From fedora-extras-commits at redhat.com  Sun Jan  1 00:01:59 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:01:59 -0500
Subject: rpms/ocaml/FC-4 .cvsignore, 1.5, 1.6 ocaml.spec, 1.17, 1.18 sources,
	1.5, 1.6
Message-ID: <200601010002.k0102q95028350@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28325

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2005 10:10:01 -0000	1.5
+++ .cvsignore	1 Jan 2006 00:01:59 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.08.4.tar.bz2
-ocaml-3.08-refman.html.tar.gz
-ocaml-3.08-refman.info.tar.gz
-ocaml-3.08-refman.ps.gz
+ocaml-3.09.0.tar.bz2
+ocaml-3.09-refman.html.tar.gz
+ocaml-3.09-refman.info.tar.gz
+ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ocaml.spec	11 Sep 2005 10:10:01 -0000	1.17
+++ ocaml.spec	1 Jan 2006 00:01:59 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.08.4
+Version:	3.09.0
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,19 +7,22 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
-Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
-Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
+BuildRequires:	ncurses-devel
+BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  xorg-x11-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
+
 %description
 Objective Caml is a high-level, strongly-typed, functional and
 object-oriented programming language from the ML family of languages.
@@ -29,6 +32,7 @@
 parsing tools (Lex,Yacc,Camlp4), a replay debugger, a documentation generator,
 and a comprehensive library.
 
+
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
@@ -38,6 +42,7 @@
 A library for interfacing Objective Caml with the scripting language
 Tcl/Tk. It include the OCamlBrowser code editor / library browser.
 
+
 %package -n camlp4
 Group:		Development/Languages
 Summary:	Pre-Processor-Pretty-Printer for OCaml
@@ -47,6 +52,7 @@
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
 file and printing some result on standard output.
 
+
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
@@ -55,6 +61,7 @@
 %description ocamldoc
 Documentation generator for Objective Caml.
 
+
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
@@ -64,6 +71,7 @@
 %description emacs
 Emacs mode for Objective Caml.
 
+
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
@@ -72,6 +80,7 @@
 %description docs
 Documentation for Objective Caml.
 
+
 %prep
 %setup -q -T -b 0
 %setup -q -T -D -a 1
@@ -81,6 +90,7 @@
 
 cp %{SOURCE2} refman.ps.gz
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
@@ -91,6 +101,7 @@
 # %{?_smp_mflags} breaks the build
 (cd emacs; make ocamltags)
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml MANDIR=$RPM_BUILD_ROOT%{_mandir}
@@ -105,9 +116,11 @@
     cd infoman; cp ocaml*.gz $RPM_BUILD_ROOT%{_infodir}
 )
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/install-info \
     --entry "* ocaml: (ocaml).	 The Objective Caml compiler and programming environment" \
@@ -115,11 +128,13 @@
     %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 
+
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -143,6 +158,7 @@
 %exclude %{_libdir}/ocaml/stublibs/dlltkanim.so
 %doc README LICENSE Changes
 
+
 %files -n labltk
 %defattr(-,root,root,-)
 %{_bindir}/labltk
@@ -153,6 +169,7 @@
 %doc otherlibs/labltk/examples_labltk
 %doc otherlibs/labltk/examples_camltk
 
+
 %files -n camlp4
 %defattr(-,root,root,-)
 %{_bindir}/camlp4*
@@ -162,22 +179,26 @@
 %{_mandir}/man1/camlp4*
 %{_mandir}/man1/mkcamlp4*
 
+
 %files ocamldoc
 %defattr(-,root,root,-)
 %{_bindir}/ocamldoc*
 %{_libdir}/ocaml/ocamldoc
 %doc ocamldoc/Changes.txt
 
+
 %files docs
 %defattr(-,root,root,-)
 %doc refman.ps.gz htmlman
 
+
 %files emacs
 %defattr(-,root,root,-)
 %{_datadir}/emacs/site-lisp/*
 %{_bindir}/ocamltags
 %doc emacs/README
 
+
 %changelog
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2005 10:10:01 -0000	1.5
+++ sources	1 Jan 2006 00:01:59 -0000	1.6
@@ -1,4 +1,4 @@
-96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
-0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
-49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
-35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz
+834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
+280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
+598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 00:05:17 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:05:17 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.17,1.18 sources,1.5,1.6
Message-ID: <200601010005.k0105x1q028417@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28398

Modified Files:
	ocaml.spec sources 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ocaml.spec	11 Sep 2005 10:11:22 -0000	1.17
+++ ocaml.spec	1 Jan 2006 00:05:17 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.08.4
+Version:	3.09.0
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,16 +7,18 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
-Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
-Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
+BuildRequires:	ncurses-devel
+BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  libX11-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -179,6 +181,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
+- new version 3.09.0
+
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2005 10:11:22 -0000	1.5
+++ sources	1 Jan 2006 00:05:17 -0000	1.6
@@ -1,4 +1,4 @@
-96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
-0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
-49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
-35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz
+834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
+280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
+598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 00:07:22 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:07:22 -0500
Subject: rpms/ocaml/FC-4 ocaml.spec,1.18,1.19
Message-ID: <200601010008.k0108ImJ028465@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28423/FC-4

Modified Files:
	ocaml.spec 
Log Message:
new version 3.09.0


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ocaml.spec	1 Jan 2006 00:01:59 -0000	1.18
+++ ocaml.spec	1 Jan 2006 00:07:21 -0000	1.19
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
+- new version 3.09.0
+
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4
 



From fedora-extras-commits at redhat.com  Sun Jan  1 00:07:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:07:03 -0500
Subject: rpms/ocaml/FC-3 .cvsignore, 1.4, 1.5 ocaml.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200601010008.k0108ITd028464@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28423/FC-3

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2005 19:28:02 -0000	1.4
+++ .cvsignore	1 Jan 2006 00:07:03 -0000	1.5
@@ -1,4 +1,4 @@
-ocaml-3.08.3.tar.bz2
-ocaml-3.08-refman.html.tar.gz
-ocaml-3.08-refman.info.tar.gz
-ocaml-3.08-refman.ps.gz
+ocaml-3.09.0.tar.bz2
+ocaml-3.09-refman.html.tar.gz
+ocaml-3.09-refman.info.tar.gz
+ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ocaml.spec	11 Sep 2005 10:18:26 -0000	1.12
+++ ocaml.spec	1 Jan 2006 00:07:03 -0000	1.13
@@ -1,20 +1,21 @@
 Name:		ocaml
-Version:	3.08.4
-Release: 	2%{?dist}
+Version:	3.09.0
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
-Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
-Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
+BuildRequires:	ncurses-devel
+BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
 Requires(post):	/sbin/install-info
@@ -179,6 +180,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
+- new version 3.09.0
+
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2005 10:13:14 -0000	1.5
+++ sources	1 Jan 2006 00:07:03 -0000	1.6
@@ -1,4 +1,4 @@
-96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
-0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
-49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
-35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz
+834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
+280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
+598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 00:12:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 31 Dec 2005 19:12:35 -0500
Subject: rpms/kmymoney2/devel kmymoney2-0.8.1-gcc41.patch, 1.1,
	NONE kmymoney2-0.8.1-qt335.patch, 1.1, NONE
Message-ID: <200601010012.k010CfSV028616@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605

Removed Files:
	kmymoney2-0.8.1-gcc41.patch kmymoney2-0.8.1-qt335.patch 
Log Message:
drop old patches



--- kmymoney2-0.8.1-gcc41.patch DELETED ---


--- kmymoney2-0.8.1-qt335.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan  1 00:22:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:22:18 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.18,1.19
Message-ID: <200601010023.k010NBGh028690@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28663

Modified Files:
	ocaml.spec 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ocaml.spec	1 Jan 2006 00:05:17 -0000	1.18
+++ ocaml.spec	1 Jan 2006 00:22:18 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.09.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -18,7 +18,17 @@
 BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -31,6 +41,7 @@
 parsing tools (Lex,Yacc,Camlp4), a replay debugger, a documentation generator,
 and a comprehensive library.
 
+
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
@@ -40,6 +51,7 @@
 A library for interfacing Objective Caml with the scripting language
 Tcl/Tk. It include the OCamlBrowser code editor / library browser.
 
+
 %package -n camlp4
 Group:		Development/Languages
 Summary:	Pre-Processor-Pretty-Printer for OCaml
@@ -49,6 +61,7 @@
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
 file and printing some result on standard output.
 
+
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
@@ -57,6 +70,7 @@
 %description ocamldoc
 Documentation generator for Objective Caml.
 
+
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
@@ -66,6 +80,7 @@
 %description emacs
 Emacs mode for Objective Caml.
 
+
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
@@ -74,6 +89,7 @@
 %description docs
 Documentation for Objective Caml.
 
+
 %prep
 %setup -q -T -b 0
 %setup -q -T -D -a 1
@@ -83,6 +99,7 @@
 
 cp %{SOURCE2} refman.ps.gz
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
@@ -93,6 +110,7 @@
 # %{?_smp_mflags} breaks the build
 (cd emacs; make ocamltags)
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml MANDIR=$RPM_BUILD_ROOT%{_mandir}
@@ -107,9 +125,11 @@
     cd infoman; cp ocaml*.gz $RPM_BUILD_ROOT%{_infodir}
 )
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/install-info \
     --entry "* ocaml: (ocaml).	 The Objective Caml compiler and programming environment" \
@@ -117,11 +137,13 @@
     %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 
+
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -145,6 +167,7 @@
 %exclude %{_libdir}/ocaml/stublibs/dlltkanim.so
 %doc README LICENSE Changes
 
+
 %files -n labltk
 %defattr(-,root,root,-)
 %{_bindir}/labltk
@@ -155,6 +178,7 @@
 %doc otherlibs/labltk/examples_labltk
 %doc otherlibs/labltk/examples_camltk
 
+
 %files -n camlp4
 %defattr(-,root,root,-)
 %{_bindir}/camlp4*
@@ -164,22 +188,26 @@
 %{_mandir}/man1/camlp4*
 %{_mandir}/man1/mkcamlp4*
 
+
 %files ocamldoc
 %defattr(-,root,root,-)
 %{_bindir}/ocamldoc*
 %{_libdir}/ocaml/ocamldoc
 %doc ocamldoc/Changes.txt
 
+
 %files docs
 %defattr(-,root,root,-)
 %doc refman.ps.gz htmlman
 
+
 %files emacs
 %defattr(-,root,root,-)
 %{_datadir}/emacs/site-lisp/*
 %{_bindir}/ocamltags
 %doc emacs/README
 
+
 %changelog
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0



From fedora-extras-commits at redhat.com  Sun Jan  1 00:24:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:24:20 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.10,1.11
Message-ID: <200601010024.k010OquQ028754@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28736

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtkglarea2.spec	31 Dec 2005 23:58:15 -0000	1.10
+++ gtkglarea2.spec	1 Jan 2006 00:24:20 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	OpenGL GTK widget
 Name:		gtkglarea2
 Version:	1.99.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -18,10 +18,9 @@
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	xorg-x11-devel
 Requires:	gtk2-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
+Requires:       mesa-libGL-devel
+Requires:       mesa-libGLU-devel
 
 %description
 GtkGLArea is a GTK widget that makes it easy to use OpenGL or Mesa



From fedora-extras-commits at redhat.com  Sun Jan  1 00:43:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:43:24 -0500
Subject: rpms/lablgtk/devel lablgtk.spec,1.11,1.12
Message-ID: <200601010043.k010huLH028825@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28808

Modified Files:
	lablgtk.spec 
Log Message:



Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lablgtk.spec	31 Dec 2005 23:45:56 -0000	1.11
+++ lablgtk.spec	1 Jan 2006 00:43:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lablgtk
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -24,6 +24,7 @@
 BuildRequires:  libgnomecanvas-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:  gtkspell-devel
+BuildRequires:  libXmu-devel
 
 Requires:       ocaml >= 3.08
 Requires:       lablgl >= 1.02



From fedora-extras-commits at redhat.com  Sun Jan  1 01:16:16 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 20:16:16 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.19,1.20
Message-ID: <200601010116.k011Gm1W030657@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30640

Modified Files:
	ocaml.spec 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ocaml.spec	1 Jan 2006 00:22:18 -0000	1.19
+++ ocaml.spec	1 Jan 2006 01:16:16 -0000	1.20
@@ -104,7 +104,8 @@
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
     -libdir %{_libdir}/ocaml \
-    -x11lib %{_prefix}/X11R6/%{_lib} \
+    -x11lib %{_libdir} \
+    -x11include %{_includedir} \
     -mandir %{_mandir}/man1
 make world opt opt.opt
 # %{?_smp_mflags} breaks the build



From fedora-extras-commits at redhat.com  Sun Jan  1 01:17:07 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 20:17:07 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.20,1.21
Message-ID: <200601010117.k011HdE1030710@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30693

Modified Files:
	ocaml.spec 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ocaml.spec	1 Jan 2006 01:16:16 -0000	1.20
+++ ocaml.spec	1 Jan 2006 01:17:07 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.09.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 



From fedora-extras-commits at redhat.com  Sun Jan  1 10:39:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:39:42 -0500
Subject: rpms/kmymoney2/FC-3 .cvsignore, 1.2, 1.3 kmymoney2.spec, 1.4,
	1.5 sources, 1.2, 1.3 kmymoney2-0.8.1-qt335.patch, 1.1, NONE
Message-ID: <200601011040.k01AeFpY017807@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17775

Modified Files:
	.cvsignore kmymoney2.spec sources 
Removed Files:
	kmymoney2-0.8.1-qt335.patch 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Nov 2005 20:23:11 -0000	1.2
+++ .cvsignore	1 Jan 2006 10:39:42 -0000	1.3
@@ -1 +1 @@
-kmymoney2-0.8.1.tar.bz2
+kmymoney2-0.8.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmymoney2.spec	15 Dec 2005 15:08:28 -0000	1.4
+++ kmymoney2.spec	1 Jan 2006 10:39:42 -0000	1.5
@@ -1,35 +1,38 @@
 
 %if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
+%endif
+
+%if "%{?fedora}" > "4"
+%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel opensp-devel
 %endif
 
 %if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.1
-Release: 4%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-0.8.1.tar.bz2
+Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
-Patch1: kmymoney2-0.8.1-qt335.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: automake
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel >= 6:3.3
+%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_with_ofxbanking:BuildRequires: openjade-devel >= 1.3.2, libofx-devel}
-## TODO
-#define _with_kbanking --with-kbanking
+## FIXME/TODO
 %{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
 
 
@@ -49,8 +52,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .qt335
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -58,7 +59,8 @@
 
 %configure \
   --disable-rpath \
-  --disable-debug --disable-warnings --disable-dependency-tracking --enable-final \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
   %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
   %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
   %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -109,18 +111,18 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 %postun
 /sbin/ldconfig 
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 
@@ -130,8 +132,8 @@
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
-%{_datadir}/icons/locolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*
@@ -152,6 +154,19 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-7
+- gcc41 patch
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-6
+- cleanup ofx deps
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- cleanup %%post
+- fc5 respin for new(er) libofx
+
 * Mon Nov 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
 - relax BR: kdelibs-devel to 3.3 (for aurora/sparc, #173133)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Nov 2005 20:23:11 -0000	1.2
+++ sources	1 Jan 2006 10:39:42 -0000	1.3
@@ -1 +1 @@
-266fd411098cdce53d7db202960f07d5  kmymoney2-0.8.1.tar.bz2
+ffb09eaba4f93cd47e9600a2cb6b02c5  kmymoney2-0.8.2.tar.bz2


--- kmymoney2-0.8.1-qt335.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan  1 10:39:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:39:38 -0500
Subject: rpms/kmymoney2/FC-4 .cvsignore, 1.2, 1.3 kmymoney2.spec, 1.4,
	1.5 sources, 1.2, 1.3 kmymoney2-0.8.1-qt335.patch, 1.1, NONE
Message-ID: <200601011040.k01AeA3a017802@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17759

Modified Files:
	.cvsignore kmymoney2.spec sources 
Removed Files:
	kmymoney2-0.8.1-qt335.patch 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Nov 2005 20:23:11 -0000	1.2
+++ .cvsignore	1 Jan 2006 10:39:37 -0000	1.3
@@ -1 +1 @@
-kmymoney2-0.8.1.tar.bz2
+kmymoney2-0.8.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmymoney2.spec	15 Dec 2005 15:08:35 -0000	1.4
+++ kmymoney2.spec	1 Jan 2006 10:39:37 -0000	1.5
@@ -1,35 +1,38 @@
 
 %if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
+%endif
+
+%if "%{?fedora}" > "4"
+%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel opensp-devel
 %endif
 
 %if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.1
-Release: 4%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-0.8.1.tar.bz2
+Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
-Patch1: kmymoney2-0.8.1-qt335.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: automake
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel >= 6:3.3
+%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_with_ofxbanking:BuildRequires: openjade-devel >= 1.3.2, libofx-devel}
-## TODO
-#define _with_kbanking --with-kbanking
+## FIXME/TODO
 %{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
 
 
@@ -49,8 +52,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .qt335
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -58,7 +59,8 @@
 
 %configure \
   --disable-rpath \
-  --disable-debug --disable-warnings --disable-dependency-tracking --enable-final \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
   %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
   %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
   %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -109,18 +111,18 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 %postun
 /sbin/ldconfig 
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 
@@ -130,8 +132,8 @@
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
-%{_datadir}/icons/locolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*
@@ -152,6 +154,19 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-7
+- gcc41 patch
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-6
+- cleanup ofx deps
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- cleanup %%post
+- fc5 respin for new(er) libofx
+
 * Mon Nov 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
 - relax BR: kdelibs-devel to 3.3 (for aurora/sparc, #173133)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Nov 2005 20:23:11 -0000	1.2
+++ sources	1 Jan 2006 10:39:37 -0000	1.3
@@ -1 +1 @@
-266fd411098cdce53d7db202960f07d5  kmymoney2-0.8.1.tar.bz2
+ffb09eaba4f93cd47e9600a2cb6b02c5  kmymoney2-0.8.2.tar.bz2


--- kmymoney2-0.8.1-qt335.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan  1 10:42:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:42:22 -0500
Subject: rpms/sbcl/FC-3 .cvsignore, 1.6, 1.7 sbcl.spec, 1.26, 1.27 sources,
	1.6, 1.7
Message-ID: <200601011042.k01Agsfm017937@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17894

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
- 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Dec 2005 18:59:35 -0000	1.6
+++ .cvsignore	1 Jan 2006 10:42:22 -0000	1.7
@@ -1,6 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-sbcl-0.9.5-source.tar.bz2
-sbcl-0.9.5-x86-linux-binary.tar.bz2
-sbcl-0.9.6-source.tar.bz2
-sbcl-0.9.7-source.tar.bz2
+sbcl-0.9.8-source.tar.bz2
+sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+sbcl-0.9.8-x86-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sbcl.spec	6 Dec 2005 19:03:50 -0000	1.26
+++ sbcl.spec	1 Jan 2006 10:42:22 -0000	1.27
@@ -12,8 +12,8 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.7
-Release: 1%{?dist}.1
+Version: 0.9.8
+Release: 1%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
+- 0.9.8
+
 * Mon Nov 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.7-1
 - 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Dec 2005 18:59:35 -0000	1.6
+++ sources	1 Jan 2006 10:42:22 -0000	1.7
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2
+4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
+294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  1 10:42:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:42:49 -0500
Subject: rpms/sbcl/FC-4 .cvsignore, 1.6, 1.7 sbcl.spec, 1.30, 1.31 sources,
	1.6, 1.7
Message-ID: <200601011043.k01AhLvq017942@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17916

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
- 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Dec 2005 15:33:23 -0000	1.6
+++ .cvsignore	1 Jan 2006 10:42:48 -0000	1.7
@@ -1,6 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-sbcl-0.9.5-source.tar.bz2
-sbcl-0.9.5-x86-linux-binary.tar.bz2
-sbcl-0.9.6-source.tar.bz2
-sbcl-0.9.7-source.tar.bz2
+sbcl-0.9.8-source.tar.bz2
+sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+sbcl-0.9.8-x86-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sbcl.spec	5 Dec 2005 15:33:23 -0000	1.30
+++ sbcl.spec	1 Jan 2006 10:42:48 -0000	1.31
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.7
+Version: 0.9.8
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
+- 0.9.8
+
 * Mon Nov 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.7-1
 - 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Dec 2005 15:33:23 -0000	1.6
+++ sources	1 Jan 2006 10:42:48 -0000	1.7
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2
+4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
+294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  1 15:24:13 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  1 Jan 2006 10:24:13 -0500
Subject: rpms/baobab/devel baobab.spec,1.7,1.8
Message-ID: <200601011524.k01FOjED027382@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27365

Modified Files:
	baobab.spec 
Log Message:
Rebuild to test ExclusiveArch behaviour in the buildsys


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- baobab.spec	28 Dec 2005 17:12:19 -0000	1.7
+++ baobab.spec	1 Jan 2006 15:24:12 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        2.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -17,6 +17,8 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+ExclusiveArch: %{ix86}
+
 %description
 Baobab is able to scan either specific directories or the whole filesystem, 
 in order to give the user a graphical tree representation including 
@@ -56,6 +58,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-3
+- Rebuild to test ExclusiveArch behaviour in the buildsys
+
 * Wed Dec 28 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Sun Jan  1 15:29:39 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  1 Jan 2006 10:29:39 -0500
Subject: rpms/baobab/FC-4 .cvsignore, 1.6, 1.7 baobab.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <200601011530.k01FUCot027509@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471/FC-4

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
Update to 2.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Dec 2005 16:56:05 -0000	1.6
+++ .cvsignore	1 Jan 2006 15:29:39 -0000	1.7
@@ -1 +1 @@
-baobab-2.2.2.tar.gz
+baobab-2.3.0.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baobab.spec	8 Dec 2005 16:56:05 -0000	1.6
+++ baobab.spec	1 Jan 2006 15:29:39 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.2
+Version:        2.3.0
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -57,6 +57,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
+- Update to 2.3.0
+
 * Thu Dec 08 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-1
 - Update to 2.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Dec 2005 16:56:05 -0000	1.6
+++ sources	1 Jan 2006 15:29:39 -0000	1.7
@@ -1 +1 @@
-2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz
+b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 15:29:45 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  1 Jan 2006 10:29:45 -0500
Subject: rpms/baobab/devel .cvsignore, 1.6, 1.7 baobab.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200601011530.k01FUH5u027514@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471/devel

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
Update to 2.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Dec 2005 16:43:15 -0000	1.6
+++ .cvsignore	1 Jan 2006 15:29:45 -0000	1.7
@@ -1 +1 @@
-baobab-2.2.2.tar.gz
+baobab-2.3.0.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- baobab.spec	1 Jan 2006 15:24:12 -0000	1.8
+++ baobab.spec	1 Jan 2006 15:29:45 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.2
-Release:        3%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -17,8 +17,6 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-ExclusiveArch: %{ix86}
-
 %description
 Baobab is able to scan either specific directories or the whole filesystem, 
 in order to give the user a graphical tree representation including 
@@ -58,6 +56,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
+- Update to 2.3.0
+
 * Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-3
 - Rebuild to test ExclusiveArch behaviour in the buildsys
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Dec 2005 16:43:15 -0000	1.6
+++ sources	1 Jan 2006 15:29:45 -0000	1.7
@@ -1 +1 @@
-2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz
+b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 17:53:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Jan 2006 12:53:18 -0500
Subject: owners owners.list,1.494,1.495
Message-ID: <200601011753.k01HroJD031170@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137

Modified Files:
	owners.list 
Log Message:
+scponly


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- owners.list	31 Dec 2005 15:12:32 -0000	1.494
+++ owners.list	1 Jan 2006 17:53:17 -0000	1.495
@@ -1097,6 +1097,7 @@
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|scribus|DeskTop Publishing app in QT|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan  1 18:42:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Jan 2006 13:42:40 -0500
Subject: rpms/lirc/devel .cvsignore, 1.7, 1.8 lirc.spec, 1.11, 1.12 sources, 
	1.7, 1.8
Message-ID: <200601011843.k01IhCg4000435@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv414

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
- 0.8.0pre3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Dec 2005 21:07:23 -0000	1.7
+++ .cvsignore	1 Jan 2006 18:42:40 -0000	1.8
@@ -1 +1 @@
-lirc-0.8.0pre2.tar.bz2
+lirc-0.8.0pre3.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lirc.spec	27 Dec 2005 20:13:13 -0000	1.11
+++ lirc.spec	1 Jan 2006 18:42:40 -0000	1.12
@@ -10,14 +10,14 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre2.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre3.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
+- 0.8.0pre3.
+
 * Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi>
 - Split kernel modules into separate package.
 - Disable debugging features.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Dec 2005 21:07:23 -0000	1.7
+++ sources	1 Jan 2006 18:42:40 -0000	1.8
@@ -1 +1 @@
-80aaee5c1b5815f115b1e14d49f36cd5  lirc-0.8.0pre2.tar.bz2
+c20cf756b0b5cad96437bc25e81b166a  lirc-0.8.0pre3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan  2 04:53:24 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  1 Jan 2006 23:53:24 -0500
Subject: rpms/pam_mount import.log,1.13,1.14
Message-ID: <200601020453.k024ruxG018863@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807

Modified Files:
	import.log 
Log Message:
auto-import pam_mount-0.11.0-1 on branch devel from pam_mount-0.11.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	24 Nov 2005 03:48:04 -0000	1.13
+++ import.log	2 Jan 2006 04:53:23 -0000	1.14
@@ -10,3 +10,4 @@
 pam_mount-0_9_25-3:FC-4:pam_mount-0.9.25-3.src.rpm:1118332645
 pam_mount-0_9_25-4:HEAD:pam_mount-0.9.25-4.src.rpm:1118332757
 pam_mount-0_9_25-5:HEAD:pam_mount-0.9.25-5.src.rpm:1132804079
+pam_mount-0_11_0-1:HEAD:pam_mount-0.11.0-1.src.rpm:1136177590



From fedora-extras-commits at redhat.com  Mon Jan  2 04:53:30 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  1 Jan 2006 23:53:30 -0500
Subject: rpms/pam_mount/devel pam_mount-0.11.0.tbz2, NONE, 1.1 .cvsignore,
	1.5, 1.6 pam_mount.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200601020454.k024s3iG018869@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807/devel

Modified Files:
	.cvsignore pam_mount.spec sources 
Added Files:
	pam_mount-0.11.0.tbz2 
Log Message:
auto-import pam_mount-0.11.0-1 on branch devel from pam_mount-0.11.0-1.src.rpm


--- NEW FILE pam_mount-0.11.0.tbz2 ---
BZh91AY&SY??
?s??????????????????
?tPt?????:
9?>}n?X???????????I??g?x?[???{???
V?wZ?E??????PA?m?AU??=;??t?????f??g?Ovo{?z??)??????cZ?Z????s???=Z?mh{?????+????w??;v?????????(/??]??]n??4e?J?mUzaK?{4S?T?}?????>??l6
????w}????9:v?w?{???????k?u
m?B]?kW??z???kM?v???????o?(?k?g??????:?c>????
?????Y????R??d?J?v?????q??}????t?I???}????3??d?r\??9|5??G????Y?{4$?e

?k??m??v4?????]???y?n??x??`?z??jv??????f-???c[mCv?????[?}??;nf.|???p}?l?h=
??=???C??jz??[?w?W?v?????/??m?
 d?!"?b?B%?E;?
?????U???p?T??
?D?6?*???`b??P???
jF??
@??*"h?Gb@(&???PV?+R(?:?*T???A
"0?N
$????#?#D??D??R?R?#?U???CXBD??>?4???h?????
????9?????PDr?&??)?????????t~.????????y! ?D*I???9
??6?p??P???)"???-?s
?? 
?d[E?UJ?
??;3E?@?ZI??????R?RL4	@???q??Q?Ap%b at 0?r?%??hT?E?)?|?	?y? ?Q?_[ ?G??0d8?????h
*??{+?????g????;??k?V]???g??%?)M4	??H@,????tP??6j??????Hv????????T!??????
d?b>.?&>?Y?*?y??/g??????:?????????;pu??????<~??i?a?2????$?:?Bj?66?x????w?)?d?o
x???-C???A9?CO?9????1??Y??????(??g??!P??BF04?uB???eSW?h??y??^?C???????? 8???f?g??*???9aLI??{F??K??6-MS?iE?f??<?(Y?f`?*?P??A?c?i??0?}fB?r????7??#??q???
?!???s?0&fs?"^99??)r?????X?!@<?#????wF|??|??% ??P?Q??????G?*'?,W???#?<???z?d???\&F*i?,E???v?Q5'G?t9???d}?????Q????$?????D?;
G???M`XX?g<??z???m42?????
???b??*??q?0NlO??xp?????V?Q??_dZ`??8????Vq???&q?H???]W???G?Xt??\???d0?? ei2??????????p?p?j??l?`e?AsbNs|??n??n??M&??????????Z?Q???z?hvu?r???I9????}???C?_?I??z?@??D????S8*?Be??h?	?D??>lu?}e$???Z!?\?8<f@???-?????J??,5?(??]???3???<???9?j
pr<?%?`zvk??b???<&????,b=?)vpmT???2{??7?Ug?~7?)?9?Bg&?????M???z?u????F???????$z?s;M?uIR@???T???????q(?XgN?y??$"??.
??e??5??r??5m?/wn???f?8?????f"@?Y??H?Q?t(->?A?<*??`?P??h????io?S4?huH>???8?K?{?u?z`?D?v????o???La????M?????????????????i;f?H;1???eU!$?#6??????=g)????wH(?<x?j????,u?j$??T???!?'????CH?(?4?x?Lnb? ?|?b??
?=Nu???[?6??Q??????W?????,?J'U`?:??TK?#??+??????p??wvgww???L?`"p???V5`!?7?Co??kw??K`??\VG????g3?Q??:?L,?.*(?????N8????????e*???.?C ????}#?f$?/?????@r?C???G?L?:?I??!%??(|G&?>^?R??:???????uF?8_W?t???????{<??w????;{??C|?M???7???x,>z*?/???A7G?^=?[x{&??O7???????dq???W??<;??T?G??Z~l?=?c???????????????G??m?S??,8??W?w?
?9?5?(8Zs?Y?x?????c?}??	?U?????i????????!xRRj?\9??}9?%&~s?%pR??r??N~O????????????:???hC??X???????5?h|?9????g??X??U??\
?Z??(???E?)ow?$?#T{*9X\E????,1?????h??NP???]^????^?q??R^?L??H?J?????????hN?8?,?<??E?Y???g5_???\so????/ d|????;?J?l.?w?UTjWv????v?C?h?????y?VLf??<J1??F?L?U??O{N?Q????z6????l??o?~?Z?MU[?\??)?)?}c??????g???????????E????Q??j??E?MD??b?????r?Y?7??J5?A?3?????????)?j4J?YP???e
J?C???[????y????)??qV???>?B??D?i?JUK#?????Y?S???I?????????{???[Un?
?s?8?o:&??+?Q??l??'??e?*YGo!???C?K?b ??G?DNE?;?{.<?[@c???5?|n/????~>g?U"7?i=???n?S
????6???oD???h??C'?
??d??M(;??$u???M+S??????%_??A?PD;+?7G+aV? t?U<??3???aW?|(????????????dm???A?cO?Iq???y??????~?V3??}(?+??)????????J????|%L?9)????F??vQD
?5??? ?}??????;w????u%??&TSBvL??3????xp|?[+?3????"????M?'?P?jRS
?"?d?F?T???F??4????????0N??fy???nt??1J'5cl?>jY????;zXG?Z??J??v?t?HL????K??`????????k?m8?M4??D????}????]G?&??-0?v??TMo?9?F?LEw+????cY?7?: H?<e*#?&???e$G>c?s????R????k,
K.&vL??]??N???VQ1???J??!?;~??????
?rT???S???#h????c+C}?^??D??'<???)?ZI-?fbQ0W??m?Eh`????????#?<?
?O+E+$?G??^?5$Y????????a???x??>?S?|Y?x?q0?????"??t?????!??&?g??o??q?	????S?0??0?;?a??1???f}???m}???
?i??T33?u~)???1?~5?????>????|~??,??{??KC*?2Z?`"De??Bp?????79'6?LL??!v
{L??>??O????t???i*???????rL?-C?Pfe?J????????(/??2)??%baS???????!?)"r???????/n?^
:?????21I?????bn??i!0?"???=??_%(?&?'??38R?S???A6?NQ????????R????Fa??j??m?^??M?[?
*3?rs??K?@{??Y?????
??Z??v??>:?:8N2N8a??I?????1???P??PgtW
?BbHZ%?????F?????
?v????d??s??X?????N?Z?sw9?CX=?I?!A9??)???#?b?~?V?&5???bb?R?df??+3?E?>??G??9???c?tlq?
?????????xjD?P?	??Q?????#4-?E??x???_2??t
????,v?AW??['&??zVBfG??z7??8o??????8
???NGs
^???
????[meau_???=|Gs?<???[??	6???2\??Kd?S
%?8???O??=?2?\R???/e|1???Fz?Si????&?????*?q,(g???&t??#?Y?B?\???*l?z???y)?7?c?C?i8|?zlW??||e?????q?16?{?v???h?$\z}?????y??T????BeJ?O|T???\?O]??
MF???re??yn?6?rj?JpYBV??'?f]????a5#?ARH???	??
9?Y`j`?Q???]?OrG?????>??'A????????(D8?
??Ne1?8???? ??B?%%0??i??????)?( ?@T???UJ???}-?U?D???
??P'??sg?eLd???Ir??ie?Q???oF?|?lU?C???>???hi-?b
wd?????31?rfg?7?o?2????Tj?!???
??FQ??u??????7>??V?????&????"?{???X???5V[g)?? 9?S?A?
?h2:?C????H'rC$q???8U??[?\???LSPQ1?aXg[X??Pb
J?i)???*?)??mN???9?? ?"/??G?Ps????k?m????2?{?@?Ta?|??l?$H`??IKf?G?0*fQG?w??

8????????K2?GL??s(?n??_?e?Ct???N??t????1#?,?qRB???R??M
(?GhHI???t????	y	O?????T	??????d??,?Q?^[Ya'???[?zm?-a`????c?8???}<xb????z???Cl?TH???a??lL??}?iG??9X?
?8???c?8z:????9}??
O????????t2#oZ#?LLF#'?<?;WOM??X???\??gX]???1?r??(Zd??
l??_35d??9
????qAy??g??pb{z??e@?????^?[???(b??x,?j?Y?NW'?4x?H????F??kU?Qau???j3*iU`?:y?L?Qtp??7)???R??|?+e??uC??~??50??^p??Er+f/U
Y?????aD???pL?L?U?&?~K??U???T?7?A?ZNS?|
L???JpPv?Po??0?P?,5??b
??
g??:W??n"?z
PPR7?K??2	/J^??9?W???i5H????#`3)N?a?gA:3???5?y0m>B???b?q??????2
??7|? ?C'y?=???y?{????&?F??:????D?4???e??S??"/?????%*"???s?
??)??????
?????eUU?YUU?e?]{??????O?4?????s????Y??}?????????\h?S??r[g??F??10G&T??2?aY?L:?r?QkCy????Vf?L#??j?w??5c??? 8?<4?(?[???T?e?T??}?v????;g:Z??B????????t??+??????2G)$?q???K????>R^???	&
??A??]f}.\??G?BNy?{9?#???Z?@???gw
C?0v-zIJ?W@???lz?C#0???c??"f?z??@rb&?n?y?T?/y"wTN?A???7?L/???l=d???W?!?sg?r?V?9??Bl?[??r?jN?1G???i???m????
?2u
?h8^?kI?+??1F?
???b???????????Q~g?phM????vx?<X>H?????`?$g?H
??q?c??
=????Z@????6?i<Q????????c????.???x??Wj????3w??s??x2/?C&???:??BD)
??O]F?1????U??F?!}`?6=v?J?9??s???h?_??@?(M??3?i?????)jZ[%N?{?
M?1m??	?????Cm??;k????????u???V???
?b?J?tT_?L??
#7??Ho?C?h`?NB????	m???'????`???t3??????B??o???6;????Y~G0??u|???!?C??N??R`???|??j???U? 0??>3?@?0pPEQ??f???ae8?"???s?*p?x?+]C???n?@???G?z?~????~?egh??N
?????w??9???;??cp?Q??????????T?????s??e?Z??GS???????P???30i??Oo	
?????8,VOo?FO at AN?P}?_???n??8O????fl???2??Q8?1?????????,?>???|??>?L?	\2
?
?O????<S+?0J??K!?RC/+/F?-??(f???!"??p8????%&???Q?{i>?U
?4fX4?^??'?g??.%h{Kop~? ?????Y??NN!dl???K??z$??a?r?a?c??#)?a??}???]}?
????5???q?Qu??Ma??y??n????'?q?{??#Ls	????????<?t???I6????I2aW???2?#B?R?;?K???"???)??%???S?2T'S!?4?3,?,?????11<?W3?:v???D?????&i?*S?B
???M?R??dr?Bc????|??OU?7?N?(??8?.??	????*?I?C&? ???????Rz%a?j???U?UA??mc??,,?ns??r7d:~&?ZW???I0^?k???J????i??wq?8?C???=?PU0wI?w)A7>??Lh???X???f?A6???Gq?????.????7???W??M????a?B?fW????>?G??d?tf"??U??(0?aA?b\o6??*U??Nw???@???3?pnt"E???:
&x|?~?????uf=?Q?7p?S?
?KD????a????#???&?s??	????????f`?AP??J?<$?
???X)-dxmT?j.lG8?3p?*0??????.??g?????S?}?{,??{??????d?%^7)?.?P????Am?????<.??&???4?{w?:?sO?Q?1??9???4?& 4T???#???2??$?.};?A??$?B??d)?i&?x??\.?q?U?rF??+T,?]??s?v???V???yf,???wM?T?g
K@?4?Y9B.Mzz??&^??#6
nUo??????}E?n!??ci?bX@?5??:Y??Ye?r????-?^????q
;[??X@>|??h?Y;'???kJ?b?GF?n???????.??????v???????4??CE?D?O=???(N?|S??4U?#:??}?M*??X=4?<K??5LtT???+?qh0?d??;????D?G??bv?z??@?E??1?o????	??R??v???M,??????jH1?"j4HB???A?P?,0D at Gd??DDw???p&N?H????????b????`?
???qf?x?+??Y?PUR?`? ?j???A1?b"(?
?J???Hh??!??!?$??$i ????Z???!?`?"????i?!bd%?(hV "H?x????)?eVE???SR1?#?	???{ 2???A???	??)?
)$
i???JR???jS?T?;? ?O?^RQ'2?x?????S
???{?D???
??? {???:@??9IG!F?OV?????????????
?}?G???`?0C?c??;p?pz????{gaQ
?p*	? ??
????,????"2	Px??t???????6?H}}z?)D!?J???
?`?@m?w???
??|?u?a?WR!??U	?Vj?`??????g?H?kJ	"_???K
b R!H? z ????"}??? B		?SBC?h2?~rx#a???Q:5?0? ???hSN`=???^??		
???x?
bD?aG?Q??A>1???????$O???:???2?P)P????Y????$P?P?
J)j??????D	?u??????(_/=????A=l)???fwf
?#9?4????0??O?????????????|5?\#????k?2A?JBBc???L)1??-??e?D?a??j-?$R??)????G_????
l?*li?????E8????"?????\'
?(P?A!n?3?
??8b??B_???4????
q??b?e?q?B????q?~???z????o?? ?????O?????$?,Q?p?pHA??#/??4
???c??H{?bo
?D???2c??n?t,(???????;??vKLH"[I,???*?H?VTVB?sB
?*?*?_???H
?j?9tY
??9?Z?oI	0?j?????_????????4?? S??36N?X??iq?",?xyo???e(???;??XJ_??
g??{
??{8c???O?{P)(
?$!????)+3RT+????keb?h4??af???[uHYE?
?D???????a?D!??!??=?????LT{?x??ND
???b?7x?R?D??????R?C?A???B?6C???0t$O?.??U??~??#??????#*????&?2???G?X?P?P7?9?N????1?@?Xm?
+?My7??P

?????@?Hc?`??Y	?(
?p??%?GG?p???Po????m?

`??
?(
?^?w????3??D?Y?.Gr???10? ??&?D?\??S????8l-	??H|?
1?????|
??;
???!1RQ?l0b
??^???q?
????K?|f?#???.fK??c??n?????????v??	?$?)??r??s??{???x?'????{x<??0/3n?I?Q????L!?q?Xr?M?D? L2@/??C?g???!?P4P5????.????=N<?N=KZ>??eq4?????????	????
d??b?_?.?h*??}?E/??U}Z????Jg|??va??}??V/}?H?$?C?<?"???CtD?xI????r?)LJj???f?[{'?${8???ZG_?=??
#???
??!??????!9????o
%,????3?qt??L2]c?
`??!?t??@y??=>y???wA???T??n?9l??/a at eP???~?y'???????9
?R??u???-??A2#PlM_????w????? ?2???O????X- at bq?PV ?`???
??=???-?A?c???C?c0????&`y??X?	 ?,????}?\?M?PjP???!?Z?`?H4?????#K??

FS?%?2*????$A????Z? O?????0?b???@???????HY?!?tT??H\D?Q??????_~=7?64???*
??1???"]ER\?8D?K???R,??\??OS?#???JOppy3??u?x????Q?8?|ON)???????1DN???????OP?ER\9-;?&jB?[UFC????Z)"`0!v??#?
?
n????6?x??^??$?????w?N??????NCI?Q?v??>?????I??
????4???/??o?B?:????:`SGv?a????M??S2b??2cW??[ "s0"???>?
?D?????)D?d?y?!???%?n?	???
	W??z????T?E???l??H?????N?:?[??t?? 1???H?12?@?:?T)$6po??????4?`?_a?>?P?O????????fc??N???'?2??r??5??vOP?\?Eg????8???o6??R?(P???Y6????Q	?
A?????v5D~???5????'?y??J???E|???+V?J?J?5p???Du.?????b?X???p???Wg?imL9??b?e??QQ?7?M97??o??}?w=}??YF????52(/>?W???????s??V??:?A?
????%f?jQ???+"???
????????O7?w?8|?ND??a??3????R?%??'K??????????q?B?(B??|??6?????{????h?&?{S?Q
?&2???2??yZ?????
?(U?_1?w?K
N[H?[)V?A8#?E#??:?c??J?{w}z?J????s????,?3??)G?'?_a?Z?????j'^Y?????04?N?OYu?a??f??IQ?
w?4\???Fh9-??!??I2?O6?4k
?|???0?Q;zR?l?fu??8?A^{+??+@}MC$???!C??
??hfpY?XN????x?B{W???3?{p?;[????D?B?C<????y?.?G?`???????????????Y???$z???t?8?y!???9`;?{Z???????}bW?
?s??????1??@??A???'4?9H1h???8N"q?
#%cc???:??$??fL?sF

???ny??F"?!#?`7LP8}#??????'yOa??n?q-q???w???????
Q?@?r?>????+?H?? ?X?Y????C>?q??K
CA?????XN????8??>????C^?
?????Y#????R?K?j@??~???/????R!?
0??`!????}???r?DV?z?;?5?A?????O]n%V??6p???S?-?e?Q?`?l??t???E??0/( N????I?F&???????????3D?rzI?A???????K???e???;??M$<?H??????
??p??	B1$??Z?gg^?98?????????H?2J\???&9C?X@&ZE?0?J0=~[?C???8?%p?9S?$5?D?BG??7z??z^~??????2oP????
U???.X?U?~d$2B?S?????f???E/=?'?A???_?9???+?l??]3?M|???]?@???x???????#?@P?g????j??:???@??a????{(?J?????????????~o??YE??R???B6??H????*?F?{G??uUU?g???0X^n???$?3[?}J??q?.?????e???o???bm????s??S??k?????o[?&?I???m;L?I?
??RS!?.?2P??Z?B?0
?P?Y?C??f?b?UA????
\?L?i ?e???p??D?5??????	???D?t??>R?[a??6H?;????4??F????v??r?E???v-??R?z?l?|?]t??
??xM?+!hi5??[.?3?????[$6'??+?eE?b????)?>???g$?H??4???B???????@???????4?(?}I(?@??9??B??b????9?S?0??xf???Bc??
Sq?
????hxs?@w??Qt	?!?????????|???
#b-??B??D???h??@?X??)e??ndRk?Vg?r??+;M?????`M

D?aB@?a:?!??#??h?s??gB?Hb? ?????D?`?9O%f??3?+?
??u?o??
?_I?Qe????????&W?????b?yq4?md}?n?????J?
@8???{?@A???z?u?`?s_??i&/??7?}
????D$m,?4??cM??1	?(I%?A?????d?w,.P???????O??M?V??	??????n?uF0?B@!???w?0=e??=?????"??~?S?y?G?k-)??8vfO?s?8P?xr??r?
O+?}H??M?????I( ?aZ?oW?6?%1?????#L?2^?ew?z?e?bj???=D`ClPY?X0?g??????!????f??9?U??9H?????????2??\f?9:?i??m\g??{????2M???Y?'!??4?(E?a??D?.?)?u;?t???O{??=??+?1?????Aw?<N????????4?X????x_??|"???X???=j???UUUUL??8????1??kx?1?`?3E?e??q??????+???J??????e?z?????M5?ki???>?????????????T?W%??-???X?US??_???N?G?z{???tV? ?? *
?7???4????{jh?P?U~?U???y?wj?r?????yN?????????@?0??
?[+O?r at D?X
Z??o"|C+?>N?s?z?v????
 ??	??LEb ??8?5.xAN??Pr	?VE?`?Vp?r?:;???J??1??:0|$vs??@?	h\p`??K???| ?C??3z??0?R\???????t|?{[?O?'4j	???D????)"?????????/?RC????!S??
@?l?E0????K?"???i?IN???p+QY0??"*??
???Q*9"u???P??Ns??6s?4??:?????`=??(??
Q#H!???upRm????????;H????u??n?h8!B?1???T?i0?+eE?K?????N? ?f?p~o????{?p???:
bl??	????{??H??Ims\??ps?mN?fe?_K?????!z???i??q?]s\?c+<,??4a=?pX?N2:?6???2??d?2??c??y???S?&s???@T10!?r;????p?????f?#^0,i{!???:N@ H??1???8?^?V???`???Qx?{???k?=Yu;Li??
???}k?????-			??7?}3<??2??=?<M?X??Z%??????wNs1QDUSK ?U?k??N?X?x3K??:??#!????
??*???)?En?"?>??????i??i?RQ??\$?+?<G???j?y?<O70N^/_?b??Faj+^_??9???????}c?&????????^. ??j?u?_S
??9?rIy?m7?91???w?.fG?x??6??$?=$??=??????)??d>^/+}??W?????D?'?
???G??{'??`g????;???SV?-C??h?u????????????[?p?????F|??$?????BW?z??H?-??Pqh??u[W??;g?c?$5v???-d^D??f}?{$?????<??6??Tj?e-?5@?X??G????H?88?d??+S-#X????????2???6?R?????>??\[.p7W??????X?!'?cF????????c?R??OE?
?V?@???lC7?_?Oy??3w?!?yXw???ov???O??@??v?|??a??v?!A?a??o
y?z_?????????=?rf?dP6?gMTp????s?]?L?????>G??c?)+??1?2n??
???????Lp??m]
???\g?v?H??`???9V???a???2???+I?b?!??????Z
~?v)3?y???????%Q???
>*???O?{?I??d???'?w?k?_*?#?4????`??d??n'?^Sl?%?!??*??Iz?F#Wi\N?1K??bg??K??5???Uo?y	6Z*QP?9?a??nW??R???7
z?au??gJ?[?%????H/?u?j??w??h?|$y;N?????Ah????1???Q?a??'wO3??R/q??@???d???H?U??@?O*A?????0?B???E?<???Q<??X????9?r}??N??????9?5????W???e????Yk??Uf?Ep
???PPB=???6??$???CL`<??.?(??????X?????%?d@????v?.o?%?)??s?_<????I[?:e????SA?ZF??(??????L",q?!)
??s??%Gyii?L?
????pNN??&4_)????????rE????e?e?d??0??????"??9??X}drc??D??u????Y?.??0?u?{???2??D???4??f
?????<*??vv????	?A????4(????I?????5I??^?3	
?aV?ca???6?Yd?{?;0C?}
v)7???]??
?u??????,F??N?????L??\??z?!?K:d?YQ??l?{9??????gy?s??hC$????$5;m?a\7???h????*?#??????I7?!XH?a?o?:???u?2?CL?%1?&??gBc	?%N7?=[??A#?????r?AN??H?????a??r4
?-?(n??Rg.?j??m4*?(?8???LjO???W8???!?~??Y????$Hv93???56?r?~I?Opb?rc0?Sp?;^.?????Z?	??nP&3:??;?
?I_?????G53V?Giq???X?M?H?n;N7?????6?d<??T?;??????DK&???"??
Ik^????
7????????N?;I?
???& e1^
?????R???@??[`?F???C?j k???JA-?7!????k?r????Z??b???G?D???e??$]??H?!T??|??=7?5????aT?C?/???'xhj?D#7a?_??g?s<YS^?*	??x??i?D??G+Rr?@yuvg?'(?+??i????ES?0U7X}??r2q	?>?+?
???P?JmW?????j?X????Q?>i
?#??h????!??_??@l!C2)???J?>>??t<!?i<?m??"9?*?7??????icE?7?=V~??j???+?p??Pf?t?@F?O?
W?/??1?Fr?????t??l?o??,??A:Wz?K?r???e??F??>?PF??????Gt???f?????e? #i????QO:J0Y??????S???&"A??UV??????T?V%]U?a?[6e?J
hzW???%?>z????&&???4nq?jQ?????X*EP(@J?!:???6??d?????!?;7<?\
%4.?
c?m^LrXG????]?-?^KAxa`?=?r?????PLji]?]r?m?;??[$@?fr??A?wq??2Tg???0??????M???;XH&-??SOoP?z????y???K????Az4??fa??=?
?09)?   ???g???`^@??Xe?????{6?"?????Y??d?c?Q
V@??Q&o
?????A????D??x?9IP~???J`?Vrz?>#? ?T???xQ?q?jy?`?

c?F??Sb????D?<D?!?I?$???7b?

??6??J/?F?5?T????9???T????[??s??LW?????1?????5??{?C2f???B?%{{?<z?/?????stl??P????$W=p????ea1(??s?
?;?0?K~???g????????r9	??d?
:????*=Ox???I??,??? ??p54????4n&???1?p????????`Y<:6wNi?J??????T~1~ ?2m??]
??'-????n????
FU/?w:#?"????>{??~D??V?Z?x??52?u'Pb2+$sFn?E????????/???m1:>?f??V?*??????Y?????u??;CG???O??????0B??=Zee??o?,?uO;?2?8?S??>??I??[?
c#A(3A?Jxq??6P&???????IP>0?t??j?? ?9?,?4??h<09??Dxp(????{??u?V?+?????????5??a^3??L?|?????Bb1eAJu??d??H?T?L9sc?/??/q??=?z??kBD?Ez.q?mT???K?n?E?b????-??q?I?????g
[??? ?=??e?bR?BH.?q?vB	R??Q!0??M?aZ???8{k??J?4k^?S+C??H,???W?{|??????8?e???I??r??7?F?a???? 'hX?? ??iz??L???.??y?}?NK?#
$?????:U
??:???s2/'?5??!?`???c???K??p??$(?$Ca??[??F, ???Q("?-t??????#???-?K?&?E9??O^????t??)???)?y?|E?)??c/??
?	???4?p?"?"?*-6?#???(>?)??_?Z/??q??\???Ev?
??~J?66zmT??3n+??7/??R???
?^6E?~????F??/	?0}????P)?9BJ?????	?????+S,?C?\?A??"???[??0?U?????????F8BCL??,?L/?NZ'j?I?g	 ??W?eB??"??&jO???R/
R?p<????n?q????a9jt+r?G?*Y?g?????u?Ug??Ok??Y?k??P?8?Z5?r?? 3?'=4C)???5]???^??Z???b??G	?S????????=`D???o?{WE?vK??h?$??l?!?M[\?5???M?v+?	5?7??8?n?~??&P???Z?????fl-?'}-F8?&j1??274?Q ?c?@??NU??1S?h
&?2???t3??}!???uz?'????D??~???5,????l??????F?~???v????"?? Lw?;????e-?|af??(2?>??e!H?#????????(???o??osY??	?A?W??%(&/???x???RlG???????i??S??6?P"Mr??1V?@?}?-?Z?4??C at L?;Lvzke??7B?S????
b}?{?????f9?O!?#???????1??p?d?P ???o?,w1??????K?Mhd?'?I?;??)????~?NN??a?m
?Bt????#2-?bmS??Tcv?R?W
???<????????/???,????J?l???P,??a?b?~?8??.)?Hy;??Nz??????????????b!~?????l?x:7?????}?m?0dS??#??????-?r{a@???3??B????
?/??D.V????
?";?aV5?%]?	????w?of?q??9b??k????ph???t????	d???YQJ?/_??????:@????????K??<?K?????/??8??&#???U?4J?,???0Z???????7??<???}d?`???&?????<?\?)??m!?1???>???(??bsM
?
?$z??R?QT&]?5?8`??$??"?Ch??????v?'???L0X?8|Fi????????u?s7??l6??????CX}????8LP?,@?9?E?}???G??Z
?????r??%???|)????0
` 8????????t?HkL?
?C?e??#?f=g??'t???g?pz?q??v?6???t??6)???#???	?F????F?@??`i%F???8z?\|?t'??=OC???_#
?u?W???j?L??
?+?k5???X??J??)?f;4p???????7?_I??y$:??????(?G?Lt???|?k?q??{0?%?1#%??,W????
p??N
???g??a???<?(??D?8`?/'?`?m9!f\?O?0?l??Q?$u??,RAg?=???e?8??K????N?}1??A?}???B??P?8;???^1-???]??)N5????^?Q<???XL?	
/ ?[??d"s?Lq\???1?"
?6X?7l???c?\??????????????C???
???
v:?3????/AK??)?n?????I?}??m?#!Bd?(^??????9??D??M???b??aUD?D/w%\/???U??d^?
?P8?????9?|t?I??<?%)"??m???G?6???????X;J?l?	????k,??????A???}
?D??9??\*s??"\??"?"P?my??????f?:????S?=xO-???3-????????xyt?NB#???R?f_??Unb?f5^.?j??????????h~?Z??4????dL82??	??$?:h:??d???&
>i???q??_Dg?e?L???p?T?S???*???/|r???p?%W??J?p?8B??????????w?Z
??Hu???e???m????B??6??u?????????,i7???%Xq?9??*?L?????s??w??d{J????????Xo
B`??.?a??
????
?	??d%6?B?z
????b??<?8}C??J?H)`;@>E???>b;-??|@??}d0H???o$ hc??????1?4??]?M*1????<iu???Z?]??????j??*1??<p??U?????c6?
Zm?ih?j??#???Dvf?L?9???7<?\??^???60"?WI???bp_s?????????!?????F?{???Q??0r9??*???????n????????w)w9???q?;
R?0?????8iv?r?r6?Cgv???M??????a?A???w?????7.~9R??z?T5?X?:`??L`9r?]???yJJ}CJ?+bTv???-D??{b6d?YH?????"G???po&??sjD???A??R?;r?????%KL?<t????[??;T^-PI
???W??G?T??u8?vL`???/?zB?n?-z????	\????D,?W:?\?]%JvV*L?
|*^?????a?r?89????gu??9'???5f?yP'?e?q??p)_!?2Aa?!???%+??N1?o?k?[>???L?????w;???9??#"?????r???oZ`?f^}???.??|Jt]p??s?
?nA??????/?N???Nd??=O?P??y??:?4#m????E?8?A?LIX?l?F????E?P???!?4>Fy?D??^??aq?CO?n???4?Q?????
0???5??J?)??T???'?i?G??}[??!c?
?"m_??K[
`>??-?^VG0??|???L?N- Kn?/	????~9??tCv????/?S??hjc???(?uB?K?\?8????}?4?Aza???????Hr{VF`w?????q??t(?+4:??9M
?B?{?\b<2vZ??<`?(????c?@:??S?c????Q?????S?g ?2?e??m?DJ!?i??????"??GG????w???7D?
?????AU??T;??'8?S1PO??{x<[d599???tjSMf??s????4??T??n??[5?!?????+???}????LJ??? ?U?3#????=?.??5?????.Dy?d?}%:??-?f?*r?<i;???L??}:?%???W?????N??M]s

8?:???I?T????dx(?????%?????8;?&??D?.???7Ql?Z?,??9!d?WD??vOSo?n?r?9??g-OyY4d?''S??}?W??Tl???p???
?,<?r?F
=?
E???~??\?+????A????9r??&??&??z????P(????J,k(-y???A?????*?c#Zs??u????%??Xp???????b8m???1??Y?~???U????b
e?rI?;?'?-8`?k{u/Y???mT?9L8??[_V??0?.=??1?3?`?0u?x?????M??=?-2???h???????=??x3?7<I
U&
??FG;.?-ml?K?\?'#?v?4d=x????????e?`JXv?p?? ????f-?xv??l??1??s?'P???m????a???????AO??(?????????H????Y??XG<Q~R
?CPD
?p????L?8?f?????`n<????p?O?GC$Y
??(?`?3??>??????????[o?{MS?bZ3?0O(?mG?6????(3+???s?=SF{$?#d?7 *????2Ld?gt?0?M?Q?-??8??\????z?1!?#???x0\?*??????? ????C?u<
?I&k1
&P??R?~`?O?R?J???H?u<@?WR15*??<?\?&U??(8 ??X1??/)y}jy??f???P,J???????)?LY
?18?D#)?z???5???F?!xitV	?k??c?Ft????4 at c!?FbrI???@s ???
L4{]&A??W?????o8JJP!???9CK?$!2av=`????????h*?WV??w?u?N?DN<Zt?QSqd??h??F?J?,?,??u
??5Q,9?????]?$vE?!?;?{??YYn*?d??8$?????VG"?????dNg?<?}??6d?9?%?%z9?jAPz????}?N(?>?)B???E???[??
??-G?J0
]<C??	iV?[???????A%@?A?x?O?	??O????)`?HfA?VUZ?SJ?2?/??9??3?E!?\???c?????????????
?????~??D_U?]??$1!m?w???9G?d?Y`u4=??Q ?(/?~3??{+???Q]f???RT*?/=|?&&&???[???????t?????&|?\???7^??q?&???????'???????V
?????~??u3<.??6???,????????f??????K??i4?fkoF???????s?Z??9?{;s??4???kn?>???[?Kxfk-??????ijz?l7v??????~??;???x?????%?fnZ???-?????L;4???5^7;??W[???v3????/]?wU?;{?:?????y??:]j?z??e????(0?(/??D??<?~??M?19?mi????h%<????u???:c?????
??Z1??~,x??zI?a?Z\5l7?3??7?X??^
??uK?????~?
?-??S???g
%?(?g]???Z??U????nrl>?????????\f_K?&;????^??M??c?l??#?'?HM?	%R?=k#??5???'U?,???>???f???tS?n????[??a?,????YyZ
???LHs??8???S?Qd<z????
???v9?????????
???V?|U?l<xj??ZP?M11=Jb??:??I?q*:WdY??
??a?.?
??<p-+?S4???q?????"(kX<?q_??????????5u?????.?_??????6???????????#?9????WN???T??2?;9v??ZT???????g???1?????z>??D??6?6???q?2q|j???zi?Xt? ?z??2?L:?mQ?ms//H??[I???^??Wx???|]???R??a???1??:??7?#T?#,O dn;?i?8
98?J?$9u?-?GP&N??enm??????[?a%?*??I???*A??'?]EUf?u?|9?~???y???????f?D???[???"???A[?@!?????_
??H?c??h?;??G?~o??o???OI????7nk???i???? ??Rp?~/?,z??1??;??????8?q??*?}???[??l????J????
?A??????`?(g^????&???H???????:??Jm_?I
?p0e0????&U?|?1e?Ei4?g&1???waA?-???b?+ ?		m??(????????G?bS?y?aUgk?????:?Mo%?S/?|??F???2????A??u??7??????X??uP???a	???
??n_??{D??O1?ICf qF
???5I??q????"fT??tI?????i*?R???)?B^'?	?~V??&??d
??<?y??{VI4??L?0f]???0???P?????m:h.Q?t??8,?5?VV?U^2?i??:?4??}?B???W? ????c<?;?N??\?A???zhL?gG?=?(5,?	??J ?Y??+Bm??6?1@#C?????`*ME(???1=^9?????????y= ?5?'?5'+G????hT????????L??V???m??f|????[??yuLc?-?u1???
E1P?-}?0??$?
O?????
h?j"?D?.?`?iFq??	 I?8U?@??b?J7?`??t?4?B?j??ZRE`?6A?xB???
b$6`??tD??
?(?0
?H????%' ?8??a??Hj????I=a??s
A
?JWG?F?cm?)U| ?Y?T??,O?????A8i??i?????^??&	??bi)JR+????j?????{	?SM)k*?m?'<??"???}?<?8>q???T??K at A?	%?o?VB???Pl$?v??
???	?x???B?????a???????JA??????????	Zb??L#Y1???4B'H?pZ????x??#?`T???_?{~?>?|?d?O???c??d/r???dHb!?`C???%w
A?F??a?????xW?5?6?????|F`d?=e???J?)E'D?#???W??C?M10?+??Z?F@??HN(J?!??<MB???6??uo!(?^2?????q?|0Q>?A?T??qZ8??7?3??da ?P???)?1J=
b?6??L?1????. ?????N??Q^???
26%"?4-?t???Zq????x??J??V?![??G8???(fqH?dC2!
??d?UUUUUF?V???b??????*?)?JD?hqL????,??HW????@??w???)?9???D??
??7
 9??c1?!)Oa????:?2??54re"F`?91d?(?#?;??1???P??"W??????0??L?q9?\??(????4?J??K????F
??1C??q1???bXxpf? ?R?s?o???3|1???9??j??;??/??>???????gz`Z?Q?\??Fa[w?\?0???|"x?0??=?g>?s?`??3??C????B&??|#P?P??O???y??#
'?x??S?=????????@`??X???,???`j`~?????t?Q?	7???U?Pp%\	{1??R@ E??R
=W+?m?????~??U?:??`??RJ;<
h<#???Q??Hc?T@}?
??????o?p?????Od?C?
?!??/>
uA?eTHa/??!?Ga'qv!?A???????9?J?['?Mb?~??????????2|&?@P???N/?????H?%??_?0?$@G
??$???cZ?????SQ?AK&?UX?9=???????????
]?Hq?GH??
?E???C???nK???k??iE#?FT{
?
@>?V? ?????=)?
T}!F??yLb!
?????`x????_?@koLI?#_?~~>(BB?????@A??0???H?5V9@6q`XH*???"d????"?:b14???`?9????u?Rj	?.1l???2?
???XP??+YQ?#%h?)Ab??`??"?SV??'??B?&??Q3???YF?^,F??^7?_O?o??
??)??x??G?N?????????^?d?-???????????y??!?????L?{?CA?H??????????%?
?#*L????g}?E???????IE39???t6??S?(l??5KY?????? B?.?a?B?@?o??<MA?$D
????????4G?hQ??]/FZ??A$`kUP8?
~????B??????b????s?q???m-????[m???q?T????;????I$??g???????{>?p?j???????ll???H?Rz$??????????y^?#Qd&Z??[?ad!	?u???U??6?OT0?#?9?8??Am4???wg??[$2*!?Cb
?@??[ac?) P??'?????6????A??I??H;#G?E?}-???`4@?@??D{????(
???
??8=?????N?	??%PB?`X%?,
B?]>?
???HI?%y
?%`?a?i?=0???$?#???d?;
!n?????@l7B?6?u?????e?????lw>	??g?0?2)78?r?????'?;?k???d???|?J?d??????hTp???:??
`?z????b?%	*??_G?9$'??J????G}??a???@q??k??w*?0?! p?q:ed V`?`fC????]?W?
??	-??>??V?????W)??0p?'4???????(P??@??a8???`??6????ya?e???L?b2u8t?l???_9????K
???n=????32??O??????L?Y??A
???lZW?k?J?%D?UQ?v?????9???????4??je????p????T1?w?????X}??G?????d?????:??`s&
~???(?Y?K???G?a??????
??X???????:zR??"f

L42?bC??e?,;=?4:????;J??p???????`???)?I?ON?#?(`?}?
@X??Q,?h??!b}?~e?RRS"1 at V??w??^s??wW
???>???	$H?C?G??y?<	???fG?BFb\6?S?????Z}??*??	>???????????Q???G???????c???A	?J??'0?u?A?LC?O??<4(H?B?D??)??
??;e????d?	'P???t???;.?????5?
J??"?i??3300_\?x??O???Z
?{^}??X??F D??*?????S?
&?????
??0???33x???8?????Z.????<???T?rK5<P/?R?~|n?U?'4?g??o??0?????1S.?p/?D?>??????j??qm(?g??*?G?????_??????~????????(4???p????J?????u?3?cA??cY???dv???\!??~H<??d:DM`??G??|`??&??P?"??{?'????+3?>?6?????i?0??6L????T???U<3??????B'?~?5?Z!????#,?g?=^??fc?d??&J?<?????0??????????l+????n?zp|???%WV??@?EN?}(#?S?Q?<?E????@
9f?^?PL%?f3?]u?lGi?,???y?}?9?!?g?
??7???????6?&8:2???C?}???eI?p???-8FGB?????"!"?W?????>????7????D????|????i????u?(??bn'>?Gy??
>Yy?y?$Yv?????D?E^?G???HLzY#????j??aB???k ??h??Wz?Gl?s?`?(???C+qvb???G?-??r/?]?????F????d{Dmd%??I???E??C?{???clA?|????8?y}?+???%?rp?8?H1??D??~B?U
--V/??hQ?Z?>@???2???E)?:????C*?J???Q?/?F51?b????? 6???d??R???
??&+C6??/??????o?
??{d??1l?]?ShT??-????@?Y?5????)-?38?	???`?pp???;Of??B@`1??y???t???B???? ???]A?T?o??O??Ie
?z=8???bxy??yU`?h?
????g??V??q????%???@"?i?48??
q?8????F_????	??????p???NzEgVIZ+N`"?J???@?u9??*?;dXZ?D/>
9?E"`:z????????~?&GS
????x?
z?ZW???c?@?7??????oOhy?h?A/?4^?oG?|???d?W????^3~hC?q?????M??z????????*??}g+_&?Y>?~???mGo?[	Qd
??i???R?<pA?	9???nCh?/H?F????ab?&???s!?????? ?r2d??????????? ?|D?A
???^M?9(\????????	?	N????K??9???R????|bB([s??:a?)??(???cLL??a???HG?D|?<????q?3
??#?????????/?7???d4<?#??q???0%?8?l?)MR|?,???~?(2w???L???3???hX?1O???$)TK???? ?H?C?d????
w????E??dA?q?????*?L????d??GM)???%P8?~???????????q???0??_?;d8??????d|?6g?a?6?????ba?hl??n
??,~GB3SJ???N??P??????\?l?@?????^.w???l??.o?.?B?S6?+??o???????<?nX?3?wKsH ????5?F?Nc???E?;??U??q?????????????Q??A?H?EL!H????CH????kN>b7?[f?uCtC'?,?(u{K?
???~??????srhg(^??K???f9??
h8???d?dww??h%?
Z
?,?]???&?#????${??\????
????}cvz\???????d?=?>?Q??????????Dq??????????(9??
A?W??dO2?iH?`W??m??,?J30?n??A?*5??????]???}t2XP?o???HBY?~9? r?H????M???T?I??&G|????k?:?Q??????`1.<j?PBI?Ud?1??????_?z|>??*??~?I?[??$?<V]???{??L?
?;E?????????6???GS?F???zK.?????=???fj?kf?N?m?W??y?`o???8??`??/???3?-??d3!?|??l???)?)??'??_L??3L?rGq?$??tR?g?????n???_?_?3D?
E? ?!(??p(?p?b??jm?%??s???	??"2)+,? ?a?wbI???N??????$?H???"}w{??M????]????L?4HA??P?34????I?+0????z?Vj??~`?Om
?d??SGp?9?;??1P~?}
4???@??Q????u???o?z?u????(?s??P???BP???z?=nC?v??mGA?Cc????^x``????c}lm?????
??!???>+?X?Y?????N????????g???I?ZZ? ??b??N?w??y?0)?tJ??:;?d1???9>.?%???uQ?nA???zkQ&z=&)i}??x??>?Mm?x?&|?g??f?H???y?5F???N?}c??9??x ????K???9u?f?t??`???&c?v????i?????W??
?6??-?4/?1?b????ED??F??W8??q'???$S?+?C:?? ????
??~l??{??:7Pgt??? B?:??m#?yC?f?J?j?n??6??&??6=?k??xR??s???k{@?? ?EIV?<?UZ?Eu???????EV2l?u}?V???o??7??D??4Lf{?M???<? p?q?????1???9??X???
?$??P(>?>?D??7?~`6???;?+?p??hL???p
???#??ZF?>???N???}Jr??iP ?0????A?0??~-6 at S??fL7C??tv??????|_C?O?????????yp?????`??>.D}_???,!? qOc??????Y
?_/????Z?;~4???}@???i???/???EV?????=	?yf|\z^b??b??p?"
L??????W<u?u?4???D??o??id?~?i?}???!???i?V???l?Seg?Eq????Da??I
?J?%URxX??s6\+????}
??3???????h????d??pWq??????L`???,&????"I?
?L??O?	?e)C???i
?????M??b?CxB?
?????52??n??????y at 4???K???>>??
??Qo;????? ?&8
?!??+K??E?
?
?
????????!B$a??
?????~??f??<L?
?qg?Ps??F??
f'4??????:???~u??&=u????????L=???Ff?????ADen?P"?r'?G?
??d?
?5????????*???A???9/??C??????
?i%?wD?ZmhS?SH?3$0???M?m?6q?2p??B
??Z????W??.????/??h?d!??J?94?Bq? 6p??Q???3}e6]P?_S?????[!??o???{????5 bX?e2?~%?D??mLT?
!?-Z
??A@?v?j?CC#?]W??dHV??w????ms?2V034?oA????N??1?t9?F????(w???k???r($M??=??S??i?2L??x????S?}?U|??_??|?E????_?A?0????8TcE?????]i????
ptaG%???"??u??????v??????***??3?ubz???wT}???'@?????#;|#t????
?%????M?p?@?????A
???????P?JVq?`???G??????n??R&c?:?_V:????f??mI??+?ZTQ?zX???V|wH???H??
I'???spa??i??\
?1%W??;?????????????u???g?A?D
,*
DO?/?=I?<??????Mi??_???r?X?o??\??????????
r?
??0j???????A0b??i?u<f??EI?(xOS?[U????T?:????
*???T\`?."??i?&kq??=QR":A??kv?????R????QI 3?????????<)?/???????N?????-??I?/N'q?Re_?~???????Y???n???^???>)?????}? ?sC?R???f?8??z6?B!?LW?vK?{1????C=o\Lg.??3g?C?i{???H?$@?`oO<?Z
.???)Q???l??5???1???
?????Y?2c??f??3?????o?}??O>kU?5?&??{??X???L?P'r????	???P??~E??MZ???%Yy,EX??????????L?iF?J?EW_X?eX
?s??W??V?FL?4??N*)???v1?kI@????S)???$x????[I????(!X??
?????plm+$A?(???"??q??`??_p?6???e2`?P ?I
??~?	$??g\?m\??Q#??Tf.TA?}+	m?????????Ig?fj=?t?k????
[q?]?;?{'$@y??F???1($Eu4??@.??W7)?%?$?N6?<um???S;?6(?!R?	??9A3NO?GB+?L??V
?8?_???1?????x????n????n1pz&L???ji%?[?:??sN??e???\??????JJ?:???vnS??v?19??{?.H?4?}?wrBo?k?2?1???P???????w??{u??af?i
eS+??"I1???y?\?????????]s?D70L?
?MU?dBtL{4????2?4??? ?????N??mV??4i?`M+??%B???)???6?O??????????*???l]???!~j??*?q??<??M?]1??&,?,?w????1??Xb??????]???Y??>,q?a"v???:??2???<??i{x8w|????????e??
$???????eg??9?m???WQi?????geg???B???|??f??^::?T?d?V?F?n????}5?????O?[
d????Ia=9??Qm^?m?\??Wg???`??????d????M????Jl?`??x???
?%"??5}?~?l[??????????~??7K??4w5P?%??#?+???
?MQ??=??w?N?f:@?8??w?rM>31
??>?=?{??4??'|??@????8,??b??F?T?rd?94
?? BS??@JJ???)??T?t??;??
!"|R
?C0H?!??A?=B
%D??%4JL?.???
C?{~
r???????[1?0???#??R
#?o#{???a?s? Xj?'?`?},
????
??~???z?c??Lc??????m?\6????q??[@Gg?$Cs.???VD?R?0?KY??????Dtq?E1???L"???U@??????-???0?>a? ?^?????oY ??p/???????????A?k6H?7??????O?>??y??!?R~??QDv???'4^b
gQAJ?/?4@?
??????g^???Ru????x??????N?z?q?$??[?????r!?UDK????""??h"??;?>?(???
?s,>B???????3????????f?KaqG?_??Cm??????9f??h??nG??	??.????0?p ???&??A? _??z^?Nd?,????b?l42??C??o +????)?P?????&Ca_G?Pu??????=?w1]????w?^X??[
?"?@;m?????<?????H???e6????=K?"0?2dA????g????]?O???????=ME???J? 0???????uT$P<
iRC?????????L???1M1D@2??Qw?? ?+?$z?????
?^:?Bf?u??KA?q???!i??]??(gm???y?S??f??T?h?-]wU???i??
c?????@????2?C? ??9>pt??$?-&??Zeyl???(A?b?Xyo AG)??g???!?w<?g??z??Tp??~x?}????)?
????0ON?`???rj@???o@??7n03hE)???????r??<?&??{???x???"?_c??@?W?a??B
~"?h@5??0??33J?h?\?d?W??]s?P!?V?
T?%??JA??O???;????A??p?{??)???A ??0??x?p&$w?=??|??9a????s~????!9b5"'?4w>	k???R?~	??s	1?V?d?
??T?X???o??U0y?FD??1?c???R??7J|????????c??Jf??pY?N?
?XRI???f?z[??	[?3E?k??B??_O/????^?*@??@?^????F??T?oBe?N
?H?)?09a"=?y0?&?N?J?Jp:???(?P???^9????ru[???xn_\?=??=H|????kv?W?}???z#?????E?
?p+j
??A:w<?`F?^AC EhN?F?
???U?R?
???	]????	???????3	o0?8a?[EB==_?~???[?E???HfV??l[??o?FM?/;G??VC???
?<??~????????a?P???^qww?'?????9??D ??????rr:??F,????y????8d5??$?`FD???f5????Sp~?(4???TD =?4h,!p??N??u??????r?V?}7?=?H???D??"??A???G
?????
&????8????W?T?v??[?3?!??v??>&?~???ms???q????]k?,???2%????.???c??]|_??8L????????)?(+???k?Y???
?`?d?%&?l?3???a/%?6 ???C?uA?y???+??A}?&?}???{?f??]?m???fuV7B?>)(W????(?'`??:9S??@?3-????????o>a??A??????L??k??Y?q?(???3`? ??5???r?-lv??s?`?6L???M
???{Hn???:_`?n%?%K?????s????@r?r?t1?????L2(*:????t0.f?a??3
?????olRr?A?$i*?
???,R??$JB??*??????c[???
nK???2L??	??
B??'????????/\?f%?(!	?Ga?L?Mdx2sg_?3
,(?^vRb???.??g
?>??2?<9g_[?!???p/"?????v?y?&?^'????pF?v??l.F???B???POld\? ???=????1???G??.??f??~?????v??????a?~???%???G??X??Z
???t?T
.?|F?eSK????? ?4?{?????q??x????o8??9??????]^?%?b?Ks????Y5???&
	?3??4fv?????????f?q?'b.If??`???????Q
?0??J??I??N????/?????+??`??'?Oe?A??xAl?H???}?t?????h???e?'????k?2o?5?%?q|?9`63????u?q-\?~W??$
??!?	A
??????w+u
bu?.'????53n?"H??Z?????r>?????j?j??B at h\\m??$$)?????0?.T???w?Q?|??g?????=Bn??t??????_???=??+??w{?-UUUUEUR?EQ?2???
q<?!???D???)I?%.??;???bI?????'?r???tv??g??g???s3??qE?n(??bN:b????/??$??<??.??4??O???W???}???????cf??4???????? ????'????D? (K??
??G?A???
s7????4F>C???ro%B?%???$?????Jf{fp?g+_ec??w]??\K??k?????s?????? ,?x?;w???n?MT??5?o??"J???O
??7?.?x~P??rx@???>@
????'?d??????$*`??r??2?`??2*?????.cb?Bh??C???????_???P.??i
?Da???
?X?/Ie??U?&?a??7
|JJ???B???g]?2v-?+e??1?%?76?V@???y??n??46IG<??_D??0?@?T?Z?"??Ev?o?P?????1?1??e`?????x???X?"??g???ex??`?#]1?caS???
P~?(@??2???mf????4d?hC$???b??q????J???1 0?G?b\??Y0DS}"?[??
''@?,dd=?&n?BUX&	?	FH????D?Q
??	?
?
9U"	T ???oB?S????!??
u?U????Rc
?A?????w???9??bz????????333gm??W?q?.??f?k??????????x
A??
Dmp ?
I
Vf?9??|??v??p?r???<
?	NU????9?'???,????w?
x?/???@R5Aj5?R?a?/??#&??"S???r??????pj??6*?z???vkZt?y)???J?!?V?+?J?F7?????Y??%8??9x???????:N??l????s,??2????????????lA.i[7?????<
l????z???6?+54???Z??A
He?d?XEGJ? ????????????????9?	-?U?P?MsTf?2[*TT?
y"'	
?_??)#p^vC??J2??
???????hq????K??Z`??HT #??I????CmA??QwwmOUY??
fE?2??????h??F?i
R87H???????1?
1???'??????
p??A??n???9????S?Nf???
/?j???Y?Z-??
???7??k-?UUJ?*M?????g??_	?q??;~[?Oo??W3w????07?????s?1?l???7?????h?D@?gs2s??~3??S&b&9?U??9&fq??|?mo?????DP?h??;???o????}W????G???<w?<?|?????????e?Fd?????$?&
a?????}yA?[???>1UX
?>?6rR??]f??IAW?i
??mQ????????O????)g?L0??L?:S????Z??y??%t?$??
X,&18?y)?Ts??#?G?!??D??q???6?=>\R(??
?w??GB>???,?J????l??P??{X??=b|??????"??>G2"??I=K??I,83??=:n???????????7n?m????????}DY?a?????y???gsq?)?8???V??????????????r?p?UR?me??????????*t???nS???
?g?0p[s??9omG?G?
???Q??Fc,??g
*?-ua??81???3G33VWe??-???8?s??s???y??X??N#?n?@??	?-?"`??8J????
t(?????
?%?m
???Pb?N??X-Z18'??:??Q?V???f?;???d1x????M7?wD7??j????2?&?K?lw????V?????'?a?;?<?&????a?"?NuP?c????gt7/??T?[??w?[?G??6%?Q?pf??_:??=.?;???u?W??m??>?}KF?p? sj????	???ff?O=?Y?j)*+-a???5U????]???I?60?c???(e?A??s?D????
??p0??HBI!?N+?$A>?]?rM??h`?? ???@????
r}?:??@??????$
XCEA??Y?2????{9??$M?M??C?'????I??XBaj
c??????i???F
?D?x???"???b??,???z<?1??'??F????}????????G?2HA?w+?iV???s???????l?>?od7W/??!!?!|&/??w%Z???w?????Ab????????????-??????_*Z????|??l??c??
?c? }CR}e?y
K?RV^0}??}?$T0l?`?#`???d?Y??J?E@r?*a??? d???|O?`?????a?d#???|?Q?>E???V?=!6h?3?/?_
0?`H?a(?g??	??????f?>"zQ?T%0??
??@?Z?F?
H?W
g?0Jvp???A?/??_??
?????0(d<@??}e???O?
??????`T
?+N?qEw???@X{????
("??yt
'???????E?r??j?(???.2BB`"H????????N??fXfX? ?*?a??h??1j??&?S??V?s?W??8?<$$8?TLDc?A0Ff4???a???K,?,??-?%?%??--?%?F??@????u??75?
?G?GX-q?????{??Se?#?l?+6S?A??eQQF3?#X?ac???3#?"??jIb*??????`?PK&
{??A??z?/a?'???h????W?fQrB???B?0??
@?~????????A?%6@?d	4??u}?c??g?[?v?(x?{'0????3&,wm?{
+&G???v8-=K/??M$m?Kkcc????!?Rd???;{Ni??\xlZwV?9
?????:??mq'=MX??yxryF???f?E??Y??I'??#P;?????o)??'??b?? p??Y??'?E8
?en4
?
?S?q;?'???z??Dw??????#?)?:j??????*'x???P(?/?#?
??*[HD?u?9?
=O??P~????
[??F?6=&?+?????g0?m?M?bQ?O?(?d???l???%???????H_???
R?y???1L?!??,*4?!?
???hRyd????`?iZ???l4h?????%?HH%(???=vy????M????=?^?wC?
?m	$?
?iJN?5U?0?/-\[??85(r3
????l:?X?e?vE@";HBf&Ji??y8????{??]?C?A???_?S??A????P?????K?vv?)???9D??9 ???$???????0'?0
?a?$???l??B:?9	?`
_P??B??Z|?;? ?0????w?(?????"B?????>?v??E?p???%L?P)?|yJ???R?th ?e?!e:?S?d??????s???hc!(
(?N?%?\?w1?@???a?	W??vYUI?nK?F?n?*??g?r?M?bY@??PAc??A????B?B$X????}??>?*???a|?&?y?4(,~h?]?_"?!H
E?K???s?
Y1k 
ETG????/?4?>??yH0??N?kS??I??eD?4????3??y??????>W?[?`?x!9K$H??6?hY?e???Xy??"??n.?B"?H?&m?4 H?
D{??x???
??4M6^Ms?3?(?x?K?21?hk:?.??????i?*!!???+?T?XRdm??F8?????????h???l4f?"#K0`.D??"?ra??6z?C??d??~????E??U7??r?b????a?????rm???2o?0BT
{?y???"2?????E????????1f}?Yy???
?~?f??q??
????;?????c!?DR??<??I?/?B
?1????z$?
?x)??9R???@?K
??
A
7?o?????X?
yE??W~E&GN??U?FSe????Zu??j?????????
*u
KH?
??~????2?????l-?r
A[??i??s
2????;3???5S?)}G!?( >?.???
???Fx??<?p2?q=???	?n????>??_p0????ks331??0_???}??_??J5?)?}m???l;??D?F,??(bI$?I$?NPho:??????1'4??B?43D?	q???$@??M? O??{??3of???c
??cM??????!o.???V<?????2?????z??D	?6j?????????}??UT]???vD0X?G?????y
YR_Q?	?PRP?? D~???e???
?c???F???#????????????
??v????S?\!?????3?v?L??em??4??jjW@L?B3h?78??u?????s?ew???a??????uY"?????"?	2I1&V?@???>OC??;?9??4$!#M at IE	R0$?)M?????@??X?
???T?@
????]l&?%#`~?!?b???E?%???O??e9??O?J'"?d
=?|??$????q???^T??"a
5!??`?*?0&K?j?$???F???????]??jB~??ab`40/?6?<0>?	?y!???2??9??;???y:e#?(W at O??JWR%??i
??????m?+??%!H?!
$"?????%y????L??]?G???Ch`?6?&?Ha???q?L???$?D	O??K????G`*??$x?o`R`??+?
U??Z'?vB??7??>?, l?X?Q>?v?]?!????8????*??L?4???4?B#D???
??r#??x?8??!????Pc?1`??(??0??N?Y ?C?*?1?X??)??????	j;T??(?
4J`F(D??XD???@{?x?q?(@?
C?~f4??JZw
X`9
X,)Q?6??)0????p
??K?G?pM?B?Hf?Pj&????????F????f{?z\?=?r9??3?eG$X`??#E??????ts????t?2Y0??^??4??)??@9<??}C?????0=??g8p?9?"e???Kj?&?????+t9 f?dA
???=???D??y?<?'?3@?5??,K??{~&W??????b?b???ttHy??9??P7???w?/u???rx{G???u??jby7:Z??!:?y]?
m- 4???sPOL?W???D-0/oN<??????n?{??.?!]
??$P??????:`y?\*{$??%?!??a?M???I?5?#3??????2O??N????`c?????f??!G????0J$?J?B?????????O%??{&?1?"?? ??o?$?{J?!0?!I
??*??B~,???XA?]?_??[? ?k?
??????!????p?w????-????B?}??o~?e?(??????
?B>p4?k??"kH?????)Tz?l?cpqXQ?'L
Y?
<:?
?`z?v?2
??	w?8?M
??jB?V??????H0?<?&???(??Lt
?#`?!\)#'???????x??e?,X??????H}??=?>?p?O??$?? c4{]????0?z{]
fQQ%Sl.?F??????S?o^(!?;????~??]??q????;?
MF"0??0o?D@g?%A??NdP?+Pt8?3p?|	?%?
.????xtP??j !??>?Z??????@?t6??;???;A?P:#+???q!IQ???
???"?)IL?? 	??"?#T???R??t1?9'F3he?)??<????? ?/2%j?Z??$??`??!?????F????$j@??aXah??9??:?j?J/K

??d8?!?QJe1,?,M2??F??1?Kp??l<??w+??n????J??<????E??????a?|#?B??????s?????z?4	pH8B???@V?E?HL?Q?DB	]?kLzD??60d??CB???,9>?z?=B??q???Bh!??m????@? q<?g?&????;?W,(?!?&??9
?????9>?6*??f??!?
Z;S]?r????????O???W??|???,}mhs)^?????[?H>e ???AY*?1?}??/???yw??j`????)?,?}?[6J_A2???nc at OZ???(P5?7??????#?d?R+I?S???
?????? tG?#pvr?i	*????	??9??x????^?}??+d?
?A????R???? }???!??e??@?IH?#????I?
f??3$tj=????Vb1H?t*?? ? ?????N	tD?
9?M??j>???
??O?
?P/?>?z??<??c??)
?zg?"?Z?????"9<{?[???\??>b???f-????Dt8????
???"
?????<N?????Q?h=
?3????jp???nb?5$p????0?M	??????x?????d?]}????6?q?????{b??md?8~???
q?-?\??TuL?,?zA?qG3Dz??????]_?c)tV??E?1?????*,?&H?|???F?>?)?G???	??r?'$L1b?i???rr????T?%???$?????-'\???????Vj
??????s??y?),?]?y?3d?s
!?F??EYbxD??AT?
?g%v???G8R??S???`P`7~C?????-JW?????!???e??????Fx?ao?jZ?^46.J
(?L}3???I$???G_G?$\%B??U?d?@?(1*?????G?.?{<"D???$__
kK?X:]?????1>??;dus?9'`A2dK3??L!BC??[??J??>D?????)agW[???`%V?;J?
?~ p??6?I?
y9?^n??Pp??A???3?"?????h?c0?b???q???in2kR??Y??2???[?c?I
?O?
{?Q=
G?4?d
?????X?	?Y??L??h??/???A????0??+??9I????H??$?s$??Ah????>K?????|@??w?r?F?@tp??)p??'!???#?????a?^~????O?0 ?}`???d8vhy?.* v?????:RT?oi?????`d?<(D??s@????
Vv>A?08?9?ZF?*?d`C??+M??6??M`Sq?XpQ????x??;?i?????.???P
!dZ???BTF?(Z?+S?X?d??????
????P|P??c?(??<?w??!?:?il???hL??W?a??
??l 

O_h??8z at h????8?q?0o???$???^???0Y??|???McuB8,?5?y????0???C?H??\?C6?
??O)?E????k??g????*?o?.@?i??ry???wtz???U????".9??.???}~kV?<?g????a???N??'??????>7?????????_EG??w7??SV?????nl?????????i?x?y????;_?~M?c????N??+?f?#??e???rD??eo9U?3+J??B?3%F-p?
?|'???|???|???	]%??S??????4??1?????m0?3???t?????_s?h????{????????z?????DU??u?oj??q???rB$???;?X?3Iz???^??=Q??s??=??????#jEh?.-???FR???J.?l????ELWyt?N??o??????1Tf??O?3h$?????????????X????\#<?;?m=??7?????I?*??v???U?M??)Wg}?)?=|D?z??????????o/????'?P?42????T??F???y?6?=V?[[
????o?v?l??2?????}??fh{^5a?????3Y?u?"??Q???????9?/??^hb?P?=??;)2??????????+?gy?E?
i6?4?n~~r?5???g6???????Ad?t?>??L?u?dm??M??_y??I???l??2'[7????C7/5)}*?|?XfcTw?????C
B???f
B?9?|????eW?ET?U%UUUQBSPADDAW5_?"??-p7A?t~CY??&?4\??`t?!F0Q?G?`??0??;?~??@8T??Of??9f?BZ<T>???????v`??h???
??;l ;?o*??
j4?8??B4B???	??u???????85??}?2z?????!=jH? P?<
??D>+???????%?-?'d????0? ?%J?k,?`h?@y ?j8??B!*hG0C??`? C??8??d????Kd???QT7
DP?z?????
?N???0
??;`???N?(?x??
?6??)?xB
Z??,%??4#J?iY*????*RaV?????
D????X?
B?)?h(N?68?????G???y??????
AB1??C?
???"????Q??r?
?????+???zu6H???? *u
????/?C?<}?OA:??^q???Qp0?FMWaE^???D?^b??"??
???????[?(?B1???=???/{?\?????y?qGE?"
?tU?6??I????9w?DK
0;????	@?[V?G?
?aH'BH?AX	.B????
???:F??<??}?=?1???""<??2HI!LD0'C???<?B"b!?
?8pA?s???D??D?W1?????b.*?&??=?;??|??983?A`??????HC |?v?`???HR(`eQ'v? ?'A?q?"i?{H,)3?H?;?c ?
????a8??????5LDh??T?????O?A	???,?)#E?DQE'??D?????????Gh?:??{n??%?????
???1?
????`!?1]???<H=(Z5c?M?q?r??????j??????(????9?z?}?????0?Y??!?:?QdL???a?0;?!O8?MG???
???????\&?Vbn????e4=??????K??mp?kA??v1K&e0?YF??????RmTn??t_???f
?u??<???9?E2?ho???`?J+X?AS?Z>E?A??
,'G?8;??x?:??{yn???:?Zk??o?'=
??*???p??!?y????Y?cV??
	??8?!?#kL?!3?_???y?C?,jlv?#Z?1a$????????6??\?:?Zur
??????(??J ?(?:?'???(?E$?<??S?9??R?(HB50?D
?i4}?????m")??????????7??z???9?K?Q1?\???!?2
=? /?Z?}?3b`H?$E=4!H???????mBI
??j?;??$"?"??H?@ B?}0?r????h?pA
{??"????W8`???9x??G?
??.??,???S&?{y?t?x??C???"~?F???AWa6??gW?????:?}???%?L??Hv??i????? %a??Jj^p|?kBC????tB$Gx?
	??e??	=jb(R???2
h?O"T?u2G?GE>P????G?;???S???Ca?????hb"???>?	4?b????W?
H?[???????n1?
?/?5?r??5Tx?`??^?3+	?)???)?U
?a???cD4??,??7*-}??:1?g?????sgQ)??
???&d1?-2????q?ZQy??d?
7?\p?j7Y
\?X???[??F?"?????"A?|?Zi??A???L!????N8??9????
/????:??1?3?r???l?????lgP??&?&#?riC?(???????X??
 ?"j$i?"????M??O???{?p4?'??E?P?
???	??$??1%2?,???xQ]t?3?CTUUQ<|?H????\|k??3 f0?|,????!	?1?!?d?:C?X??s?h???V9?	?s5?????????L.V?,???#1@???v?????|?{???a77???: ??Q?h??J?3??#?6?x?i??
??#?#??H?3{??????&??\??????BD?(x??0$??3R??z?^??|6 
~I?d???@@AJ)D???bj??$Q.??????V?1?D7?%O?DQ2(+???8??,N????C???r	?? ?h??t?j}?V*l?V?0?d??N?};;?n???a#D?*
$A(??C>z??Y??o??o????C??ZOJR?u??h?}?p(??????@N?
?Y y?eW?E??????D?JM??|??V
?i??u!?4:u}?aa???Q?DJ?t?ML????X?*?A???w??rVF1?I?m?@???P???$G????5<K?t?????P??=x-?TH=???h?G ???<O?>&?n??-iNF???M?h~?
?"??+ n:e?J??????1???T!??>?8???c????F?.-}?Q?\?????????L??^??
??	L???>??"0 z}????0(??$9?<
x |??")?C??%???????Jb???B?@zo???d b$?)?_????k_%T0RP!H?:?h?D?????05?(??e?U,???a??m?:??}?@?!???
???SO5??@??3?-,sa?? "??`?3C?0]1r?9o-o??{@<}???^0#??,n*
?'!???1?????K?6N)?A0dA&????XZ??#b?q?u(??L(
??l??P???a!?
@??O???ys??.?
;??:?????G?C$"?,$(?
??3????01}??!%4????P*??>????l{t?57?v??1WX???|G1??Az<8?K????l
?"????`
?F??`2??????F???I?@?P}??r42a?
???R$$"0R??????%??YrI?9?50Q?1,?:?7????BF?<?n?b
?
z??}oRT?G????*r?
|??%S?($??
CH?i?*???t??g?IBR???3???>%11???
5i????????K?!?'GU

???o??..7?Ta09+?X-6??"???
???2u?????????c???|?$?????L?A?????!?Xt8C??(?$ ??????
H??????M?y?<????gi??k?
????4n???G0?F?[?`9wA???1,Q$???X?E???????[C? '???H@???, ?W&??
R?.?]!?????o?e??^8y	???E?8LI??D?D+)4H-5)??$!?[w
(J?J8
@??,?0B
y	@?@a?
r42)B	?	YY9??L
?@O0V
??^r?
A#?H??xCHG??2`??""??
A?w?s?f???af?F?S?H??????Jw?4h?f:vB?PY?????A?&&?????a??;?? ?#???4?>4!????~???AR at g????k??,?s<?3`P6b>??R_z?#???????p???a
?J?????|?!K?=???{?"??????l?:??d?A??????h??F?9>l0p2????/uT???^??U??ll`???;?{??	p$&?"?<?pz???????o?k???Q	?Y?Q%?W?ly??=_f?"}???D?C(?
J???1?

?u?%Fv?????U;?,*$G??%??????I?:???*qy?CJB????v??d?[f?a<???;?]2??S??,?
??H,Q?d?"	???*?????a??3????5??
 ?`????$3$7	????[?3??m?r?W?N?U?K???s?(0???k?q?H??0kV?;???????>?#X???I?w8?qJ,"B?
?/??p]?#i?0??|????#?D??
6????c??I%??j?""?f?&j??""? ?""?""?"*?(????????????""*? ??""??=?}!????A!'??!???%1E???????&I?P!??E?%?1`?Lqk?a?0`??
?A?0??b?X)????7???Vq?JjMs????
?'A?O??k?]???7??
#"
?:?bZ=
g0?9hMC?f

O???0????9WQ?)?'7??1?#??)(?<?? ?	
0K ??
C???3??????UD? BJ???Ai??[u???(c0SF?)6?DI"????
$??pQ?*(??T`?L?f????@BL; 0??c???	7Fa z?<?5???5"?R??
??>????!)??D7?
?Z?>
Q??%??0:M$?D?4??C(?
q"?????????d??	=?)?O?(s??_?9@?????v?oJr;e?
{???$????*3?q???R@>Fg C?PH???P?B
]?=`??R~?GK??????@%??pJ?i=????D??o<y??A@????Y,?+?????r?,?H1 ??}?$????F?????I???*xFHO??J???F??C\N??RxF?Al?D`?yZJFR?Q??`H9?????y?Fc8&ftb?]a?t???21[)c0???0CV???m?? H?????G??d???F?
:????? r?
????c}??M#?=????C4:?Lh??c??e?r?c???0???????Ap????`?KF?????D?CN&??&?1??_2w?*?????8?a
??????k
0,j	:'N????D?B????\??|G??#A?
V C?B&Z?B ????????F?
?YFxg?xx P??l+l@???3F???)g?Y???Kf:4pI?w$A3B???vFt?0x	??G0?=?5?@B?yva??8?j?q?7D?+I?J$?i[?aqT??5<8l???? y^c??X????? s#YJP?B????fK?Zo???????l|k??+???
??`??Y??`?C?"21???Cb????0I?/???L????P-???=QM?uV????F
?l
"?D?????????<	;???{?U{_Pjgt?2??
 )???d8??,f??%1?m?M??a???????B?&???v?#?k?h9OY?
???$v"??`8?#	?????lD?????7???a|????? q?HK??>?BW?|??f?SW?ZW??A??=???-B@???s??	??*V??? ????s?5?M|????????Z?I??}??@?)0?J????W???????S???cK?H	K?4
?d?8*0'``??e`
$"A??a?A
1(???4R

!@?uZ=?P9?p
??qT??
Y?fB????y?^?~#??P<c???9??????5-t??(?aJt?C??|?b}	??
>??p????H?#???,?H
$X{e?)@%??U???
 ????fHBn8???kT?&?????K?aC??9"B]?f???1	X?)j_???J6?#?I<??	??S$??ns?l?n
%
px?
?A??0?tB??L?,?	?QqC&???b???y??%?=}]]7?y?WH<?iF??>0??G#q$?Q?$0?d??L??N9I????k????G??s??	4rpttQ8?7C?Hz?]8+	?s?P?h?	_&0?????C?>????}+?!X-?????B@?=?&??????????<????????????
?????????j??2?Ay?????v???Q?
"P??)??Q????
Hm?!?
???????
?Fc?E??7??1?d<b??
?c?8?f?20?a?6U?Z?}???I?ga????i#	???&?.???"N??7?w?Ddfw-??V,hr:??2??p,`?????zqk??s??ui?l???HV`??	?4????????L?@)?aV9;S/????#Y? ?4w
)Jr????a at w????:??@?tP:#D???k?#??
???O?T28??9*
???
?.6?F
??1U??J?]e]Q???????p??96?E?s????nsL?E	??D??n?d??s?,???
i0HHuGA??3???? ??X?]?V??SsL??\??????A?F???[??l?????kW???????$??
?z??
???2>???%,???y?I???(?u?6?o6??;14Bt! ??v??"
??_
'y?<??????
??`?,$?G!????j??6?????<,u?
Y?%?(??1??{_?LF?;??y???YCI??[ai?uXn?1,?(????iP??1:b&:????d??l?N?[?0^:v?????,(j)Jp??O????????a??0??h??a????????E??d??$a??b?4h?xM=?'0??_????J5?Wk?7??BWM???x?0U:a??N?
0[????#f??N?I#??%z????????c??a?\?Z?	??J,?F?????$R???`??@:??!??
+??V?d?
T?}?	<u?a?g?3??p?W|?=??kX?~h<?iA??@i????x??\;ds?ZoX ??r?i??2d?N0@m?z]?S-Y?y	Sl8?????)?X?zMX?yY????V???X?=Q??[r??Hs84<?
G?:5??{?Z???)?t)???0?MM??D?pL
v?#?nY??4?E:?%??%?c??
`2???$?x????<????????A?c?d?T$l??/]?CI?z)
??I1?vq???7W???9^?r???2?;??4?w?ad???7G?(Dk????dv?@!???v.vv?:??????h!<K?v1?SU??b????&]?Cil^?.?9(??-???^z?X??6>e??k?:Fp8g????t?p???????O|K?40cw{?Z!?#@4$?R
??K P?lr??T1.?<??d?
?C|??J????N?64?g&D5??-??2<
E)H??t?	?FF????8???%_n?I??O0????M?????Mq?tJIG?]t?b{??.?
?`??'??;?2?K???E????]a????#???8`G ??d2??? ???y??81z-?????B??O?2?9??k????pO?]?\???[,??????m?s??y???:??l:	D	`?o?Uy???*?YU?x^m??+?zY7???,??NT??08??0pFa?{?)41?6t3??,?T%?0?$,`b??xN?\`??h?(sK????l?p4??c&z??G6^?* ?\O?????]?
?????????????Y:1h?2Ec?????n??
???O~?rf???

?_M?O???4?????0??]?y?:R????
????|g#p???q$t?D?jpu-6??<??B,?????????6V\?9t0?([Re??C>??0?7R?NV?1???'???|?NPh?K?????$?(??t??=??IU&h??C!?!???0bn(?9????mwZh[!!??b??A?C?B??=?k??f?~.??i????<??'9?????/yc?????a?y4?Z??]?2c??s?.????t?Q?Rim?1J???
?B?b???C??2i?????!??*??E?O.KKs????
?az???^?&????U\?<	0
`??C???E??CB?n
C?.??y???8?M(????f?????Nu???Y???T=~??)?t???)2??"???E	{????l??`?X?`f??x?Kg+9.@?W

??w?a86?'?D?[d??G?
?P??#?[????v??????d4?D?
???
4?*"2??@???T1??Q1?
%)TUQZ?
?	??U4??(???y*?iB??
?(
 p
???!???&?J?P'zp??n&M???????g2TY 9??h?K0&?
?B?s
?R0la?"?????xM92????fYo?B?x??Hlr+?????h[]?@?0??8G??`@`?
??@?M? 
{????[1
W$?
\dI d#"??8qp%3??r??)f?hY?e??? j????t0`
dn>
??
?
G?@?0
?k?H??????;??0??8YG???,??|(
??@5???E2?r??? ?s?*D????V??????7EcE?v??2!????
????X(eD2?H???$E?????pc#?m???2???Yd3H??l?fTm???7?@???$Q???????<?8t?0n??Z??a?Q
G?d??? D?,??%?kD???p?/??d?q???<???W??_?{???Q?FS8+tw?'?*A?^Cy???P[
}?
,??:rS	T??1????g ?b?w
r??@)_?-Q???? TaH??c??=?;?Pq?'
???F*J?????? ???pu~???d?b;;O?v<w???Uo??Q"?4T`?'I????
i]?CE??:0???=??????A?PO7F
??Uxl?<=?E?h?&(8??/?1??? ??>??T?('??J!KP??	?P?\@?p?
???B??s? ^?4.?i?R	R6???h????
?????b??P?P:??S?sN??8ee	;9%\?L ?tz?1A??F;?T?>?)?Q;?7X??(??I??T?L?|A3&?N~?
?;
F32?HA??
?h?z???70??F??:??R
0
??n\??htw?7e??q???f???	??[????RKc3	?@?
?	G9??]?????TFV?????b? At ?#??}s??*?XS?>Q
$?:??????7?xb4VD?j? ?J??`????C??jm
G?	i??[?D
?G??7D???>??q%?&R?D?w??*o
a??1~????zF?"JQ=??????u???P?q>!??r??oG!???B?????
O_M]D_??}?/????px?;P=?1?	???EY^V?\?x+B?-?F$?1N?8?8?R<?
?|+?%M at IhXv?6??????](1@?{?;????x?GF;?%??8?D??
???M?W
v??p?j????q?Bw????5V????]?????&?6?<?9=???b{??!(?{?X??[0a?0???;h?????@e??e?
D!AD??P??n`?lZP????Z???????).?.Fv?4$0??0K
0y?t?k|?L6Jiy????;eU????e"v?B?2	?	[??????????MJp??d???y?k?c??????7?4?P%??I??jG?	????).
$???N????`r?I????n??????#?????\?.&8ZP-?R????yu?????7%`3??R????TB5???M??D?O????;{7?1?p????P?	L?'

??U?HUU?U?D?0?3
??eGr??XA`u?w???h+?>?6@?I2H?c0?????????9(???!l?riZ0"?x:/L|?)??@u? ?gL?r%???????U&??,?"???Jj???1A??Rv?
R??+J'?"T|B"n?
???<????tC?????L?!
?!
?6?p?A??)?D?Cv??4p?P?K????l?0z??v?I?&??e???????%A0?6Z??P}?????qpGY@=??P?DD?@?(*RUM at C0?B?f?(??T?d4~R/8??}??4-???yqr(|? x?/y<?
'?e$(???^n?m???4?u? ???R?<?9Ry*? ?C?8?9>????K????u??=???E3?n?l?GR
??4?s?-??e?X?c??ZY??????+~Q3?izIF^?d??d5
5??????Wh??5??=?6?kj;N]D?????P?;?a??]?`?1???M;?K??Qn?*?3?
aZ??2;G?),?P?Pl??Odx?
?5??????????@?N!??@a???]n?N??%b???{?_??2?+??Q??60/N???\?#?]?ZXC>	???9t????F??0?????? ??c?i??[+R?P?w	XP???D?????	??Z?!f????3?|???Mj???9D?I;JC?V?T????,?TL8m????Y
????(?V?6pT"?D\?a?BP!? ??,>???H
??M)BM?????r??#?1?
A??`????7U5?H(dF
??6???pt?V??5??!?G???0i>?????P'??>?????[1?Q?2^?O??>i?v??
?Gw???
'?????????;????^?O?K:ibh?Y_)d<G??(?=?xf\b???&??J???
?!?1?P`?????h???d???2?U?q?E??s?
 0??>Ht????=X???`'kc0?1D:b?????X?i?B??i?@??8?&LC@?
H?*d??o????#?7???
?Q??n?M0??p?X[????????:??p!P?????@;???0?M??9U?MAO???nF????	?XCi??*?9Os5`d?
G??~?B?n"b??`"?W???l??
?u??82A
Pq?:??q????l??#a????I?A?'
uRA?J?#
u?0h? X???(??"???LB2?0?E
???S????6CQu'?6?j??
?
?{{UT-? ?=????PD?8??????-?SRj?K?`k
??3R?|p?hN'|??B*W at An02????$;#?2
?
????????k??Pe?f?L??a?g???:????kh>I$T??*
?$D???H$??JFXd$@!???o???`???5`C?y:????????@?*{?

iF?b?????*ar????J??1?4g??CYM??X!????@?1N?3?
G??D
????-?Ma??^??? i?lV?!S
ZCh?T????"?
?|??iP!??LD?+??dx$4Q=IQw?wj at 5(??eu???8"Bg?PHD??~??@u_??????f@
??2?
$@[?r(R?IQ*?? 
??WSU[Z ??????
4?j????k;!?:???!?)????^???B?>(??dGK? P?G?????%?a_;?88?d???K(Y???5?lS??%???(B6g\](>n?b??????.???
?l?%?$#JQ9?B????!		@??lJ???Cj?JD?e???????PD?????L?????7rpr|<?g?j?/?p?"?b??y???\0??c?\@7X??????Y?C?A???C?????}???n0$?"??C???Mh at j
4?;?
?<?O?@?k??7E?;-
b???D?????Mb|?????]L1[?
??#?b???Y?A%?x>cRq??@~?R???j??P0?|??9X??#C*?2"?x?I?c??F?#/????K????bpG?WC???Y??????<P??;???R?U4
????/C1:?$c?A)
W?|}???????a????j????{1?uP?\`
L`??ZR+??H??>?????'?????3)s??Z??C8????E#E??>? 5R?@?e"(1?Ic????
?T>6????x?5<2?M1"i??H????,H?uE?s??L^??U?kB`?WL?F????X$7??<f?
dL?? j?$?Y_1?F4????????R\3HJR?244?Z???%`6
%_?\?x?-#??v?3\b?H??4?4&????c??2a??E%??v?S???V?g?qKy???`>???;?D!5?	??0a^?v;S?????N!???"T"(?-y
$?_?Z??4T?Z?'?2fALh?p???"\???@?O?9?)?"I??i??
Rd?h?W?
8C????tge
4	QBa
????4?R?0??JI?????BL
??:sx1????7?i$??`??u-%5?e???
?(??D ?BP?DH?A< 0??_I?k	0pF[?V????a?(?(?F??'?1?"`?R??oB n*
??
??a?}?(v????A???Q,=???>??P6???s???	2S!I.?J)h)?FJ ?(%?eb?b???*?jV	?&"?????b?p?"
Vf?H(#???4@?`4?}???? *??????m??2**<X?? H??Z"8?i>2
(??5?>?v??
0??=?7???
bvBa/}?'bB???a??X?J0?E?????^??4?C?"?K?z?(?E???8????48???uO?K???H$BD
??Odt3%D??h??	?&
1]???:?Fi?~s?i?X??5??ZR?5?a??1????P?????la@?*R9?9??D%Q?#???Aa>??@????h??9???I???,?=??>???|?w??X?D????d
??????B??j??h??H???EC`(??=Ixp??E:Qd??S?bD??U??_?Q$?3?xm?au>??b0!J?:s?g
??a?SD?Es0????!`?????*???``	??Xb????W?3e0??I16???Q0	?&?)(b ??d?$)*B$???*H?
~
+???H???"?????r???D	?'A???>????@????Y`??x!?`=??sk	???{L~T;`H?	??(??H?? ?iRRa?l??q?	p??rD?"??!??
?
?hd2D??&??*??hp?x??]??'?ZBO?+?M?`??(???(???&,Hmf?
a???????%i?c?<|zKz,????.?jb?'jGy-???@??@?4$??i?????h???S?>d??\??aE?G?#???:????xT
:!?"hP=???\@|?S???
??Y[pA?lZc?S????.X???x24@??/(???!
b???)?)??BeL?(LP~?=a?X????? ??x??#<!?B3?ew_????I???h??s?LN?3UQ
t?)???h?????????M?????
`?f?d??????J%?O???r?<>??bAN%[?>????"l??p?l?P???uT?;6??I????v?m?r?F???/??
~1??J???????4?!?P$P??
f?c???YY??Q?0??_	g?#? 
1
,???C??V?.?dfp?\?$?=f
?(???0Fu?o?
K?-?=????"?????C
E
?ps??m??A??h?SbX>?????C?6bDa8A0?rp???L0M???8<q?{?B?	@8?h~~px?V3d!P?@?Ap???
?-f1)?2&@?
 B??^
?T)>???1$??/?LBm-??????)wT????i?<
???(U??a1M[g?/`??????U>2?????Z@$I?S???%~??????l??0PEC0-
?
+1 at Q-?AQ ?D1@?2?QJD??????D%EKG~d????`????P?QAI?X`??<D5?j	? ???F???RE'Wd?D&bhZX???!?J?"F?Q? ?!O?4?T3?H???#?|k??????[qJ@?QDC????x
~?[?:,IDN?$?X0?4?
???W ????H%J!(??8?
	?c32BD?H?? D?-D?0R-w?
??
??e
O8?dP?f
X??[??j8?{??
`?!???\
D????<?(w???????o&??
???F??????	?????L?	'?x?}?D?P?@??,??:?A???!???T-???d??
??4?c?????@<}x??????TI??q????hyE??gc =g``????<????????%?o??????4&???>XF??\???I:???2"???SI?H?+???%odhh T ??XT?!	H+???X??P?$???z2?V???x??w???q?????EN?-?:D??y??!#M?d"?;????(?=3???F?bj????fn?qJb[?O"???R
+'He?b?t2Ag#w???Cc?$%0?l?:??&?	AJdE-
"?S?b?!u	?45??4?HHO?%M???? ?,7oS?d?????9?#
#??`f	???
t?
????c??^?hb??;\
??1Dg??G?g%?WK?:??6??L?z? A?s?9??mX0&?nR@???L??H?
IC?? }e4j????7?C????q?8??!?b*	?O?#?#;?	>(9?k?.???
(?g]g?SHd+G?9???|??b??m|,&?7?
"O?(??=?D63J?<M???m?U?A6??A????&ZW???????!???)????FC?D????;
fS????$?d????Aw?u%kUNC?0????!?_
Z???$Y
u`?9?y/???/
``???C?d?9??
80D?<?D?????u?p?????c?8Lp@?^?H?????

0a??D??L??b?b)?G?oa?
c???????f<:???S	?P?r?	""?%0GM?!?n=;i?H?x(o???S??SRLA??ws???@}?:??? ?AF&X??????4
WB??
?!?cZ?W???*eD;a??!?
(??2W??P???!
?)A????H????<C???:f|???M?S????d????&?hqT??#?=??:(n?i!M"X	??G?~????2
???9?ABl^P?2C?m?
p??S)?$??R?S?#?C
h??IH ?
?)??
|&?pO?p
j
?F?	H?R$????/?
PU1I????N|?d:	???$	 ???baT1?=????8=??,A?H?!?#qFq??a??:??? 6A????Zuh??B??p1Z??B,I??BD??= Y?0AAr\@C"t*L`??*U)??c0@???}5*???o}???3????i??b1?\???x}?s?[nk?C?)???? @???$??I
0???:a?`/PDX??M?Y?M_???m?&?b?????(-f???????????X?B`-?f?qh ?y??3?1???x?T?B??5
???b?2?e??2?(?H2??+z????hK?6???g9?0?5??(v???07#?r??B?1?l?t??#1
a?=RA?\?.???X???dO2???l?<?X???ijbc??
aY#?d
?????=6
???1f!C????4??#h%S0@??L?PRuB?b@?ZR???P?=?lJkR??B?????Ni?hS?	?F???5?!?a???f?2???GN+?Z??RCh???kN?f?5???m<%??95D??G???Rn??v??e?w?9k1
?Q?9?N???&i?~]???@???????d:???=???k??????*?_??#~S???????}?9L???%?M????rH@??I$???zN????4|?;*muo??X?F???Q???Q!??z?
?v?W?\???!K?
C?X>	>p??	?a?.????O)?$l????VM??
]
|B?-'D?K??0v???!M>???????????B"o?wt
<u?'??N?}x???"A??Tv
??A$-?U?)j?Y?P????H?d>w? ??
??h??IL5????	i???A???I???b?%e?
r?L?K*!UC?9?H: ;????/I1:????90;rk?????t_ ????O????;??V?"??=?l??{??j??k????x?y?$???n????I
?UPf1??
C?^x![?O??~??i6??0?]?&
k?Cl?`D?K
v?=??0????*a~,???I??.???f?????)erd-`??h?"?@t."'?Xa?zK??}HyC??k??C?^??Bo???]??WV?k*?X=?????
zX9!??}h????P?$I7?3????????oe~?????.???$N???J0???????)?E?7D???????m??@?,:????	pJ?b?Ci??e30-??!?!??@!4?(H,D?&???X???oq?r???Y??;M'???xvVb???y?????d???????)=5OH?K
??i~??[
??|m?%?HJ[k$+
?
??f?2??H?X?Z?*R?
?j????VmH?i
?%,?Yl??,??!m?c??j?@??H??d?????&???1'L??G6c??;??YY?>???*?f????(???1l+???G??4?i??%j??gJsT??^#uF??{?????B}??%
????? ??g}kCaL??9!?:=??<??_??>>?D??
?????????????????^?H????l????";I<?{?Py??@??i,vY?l#????q?o?^???????4a?!X&cg-?????BbEa?	?	????e??$?q0y?@?$??~?xo.?$C??$?J?"El?y?"???^"????^?M$H*
E:{?Y?C 2??)5k?Xf???????v?*??}??????
X?M??$?? ???LDB:f?
C???& ?$?
?	k?5fB??'??l?t?q???&!@E????D?H?.
<???#??S?i?<01 #?O?
??f??????\???
??p?4??m??:??7	??l??????dX?C??g(?AzD???D???w???2??O{yw?jMax?$E?P?
?X?
?8Zo?"Y?????????????x@<???i22???d?C`?)c?h?o?"?R	????H2?
4"????
,J?D at HP???"??	^?R at a???H5
,
$=????u????HI{?w:???r?A????I??8B??$P?
w?8L???b???R??"x?{?E????|h?
?x
S)!"???#?]{?V>c???T???N:<6	????$?sm??S6?g???qbX
<
S?1B?
?&???x?G
l?l9@?d}?l?b??
???j????3???G?eW?E]?'W?a\$?0L\A"??l?FD???$?
??m9H~V?]??????C
]??????k
?B???
?	T?Q?j?8jP$),O0]@???????,A???a?Y*`}?????JQ!?
?J?9?	??6EZ4????A@@?A?(DRlP?e?JQ?
)?~??{????!?8?aM?B???Dm?-??[[B$?LdR?Z??Pu#?t?(Z???"zD?(,o?-?lGTpSG?A?\
??^????+ ?@d??E???>???O?aH??s??`$??h?)P\???!?6L?B???_i???D??H???o???Ih?x??a
?)????L
TD??I???JJt(?tT?-:?
h??9?}????_?%?H??
?????L??QFJ????*?
???":?D??}z ?	?????????Q??????5}
%??=\x??q???~?2!?????sFi?
ZU,<?W
?X@?&&?ad8?	!!#8Q???"?
T??!z
???B??p?!MQJ???T?l`
??S
N?=??d??I?~d??
?YE!{HQ?
??y??X?
()22("t=As0??!jh?j.?q?{?!d@?A[
?	$???9?{?;L!??G?0???o(???????b????  ?d??'??D???8F????
?;O?9?????W ????8?,D`R???@?'????????|v?'?e0?L?9?#?+????l???a
R??A????'h!?3???6?.?C????Q
Sp at W?gn????RB??q`b?38?t?.88?3~?
*???aPR{q0?`??|??'f?`pp?A?
??(??P:h?T(A???_??;??G??: ??FD?c?t??c??????ot?????V??????v?k?4?R#L	
,*TG4??i?}O???:??~??E(??
V??H??'J)M0??	??????????zD!?????h (i?????J?$????????BT??:a?p???L?1?
)i"??0?~?A??<?{H ????
?
R????#d@?2?OG?*u?H ?~??y?R??
 4?R?
Y?
c??\??Ea?G??0?C???????n!?%C?P?(???GO??c
R???????D
?????#^?8???qg?A?B-?;X

?eT?
?yNP
?J??=???#??2S??^?;p?]??'?'???~	q???????:?????????????????????????u???|??w7A??	??-?3?p?`???????x??*\?ut|?<???)hE~k(]?XjD>?
?*6\???T???1??(???P?!?????w?)??e?:???
R???T?
?i
E*lb&a<AD???????????A?sG??7?d!2?JsJ??2=???0f??`??<??WH
?b????????C??D??L?y??????$9??
?????(h?<k&y??{??z??84S?y?E/? s??s?t??SB
8d?$	?HD??AT??%5?*?&\LBA:????S???h????r?zI?7a????q??2fI}????ZFFq?A???/8?^L!? ??	o18L1@?H?!A??b????Q??
B??U??K?(???C??`?A?	4?YbJli?>??5??????H0(?Z???B????2(??E???G???? JJb??WB,
4.?4NbP@?Z%??N?fH?a#??Jl??Nj???D/"?`+4ch??B????$?8??? x00s
f&
u??SS?ej.M(y?/??$H?-?	?H?1?
K?s*SB?????1?x?B?	F?????%?h?a?
???
~
mlc?
C3
??I1

P??IH?0I?????4,?????M7???(?? (&?`f?S0B6X??HP??0?^e?	?a?????f?r
8???y?;?d?^????e??l?i)?`d|?K??luJ?? ??G!?G???'q??a? o3	?w?OI$?w?+??p'?{l??Xg?2 cB??D?	???????4???
?|?l??????a&	??A{t?M??h? ??i??V???h?W??????c??0????????&????'?(?|? 4W?U?! ????MF?*"? "F?B??*!?8???%?$H?v???u$tB!D3?}??E?hq?????'?e3??g!H??"?kX?n??A???
~S????(?@d~A?IL_?????}C
?(????!1?^#H??" r?`!?v???j?$?$?,,?-?-(?C#<<8l'?!?B??
!Nb??d ??X???_\?h????C????w????6L?'Y:
w$?2 at .	<???
?I?D
`??
"????	j`f?????)????S????N????aa at S?s?<?1 ??:"?#?zE;!r??B??v?oMn??	???
-NY!??8c at 4I*fZ?h?hY?E???z?	?/bh{?>]

B?@??7??$???E???TH???_
T?1?, +'?b?????g??+?L???M'????s0D?RY ?!Ri??????i$?Oo1???$`@?6??T?
7??
??
??C????A???dz	SC???D?:Z????Zx?r?`?!?$
????L?????:=??\#?

??
>?
?	???
??P??4w?8=???	??a(?M???ln???xp?NE/????a	??U?a?|<
sou?0?r???0W^QD?
????
N"~?????
???Z^T?}g?
??~_q?F??=m.????*???F??"?????>j?b??T-L??0?????k&2?96????
NSz??.0l?CS:??1????#F"Wal????????????	??
??WR????b??L???3,d)]Jd??D1?NhP2LDXv>?Fv?> &B?`~_?????~?Lm?a?1???????.?C
????P?8Mc!??~&
p?Z?B??YM????1M?C9]?]??@?V???m??j~??N057?l??'`?{`[(??a6h?T??8???!I|?`?KphP}??!??"??
?X:?U9c9?f&4Dhb?I??H?????wP_Q?????&g??Q??=??<????M???
??f?? ?r?-?$e?}
??? D??????&9?e/?????Y???y????k????A????b?f:]ad9p#?d???I??JXV?0????C?FF@G??
j??)?H??0I???@?
F???6{1|
!??M?a???????z_NU???,?^2	??h??E0H??Oi?I?-??#???????kGQ???w?,?&?S[0?????n???zN?1?H?????d??P???S>??s??}xpsF????*U?\
Dz?D??L?7??3???Y'??b???W(???:?cu)???;=y?A*????b??;4??,????;?g?t?s?g%?;j?s<?q???
?i??2??8?l0??C??&	?t82-6??
vJ??%??|d?VSf??\(\???	w????&?1r!??
???:?F??K1v???i??'?^????.??B;??Cr????????8???#?Xw??????JGKl?(?t???j?R?????&?#?#??z^????Z?T@
lK?Tp??=?e??T?o?2??????J.@? ;|?	?h+4?8?xZq????s??r????!?HA?B;?q?
???2<?p?xgJ;A
?CpGE,?axe?"?1~L?z?t???g,?^??kq5????2?A??`h=+?Si pI??88??*?Fg??a???????6???b?n??[?$?

?&i
^:(e??W??l?fQr?p?3?Pi?7??X??T?C?iF({??)q
?
??%?l??`???aD;*:?2??X)??]?????(????=!?h?
'??o????Ozq?	T?????d???cjuIN"?+^FKq]z???/?`?9pu???[9?:????gx$aZ^	??/J%???h?U!?RS"J/?=r.pz?Sx?S?x?????u?p_8??
?u"u?
??,"??????`??{u???
?YA.?????????7???`?t?;?.???	:M????pplL?b(	4v??%?Z?3D`??X?A??af??il?50??w???????t????z???tU?OH?2
kXB?????R??0?????:???+?b>?h?.G?<?v??I?~?(V??F?@T?|Y??2?=??sT???A???r???B??4??[?fO1?2<V!1TE?;?E?{8r???V??-??fM0???
?D???q??c?????}O??5????=?????]?d?f??[??1zw?z?[rwP8}
q?A????c)5?????f???t(?wCS;?e?b{5N?x%H????,?44?6?Z}ukh?1.???y???l?Hs???g?65???$c5
????X???5b??E???Np?/0???kR?oXy?Z?H????@???Q?w?????0?(?	R??:;'??&?x?0l:?????Ia<?-.?1mBc???)
}?????.?{??'?yT:??C!zg???

????H*?h??!?G???v?9
h=
`?????D?P?
`?????????_?G?@d????,?????i??5+?$?g
)=S?@\HL*???w#G4?T??8?????A,t'3?????	????6?7"??H|P?e?D?$???@?A(D!??~(
?Ju?2?)?+??$?'?????????i?)
?	=??:??|???_}??
??;R??
??!bO??'i_??????o?w?????]?|~?X??<??!?S?!LL!;$??*h?t?,)?'RJZ?
U)
?84d?????????DH?????? ?"?s!2????333"m???d
?'??j?b????6?g?4?3<?B
?c?[8???~????L??????????
_?! k
?Z?/@??,]??>#?t??B?M*`?	??d?A
"?=?Ai??& ????H
?3?????u8?6?4??Cy?gU???|???:XQJx?6	?????4Z??;5?}b??)(![	Mh????`


W??>_?????
?????4??@}Xz?????H???zOQvB????4?	?????g??}???2z????jo=tA???????
??????CdE<?z?;H???B8??"D?T'?
??
??~R??z???q?R???
??M?&J%cm??P??R??L*?*?Rd?*??A?

??? ???w??@?
??E!?????[n???=?`??F??????Q??y? Q$O=??kt??Q??!?>Hb?!?.??^??8????}??????R??g?6h?c???dhh".?&B?i?4D,?????H???n?s?????#?L?e}h<???`?-???;]??v???S?*q??????|?
?
"8??^?O?P???N?h_???]h????;??????????L???????
??\4P?P??? ?l1?N
?Rh;kk?G<?62Ee??????????*??X(?w?5#:
?4?@Y?ct?????eH????=?+@?
v????????? ???M???K2???a??@v2??`?0%??+???ef?NR?<?	c?:I??i?W? ?x?b%?????a4?RX?K	
I2H???a?
??_??p`>?"+???=7p?+?????Dp?#		?bk???????wPH2*A????u&?
C=@?c9/b;?`x?@7????K??q???????A???@x?
??U???P?N??.?n?t?:ml?m???e`1?I,&?%?OCKsSMA(g	?4??V?(;??>???(???>?<' a?H?S^???????m???????|???}KLW??8+li????k?/??)?r?S???6:{????C=I??(???2?=??=(f?????$??
????Ld?????:F??Ju??G6IX7O*Q?
????-j?rq!?U(*??m`fB?q????C???D0??!???Q\???,1?9?[??Y?Yh?M"?fc?????]?df???<?7R?HFA<Op?????y????	6?H? 79?e??\????)4Z?*C???SES?:E?
??????^['??XC????~U(8?
?V??!s
;T??9??,??[~Vf?&???N???%???Ca????$bK?Z
dK?cE?A??????9?J?R?Pf7ykp1?a8W??r??oZ???Q?;p?*?&'u?g?*n????5?0??C??\Z4?	?????28B?((`)_?
(?e=3???z?$#g????n???????p!??ywl?R??ws??O
F? ??p?J?i?6?
??B^????e??A???!mra 1?????%<?~J\?p?;?e??)&|?9U
!????B?&?S?y??<(?
????? v?FH8?v?Pa?cy2meV????4+Zk???????g@ ?_?(???????LP?!r?`??'?
T?
e_?Z????f? 	7`?6?r??R??"?N?????ig#y?Dh??]?@A?????O?e?u??0E?	??l/??Q_??9??q???H?]FI??t?/zjm
?7?N}*??????g?)???????Vjb#g?s^a?:??M?#?`~$ ??;?Ov}???>???0D????h???r??@??D;??0HD?DXv
????HD?
pD
?$F??A?j?
???@?>!?????
h?]0???????O3?>?p`??

?m????Y*?L)|???4???H ?Rh%??tex??@???S(?GB0??`?
u?L??~? ?!9L???. at RQB?4?@??:????	?x?x?	H?q????@??BCLG`F?*#+?
????????B"?????????,}??8DB?c??M
??
?T?)?)A2!? ??
]??di??#rJ??K?e?T??
(?8?\dS?!?M?
*EL?F?!????Bt???"???H$?+!
5?Bld?@?!B?)ID(-(??b?$?

?? ??C????9*??%??i?`h?h?;$)??	I?
?z}?10 ??$?)?-2?H?(??ye??:?h?
{???????=?%?>???????&?8???HDN?N?OE8?????y???D? ?_.ffdiU?2(v
7?	d2?J???ke9T?c?}?=Z?0&	??tA????(]?,????I
??r
?j{?BOa??1$G??GRV?????!Q??"????#??y???a???D,?2S?if?"X??g?O|8??S(y?H??? @:?
?%]?S????hhv??^4?????I?LBql	;?a:?,hZ?
j?P?d?zw??^??)Bpf??@???m??8HR?0???`N??l?R??R??+
????8????
?i7?B?h??(?F`?M????a???2?MA?+?????N?N at i??KH?Ib2
&G?'"???????
???%?? D??\?hC@?????2!H??l4?
???6JC???H2
j&????9?
0<Pk??
?K?"?@?X\????#?)???????e/4?
?w?????N?C?2?P77H
5??N?=???4&?(?O$??F??6:J
??'aX???E!%(bTy??
????????l?=???1G?'?E???i! ?_K???S??(u??%`;Z$+^?30
@D#??=?????x?1??4???i
[??)!?UB\	IbI????????6
8?T,?V??t4???p?;?"?f?!84?<?PKa??I?.?
&KqD?SV???OAC???V?
Q{b?p
??p??p?{d??S?C?I?6V7?.??B?ITU??1Ax????3S?+?5??/O????????F?????2b,?"?h&8&????
???=PF?(??A[
???F??hQP?	???+a?|H??""Va?
?Z?????H? [?4
4?2J?"a???q
?&A???x?2?CF5?j*???????B?8YU??C??S!$??=???A1??C????,u,EU?u?????iMP]Ca???|??M
yz1&,?bh?b#\????p0??g0"? ?U??@?RL54?A?2"&ZV??????????9Hv?????8??P??4#????O????????2C&?9~_.?6
????=???????? %?(y????,??U?Z?"??`???B&]??#?>??h??????$~??DCXI?A%?3???@j???qO?)?G??????)?(?0???b
H-b?j!IZ?v??BT??-B I ?@b
Dh??'????~???K??y?(?g?#???+?_???j???3????<??????????Hb?I(???8???qW??M???r??r??????S?????N?P??%?A?_?X>???Et???;????`(9?EV????rA;u??"b"I?0B????b?h?-???C"?????'

???!M?t
F????!??d?7$ D0n1(d&????!?}i???ire?alQ???(R??6@?:?8??&	????P!????*=?bl???9g?
?f????R????"?$?F?????1???	q?2?a?&??	010*?,?,A-)+IN??o1-??`??rT4R?IB???&P?,(???!
Uy^????????????BR??7d
O
P???P2????@l?P@????J????
????&t???P???????ze({?g????????<Uib(?z?|?@?4??uQ???"???*F*?
?}?l
?j$?}x;!C?!?p#??2?E???Ql?%?$E D(	SR;????2&???V
KA!??????p???b?;?? x?r
`?????
-!?z; ?j	GQ???=?`?T??`$E?rd?XK??
?1?*c?a?S????
b??i E*?*)">??G|@??:??????!?8}???>?}T?;????~?Q?)??C?J?{?t(-
,`:8????
ll??/??f@??tq?[??(u4?E??
????*?4???c?????/??*?7?}??W?M????b????}"i$????1??d?|?????????{??>??G?6??a?HT8???T?
f*??u??k?30??`??KBU"?????G??"dvC???n????r????^>?o?f
L??Bk??21?D?????sb`??7@?
?7????
wy?P?
???????N8?
?\?$(L?!2?=r?NM???3???????#????(???? y7Q?R&??????#?X4/??:%??????SN'??)??Jv?F???F??0??I?t??f?uL?
?&
]?H??p }?09?\Y????z?(#z5=L?H?f#??#F?|??[Mt???$,?????c????8?# ~_?1?y????:???*????h( ?T ?VR?U??:e??????1K!o;?y?@X??xA?Z?PzD??N$?}qd	
?
???,
)P?


hj????? ?~?"W?B?(?/???y _?C!,?p/(X  |?tq^	R(@)Z?RXQ)
~q???)NK??Z?????"?1`??HY0Cxh?z{tS?a
_3??????w?m\r???k`hx?y??????!	?`	?N8I???F?]a?%?O?Y??
J??a?O;?7?\?b????
?l?Pl?*zC"?*?i^	PSP
??!E%?AJU4?
??`?G????}???5???ZfXH
?????&?G??p????,??5"????>'

???	?2_RI?o??{?E????/????X?
%J??u???h?3
??0?@^??E:`w?
????B2!)
??C:?????O?x?8??"@c????????{`SM?N
?_n????
??>?
D???B??pEA???yO?]w???_r?

	?????3????3?T.?????|?%
??
|???????F?r$?hr{?G??????{????S??{x???????;??g???m??}s?_/?n?m?;Mn???v=su???mnW????n???2U?QN??
{??D??t??????ki?????yn?a????????q???#?9?????%OhJW6?K??M*?P?M 4
??>`?<	(??)?(;??#?^?m6???Fvf?????b????o1%Ev?j)??pF????c?&nb??j"B
p('??@+`
Ia``?e?????"&???$%)5?G

!?
R?L??	@SL?K?i]???QJ??D?@???GZm?????cj??G ??#t?4??ME?Fi ????(X
??h( ??"`?)?j"f?I(?@????&`&?`?X???*?h
??`? &%"&
?&???h??h?B`JfT?%)N??S???Z??J??F?????
??Z"?h?

?"
JN?3??H???i(??V B?%? is
?
R?bD?f???"?D(J???&"??
Z?H?!J)J*????(???i??B???()&B????J`???R??i2"V*R?@???????Q)0??PV??V ((???0B!\	C L "L?iH????Tb?0?(
B??i??
??

?b"?U??r@????A?Y	C?A2S$"??????)???" ??j?B??????(j*?H!?$?%????JD?cC?
??ELLHTQh???&X
 ?O?Q7`j?(Hd???J!@??4?KSAAI at ad????	h??H:??C?IZ??4a????,&??
P@?R?F?H??q*?`L3???"?????
J ???
?j?)$&?sh?A0???`5T??2k"(??xQ?Y5??????A??6
????cm??~?K!??????0?I?????4AUA???? ?j	?"????????l????$L?A
PP?)
?P????@???b1A@??M#A$?@????))?"?+1???f ZB`S#??J`?d?
X`??!`(???RJ	B??CD?1 C!
I?(??i??h??d
`?????i????b( )h&H$????
?i?"J"d ??*"?b
?*D?dM
*UDAAE	I?D?4?QLAPSQMDJ?- ?R??R?DC,CL?%???\?!??Z?????# tIK???GY?S??k
?		FeH??
?????UU?E!C@? LD??8T??E?	CE	?d???T?	00?Q?DF??????f??&??fBa???[1\?UUQ?%-!KED+?(B???????
!?????="?????????n9!?A???\i??Unr?????????j???????????????`?Bd)0?)8???mIn?1????Cg?????9$?????i`???????L???$??J????
??P??)?s?80??0???~o?}zCw?????????\??a?L??LfPh??????o?X?Gf??&Z\???co????wU86????Z?}\o_a?"??
???PS$9??a?P???H???q??1??????????{???????8????"?H9???//9q??E?MCL??{l?QY[?;?V??????EYP???w???m??U6r#?k%????K?K%???[?O(3????)????J???-??j9????`?3R]W^?2
ZbS??:y??**V=??Zg??+?3????E???]???????&~?u??k\?+?i?f??1.?Z_L???M_-44?j??*?????x7???c?@???mwk?X?M?X?>c????A???????F?? ?/?
/7?????m?<?o??c?cV???6}n?????kz<?????????????h?Q???}??+????>???V??j f???x???c?=?????q???_??????????lU?s???U+|??Y????Mke???M??????h?h??+I?2A??$6?:z;??5?m???"s
d?8Zm2d???~??????3???+??J;?(i?????5??R???	???1?y??n'}n??fu??=G>3??0?1?l"??"D?%M;0???v?o???a2??E????? ''c;?2???!?E??
?????_,?F?wc4?? ???E??_????hE<2"BU??xQ8???n?d?*??|v?*k?l}?gg?????w??b??|?E??A??!???<???{???t#?2%?BC??z?u???????7 u
?4 at y3qy;?v???3??h??eu??P??^????H???Wh?q???eT??????q?`????U
9?k?j?g0t???r?mWi?t?WQ??????????x?g?^??,y'?h?`??~!?????`?=?????Nc1V???^?'u??(a??????????{???++?g????^??<????^????F?_g???{??????m?9P;`??(a_??q??5???F?l?<qQ?????O?k{??S?u????"??%????wL??M?}?????????[????z?K?//#??j=]RZ&??Q?H????g???G?f???]?????=R?g?yI?c?sr???o??y?????N?rf??`???}_????dN8??Z=J????&oh???v?t????y6M`??????p???8?\?y"?Tw??c????q??^$uw?L~
f??A???'??8#v?}\??$n?2S%?K?1????????Qc?uf?Q"?
(?E?^-O?????D9?????4???c>?m?????^?:'4y0YD???s???*L??q?-Jn
N?z??T?I?^S?XF???f\5q?q#|U???1??g5?D7???u?a?1???
?8????u?0}?:??1?!?/???l*????L?BR?q?zx???29 ?X???
*BI?lq??|![?W?75??s?????????Am???.d???G?"S?R?"?h8@????p???r?TT???????????Dv?a?}??3{G???{?}t(bl??D]?Dv06??h2M?,?N,?????}1?p?x????h??1<)??ce?Dz1H????2c?Yw??_'??<?????$?yb?Zv3?#????t8D'??4?q?l??9???????w	?)H??sP!?U2"#+???????}?~?a?????u?n;:??>tL?MG?\?N?????2????U3?.u????????????????????Y??/#???????7??6?o????]l>?Q??&??w???(??vF6c?w$???)S?????	??k??V#??G?d??;V???q???9???&???Y??"	??}????W]Q?sN?de?ttn??5
F??F,??E???8N:?yLm???#\-???eX??UA_c?1?_???4?U%
??d}???z*???*???4??54??U?-??~???g?????GE???!c???O?8
+#2M???D?D??s??S???gD+>?9s??a???z?v??er5?j{_??????Y??A??YI??-K???u?W???|?N??#??z_.?w?L??YwI?t?O??????!??
?????W??<[?f?r??????????sH0?H"?q7?/??>7?p7C??????8???l?????s?$?/>C?R]???	??U?Y,3!U?Ih?eU??crIU????????y3??A???~?V?y]???<???_&j??n??'??yC?4c?a$??W?????????5??}?<??M????90???W%??_??gOg????qH?=m?X?L???????L??I???r"??n?

Ru?#??+???-??@??"????#??b???^??F??p??b?2??Pk>???3??k#<?b?9t??W?~^????=????hf_.i??????`????????'??7Y?$Y
!??f>?G?k?e?????6?u?s?#Z???66?(je?f???>?r'?
??+cbd%???[????2N?>_???#Tm4?s??4???h?(????1????[/?????"7?????=/<z}???=O$?]}x???????8?_??z?a?pk?Wveo?\???3?_I8?|j??d????v?;?>:J?v??????c??8jp??x?d????9???-???????-_???X??X??&5????6dH??C1???VU?V?t?????j?{4Vdt?dAd???(?BE?JtI??9?eI????x??f?K???
??"!??Z?q,h?EaMp?6?sV?%5k6T@??f1????z???g;:??????HTg??f	?h???c?8?\???>??7?D??}?P???
H????*???4FV???E?3??6??N
???9??????29?O????l5Ug?vU???9`r???5Vc?d?[g@?L}uM??=?5??????c??cJ?F????"?+?F??k/???fL?6?????????L?Oh ???:I#??v????/q?????&?f??????x?~??6?
HzYU????w?]?/n?Q?q?Y>O}3??e?8[??Ra??%\C?a??	vPt%?z?-???n??f?+?-nv????_??x?????gE?????????	?]??????????{?p???Z??@??<???????????????n???V?$?I$???_???Z?}?]??P?.??+?c%gO?j???{??????????T???x?W?b??:Mz?)T?^?mw?M4??_C?????~???<???[-e?<J?????^???O?9??????{??
??w|??UQ?X+?E{!?Am+?Z??^????????\??U-+??VYc???????df?3n??m##????c??%?Q??hS9?Rf??
??!??4=????/O???_??_????P?r??3??f}>??x?\#<Tl? ('????2??>??r????wzBgG???p?F????9???????6??#?????????|u????_|??j??|
W??????????s???^?????G???3????????I??k??;?y??4.?3??m????I??z?OO?)????XYk??h-?$? X??dv????{??S???<?9DU?v'??
?7??UAT/K????h??????C?r???/?9
~{?!??YjM?}?3N?R
?O? >??E?????`?|??Ai???V2?zj??I?3?9????
???R??O??K???aUumd??????L?^?s?34???P?????h0?!$???????????L]?w??9[???]?=???z?k??????Z?????q???F????iI???
.?#?????45???]?Ok?r?M?$?OoCA~??????????	?;<s??e??w

?4?????#??Nr?Q???C???????(?Sd ?&4?Bq?D6T:4??
*?????Qe??????2??8=~???)?(???d??s?T?l????YCU3????sI6???'A[??9?,wUDJ?
???>??w??=?=????}???s????& 1?D?CL
a??|?hP??????@?2W?v=?_v?u?M?h???:?????%)2k:u?rqs??[I?d?w?l????Dx,??=?<\???H?????,y^?y|?i??4?G'?T??????2=A???SIW^?h"?????#??t?}??g\
?f>???w??,?4w$+????Y?3??a??-
a2???v?????'????F?????5V?=h???????????1?	r)	"???h~q{?u[????????}W#O??Mr?????r&H"@??9!dh@?0z?Q?V1

V???F.?8PM???FYYGI??2?k?
?)???LV7?u?U?w+??QY????)a? C?????2fE???Fae(?X???[?n????uh?/??DY??????s??(x????!B??!???t}G?????1?q?U??{????>r?m????0?]5??Tz?,m9?g?R`T8?G#y?V12???_?-Q.??[j?I~?p3
?p\T?q??m???j??|3?qz?9%A???X@??}?`?D?e??????%???~????P???????E{4?????4?J??????\\?]?q?6;Q??????h????m?)????>?????U;??1?vJ|??????2Z_8??b	?????q???????	
0??P?PT[?????????)U-?CT!<?wI??[n?????4??&2h???
?G?????L?=??!?3???t~0???}???I?O??d????n??a=?}&????:*-?????q????~??]P??2?F2??????'{_2???8?0I?"???$[Q??OO?v?????~?-s????T??p?
\<????r ?s)C?n-?8@???UQ;Y?????G?>??C?%??
K???M(??????;(????g?????-?????'??MVE?Z?CW?????????R[5}???;????n?e?MM???W?????4?w?qc?7?W???????L??3???!??}W?g???????1w?scd??3?&]a?E??d?0 at C7?g?????=W??6????G's???????s????Zft???_???6N??'o??N
t?:J.??+\?[3%?0c???????'?A?,??G2?s,?U?EE?z?(6?t?N??9??A???v???W?4m?L>?H1N?'??(n????D>^????5??,??b?w?9?&-0?????'
???????@???
?.?????)?gbi????c????j;???S?qVJ?c???!T$O???T??P???C?>O54??|[???)??,l??j7P1?idh.??Q ??*?13?eF?	'?b?o\??/TG?p??1?Gz??h??,_A??????eR??"v?=???H?j????Z???a???|R?	?1	.??}??>P??*?s
e??E?_l=n???(??L?y}???u?|????B N\????ni?g}??E.QD*?gH??c?v???]3$?a?[??'?2?[?/C	?????0?*( I?($L???\??>$%???K??}????o?^???????????????}??~t^???b"?D]?a&??????|???E?L??:g??????? ??n~>Ms????N?PB'??!??3C????t?`?\?p??F`??P"o$w8?o6?z??)P??
? ??_2??j???c???/yG????l???oH?????@'???D?P>k??
??K?
?w?9
??j????_n?j?[5Cd??EWHs??=Gae??BZ%????k}U&?????b???p???Q??????]????S?)?%?a?m7?p?t??y?C#Q??????Y
,vYh{y??B???]??bjA??t9?Y?r?I13}?@????i??s??@?l??9?U?<?O:?j?d?"tB]?2Y}$}??^??j|?????#?s??0?G$aOw?/????????+pv)??Q??#?0?Nr??
??1cj?y?{????]??.??ui?B???????
J|????D'??qVO??i???}4O?UQ???1???q??:f?3?l
r???aA{'?zi??B?
0~2,???tm?tn???9?E?D&?h??b???????'?t
?=GqSYw??$>?7u_0<???/??!??????w{?c=??tC??Wt???\????????o?a?}???<???0???cl???XRR@??)@?Iy?c???c??Z??_?_?/???}???[@?X?:???M????u?oo)?	?8Vw&?mI???"-????!*
b??9
???=b9`~7?x#???j??uy?<?O???	E???(q?x?:Xyz'?p?I??&????????5.`?Q?t?N??f???5??H??? ?a1???TT??
??'?tx@<?Jb?%??Jb???j?lfj?$pSm]???gu?*WhR?a	???b[?J??F??`?(o?a?$??2??8n???:?z5<????G???w
???S??uq_?J?%Nj?<?S??e?Yh?G8?*?b???]V?U%#???d?2z?N?f???\?\K|???????RTk??\?iC?'3nt?yX-:?9 at 87??.^&Q???{??%??o??su?H>?|S???A?B??Q?`????3????m?G`??)??x??_4??N?a3a???>???;qv?????5y????e????`}??o?Z?E??e??????o?Zs?'u1??>|{n??i??_*?????ctx{>SBBr??E???=/??8l?P?3]?????m?E1b7??2??u??IG??@?li??<x\w]
lM{i?9-~?P???K????{??????s?U???z Dk???Zk4HY?
?/??Gb
T?ih????2h????8
T ??|x??'???@$?b??vnO??C ?B?"?
,$CIDC at J$?T???K4???1??<?1??#????	" d?((???0&?%"`?i?4K?	?D?A2??3??IKPC?!??$MRR???"??`?,??,DAS1M0ACQP?CS$0Q#H?`R?&$?M0?
D?/?????_??WS?=???5?b+?!??]Y??v?^?Z?d?N?ghvW??Td!??f?#??????cq?
???Cm;,n?$"z3?x{x?D?;?3?QN?2?PR5@|??D?, at R??
%RL?I?A@?D?4?U!1L2?DHJ?ST%$D1?p? )"*???????Z4??C??X=E?[???5??-EB?E
I?I2CI0Q$???0????	b?x?: R+??8
PQP(S$
2???DQ$?B?B!???????d?????
???L1x??X???a?,C!&???5
??U?P?f{??=s????	q?x??R?h??#pA?)??e*?l?-?P?????HJh??g??g-B1??!?$?xd?I??o?
?|?xc??F~W2`?l? %?5?Zl{f?e?c
???NnQ????y`?b??(K?s????L*x? ????@}??L?DD????}??????J	??ed???F???>??o???[???[0\?__??g?{?M	??C?????PIHQ$f`????%b?>?V???$????9????B?'|?U?q???G?O????0??=F!??,#* ??,??$?%2???S????je?a?4?`RD at YcI?cdEX?`?D??u?r:??0*I?????NIAELI1e?AA?aY?1RMRV89??p5?????????}??u????)F??Is*???{?????"?
?z??[B?L(?
tfNFg??u?2?b?D??&0p??????????
B????94????
?:??????
5?Pl???
??s??H5k????[????E????G1??d??h??	?7?m??|p??????]?T]?U{w??a?V72?;Q ??&(t????o,,?MA????f?F?{?; ??,??b?7??????D??,?R???m
R???N?)#&??x??QQ??<?n}4?D?|qib??$`?y???.?!?m????Cs???fN$?o4?+??	8?PI`c+?#tP???L??d????KOPG%?qEWUi????X?????s??<&:?e???#3?;??M??P?Hg
??e??
k?>PM??ac????M???????????H???]8l?g'?	Cj
+?
"L??=RixiG??6?z?Q??\d?'n??mA??1??
n?MF/o>u?/?Hr
?????%??F??????.??
?`2
?y~?E??6g??O0?a?1?`8p??????F?G9?p?n`k??/???w??????f????m??^Kh??r??"Ha????Aq???o,?4?4FJ????l????L3?`R?(j?^??0??Xr+??P??-27?(?`{ X?J????? s???Gg?0t
??????=?c???!?
f8R??S?3????`??????7?B?Q0? 0?t?LM??V??????*2B??/?t?g???7???????????~????
R????3?l=G@???5?W?hh?0D??n?]j?y?xy? ???W???y????^M?9l??`?i?pq??&?gHi?)??1?Z???c?9'CA??2??6?????	R??	?3$????@{1	?Y????????M*?^x???\?g?)????????!H???i?-??A?jB?# IE&@???????f}8l??I($G??
E?Q?
Hd????/?>?z?????("?"9?
???-#z?j?r<??I?~R?Ob? ?v3??p??????Z?????P|,pJ?*OO??5?F????????**ma@?kH0LlQ^??4Y?I#?gw???1?^??>????5???x^???4?$?l#,??&?y?(??oL??z?p??wn??
b?:?^p??????B?yDj??????????y?w????-?j????????_???rR?j8|YN\ra?2???C?N:?????p~T?uk?wA?.??G9H?????h,?O?s3P??O?7@?:y???J??u?B??-b?I#E????????)S'R?m???3?#!???????m(31.??????I??B?h?jH_???i???KY???5?G. ???E??tDz?y?$r=???????N}?k$????m????g?????
???_???h???:(dLD??*c??
?$????L?>????	T????fp ?~cQ???>?PEQQ??Q???wc?nz????I???$?EKA]????2?D?@-;pb?D?*$8Af?.%pX0??N??Tp3?;_Q???????? ????x??????????K;5???@?X])?M???C??
C???2?e?#jj?9??"??{4?&??l?82N0????
T????????j?@?q}?Zfh??l??lqN
?u??
??j6W???3????t1?w?sk#?qc???dN?;??L6?????T;0l????????0?LDZ?ia^?s `6*Q??	!?,??????v
n7?7)???
vI&??
Ff]bup?N?*????[??????1??0??%U5`???V?????
Fg?>????S??"??a?JqP???Qb??~?-+t?;`S????jCF??G????????$$?g??r?
??4??H\
?*}?????~???3?p?5????j??-F?????l<C????
|??HL?Gh??>xQ0??k?U-????">???El'1]??B<???A?%????W?mD??)5?h???/???E??r?B???????s8?????;?F?A8N?N???????????=+?
??\??????A
X?]?W??8??Q????
??j??=?q"cv`??o0?1h?3?<?v?I?+?x?????z?X???1"??
?????pp??f1+??k]???#Qq?Y?>????k??0??`TM]?????????M????M?cEo<	VYKMz???????"?????l?D(?a
????
hy????/?!W?????U)?w
??
??&????`?l!????9??Lm?Sc?G1LJ%P?????Ks)G*P2?*X??\D?;??D??ARQ????_1?W??????b?????1MqS`?Ww9$?{??l?#?Dy? ????-\Gm??]???<?????NX??$M2??tBQ?
@@????R?H?4
?????gJw???:?$]?I?a??Qa???
d?)?S ????!U}??????S??"Ahv??zdur?????v??,?bPv????j?C?\??#??3??aiD?|?C
??	??/?1?[?>?-$'???N???Q?G.n$
???h?KG??kD???\?,L?<??5???x??????=?mB:v??f?a??????AY???3,0?*??p?W?E<{??}F?T??9?on??m?????R??<????e{g?8?+jX?
???_?A?z??v??	??`??`?g??m?
????a
e/?a?GvC
?????d?P????x
??@??"p??HX
HZ?B?+?2?i?????l?F?	???j&????("/?.DQ?"?q? ??>{ ?????d;??c?M???
s??C?2X"D?&???1j"?*??'
???
?
A???1??5.8?	$y?gg?F???Kz7?????Tno;???P?/?t?M?????={q??U??W?3?UD?orE?ScxC?MT|?}??P1wC?5P?j????}8??Q???m?????zI]?????f??}?Q??w]??i?9????4q?t????????[??????m3?A?|>?e?^:?????????o???x:??t?T]+??????f??{?=???????9?T?8??t??!|?H`?????j?????B??????????O?_??-?,?ySk?KN???O?????p?~?'?}v)???W??Sj??TEo,go?-?5?9>5U??,?U???????U?KG????W?_?D?????e?t??=???3Gla?U[??a|9?o???-????????????3zp??3>O???T??`J?Q?
?5???]???~<?8

??
?`@????????????`HB??g??&h>#?G?/$	t?`??Z??k???Z??G???Ej???HYA?'_?'????hmQ??J??iY?a?K???J
????"I???:~d?*-??}G????1
??`?????p@)?o??~F???d??d ZC?A?hA??G\???B?A???n
&?1?$??e&R??xyF???.?`? ?.1H?t??2@?q2???fX
f?0??Y?!?9H?	h??n?&o?{F??{!????:????.?$????e??Y???U1	????3	???a??)?????=??
?n?NV?????d???????!??r????a??5??M?
}??r???z,???XQQ?????`(A?"??Ec??????f%?k<???f??P=?A????;??5???<?j?n?1???L?bm?????p??{???e/????!?Y??x?m<?P16?~GB??2?????V+j??1??????9W?4?8Y
i&nf?od??!^y?,o?kR???????Bf??yt?????!&69?????"$2N&.6
??L??fN?????)?(.?<??????r}dr_???%????p???H??0?qa??'???@?:G?[w??<????????xGJG?-??:s<?1??q???\?'??o???????X?d>'?T+O???nzW?j?????I#[?^a?????J/???II??Q=	)_??[?h*}`?T?????
U&?7???????????0??x????C?R?w??r|???w??U @R?4
24TK?t?"?)??	??????q????c????s???/??rI????`??$????AY?|?y|??k>??_?U????????<mE?!???yl?,??77}??7?????<??5?O?u|?]?????V??+/??????c?<!K??;?ps,?s>:?]?m??C??p?n????PbH?R???W?^??BDI?8p??q?_kc??0[?
????????z??~X?/??T?x?I??0?M?C?RU??%????HO????=?[V???{??y????t?q????~?wa??????1??????????TV7I??3h?G???='77^?"?)?????????W??zC????$?A??.?	h?u?2S????!??AV?????????? ???????1?????`?!Cj?;????>?k9?U}???dQ?-?%P?azn?{t???????Pl?-?QP$????
c'??(<{E?????w8?5?8??u??????????8????IxY?$@?????3?+???????????A`??
???3$???J(3?k??z??i?v???E!??P?-??5???*?!*?.??k?y?>O?D:k?????E?Y??
????Fa??ZBA?8?>??????????????????????s??\??q???PH?c??U
?_???r??%O???(?>?*????AA????????p?e??!F???5O?%sE???R_z??? ?d{??S~??|?????4???;?????m??????`?M?q???r?;??1?????y?????uw:?'??w:?????;?6|??|????v?c??B?
i?J<???%??D???m??{P?R?_?g1??L?x???o?p??E2(????6?s<F?CO?V?????%:-??m>?m????????^???4m?m?L????e6?5L????$S???-?FW[={>w_<???VY|??(Q???
r???![?M?Z%?"?>?)HU???Z?6Z?\9?N??+\?W?.5?	??&?7W?????Z?3????[????;?S???!$??????s????$???Xs?U=MY,h?J?0?????O?Z??H?}z????*dp`????CJ???)?Hh4??
???9???????0??????????q$??Qy??&&???j?>X???B?F?????%r?qC0Y??1e?????2??(>???wH???oN?!??Lk?v???z??Z5?{???O?????????5+?#7????^x??W
??5??1$???H
?ow??T?a????54`??? .?8????M?%#?
H?3f?T?Z??H,u??|?#4???F??q??
/??w???????????v8Eb+J5?!?@^???8?+?/?????}[4??L???0_???&???yt`PW??,?7H0?????RU??`v???d@?C!?cB??`?@u???4?/.F???a??j185k?????d~PU???I?&??E!|???R)??b??`??P?m!???C?^????>?P??D~9????Z???????&7??j????}n5?????]?8Ub?-?M????_??J???~h?K?????????>{GJ?>d}????\I????????WT?4???c?????MPY?%.8???r?F????????5Q??+????-jQ????OZ???????M	??i<A8??,i?)?a?;????"[??
3?L???7??? Qe??l3?)"P? ?=V??????<???P6?????:????{d
m<?.?Z????
WP????9?2???cB?j?????9???n??/0??@??????>5??????4?M??!???i???Q??????Z*,8?U0m:dA??????R????3L??bL8???A*C?J?h??:,z????>???3???X?-W???#?(\T_!??
T???R??????-?? a???n??"B! ??	+???0y????[??s.?|?g????a?0sI`dA??
e??_?)?;???4???????<?h??"y?z7????Q?
?H?`=?;?J:|?bAS??DK??&_;!D??I$n?4??A?I???5
???I????uT?h??&?C?)?bp<??M???AbX?dQw,g???}t{?s????DX?a??T'???EJXB??a^??:"jQN??8?r??>?v?I???w!??>]?9???6???Xk??qL??0???a?E????~X??V}K?^	? !y???%aCb???[?&?dM??0??2?i?c_????
4K$??Hl(??V<C$_??/??-? o(
?
?
??&?W????????h*9&e??f?H??w???????Q???z???P5????????	!$?????????=????<??	??Y=Gwv~??
$???? ?UMA"@w??
|???o?????????k???@?>v?j&<???8???*???X???C?hF0??1??Z3v?ZZi??#dQ??R?t?D?n??N??3y???B???va?`?;??/??=6S?}\)HEK?????u?????
??.??|.?????C??$?nZ?`i?1??M/???%
Y???7????C?3<~?;??tk?? @P$RE$R????p?CO???w?7?Kq ??]??
????????'2N??J|Y?tYp\?8(??J?7??????Wv(???6?????W>????"c~BH?????????g?m???&?:z??s??v?:?Q?&DDpaA1?^0v?[??e??`????
Q????.;??)gk>"?og?????[<???G}??nuW???????^?|?F?]k?j??	???i?????????;+]???X?s??8>?cVk?c?|q?}?)I|???:????	?>?h?-Z8? SZ??W?/>%#??A??C???3??Z%??>?????M??N???????w?
eY?uY?O]<??Yk?J*K???a???n,?4?!M5KH??%LKi?#?Zg?eI??Q??P]V??#N?Nsy\??l??W??????+??(??}F??4???.[y??????0cC???0?*???sz?%?*??*?\?+L?h}MH?4G&k?@6MV??$?O#??(??( 5?AH:???'???}O?????I???2_??c?]C<((#^?;uMH?Y
?lT5C/n?jrn5j+Q???=*K??%\47???[?~????U?)?/;=6|d??FM?94?bY??%W9y:	??e?D?UE??????:
??? ?]A??Q??h?r??>??Y?W?t????j?{???nS??-h?#??&?5n????[?)?
J????????z?&6?b?Z?uYt]?s5g??2?%??Zg?M??F?\?<??+2?~?>?j?????v????N
????i??m??$????#|?k??[i?*?????!?R???q?*6PN????4x?
?t????H0???l??,? ??gC???66?K?E?"?k???8?>???s??0???d????L
Dz`??F?oI>p}??W?????66668??(??(??(?=3????O?sU
u???R??O5	?	~???QL
R?V?	??1J??`h?r??????LI?k??O?????4[?;?t???p?H????c??o pg;q?M4?CRg?*??'?d=?i??	U.?q??????????&k?QL?j?Fj?d??s???uq?#?????;????????D?5j??*X{?????g^A)?_????????????????Bj?.TIC?\1???*?I??????J??Y?}??Y?%C?????hL?????????c?G??k??	rwv!e;!?Y{?j}?^P[??!?*???K}R??;?c?tW???t+^/??b{??4\SeZ??i_*~|???M?
?d??
?3{??j7?l?1CPo?;tM??C?ct?d??x3[?????$??%??`H?=SS?d?#?n??????????_G?=?i???????O?????4B01
e????W???j	a?+??L?)??w?+
boa???;?&??%?/?R?G?^?0 ?e'PP?u????i*?????????4{??????*??G???7=??4?|?Z?????S??L>????????\??hsKX???`f?M?u??(45?t5?nd^?k???W?/?H?????u?^?:?b+})??s9????X'??O?Z[tk2o??lS?^????mI???ok/?????\????8h?*j)2?.?<n9?yF?o-\&???S^??b???????
?????a????????l?:?=b?2?'?6sV'???????s!$?33y?/+I?M????|??i??n$??ue?
??~???????$?????????
&IS"C$??U?q??-???*????c????8?????`???X?????D,x?????^8m7f?F?*????3")?[?!b
?@????i&I1:MX.J?S?}=Y?|??A??????;???i????n???y????
y_?ut???-??BL?m?L??Nbo4?????k???)v??PN66????????I????Ju???1?R??|L?U?:bJT??D?rO???!:????9?l??3d?p???B????;y? $?L??????o'%d?	?0?ml?&s?#????>F??_?.$#?e?@???|?????Vl???76?]?L???S?=d
h:
<Ex)L*
B????y?u9???U<\??W[?_??u ??3???h?????
??N7K???K?*?~????E?3??A??????1?????	?)?8???
;??d	??5(?[l?Zmo'c?<q?15?E?C?c??[Vr???B?j????;?*1}???N?8_e??>???UBQ?l??nS???????h???Hkg2??????t????M?C???????-?K?:S??xn7ga??U:r??rM
?dR??g??????????/H????M???o|8??I?s???????~??q?g\?CU'?3#??fnO????Qgf????Ai?Y?0??!P?w?r$cig?+7????WCP0r?q#r??i[?M^^_"?T?"????F?6???<PyR??4?+Ln?o?????{3{p?<?V?????"?9??'?_?~_wm??G*i?@&?8?'@??.6B9]?@?Q??!???+4Q?j$T'
?#-*??|???g????????
?g-|;M??h2?????S???J?C????????s????P?%-\e?~?????{ln???????W???5??0?(
?<?Q#????h??????J
???A?<?_?F??^
*?BB????I?????????0?/?m*?? j:?e=Yo?z_??'???K???Knh?????{????+?b??]!#??)Y?'????
\u?R0a?u
?<#??)???Xy#w?y
?'?1??????w???s;????@a????????:?%???N?q???h'l=??2D??? ?/V???\I?Q???}p{?????PY?m
?\?Q?p?pX"i???A???????cZ?????F?J2E?p?H?>??!?7?l???'??;#2'0"????J?uA?:???Q>#"t?q????\????a?}??????X????+	??}?>?D
%<???D??9??Ac ?+q?T at i~v?G?wQn??}8?Ii??0?kJ??H?2 1<?????0?T???n??N?nZ? ??
ec?S??z?

wjmZd???fw?!??yE?Z[7??-??M?????:?k3?|h??-???
Cu??T?A??V*?uR9s?I0?w7\????7_BmnDltB-?w?1{??Mo?O???g??_>?,*?y?PI?U{??g???m?c??S??v??????,?
b,?$V??t???T??{??I??????
!?%?n0c?YC?S?Zu??U(3??D?\]?B??a\>
v_?id??b?0j"9??3T?1?
o*}???k8yk?^????_??E???k??c?????Th5^B??VD-b???i??????=g	???????/n??^J??|Z,????C??9?????$?9
%3]<??t|????bf??o?D)d2N?y?nO??????J?@?"6P6???!??Q5?*???W???h??V~+7??ZT3R^=Y??????30(??gkm????????:?!??=k?4W<`l?0?+???(t?U'???????H at I??Y"?a???^_???7??2&^?}:w?4?+???bC?=m0f.?$?????+???R
?$FT
}?^?
??L???>????o??u?~??????0?????{?rj*d?G??V?F???n??%??????o???l??'bjO??-???"???z?0Y?@??f/??s1>5??FwRNZ????????(@.
?-JJ???I?%j??^?BG??9?\wX@??%???C?(?????@?_ at y?[?????1??L????????I?~9?x??g_??.?k??T? X?:?????ye??{n?(???????g
???]
x{??950?+?????k4????S????G?d?
?i?????i??e??? ?-Ps@???????'?N?S?pQ?n??A?%jN??1??I?3	????&?U????????????
?X????U???1-??G?\as?????_(bl???:?QK?? ????P???-??3l??????Z0???. ?A?f?&x?W??%b?<??`????8??-??6?n7????y+D@??[
?6????L?"??^?d??[{?&ZUw?????D?\?W=?-M;?T?????h(?????.o??/%K%??2y?6?}??F???d?.??j???????N?az??t?\?p???lST@????D???w???

X???[?1CC??g?]b?,?W.?%??ZhSuu?\-??|O?=?+^????(?~LE???>??U???Z3O}g???#??lp(Vh??????E(*~?)?U????Ta^??????k??Y?84?????a??e??L?
?]U??O=z]R??????W????=???!???3?}S%?<???/2??-/?a???Ro????????Y??a?)Ek(amC?????<??Qo*??.?p`Erj8&L%??T?}\6WC?????(??Vy?L?????`?55?AD?3????r,?k
???
??y
p??i
!G)??
fZ5??#?*?8?_?????['U\???Y?`???_????J?????j?$?JH3????YYH???8D?2$??<????'?{?????q.?l???G?Q`UNc???J]C????U54_Ix???|????6???m?Ba?$??~^?????E{??n4J?????)c?u??f??|/?V??	4P	??WI?y??????_???????7-?GI????#??7?O]?L?+?E?xdq?????????^?5??0???z!-a?
????8f3?????-o2c??????5p?Fp?N????#l??T,??%S\?5P9&!???[???????D??6_E?t?Yy/??m?h^??????Q'R???9R? ??c??/?????oX?J?
?(??yU??}7jb?'?Z9????aQHh??S?ITg(,?M?????8i?T9?d
d??f?}??%e~
v%C@?M*??V????8??????x?8????rS?S???Uv??+?C.a??.D??5?l??`}????"?O?a??j?o>~???9?/??R?q
?Zt????q?qy??????Z/??n~?:??#Z?????|-?s??&??h??????}?Q??c??=?????L)??0j?ER??F+l{?i???|?"ETW????q@??????????8?fpd3!???)??3	23[&?JC?yXD??????'}?x:??K??l?[???????PTL?;
j???5?2??>
e?3?G??p_???Q!c"?B?R?
????x????1):l%???-[J?????J??w(?$?7?U?k?f?]ji?/6??
????IXW?K?
?3&"??PVY???:?????
?x???u?????????TG
l?M?&j?	+???#80???M\R????V??^?zu????J?M?l`?-?cc??%?84???*?3|?&??Nu?j?s:{??h?.
s??????j`????:?A?????-?>X-Uq?????./?DgG??n?????cK?)Y;?P?????Xp?x??y)????]???^6?K??5?iVj
??]?Y?%3???%?D|??C2?f??A??=Y?t{??M?}N?6L????A??9?"???????Os?S|?,:3??|F?	??E?NL?+????}I?;?n1?$??fT? ]J?h????ga??????? ?[?S?	Y??u?r?[n?fH??Jz
?q?????????"?Q??=
?m2?kU]%|?&k??R?w$ai]?X??h?Y?i?(?
?$;??S???B?m?????xi??Y????ytT?m$z3{	?3??J3??\By?UPu(?W?g?/??TB?\j?????b??$@b???Hf;2??u???<?{??E????????{}>,???z???xB?E)?yi?N	{'?%??????i?V????n????` ??<V\???&>I????)4?'-P?bs9&???.????5?p??????is9f.1
1uH?H>/?
U0G???a?M:j?l?eW?b?? SS!4?8;??},ImdN?3u?Q?4??8??^atTj7?F?e???W?P,F?@H!?
l~??Z????i??t?"?M5?
???$??Wi6E?J?q(???i??I\YKr?X@??????P????
/|E?????=%;?????,}f?d?r?????
1????Q!?7?[W?eD????A????0`?"??}????????4??????3w_-??~?X????9????Q??x??[????zZ~???j??i??U??~<j?????92d?????T???e?h??W?a?1j??s,i??A?7?Z??B#r????I??X??b{3CSjH|%
"???X0??\?6bn?7???-????#??g?SX?n?"?T??r&?'?pzj???^???%qik]??tc??I??z?t?7C????@?"P0???mPr?????Q?$??<?ofi????1???"b?!?
??
?????Q+?+A??5????R??????<?L?E???=s(??Z??
??F?m2Z?P?#???{?{j?g>??????kC?i?\???]|~gN??? K5c?V
?2???&5ho1^?BJ%x?B??l~?H????4t???7b????)Z??,.i???Pq?X?o^??????O?
b?S>:/???x6?!??s?F???v?ao???/?#i???9H}<IV???????????h??	?
![??5????UYlO
??????$???w?Wu?Q???SRl?x??:n????$dp????T{o?e??,i?
????????????!	SN?Q??[J??LXH(G?1???[????M????????Y;?
&??????9`??aPh?z???]?c??$????q
?1Y?????Y?ZqY?{??
+?=?????????????.?m$?BQ?F???
SW?Y??
"??*un73-"???^?VNO?????Bk?@???	~]tD??N(-??H?`I?nk?l??Q??P?IP:f?i??'~x??W???:S?;dW???
?^???-J????Y!??'?j?Ye9=???0P?
:oQ&1d????b2(?0???aC?QZ?>A??z#??p??k?????`???????h?wZ9??N??5??N?-??`??9??Tf?v?c!??L?7?
????R(?bHn?m???)$??
}?????O2p?1??????W???)_`p??*??i\??????T2??+%?6x,k?	0_D?0???{?
??%{?b\?|?9eK?1?N?&7???
bF????j???????i<;??u????6G??YI??!r??#??f'y
?9??8???????0\??k\??????P)??????N???9???P????T"C???(???q??$w???:Y?S???"h
???GWEP??.?2?d???Us???????????p?A3?c[?3k@)_?????_?4?????1??????/@??Q
??}is?8???p????0X4?f???c???ll???m?P??^?u_?TxH?3k?[^.??I&|????(?????A????N5W0??*?j!?r?0+?Ua???????v????E?L+????PU??Ns?G???yO?????Fq|:?'???y????????%Z????r? ??P?V?o???????
?!f^?Y?1>??|:?
?w-?MX4)$`R?tdDUs\W????J1???T??????Z??	????d?`&0????o%?7z??zM??
??5???x??????????q	??E????????k????pW?Q?0??,?L?????^Y@?t?p???3o????5U??
?~=G??D??
[????i}?{??pbu?a??\?0ML4*???*(?28u?K????fQo??9?S?????Y????Ag???C?Cu??pU??Y?P ???4hd??E?S??Z?{?g?.?????Cl?I	???04??m???|>?#????4s}?}?!G-?:=p4?A?"o?6k-?>?????o???4m$?e;??Q??@?????z|?1?/?bze~???6???T.?z??*!MC*???%6Z?Tkm{?&?T?F????0TD??iV?*$GZ?VM??h???g???????XB???2??#??{a??,Vfe?-???\M?4?x?\????e"i???FKpN?+c???a!?n?CyV32a1???uJL?????????'?!\??H?OJ??|
|?7?96y?|r?2?7?5??b@?p=l?=Vv???9??7[????F?G*]?+???!?????w?c???FW?m??&O
??|~?p"g????M>m?@I
V6F??
???F?_^t?
???(????d4H?q????)??|z?Wgm[-?cz cy?im=?q?:W?5l??{I?.?n????7h
??T?r??J?)??p?@h?(1.-?'??\W????x?3??CNdc:?iV1H???????????5F??!T?????o??X?/c?w?V???!??&9??????0????+??A?d?26W?8_??VT???
?Z[???>,j???z???_~??[??6@?
s??'`v$?Ob??}?,???N?????k?Cc??K?z??CA*?9???g??<1T????{\.?Qy.?<g?75???2=?i???6?4*?z?]?i4??/????i?Dty?+>??+????:q??s? 4J??I???i+?t???aQ?`??X???X?
?f?????O+n6?_????????.??a???*????~/
9?#~P?|?3H?a?
ky?<?q???1IT?PjB??5??h??p???]@???tB\??a?S?p?#????L?
?:?#$C?,;B??"\???L?????v?Dq?E:?'X`?Y
Lf@?5?Y????Js;
???q??? Cb%?]Yd???a????>`(??W/K??????>??i?????i*?Z???6????????dB_??34]L?{??1?F6??N/?tU??3????Z??X??VBh4???x?i?9?????']y??S????>'?mF??!)??X?"?d???H?6??+???G~???_??,??
?q????}s?=zw-i?'-Z???????p??vc??:???LY???Gl`/???????P?1H?
?Xd% ?X &?BX]?dB!:r ?A*0/?nZs%|4a????l?????=????
?~?w????8??]?????\??\???????c-?#??3??,
r??s(?a??)	?Of???????U?_n?8????sY^D?
L?[,??Vt?M??????????/N??Qge?q??*~??U?\A??
a????=0x???y????x<
x&???c'?z,???A???+??*??????????,?e2nk??p?{??<?E{????<??k~<R?a}t;??a?1cd??;u?L??`!??B2??U?U?????L>??`??g??p5+??????C??<?????>?n??`??>?^S????:?Y:?F)>???G?Kf???7?!8??8?u?	???'S?qtP?'??'?u4z???0???T????????2??Z?<{=.???r???????/=??
?????Z*?~v?19?7???b

?@D?]??#??
?H?Q#?{u??1??????x/0*T?Q?}?6????x?9?????1??????5????????4???e??"??E??e?u?YJ????
1???'?
?^St
?z??p7`5)?j?PTh?X????mzQ}}?/??ad?????????S????Y?_?=	#?????<?????zgD?SDL!D?6R?ddTu?g??5?r??+TV???b#???2+?
B4?a??kV???y4i??/iy?0Lj?J\?1??6?T???M?(A??Bl? ??3P(??Xm)>????8Ebl???9m????b?s??J|??R????????^?R"???9_??a?Y?W??=?J??,?????????8???
?(???>U???N?mm?x?G:?1?%W?M?a??????}?{
k?5? d??l?k#Xd???????????? ????f???Z6???V?%\?H?T??-W7??5?8??-??6??u>2?iB?uI?????X???U?R?????Vu?????f?~?gmr???&+??$?????._???j??OF??c????kf4B???-p???.?O>???M/?~?*]_8?j)y??(?u
???y??q?]?e"???_??????aO+.?????ylu>z?%!?0?
I?;0?	???MqVtQ7?e>??4???)????z?7??5???'???wX*?j2??L?r?L??W??????????
xFsi???F*8??%?yJi?5?z
r?`|t??r+6Wa_0?E??6?W??S*??S'\?&?+T ????q???4T??d[?:???KG? j6????Z?$?.?5?T??<???Wg2.?
????37Y??????????n??(???
E?2#4cE,?ge???^???????l?????
????<??????O??X7??R??	R?gw;u?<?u???9??-?Z?W??=???????F????k????u?r??Y??m\'???^???????lp<??X???? l!?%?dce??0??p?n?????C;y?7R??j??x??;?1Vl??9\% ??}??s?(?.)????J????2k??AZ??
w??L??
G??=??????o9k??rsq??2]
u?454???
)??+???9/8?XQ?`?W'?
<`??????
?7>y_|?b!????ItH?G??u??
?	"? ??^(?????:9!Op??r??nQf???????PBT?E??cs)????? ?}?6????Y?%\?kf=??????????'t$?????x??&??N1?(???L???6?$Z?O?e???gN?cx?L1??R?faV?b?s?????G??????[.?B#J????u`7???
 ]??;??'N??&`?g+4-??x3(??`?4_?2??r???Q?z????;8?f]??t?Y??En!?c?y\?$xU	? ????N???4!M--?y?????i(h?JJ#??C?%*S??f?=1&	"??????
?dN?^#?
?;??
?`;?z-?I?8~???!~(??>.V>???
?hp7?'?7h???t??? #O'??=?!a???#w.???&? ?

?Q????

T?Ng??,?C??????X2?fUQ??E9???l??*^y
1???=A????}?????q??# z??? ?<?????+???????>K?W??D#?nw????=????t?_)lw?%@?5??6??hi?:X???_?E2?
M?"?0????? ???1(?r4I/?*
?,tR???~|y??'
??U????????{??#?8?8???\Y??f	??'??
?|vi???2-??????CYP??l?U<{!|ZJ???<??*}z????????????????8??????wl?'???Ac???t?#~wV?????qm/KkO??????:??????????O??????<???F??T???Y?1b%5?+????yb????????9?????UA???7?*Y??ymn?z+[y?!Y?????YB?????m3??d????U6[???H?p?g??%4???!?y0??^0?T1?]w????qn???a??C?X??HF?%{O?0=?N?^?t?Y??NY?o??????*R5?:?z8>/?{??(pK??K????m???^???=????????|~9?3By{??}?$??t?n??uG?E?Ko???P?L kWm????????slZ??]m ???c????G????-'?4zs?,l??r?e??{?Wko???y??3?%:Z?D?g????.i6??????a???>????OB*k?9??=??M?2?????Q?y??3??????t4???
????^?!?`??h?eBJ?.Q?d???]#$?
??=??\??R??hGj?O?U????3?O???IH?j???"8[Uu?-_-?!???>?b?E?????g?6W?U}n????,?G:????W$p????????dup?:??8j>?$'
?;???????'???S_???????=
???JS???(A??????<*?(`??]?????;?x????Fx:h$?????I??h????<k?4Y???N???fzY??[?
h$)	b!??D??w\_??????p??b?y[Q$[?Wd$??C??_???I	$D??Q
$??%#?I??????`??Z` ?YL? (??X??2?T?
!??i	@?hJ?cf&N??9OV/Xr!I2?(qc0??`??]*???H?BA???	??S?`??C? d??*)?$!????????&P?
8?H?K	4??D(T?1?ab at S?ffU?a???a?"|$E4?0F?L	x?0J??_??'?TD
???U??????1?}??w!%?H??p???;?ua3?z????C????????>i?K?_.[??????Ik???%?dV????
H????Z\??l??S?;??????M8|O???
&?!??$??jH??R??h)??i???n?z?%????????B???n??T????uW?b?n??9]?w??:x9?x??b?W
??u?????????????d??f?I????	~??cE?~????5
K!~????_??k?	I????6?'??TQ{}<}>???
?
/f~?I???$????&????????:	??[?im?"?yGI?A??d?+?0~????|~
????W??????????S?h??2lm?F?w??8?#-?)}Vh????(~?W???L@?&?:?1F?7?&??????b!w?v??}??W???$?k(??yU?????[??/?????T???????/??????i{l?_W=???????Z
?S???=-?z???9&^??PP;=NIq?>????0?j?(?l?1?]<?:??N???y{??O?t
:??O???<h?<]?Q?eYc??????Z^?1L?_[;Wg?h?;??o?q???N??S???X?????-????1??UC:?#??l6J????i?????$?d?SA?8F?!??????????}?K??_????9?w?'???????7??s)B?V???YL??\????]??*??W?FW??m?#sv?Z@?>?Y??vff?????\????b?4?,v?Q,?p?????????h?????Q???
C=?[??0?A??
??@9#`??l?N?`L?+x???8
?*??gl?Q??0??3?Ej?~?YW?@?C%x???ARG?p???q?x?h?X????<?OX???a? ~#???shQ0V0????_zW???A??l$?h??
?r?H?????)II?v?Bd??.T??)??
?KOiA at B}?9????#E?|???Q?_??????
C#l?1"?0??????????%???tK??z>???6?f???1?W?,??%!????9;	?4
?!?OqoO2b?)P)YY?+?Y????x?????0???2??#?#V?JU???D??+er?c????j??X?i?3?!??K&G^???Fk:H?NLl?C??M?n?
(???H?????W$W??fL1e1??V?
y?P???N?7????x4?`?????Z?-???!??MP???S&???3/33N?i??M&4T?Jk
L2??q???-??`8?%0???D?%x????i?$3r`H???5#e??=;HK??(E?@v*?#?{3N?4\
dU?@?uI?W ?%?6hf????Ff? ?	?UBgMhz<\???vB??U??fe??)Q
8???dF??????]c????B?1?pe?FA???T??5?6??1?j?L+!Rh)aA?A???0??M4?Ly?F",?U??4???????XZ???HPX?F?????p?D39(V?7?=H6j???k?????avb?1`>?aS?+
???X0a???j9$??],*LmjIp?????5???i?G???u?ts?????&?4?2????aXf2??1??k-.?a0t
??????<???????N?hn?jEwJ??L%e??Ha?+j?f?*??????1???2%?p]?Uj?"??
??uP	n?h??e,?B??y@??8??	?>?J`??]???
????@???&QzX???????-?
[pf'?A?h
??-?????gf??4????z??xz??v????xkX?????{vM????????z??:??1?(9l?-?q?9+?`??
:c?d??????Y?????3r??_?T']	Jm??bQ$??C????b?'?+??????Cf?1??`?i?:??#??ih?????
?l?!
C?RZ?p???&??G??jt????Ek->[?We?&??4?1xXL?diBD:????^}lM???FJ?iiR?%??3W?|_s?89?y=0M?T?S.?????{??????A5E?a?h????????AEZ??????W??R?????
a|?WKt?a]ID?C?F??????Y??B???SPC?.?<6zP@"2?2?S??K????OY?**?
?'???]??=?c
????E??o!?S??.j2????.Cz-??i???J???z??wI???:h?T<????[?9?{?N??llK????8?F?eP?2Q
U;b??zV?Mu?	????F???)?87F?w%'?9?8?A"?
]<I????
?>???%f??C??UB??e?=??|?)????????W???|? HB
?d??y9??????J+$	??<Ye1??K	m6Q???Ofb?9?%??lh?S$k,???4T?8]?v`??h??
?l???r`/
???c,????$7l???a????????.??{?]???h#?#`?1?)?????z???z?8???Bh[)R?5G??6;#???????? C?d?(??j??m#q?W2??y?=H? ????H????I+nRQ?QII??%?????	[@???k
B4?* o lAY???!?????r?I4X%??m?$?yW?????Hg?+?<?l:????
`?C?????<)???B???2"?O2X??????????8?M??5z??H? ?5|?]*,?R1?@?}?#l?{$(?4z
??4G/I
|4?1?
tK$????AQ?;???{a#n!??4,uMrS?N?]?A2?< {c?
?7?|?X at J?@d?4???]!?iPA?4U ??P??f<c#????K?S?U$4?
?j?h$????0????\f?H???F???J4@g?6?????A???????s???????n????)6?J?/fX?_iA?? ???4????? ?
?

'??k?XL?fa???#???
??|r????p??bRy bv?_-pB???!^k??)?E?5^?g???o?,Q[?R?e0??5?*MT?V???(?,???e?l?????90?p?~??????`?Y?
?J???????? ???9???C@?Bl?Q?xMA]?9?Mp);9?JsU??y?QNT??2!N??e?z?%x?
J???7:?%1???a?s2mr?a????u?O??X?Y?#,7?2?IP??2!???4YcG:GZ2(?<L-???i+?A??S?ul<??
1?J??'??		o?"??!?f?1?????Ia!??kF1???v?`??CZ4?????????f???????+??Q???N?i?e0????u?
???c<?FtR?rw?????(??#Q/]u?
???sHD4??p<???f?R?????7p?<1?h???
?H?????"rA?t?UA??L"???@?wF?7?<f??9??? ???.??%/?????????"??n??,??]? ?X??????h?I I$#HXX?(x
?m???_
O???A???!???,??P@????v[??T?1_}?b"}G?o6????;.????
ST??????C?aT
?1??4??6P???0?F??ha??????;???`%.#a>?AB??&?????f?/??)??Pt?t???(?1x???a?u?be`????R??T;t??f?T
????r???
?k??????$???'???F?????&
r?6)?6???!????Y?#???+??????*??????a?hR??lz?T?????bm?g?Y???b?/
??Sh`3#	?G????.s
PC??A?@??*?B????
~???D)A>?
%?``???????
???I??Q?j9??????c?FC"4?Z??/?%??
????
?CB`d?ZX9????M??>yw?;h=??s??? ?????l?j=S%????.??#??"???C?????C
P??\SaP9?a?z?
8?????,????a??"??4`!???84??s?im?????d???v??^A?a?s0?Y?[4??
?jsq??E??????-??2P??????e?W???&%?|{:%??i???`X]q?a???

E????P??8??}~?????-?t`??C????V?c?k????k^??+L2;k????	?sTy?*??,|?????+t??1Xf??????$W??)????VP?I?d`??????!
?rC	?y??wZFG?`?|??W???"?????y?zQx?2???z??30d????????w???O7??~??g`??O??! 1?????G???????~}?????? ?_??e3o?Q???W{}???????]K_?sS?k??????;m????<?xp????a?k??S?C?zi?n3?C5????(?+)???j?
e_??~???N?G?yq????U???4?????[??g4k??-9??L???8???<??#????D$?????Q??|?7tg?\dg?'?u??ecc3?pw{???R')=??/
G?8l#?:????????
??%?e??X??????m?%??Qq?^????
?E
??>?(o?@
/????O?>???8????|??E?,9?m??@???a????%??8??tl6lv?0??Q?? ?Q?X@\??
?_4}?s??	?"!?e?????<???6
?TC?$?52
??E*?"?&???DC????????"<?W???G???4m???OEg??m-?*S??$%p??/?9m??_Q?3???I????R??yb4D???d?
?_?r????CuT?[g?x[??,??"?B?Bg+?)???
65?p?u?=????k;??T?Jl5'??\#Y?A/5?iv?x?8????j5?L??6Z8??p?r??o???5mmV^D?6??Zi0??J??vBH??????[S??>?????%,x??tj??o?C?6??<?????\tD???Z??!?5??:?y?0|????l7?24????x?-??H ?o/?D?})&??w??????uT?4??YPO?+'??E??5???lg?c>PB???w?s??5????#???(2C????d8?E?M?
O?$?T?A???=??O[??p??7????D??T?]I??3?????_us~?}??????	'E?l?x?:?'
?q??7
?$?r?]9?dK[x????=7@????>?????1????Rw?KQ???;??q??o<w????????=q??o?HH??Pd???-??7??Gm???2?c????\w???09U??5??F?W?1???i#?Y,+?)????x?f?6??z?q?
H?????]n?f79??D???????'<?7Q9A???T?!??,?_???S{??:?&<g`?;?????oP?9?r?aL?????h?Z.p???=%??(??x] ?y?k{?????Pu??a?[>???%?nY?U?wg??Y?o?Af|??8{
???????j{uqk????k???????}|??+??S??[??f??????.B?
???(4?W4hL?dP???+h?\@0?{92?? ?	???H?????>^y??????}?uA??wRH?J
??????f???e?v?o????C????:$5?WV-?_???7?
??3(?K?*?yy`w????bLM??s???231c??
W&=1?	?U2%+e????76?????Z?x?}??S??+?N????:X??\?O??[?,?*?vvL???_??9?f}??E}A???MC/C(}Q?2?C??3+???&?'Ap?G??(?????;?H:?????/%Y?S?C$?_g???,1?c???[??2\a?7O1q?????{ ?y???>?}??6?o/5???S0????WMUW?w?2v?0|??????xm?o????<?=??>?-t?l|x?vb???,?]_Y?KVa;?N?[	???j9??c?????ZS`Jo	??w?=??r???mmMST?i?????=??i)`?p?^?????{z\n}???b8?????m???5?E??uXFYQ?bEG
???S?'?M?N;	D???u?]y?\HWZ?%?oIn	j?????g??l?L?]??hu????tT9??;??>%??U?Q9#?????q4???4??~l?70???~]??^p.??4&d
????????+?_g??f?D???9~3?/? ? v???!?B=?N??M??ps???????( ??y???L?'b????vF????[,?????|?YufY??~U???j+??Wf??????y?lh?~?????u?}?0?'2???4?p??x8?}??,3y?[
????????n9F?^???\c???6??
????4CuH
0????
?????????t??????-E?MK?[;W?5?"?+;=??K??q??;=u?g$?e?:&?u?Fj????TY??Mm?5??K??~???o:??????S?jqVU?/?}ytr?z.B??w85??t?X%??f?8?>??F{????`??L??,N?k=??F???T]??	:?H????D????4?K??q?CK???QIY?*???+????!?/????????Y?/??N(??!?L{??*a?GT??Z/??s{/?6??C?w??"?3
c
???PQ#"?~?????&???hOG*??i&?????v????d8?l??SP!6????? PH??@B??X??@??qJ ??X???uh?H?C?S????????0?MP?fj*??"?L?P??C??q??????0f??L?
q?,??#*???d?Ga?
t!?;G??WP??c?f?1???????V????|?eP??*yHW?~??VT?|???
????M??l\???{?T?
??@??h0??\O?q????l??,???*8J?u$W!f1	*F1?T)i?
+????3??b??>??V?M??,?M@???q???U??Uf????sT??U?f??6H????vk??c?]?_Y-,4????yj?z?Z9????aiVF0#??6?adN:?t?
???????F?x??,?|??e???+?|??F????????LugR#???q???b?!?????g?????n577??"???G?????????Z??\W?~???K??um????}??
CT|?v???H????? ;?-A???	K?h;??	??#??@>
??0??m(A?3?;??+???B?e???$???]???cN???F!?kT???????uE?Z??=i???m??}=???[?}
?=?}??????]_???-?I??????*c??>?f5 ???f7??i$um?R?8?\H??;?U
;?=?*k???e])?/yAJ???g?y?mG7
aV<??????9??"?Bj??*????????L/g>[?K?????5?vT98???r??v?k?@0?C???1hn&R???<?9?MJ????? /???9!?? ?t{t?6j??_mq?E??????S????mN@??h???h??[?a?zv????1?-RV??^??g??u"h?jO??????????";???(>?nmADn?????s}??????,?>]?b? ?P?(?q?SON?mA?-iFk??["=??R????????-5u?)?u?%???9???0`*?1u?b????[Jf??N
??????
:<	"?!?} ??oG?A??}????????????2??
????(?)?aa[}?v??{'R??.???\
?!?????\??P1?Vt??7?}9j???T?l?\??"?????????NLX???7???!??e??	}??
p?????????N??(???NZ#l?S/????)?j????w??????'???????oYA~????/L??J??u???%??0^?#?M9?>?)??%Z??"?;?.%RdaY?Y*?mel?dN???`u?Q??0???!??+J\?\y
?u;6U3?&??!r????(????(??????b???T?W???
?s?Y?
?*3Xq(%??
6<5
??????????c??T??e?cG-??3?5?3??x0eO?u??r?s'A???PiH??9*b-???t
}??k?ZC?>????8?	???????????y+??O>??6cR/~???:_f???i???}???b{?????@~`?f???y?
~UP??U!???#e??ZF8???ItA?????!?fA??
A???*??
|D??????????29&?aPR!???G??<?j??(	??3?ZV?@?
L{??????I???_?;D?`?^lF?Y`s?$?0:??
'?b?{Y6?>Qt?m?K???$??" ?7?>??E??r?iKS???Z?<??chq??mg?y?]??`5?X\??uUL?h?3?M,4??q^??????xw??8L?&????????_??U?h
?9uvm???
ttvv??l?<?rrp2???D????????v??????Z????2=??c?
????p????V|?~????a?#??2}??????B?9?t~??UV?lU?aN?:??%?lxY?X$Ev
???>?dO??y???C3]???Gn??rk?0UG??????|???C??<Zv-u?8?GX\.C>}???YU6????J&?????02??p??t???K?qG????@???H??G#
0?>??y@?i?z??D???u???,?u_?#?N[?XG[6?GN??&C?)L??NhY????????zh?!pCR:a]Ak>????w?l@?A|?"??2???G[g????
??0? ?^7&%??L??	\=??fu??M??$
?????w??O
>r:???|?Li?????<?<????_Cudvg?L?b???c9?w?>
3??C?,|?????c4s??^?6????,???Ty???7??_??z?? ?}@?????????*???h<??(??
?_:??M????~??S*eU?a??1A?F????[?
?2e?Y??3???J?Q??)?O??0?8??>'?3
?CJ%?N??[#?????DG	?FC?3/???r??????Y?z????????w\?????J??<? e?uo}Or??K??[??P??f?????????Z?[CY=??oF?5???????????????um?(x??????x?m??W?B?P??T(#Q?LV?????Gw???Kx?Z???;?U7q?:TgT?Q?4a?{\????g???=SN??;^JX??????	s??hi???e?0????f7?x?&b?????Q????AX??l"=gj?1??9Gn/,???+????2???8?4a?="?
J????M??Lk??I-?@??\:a?"???UT?g????4KsA???>???l??-y\????*.?$,??%????????1?????c???"W?
????5>??i??}X??x??Qu????8F?p ???7#^????Q?M??????,?r7*u??yQ?e???????e
'?????7??8?(?+VMj???_Z???c?O??{m?{??c?<?!i?G??IW?S?????2?@4?O??H+????~??Y?????+????9nFI??<e/??????/%x??????""#?~?_?_????'????"f4~?
?7??~??9&?????T?8S>?L?<D?Xe????R??0D?0??z?)#G??5?????"HHF
N???:C2?9?|,s?%?D?W?? ?4?????#L????????t????8????q
?????/|3???3?0??X]v?`a??vR???rWa?	!97E??=??)???????d????#??E#CDM#C0?X"????:y??f??x8S????????w?????DP?4???????y??-C?=?. 2???
??w?#Z??????Ev??B?T}8?????Lo??v???o
???z0????????????b5?tq??`j?o$?g??f???8j????M??c? i?5
?
o
?????U??
????????U?-??e@?8??1?~??+??}??F?

?????&E??U????????^??????`??6.?(v?.?<1?x()???N????B???1$L????F
?!e
<??????*n??4?????
?"$??~???V^n???*???tPLb????h.??[???W?`m??6 ????e1?=952?6>'?9Xr ??xU?6?????dAw?e??$?nG?'?????mM-~?d?h?<?j&v??Z?~g?	?v`=????W??eC?D???m?J???O??=?????q?$?????Oa?IY3???-N?6k????	????\?E????Qi0???s?????)T{???0??eH??8??u?~?0e??HG2B(??g?]??Ps???b??e?w???A?Ou???)D?Y???L???3?v@H&???S??d?19?@??????{?R?+??2N??????c_?????????w :_???'?c???Qh[8>??)J)?Bo?%??)??}Y?$5"X
??AAE='?&??B???????7??q??6?)@??


(?Y???B_4??}?>H???!??'(-??;Pm?"??&H?	Q?S??{?A?????<zP????
???? d?$t??\8iy????>z7e[?????Qd?%K???*zz]L@??%N??n)0?`?}?t?\<??0??|T?z+??????r?V?~M???szh??Nl?4?H?
??? d???&t??,t?8???<'??#??J?EY?D??e???y????bp????j?X????
?=?E??????
??M?W?Be?3?w?1|xm5?bG???E??$j	t??s?????9?@??d???n??????V?}g????f??????*?SE?P????f??q?????/??b?	??@?	?=???j&S?'?'P/???`*\?????@-z?"K?Z?H??T????6?aa:e???<???Jt3??B"???q"J????????!?????1	??h?{?w???J???w?D[?s??z???_ ????b+???1?G??M3F???&"?hx?DE??
:<s?!6q??Gt`h???%???????*???4
?{????Jaa
L?%A?k"?V??A?!???7x??%???cD???D"3?DHsR????~?????4??u?,K?X??Ggm????_??tV{[???W???????1??Z?U????Zg9?J?W??V???79?3L?cj????D??????l?{??;??>4-h>+???E?????+??O????c????[?2G?3??-?g&?:v?L4??g??>&OG?u1???#??????6???0?X?????? ?*?.5???L3Z
???E???>??p??rp>????6?l???H`p?????*??!P??|?n???a?(??c????Wz??e???]`???[??{??8X??a????I?????u?????{?z??????????q?{7}?Et??????DD?)?B????q?j??dA?%%????Z?Fd?;e???????V??????8o???.???a????M???n??K???hk0D????*?d??????~?jD???????M??????
?v??a???%R??z??51?Tn*
??
#1?T?H?KSY??)w\R?F???)?5??Z?SA??i??|?B???J?%??Q?2|H? s??@S"?g$????'?,?Ow#4?5	????G????yXY??<-?#IK?\	Z&w?{??@???f=??????|~?????????y???TR????????V????-/??t?;???inZ??-???i??\?2??????S???*?x??????V??uyk='?[??n???c??cMW??F?`Yx?A~???PXG?/E?w?~N??Ld~O34???;??????_f?~
,?&?fk8K??"?.	??Ls'q?????4v?\?b??1?eD??p!?|J?>z????????? V??\???'`$????(??X?0?L?C2Ut???A?/??u>cQ?Vg?l?k??A?????ZM??m?D
?????uf?????<>?X???c?7"????m???Z?.???pK?l??)?q???N??}???u?<??I?y???w;??]???<Py?5???x?7m@?hI??m7???H2?@?????9O????.?sn???]?4?(s6k?&??????.??m???:??tW?~f{oy?d)??F??#~4?GsH?????sIaH?[?!
?M'8P?3?????????v?????Z??s??1??k)b?i?m??~??f???????||l?de_h???Nq&
O4??rzhM#S?_?? ?D???eK?????1??O?Y?SXg?Y?????!?-?????c?S4b??bMI??=?/???XU??jyJL????Q???h??Fd??{|?B??o?&&???j??dE?
???Mq??????+??Z?$cr?Vs????|?8??CA??????f??>jW????>???j3,[??????????)?O]?fni??]%?}ww4????p?_f?s?c???+a?:(b]?????9???%D1?yw???d!
 S????9?Cll<$S 4.I??????o??wp??/?????('?#qdFI?4`??:e?;W????IF?y??e??i???????
???k?????+?R?????n??zHl8:	r??p??{?p??a??z?=?Mv/&?,???/?2???e^???]eA?*k??m3???Ehr????????u at D?*?^m?u????????J??D???R????Q???U*?8?(:?h.L????kT?????g????f???:?.?U?t???.v??{?r??"???m. ?3}s?C??G??;??q????eM???????s???????>????
S??ll??P?~??%:<@(?d?????s???1?????V#?T??Ge/?q+/G=?
#VRb	???&?9?=?[A?n?]?+??9
?}??/2?N?Q+?????r?Q???B???y???E???}I0	??b=???/???'???7:???v~*?4????O???r1??%.[k9I???u???????\F=?W,??k?,?'???N;?~???~?>?-????g?}&_W8????J?(=???|????'??|%
?Wm`?D?????":b??Fb?T?YU??????XT???2~g6?C??O1k?D6??? ??#R-]kuj?8y??A??O??h?:	76??zZ?
,p????7?????7?O?/i??l?6?Yw???G?`br??A?6zN??S@????,)0?C???}2?bH?\?????n?B????bO??????p,??`?_?P??k<w????)v???
??5??`?*??ott9??????k?????z????KD?4Cg??5?$z%^H[C??xKWX)[?V?fHn^???*???<RwD?Y??#??$?*??x2}:?/?W7?Du?????gA?l?;??/?M?\ii????k????3???q?h??0d=Zn??6?)e)?b?oFS???Y?c??Q??????V?F3+Q?J_?q???q??r?c?v!A?W???????i??c??????(?O?N???J?4?y!<bwCd#???Z?????JQ/????????w???C???v???'??V?,??Y#R~f??H?????a???A?:o?u?G?`?4AmI??M???????>??=
0gTn?0?S?????g?d
?????u_?l?C$??'zP???1?<?c???????;??????????y/?frs
?#4x???=p	????
>hPK?E?lUW?d???P3XH???
"
L,Y*?J?
??Lf??%] ????s?USE?!??@?J?VB??N)m%?66??l?h?v??!*!Sr&M?T(?)(??S7[1C??>?J???c?t?H??FiCt??d??#]4e?R?QRLUMJQLA5$5D4?@P??b
???JC??????p??Sy?P?HJZB?`????(?8?????mq??h??"????M?Q????$????a??p"`fZ??"b???$AE?O??g#???>o??c-?7j????9i?~??n????A? ????????]???q???????CSWQ??,????&?e??????o?:?I??K??R!????fV~9????gH/??kEs?:?)??c?k??9?\?t5?@82 ???7??D#??????F???4MIP?r-??%-??????s?????Zb
?t????Vc?(phe????M?"??f????. &D??"?+-????L?s?)??????@A???l=?
?!?>B?????????eE????iVD?X????;?Q?}G1??AuGI?0s??7?M \?,????yo?%????W?%?r???v??I?~?5?s
1ZN??N[U?????d$?p????\??%?v????????QKE???p????Tj?2`6[Ij4&}<???v)
???=??B?e???]?)wWC?V?n[lyz???w????>w??<??@??<9???'s?l??f?????????x0B?l?wf??r?????\?N????[?	?	FNo,Ra???eF?L?,?e7?
???????J???????I??\???\?b???O?t=G<#?`z?NZ?=??U?0?????????????eUTETDEUUUUUU5_/_???U{?qq?>?N?GN._??????j???????????????f?]?w?u?\?a???0?**&$??F? r?'/?tX'???;u???N??>?m?+H??70?00??#]c??I?@?????*?G}O??y??M?[?[?_nVtQ?2?_?2???^5???%????e??????Hg???Y??`??LSV?l-(??Y?	???r;?#H???????????????%{q???EQ?D(?(+??????.D??v'??u8<?T??<??H?U?L??K?KP(T??$???`c?l????e?????w??"i?ja?o?z??L?
lyA}????m??bu??i?(2/??LK???FmbX??????4??(?--`??kZ1?j?1?)???P?!?4?????>?p5@P??MV?P??97?i?W,??	??T???EkY\???Eo????T???"6?/U?O??B??
QNV0???`h???Y??????)?g?2?'_+??;Lz??????????????p?5????????2?????4H???	_}?9-????"??-C???y?j??;???v??????m???uUo2?<?3?????fUUo????d?m?I?N???m?,??A?,?	?r;??5?#?
??;?7???v;4@???8???J????~????????????6?m????"??????Zm??!?i???H?^?4?,xrkm?"???B???9 ?&s????n????5v?eUL?@Urfr?P??????TJ????aU??j?????iG???v[?1t,???mwZ?????????j??)?(a? %"H??f?????????">?^????????p?D4??w? ??????-"D!@D??
+-?=_u#?i????&?`gLroi?a6?F96c???1???@^???w1??OymR?G????
Q?i????????????D??y:??j'??????JHlAT?
$?
#?????jE??????Gc??<A!k";A>??O???O?$???????eR!?P*?I`@?0?a?????{????????????x???9?2Jc'I????#[???"):2+?>??;#???1c??!
B?! ?g???N????m???T!???tu?7?????]?$??
?O?YB'-?H?HgB??
P?e(8P{????C???????????Puww;(i??r?????M4:???F??A????
M??0,?*?
B?
?A?U?"????H????e??=zn??<??!???d??
L vf?C??x????}g??lA?_???
?;??x?n?!??(??U1~?J??)NK<??&?\-?>?? ???????T??cZ???~?H{?e#??_?J?$?????OI_?@?????:!??B??F%L??tw
?k`???f$?8??c??c??'???<?1
??????B??U(?r7<xW??????1???SK?TE??FwJc?
L10??O?,??uC??@?????:?6??????C$7?zK??D????<|fL??w??]?n?H??^y?|y?AT?a??????6?H?p???9.??A????8?qK??9??2P]?P5???n?/????*????Z????N??`?y?t??????hcE??TXj?7si?????)?68&?ps???4rr??c?B?Y(!?S????d `????0???kx?3
?? ???+
6?????G??^??[dC?????|???tX?	? ?zC??<?|<?%???
MD,???t?Qm
????5??a???q???Sd?u??????%x?Y?S?
?3?xGnZd??8?K^
??O?9j??=7?????r??_OY?5?*?(??G???@?:??
??
hE??Rl??`=s?
?U5y?}?>Q?! ??????EG?#???<C????4?d??b?+sT?0x?u|?S?N?`?z06??d?qP{I?
???iK?y]??{??l??
1/f????9?rA?|??N4?0h???3P???????|34?C??A?!o????
JM (?s????=???:u?LU??l!A??@?Wkz?N????_??.C ?GCWP}^??}?j?q??????n?fw>v???$@?H?A?6r?P"???lc?a'?u`?????#
0
h????U??ET??ab0?????-???0?1x??>w3??2u??*??L/?)>???5?
?6@???J`??.?~C???#?%b?V???30??##!??8u;????wp?w??pry*\cO?c?????
e????????B?"p *?"
??????|W???P??_p0Lt?f?L?,F?I?????`9?T?D:xl?d`??0?????`?
??>*???	???<?Q".?k?+;?XrG(Qy?I???s????S>????????????UPM'bwv?W7a???????p??4???=??&??%?B??s?v????&I????_?2??A;Q|`Xu??=????@$dD?R$J?*??p??t?^??'???/????f?lP?X?1??=????,l?J?p?J
NA?2?
f?????=?	QUC?bxyhP?\?C?????P?\I<?O??P?????(<w?????^?k???vxe?z????-22$Rf[b?G?????W??n*???????(?Z?48???B?
?}??28%H"H??H|OxD=?v??/??0c?B?x#??j?C???Hu??????)???J??sH?O???;?!??\[?R%3???)A??spE[=?Cs8q???!?.?J>?S?????.??????.`;??8??{?'A?K$??EP?!?
??D??U?>MC?P??kM?????????`	b?#??i?9;-AE`=?F??@????<3xN|?`???g?? r0?\{S???]4?p
u?A?
@???Gc? ?d?r??6S?@
%?
?*?'
?S??E!??8??b+???8??G??Z@?+&m(A?C?,?
?K?/????YL??$?p?????[p$n:h???Z?\
+C???/???^$"???T
)Y???'????^????{???????]4C??7c??]???>????'pfF?8?x@|???S?^;?nl???-Z?-?=F?qv?
`??"5????!???
|??B???N?w?R??????OOJ?
?d?(.??DAf?_ at A{????|]a?}U?!k??u#?
????'Azh?o?S??W?L????4f?c?li???%?Z({
?
????_h=?MHzB?)???"&G9??????EWapQ????r?H}G?oJ????????5>?D?????>?N?#L9??wH?????s?3MVt?0>tf???????}
????rCX=CA?? ??L!!$????c?5??r?Pb?E?d?"??&?~????<???	}???{?.????2j?Ca??zK??}(z???????")Ly?G???4<???(4?|?
?<?6<?		
?q??y_?&j?4?%?'?*#?
4??x???i???7?l?????????r??h??1vV?R???F??$?`??/82???wH?>?????o?????N??pw:?+????K??9???(???!|pT??J?Si?m?0;?{?/D?'
?G9?IoY???%?????F?t?MR??????.?61???UDkL,??	%?u2)?Yi`|,0,1?,a)]1?8n/?6V?b?k?s?T??[?W? rsg?%?ve?? 1=????	t?N/?zG????C|??L???JjI??h&i???+{??\??|S???????=?s????m?B?j?7	#?h9???
?>T??u??hRf?6?C??Aym??????B?L?>@????
??s8
?D?H???=29?]-?[gv?9I??-D?ku(	 ??0?Sp#Y??>?l?"
>#?q??c_??3???bhM??p$i?z$81?B?BkK)T??P?$
?=?& ?>S]?LTA?L???<?ot??
???qC????G@????C??D??????.??u5?;0???
F%T2?(;Oh??<???w?$?a????h
??[C???A?4;@???`>?"z
9r??"? k^?I???D???????Pq(Q??N
?QF?O_ ?07??hu????B-?H??N?????Q???'?%D?	?k??J?n?	;?)GsF??b&?ats?;??C{?
??u7????w?Z?\B?)?U?Xw@???
?KG????? ?]?eJ??-
39
c2.1h???,??(???
????0?N~F??D??'????{? W$`2/?h?A??1?,??zJ???F?
?D?T??????0G????;zw?Q?Ow,?7M?MW????-??w????u?S?S???i???f
?v	<?c?????+?K]E?I??\>
:?????????
????@}???k?Q?o?I?????8h?????th??D????M(0?????0^?=?????@G??gO??)??O????q??;>?Zo1"D?*?i=?/g????(O???fg*?2Z??%RJ?Oy?????=H?t????>'????H??N=??zxi?C??U}??L?????????yo?H_k]Px?sy?f?(???t??E??????{wD\u?????=?g??J?????G
[	?,?B?G?L?;?????E?<@????&????i?f$
Y??,p>?2'?O?????i?????@??n??f???FO??l?M??????
???/???I????=}zv;?
 ??h?w??G??f?z????2?+?v?o``y?7=?y?,?g$9t*a?wA4
?M???L??1?? ?z?m?@g?O?$[?/z??*??+???MEU??[@??`g????H~??d???D????(?!??aL?e???9?X??????%???
??
?o???0?????????
`?O??!$Y?w?C?C?R_8y??U?????????Q?|??b??{??>?`?1???32?L34v?rk?g???98%BHO~???7?
p??P?!??FP|f????(??a? ???*????-??I_?g????3??????z(h???A
!???| Sv???M??u?1?dId+g{?	a?0a???[?G?}?????????
4?mzD??:?
??#
!I???~,lNBD?? NA???(?H3?*???dE???L+??yCUXz???Yge???p?????]??:?V???*,???????L?!!?????lm??]T?E$]???c|W??Y?nL??????p)V?E?? ?Yi?efqfoU?yU?jq1??Z
?????#??dri???#hF?????????x???p??*GuQ?H??0b?`}???/#????EU?&	????xF?s01'?&??@??q?????????????
?z???a????
?n???Gxh?
???$Y#1?I??w?wv??Wc??a?
?LlM?s?&?C??S?P?i
?gE?&??)???R???'?-s??`???}G?????4???"???????d(????Q?,?j??1?SVIJ?59??/&I??????gl?m7?Z}?k?+?@?oP|????"?t??Zh?}SZ?m
? ]?u?/e??+?AP?s1???r??:?D?z?H0i??=? N??EF--?n?,5???X?r%????!??	;??)?C
RNQ	???C??????"??}lm???),??
?p???Ia???A
?6??@ ?? ?y	??*6?9?aB?BhC0????>!2??>LA??7??Wcxi?D`h?\?T?GX`9???:x????y??	??8c???????????*=??|???m??D??G?j4?u?*?%??M?B??????>w
(w?Z(???\t????0??????0?30")2???	?3?3Y?J??M?#??m,_6?^?j.?
@ ?4?`??#????&????V???v??.?!????cp??9??pa?tN[n(w??ty? ?ri	??????a?(???f???Bj????
??9???MqH?l?R??o??T?E2?v?0??	]?8Ux?x???0y??,"?a4=fk9???????r?(g-??
Q?D?Z h5^GX#?t???y|?p?N??C???@:??!?0JP?bw??
?????7????*?;AmAE???i???????((???(j?p;??pw?h?%??/Kfy????]xpw?\??tp'Q?//???^?HibR D`????
:$?~?-??=D???|N?CQLH P?
 ?-??!S4?=q]??x?^??
?EZ?.D??+???GA?hB?$?????nh?s????&?`L*Xx???W?!8?????_??;??d??t?w=\^???>??N??O??<?r?1??g>a??Y??e??,?g*?o???y?EW'{?e?v??`???:?NL?H??sDA:!
???f??8?w?Q`??Y?L??3?dK?$?y??N????&pI????MO?????uw?:|`?aT??"?0R2
I
?0???a\4???)?]??5

??i!??C?c??9???O??i:??r`$C??=F???????w
Q?x??y?a;M?_?h?n??Pq?4^
BFB	yp? ?6??!?Oy?GxF??????\8?	
?????V???DS???4E H???????0Z#?(?{?q?>s??p=?;?IL'?????8??n??&?C???.d?)yj?K????#X
j
$M:\???4??
Y?[??. ??r Q!:T??}?
??
B??t??1??????
@??
	??R"`?41???????p??
?@?F?]B???> ?1
??:U??????y9?C?????,?4????V?????b??<?_)
?!}?2?"?`?i?1?%?R,0I	P?	@!?_?????{?/??????OT??^??I?D??Q??2gJ]?????e]?+????$gi?s?R?CR?HR
?@ ? \220?lK???F???g??P???'??#DDf*d????B	2e?
?????&@??wFb??????;?47??n[D???cT????????z?>X:'?6?#?+w!9???#o?J?????"	
&%?)B???{???

?(F
F ??????/?U?PB<??????l?:?C???{	?_E
??r?@L??_???????????o
?A??????#??D?v?x???]?
???"??K2?tj(
mp
??A?,?(n^rQXb?#T??p??E??e?7??6????5??,??
??+?Y?2hE????:???!?????f<?J!_??w??B5?&

??
R!2?E"?h@?0?=TH????~V?s???y?d?7????~?<f3/?6?qp ????????E?L????1v'?f??a1y??4Bi
????LR?:??l?????mX}?>a?|??SL?B?A?????t.?#L????HhG??)??l??h?=fZ?"?????P&
J?????"?.N,$?vA?"?H??*$02j?q??0,?2??pr?H(?&??v??B????D0???r??F??(??>?c?@?03r?`?1?n$?"??	Z????)?O?|???S ?KL?%)L3,,??????;?44A&$$`???A??I???Q/???/??s?V??K?~?i?tN>e<!(h?O?}?@	?""YS!0???P??1??[??#??pi??a? ?L???i?t;?y????,R*0?1??{????O????0s????q:a????R?/?L?\J??J0??
??D?Rj	??<??*?y?l?A?B?tD<mbH????????]???3
?3j?????1v???p6;;?`?"@????????G?W?6?M??1P`??L?K?)?LC?{???????<z???2?dRc??m/I4???R??8?pf?b??dN?;?Nx"?=??W??, ]w?$)@????????AaLD?M`?9??dS?D?6??D??tl1XaZ0/h?)??L?H??P?????????z?H@?g1????S??~?S?????An???$????~?????D5_WHG?>r??XG:?P?:V;???????R?
NRJE?(0?3X?	q?	?j$SLo?L?"??!?
?KwF????`!??|#?hQ?B"??????0??(OT?B%?>c??*??2?(!?k???]????2???NB?????y???
U#@	?0??J
"?e
?dD??|????cE"% B????z???????I??
?#
?D~v
?&? ??????
????
?\?aF??	~"$??
XzR???s???????b?S??o&?????${A????O)1>?????????,?&X????p'0$Lw?}V:?|L???????w????R????W????^R"&?H at G?
~
?b??y?????c????R!??
?I;?7??? ?
?A?P?qULc%?kH*Q?.B??!?4&??Q4????q4E?U?h?X?$XX?+R??j(??*?h??\*P)
??b??????{d?i.f
??!?
Y?]5?
??A?F
?cbn???(??YlDRFB?Z?E???x
??L*?RE?????0"??(?@?Ea?h?:??g*&??d#d?:?IRJA5/Eq2{?{???{??o?gD?a`U&?S?B8??mtbH?T??5$x??????KC?1DG?t0????????rx??U?>?a?$?I	????~?2P????IT?%UL??B??$6?5?A???[K(?Q
?A?)?t.e???w?\oM??0	Y(aYlo??xS?C;??G??$nc+I??$Xok)?x9??$????uD???hC@4????*)??5??p? ???B?#b????
h?H!BHD?o??>?????d???{?466(?3$=??8F.?9?|K	V??????#_??kw
?UU?IL_LTM??\?$?s?n??'?????4??????G?9d??A?I??????>}i?V???^W
??")
?l[q]???2GJU??hU	??O^??a#?_?_??#V_*J???b??	aS????DR???$L2??P???FA?l1??????ct??Dl?!($??.???#

??MU@??3/2????L???????g???|qD?XR??#D?MP??'n?o??Q?F?G????N??68???S|D}??^b??I?<6?
8IX?/??f????&???=X??(b	Q_<???????Jj????
?+-??I??????2h?S?q$???J_???????.????
?????C?!?Z??h??
5??6???
??? ????????D:?q???v?l_KeL?aA@:?N	?
????h?V?H?<l0????1`???????(????j?b`?F?h??rQ??Ep?
??LB?e??b??e?3???w?l?.96X at 3*c?{X6??a??a?bM?8??CN>???ma?8?p?9?(??HFZ:??
(??#??")'???
:q6/K(?/U??+??}?J?
	??9RK???he?AmD?N?D??
?c?v?8?L6Gz1?????gB?Nk2?FI(b?a????4??0?h???K&K^Pn?WP?c?L?eM????l??ud??&
???D??UQ??1??L?$-?0?? -A?
Zi
0?4???aN??7=;Vk0?bf8p08????;?L?J0??????h?????6??AIf??<??2TJb!,b?????Ji?C?? ?0????`aV?,0?????\?&`7YD??
???Ieq:???)\|a?(?!?2?n+?I??Oy?/????8?d? ??d?B?Y???B??Z????????1??EM,U???0??#?f$????B ??J$?q???M????j?? r+"h??-m?E1??S?L?Vip???2?T?E?J???
???2@?X??
H??
R?b??Xb?eV:P?5,0?", (i???`?b?h-??0x??r?$rB'A?((??t?q?????
:}??JJ??,9?/?@?
???I?
=68/??hSc?g"A%@u#??.K?tH??x?n&w????j*???l??a??A? :???5?F??\?=???0Y1??*?mQ<??,X6???????_???J	?!?89?<????p???7<??}?E??
$?0?$??:?
	U?`?T??R4Q9&k0???2?CE?L?1???H?R??PR??D????!`?
`??->B??????C??.?????{???}??>?n?{9??!?q?0????12yQ
hkMj??
(\?h?m?C?<?)????.??M+B?!h????/??u?H??Y8:5p??????I??^?Ax??
???MI?
?
?
?1G??L????BoO????
T5???X ?)??2?A at I@???v?ZR?y??Ec?>?.N#??|???S??~Kx?8???;?Z(?!R????1vCp?c?z?UUKo?>@N??~???C_Ff??D?i*??C0Oo??M|?{$???w9?p?((?H
`???()!??3??8?R	C&2????5?	";d???R4?(QSB-?fI?U?S$3(???FA	<9?T?7rx???1??^`?c?[???t?F?&??*r?@?g?X7N$^????*t??7?<<.??1?~??M???????=aiL
???MK???u(?6?P?"y;??]?Yj??????
???????`q
?Z?E?1?[??????R?*+
??.???~!??O?B&??`yB5??/??M[`C?????
??c???W
???Q?p?g=?*RT????U? $??J??h?CAX????W4/$<-??m'a?:?#?'2~4?M_^y(0
q]?????A??????U???\0?	i)?SW0??F?iWd?TX?^?QA?p???????Iw?c????~??^KK?z.??V?B??JC????n??j?2M?c?T????#???
??? ????,??h`vH/?????T?BD?~??OQc=K?cS???>?Q??}S|?`_P????0??nTd#	]???!???/?4??
?	?? >???????p;?C??i????F?Ld?O*??H?
??p?!????hv??]aOA?[`m?S?c?O
O1?????j???7r??2??Q^?y???#\b????????
?i8?? A?#AC*F?6?&r6!??J?A?L?c0??R?????c<?C
?H\$x?
?T??????????]??SL??J]?zL?Y?R-EM?T`?-Fyt?M?.11?{
S?
??~UX?{
????u4?Y?K??a??b? H?qh7j??i]'#?/???x?&?(J?z?l??@A???5Q??T?&??Q?}?}e8R??<P:c`??D??9E$]A?C??;?????'?
}??*?AX?d8?h ?Y
C??y?i#???W?,.??????x?H??"??S?|i?j??Ka?
,????????%???,d?k???m??:???p???po????,?? ???'???w?QX`?P]@p??? $@?m?;[d?/hV??`q????#m?;???cX????19?S"???????@S2??h???F???;?ux?q?z;??????ym?j?K???{???[N2???????$??d
?<??Q????????
t?Q?S?x??ic?????{&?-?S$
?d???|??3rg?m?e??%M?R`?j]????#S??<y?!?
????????????jSGY??<??2????S^???k?;?!???v14???yw???7???q??o??$V?!??-???70o
????E??^?Z?:?
	????V6??T????B-???4~??9??Z????????gs\h??
(?ev?C?????j%?-s?h?7????F?O?>???-
?I"?K?? ?VR8/,?l5,R	=k/w1?P???4?v???:NT?7S??;
?P?%?GP?????? ??????zAGw???q?A#?D?	??
??;??p<K?<a[???I*'0???eI?U? ???.i?<??&`??M??"L??]??=d?N?Wv? ??OG???6r????}=?
?l?1?_?O[?N?x<???P?Y^?????H3??<?}dwM???H?^????0vj?3?1?4o>?;q????????:????l5?'??j;?
???tI?\????????H?3?1?R?0?X?"????WUB<Y???l2???????
?-l`@?|??M?}??N?Z at q?qg??<v???^???6bxQgME?K?"Q???'?<??}??T?~(?;w0t?w}3?a???f???,:e
+I#??;?????????a<]???$Y?C`K5?7Jek??H8X???mC(]0?9X!q9???j;?V{???
???F?4yT?L?????&X5??(]?/?1?fAa(k??z?)?????Gfyz????o???M?????H?9???9a?N??N<???qg????#?tu
????????????<th?(????q
g1p?$???`~??=????}2?#??$?X!{v?9?T?*;y??????Th??1???Vk???(:??pH?D?H???6?d??[??q?? ?n?d?????%?$\(;??2?4Ol?ux?y0LW?!?\??kS~n????"????k?B.?	??Xw!???+??2?$??"*d????T??Daf??RL?"????|??$?Y"???N?jY?!-??#?A???7?????BuY?	ii??&??0??3?L???Ir6C#$?$?8T??Y
y??b??, 0?ly??5j?
??kO???????<??5???u???????u??<q???d??3????l??5(k?s??A
?J??\:
a??w??1??????j"!3??.???:k??'L4653G1;>??27?h??h_4??,?B}?nu?w?vW??l+??m???????hb?????;?B???W?S?4?{k?????.??%{?&G??^????????Y^q???"???J2???N?l?j;?tiE??fmb??J??5?
??qmx?f??B??7\??
???GK\??5??????x??????`?U?60:?v?\E????+]?TY??.A?t??a,F?F?;.???\h???4??i#u?1k??1???????????^z}?$?m-????8??p2	?u
C?EK=q??TqF`?H??L,'??5???	??J
?}???8?#?Oi???y?
3f??;?F&0F??Q?????>]?
[<r?bq?)?$??
?6?EB?2g???Q?5??@Bp?#???|Pa????+???b????.*?\??{q???z9;????t?|??J3x/???]????h?????#?d?I/?????I??C{z????1{W?4I?Jj?H???k&aX ???z???n?~X^
p??C?na?6??s?^?"?A?E?w?J?v??N??????n?A????1???H??l?dgD??!?@??L3?zr?+Y\Au?}F?X?}?????8?L??%L????????[R????)$?C???R???], ???Ht??????{?1???\??6?g5;????qo??3
?oL
wa?a?PFP?d???Z?iB??y???2???D?
Eb?t???J,?%5?	???D????s	R?1?E?f??d?Ox?F??7??U??t?? +5?????a??@?@3?	$2J?AF??FK3?O,??:?0fnV?`gOD???=?^??SP??.??.?&?V at Q
?P?f+-????5+Fw???s????{q?{???FT???k?n,w?????m?
Nd????*!?????SO?:???n??~Y?s????9???*?wh?s?????h;ng???j???r?{??Y.a??I-I?NI?~$rw=?Y???Bc???i
a?+?w?9?q(r?1????p??$?J???z????????z????e?5???t"???????h"??x\^???1???umI?)???Z??]b`???Xt???f!AL?(??Wl?????]???e3d???4bXHT???[;ntSix???EW	?]j???????Hi?S|???}2?G#L$!?EZ7????
?
t?X??/mu? d"???5?;?:??"e?=?Q?[?}?3x
?x?-??#?`????wQ?39P?;dt??D ?z?)x?D??9Z????9???R??f???>????$???ha	??S??w?jc??8???G ?m6?s?V????Nc	Q?U4?.&???!H&?JY/Yxlba"?"?@?b?$?K???`?C3.s?B5k??
:?CRlshF? ???-??K?s?rI???SP
??3*?}?$#??Ap6?DZmt? ??)??%b*??[??????z?/T???EP??\?y?U?v?h???;!
?zr'FP?;??IN?"?a!CTP?c?/!?:?S
0?O??j??2???S?Q??Q?*??cb?5??!?Q??
W??EW???d??Lo???h?4
2

,e?jBp????b??ii??u???8oi\S????
?M2?D?0
)?N ?c???#??p^R????B!?;????? ???f??S?,a?,??7'?/??q???J??[<?S)???]P??? L
4h?????A?j?????\?I???B"P!?9
??S??r?z?*S2??>???io}?:@???J??h?g?|??{x??dIB???#?-?@n?,??P??4??|
?$???z?5?"BF??D?0??GB???yq?;5Hy9???;O?]??;?6?Y&{?p??????0??sk=?u???5?4?B?B/x?Kz!
?Q5???p?,???9????r??C?N@13?H!??i???OU??<?????????\q?	?KL+/$???m???p??A??9?~??7ET?|VC??^5??
???z? ^?c|d6?$C??xh}????m????R?Z$??L`?5gy:???7????0?r??Gl?:]?!r?l??
??j?<??!??|? ?L+??L?1?{4f???3?G?????6?(P?F5'\????w??5??????M???R??D???????R??x8??99D????@????vpBh??????U???????LU???J
?VIXVY??g\jM???-l"$????bk	.L?R??AL?>>@?f?y????pM[????7}?$????k?sQ?l?J????EE???????????e?
s1)b?c?h??zJa??G?X?Ka?8W??V0W&H;?Kr^?#T?h??m?=??E5??y0?Xe1,??Z?2bc
?>?:??
?
S????E^?\?????=?6??l?
H'g>???.????h0???h4#? ??=?!??|????=???k?*?{??J
v9??u?OB2!<??????4??)ZH5P??N`n??Dw???Lc??j0?(?f?t???j??0Q?4#????fF3C3y?#F?jFex??8
K*?j?#*???GvMJ9?;??pL/`7?!??P?P?????0?3
h?M????%?? ?09[??s?L?M:??i??E?\8?z?K?????-:4?5
?p?(r?p5"i??Z$l?L?W???Y"m??
	?b
24?????';:A??=-?p
?^????%"?mO????{???	M1?`C??K?/U--j??????????
m????79
}?##?8?"s?z?D3?!?s?a:b$h~?^?:#????;?fa??:??L|?gow?;????s"?Y? ???`?R?A??]?? E???S??c???!

?d?m??!??
?h???i&??????4?e?
h?$?*0o'&?X?r?2[-?????]?|P?F%?VkA_?e?,?o?T]???????K???Z??+t*	$|4???*?T?	$X?D?:(?R?????]5Z???u`?,?9?6$?F?9+?A?J?6`?afu?;,?5A???U,??????'&?|?L?,|??"
?????y????
?@6Nr????c?s?X^a?"??????F*???(?????D"L$?\?\??b?5?]H?2a_G\???B???
	??$?Ns?v@????7???????S??B???6,?????9k??{??O?
??????:"??@?u
%OD??=B@?x??!???,?'??Rj?Aa?rT	?|P?v[Fs$1??"|?O????-??o???;?t??2???D~(0i#??????5?N??H?${?$O$?M?
???C?^???}?l?????8=???0d1
??.?cM?C???T1??????)??	-????!??F2?t??u?h
Eo5R9??H'

????*w!t??@]???{??j ???}???W??O???5
?pxA`??n??
&?#??m?h:d+mbl?P	??4?<%??Ph???vh??????m
(zg*?
?9?c?4? ??<"??T??y??|?c,?????xR:??%~S
X].??d???8a#
h????%?????????j<?V?{))z?e_$,u#????>?,?E#?c?LQwS???B9???v:?+tQ?W??
q?-*P.??0?>?k-?f??s)?R?@?{=??%????AJA?
???L>?hl$??4??'C????????
??????D??u?Mg??????W??
1n???(Bh
<?|?-	;A?VGK??Bu?/?f,K?
??????
???Q??
D?*??7
3?a?H9? `D??IP"?07??l8?q??/C(a?]?+?????wa?0~?&rfF??A??n?v;NT.??]I
E??RB?2?NCB?-???R}??t??|???8?
CgP!
(????TH??A2ARd?'i??q???
`@@?C??A?
~H???+?=?ZeC%"?fd?p???3%hK?Y???Z?>1qC?)????"	
?L?d+R?v^??2%1?	?????9B?#??"?
6f????@??&0b?fc?$BD??j?I?&41?a!iuFXbF@?dKE	??$#?&BX???z???V}?'?8F?????X??a???+cl??jC???4b???AGtv`?"?=
	??`7s??CU",?????????????$0A???4Y?;A??
)??%?T??ln`????
?0%
9????1?D>s?d?}?;"?b?`???/?????H|????^KtWL??lJ"T
9r7?3N???J?t??9?
AJR1&i????X-??kZ
??}?;?Qn?zu??????	a=Wj?????3????m??j?3tR?5??@???z????=q?? ?]????T5R??b???n4|????
u?8L?!?hf&??`?1??0X??O?4b??????????m?jAB
?p?r??l???#???8@?%;B?N??u?*????
?? ?>?????uju$
g	? ???Xk8%5?H8&T??<JJE^(??n?`<???]??????48?7???A(
?X???
~
bI?AL"????'?"?e?*o??!????????q?OY7?UBv]f?,??#??????0???<??_qI?9?h|??{???????K<??z??!?U??
A???Q??>L?? ;R???,os?????}?
%)@?f????%6D??5?????????S????!EJy?<????	???31?z???u?}?>?nU??:?DX?C?????&?W???+?#?`??&?>???gJ?0 f??????????
?Z*la??????x@?&{???Xl??v???*=??]??;H??hj??/?|+???"q???)?2!?"?,`O#`F???%@???DD???E
s?c???B9b??<G????????V?`??????Y?
Q????B??C?,1@?????????W???????<?d
$(h???	a"f4?FNL??!?2????&G??@
?hhe"+R?Q
?)(??&)+???0*R	B?!?T???Q?f4D?5??+
%pc?V??T?tZ?0???PM?DA??fJ?i?h$26?J?3?0??n???u ?MD?A???&R?"??M???????#dn21??)?1?21???PH???????I?cId????Ff?}??1?6?-??Ft"A?U?x?$I#??b?A????X????????$d;@
??????}??v?dlGA?????G ???hi0K??E,??^
\O???!E0'ahZZ:?gYlF&C?????.??0?d~?@VZ^ZV?????V2!?????c???X??a7?????????n???iX?n?Y??h??-LPq6?0???5???V?-H?H!????2"'????5i??{#x?b??*???Ri? ?@??0???tC?PF@|????V?%????L?A@#2???@*??
 ??????=X?$m?;6^?
i?8?
???hqqA/??]T?k^???=?z+?$B"??c???piF0???.?`?	?	?4@????=??>?Q(LP:??B]??????pP?
T4


i
?
??Hd?4+?A?&?f?L??p?BT]?3d???"?2?XH=?k??h???T????UM? i???p???j?!4??u{?PaT
?`j???	?
>2????C????IfA??????6`b?Bji?@?f0.xhD??:H?5
?
?
)?j
? R`W??1eZAA??????/??@:%????zh?H???A?W?t*aD??4"dw?????&????5F? ?? 2?d4?4>?0??>
?N?<??t?(%W?w8Y. at d?P?????????
	k?e?7;?
pf??LKF?M??;Ev ?!#????T??????
G???N.?/??i?``a?K???Mt46&?;??4kIn????????4#V???u?H?c?%?7?J5??0??hY!?a???&L??&7`C?%?Y$?I????h?d2?+P??\-O&fL?B6?6??v??7&?5r?(?d???]L2B??????????Cp???-Z?j??????????Y?K?"?xq?+???aq???lq????P?@?m?jZ??M?????????6?$15?nW?e????$?f&????q??n8??]bf?????P!a?G?????F??????.X?S??f?2LS???D?? =???:~??7?:yU^{
???X?G??1MoQVA????????eR!???j?jMF?1h??Fh?rru?R:?u0`?dqBc?GbLh??N8PXo????`?	I???j???A???2]d?????+?>9?????Hw?@??P?B? ?JQ)h?e????M??0DT?Q?Ow?>?,?(b*??????uqH?o??(???@d2
???4?P?@x"???:5E?i`??@??q
?W?}e(??@?D?Ga
?SF h??B?????(?3?? ?iH??K? P&J
?????&&?aFe?$B
?5?!	????yj7?4??G???????(4??????????
i??n??L:<??}1;`??
??5?}E?k?W?5"?V??i??}DTZ_???T?Lzi7?n<?	$/???1?
???O?>?X??A?\)$??DtA?$??n(V?????U???d???$>/K????;?d?>?5??I?:?/?o?>r_?W??}?????xp0?vz?i6?}?G??X??)?bR
?&a???C0???~L?A???{J??^?K}

.?x0?J?'?#k[?e
?;#@$?]?9?5l???-6H?xk?X?P\?7YO;??Fbbi?I??,68???,??????'??b??P??@????
/z
M??la?)?kA????o?;u-??,k???R???`?4ki?Nd?Pu??s|?h???A??ubhjbI??j?X?=8|
?N4	??k??6?????Hb?*jn???lpbM?jQ?&-E?A?c???2	??M?v48"9-8???Ia??UC?/??Z|??k? )\?F0?`??&??X	]??}
'?????D
J`???Q<?|???"?I) fX??*?R?
j$??)iR(????F? ??????&J"BR?"?$?R
	bh?"?(?H?!??	"X?i??aF?d)B?a??e)????j????
C5~^B4??
???0$?????$???Roae2?????(??@?$)$???R??R#???" ??`$??f?HI?(Y "H	Q&?(?H?T	(%? fHJ)
Y??`?"
??)?(H????6?EF?
P???{??
???S??wy?M???F??
d?:?
h????7TW?E8D?*EM'?????(z??r??%$o^???L?^?[#~??p????vl?{???<?Lz???0!E?s???W@?dF.9??Q???????YF??BT?YP??11?cz?G?:L`:?i???OB?q,??z	?????Q?0???+LX3????-4?0?4????5
??<??JE???Vm?:A(?4X?n??lc\d/$A?C?@?`??? 5?4?%
?Y?o;?I???????`A<?????!??o?
?J???d2
J)H1?????N????????)?
??`|????t?j
??($???C????~7?2~Y?}.=??I
7????[?5??m:??????7ad?????&?5?????]??`?@w??P?@5????]????P?Q5gBT??????8Z???
??
??
?-?
`????$-kLAH?
H?A?Mf?8&(Gp?Mj?????ps0rn??????z=^}Fl??9D5???1??bD0?
?`L?ae??`
`??,???c	e?zR!???"???9m?h??
a?)???f??D?&F!????8???????m9?0`h?BmHK????W???t3y??Bd?MZb???;?h@???>???x?L?]??Y?$??????f4?7\?!(
 ??????F???,d?=??????daN???dS+?Q?L?s%?f??
9?bP?3????+?y??"??BT?(?d
??n0?Dd?a/???M?ny???"a???Hx?d????y????*???m?|&<???%?C??`cl
????>XD?1*~?\CL?,1-Q?"o?07`wG,A?`}A@??0??1e}|?EAPI??f?J?~??#
?*?&)??????????iQF4?!?????f	?MkN?$?y)B_??s?>D?*????@a?{c?????G?Hu?/d????Jh\A`X`!9?1?M?Hf\@.?b?
)F	Cp??c????s]D9?????q<?
h??`??D?G`???"-R???F???	?T????????(8?':?(kF???F????????_?E???????9lhP
?2????%N?2'???+?6YF(?d#Bq???`w?v??4?4??
???8@?[%?.?{Wp????P??B{a?xW8c:?h?;eEE??8?-BD???86Y???r`d?0?1RM\??m??:???W	
rI!0????"%l?Hv?
?????9=?????i?????k
Q?p8??z??8???4??f?
p@?+??.;??D
p$+??? 6i?)?&?qXB\pa?(? H$??1/?X??E(?fS??aJY?2(?Jy??Gu2"??y?z?5=???`a?Y????)Jd?s	 e?(?b?A????>?d???6?;?`??B?}?O; /??u?>Y??1??/;???}?j?Y????
?
P?$Z!?"?????[ET~s????W?????N=efTq??0'g????d?
_S`J?J????!?BCr?(??2?D?r0#V
LMa?t?(W?(r?????"?0??m? H?+???x??Q-
?????{???YU?!?u?`??4??0?R?}????}??'??P
????I=A??*?r???
)EB?
?1@??	l?????r/?&:8_?Cac???Ew?|?u???????!?p????-??????0????ax L{p8???M&?T?(??+T??zx?2e%i@??3?????R???????s0?Bl???5)???
??j?J??^????XoCAQ?I???%????C+?????	????????e`
??Zd?e???P{,
??X at lF???;?y?g	S?
?
{?}R
???????4?0?Q??*C? ???; ??2?(4?rl6??0y?i???K?f'??(?? ??A?B?8?*???d?D?J??s?&??"R?D&?"WPA)"L??20?q0 ?C?$FH?`1!+?????	$??f
d?
?&2A???
??e??"?W?tk???F?h?$d???L?et?;S?H????r?????????????5
???`???????~
?^)?/???&???N??]?{>?1???4({a???HY??)!?@???)M??7??????2?tE*A???>&?????*?CM@?	`]?>r?R<?vO???????@6?&??????KZLjI.d??
1*?
??k*???W?j?1?qF?A?=0?????.??
???;2???8TQ4Zw,-p??@h??DF???aFZ???Y\??S
X??7??<?8????
?
??!?}C?~?E|??Q?Y?g??|4)?????}????E??"f"SQ????u?????c?&??;P?E??????X?#0e??:2HY[D$?w?kUP??????????'1S
|.?rXi??	RV{w\????g??7?M?CM?1 .?*??R??4\RB??h
#???????)$:??`
?!@?4???%4H?( ?zt??"l*??I????hF???@?r?
0?)$?	?????g?A?
n[?Q?!`D
?G?P??b ???
?1
@??|?????]?e???d?#???r,??CPcB"i?Ia5*???GPHDPpY??f5?Z?! R6;P` ;???p D?#U?QE(?????L-?p?X?.?b??
`????f&?1?????r??Y?3M!E?+Q[??M	l;?x?L?8?P??p7?%	?B??"? Jahd?
?=j0?r	??????#
	$?J?T????f???]?c4??E?0?	
^??"?'??.(/ 3???"d
????0??q?????R?H@?=?&+?d???x?O?P?P????3???H%?!(?s????????X?|4???
?C??5+?*???B??uB$?K???K??u?&A?@??????@&<C>?k?m?H????!]?j$"?i(?/???T?
Q;H`??????>?v?H?nFC?'?????5E'????I??4'R?????C?p?3??i?LQ?"eb*%?:?Z?ZHb#><???h?/??$F?4Ib?C?H?9?????(??e`????H??
Hz???t?\?Tlx:8;????R?.II??L(????#YOX=?T?????	????2f??????[???+?4k:*?
 ??P??!
p
T
??hD?b??"N??*?0F?Q??T??2??^?%?ZL?T+?(B?M? LAJ?ZSa?a0??`?1?u	?SD^?,???lc???X?H???B?U?.?f??6{<1lCh85Ci??h"c?2h(@?????2f??)L?.???Z?f??Z,x?-?!D?A?8 ;?:?1?h??:@g???D.?i@?<W?R????[lw ?
(#3&????,?6.?Njf^AFGmQ?d4D?1?-
F????o.?k'?Q?A???niq?F?P?I&
???1??
M?R?*?Y??x??k0c"?
??U?ET????%?DS|K?{?[s????
???m????FL??? <?Y[??0????2+F??h? ?E?V??G`?5?<	??JP?Ad<K?$?lU??E??/{??
????`bL??$n??????"?????ys)??bJ??F?????.T??$?gq??4?\3??????uH??,T?v??J??f`?4D?%?Q?t ?
,?u?S????V?7u?F???#q?C9?D??s?[???*???9?%??^??HQ?;??J2:?
??3????
???0?Y??
N?bLb.???????G
0I?yuV0?
?
-?9?2Y!??&G??*?a??=Qf????h????FH???L&;?S?[??)??3?e???$?????d??R????d?;M??TX?}?x??/e?R\?>?????q????FOP??Y??s??? 7?	??V??k6??<?p???z,NF(1????M??7??l@{16
?A\????WI?W?V{?%9?I??????i???w???
eg???r?)NtF?E?????? p,???t?8???Q????.?30L??D???)?H???B??`%???L4?????
!??b#?d???m?=?,S?of??i?pRG??5!?#?5?GV?N?v

????BY>???N??w????G"???C?+??
gzj??$????2e??m??r????:7??\??	!?E:?Gs?
??"?~1\?d21??6c?2L$ ??c&Y??+a^B!???y`??VX???LT??????
?m???????F+
,?	E+??Q???A?LGPh1Ep??"?:f?
4??k?$

C??"Gx????
??4??C???4N4?0eU?*?1????J??????Z??0)??"Z?i??A?A?e1C0BS$?
% GN???LC??i2SD?/{*??p
D?$*0dD*A(0? R??K
A?y????h?&?
??<?\?NE???`q?
?A;????^?????

?:7BTxD??X
?
VDc????????J8?Gb???c?0?1?X?i???oQ??Y???t
b$J<?&????0??NN? 
????6/P?N(M
?d9???XH<I??	???tx?jE????
(?;?O?A??d??????7x???"?=;a?L$?N?(?C?
??R???bv$A??Q?O????w?????>K,??d??J'z?QV&??0:?l?O?oE
c?	bb%
b???zNh????s?q???e?wfQ?'???UD?U!?d?: ?P??4r???????t4?A????$??.?$%{X??&RV?5??-(??@?hm L?d???-93O?w?,???z?1???0?K?xPe????
?o@jT$8?VF?IcfY???R??~?lX8??X-~???J?q?WA\1???X@??C?!r~kW=d|L?iZDy??
?4?#?\?y0?=7???????P?y0?3F7?]??h8??F#x??R?1!5
?+??jig?>?????+D*??v7??????L}?>7????*???+??_???<?y|^
?X?
|????!??
 $??????O???
HAI?2????D?
???-
 ?G,??@?Q?'HQ???
a???Mp*?1AU15La??
??????P?*&xwJ?aM;?y?j?
???????(?@???
}>????? J:JH?(DD"?z?<tb?|???4?PC
4?!!!R?BP??c, Q??????(SR)?A@??_lFb?0?L??)????>9?yx/?
A?I??02??[3h?z?H?r???;?I`?B?H????|?yI??! M???W?1???
??
?yJ????jeDU????????,5#e;?y??*??1???Wt@??Nf?8j???T????????u?of?+$2d??G at K2f8??F`?@]????Rt??9?	R? ?&???i={??&??fty7?:ACfd?YQ@??h{???=!a???m?S,?'??.?9???i?%#??'/?L?o?!?
?`OY?U?????#?tr??[j?4?yO??9??r@?????=??'?CX??@8v??lM??G???>dJ'
?`???$I4d??H???a+?
????h??????4?w?Q?????r?????1???ye!?2???b
???rL??8???({??????
J???R?X?!R?'??*???s?(

=GOK??J=A? ?b?$T?fjX??dJ??2p)?????3??s???a#XA8XFa???dLR?!????P?????fD???I?? ??????T?T?0?2%%???Q?BDUJ?
?d6
?3cP?
?9??=?MD?~S*?"D2????????)v+????????h?E?HU????O@?T4????S	f????d?3LN??'?
??<?u?aVfW\1?b??(?????????????G6#??E?0?F???????|O?l?Zx,?}?
o?x?t???Ch???E?????ej??hd????
??????>5J??V?!??6?,c31;??|???|??H?f???Tk?C>t??~???t?????????<?l?Y?G??0?H??Y?v?'??Q?j23tK4Pc?mz ?q4i|!f@??u?<R ?Y?5/???}????i????,2f??????m??}5??????(?yd??w
??D??D???V/?w?????p?BQB?????|2?#?k
?cMET)?md??#
H??kN~?J?DCQ?M???D{?f&G??5?E`?SgJ???
 }?F0?u??@?!?P.Fhv????H?D?o?`???
?J
?	C
H(??A8????}bZ;G0t@????N?????%?L
??KRM$?D
v???????l??t}?GBv8(
?
?G??????b?`??
??
? D???F?d#P?
Ba?z??????0?=??{[???SN?U?q?t??p?N???3?gi?aL?sZ p?
je???^Q_[?N??L??E|????`?I? (?;?????H.????????[?tqMN???C??u???A??;/?[Q?w?I4R??$?pV?|???DM\Cg?????9?????;????|3yB???'$ON?A?????/?_R=?N
????y`h?????l$?0????"??Oi?
%?????	T`??~w???4?5U??'(???D=Z?Ht??-??a?D?h??? I4dI?[4??<???s???gy}?c:!?k??\?
!?]c?q?'??Z	?:?K.N???4?QW
?,[`?bZ6?????6???$j???1???<?'a???;?A??<??I??3?Nyh_9M?Pt?6?q:cpD?? R??P)?$0?
U??P???BE??O?`|?o??,???!!Dw
m
N?ki?? ?=?8?p??3A??3Tp????8???M?5"x??Q??B??5???3?Zr@?I?l???(J?83a??jdb?pt?c????e?E?n??????P?(?	??g?:?s???X??u?d?? 9??G????B?&S"1?????b%2iJ?a????i[x?l???p?AOkz"@??3??!*?V?S
E"?n$?ID??Adh%?a???HP?c??0???`d?*L?US???? 
<?[???`?``??
N?Vt???TC?	@l?L?	&,R??Ck???c'Q?A:`???(??l	?@aZI?&(i?(?
?"?3p???&?bGC>X<Z?b?F+?

?B?/M??? ?S)?????????l?n???HR?\??8?%6N?6?A????4?0~E?-??L?#sl0??z?./c$?b"??6?????l?L??=8i66?
?????I???la?i?+?B?????T??7
???SF?L?1?{????????bh?? oL?c1?LUk?
??C???%I??F6MCm,???o,f#$???????6?k\QaM"?BM4?&?q?
?(?R??k#2p?
???^f`????=Ej%?????????<p???b?aQQIN?!l`?1?O5t?h )TQP?y??J5??`L$d8BPITL?EAs??b@?q?	P??????c?1!p????i4BN*?Wlw\P?5??R?!??
)??&???t??(Z
Dp????>^?H??a"I?% i` ????"@?J??"IJ??`e`$eD\!????YiJA|?1??]??TQ?FZ??k??+X<p?4$?}???h
?@H??:?E??s?]8??+2
,??D?3xk5?i` A????TLM??V
H??!i%32??????|?}?j????\`$??P}$S$? 5E4SEDI2J+??dNd?
?+
_?n^?Q?
Nz?Q?FN
>?3?#???ER|j?
?>"=??0\ 2I?????S??Yvxb??_D h???h?P`4-{??????Ep?m???t?)-&A?)5J?7HXp??/????>?
|Z^?q??RC?????+
????X?r1?")4??
E?E>!
??^???????_?_?O?i%#??? h?\"?Hf??
C??9?
J??7???s?7?B??????A???%2????{???<{?)`A???=??????1???????i?n??????4?!~>???B???????????6q????x??Q'???L??
?4t?M7(??B?`f*???"C?
??q?&???A+???EIuQ??JYOP?	lA)"w	p??NyW?_F?b	u??#???J?Y?F?????#U????>
PP?t??v???uHD???????:?^???ET4???}U?0A
@@?l
??
??V?????AOD!U??KM l/??*H??Z	s?J?V???B,???i??? 

H?K??L$?`rG?JR?)??lA0
0?R??2P
?L
?*?????
??Pb??}??g???ClM??:??a	?}??4??@?{/h
?????`?$?P
?X?C3
R?@s??Z??!?
3%T??P??	L
???w@?&"?`x???4
?D??e{???8c??%?Gx??sv:??l?`h?B?q???????'?AI}?=P???Y3???k?????4\Hj??HcLB?FH+??DqdC???3Q4????1?	
???
Ea
A??	?k?@?@?.?D,???E???9?Z???)L?
	J )
F?,5?v-?!?\0?l"%???_???#?6G?_????F???sN 6??4B[???.??<???Pt???hA?????
t???B???hM??V/?5?%^|?x?|f?v??cl=??'i9??VXCXe?#??#???B??????-OD
??(?K?'???t????6?Y:?zQl?3][???^??????(???F????c?Tt???^??bVO{?E?C????]???????$Y???7?:??,?s?g?{?|]?G[?<tl??
????P?a?4L?(-F?dR?N&?=&{?\??^~5?4???Jg??Cl?c?8??x1?t?,B?_??r?f???~?pa???3m??c?>^?!M????Fs??kbw??E?-k2?zk??,??|=????I?PQ?B?KX?p?${????????H??b???)????? ?-??????^?E
2??????
????{?0???????0????????C?Nxy???(??p?GY???'A?!Y???%T?"?T???V???
??_Lsz?J?
????!
??
?H=???U?NZ????^?0?8?Bq????????h?>XR? ?x????q6BZ'S??2??U
?#?ZhF?h??vS? L??sPQ?S??N?
R?82?
a?Vtf????, ?$??`??y&T????}W1???I??V-?9Q??}?|???????se
<???	??HITA??
?pF?@%a?
<zPt?z9l?#+O????k???aeY?ft??x??
?/y???????\???=g?^F#8f?*?W??n???g< <-?E???S?K?M??`:S??b????h?j????y??q5?H8\??J???11+Z?L?aS?C)??C0D?6V?N???6?40V!??<?9gS?-f??nB??v?h???/?G??
?X??_?L?]?????=???zq]M?*oK??a?VD?61G	6? u)???????SW?e??????But?-k?M3?????{??x?v{?"???E??W=???yfO?M?d;?|4??`S???
"?wr?8??????F????T?K??@?P=??=$y?L???????????[??z?N????i%?n[???Ef!???F?M)^8??j?????Zp?Ll:1?r?]?t?=4](2?v??H?cJY-???:?m?Q?????????8pq????8S? ?D???1???}????t?a'?$h	?
	??TPK??ku??
???oK??3??7X???]5?????8?H}??xP(P??h0z??7A?L????V???@??@???a??X?a???z??g?a at Z??a	??Y'|??;H??????l??????W?{~5??X???]??w^?????as?&EJh>?????a+3=g??c??5?Q$?9$???P??m?;???i?6?A????3?w!U
?""]?G\???2?u??J?
??v?zx`?
??w??????
???;???@P`bA????@HB??m?NC??W? g7)l????/?A?e?????jSYr?-??8??z?,W?????]viA?C??t????t?,??fg\?N????d?T?I?a&?tL??8?;??{1??i??
???m????;??I'A3x?
????dC?????
??Y??9?=c??
0????I>??t?[??](?+5?F?a?!l?#y?z????<ef?(?l??????$\1g?[$|???????qEB??SPu/P???? ?Dw??a????
?????!??????L??????+
j??
????J???:????5??$:C?|?/?	??I??fl0\??;??r?????X&?`?
9???{????S
w=S?>?????R???7??0`??0?`B?x??y??????9,??????xA?????$?I??Q%?$iS??@??	8"?.????q3????Kn??Z?"??_?DC??
?;{?V_???f?}U?cm?jd?? &??????R??.?Oa??Sl??I??B?h???????8??Zc?Y?2?u?1q??%?Q????"k???AO??
?* i#?a#?Rs9
?}??v?n?g]??wR?R3?k?????U??|+??:?=
??J.&S?u$w?+???+???`????Q??8 `?Q??8??????8?
?09???LY?0 fLS?	??E???w	????M?K???A???'??~$??be?jc??-??????65G????=?? 0?
??`LF?????N??`C ?2???%'@?091?h8! ?9 Q.EIlN???S?"??"???? ????
*?:???Z??6!??0 `h??f$???????<GW&?Y??[?????Kh?p?lX, Ho?????F????'QZv??,b???i"&1$?tqa???b?b????h??A1k?H??xX2?f(??
A?4?????????C??KF???????G?????>K@?;&??+?p????B??~??????Y?????`2?C?<e???$?'0>~??????i?!!????B8??6?>.???rq!??AA?????)??7???I??|?????+?^??'?????A?D?B(Q	??y?????6?h^????AO}?N?D?????&0N!?G-)*u,?X????{?????[?f(<??|????G??}???O}p??`<?_$??@?T??A???;?ru&K hC?,? p??>E<~=w?C???2???c????H?w?oC??
o? I%"5?{-R?8*M?$???
n=09???J5??S??s?:L???jT??@xl?2?!) ?g?/@??f\}?&^?PWYic???? H?
?a?Q6??ox=	?U????
?1?n????)(Y1?p??????4????.$?O?s??n?? ?1??L^???Cpo?ow5??	b?$E =~U???;??k?J??9?iH????AH=%T
c ????v1x???(S|{0pnj????%??gC#XC?????>?+???d7?!?????I?X(!????x?7e?MF?yB8
K$??em?L#??_?t}e
(??2
??.?!???l2 qf??q?H*?????!70TGN?1?	???}??H|kG?l?7?????`:
?u????_?????g6??a;??]??	????iU2hn??FX??)??????vLc?e?m???(\v\???4D??i???{2?????m???h?1'Q???I?;???DnD?<?$?
9R$s@????{?~x?f?^T8?????n{<?X!??*{;?W?
y?w?W??!??e?b??@!S?6?R;??b??
B@[??B????n|?h?????Ce?3B?d(??0???(?t?_??>?-RD?
,cI	,?*?KX?????I???
h? ??M??D?J?"?A???
??4?%???K?-a;P?p???%d?????
??????l???+?fG???s?:??SV?s+tiFK???j?Z??U?JCp???Iwi?-?&????9m?;??????!p<??Ips	?l?mO???!???h?j
????0i??fK?4??,?BV
??????V?mG:??"Hp;?!??u??))Pk?rP???t3
???*q???5>VU(yq'
?.?I??????	C?o??)i?z????:?$??)`e?DN????xU5???L?|kO?h?a???a??kP??3LNM?ky]??s?!??d?9??:hB!9nB?D>??>xQH-?a?}@C-??}L?8a&???A8P3X? ?????|-???????Pq?$???x?????t\?f????1?4B???(2!??????????C?W?m???cvXB??b?c?M????
??????<O?k?L??+\??x]?`e
H?L????.U,k?52_b?!?.MG%??4[?k?c??)a?"|??H??5??9??????}k??I76<t5??Z??C@?9V????? u????w?SP<D?;v?+gs?#?hF??????n?qX???$Oy?v?D??:?J%.??G???
???jJ????pq??g)??d[??41:??.d47T6[????D6?w?
nqD`Rb?{?[P???U ???RyM)tQF???0????r??.h?e????y????6
6?N??ce???Z3?w??0H?37??J	P1$h?J??N??8pp?r??B0Tu0?b0>?L??	R:DpCP??r?
??p=??????????y??O?7???mU??h??\???
+`?FCGY?u????? ????T?KJiL??1h?k?
SX?
?6JM(E?p?J?gl?@v?c??a?w~????@F????A'
?????.???4<=?U-??Hl??FZ?7I??e5?P?????
9???IP?h?"???s?"F??K'`?
??)?4???p???E
?%?*???]??6:48'
?3?a1D????n???8?N?)I$m8%?????@U??B???T???jS???d4S_???Tblllm?a_?q??\I,V?"?"d??R??pCez?=?U?=R?s?'??d$@??K??????u?&?>$:
?X?
A???4?o?????a?A?gY+??Y1?F???d?B0?BH?A^?wR????????9????I???????E?J?BE(=??UUUUUUhNIc?@?(????p?	d
?e ?#b?ET{???W?wi?Q?)???)??[Ws??a1DF???!??,????i?SE?*??1$0j?Q?'XJ?!H8?N???-L?H at f*???d".1Sxi??
j1r	!?(???A??z???$6CI 2??!c??'
)?????N?????>?????<TQl(??La_'???I??{?
???d?,#bX???f???.P	?6(Z??	??cPJD?*???[%]?f??????>L??wN??{?!j??2V?D???F
B=??7D9?`Y?P4Z`????FN???g?PWu?U'??g?0??o???.?k?~?B?=?????j?1?p??????????$gA??F?("{R[??`{N=???8?(|[?????6b???]H????YP?m??W?W?8?D ???nM*Ha<DIP?H`@}(??l??h&)???t?7??}?m>??'?6??(?cm??!???
?H~?dMJ|f?I?U?Y?P!??w/0&H9*|????jY??!OI(??&o9%2?I?`????
S?
???9?sE??B????DO??##j?@<Js6?2Q?!?
@:??l??O-???T?="
i?????HG??l|?"H?$?I???4????u?????>o8c?#????	T>?????????$?8S&??? D@?Q?,I???*?},?X?a??@s)?M?+????6:??)4N?$P?M?@h????p"?d
?%2
?	?1
??2 ?*???C??^??RQG??#*?$)?0!?!y?%???"	?????C
q8??0E??a?)?!RpH39Dx??%b?B???}/>?}?j???@?: <???$4y.???{$?^mdU??Z????7zO9??"bK??]??????@?#!Q[H?%I ??????????s?c?B?"??o?????4B?C???6????'?????+IT?
??]?xQ?>vY??\????? q??e),J?f?dpIeL????a??"?%?%???:?vy??&??Cj?r?`)?C)?;b??6?a????,te?I ?d?B??WUM?4R???
?j?R???
E????d%L??1??u?XW?I;?h??f
`?)?H??0?S
??H???@???v%	?r6Js???v&
r???S?G	????l???>?0:?:'?5??v7?????".??4??D?LDs?~???}>??IAD10?????f???	??.?bp?B?c1TT?
?"Rl=Qz-C??C?!??0??
?I~??????????(\???r?v??
?????Q;?l
?=H???o??G?q<?j??BT???L???3??>????8?WL?rpJ????P?G?t???&Aq_\? $??G?R?@???k[v?L?&?&88???H !?O???@?
J???B???U?p?!??g??M?
;???S??d?wA&
 ?W#:
A?4??4?B=?R$???Ln?!?
??C4??{WgY:0Py?C?I
?PE??L?TJU?? nA:???i??vd??.???VJHV?l??"? ??*?? ??~?b4y???U~???&?^?}???F?E"
?@???u?XaNo ????????E
??8?0cP??-??9!?=?????5????P??J?$H?
DX|~??? ?dX
 6?P?`=?`???z<<?????xdJ:#???>??A????P d4???Q8??$??MG?"??-"?pW?
?S??B1?p(?v0?k1?Q]?z]??(??`??9yWz?d??????c?c?ff?@D
??D??,???S????????(}1??&!????;URT$~
?j??&??&H?h???#??u?
??w?	??B&O?"??k?Z5,?.???	????V?91??+4??f?z??0b???F???1???d0(?D?x???????:k???$?v%/1Z???$1"&????"??O???'?m#?`PDF2?????%?]????????g??????????????"d???"?

??Jx????g????????E???????J
0lk?S#????V
?8?^??V??|??G?hc?????O???!D
rZ0??dZQ???%OB0$}XPF
SkTN?/LfW??lD?W!T
${c?F?@m???Q???Z+$?G:.????
?-???!n?<0???I?B???#???????QX9Ef?1 ?&^v?/?C?G_??Whp?A?"?0N?
7??co??P,????w?.?g6F???&??s7M??1????4?C9???#??Za??;?7I0!?0{?????????i;f1M
+??P6?L????????NGe??xb?O?t?q???!?F???]4t:8????????? &"?/0p???4
S?D??(??
Gd5@;?
?Z?b?? ??bU
??????<
~?8F)????)e?w??????(??Y???# ?"=o_??u?]???W?R`??`*??????a`???$??"??n?Q;h"?@K?cP??????dad???#,??(Ry???{???r??>??z??#?D?8A?lq???RH???B????7_????a???0?d,?????'??-???(?D?(b????
jJB!?????j???
hJ?i? ?????"&??`??\!?$&?? ????j???? "??)h?
%????P~xS??i??6????t???p???R?H??T??jo1?
j?
?%?*(D?	a3H?>*%??$`?
3?2D?q??
J?#?D,????
M???u'?H??f????????.?g?_??C?P
??L<??l?4?ox????@?`?C??(l????-I?!BP?"0?4????/??????X{0??P???????????RR?,?YcS??????

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jun 2005 16:00:08 -0000	1.5
+++ .cvsignore	2 Jan 2006 04:53:30 -0000	1.6
@@ -1 +0,0 @@
-pam_mount-0.9.25.tar.gz


Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pam_mount.spec	24 Nov 2005 03:48:10 -0000	1.9
+++ pam_mount.spec	2 Jan 2006 04:53:30 -0000	1.10
@@ -1,14 +1,14 @@
 Summary: A PAM module that can mount volumes for a user session
 Name: pam_mount
-Version: 0.9.25
-Release: 5
+Version: 0.11.0
+Release: 1
 License: LGPL
 Group: System Environment/Base
-Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
+Source: http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://www.flyn.org
+URL: http://pam-mount.sourceforge.net/
 Requires: pam
-BuildRequires: glib2-devel pam-devel openssl-devel zlib-devel
+BuildRequires: glib2-devel pam-devel openssl-devel zlib-devel kernel-devel
 
 %description
 This module is aimed at environments with SMB (Samba or Windows NT) 
@@ -53,6 +53,8 @@
 
 
 %build
+# See BZ 174190 for why this definition is required.
+export CFLAGS=-I/lib/modules/`uname -r`/build/include/
 %configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
@@ -95,8 +97,11 @@
 
 
 %changelog
-* Thu Jun 09 2005 W. Michael Petullo <mike[@]flyn.org> - 0.9.25-5
-   - Bump release to rebuild for devel.
+* Sun Jan 01 2006 W. Michael Petullo <mike[@]flyn.org> - 0.11.0-1
+   - Updated to pam_mount 0.11.0.
+   - Mike Petullo is no longer the up-stream maintainer.
+   - Change URL.
+   - Change Source.
 
 * Thu Jun 09 2005 W. Michael Petullo <mike[@]flyn.org> - 0.9.25-4
    - Bump release for devel.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jun 2005 16:00:08 -0000	1.6
+++ sources	2 Jan 2006 04:53:30 -0000	1.7
@@ -1 +0,0 @@
-2f0e2cc0fa9a3cf5153c6f915aa1719e  pam_mount-0.9.25.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 07:39:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon,  2 Jan 2006 02:39:40 -0500
Subject: rpms/naim/FC-4 .cvsignore, 1.3, 1.4 naim.spec, 1.4, 1.5 sources, 1.3,
	1.4
Message-ID: <200601020740.k027eDlB024500@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/naim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24479

Modified Files:
	.cvsignore naim.spec sources 
Log Message:
0.11.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 23:21:10 -0000	1.3
+++ .cvsignore	2 Jan 2006 07:39:39 -0000	1.4
@@ -1 +1 @@
-naim-0.11.8.tar.bz2
+naim-0.11.8.1.tar.bz2


Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-4/naim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- naim.spec	2 Oct 2005 23:21:10 -0000	1.4
+++ naim.spec	2 Jan 2006 07:39:39 -0000	1.5
@@ -1,5 +1,5 @@
 Name: naim
-Version: 0.11.8
+Version: 0.11.8.1
 Release: 1%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jan 02 2006 Luke Macken <lmacken at redhat.com> 0.11.8.1-1
+- Bump to 0.11.8.1
+
 * Sun Oct 02 2005 Luke Macken <lmacken at redhat.com> 0.11.8-1
 - Bumped to 0.11.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 23:21:10 -0000	1.3
+++ sources	2 Jan 2006 07:39:39 -0000	1.4
@@ -1 +1 @@
-e66f29057ffc4016e814134b8d1f8681  naim-0.11.8.tar.bz2
+beb0a3b2bcb45cfe9b84075dced494b8  naim-0.11.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan  2 08:55:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 03:55:16 -0500
Subject: rpms/wine/devel Makefile,1.3,1.4
Message-ID: <200601020855.k028tmfQ026317@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300

Added Files:
	Makefile 
Log Message:
- add Makefile to devel branch



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	2 Jan 2006 08:55:16 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wine
+# $Id$
+NAME := wine
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Mon Jan  2 09:04:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:04:13 -0500
Subject: rpms/wine import.log,1.2,1.3
Message-ID: <200601020904.k0294kFo028359@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28314

Modified Files:
	import.log 
Log Message:
auto-import wine-0.9.4-3 on branch devel from wine-0.9.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2004 05:32:54 -0000	1.2
+++ import.log	2 Jan 2006 09:04:13 -0000	1.3
@@ -1 +1,2 @@
 wine-0_0-0_fdr_2_20030911_rh90:HEAD:wine-0.0-0.fdr.2.20030911.rh90.src.rpm:1099891974
+wine-0_9_4-3:HEAD:wine-0.9.4-3.src.rpm:1136192622



From fedora-extras-commits at redhat.com  Mon Jan  2 09:04:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:04:37 -0500
Subject: rpms/wine/devel sources, 1.3, 1.4 wine-20050524-generated.patch,
	NONE, 1.1 wine-32.conf, NONE, 1.1 wine-README-Fedora, NONE,
	1.1 wine-notepad.desktop, NONE, 1.1 wine-regedit.desktop, NONE,
	1.1 wine-uninstaller.desktop, NONE, 1.1 wine-winecfg.desktop,
	NONE, 1.1 wine-winefile.desktop, NONE, 1.1 wine-winemine.desktop,
	NONE, 1.1 wine-winhelp.desktop, NONE, 1.1 wine.init, 1.2,
	1.3 wine.spec, 1.3, 1.4
Message-ID: <200601020905.k02959Qt028368@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28314/devel

Added Files:
	sources wine-20050524-generated.patch wine-32.conf 
	wine-README-Fedora wine-notepad.desktop wine-regedit.desktop 
	wine-uninstaller.desktop wine-winecfg.desktop 
	wine-winefile.desktop wine-winemine.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
auto-import wine-0.9.4-3 on branch devel from wine-0.9.4-3.src.rpm


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	2 Jan 2006 09:04:37 -0000	1.4
@@ -0,0 +1,2 @@
+73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz

wine-20050524-generated.patch:

--- NEW FILE wine-20050524-generated.patch ---
Index: wine/tools/wineprefixcreate.in
===================================================================
RCS file: /home/wine/wine/tools/wineprefixcreate.in,v
retrieving revision 1.10
diff -u -r1.10 wineprefixcreate.in
--- wine/tools/wineprefixcreate.in	19 May 2005 11:12:34 -0000	1.10
+++ wine/tools/wineprefixcreate.in	29 May 2005 00:00:00 -0000
@@ -38,6 +38,7 @@
 
 dlldir="@dlldir@"
 datadir="@datadir@/wine"
+fontdir="@datadir@/fonts/wine"
 
 do_wait=0
 quiet=0
@@ -175,6 +176,11 @@
 link_app winhelp      "$CROOT/windows/winhelp.exe"
 link_app winhelp      "$CROOT/windows/winhlp32.exe"
 link_app winebrowser  "$CROOT/windows/winebrowser.exe"
+
+# Copy the generated fonts
+
+cp $fontdir/*.ttf "$CROOT/windows/fonts"
+cp $fontdir/*.fon "$CROOT/windows/fonts"
 
 # Copy the .inf script and run it
 


--- NEW FILE wine-32.conf ---
/usr/lib/wine/


--- NEW FILE wine-README-Fedora ---
Wine directory structure used in Fedora Core Linux:
===================================================

\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
default. It is created with (empty) C:\windows and C:\windows\system
directories, needed to operate Wine without an existing Windows
installation, if it doesn't already exists.

If you want to use Wine with an existing Windows installation that is
mounted, for example, in /mnt/windows-c, change the symlink
\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
defaults set by installation.

If you do this, you can safely remove \${HOME}/.wine/drive_c.
(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)


--- NEW FILE wine-notepad.desktop ---
[Desktop Entry]
Name=notepad
Comment=Text Editor
Exec=notepad
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-regedit.desktop ---
[Desktop Entry]
Name=regedit
Comment=Wine registry editor
Exec=regedit
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-uninstaller.desktop ---
[Desktop Entry]
Name=Wine Software Uninstaller
Comment=Interface to uninstall software
Exec=uninstaller
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winecfg.desktop ---
[Desktop Entry]
Name=Wine Configuration
Comment=Interface to set wine parameters
Exec=winecfg
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winefile.desktop ---
[Desktop Entry]
Name=Wine File
Comment=Wine File Browser
Exec=winefile
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winemine.desktop ---
[Desktop Entry]
Name=WineMine
Comment=Wine Minesweeper 
Exec=winemine
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winhelp.desktop ---
[Desktop Entry]
Name=winhelp
Comment=Windows Help Browser
Exec=winhelp
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


Index: wine.init
===================================================================
RCS file: wine.init
diff -N wine.init
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.init	2 Jan 2006 09:04:37 -0000	1.3
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# wine	Allow users to run Windows(tm) applications by just clicking on them
+#	(or typing ./file.exe)
+#
+# chkconfig: 35 98 10
+# description: Allow users to run Windows(tm) applications by just clicking \
+#	       on them (or typing ./file.exe)
+
+. /etc/rc.d/init.d/functions
+RETVAL=0
+
+start() {
+	echo -n $"Registering binary handler for Windows applications"
+	/sbin/modprobe binfmt_misc &>/dev/null
+	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+}
+
+stop() {
+	echo -n $"Unregistering binary handler for Windows applications"
+	echo "-1" >/proc/sys/fs/binfmt_misc/windows || :
+	echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE || :
+}
+
+reload() {
+	stop
+	start
+}
+
+wine_status() {
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+		echo $"Wine binary format handlers are registered."
+		return 0
+	else
+		echo $"Wine binary format handlers are not registered."
+		return 3
+	fi
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		wine_status
+		RETVAL=$?
+		;;
+	restart)
+		stop
+		start
+		;;
+	condrestart)
+		if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+			stop
+			start
+		fi
+		;;
+	*)
+		echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+		exit 1
+esac
+exit $RETVAL
+


Index: wine.spec
===================================================================
RCS file: wine.spec
diff -N wine.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.spec	2 Jan 2006 09:04:37 -0000	1.4
@@ -0,0 +1,1060 @@
+Name:		wine
+Version:	0.9.4
+Release:	3
+Summary:	A Windows 16/32/64 bit emulator
+
+Group:		Applications/Emulators
+License:	LGPL
+URL:		http://www.winehq.org/
+Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source1:	wine.init
+Source2:	wine-fonts-20050524.tar.gz
+Source3:        wine-README-Fedora
+Source4:        wine-32.conf
+Source100:      wine-notepad.desktop
+Source101:      wine-regedit.desktop
+Source102:      wine-uninstaller.desktop
+Source103:      wine-winecfg.desktop
+Source104:      wine-winefile.desktop
+Source105:      wine-winemine.desktop
+Source106:      wine-winhelp.desktop
+Patch2:		wine-20050524-generated.patch
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch: %{ix86}
+
+BuildRequires:  autoconf
+BuildRequires:	bison
+BuildRequires:	flex
+BuildRequires:  alsa-lib-devel
+BuildRequires:  arts-devel
+BuildRequires:  audiofile-devel
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  lcms-devel
+BuildRequires:  libieee1284-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openldap-devel
+BuildRequires:  sane-backends-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  fontforge
+# modular x
+BuildRequires:  libX11-devel
+BuildRequires:  mesa-libGL-devel mesa-libGLU-devel mesa-libGLw-devel
+BuildRequires:  libXxf86dga-devel libXxf86vm-devel
+BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+
+Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
+Requires(post): /usr/bin/update-desktop-database
+Requires(preun): /sbin/chkconfig
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+
+%description
+While Wine is usually thought of as a Windows(TM) emulator, the Wine
+developers would prefer that users thought of Wine as a Windows
+compatibility layer for UNIX. This package includes a program loader,
+which allows unmodified Windows 3.x/9x/NT binaries to run on x86 and x86_64
+Unixes. Wine does not require MS Windows, but it can use native system
+.dll files if they are available.
+
+%package tools
+Summary:        Additional wine tools
+Group:		Applications/Emulators
+Requires:       %{name} = %{version}-%{release}
+
+%description tools
+Additional wine tools
+
+%package arts
+Summary: Arts sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description arts
+Arts sound support for wine
+
+%package esd
+Summary: ESD sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description esd
+ESD sound support for wine
+
+%package jack
+Summary: JACK sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description jack
+JACK sound support for wine
+
+%package nas
+Summary: NAS sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description nas
+JACK sound support for wine
+
+%package ldap
+Summary: LDAP support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description ldap
+LDAP support for wine
+
+%package cms
+Summary: Color Managment for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description cms
+Color Management for wine
+
+%package twain
+Summary: Twain support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description twain
+Twain support for wine
+
+%package capi
+Summary: ISDN support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description capi
+ISDN support for wine
+
+%package devel
+Summary: Wine development environment
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description devel
+Header, include files and library definition files for developing applications
+with the Wine Windows(TM) emulation libraries.
+
+%prep
+%setup -q
+%patch2 -p1 -b .generated
+autoconf
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure \
+	--sysconfdir=%{_sysconfdir}/wine --disable-static
+
+%{__make} depend
+%{__make}
+
+%install
+rm -rf %{buildroot}
+
+%makeinstall \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+%makeinstall \
+	-C dlls/wineps \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+
+mkdir -p %{buildroot}%{_sysconfdir}/wine
+
+# Allow users to launch Windows programs by just clicking on the .exe file...
+mkdir -p %{buildroot}%{_initrddir}
+install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
+
+# Install Wine's fonts
+mkdir -p %{buildroot}%{_datadir}/fonts/wine
+tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE100}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE101}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE102}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE103}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE104}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE105}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE106}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
+
+cp %{SOURCE3} README-Fedora
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add wine
+/sbin/chkconfig --level 2345 wine on
+/sbin/service wine start &>/dev/null || :
+update-desktop-database &>/dev/null || :
+
+%preun
+if test "$1" = "0"; then
+	/sbin/chkconfig --del wine
+fi
+
+%postun
+/sbin/ldconfig
+update-desktop-database &>/dev/null || :
+
+%post arts -p /sbin/ldconfig
+%postun arts -p /sbin/ldconfig
+
+%post esd -p /sbin/ldconfig
+%postun esd -p /sbin/ldconfig
+
+%post jack -p /sbin/ldconfig
+%postun jack -p /sbin/ldconfig
+
+%post nas -p /sbin/ldconfig
+%postun nas -p /sbin/ldconfig
+
+%post ldap -p /sbin/ldconfig
+%postun ldap -p /sbin/ldconfig
+
+%post cms -p /sbin/ldconfig
+%postun cms -p /sbin/ldconfig
+
+%post twain -p /sbin/ldconfig
+%postun twain -p /sbin/ldconfig
+
+%post capi -p /sbin/ldconfig
+%postun capi -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
+%doc AUTHORS README-Fedora README VERSION
+%doc documentation/*
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/winebrowser
+%{_bindir}/wineconsole
+%{_bindir}/wineprefixcreate
+%{_bindir}/wineshelllink
+%{_bindir}/winecfg
+%{_bindir}/uninstaller
+%{_initrddir}/wine
+%{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/msiexec.exe.so
+%{_libdir}/wine/regedit.exe.so
+%{_libdir}/wine/regsvr32.exe.so
+%{_libdir}/wine/rpcss.exe.so
+%{_libdir}/wine/rundll32.exe.so
+%{_libdir}/wine/start.exe.so
+%{_libdir}/wine/wineboot.exe.so
+%{_libdir}/wine/winebrowser.exe.so
+%{_libdir}/wine/wineconsole.exe.so
+%{_libdir}/wine/winemenubuilder.exe.so
+%{_libdir}/wine/winevdm.exe.so
+%{_datadir}/applications/fedora-wine.desktop
+%{_datadir}/applications/fedora-wine-regedit.desktop
+%{_datadir}/applications/fedora-wine-uninstaller.desktop
+%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_mandir}/man1/wine.1.gz
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+%{_bindir}/wine-kthread
+%{_bindir}/wine-preloader
+%{_bindir}/wine-pthread
+%{_bindir}/winelauncher
+%{_bindir}/wineserver
+%{_mandir}/man1/wineserver.1*
+%{_libdir}/libwine.so.1
+%{_libdir}/libwine_unicode.so.1
+%dir %{_libdir}/wine
+%{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/advapi32.dll.so
+%{_libdir}/wine/advpack.dll.so
+%{_libdir}/wine/amstream.dll.so
+%{_libdir}/wine/atl.dll.so
+%{_libdir}/wine/avicap32.dll.so
+%{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avifile.dll.so
+%{_libdir}/wine/aviinfo.exe.so
+%{_libdir}/wine/aviplay.exe.so
+%{_libdir}/wine/cabinet.dll.so
+%{_libdir}/wine/cards.dll.so
+%{_libdir}/wine/cfgmgr32.dll.so
+%{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/comcat.dll.so
+%{_libdir}/wine/comctl32.dll.so
+%{_libdir}/wine/comdlg32.dll.so
+%{_libdir}/wine/comm.drv.so
+%{_libdir}/wine/commdlg.dll.so
+%{_libdir}/wine/compobj.dll.so
+%{_libdir}/wine/crtdll.dll.so
+%{_libdir}/wine/crypt32.dll.so
+%{_libdir}/wine/cryptdll.dll.so
+%{_libdir}/wine/ctl3d.dll.so
+%{_libdir}/wine/ctl3d32.dll.so
+%{_libdir}/wine/ctl3dv2.dll.so
+%{_libdir}/wine/d3dim.dll.so
+%{_libdir}/wine/d3drm.dll.so
+%{_libdir}/wine/d3dxof.dll.so
+%{_libdir}/wine/dbghelp.dll.so
+%{_libdir}/wine/dciman32.dll.so
+%{_libdir}/wine/ddeml.dll.so
+%{_libdir}/wine/ddraw.dll.so
+%{_libdir}/wine/devenum.dll.so
+%{_libdir}/wine/dinput.dll.so
+%{_libdir}/wine/dinput8.dll.so
+%{_libdir}/wine/dispdib.dll.so
+%{_libdir}/wine/display.drv.so
+%{_libdir}/wine/dmband.dll.so
+%{_libdir}/wine/dmcompos.dll.so
+%{_libdir}/wine/dmime.dll.so
+%{_libdir}/wine/dmloader.dll.so
+%{_libdir}/wine/dmscript.dll.so
+%{_libdir}/wine/dmstyle.dll.so
+%{_libdir}/wine/dmsynth.dll.so
+%{_libdir}/wine/dmusic.dll.so
+%{_libdir}/wine/dmusic32.dll.so
+%{_libdir}/wine/dplay.dll.so
+%{_libdir}/wine/dplayx.dll.so
+%{_libdir}/wine/dpnet.dll.so
+%{_libdir}/wine/dpnhpast.dll.so
+%{_libdir}/wine/dsound.dll.so
+%{_libdir}/wine/dswave.dll.so
+%{_libdir}/wine/dxdiagn.dll.so
+%{_libdir}/wine/eject.exe.so
+%{_libdir}/wine/gdi.exe.so
+%{_libdir}/wine/gdi32.dll.so
+%{_libdir}/wine/hh.exe.so
+%{_libdir}/wine/hhctrl.ocx.so
+%{_libdir}/wine/iccvid.dll.so
+%{_libdir}/wine/icinfo.exe.so
+%{_libdir}/wine/icmp.dll.so
+%{_libdir}/wine/ifsmgr.vxd.so
+%{_libdir}/wine/imaadp32.acm.so
+%{_libdir}/wine/imagehlp.dll.so
+%{_libdir}/wine/imm.dll.so
+%{_libdir}/wine/imm32.dll.so
+%{_libdir}/wine/iphlpapi.dll.so
+%{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/joystick.drv.so
+%{_libdir}/wine/kernel32.dll.so
+%{_libdir}/wine/keyboard.drv.so
+%{_libdir}/wine/krnl386.exe.so
+%{_libdir}/wine/lz32.dll.so
+%{_libdir}/wine/lzexpand.dll.so
+%{_libdir}/wine/mapi32.dll.so
+%{_libdir}/wine/mciavi32.dll.so
+%{_libdir}/wine/mcicda.dll.so
+%{_libdir}/wine/mciseq.dll.so
+%{_libdir}/wine/mciwave.drv.so
+%{_libdir}/wine/midimap.dll.so
+%{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevldr.vxd.so
+%{_libdir}/wine/mmsystem.dll.so
+%{_libdir}/wine/monodebg.vxd.so
+%{_libdir}/wine/mouse.drv.so
+%{_libdir}/wine/mpr.dll.so
+%{_libdir}/wine/msacm.dll.so
+%{_libdir}/wine/msacm.drv.so
+%{_libdir}/wine/msacm32.dll.so
+%{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/msdmo.dll.so
+%{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/mshtml.dll.so
+%{_libdir}/wine/msi.dll.so
+%{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisys.ocx.so
+%{_libdir}/wine/msnet32.dll.so
+%{_libdir}/wine/msrle32.dll.so
+%{_libdir}/wine/msvcrt.dll.so
+%{_libdir}/wine/msvcrt20.dll.so
+%{_libdir}/wine/msvcrt40.dll.so
+%{_libdir}/wine/msvcrtd.dll.so
+%{_libdir}/wine/msvfw32.dll.so
+%{_libdir}/wine/msvidc32.dll.so
+%{_libdir}/wine/msvideo.dll.so
+%{_libdir}/wine/mswsock.dll.so
+%{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/netapi32.dll.so
+%{_libdir}/wine/newdev.dll.so
+%{_libdir}/wine/ntdll.dll.so
+%{_libdir}/wine/objsel.dll.so
+%{_libdir}/wine/odbc32.dll.so
+%{_libdir}/wine/odbccp32.dll.so
+%{_libdir}/wine/ole2.dll.so
+%{_libdir}/wine/ole2conv.dll.so
+%{_libdir}/wine/ole2disp.dll.so
+%{_libdir}/wine/ole2nls.dll.so
+%{_libdir}/wine/ole2prox.dll.so
+%{_libdir}/wine/ole2thk.dll.so
+%{_libdir}/wine/ole32.dll.so
+%{_libdir}/wine/oleacc.dll.so
+%{_libdir}/wine/oleaut32.dll.so
+%{_libdir}/wine/olecli.dll.so
+%{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledlg.dll.so
+%{_libdir}/wine/olepro32.dll.so
+%{_libdir}/wine/olesvr.dll.so
+%{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/powrprof.dll.so
+%{_libdir}/wine/psapi.dll.so
+%{_libdir}/wine/qcap.dll.so
+%{_libdir}/wine/quartz.dll.so
+%{_libdir}/wine/rasapi16.dll.so
+%{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/riched20.dll.so
+%{_libdir}/wine/riched32.dll.so
+%{_libdir}/wine/rpcrt4.dll.so
+%{_libdir}/wine/rsabase.dll.so
+%{_libdir}/wine/rsaenh.dll.so
+%{_libdir}/wine/secur32.dll.so
+%{_libdir}/wine/sensapi.dll.so
+%{_libdir}/wine/serialui.dll.so
+%{_libdir}/wine/setupapi.dll.so
+%{_libdir}/wine/setupx.dll.so
+%{_libdir}/wine/shdocvw.dll.so
+%{_libdir}/wine/shell.dll.so
+%{_libdir}/wine/shell32.dll.so
+%{_libdir}/wine/shfolder.dll.so
+%{_libdir}/wine/shlwapi.dll.so
+%{_libdir}/wine/snmpapi.dll.so
+%{_libdir}/wine/sound.drv.so
+%{_libdir}/wine/stdole2.tlb.so
+%{_libdir}/wine/stdole32.tlb.so
+%{_libdir}/wine/sti.dll.so
+%{_libdir}/wine/storage.dll.so
+%{_libdir}/wine/stress.dll.so
+%{_libdir}/wine/system.drv.so
+%{_libdir}/wine/tapi32.dll.so
+%{_libdir}/wine/toolhelp.dll.so
+%{_libdir}/wine/typelib.dll.so
+%{_libdir}/wine/unicows.dll.so
+%{_libdir}/wine/url.dll.so
+%{_libdir}/wine/urlmon.dll.so
+%{_libdir}/wine/user.exe.so
+%{_libdir}/wine/user32.dll.so
+%{_libdir}/wine/usp10.dll.so
+%{_libdir}/wine/uxtheme.dll.so
+%{_libdir}/wine/vdhcp.vxd.so
+%{_libdir}/wine/vdmdbg.dll.so
+%{_libdir}/wine/ver.dll.so
+%{_libdir}/wine/version.dll.so
+%{_libdir}/wine/vmm.vxd.so
+%{_libdir}/wine/vnbt.vxd.so
+%{_libdir}/wine/vnetbios.vxd.so
+%{_libdir}/wine/vtdapi.vxd.so
+%{_libdir}/wine/vwin32.vxd.so
+%{_libdir}/wine/w32skrnl.dll.so
+%{_libdir}/wine/w32sys.dll.so
+%{_libdir}/wine/win32s16.dll.so
+%{_libdir}/wine/win87em.dll.so
+%{_libdir}/wine/winaspi.dll.so
+%{_libdir}/wine/windebug.dll.so
+%{_libdir}/wine/wineaudioio.drv.so
+%{_libdir}/wine/winedos.dll.so
+%{_libdir}/wine/winemp3.acm.so
+%{_libdir}/wine/wineoss.drv.so
+#%{_libdir}/wine/winetty.drv.so
+%{_libdir}/wine/winex11.drv.so
+%{_libdir}/wine/wing.dll.so
+%{_libdir}/wine/wininet.dll.so
+%{_libdir}/wine/winmm.dll.so
+%{_libdir}/wine/winnls.dll.so
+%{_libdir}/wine/winnls32.dll.so
+%{_libdir}/wine/winsock.dll.so
+%{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/wintab.dll.so
+%{_libdir}/wine/wintab32.dll.so
+%{_libdir}/wine/wintrust.dll.so
+%{_libdir}/wine/wnaspi32.dll.so
+%{_libdir}/wine/wow32.dll.so
+%{_libdir}/wine/wprocs.dll.so
+%{_libdir}/wine/ws2_32.dll.so
+%{_libdir}/wine/wsock32.dll.so
+%{_libdir}/wine/wtsapi32.dll.so
+%dir %{_datadir}/fonts/wine
+%{_datadir}/fonts/wine/wine_coure.fon
+%{_datadir}/fonts/wine/wine_couree.fon
+%{_datadir}/fonts/wine/wine_courer.fon
+%{_datadir}/fonts/wine/wine_marlett.ttf
+%{_datadir}/fonts/wine/wine_sserife.fon
+%{_datadir}/fonts/wine/wine_sserifee.fon
+%{_datadir}/fonts/wine/wine_sserifer.fon
+%{_datadir}/fonts/wine/wine_vgasys.fon
+%{_datadir}/fonts/wine/wine_vgasyse.fon
+%{_datadir}/fonts/wine/wine_vgasysr.fon
+%{_datadir}/fonts/wine/coue1255.fon
+%{_datadir}/fonts/wine/coue1256.fon
+%{_datadir}/fonts/wine/coue1257.fon
+%{_datadir}/fonts/wine/coure.fon
+%{_datadir}/fonts/wine/couree.fon
+%{_datadir}/fonts/wine/coureg.fon
+%{_datadir}/fonts/wine/courer.fon
+%{_datadir}/fonts/wine/couret.fon
+%{_datadir}/fonts/wine/cvgasys.fon
+%{_datadir}/fonts/wine/hvgasys.fon
+%{_datadir}/fonts/wine/jvgasys.fon
+%{_datadir}/fonts/wine/marlett.ttf
+%{_datadir}/fonts/wine/ssee1255.fon
+%{_datadir}/fonts/wine/ssee1256.fon
+%{_datadir}/fonts/wine/ssee1257.fon
+%{_datadir}/fonts/wine/ssee874.fon
+%{_datadir}/fonts/wine/sserife.fon
+%{_datadir}/fonts/wine/sserifee.fon
+%{_datadir}/fonts/wine/sserifeg.fon
+%{_datadir}/fonts/wine/sserifer.fon
+%{_datadir}/fonts/wine/sserifet.fon
+%{_datadir}/fonts/wine/svgasys.fon
+%{_datadir}/fonts/wine/vgas1255.fon
+%{_datadir}/fonts/wine/vgas1256.fon
+%{_datadir}/fonts/wine/vgas1257.fon
+%{_datadir}/fonts/wine/vgas874.fon
+%{_datadir}/fonts/wine/vgasys.fon
+%{_datadir}/fonts/wine/vgasyse.fon
+%{_datadir}/fonts/wine/vgasysg.fon
+%{_datadir}/fonts/wine/vgasysr.fon
+%{_datadir}/fonts/wine/vgasyst.fon
+%{_libdir}/wine/winealsa.drv.so
+%{_libdir}/wine/wineps.drv.so
+%{_libdir}/wine/wineps16.drv.so
+%{_libdir}/wine/d3d8.dll.so
+%{_libdir}/wine/d3d9.dll.so
+%{_libdir}/wine/d3dx8.dll.so
+%{_libdir}/wine/glu32.dll.so
+%{_libdir}/wine/glut32.dll.so
+%{_libdir}/wine/opengl32.dll.so
+%{_libdir}/wine/wined3d.dll.so
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/notepad
+%{_bindir}/progman
+%{_bindir}/wcmd
+%{_bindir}/winedbg
+%{_bindir}/winedump
+%{_bindir}/winefile
+%{_bindir}/winemaker
+%{_bindir}/winemine
+%{_bindir}/winepath
+%{_bindir}/winhelp
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/uninstaller.exe.so
+%{_libdir}/wine/wcmd.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winhelp.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/winetest.exe.so
+%{_datadir}/applications/fedora-wine-notepad.desktop
+%{_datadir}/applications/fedora-wine-winefile.desktop
+%{_datadir}/applications/fedora-wine-winemine.desktop
+%{_datadir}/applications/fedora-wine-winhelp.desktop
+
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/wine/winearts.drv.so
+
+%files esd
+%defattr(-,root,root,-)
+%{_libdir}/wine/wineesd.drv.so
+
+%files jack
+%defattr(-,root,root,-)
+%{_libdir}/wine/winejack.drv.so
+
+%files nas
+%defattr(-,root,root,-)
+%{_libdir}/wine/winenas.drv.so
+
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/wine/wldap32.dll.so
+
+%files cms
+%defattr(-,root,root,-)
+%{_libdir}/wine/mscms.dll.so
+
+%files twain
+%defattr(-,root,root,-)
+%{_libdir}/wine/twain.dll.so
+%{_libdir}/wine/twain_32.dll.so
+
+%files capi
+%defattr(-,root,root,-)
+%{_libdir}/wine/capi2032.dll.so
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/function_grep.pl
+%{_bindir}/widl
+%{_bindir}/winebuild
+%{_bindir}/winecpp
+%{_bindir}/winedump
+%{_bindir}/wineg++
+%{_bindir}/winegcc
+%{_bindir}/winemaker
+%{_bindir}/wmc
+%{_bindir}/wrc
+%{_libdir}/*.so
+%{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.1*
+%{_mandir}/man1/winedump.1*
+%{_mandir}/man1/winegcc.1*
+%{_mandir}/man1/winemaker.1*
+%{_mandir}/man1/wmc.1*
+%{_mandir}/man1/wrc.1*
+%{_mandir}/man1/winedbg.1*
+%{_mandir}/man1/wineg++.1*
+%{_datadir}/aclocal/wine.m4
+%attr(0755, root, root) %dir %{_includedir}/wine
+%{_includedir}/wine/*
+%{_libdir}/wine/*.a
+%{_libdir}/wine/*.def
+
+%changelog
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-3
+- use ExclusiveArch instead of ExcludeArch
+
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-2
+- own font directory
+- fix devel summary
+- add ExcludeArch x86_64 for now
+
+* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-1
+- version upgrade
+- changed wine.init perissions to 0644
+- added autoconf BR
+
+* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.3-1
+- version upgrade
+
+* Thu Nov 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.2-1
+- version upgrade
+
+* Thu Nov 17 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
+0.9.1-3
+- fix typo in winefile desktop file
+- drop in ld config instead of editing ld.so.conf
+
+* Sun Nov 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-2
+- add fontforge BR and include generated fonts...
+
+* Sat Nov 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-1
+- version upgrade
+- move uninstaller and winecfg into wine main package...
+- drop wine suite
+
+* Sat Oct 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-3
+- s/libwine/wine/
+
+* Thu Oct 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-2
+- remerge some subpackages which should be defaults
+
+* Tue Oct 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-1
+- upgrade to new version
+- start splitting
+
+* Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0-1.20050930
+- add fedora readme
+- switch to new (old) versioning sheme
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-3
+- add desktop files
+- revisit summary and description
+- consistant use of %{buildroot}
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-2
+- some more spec tuneups...
+
+* Sat Oct 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-1
+- version upgrade
+
+* Sun Sep 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050925-1
+- upgrade to current cvs
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050830-1
+- version upgrade
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050524-2
+- fedorarized version
+
+* Mon May 30 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050524-1fc3
+- Update to 20050524
+- Remove pdf documentation build as it's no more included in the main archive
+- Workaround for generic.ppd installation
+
+* Tue Apr 19 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050419-1fc3
+- Update to 20050419
+
+* Thu Mar 10 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050310-1fc3
+- Update to 20050310
+
+* Sat Feb 12 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050211-1fc3
+- Update to 20050211
+
+* Tue Jan 11 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050111-1fc3
+- Update to 20050111
+
+* Wed Dec 1 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041201-1fc3
+- Recompile for FC3
+- Update to 20041201
+- Small reorganization:
+    - use the generic ICU static libs name;
+    - no more wine group;
+    - use Wine's generated stdole32.tlb file;
+    - use Wine's generated fonts.
+
+* Wed Oct 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041019-1fc2
+- Update to 20041019
+
+* Wed Sep 15 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040914-1fc2
+- Update to 20040914
+
+* Sat Aug 14 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040813-1fc2
+- Update to 20040813
+
+* Sat Jul 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040716-1fc2
+- Update to 20040716
+
+* Fri Jun 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc2
+- Recompile for FC2
+- Backport from current CVS some fixes to the preloader to prevent
+  a segfault on startup
+- Include a currently uncommitted patch from Alexandre Julliard regarding
+  further issues with the preloader
+
+* Sun Jun 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc1
+- Update to 20040615
+- Use of wineprefixcreate instead of old RedHat patches
+
+* Wed May 5 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040505-1fc1
+- Update to 20040505
+
+* Fri Apr 9 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040408-1fc1
+- Update to 20040408
+- Change the handling of paths to DOS drives in the installation process
+
+* Wed Mar 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040309-1fc1
+- Update to 20040309
+- Replaced winedefault.reg by wine.inf
+
+* Wed Feb 18 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040213-1fc1
+- Update to 20040213
+- Moved Wine dlls back to %{_libdir}/wine rather than %{_libdir}/wine/wine
+
+* Sun Jan 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040121-fc1
+- Update to 20040121
+
+* Sat Dec 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031212-fc1
+- Update to 20031212
+
+* Wed Nov 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031118-fc1
+- Update to 20031118
+
+* Thu Oct 16 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031016-1rh9
+- Update to 20031016
+
+* Tue Sep 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030911-1rh9
+- Fix of include location
+- Better separation of run-time and development files
+- Update to 20030911
+
+* Wed Aug 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030813-1rh9
+- Update to 20030813
+
+* Wed Jul 09 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030709-1rh9
+- Update to 20030709
+
+* Wed Jun 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030618-1rh9
+- Change the default C drive to ~/.wine/c, copied from /usr/share/wine
+  if non-existant (Thanks to Rudolf Kastl)
+- Updated to 20030618
+
+* Tue May 20 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1rh9
+- Adapted for RH9
+
+* Thu May 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1
+- Add libraries definition files to devel package
+- Update to 20030508
+
+* Tue Apr 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030408-1
+- Update to 20030408
+
+* Tue Mar 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030318-1
+- Update to 20030318
+
+* Thu Mar 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-2
+- Fix the symlinks in wine-c.
+
+* Wed Feb 19 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-1
+- Update to 20030129
+- Various fixes in RPM build process
+
+* Fri Jan 17 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030115-1
+- Update to 20030115
+- fix to build problem
+
+* Thu Nov  7 2002 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20021031-1
+- Update to 20021031
+- Tweaks here and there
+
+* Wed Sep  4 2002 Bill Nottingham <notting at redhat.com> 20020605-2
+- fix docs (#72923)
+
+* Wed Jul 10 2002 Karsten Hopp <karsten at redhat.de> 20020605-1
+- update
+- remove obsolete part of redhat patch
+- redo destdir patch
+- redo kde patch
+- redo defaultversion patch
+- fix 'my_perl unknown' error
+- work around name conflict with textutils 'expand'
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020327-1
+- Fix wineshelllink (#61761)
+- Fix up initscript (#53625)
+- Clean up spec file
+- Default to emulating Windoze ME rather than 3.1, nobody uses 3.1
+  applications anymore
+- Auto-generate default config if none exists (#61920)
+
+* Mon Mar 04 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020304-1
+- Assign gid 66 (closest to 666 [Microsoft number] we can get for a
+  system account ;) )
+- Don't use glibc private functions (__libc_fork)
+- Update
+
+* Tue Feb 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020226-1
+- Fix bug #60250
+- Update
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020221-1
+- Update
+- Don't try to launch winesetup in winelauncher, we aren't shipping it
+  (#59621)
+
+* Sun Jan 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020127-1
+- Update
+- Fix build in current environment
+
+* Wed Aug 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010822-1
+- Make sure the package can be cleanly uninstalled (#52007)
+- Add build dependencies
+
+* Thu Jul 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010726-1
+- Fix -devel package group (#49989)
+- remove internal CVS files
+- chkconfig deletion should be in %preun, not %postun
+- rename initscript ("Starting windows:" at startup does look off)
+
+* Thu May 03 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010503-1
+- Update
+- generate HTML documentation rather than shipping plain docbook text
+  (#38453)
+
+* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Update registry to mount "/" as drive "Z:", fixes winedbg (needs to be
+  accessible from 'doze drives)
+- Don't create KDE 1.x style desktop entries in wineshelllink
+- Be more tolerant on failing stuff in %%post
+
+* Thu Mar  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+
+* Thu Feb 15 2001 Tim Powers <timp at redhat.com>
+- fixed time.h build problems
+
+* Wed Jan 31 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add a patch to handle .exe and .com file permissions the way we want them
+
+* Thu Jan 18 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Restore wine's ability to use a global config file, it was removed
+  in CVS for whatever reason
+- Move libraries to %{_libdir}/wine to prevent conflicts with libuser
+  (Bug #24202)
+- Move include files to /usr/include/wine to prevent it from messing with
+  some autoconf scripts (some broken scripts assume they're running on windoze
+  if /usr/include/windows.h exists...)
+
+* Tue Dec 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix %%pre and %%postun scripts
+- --enable-opengl, glibc 2.2 should be safe
+- Update CVS
+
+* Mon Nov 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update CVS
+- Add a new (user) group wine that can write to the "C: drive"
+  %{_datadir}/wine-c
+- Fix up winedbg installation (registry entries)
+- Add "Program Files/Common Files" subdirectory to the "C: drive", it's
+  referenced in the registry
+
+* Wed Oct 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- rebuilt with new DGA
+
+* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- new snapshot
+- fix compilation with gcc 2.96
+
+* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Move init script back
+- new version
+- move man pages to FHS locations
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- move initscript
+- new snapshot
+
+* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Start the initscript on startup
+
+* Mon May  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- New version
+- new feature: You can now launch wine by just running a windows .exe file
+  (./some.exe or just click on it in kfm, gmc and the likes)
+- some spec file modifications
+
+* Sun Feb 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- newer version
+- Improve the system.ini file - all multimedia stuff should work now.
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- enable and fix up the urlmon/wininet patch
+- add: autoexec.bat, config.sys, windows/win.ini windows/system.ini
+  windows/Profiles/Administrator
+- allow i[456]86 arches
+- add some system.ini configuration
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update current
+- add urlmon and wininet patches from Corel (don't apply them for now though)
+- create empty shell*dll and winsock*dll files (as mentioned in the HOWTO)
+
+* Mon Jan 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update to current (lots of important fixes)
+- Fix up the default wine.conf file (We really don't want it to look
+  for CD-ROMs in /cdrom!)
+- create a "root filesystem" with everything required to run wine without
+  windows in %{_datadir}/wine-c (drive c:)
+- add RedHat file in /usr/doc/wine-%{version} explaining the new directory
+  layout
+- wine-devel requires wine
+
+* Tue Dec 14 1999 Preston Brown <pbrown at redhat.com>
+- updated source for Powertools 6.2
+- better files list
+
+* Fri Jul 23 1999 Tim Powers <timp at redhat.com>
+- updated source
+- built for 6.1
+
+* Tue Apr 13 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+- updated package and spec file
+
+* Mon Oct 26 1998 Preston Brown <pbrown at redhat.com>
+- updated to 10/25/98 version.  There is really no point in keeping the
+- older one, it is full of bugs and the newer one has fewer.
+- commented out building of texinfo manual, it is horrendously broken.
+
+* Mon Oct 12 1998 Michael Maher <mike at redhat.com>
+- built package for 5.2
+- pressured by QA, not updating.
+
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- repackaged for PowerTools



From fedora-extras-commits at redhat.com  Mon Jan  2 09:09:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:09:16 -0500
Subject: rpms/wine/devel wine.spec,1.4,1.5
Message-ID: <200601020910.k029A5Fx028424@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407

Modified Files:
	wine.spec 
Log Message:
- add dist



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine.spec	2 Jan 2006 09:04:37 -0000	1.4
+++ wine.spec	2 Jan 2006 09:09:15 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	3
+Release:	4%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -679,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-4
+- add dist
+
 * Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-3
 - use ExclusiveArch instead of ExcludeArch



From fedora-extras-commits at redhat.com  Mon Jan  2 09:16:48 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:16:48 -0500
Subject: rpms/wine/FC-3 wine-20030408-defaultcfg.patch, 1.1,
	NONE wine-20030408-initial.patch, 1.1,
	NONE wine-20030408-kde2.patch, 1.1,
	NONE wine-20030408-winelauncher.patch, 1.1, NONE
Message-ID: <200601020916.k029GoW6028715@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28546/FC-3

Removed Files:
	wine-20030408-defaultcfg.patch wine-20030408-initial.patch 
	wine-20030408-kde2.patch wine-20030408-winelauncher.patch 
Log Message:
- prep for import



--- wine-20030408-defaultcfg.patch DELETED ---


--- wine-20030408-initial.patch DELETED ---


--- wine-20030408-kde2.patch DELETED ---


--- wine-20030408-winelauncher.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan  2 09:17:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:17:04 -0500
Subject: rpms/wine/FC-4 Makefile,1.3,1.4
Message-ID: <200601020917.k029Hf5n028759@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28546/FC-4

Added Files:
	Makefile 
Log Message:
- prep for import



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	2 Jan 2006 09:17:02 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wine
+# $Id$
+NAME := wine
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Mon Jan  2 09:24:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:24:37 -0500
Subject: rpms/wine/FC-4 sources, 1.3, 1.4 wine-20050524-generated.patch, NONE,
	1.1 wine-32.conf, NONE, 1.1 wine-README-Fedora, NONE,
	1.1 wine-notepad.desktop, NONE, 1.1 wine-regedit.desktop, NONE,
	1.1 wine-uninstaller.desktop, NONE, 1.1 wine-winecfg.desktop,
	NONE, 1.1 wine-winefile.desktop, NONE, 1.1 wine-winemine.desktop,
	NONE, 1.1 wine-winhelp.desktop, NONE, 1.1 wine.init, 1.2,
	1.3 wine.spec, 1.3, 1.4
Message-ID: <200601020925.k029PAnu028948@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28897/FC-4

Added Files:
	sources wine-20050524-generated.patch wine-32.conf 
	wine-README-Fedora wine-notepad.desktop wine-regedit.desktop 
	wine-uninstaller.desktop wine-winecfg.desktop 
	wine-winefile.desktop wine-winemine.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
auto-import wine-0.9.4-3 on branch FC-4 from wine-0.9.4-3.src.rpm


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	2 Jan 2006 09:24:37 -0000	1.4
@@ -0,0 +1,2 @@
+73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz

wine-20050524-generated.patch:

--- NEW FILE wine-20050524-generated.patch ---
Index: wine/tools/wineprefixcreate.in
===================================================================
RCS file: /home/wine/wine/tools/wineprefixcreate.in,v
retrieving revision 1.10
diff -u -r1.10 wineprefixcreate.in
--- wine/tools/wineprefixcreate.in	19 May 2005 11:12:34 -0000	1.10
+++ wine/tools/wineprefixcreate.in	29 May 2005 00:00:00 -0000
@@ -38,6 +38,7 @@
 
 dlldir="@dlldir@"
 datadir="@datadir@/wine"
+fontdir="@datadir@/fonts/wine"
 
 do_wait=0
 quiet=0
@@ -175,6 +176,11 @@
 link_app winhelp      "$CROOT/windows/winhelp.exe"
 link_app winhelp      "$CROOT/windows/winhlp32.exe"
 link_app winebrowser  "$CROOT/windows/winebrowser.exe"
+
+# Copy the generated fonts
+
+cp $fontdir/*.ttf "$CROOT/windows/fonts"
+cp $fontdir/*.fon "$CROOT/windows/fonts"
 
 # Copy the .inf script and run it
 


--- NEW FILE wine-32.conf ---
/usr/lib/wine/


--- NEW FILE wine-README-Fedora ---
Wine directory structure used in Fedora Core Linux:
===================================================

\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
default. It is created with (empty) C:\windows and C:\windows\system
directories, needed to operate Wine without an existing Windows
installation, if it doesn't already exists.

If you want to use Wine with an existing Windows installation that is
mounted, for example, in /mnt/windows-c, change the symlink
\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
defaults set by installation.

If you do this, you can safely remove \${HOME}/.wine/drive_c.
(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)


--- NEW FILE wine-notepad.desktop ---
[Desktop Entry]
Name=notepad
Comment=Text Editor
Exec=notepad
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-regedit.desktop ---
[Desktop Entry]
Name=regedit
Comment=Wine registry editor
Exec=regedit
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-uninstaller.desktop ---
[Desktop Entry]
Name=Wine Software Uninstaller
Comment=Interface to uninstall software
Exec=uninstaller
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winecfg.desktop ---
[Desktop Entry]
Name=Wine Configuration
Comment=Interface to set wine parameters
Exec=winecfg
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winefile.desktop ---
[Desktop Entry]
Name=Wine File
Comment=Wine File Browser
Exec=winefile
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winemine.desktop ---
[Desktop Entry]
Name=WineMine
Comment=Wine Minesweeper 
Exec=winemine
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winhelp.desktop ---
[Desktop Entry]
Name=winhelp
Comment=Windows Help Browser
Exec=winhelp
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


Index: wine.init
===================================================================
RCS file: wine.init
diff -N wine.init
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.init	2 Jan 2006 09:24:37 -0000	1.3
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# wine	Allow users to run Windows(tm) applications by just clicking on them
+#	(or typing ./file.exe)
+#
+# chkconfig: 35 98 10
+# description: Allow users to run Windows(tm) applications by just clicking \
+#	       on them (or typing ./file.exe)
+
+. /etc/rc.d/init.d/functions
+RETVAL=0
+
+start() {
+	echo -n $"Registering binary handler for Windows applications"
+	/sbin/modprobe binfmt_misc &>/dev/null
+	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+}
+
+stop() {
+	echo -n $"Unregistering binary handler for Windows applications"
+	echo "-1" >/proc/sys/fs/binfmt_misc/windows || :
+	echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE || :
+}
+
+reload() {
+	stop
+	start
+}
+
+wine_status() {
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+		echo $"Wine binary format handlers are registered."
+		return 0
+	else
+		echo $"Wine binary format handlers are not registered."
+		return 3
+	fi
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		wine_status
+		RETVAL=$?
+		;;
+	restart)
+		stop
+		start
+		;;
+	condrestart)
+		if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+			stop
+			start
+		fi
+		;;
+	*)
+		echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+		exit 1
+esac
+exit $RETVAL
+


Index: wine.spec
===================================================================
RCS file: wine.spec
diff -N wine.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.spec	2 Jan 2006 09:24:37 -0000	1.4
@@ -0,0 +1,1056 @@
+Name:		wine
+Version:	0.9.4
+Release:	3%{?dist}
+Summary:	A Windows 16/32/64 bit emulator
+
+Group:		Applications/Emulators
+License:	LGPL
+URL:		http://www.winehq.org/
+Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source1:	wine.init
+Source2:	wine-fonts-20050524.tar.gz
+Source3:        wine-README-Fedora
+Source4:        wine-32.conf
+Source100:      wine-notepad.desktop
+Source101:      wine-regedit.desktop
+Source102:      wine-uninstaller.desktop
+Source103:      wine-winecfg.desktop
+Source104:      wine-winefile.desktop
+Source105:      wine-winemine.desktop
+Source106:      wine-winhelp.desktop
+Patch2:		wine-20050524-generated.patch
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:  %{ix86}
+
+BuildRequires:  autoconf
+BuildRequires:	bison
+BuildRequires:	flex
+BuildRequires:  alsa-lib-devel
+BuildRequires:  arts-devel
+BuildRequires:  audiofile-devel
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  lcms-devel
+BuildRequires:  libieee1284-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openldap-devel
+BuildRequires:  sane-backends-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  fontforge
+
+Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
+Requires(post): /usr/bin/update-desktop-database
+Requires(preun): /sbin/chkconfig
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+
+%description
+While Wine is usually thought of as a Windows(TM) emulator, the Wine
+developers would prefer that users thought of Wine as a Windows
+compatibility layer for UNIX. This package includes a program loader,
+which allows unmodified Windows 3.x/9x/NT binaries to run on x86 and x86_64
+Unixes. Wine does not require MS Windows, but it can use native system
+.dll files if they are available.
+
+%package tools
+Summary:        Additional wine tools
+Group:		Applications/Emulators
+Requires:       %{name} = %{version}-%{release}
+
+%description tools
+Additional wine tools
+
+%package arts
+Summary: Arts sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description arts
+Arts sound support for wine
+
+%package esd
+Summary: ESD sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description esd
+ESD sound support for wine
+
+%package jack
+Summary: JACK sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description jack
+JACK sound support for wine
+
+%package nas
+Summary: NAS sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description nas
+JACK sound support for wine
+
+%package ldap
+Summary: LDAP support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description ldap
+LDAP support for wine
+
+%package cms
+Summary: Color Managment for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description cms
+Color Management for wine
+
+%package twain
+Summary: Twain support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description twain
+Twain support for wine
+
+%package capi
+Summary: ISDN support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description capi
+ISDN support for wine
+
+%package devel
+Summary: Wine development environment
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description devel
+Header, include files and library definition files for developing applications
+with the Wine Windows(TM) emulation libraries.
+
+%prep
+%setup -q
+%patch2 -p1 -b .generated
+autoconf
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure \
+	--sysconfdir=%{_sysconfdir}/wine --disable-static
+
+%{__make} depend
+%{__make}
+
+%install
+rm -rf %{buildroot}
+
+%makeinstall \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+%makeinstall \
+	-C dlls/wineps \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+
+mkdir -p %{buildroot}%{_sysconfdir}/wine
+
+# Allow users to launch Windows programs by just clicking on the .exe file...
+mkdir -p %{buildroot}%{_initrddir}
+install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
+
+# Install Wine's fonts
+mkdir -p %{buildroot}%{_datadir}/fonts/wine
+tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE100}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE101}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE102}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE103}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE104}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE105}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE106}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
+
+cp %{SOURCE3} README-Fedora
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add wine
+/sbin/chkconfig --level 2345 wine on
+/sbin/service wine start &>/dev/null || :
+update-desktop-database &>/dev/null || :
+
+%preun
+if test "$1" = "0"; then
+	/sbin/chkconfig --del wine
+fi
+
+%postun
+/sbin/ldconfig
+update-desktop-database &>/dev/null || :
+
+%post arts -p /sbin/ldconfig
+%postun arts -p /sbin/ldconfig
+
+%post esd -p /sbin/ldconfig
+%postun esd -p /sbin/ldconfig
+
+%post jack -p /sbin/ldconfig
+%postun jack -p /sbin/ldconfig
+
+%post nas -p /sbin/ldconfig
+%postun nas -p /sbin/ldconfig
+
+%post ldap -p /sbin/ldconfig
+%postun ldap -p /sbin/ldconfig
+
+%post cms -p /sbin/ldconfig
+%postun cms -p /sbin/ldconfig
+
+%post twain -p /sbin/ldconfig
+%postun twain -p /sbin/ldconfig
+
+%post capi -p /sbin/ldconfig
+%postun capi -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
+%doc AUTHORS README-Fedora README VERSION
+%doc documentation/*
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/winebrowser
+%{_bindir}/wineconsole
+%{_bindir}/wineprefixcreate
+%{_bindir}/wineshelllink
+%{_bindir}/winecfg
+%{_bindir}/uninstaller
+%{_initrddir}/wine
+%{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/msiexec.exe.so
+%{_libdir}/wine/regedit.exe.so
+%{_libdir}/wine/regsvr32.exe.so
+%{_libdir}/wine/rpcss.exe.so
+%{_libdir}/wine/rundll32.exe.so
+%{_libdir}/wine/start.exe.so
+%{_libdir}/wine/wineboot.exe.so
+%{_libdir}/wine/winebrowser.exe.so
+%{_libdir}/wine/wineconsole.exe.so
+%{_libdir}/wine/winemenubuilder.exe.so
+%{_libdir}/wine/winevdm.exe.so
+%{_datadir}/applications/fedora-wine.desktop
+%{_datadir}/applications/fedora-wine-regedit.desktop
+%{_datadir}/applications/fedora-wine-uninstaller.desktop
+%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_mandir}/man1/wine.1.gz
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+%{_bindir}/wine-kthread
+%{_bindir}/wine-preloader
+%{_bindir}/wine-pthread
+%{_bindir}/winelauncher
+%{_bindir}/wineserver
+%{_mandir}/man1/wineserver.1*
+%{_libdir}/libwine.so.1
+%{_libdir}/libwine_unicode.so.1
+%dir %{_libdir}/wine
+%{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/advapi32.dll.so
+%{_libdir}/wine/advpack.dll.so
+%{_libdir}/wine/amstream.dll.so
+%{_libdir}/wine/atl.dll.so
+%{_libdir}/wine/avicap32.dll.so
+%{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avifile.dll.so
+%{_libdir}/wine/aviinfo.exe.so
+%{_libdir}/wine/aviplay.exe.so
+%{_libdir}/wine/cabinet.dll.so
+%{_libdir}/wine/cards.dll.so
+%{_libdir}/wine/cfgmgr32.dll.so
+%{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/comcat.dll.so
+%{_libdir}/wine/comctl32.dll.so
+%{_libdir}/wine/comdlg32.dll.so
+%{_libdir}/wine/comm.drv.so
+%{_libdir}/wine/commdlg.dll.so
+%{_libdir}/wine/compobj.dll.so
+%{_libdir}/wine/crtdll.dll.so
+%{_libdir}/wine/crypt32.dll.so
+%{_libdir}/wine/cryptdll.dll.so
+%{_libdir}/wine/ctl3d.dll.so
+%{_libdir}/wine/ctl3d32.dll.so
+%{_libdir}/wine/ctl3dv2.dll.so
+%{_libdir}/wine/d3dim.dll.so
+%{_libdir}/wine/d3drm.dll.so
+%{_libdir}/wine/d3dxof.dll.so
+%{_libdir}/wine/dbghelp.dll.so
+%{_libdir}/wine/dciman32.dll.so
+%{_libdir}/wine/ddeml.dll.so
+%{_libdir}/wine/ddraw.dll.so
+%{_libdir}/wine/devenum.dll.so
+%{_libdir}/wine/dinput.dll.so
+%{_libdir}/wine/dinput8.dll.so
+%{_libdir}/wine/dispdib.dll.so
+%{_libdir}/wine/display.drv.so
+%{_libdir}/wine/dmband.dll.so
+%{_libdir}/wine/dmcompos.dll.so
+%{_libdir}/wine/dmime.dll.so
+%{_libdir}/wine/dmloader.dll.so
+%{_libdir}/wine/dmscript.dll.so
+%{_libdir}/wine/dmstyle.dll.so
+%{_libdir}/wine/dmsynth.dll.so
+%{_libdir}/wine/dmusic.dll.so
+%{_libdir}/wine/dmusic32.dll.so
+%{_libdir}/wine/dplay.dll.so
+%{_libdir}/wine/dplayx.dll.so
+%{_libdir}/wine/dpnet.dll.so
+%{_libdir}/wine/dpnhpast.dll.so
+%{_libdir}/wine/dsound.dll.so
+%{_libdir}/wine/dswave.dll.so
+%{_libdir}/wine/dxdiagn.dll.so
+%{_libdir}/wine/eject.exe.so
+%{_libdir}/wine/gdi.exe.so
+%{_libdir}/wine/gdi32.dll.so
+%{_libdir}/wine/hh.exe.so
+%{_libdir}/wine/hhctrl.ocx.so
+%{_libdir}/wine/iccvid.dll.so
+%{_libdir}/wine/icinfo.exe.so
+%{_libdir}/wine/icmp.dll.so
+%{_libdir}/wine/ifsmgr.vxd.so
+%{_libdir}/wine/imaadp32.acm.so
+%{_libdir}/wine/imagehlp.dll.so
+%{_libdir}/wine/imm.dll.so
+%{_libdir}/wine/imm32.dll.so
+%{_libdir}/wine/iphlpapi.dll.so
+%{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/joystick.drv.so
+%{_libdir}/wine/kernel32.dll.so
+%{_libdir}/wine/keyboard.drv.so
+%{_libdir}/wine/krnl386.exe.so
+%{_libdir}/wine/lz32.dll.so
+%{_libdir}/wine/lzexpand.dll.so
+%{_libdir}/wine/mapi32.dll.so
+%{_libdir}/wine/mciavi32.dll.so
+%{_libdir}/wine/mcicda.dll.so
+%{_libdir}/wine/mciseq.dll.so
+%{_libdir}/wine/mciwave.drv.so
+%{_libdir}/wine/midimap.dll.so
+%{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevldr.vxd.so
+%{_libdir}/wine/mmsystem.dll.so
+%{_libdir}/wine/monodebg.vxd.so
+%{_libdir}/wine/mouse.drv.so
+%{_libdir}/wine/mpr.dll.so
+%{_libdir}/wine/msacm.dll.so
+%{_libdir}/wine/msacm.drv.so
+%{_libdir}/wine/msacm32.dll.so
+%{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/msdmo.dll.so
+%{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/mshtml.dll.so
+%{_libdir}/wine/msi.dll.so
+%{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisys.ocx.so
+%{_libdir}/wine/msnet32.dll.so
+%{_libdir}/wine/msrle32.dll.so
+%{_libdir}/wine/msvcrt.dll.so
+%{_libdir}/wine/msvcrt20.dll.so
+%{_libdir}/wine/msvcrt40.dll.so
+%{_libdir}/wine/msvcrtd.dll.so
+%{_libdir}/wine/msvfw32.dll.so
+%{_libdir}/wine/msvidc32.dll.so
+%{_libdir}/wine/msvideo.dll.so
+%{_libdir}/wine/mswsock.dll.so
+%{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/netapi32.dll.so
+%{_libdir}/wine/newdev.dll.so
+%{_libdir}/wine/ntdll.dll.so
+%{_libdir}/wine/objsel.dll.so
+%{_libdir}/wine/odbc32.dll.so
+%{_libdir}/wine/odbccp32.dll.so
+%{_libdir}/wine/ole2.dll.so
+%{_libdir}/wine/ole2conv.dll.so
+%{_libdir}/wine/ole2disp.dll.so
+%{_libdir}/wine/ole2nls.dll.so
+%{_libdir}/wine/ole2prox.dll.so
+%{_libdir}/wine/ole2thk.dll.so
+%{_libdir}/wine/ole32.dll.so
+%{_libdir}/wine/oleacc.dll.so
+%{_libdir}/wine/oleaut32.dll.so
+%{_libdir}/wine/olecli.dll.so
+%{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledlg.dll.so
+%{_libdir}/wine/olepro32.dll.so
+%{_libdir}/wine/olesvr.dll.so
+%{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/powrprof.dll.so
+%{_libdir}/wine/psapi.dll.so
+%{_libdir}/wine/qcap.dll.so
+%{_libdir}/wine/quartz.dll.so
+%{_libdir}/wine/rasapi16.dll.so
+%{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/riched20.dll.so
+%{_libdir}/wine/riched32.dll.so
+%{_libdir}/wine/rpcrt4.dll.so
+%{_libdir}/wine/rsabase.dll.so
+%{_libdir}/wine/rsaenh.dll.so
+%{_libdir}/wine/secur32.dll.so
+%{_libdir}/wine/sensapi.dll.so
+%{_libdir}/wine/serialui.dll.so
+%{_libdir}/wine/setupapi.dll.so
+%{_libdir}/wine/setupx.dll.so
+%{_libdir}/wine/shdocvw.dll.so
+%{_libdir}/wine/shell.dll.so
+%{_libdir}/wine/shell32.dll.so
+%{_libdir}/wine/shfolder.dll.so
+%{_libdir}/wine/shlwapi.dll.so
+%{_libdir}/wine/snmpapi.dll.so
+%{_libdir}/wine/sound.drv.so
+%{_libdir}/wine/stdole2.tlb.so
+%{_libdir}/wine/stdole32.tlb.so
+%{_libdir}/wine/sti.dll.so
+%{_libdir}/wine/storage.dll.so
+%{_libdir}/wine/stress.dll.so
+%{_libdir}/wine/system.drv.so
+%{_libdir}/wine/tapi32.dll.so
+%{_libdir}/wine/toolhelp.dll.so
+%{_libdir}/wine/typelib.dll.so
+%{_libdir}/wine/unicows.dll.so
+%{_libdir}/wine/url.dll.so
+%{_libdir}/wine/urlmon.dll.so
+%{_libdir}/wine/user.exe.so
+%{_libdir}/wine/user32.dll.so
+%{_libdir}/wine/usp10.dll.so
+%{_libdir}/wine/uxtheme.dll.so
+%{_libdir}/wine/vdhcp.vxd.so
+%{_libdir}/wine/vdmdbg.dll.so
+%{_libdir}/wine/ver.dll.so
+%{_libdir}/wine/version.dll.so
+%{_libdir}/wine/vmm.vxd.so
+%{_libdir}/wine/vnbt.vxd.so
+%{_libdir}/wine/vnetbios.vxd.so
+%{_libdir}/wine/vtdapi.vxd.so
+%{_libdir}/wine/vwin32.vxd.so
+%{_libdir}/wine/w32skrnl.dll.so
+%{_libdir}/wine/w32sys.dll.so
+%{_libdir}/wine/win32s16.dll.so
+%{_libdir}/wine/win87em.dll.so
+%{_libdir}/wine/winaspi.dll.so
+%{_libdir}/wine/windebug.dll.so
+%{_libdir}/wine/wineaudioio.drv.so
+%{_libdir}/wine/winedos.dll.so
+%{_libdir}/wine/winemp3.acm.so
+%{_libdir}/wine/wineoss.drv.so
+#%{_libdir}/wine/winetty.drv.so
+%{_libdir}/wine/winex11.drv.so
+%{_libdir}/wine/wing.dll.so
+%{_libdir}/wine/wininet.dll.so
+%{_libdir}/wine/winmm.dll.so
+%{_libdir}/wine/winnls.dll.so
+%{_libdir}/wine/winnls32.dll.so
+%{_libdir}/wine/winsock.dll.so
+%{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/wintab.dll.so
+%{_libdir}/wine/wintab32.dll.so
+%{_libdir}/wine/wintrust.dll.so
+%{_libdir}/wine/wnaspi32.dll.so
+%{_libdir}/wine/wow32.dll.so
+%{_libdir}/wine/wprocs.dll.so
+%{_libdir}/wine/ws2_32.dll.so
+%{_libdir}/wine/wsock32.dll.so
+%{_libdir}/wine/wtsapi32.dll.so
+%dir %{_datadir}/fonts/wine
+%{_datadir}/fonts/wine/wine_coure.fon
+%{_datadir}/fonts/wine/wine_couree.fon
+%{_datadir}/fonts/wine/wine_courer.fon
+%{_datadir}/fonts/wine/wine_marlett.ttf
+%{_datadir}/fonts/wine/wine_sserife.fon
+%{_datadir}/fonts/wine/wine_sserifee.fon
+%{_datadir}/fonts/wine/wine_sserifer.fon
+%{_datadir}/fonts/wine/wine_vgasys.fon
+%{_datadir}/fonts/wine/wine_vgasyse.fon
+%{_datadir}/fonts/wine/wine_vgasysr.fon
+%{_datadir}/fonts/wine/coue1255.fon
+%{_datadir}/fonts/wine/coue1256.fon
+%{_datadir}/fonts/wine/coue1257.fon
+%{_datadir}/fonts/wine/coure.fon
+%{_datadir}/fonts/wine/couree.fon
+%{_datadir}/fonts/wine/coureg.fon
+%{_datadir}/fonts/wine/courer.fon
+%{_datadir}/fonts/wine/couret.fon
+%{_datadir}/fonts/wine/cvgasys.fon
+%{_datadir}/fonts/wine/hvgasys.fon
+%{_datadir}/fonts/wine/jvgasys.fon
+%{_datadir}/fonts/wine/marlett.ttf
+%{_datadir}/fonts/wine/ssee1255.fon
+%{_datadir}/fonts/wine/ssee1256.fon
+%{_datadir}/fonts/wine/ssee1257.fon
+%{_datadir}/fonts/wine/ssee874.fon
+%{_datadir}/fonts/wine/sserife.fon
+%{_datadir}/fonts/wine/sserifee.fon
+%{_datadir}/fonts/wine/sserifeg.fon
+%{_datadir}/fonts/wine/sserifer.fon
+%{_datadir}/fonts/wine/sserifet.fon
+%{_datadir}/fonts/wine/svgasys.fon
+%{_datadir}/fonts/wine/vgas1255.fon
+%{_datadir}/fonts/wine/vgas1256.fon
+%{_datadir}/fonts/wine/vgas1257.fon
+%{_datadir}/fonts/wine/vgas874.fon
+%{_datadir}/fonts/wine/vgasys.fon
+%{_datadir}/fonts/wine/vgasyse.fon
+%{_datadir}/fonts/wine/vgasysg.fon
+%{_datadir}/fonts/wine/vgasysr.fon
+%{_datadir}/fonts/wine/vgasyst.fon
+%{_libdir}/wine/winealsa.drv.so
+%{_libdir}/wine/wineps.drv.so
+%{_libdir}/wine/wineps16.drv.so
+%{_libdir}/wine/d3d8.dll.so
+%{_libdir}/wine/d3d9.dll.so
+%{_libdir}/wine/d3dx8.dll.so
+%{_libdir}/wine/glu32.dll.so
+%{_libdir}/wine/glut32.dll.so
+%{_libdir}/wine/opengl32.dll.so
+%{_libdir}/wine/wined3d.dll.so
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/notepad
+%{_bindir}/progman
+%{_bindir}/wcmd
+%{_bindir}/winedbg
+%{_bindir}/winedump
+%{_bindir}/winefile
+%{_bindir}/winemaker
+%{_bindir}/winemine
+%{_bindir}/winepath
+%{_bindir}/winhelp
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/uninstaller.exe.so
+%{_libdir}/wine/wcmd.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winhelp.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/winetest.exe.so
+%{_datadir}/applications/fedora-wine-notepad.desktop
+%{_datadir}/applications/fedora-wine-winefile.desktop
+%{_datadir}/applications/fedora-wine-winemine.desktop
+%{_datadir}/applications/fedora-wine-winhelp.desktop
+
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/wine/winearts.drv.so
+
+%files esd
+%defattr(-,root,root,-)
+%{_libdir}/wine/wineesd.drv.so
+
+%files jack
+%defattr(-,root,root,-)
+%{_libdir}/wine/winejack.drv.so
+
+%files nas
+%defattr(-,root,root,-)
+%{_libdir}/wine/winenas.drv.so
+
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/wine/wldap32.dll.so
+
+%files cms
+%defattr(-,root,root,-)
+%{_libdir}/wine/mscms.dll.so
+
+%files twain
+%defattr(-,root,root,-)
+%{_libdir}/wine/twain.dll.so
+%{_libdir}/wine/twain_32.dll.so
+
+%files capi
+%defattr(-,root,root,-)
+%{_libdir}/wine/capi2032.dll.so
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/function_grep.pl
+%{_bindir}/widl
+%{_bindir}/winebuild
+%{_bindir}/winecpp
+%{_bindir}/winedump
+%{_bindir}/wineg++
+%{_bindir}/winegcc
+%{_bindir}/winemaker
+%{_bindir}/wmc
+%{_bindir}/wrc
+%{_libdir}/*.so
+%{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.1*
+%{_mandir}/man1/winedump.1*
+%{_mandir}/man1/winegcc.1*
+%{_mandir}/man1/winemaker.1*
+%{_mandir}/man1/wmc.1*
+%{_mandir}/man1/wrc.1*
+%{_mandir}/man1/winedbg.1*
+%{_mandir}/man1/wineg++.1*
+%{_datadir}/aclocal/wine.m4
+%attr(0755, root, root) %dir %{_includedir}/wine
+%{_includedir}/wine/*
+%{_libdir}/wine/*.a
+%{_libdir}/wine/*.def
+
+%changelog
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-3       
+- use ExclusiveArch instead of ExcludeArch
+
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-2
+- own font directory
+- fix devel summary
+- add ExcludeArch x86_64 for now
+
+* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-1
+- version upgrade
+- changed wine.init perissions to 0644
+- added autoconf BR
+
+* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.3-1
+- version upgrade
+
+* Thu Nov 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.2-1
+- version upgrade
+
+* Thu Nov 17 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
+0.9.1-3
+- fix typo in winefile desktop file
+- drop in ld config instead of editing ld.so.conf
+
+* Sun Nov 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-2
+- add fontforge BR and include generated fonts...
+
+* Sat Nov 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-1
+- version upgrade
+- move uninstaller and winecfg into wine main package...
+- drop wine suite
+
+* Sat Oct 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-3
+- s/libwine/wine/
+
+* Thu Oct 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-2
+- remerge some subpackages which should be defaults
+
+* Tue Oct 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-1
+- upgrade to new version
+- start splitting
+
+* Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0-1.20050930
+- add fedora readme
+- switch to new (old) versioning sheme
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-3
+- add desktop files
+- revisit summary and description
+- consistant use of %{buildroot}
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-2
+- some more spec tuneups...
+
+* Sat Oct 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-1
+- version upgrade
+
+* Sun Sep 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050925-1
+- upgrade to current cvs
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050830-1
+- version upgrade
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050524-2
+- fedorarized version
+
+* Mon May 30 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050524-1fc3
+- Update to 20050524
+- Remove pdf documentation build as it's no more included in the main archive
+- Workaround for generic.ppd installation
+
+* Tue Apr 19 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050419-1fc3
+- Update to 20050419
+
+* Thu Mar 10 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050310-1fc3
+- Update to 20050310
+
+* Sat Feb 12 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050211-1fc3
+- Update to 20050211
+
+* Tue Jan 11 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050111-1fc3
+- Update to 20050111
+
+* Wed Dec 1 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041201-1fc3
+- Recompile for FC3
+- Update to 20041201
+- Small reorganization:
+    - use the generic ICU static libs name;
+    - no more wine group;
+    - use Wine's generated stdole32.tlb file;
+    - use Wine's generated fonts.
+
+* Wed Oct 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041019-1fc2
+- Update to 20041019
+
+* Wed Sep 15 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040914-1fc2
+- Update to 20040914
+
+* Sat Aug 14 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040813-1fc2
+- Update to 20040813
+
+* Sat Jul 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040716-1fc2
+- Update to 20040716
+
+* Fri Jun 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc2
+- Recompile for FC2
+- Backport from current CVS some fixes to the preloader to prevent
+  a segfault on startup
+- Include a currently uncommitted patch from Alexandre Julliard regarding
+  further issues with the preloader
+
+* Sun Jun 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc1
+- Update to 20040615
+- Use of wineprefixcreate instead of old RedHat patches
+
+* Wed May 5 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040505-1fc1
+- Update to 20040505
+
+* Fri Apr 9 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040408-1fc1
+- Update to 20040408
+- Change the handling of paths to DOS drives in the installation process
+
+* Wed Mar 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040309-1fc1
+- Update to 20040309
+- Replaced winedefault.reg by wine.inf
+
+* Wed Feb 18 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040213-1fc1
+- Update to 20040213
+- Moved Wine dlls back to %{_libdir}/wine rather than %{_libdir}/wine/wine
+
+* Sun Jan 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040121-fc1
+- Update to 20040121
+
+* Sat Dec 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031212-fc1
+- Update to 20031212
+
+* Wed Nov 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031118-fc1
+- Update to 20031118
+
+* Thu Oct 16 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031016-1rh9
+- Update to 20031016
+
+* Tue Sep 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030911-1rh9
+- Fix of include location
+- Better separation of run-time and development files
+- Update to 20030911
+
+* Wed Aug 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030813-1rh9
+- Update to 20030813
+
+* Wed Jul 09 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030709-1rh9
+- Update to 20030709
+
+* Wed Jun 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030618-1rh9
+- Change the default C drive to ~/.wine/c, copied from /usr/share/wine
+  if non-existant (Thanks to Rudolf Kastl)
+- Updated to 20030618
+
+* Tue May 20 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1rh9
+- Adapted for RH9
+
+* Thu May 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1
+- Add libraries definition files to devel package
+- Update to 20030508
+
+* Tue Apr 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030408-1
+- Update to 20030408
+
+* Tue Mar 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030318-1
+- Update to 20030318
+
+* Thu Mar 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-2
+- Fix the symlinks in wine-c.
+
+* Wed Feb 19 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-1
+- Update to 20030129
+- Various fixes in RPM build process
+
+* Fri Jan 17 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030115-1
+- Update to 20030115
+- fix to build problem
+
+* Thu Nov  7 2002 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20021031-1
+- Update to 20021031
+- Tweaks here and there
+
+* Wed Sep  4 2002 Bill Nottingham <notting at redhat.com> 20020605-2
+- fix docs (#72923)
+
+* Wed Jul 10 2002 Karsten Hopp <karsten at redhat.de> 20020605-1
+- update
+- remove obsolete part of redhat patch
+- redo destdir patch
+- redo kde patch
+- redo defaultversion patch
+- fix 'my_perl unknown' error
+- work around name conflict with textutils 'expand'
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020327-1
+- Fix wineshelllink (#61761)
+- Fix up initscript (#53625)
+- Clean up spec file
+- Default to emulating Windoze ME rather than 3.1, nobody uses 3.1
+  applications anymore
+- Auto-generate default config if none exists (#61920)
+
+* Mon Mar 04 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020304-1
+- Assign gid 66 (closest to 666 [Microsoft number] we can get for a
+  system account ;) )
+- Don't use glibc private functions (__libc_fork)
+- Update
+
+* Tue Feb 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020226-1
+- Fix bug #60250
+- Update
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020221-1
+- Update
+- Don't try to launch winesetup in winelauncher, we aren't shipping it
+  (#59621)
+
+* Sun Jan 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020127-1
+- Update
+- Fix build in current environment
+
+* Wed Aug 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010822-1
+- Make sure the package can be cleanly uninstalled (#52007)
+- Add build dependencies
+
+* Thu Jul 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010726-1
+- Fix -devel package group (#49989)
+- remove internal CVS files
+- chkconfig deletion should be in %preun, not %postun
+- rename initscript ("Starting windows:" at startup does look off)
+
+* Thu May 03 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010503-1
+- Update
+- generate HTML documentation rather than shipping plain docbook text
+  (#38453)
+
+* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Update registry to mount "/" as drive "Z:", fixes winedbg (needs to be
+  accessible from 'doze drives)
+- Don't create KDE 1.x style desktop entries in wineshelllink
+- Be more tolerant on failing stuff in %%post
+
+* Thu Mar  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+
+* Thu Feb 15 2001 Tim Powers <timp at redhat.com>
+- fixed time.h build problems
+
+* Wed Jan 31 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add a patch to handle .exe and .com file permissions the way we want them
+
+* Thu Jan 18 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Restore wine's ability to use a global config file, it was removed
+  in CVS for whatever reason
+- Move libraries to %{_libdir}/wine to prevent conflicts with libuser
+  (Bug #24202)
+- Move include files to /usr/include/wine to prevent it from messing with
+  some autoconf scripts (some broken scripts assume they're running on windoze
+  if /usr/include/windows.h exists...)
+
+* Tue Dec 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix %%pre and %%postun scripts
+- --enable-opengl, glibc 2.2 should be safe
+- Update CVS
+
+* Mon Nov 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update CVS
+- Add a new (user) group wine that can write to the "C: drive"
+  %{_datadir}/wine-c
+- Fix up winedbg installation (registry entries)
+- Add "Program Files/Common Files" subdirectory to the "C: drive", it's
+  referenced in the registry
+
+* Wed Oct 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- rebuilt with new DGA
+
+* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- new snapshot
+- fix compilation with gcc 2.96
+
+* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Move init script back
+- new version
+- move man pages to FHS locations
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- move initscript
+- new snapshot
+
+* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Start the initscript on startup
+
+* Mon May  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- New version
+- new feature: You can now launch wine by just running a windows .exe file
+  (./some.exe or just click on it in kfm, gmc and the likes)
+- some spec file modifications
+
+* Sun Feb 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- newer version
+- Improve the system.ini file - all multimedia stuff should work now.
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- enable and fix up the urlmon/wininet patch
+- add: autoexec.bat, config.sys, windows/win.ini windows/system.ini
+  windows/Profiles/Administrator
+- allow i[456]86 arches
+- add some system.ini configuration
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update current
+- add urlmon and wininet patches from Corel (don't apply them for now though)
+- create empty shell*dll and winsock*dll files (as mentioned in the HOWTO)
+
+* Mon Jan 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update to current (lots of important fixes)
+- Fix up the default wine.conf file (We really don't want it to look
+  for CD-ROMs in /cdrom!)
+- create a "root filesystem" with everything required to run wine without
+  windows in %{_datadir}/wine-c (drive c:)
+- add RedHat file in /usr/doc/wine-%{version} explaining the new directory
+  layout
+- wine-devel requires wine
+
+* Tue Dec 14 1999 Preston Brown <pbrown at redhat.com>
+- updated source for Powertools 6.2
+- better files list
+
+* Fri Jul 23 1999 Tim Powers <timp at redhat.com>
+- updated source
+- built for 6.1
+
+* Tue Apr 13 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+- updated package and spec file
+
+* Mon Oct 26 1998 Preston Brown <pbrown at redhat.com>
+- updated to 10/25/98 version.  There is really no point in keeping the
+- older one, it is full of bugs and the newer one has fewer.
+- commented out building of texinfo manual, it is horrendously broken.
+
+* Mon Oct 12 1998 Michael Maher <mike at redhat.com>
+- built package for 5.2
+- pressured by QA, not updating.
+
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- repackaged for PowerTools



From fedora-extras-commits at redhat.com  Mon Jan  2 09:24:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:24:31 -0500
Subject: rpms/wine import.log,1.3,1.4
Message-ID: <200601020925.k029P4Uc028941@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28897

Modified Files:
	import.log 
Log Message:
auto-import wine-0.9.4-3 on branch FC-4 from wine-0.9.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Jan 2006 09:04:13 -0000	1.3
+++ import.log	2 Jan 2006 09:24:31 -0000	1.4
@@ -1,2 +1,3 @@
 wine-0_0-0_fdr_2_20030911_rh90:HEAD:wine-0.0-0.fdr.2.20030911.rh90.src.rpm:1099891974
 wine-0_9_4-3:HEAD:wine-0.9.4-3.src.rpm:1136192622
+wine-0_9_4-3:FC-4:wine-0.9.4-3.src.rpm:1136193859



From fedora-extras-commits at redhat.com  Mon Jan  2 09:27:15 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:27:15 -0500
Subject: rpms/wine import.log,1.4,1.5
Message-ID: <200601020927.k029Rlv5029039@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29006

Modified Files:
	import.log 
Log Message:
auto-import wine-0.9.4-4 on branch FC-4 from wine-0.9.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	2 Jan 2006 09:24:31 -0000	1.4
+++ import.log	2 Jan 2006 09:27:15 -0000	1.5
@@ -1,3 +1,4 @@
 wine-0_0-0_fdr_2_20030911_rh90:HEAD:wine-0.0-0.fdr.2.20030911.rh90.src.rpm:1099891974
 wine-0_9_4-3:HEAD:wine-0.9.4-3.src.rpm:1136192622
 wine-0_9_4-3:FC-4:wine-0.9.4-3.src.rpm:1136193859
+wine-0_9_4-4:FC-4:wine-0.9.4-4.src.rpm:1136194022



From fedora-extras-commits at redhat.com  Mon Jan  2 09:27:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:27:21 -0500
Subject: rpms/wine/FC-4 wine.spec,1.4,1.5
Message-ID: <200601020927.k029RrWc029042@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29006/FC-4

Modified Files:
	wine.spec 
Log Message:
auto-import wine-0.9.4-4 on branch FC-4 from wine-0.9.4-4.src.rpm


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine.spec	2 Jan 2006 09:24:37 -0000	1.4
+++ wine.spec	2 Jan 2006 09:27:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -676,6 +676,10 @@
 
 %changelog
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-4
+- bump for import
+
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-3       
 - use ExclusiveArch instead of ExcludeArch
 



From fedora-extras-commits at redhat.com  Mon Jan  2 09:31:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:31:10 -0500
Subject: rpms/wine/FC-3 wine-20050524-generated.patch, NONE, 1.1 wine-32.conf,
	NONE, 1.1 wine-README-Fedora, NONE, 1.1 wine-notepad.desktop,
	NONE, 1.1 wine-regedit.desktop, NONE,
	1.1 wine-uninstaller.desktop, NONE, 1.1 wine-winecfg.desktop,
	NONE, 1.1 wine-winefile.desktop, NONE, 1.1 wine-winemine.desktop,
	NONE, 1.1 wine-winhelp.desktop, NONE, 1.1 Makefile, 1.2,
	1.3 branch, 1.1, 1.2 sources, 1.2, 1.3 wine.spec, 1.2, 1.3
Message-ID: <200601020931.k029Vg67029158@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29123

Modified Files:
	Makefile branch sources wine.spec 
Added Files:
	wine-20050524-generated.patch wine-32.conf wine-README-Fedora 
	wine-notepad.desktop wine-regedit.desktop 
	wine-uninstaller.desktop wine-winecfg.desktop 
	wine-winefile.desktop wine-winemine.desktop 
	wine-winhelp.desktop 
Log Message:
- update fc-3


wine-20050524-generated.patch:

--- NEW FILE wine-20050524-generated.patch ---
Index: wine/tools/wineprefixcreate.in
===================================================================
RCS file: /home/wine/wine/tools/wineprefixcreate.in,v
retrieving revision 1.10
diff -u -r1.10 wineprefixcreate.in
--- wine/tools/wineprefixcreate.in	19 May 2005 11:12:34 -0000	1.10
+++ wine/tools/wineprefixcreate.in	29 May 2005 00:00:00 -0000
@@ -38,6 +38,7 @@
 
 dlldir="@dlldir@"
 datadir="@datadir@/wine"
+fontdir="@datadir@/fonts/wine"
 
 do_wait=0
 quiet=0
@@ -175,6 +176,11 @@
 link_app winhelp      "$CROOT/windows/winhelp.exe"
 link_app winhelp      "$CROOT/windows/winhlp32.exe"
 link_app winebrowser  "$CROOT/windows/winebrowser.exe"
+
+# Copy the generated fonts
+
+cp $fontdir/*.ttf "$CROOT/windows/fonts"
+cp $fontdir/*.fon "$CROOT/windows/fonts"
 
 # Copy the .inf script and run it
 


--- NEW FILE wine-32.conf ---
/usr/lib/wine/


--- NEW FILE wine-README-Fedora ---
Wine directory structure used in Fedora Core Linux:
===================================================

\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
default. It is created with (empty) C:\windows and C:\windows\system
directories, needed to operate Wine without an existing Windows
installation, if it doesn't already exists.

If you want to use Wine with an existing Windows installation that is
mounted, for example, in /mnt/windows-c, change the symlink
\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
defaults set by installation.

If you do this, you can safely remove \${HOME}/.wine/drive_c.
(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)


--- NEW FILE wine-notepad.desktop ---
[Desktop Entry]
Name=notepad
Comment=Text Editor
Exec=notepad
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-regedit.desktop ---
[Desktop Entry]
Name=regedit
Comment=Wine registry editor
Exec=regedit
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-uninstaller.desktop ---
[Desktop Entry]
Name=Wine Software Uninstaller
Comment=Interface to uninstall software
Exec=uninstaller
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winecfg.desktop ---
[Desktop Entry]
Name=Wine Configuration
Comment=Interface to set wine parameters
Exec=winecfg
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winefile.desktop ---
[Desktop Entry]
Name=Wine File
Comment=Wine File Browser
Exec=winefile
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winemine.desktop ---
[Desktop Entry]
Name=WineMine
Comment=Wine Minesweeper 
Exec=winemine
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winhelp.desktop ---
[Desktop Entry]
Name=winhelp
Comment=Windows Help Browser
Exec=winhelp
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;




Index: branch
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- branch	25 Feb 2005 22:29:14 -0000	1.1
+++ branch	2 Jan 2006 09:31:09 -0000	1.2
@@ -1 +1 @@
-FC-3
+FC-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:32:54 -0000	1.2
+++ sources	2 Jan 2006 09:31:09 -0000	1.3
@@ -1 +1,2 @@
-81521fe47d540427183e88d02d5c5f88  Wine-20030911.tar.gz
+73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine.spec	12 Feb 2005 18:34:52 -0000	1.2
+++ wine.spec	2 Jan 2006 09:31:09 -0000	1.3
@@ -1,294 +1,1060 @@
-%define DATE 20030911
-%define with_valgrind %{?_with_valgrind:1}%{!?_with_valgrind:0}
-%define with_alsa     %{?_with_alsa:1}%{!?_with_alsa:0}
-
-Summary: A Windows 16/32 bit emulator.
-Name: wine
-Version: 0.0
-Release: 0.fdr.2.%{DATE}.rh90
-Epoch: 0
-Group: Applications/Emulators
-License: LGPL
-URL: http://www.winehq.com/
-Source0: ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-%{DATE}.tar.gz
-Source1: wine.init
-Patch0: wine-20030408-initial.patch
-Patch1: wine-20030408-kde2.patch
-Patch2: wine-20030408-winelauncher.patch
-Patch3: wine-20030408-defaultcfg.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86}
-Prereq: shadow-utils
-Conflicts: kdebase < 0:2.0
-Requires: cups-libs >= 0:1.1.12, openssl
-# require NPTL-capable glibc
-Requires: /lib/tls
-Requires(pre,postun): shadow-utils
-BuildRequires: docbook-utils, cups-devel >= 0:1.1.12, perl
-BuildRequires: XFree86-devel, libjpeg-devel, libungif-devel, libstdc++-devel
-BuildRequires: bison, flex, autoconf >= 0:2.53, arts-devel, ncurses-devel
-BuildRequires: openssl-devel, sane-backends-devel
-%if %{with_valgrind}
-BuildRequires: valgrind-devel
-%else
-BuildConflicts: valgrind-devel
-%endif
-%if %{with_alsa}
-BuildRequires: alsa-libs-devel
-%else
-BuildConflicts: alsa-libs-devel
-%endif
-Provides: libntdll.dll.so
+Name:		wine
+Version:	0.9.4
+Release:	4%{?dist}
+Summary:	A Windows 16/32/64 bit emulator
+
+Group:		Applications/Emulators
+License:	LGPL
+URL:		http://www.winehq.org/
+Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source1:	wine.init
+Source2:	wine-fonts-20050524.tar.gz
+Source3:        wine-README-Fedora
+Source4:        wine-32.conf
+Source100:      wine-notepad.desktop
+Source101:      wine-regedit.desktop
+Source102:      wine-uninstaller.desktop
+Source103:      wine-winecfg.desktop
+Source104:      wine-winefile.desktop
+Source105:      wine-winemine.desktop
+Source106:      wine-winhelp.desktop
+Patch2:		wine-20050524-generated.patch
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:  %{ix86}
+
+BuildRequires:  autoconf
+BuildRequires:	bison
+BuildRequires:	flex
+BuildRequires:  alsa-lib-devel
+BuildRequires:  arts-devel
+BuildRequires:  audiofile-devel
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  lcms-devel
+BuildRequires:  libieee1284-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openldap-devel
+BuildRequires:  sane-backends-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  fontforge
+
+Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
+Requires(post): /usr/bin/update-desktop-database
+Requires(preun): /sbin/chkconfig
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
 developers would prefer that users thought of Wine as a Windows
 compatibility layer for UNIX. This package includes a program loader,
-which allows unmodified Windows 3.1/95/NT binaries to run under Intel
+which allows unmodified Windows 3.x/9x/NT binaries to run on x86 and x86_64
 Unixes. Wine does not require MS Windows, but it can use native system
 .dll files if they are available.
 
+%package tools
+Summary:        Additional wine tools
+Group:		Applications/Emulators
+Requires:       %{name} = %{version}-%{release}
+
+%description tools
+Additional wine tools
+
+%package arts
+Summary: Arts sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description arts
+Arts sound support for wine
+
+%package esd
+Summary: ESD sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description esd
+ESD sound support for wine
+
+%package jack
+Summary: JACK sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description jack
+JACK sound support for wine
+
+%package nas
+Summary: NAS sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description nas
+JACK sound support for wine
+
+%package ldap
+Summary: LDAP support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description ldap
+LDAP support for wine
+
+%package cms
+Summary: Color Managment for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description cms
+Color Management for wine
+
+%package twain
+Summary: Twain support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description twain
+Twain support for wine
+
+%package capi
+Summary: ISDN support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description capi
+ISDN support for wine
+
 %package devel
-Summary: Wine development environment.
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Wine development environment
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
 
 %description devel
-Header and include files for developing applications with the Wine
-Windows(TM) emulation libraries.
-
+Header, include files and library definition files for developing applications
+with the Wine Windows(TM) emulation libraries.
 
 %prep
-echo "
---------------------------------------------------------------
-Unmaintained since RHL9. Maintainer needed.
---------------------------------------------------------------" > /dev/null
-exit 1
-
-%setup -q -n wine-%{DATE}
-find . -type d -name CVS |xargs rm -rf
-%patch -p1 -b .initial
-%patch1 -p1 -b .kde2
-%patch2 -p1 -b .wl
-%patch3 -p1 -b .defcfg
-
+%setup -q
+%patch2 -p1 -b .generated
+autoconf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-export CPPFLAGS="$(pkg-config openssl --cflags)" # fix ssl detection, need krb5
-autoconf || autoconf-2.53
 %configure \
-	--with-nptl \
-	--with-x \
-	--libdir=%{_libdir}/wine \
-	--includedir=%{_includedir}/wine \
-	--sysconfdir=%{_sysconfdir}/wine
-
-
-make depend
-make %{?_smp_mflags}
-#%{__make} -C documentation doc
+	--sysconfdir=%{_sysconfdir}/wine --disable-static
 
+%{__make} depend
+%{__make}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %makeinstall \
-	includedir=%{?buildroot:%{buildroot}}%{_includedir}/wine \
-	libdir=%{?buildroot:%{buildroot}}%{_libdir}/wine \
-	sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir}/wine \
-	dlldir=%{?buildroot:%{buildroot}}%{_libdir}/wine/wine \
-	LDCONFIG=/bin/true
-
-for i in system command "Start Menu/Programs/Startup" Profiles/Administrator Fonts \
-         Desktop Favorites NetHood Recent SendTo ShellNew; do
-	mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/windows/$i"
-done
-mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/My Documents"
-mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/Program Files/Common Files"
-
-# Take care of wine and windows configuration files...
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/wine
-mv documentation/samples/config documentation/samples/config.orig
-sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"ttydrv\"/" documentation/samples/config.orig |\
-sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"$RPM_BUILD_ROOT%{_datadir}/wine-c\"|" |\
-sed "s|\"Path\" = \"\${HOME}\"$|\"Path\" = \"%{_builddir}/%{buildsubdir}\"|" -> documentation/samples/config
-WINEPREFIX=%{_builddir}/%{buildsubdir}/documentation/samples programs/regedit/regedit winedefault.reg #> /dev/null
-# Wait until wineserver finishes and closes those files
-sleep 5
-install -c -m 0644 documentation/samples/system.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/system.reg
-install -c -m 0644 documentation/samples/user.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/user.reg
-install -c -m 0644 documentation/samples/userdef.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/userdef.reg
-rm -f documentation/samples/system.reg
-rm -f documentation/samples/user.reg
-rm -f documentation/samples/userdef.reg
-
-sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"%{_datadir}/wine-c\"|" documentation/samples/config.orig > documentation/samples/config.rh
-mv documentation/samples/config.rh documentation/samples/config.orig
-sed "s|\"Path\" = \"/cdrom\"\$|\"Path\" = \"/mnt/cdrom\"|" documentation/samples/config.orig > documentation/samples/config.rh
-mv documentation/samples/config.rh documentation/samples/config.orig
-sed "s|\"Path\" = \"/mnt/fd0\"\$|\"Path\" = \"/mnt/floppy\"|" documentation/samples/config.orig > documentation/samples/config.rh
-
-install -c -m 0644 documentation/samples/config.rh $RPM_BUILD_ROOT%{_sysconfdir}/wine/wine.conf
-rm -f documentation/samples/config
-rm -f documentation/samples/config.rh
-mv documentation/samples/config.orig documentation/samples/config
-
-# Install link to windows applications replacements
-ln -sf %{_libdir}/wine/wine/start.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/command/start.exe
-ln -sf %{_libdir}/wine/wine/notepad.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/notepad.exe
-ln -sf %{_libdir}/wine/wine/regedit.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/regedit.exe
-ln -sf %{_libdir}/wine/wine/rundll32.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/rundll32.exe
-ln -sf %{_libdir}/wine/wine/wcmd.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/cmd.exe
-ln -sf %{_libdir}/wine/wine/control.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/control.exe
-ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/help.exe
-ln -sf %{_libdir}/wine/wine/notepad.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/notepad.exe
-ln -sf %{_libdir}/wine/wine/progman.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/progman.exe
-ln -sf %{_libdir}/wine/wine/regsvr32.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/regsvr32.exe
-ln -sf %{_libdir}/wine/wine/winemine.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/winmine.exe
-ln -sf %{_libdir}/wine/wine/winver.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/winver.exe
-ln -sf %{_libdir}/wine/wine/uninstaller.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/uninstaller.exe
-ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/winhelp.exe
-ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/winhlp32.exe
-
-for i in shell.dll shell32.dll winsock.dll wnsock32.dll; do
-	touch $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/$i
-done
-touch $RPM_BUILD_ROOT%{_datadir}/wine-c/autoexec.bat
-touch $RPM_BUILD_ROOT%{_datadir}/wine-c/config.sys
-touch $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/win.ini
-install -c -m 0644 documentation/samples/system.ini $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system.ini
-
-cat >RedHat <<EOF
-Wine directory structure used in Red Hat Linux:
-===============================================
-
-%{_datadir}/wine-c is the root directory (aka C: drive) wine looks for
-by default. It contains (empty) C:\windows and C:\windows\system
-directories, needed to operate Wine without an existing Windows installation.
-
-If you want to use Wine with an existing Windows installation that is mounted,
-for example, in /mnt/windows-c, edit /etc/wine.conf to say
-
-[Drive C]
-Path=/mnt/windows-c
-Type=hd
-Label=Whatever
-Filesystem=win95
-
-instead of the defaults set by installation.
-
-If you do this, you can safely remove %{_datadir}/wine-c.
-(Alternatively, just mount your Windows partition to %{_datadir}/wine-c.)
-EOF
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+%makeinstall \
+	-C dlls/wineps \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+
+mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/wine
+mkdir -p %{buildroot}%{_initrddir}
+install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
 
+# Install Wine's fonts
+mkdir -p %{buildroot}%{_datadir}/fonts/wine
+tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE100}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE101}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE102}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE103}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE104}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE105}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE106}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+cp %{SOURCE3} README-Fedora
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%pre
-/usr/sbin/groupadd -g 66 -r wine &>/dev/null || :
+%clean
+rm -rf %{buildroot}
 
 %post
-if ! grep -q "^/usr/lib/wine$" /etc/ld.so.conf; then
-	echo "/usr/lib/wine" >>/etc/ld.so.conf
-fi
+/sbin/ldconfig
 /sbin/chkconfig --add wine
 /sbin/chkconfig --level 2345 wine on
 /sbin/service wine start &>/dev/null || :
-/sbin/ldconfig
+update-desktop-database &>/dev/null || :
 
 %preun
 if test "$1" = "0"; then
-	/sbin/service wine stop &> /dev/null || :
 	/sbin/chkconfig --del wine
 fi
 
 %postun
-if test "$1" = "0"; then
-	perl -pi -e "s,^/usr/lib/wine\n$,,g" /etc/ld.so.conf
-	/usr/sbin/groupdel wine &>/dev/null || :
-fi
 /sbin/ldconfig
+update-desktop-database &>/dev/null || :
+
+%post arts -p /sbin/ldconfig
+%postun arts -p /sbin/ldconfig
+
+%post esd -p /sbin/ldconfig
+%postun esd -p /sbin/ldconfig
+
+%post jack -p /sbin/ldconfig
+%postun jack -p /sbin/ldconfig
+
+%post nas -p /sbin/ldconfig
+%postun nas -p /sbin/ldconfig
+
+%post ldap -p /sbin/ldconfig
+%postun ldap -p /sbin/ldconfig
+
+%post cms -p /sbin/ldconfig
+%postun cms -p /sbin/ldconfig
+
+%post twain -p /sbin/ldconfig
+%postun twain -p /sbin/ldconfig
 
+%post capi -p /sbin/ldconfig
+%postun capi -p /sbin/ldconfig
 
 %files
-%defattr(0775,root,wine)
-%dir %{_datadir}/wine-c
-%dir %{_datadir}/wine-c/windows
-%dir %{_datadir}/wine-c/windows/command
-%dir %{_datadir}/wine-c/windows/system
-%dir "%{_datadir}/wine-c/windows/Start Menu"
-%dir "%{_datadir}/wine-c/windows/Start Menu/Programs"
-%dir "%{_datadir}/wine-c/windows/Start Menu/Programs/Startup"
-%dir %{_datadir}/wine-c/windows/Profiles
-%dir %{_datadir}/wine-c/windows/Profiles/Administrator
-%dir %{_datadir}/wine-c/windows/Fonts
-%dir %{_datadir}/wine-c/windows/Desktop
-%dir %{_datadir}/wine-c/windows/Favorites
-%dir %{_datadir}/wine-c/windows/NetHood
-%dir %{_datadir}/wine-c/windows/Recent
-%dir %{_datadir}/wine-c/windows/SendTo
-%dir %{_datadir}/wine-c/windows/ShellNew
-%dir "%{_datadir}/wine-c/My Documents"
-%dir "%{_datadir}/wine-c/Program Files"
-%dir "%{_datadir}/wine-c/Program Files/Common Files"
-%defattr(-,root,wine,-)
-%{_libdir}/wine
-%{_bindir}/*
-%{_mandir}/man?/*
-%{_datadir}/wine-c/windows/command/*.exe
-%{_datadir}/wine-c/windows/system/*.dll
-%{_datadir}/wine-c/windows/system/*.exe
-%{_datadir}/wine-c/windows/*.exe
-%{_datadir}/aclocal/wine.m4
-%config %{_datadir}/wine-c/autoexec.bat
-%config %{_datadir}/wine-c/config.sys
-%attr(0664, root, wine) %config %{_datadir}/wine-c/windows/win.ini
-%attr(0664, root, wine) %config %{_datadir}/wine-c/windows/system.ini
-%config %{_sysconfdir}/wine/*
-%config %{_initrddir}/*
-%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD README VERSION
-%doc AUTHORS RedHat
+%defattr(-,root,root,-)
+%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
+%doc AUTHORS README-Fedora README VERSION
+%doc documentation/*
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/winebrowser
+%{_bindir}/wineconsole
+%{_bindir}/wineprefixcreate
+%{_bindir}/wineshelllink
+%{_bindir}/winecfg
+%{_bindir}/uninstaller
+%{_initrddir}/wine
+%{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/msiexec.exe.so
+%{_libdir}/wine/regedit.exe.so
+%{_libdir}/wine/regsvr32.exe.so
+%{_libdir}/wine/rpcss.exe.so
+%{_libdir}/wine/rundll32.exe.so
+%{_libdir}/wine/start.exe.so
+%{_libdir}/wine/wineboot.exe.so
+%{_libdir}/wine/winebrowser.exe.so
+%{_libdir}/wine/wineconsole.exe.so
+%{_libdir}/wine/winemenubuilder.exe.so
+%{_libdir}/wine/winevdm.exe.so
+%{_datadir}/applications/fedora-wine.desktop
+%{_datadir}/applications/fedora-wine-regedit.desktop
+%{_datadir}/applications/fedora-wine-uninstaller.desktop
+%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_mandir}/man1/wine.1.gz
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+%{_bindir}/wine-kthread
+%{_bindir}/wine-preloader
+%{_bindir}/wine-pthread
+%{_bindir}/winelauncher
+%{_bindir}/wineserver
+%{_mandir}/man1/wineserver.1*
+%{_libdir}/libwine.so.1
+%{_libdir}/libwine_unicode.so.1
+%dir %{_libdir}/wine
+%{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/advapi32.dll.so
+%{_libdir}/wine/advpack.dll.so
+%{_libdir}/wine/amstream.dll.so
+%{_libdir}/wine/atl.dll.so
+%{_libdir}/wine/avicap32.dll.so
+%{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avifile.dll.so
+%{_libdir}/wine/aviinfo.exe.so
+%{_libdir}/wine/aviplay.exe.so
+%{_libdir}/wine/cabinet.dll.so
+%{_libdir}/wine/cards.dll.so
+%{_libdir}/wine/cfgmgr32.dll.so
+%{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/comcat.dll.so
+%{_libdir}/wine/comctl32.dll.so
+%{_libdir}/wine/comdlg32.dll.so
+%{_libdir}/wine/comm.drv.so
+%{_libdir}/wine/commdlg.dll.so
+%{_libdir}/wine/compobj.dll.so
+%{_libdir}/wine/crtdll.dll.so
+%{_libdir}/wine/crypt32.dll.so
+%{_libdir}/wine/cryptdll.dll.so
+%{_libdir}/wine/ctl3d.dll.so
+%{_libdir}/wine/ctl3d32.dll.so
+%{_libdir}/wine/ctl3dv2.dll.so
+%{_libdir}/wine/d3dim.dll.so
+%{_libdir}/wine/d3drm.dll.so
+%{_libdir}/wine/d3dxof.dll.so
+%{_libdir}/wine/dbghelp.dll.so
+%{_libdir}/wine/dciman32.dll.so
+%{_libdir}/wine/ddeml.dll.so
+%{_libdir}/wine/ddraw.dll.so
+%{_libdir}/wine/devenum.dll.so
+%{_libdir}/wine/dinput.dll.so
+%{_libdir}/wine/dinput8.dll.so
+%{_libdir}/wine/dispdib.dll.so
+%{_libdir}/wine/display.drv.so
+%{_libdir}/wine/dmband.dll.so
+%{_libdir}/wine/dmcompos.dll.so
+%{_libdir}/wine/dmime.dll.so
+%{_libdir}/wine/dmloader.dll.so
+%{_libdir}/wine/dmscript.dll.so
+%{_libdir}/wine/dmstyle.dll.so
+%{_libdir}/wine/dmsynth.dll.so
+%{_libdir}/wine/dmusic.dll.so
+%{_libdir}/wine/dmusic32.dll.so
+%{_libdir}/wine/dplay.dll.so
+%{_libdir}/wine/dplayx.dll.so
+%{_libdir}/wine/dpnet.dll.so
+%{_libdir}/wine/dpnhpast.dll.so
+%{_libdir}/wine/dsound.dll.so
+%{_libdir}/wine/dswave.dll.so
+%{_libdir}/wine/dxdiagn.dll.so
+%{_libdir}/wine/eject.exe.so
+%{_libdir}/wine/gdi.exe.so
+%{_libdir}/wine/gdi32.dll.so
+%{_libdir}/wine/hh.exe.so
+%{_libdir}/wine/hhctrl.ocx.so
+%{_libdir}/wine/iccvid.dll.so
+%{_libdir}/wine/icinfo.exe.so
+%{_libdir}/wine/icmp.dll.so
+%{_libdir}/wine/ifsmgr.vxd.so
+%{_libdir}/wine/imaadp32.acm.so
+%{_libdir}/wine/imagehlp.dll.so
+%{_libdir}/wine/imm.dll.so
+%{_libdir}/wine/imm32.dll.so
+%{_libdir}/wine/iphlpapi.dll.so
+%{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/joystick.drv.so
+%{_libdir}/wine/kernel32.dll.so
+%{_libdir}/wine/keyboard.drv.so
+%{_libdir}/wine/krnl386.exe.so
+%{_libdir}/wine/lz32.dll.so
+%{_libdir}/wine/lzexpand.dll.so
+%{_libdir}/wine/mapi32.dll.so
+%{_libdir}/wine/mciavi32.dll.so
+%{_libdir}/wine/mcicda.dll.so
+%{_libdir}/wine/mciseq.dll.so
+%{_libdir}/wine/mciwave.drv.so
+%{_libdir}/wine/midimap.dll.so
+%{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevldr.vxd.so
+%{_libdir}/wine/mmsystem.dll.so
+%{_libdir}/wine/monodebg.vxd.so
+%{_libdir}/wine/mouse.drv.so
+%{_libdir}/wine/mpr.dll.so
+%{_libdir}/wine/msacm.dll.so
+%{_libdir}/wine/msacm.drv.so
+%{_libdir}/wine/msacm32.dll.so
+%{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/msdmo.dll.so
+%{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/mshtml.dll.so
+%{_libdir}/wine/msi.dll.so
+%{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisys.ocx.so
+%{_libdir}/wine/msnet32.dll.so
+%{_libdir}/wine/msrle32.dll.so
+%{_libdir}/wine/msvcrt.dll.so
+%{_libdir}/wine/msvcrt20.dll.so
+%{_libdir}/wine/msvcrt40.dll.so
+%{_libdir}/wine/msvcrtd.dll.so
+%{_libdir}/wine/msvfw32.dll.so
+%{_libdir}/wine/msvidc32.dll.so
+%{_libdir}/wine/msvideo.dll.so
+%{_libdir}/wine/mswsock.dll.so
+%{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/netapi32.dll.so
+%{_libdir}/wine/newdev.dll.so
+%{_libdir}/wine/ntdll.dll.so
+%{_libdir}/wine/objsel.dll.so
+%{_libdir}/wine/odbc32.dll.so
+%{_libdir}/wine/odbccp32.dll.so
+%{_libdir}/wine/ole2.dll.so
+%{_libdir}/wine/ole2conv.dll.so
+%{_libdir}/wine/ole2disp.dll.so
+%{_libdir}/wine/ole2nls.dll.so
+%{_libdir}/wine/ole2prox.dll.so
+%{_libdir}/wine/ole2thk.dll.so
+%{_libdir}/wine/ole32.dll.so
+%{_libdir}/wine/oleacc.dll.so
+%{_libdir}/wine/oleaut32.dll.so
+%{_libdir}/wine/olecli.dll.so
+%{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledlg.dll.so
+%{_libdir}/wine/olepro32.dll.so
+%{_libdir}/wine/olesvr.dll.so
+%{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/powrprof.dll.so
+%{_libdir}/wine/psapi.dll.so
+%{_libdir}/wine/qcap.dll.so
+%{_libdir}/wine/quartz.dll.so
+%{_libdir}/wine/rasapi16.dll.so
+%{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/riched20.dll.so
+%{_libdir}/wine/riched32.dll.so
+%{_libdir}/wine/rpcrt4.dll.so
+%{_libdir}/wine/rsabase.dll.so
+%{_libdir}/wine/rsaenh.dll.so
+%{_libdir}/wine/secur32.dll.so
+%{_libdir}/wine/sensapi.dll.so
+%{_libdir}/wine/serialui.dll.so
+%{_libdir}/wine/setupapi.dll.so
+%{_libdir}/wine/setupx.dll.so
+%{_libdir}/wine/shdocvw.dll.so
+%{_libdir}/wine/shell.dll.so
+%{_libdir}/wine/shell32.dll.so
+%{_libdir}/wine/shfolder.dll.so
+%{_libdir}/wine/shlwapi.dll.so
+%{_libdir}/wine/snmpapi.dll.so
+%{_libdir}/wine/sound.drv.so
+%{_libdir}/wine/stdole2.tlb.so
+%{_libdir}/wine/stdole32.tlb.so
+%{_libdir}/wine/sti.dll.so
+%{_libdir}/wine/storage.dll.so
+%{_libdir}/wine/stress.dll.so
+%{_libdir}/wine/system.drv.so
+%{_libdir}/wine/tapi32.dll.so
+%{_libdir}/wine/toolhelp.dll.so
+%{_libdir}/wine/typelib.dll.so
+%{_libdir}/wine/unicows.dll.so
+%{_libdir}/wine/url.dll.so
+%{_libdir}/wine/urlmon.dll.so
+%{_libdir}/wine/user.exe.so
+%{_libdir}/wine/user32.dll.so
+%{_libdir}/wine/usp10.dll.so
+%{_libdir}/wine/uxtheme.dll.so
+%{_libdir}/wine/vdhcp.vxd.so
+%{_libdir}/wine/vdmdbg.dll.so
+%{_libdir}/wine/ver.dll.so
+%{_libdir}/wine/version.dll.so
+%{_libdir}/wine/vmm.vxd.so
+%{_libdir}/wine/vnbt.vxd.so
+%{_libdir}/wine/vnetbios.vxd.so
+%{_libdir}/wine/vtdapi.vxd.so
+%{_libdir}/wine/vwin32.vxd.so
+%{_libdir}/wine/w32skrnl.dll.so
+%{_libdir}/wine/w32sys.dll.so
+%{_libdir}/wine/win32s16.dll.so
+%{_libdir}/wine/win87em.dll.so
+%{_libdir}/wine/winaspi.dll.so
+%{_libdir}/wine/windebug.dll.so
+%{_libdir}/wine/wineaudioio.drv.so
+%{_libdir}/wine/winedos.dll.so
+%{_libdir}/wine/winemp3.acm.so
+%{_libdir}/wine/wineoss.drv.so
+#%{_libdir}/wine/winetty.drv.so
+%{_libdir}/wine/winex11.drv.so
+%{_libdir}/wine/wing.dll.so
+%{_libdir}/wine/wininet.dll.so
+%{_libdir}/wine/winmm.dll.so
+%{_libdir}/wine/winnls.dll.so
+%{_libdir}/wine/winnls32.dll.so
+%{_libdir}/wine/winsock.dll.so
+%{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/wintab.dll.so
+%{_libdir}/wine/wintab32.dll.so
+%{_libdir}/wine/wintrust.dll.so
+%{_libdir}/wine/wnaspi32.dll.so
+%{_libdir}/wine/wow32.dll.so
+%{_libdir}/wine/wprocs.dll.so
+%{_libdir}/wine/ws2_32.dll.so
+%{_libdir}/wine/wsock32.dll.so
+%{_libdir}/wine/wtsapi32.dll.so
+%dir %{_datadir}/fonts/wine
+%{_datadir}/fonts/wine/wine_coure.fon
+%{_datadir}/fonts/wine/wine_couree.fon
+%{_datadir}/fonts/wine/wine_courer.fon
+%{_datadir}/fonts/wine/wine_marlett.ttf
+%{_datadir}/fonts/wine/wine_sserife.fon
+%{_datadir}/fonts/wine/wine_sserifee.fon
+%{_datadir}/fonts/wine/wine_sserifer.fon
+%{_datadir}/fonts/wine/wine_vgasys.fon
+%{_datadir}/fonts/wine/wine_vgasyse.fon
+%{_datadir}/fonts/wine/wine_vgasysr.fon
+%{_datadir}/fonts/wine/coue1255.fon
+%{_datadir}/fonts/wine/coue1256.fon
+%{_datadir}/fonts/wine/coue1257.fon
+%{_datadir}/fonts/wine/coure.fon
+%{_datadir}/fonts/wine/couree.fon
+%{_datadir}/fonts/wine/coureg.fon
+%{_datadir}/fonts/wine/courer.fon
+%{_datadir}/fonts/wine/couret.fon
+%{_datadir}/fonts/wine/cvgasys.fon
+%{_datadir}/fonts/wine/hvgasys.fon
+%{_datadir}/fonts/wine/jvgasys.fon
+%{_datadir}/fonts/wine/marlett.ttf
+%{_datadir}/fonts/wine/ssee1255.fon
+%{_datadir}/fonts/wine/ssee1256.fon
+%{_datadir}/fonts/wine/ssee1257.fon
+%{_datadir}/fonts/wine/ssee874.fon
+%{_datadir}/fonts/wine/sserife.fon
+%{_datadir}/fonts/wine/sserifee.fon
+%{_datadir}/fonts/wine/sserifeg.fon
+%{_datadir}/fonts/wine/sserifer.fon
+%{_datadir}/fonts/wine/sserifet.fon
+%{_datadir}/fonts/wine/svgasys.fon
+%{_datadir}/fonts/wine/vgas1255.fon
+%{_datadir}/fonts/wine/vgas1256.fon
+%{_datadir}/fonts/wine/vgas1257.fon
+%{_datadir}/fonts/wine/vgas874.fon
+%{_datadir}/fonts/wine/vgasys.fon
+%{_datadir}/fonts/wine/vgasyse.fon
+%{_datadir}/fonts/wine/vgasysg.fon
+%{_datadir}/fonts/wine/vgasysr.fon
+%{_datadir}/fonts/wine/vgasyst.fon
+%{_libdir}/wine/winealsa.drv.so
+%{_libdir}/wine/wineps.drv.so
+%{_libdir}/wine/wineps16.drv.so
+%{_libdir}/wine/d3d8.dll.so
+%{_libdir}/wine/d3d9.dll.so
+%{_libdir}/wine/d3dx8.dll.so
+%{_libdir}/wine/glu32.dll.so
+%{_libdir}/wine/glut32.dll.so
+%{_libdir}/wine/opengl32.dll.so
+%{_libdir}/wine/wined3d.dll.so
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
-%files devel
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/notepad
+%{_bindir}/progman
+%{_bindir}/wcmd
+%{_bindir}/winedbg
+%{_bindir}/winedump
+%{_bindir}/winefile
+%{_bindir}/winemaker
+%{_bindir}/winemine
+%{_bindir}/winepath
+%{_bindir}/winhelp
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/uninstaller.exe.so
+%{_libdir}/wine/wcmd.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winhelp.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/winetest.exe.so
+%{_datadir}/applications/fedora-wine-notepad.desktop
+%{_datadir}/applications/fedora-wine-winefile.desktop
+%{_datadir}/applications/fedora-wine-winemine.desktop
+%{_datadir}/applications/fedora-wine-winhelp.desktop
+
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/wine/winearts.drv.so
+
+%files esd
+%defattr(-,root,root,-)
+%{_libdir}/wine/wineesd.drv.so
+
+%files jack
+%defattr(-,root,root,-)
+%{_libdir}/wine/winejack.drv.so
+
+%files nas
 %defattr(-,root,root,-)
-%doc documentation/winelib-* documentation/wine-devel* documentation/debug*
-%doc documentation/patches* documentation/porting.sgml documentation/implementation.sgml
-%doc documentation/HOWTO-winelib
-%{_includedir}/*
+%{_libdir}/wine/winenas.drv.so
 
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/wine/wldap32.dll.so
+
+%files cms
+%defattr(-,root,root,-)
+%{_libdir}/wine/mscms.dll.so
+
+%files twain
+%defattr(-,root,root,-)
+%{_libdir}/wine/twain.dll.so
+%{_libdir}/wine/twain_32.dll.so
+
+%files capi
+%defattr(-,root,root,-)
+%{_libdir}/wine/capi2032.dll.so
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/function_grep.pl
+%{_bindir}/widl
+%{_bindir}/winebuild
+%{_bindir}/winecpp
+%{_bindir}/winedump
+%{_bindir}/wineg++
+%{_bindir}/winegcc
+%{_bindir}/winemaker
+%{_bindir}/wmc
+%{_bindir}/wrc
+%{_libdir}/*.so
+%{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.1*
+%{_mandir}/man1/winedump.1*
+%{_mandir}/man1/winegcc.1*
+%{_mandir}/man1/winemaker.1*
+%{_mandir}/man1/wmc.1*
+%{_mandir}/man1/wrc.1*
+%{_mandir}/man1/winedbg.1*
+%{_mandir}/man1/wineg++.1*
+%{_datadir}/aclocal/wine.m4
+%attr(0755, root, root) %dir %{_includedir}/wine
+%{_includedir}/wine/*
+%{_libdir}/wine/*.a
+%{_libdir}/wine/*.def
 
 %changelog
-* Sun Sep 28 2003 Ville Skytt?? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20030911
-- Fix SSL detection (need krb5), require openssl.
-- Disable ALSA by default, use "--with alsa" to enable.
-- Disable valgrind by default, use "--with valgrind" to enable.
-- Cosmetic improvements.
-
-* Tue Sep 16 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030911
-- update to 20030911
-
-* Tue Aug 19 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030813
-- update to 20030813
-
-* Thu Jul 10 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030709
-- update to 20030709
-- add /lib/tls requirement -> only works with NTPL capable systems
-
-* Wed Jul 02 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030618
-- update to 20030618
-
-* Thu May 22 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030508
-- update to 20030508
-- add buildreq's & other QA issues from #255
-
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030408
-- package for fedora
-- based on modified RH wine from 8.0 found off the net
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-4
+- bump for import
+
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-3       
+- use ExclusiveArch instead of ExcludeArch
+
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-2
+- own font directory
+- fix devel summary
+- add ExcludeArch x86_64 for now
+
+* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-1
+- version upgrade
+- changed wine.init perissions to 0644
+- added autoconf BR
+
+* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.3-1
+- version upgrade
+
+* Thu Nov 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.2-1
+- version upgrade
+
+* Thu Nov 17 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
+0.9.1-3
+- fix typo in winefile desktop file
+- drop in ld config instead of editing ld.so.conf
+
+* Sun Nov 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-2
+- add fontforge BR and include generated fonts...
+
+* Sat Nov 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-1
+- version upgrade
+- move uninstaller and winecfg into wine main package...
+- drop wine suite
+
+* Sat Oct 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-3
+- s/libwine/wine/
+
+* Thu Oct 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-2
+- remerge some subpackages which should be defaults
+
+* Tue Oct 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-1
+- upgrade to new version
+- start splitting
+
+* Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0-1.20050930
+- add fedora readme
+- switch to new (old) versioning sheme
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-3
+- add desktop files
+- revisit summary and description
+- consistant use of %{buildroot}
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-2
+- some more spec tuneups...
+
+* Sat Oct 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-1
+- version upgrade
+
+* Sun Sep 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050925-1
+- upgrade to current cvs
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050830-1
+- version upgrade
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050524-2
+- fedorarized version
+
+* Mon May 30 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050524-1fc3
+- Update to 20050524
+- Remove pdf documentation build as it's no more included in the main archive
+- Workaround for generic.ppd installation
+
+* Tue Apr 19 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050419-1fc3
+- Update to 20050419
+
+* Thu Mar 10 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050310-1fc3
+- Update to 20050310
+
+* Sat Feb 12 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050211-1fc3
+- Update to 20050211
+
+* Tue Jan 11 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050111-1fc3
+- Update to 20050111
+
+* Wed Dec 1 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041201-1fc3
+- Recompile for FC3
+- Update to 20041201
+- Small reorganization:
+    - use the generic ICU static libs name;
+    - no more wine group;
+    - use Wine's generated stdole32.tlb file;
+    - use Wine's generated fonts.
+
+* Wed Oct 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041019-1fc2
+- Update to 20041019
+
+* Wed Sep 15 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040914-1fc2
+- Update to 20040914
+
+* Sat Aug 14 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040813-1fc2
+- Update to 20040813
+
+* Sat Jul 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040716-1fc2
+- Update to 20040716
+
+* Fri Jun 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc2
+- Recompile for FC2
+- Backport from current CVS some fixes to the preloader to prevent
+  a segfault on startup
+- Include a currently uncommitted patch from Alexandre Julliard regarding
+  further issues with the preloader
+
+* Sun Jun 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc1
+- Update to 20040615
+- Use of wineprefixcreate instead of old RedHat patches
+
+* Wed May 5 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040505-1fc1
+- Update to 20040505
+
+* Fri Apr 9 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040408-1fc1
+- Update to 20040408
+- Change the handling of paths to DOS drives in the installation process
+
+* Wed Mar 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040309-1fc1
+- Update to 20040309
+- Replaced winedefault.reg by wine.inf
+
+* Wed Feb 18 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040213-1fc1
+- Update to 20040213
+- Moved Wine dlls back to %{_libdir}/wine rather than %{_libdir}/wine/wine
+
+* Sun Jan 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040121-fc1
+- Update to 20040121
+
+* Sat Dec 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031212-fc1
+- Update to 20031212
+
+* Wed Nov 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031118-fc1
+- Update to 20031118
+
+* Thu Oct 16 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031016-1rh9
+- Update to 20031016
+
+* Tue Sep 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030911-1rh9
+- Fix of include location
+- Better separation of run-time and development files
+- Update to 20030911
+
+* Wed Aug 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030813-1rh9
+- Update to 20030813
+
+* Wed Jul 09 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030709-1rh9
+- Update to 20030709
+
+* Wed Jun 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030618-1rh9
+- Change the default C drive to ~/.wine/c, copied from /usr/share/wine
+  if non-existant (Thanks to Rudolf Kastl)
+- Updated to 20030618
+
+* Tue May 20 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1rh9
+- Adapted for RH9
+
+* Thu May 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1
+- Add libraries definition files to devel package
+- Update to 20030508
+
+* Tue Apr 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030408-1
+- Update to 20030408
+
+* Tue Mar 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030318-1
+- Update to 20030318
+
+* Thu Mar 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-2
+- Fix the symlinks in wine-c.
+
+* Wed Feb 19 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-1
+- Update to 20030129
+- Various fixes in RPM build process
+
+* Fri Jan 17 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030115-1
+- Update to 20030115
+- fix to build problem
+
+* Thu Nov  7 2002 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20021031-1
+- Update to 20021031
+- Tweaks here and there
+
+* Wed Sep  4 2002 Bill Nottingham <notting at redhat.com> 20020605-2
+- fix docs (#72923)
+
+* Wed Jul 10 2002 Karsten Hopp <karsten at redhat.de> 20020605-1
+- update
+- remove obsolete part of redhat patch
+- redo destdir patch
+- redo kde patch
+- redo defaultversion patch
+- fix 'my_perl unknown' error
+- work around name conflict with textutils 'expand'
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020327-1
+- Fix wineshelllink (#61761)
+- Fix up initscript (#53625)
+- Clean up spec file
+- Default to emulating Windoze ME rather than 3.1, nobody uses 3.1
+  applications anymore
+- Auto-generate default config if none exists (#61920)
+
+* Mon Mar 04 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020304-1
+- Assign gid 66 (closest to 666 [Microsoft number] we can get for a
+  system account ;) )
+- Don't use glibc private functions (__libc_fork)
+- Update
+
+* Tue Feb 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020226-1
+- Fix bug #60250
+- Update
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020221-1
+- Update
+- Don't try to launch winesetup in winelauncher, we aren't shipping it
+  (#59621)
+
+* Sun Jan 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020127-1
+- Update
+- Fix build in current environment
+
+* Wed Aug 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010822-1
+- Make sure the package can be cleanly uninstalled (#52007)
+- Add build dependencies
+
+* Thu Jul 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010726-1
+- Fix -devel package group (#49989)
+- remove internal CVS files
+- chkconfig deletion should be in %preun, not %postun
+- rename initscript ("Starting windows:" at startup does look off)
+
+* Thu May 03 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010503-1
+- Update
+- generate HTML documentation rather than shipping plain docbook text
+  (#38453)
+
+* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Update registry to mount "/" as drive "Z:", fixes winedbg (needs to be
+  accessible from 'doze drives)
+- Don't create KDE 1.x style desktop entries in wineshelllink
+- Be more tolerant on failing stuff in %%post
+
+* Thu Mar  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+
+* Thu Feb 15 2001 Tim Powers <timp at redhat.com>
+- fixed time.h build problems
+
+* Wed Jan 31 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add a patch to handle .exe and .com file permissions the way we want them
+
+* Thu Jan 18 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Restore wine's ability to use a global config file, it was removed
+  in CVS for whatever reason
+- Move libraries to %{_libdir}/wine to prevent conflicts with libuser
+  (Bug #24202)
+- Move include files to /usr/include/wine to prevent it from messing with
+  some autoconf scripts (some broken scripts assume they're running on windoze
+  if /usr/include/windows.h exists...)
+
+* Tue Dec 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix %%pre and %%postun scripts
+- --enable-opengl, glibc 2.2 should be safe
+- Update CVS
+
+* Mon Nov 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update CVS
+- Add a new (user) group wine that can write to the "C: drive"
+  %{_datadir}/wine-c
+- Fix up winedbg installation (registry entries)
+- Add "Program Files/Common Files" subdirectory to the "C: drive", it's
+  referenced in the registry
+
+* Wed Oct 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- rebuilt with new DGA
+
+* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- new snapshot
+- fix compilation with gcc 2.96
+
+* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Move init script back
+- new version
+- move man pages to FHS locations
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- move initscript
+- new snapshot
+
+* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Start the initscript on startup
+
+* Mon May  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- New version
+- new feature: You can now launch wine by just running a windows .exe file
+  (./some.exe or just click on it in kfm, gmc and the likes)
+- some spec file modifications
+
+* Sun Feb 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- newer version
+- Improve the system.ini file - all multimedia stuff should work now.
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- enable and fix up the urlmon/wininet patch
+- add: autoexec.bat, config.sys, windows/win.ini windows/system.ini
+  windows/Profiles/Administrator
+- allow i[456]86 arches
+- add some system.ini configuration
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update current
+- add urlmon and wininet patches from Corel (don't apply them for now though)
+- create empty shell*dll and winsock*dll files (as mentioned in the HOWTO)
+
+* Mon Jan 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update to current (lots of important fixes)
+- Fix up the default wine.conf file (We really don't want it to look
+  for CD-ROMs in /cdrom!)
+- create a "root filesystem" with everything required to run wine without
+  windows in %{_datadir}/wine-c (drive c:)
+- add RedHat file in /usr/doc/wine-%{version} explaining the new directory
+  layout
+- wine-devel requires wine
+
+* Tue Dec 14 1999 Preston Brown <pbrown at redhat.com>
+- updated source for Powertools 6.2
+- better files list
+
+* Fri Jul 23 1999 Tim Powers <timp at redhat.com>
+- updated source
+- built for 6.1
+
+* Tue Apr 13 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+- updated package and spec file
+
+* Mon Oct 26 1998 Preston Brown <pbrown at redhat.com>
+- updated to 10/25/98 version.  There is really no point in keeping the
+- older one, it is full of bugs and the newer one has fewer.
+- commented out building of texinfo manual, it is horrendously broken.
+
+* Mon Oct 12 1998 Michael Maher <mike at redhat.com>
+- built package for 5.2
+- pressured by QA, not updating.
 
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- repackaged for PowerTools



From fedora-extras-commits at redhat.com  Mon Jan  2 09:34:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:34:21 -0500
Subject: rpms/wine/FC-3 branch,1.2,1.3
Message-ID: <200601020934.k029YrJV029188@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29171

Modified Files:
	branch 
Log Message:
- fix branch



Index: branch
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/branch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- branch	2 Jan 2006 09:31:09 -0000	1.2
+++ branch	2 Jan 2006 09:34:20 -0000	1.3
@@ -1 +1 @@
-FC-4
+FC-3



From fedora-extras-commits at redhat.com  Mon Jan  2 10:06:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 05:06:13 -0500
Subject: owners owners.list,1.495,1.496
Message-ID: <200601021006.k02A6kWI030999@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30982

Modified Files:
	owners.list 
Log Message:
- add wine



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- owners.list	1 Jan 2006 17:53:17 -0000	1.495
+++ owners.list	2 Jan 2006 10:06:13 -0000	1.496
@@ -1240,6 +1240,7 @@
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wmacpi|Dockapp for laptop acpi/apm information|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:02 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:02 -0500
Subject: rpms/nautilus-actions - New directory
Message-ID: <200601021521.k02FL4cg007381@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7373/nautilus-actions

Log Message:
Directory /cvs/extras/rpms/nautilus-actions added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:08 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:08 -0500
Subject: rpms/nautilus-actions/devel - New directory
Message-ID: <200601021521.k02FLAkU007396@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7373/nautilus-actions/devel

Log Message:
Directory /cvs/extras/rpms/nautilus-actions/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:20 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:20 -0500
Subject: rpms/nautilus-actions Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601021521.k02FLMl0007430@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418

Added Files:
	Makefile import.log 
Log Message:
Setup of module nautilus-actions


--- NEW FILE Makefile ---
# Top level Makefile for module nautilus-actions
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:26 -0500
Subject: rpms/nautilus-actions/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601021521.k02FLS3U007450@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nautilus-actions


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:47 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:47 -0500
Subject: rpms/nautilus-actions import.log,1.1,1.2
Message-ID: <200601021522.k02FMJ8Q007518@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7484

Modified Files:
	import.log 
Log Message:
auto-import nautilus-actions-0.99-5 on branch devel from nautilus-actions-0.99-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Jan 2006 15:21:20 -0000	1.1
+++ import.log	2 Jan 2006 15:21:46 -0000	1.2
@@ -0,0 +1 @@
+nautilus-actions-0_99-5:HEAD:nautilus-actions-0.99-5.src.rpm:1136215211



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:52 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:52 -0500
Subject: rpms/nautilus-actions/devel nautilus-actions.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601021522.k02FMPlu007522@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7484/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nautilus-actions.spec 
Log Message:
auto-import nautilus-actions-0.99-5 on branch devel from nautilus-actions-0.99-5.src.rpm


--- NEW FILE nautilus-actions.spec ---
Summary: Nautilus extension for customizing the context menu
Name:    nautilus-actions
Version: 0.99
Release: 5
Group:   User Interface/Desktops
License: GPL
URL:     http://www.grumz.net/node/8
Source0: http://www.grumz.net/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel, libglade2-devel, nautilus
BuildRequires: e2fsprogs-devel
BuildRequires: desktop-file-utils
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description
Nautilus actions is an extension for Nautilus, the GNOME file manager.
It provides an easy way to configure programs to be launch on files 
selected in Nautilus interface

%prep
%setup -q

%build
%configure --disable-schemas-install --enable-commandline-tool
make %{?_smp_mflags} 

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

cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png

rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la
rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop

desktop-file-install --delete-original                   \
        --vendor fedora                                  \
        --dir %{buildroot}%{_datadir}/applications       \
	--mode 0644				         \
        --add-category X-Fedora                          \
        %{buildroot}%{_datadir}/applications/nact.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || :
    killall -HUP gconfd-2 || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
  %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
killall -HUP gconfd-2 || :

%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
    gconftool-2 --recursive-unset /apps/nautilus-actions
    gconftool-2 --recursive-unset /schemas/apps/nautilus-actions
    killall -HUP gconfd-2 || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/nautilus-actions-config
%{_bindir}/nautilus-actions-convert
%{_bindir}/nautilus-actions-new-config
%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so
%{_datadir}/%{name}/
%{_datadir}/applications/fedora-nact.desktop
%{_datadir}/pixmaps/nautilus-actions-icon.png
%config %{_sysconfdir}/gconf/schemas/config_newaction.schemas

%changelog
* Sun Jan 1 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-5
- Remove libXdmcp-devel as BR, nautilus now takkes care of it

* Sun Dec 18 2005 Deji Akingunola <dakingun at gmail.com> - 0.99-4
- Remove libSM-devel from build require as libgnomeui now build-requires
- Add libXdmcp-devel to the build requires

* Tue Nov 29 2005 Deji Akingunola <dakingun at gmail.com> - 0.99-2
- Remove unnecesary configure options
- Clean-up the desktop file installation
- Add e2fsprogs-devel buildrequire and remove explicit require on nautilus

* Fri Nov 25 2005 Deji Akingunola <dakingun at gmail.com> - 0.99-1
- initial Extras release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Jan 2006 15:21:25 -0000	1.1
+++ .cvsignore	2 Jan 2006 15:21:52 -0000	1.2
@@ -0,0 +1 @@
+nautilus-actions-0.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Jan 2006 15:21:25 -0000	1.1
+++ sources	2 Jan 2006 15:21:52 -0000	1.2
@@ -0,0 +1 @@
+682d452e4b05c77b5a258c7ec49634bc  nautilus-actions-0.99.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 15:30:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:30:50 -0500
Subject: owners owners.list,1.496,1.497
Message-ID: <200601021531.k02FVN20007603@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7582

Modified Files:
	owners.list 
Log Message:
Adding nautilus-actions



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- owners.list	2 Jan 2006 10:06:13 -0000	1.496
+++ owners.list	2 Jan 2006 15:30:50 -0000	1.497
@@ -623,6 +623,7 @@
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|nautilus-actions|Nautilus extension for customizing the context menu|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-image-converter|Nautilus extension to mass resize images|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan  2 16:23:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:23:35 -0500
Subject: rpms/perl-Glib/FC-3 .cvsignore, 1.4, 1.5 perl-Glib.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200601021624.k02GO8Ju009448@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9427

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Sync with FC-4 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Mar 2005 18:00:45 -0000	1.4
+++ .cvsignore	2 Jan 2006 16:23:35 -0000	1.5
@@ -1 +1 @@
-Glib-1.080.tar.gz
+Glib-1.082.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/perl-Glib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Glib.spec	8 Mar 2005 18:00:45 -0000	1.6
+++ perl-Glib.spec	2 Jan 2006 16:23:35 -0000	1.7
@@ -1,14 +1,12 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Glib
-Version:        1.080
-Release:        1
+Version:        1.082
+Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Glib/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.080.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.082.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -60,6 +58,12 @@
 
 
 %changelog
+* Mon Jun 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.082-1
+- Update to 1.082.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
 - Update to 1.080.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Mar 2005 18:00:45 -0000	1.4
+++ sources	2 Jan 2006 16:23:35 -0000	1.5
@@ -1 +1 @@
-b6cb2978519fc3ee882c2c4aa27cbdd1  Glib-1.080.tar.gz
+6f3c675acf177763f51394b7e087d507  Glib-1.082.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:28:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:28:38 -0500
Subject: rpms/perl-Gtk2/FC-3 .cvsignore, 1.4, 1.5 perl-Gtk2.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200601021629.k02GTArh009521@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9500

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Sync with FC-4 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Mar 2005 18:28:36 -0000	1.4
+++ .cvsignore	2 Jan 2006 16:28:37 -0000	1.5
@@ -1 +1 @@
-Gtk2-1.080.tar.gz
+Gtk2-1.083.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/perl-Gtk2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Gtk2.spec	10 Mar 2005 22:51:33 -0000	1.6
+++ perl-Gtk2.spec	2 Jan 2006 16:28:37 -0000	1.7
@@ -1,20 +1,18 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Gtk2
-Version:        1.080
-Release:        2
+Version:        1.083
+Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Gtk2/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.080.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.080
+BuildRequires:  gtk2-devel, perl-Glib >= 1.082
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.080
+Requires:       perl-Glib >= 1.082
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -30,7 +28,6 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -62,6 +59,15 @@
 
 
 %changelog
+* Fri Jul 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.083-1
+- Update to 1.083.
+
+* Mon Jun 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.082-1
+- Update to 1.082.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Thu Mar 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-2
 - Use perl-Glib for versioning control (patch by Ville Skytt??).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Mar 2005 18:28:36 -0000	1.4
+++ sources	2 Jan 2006 16:28:37 -0000	1.5
@@ -1 +1 @@
-fa9bf175f72291ae7d843912fed4651a  Gtk2-1.080.tar.gz
+4ccec16a8a87bbf0b058c92ac44d60ae  Gtk2-1.083.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:31:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:31:59 -0500
Subject: rpms/perl-Glib/FC-4 .cvsignore, 1.5, 1.6 perl-Glib.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200601021632.k02GWV0J009598@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9575

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Sync with devel branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2005 16:17:41 -0000	1.5
+++ .cvsignore	2 Jan 2006 16:31:57 -0000	1.6
@@ -1 +1 @@
-Glib-1.082.tar.gz
+Glib-1.102.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/perl-Glib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Glib.spec	27 Jun 2005 16:17:41 -0000	1.9
+++ perl-Glib.spec	2 Jan 2006 16:31:57 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           perl-Glib
-Version:        1.082
+Version:        1.102
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Glib/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.082.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -28,7 +28,6 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -41,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +57,15 @@
 
 
 %changelog
+* Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
+- Update to 1.102.
+
+* Thu Oct  6 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.101-1
+- Update to 1.101.
+
+* Thu Sep  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.100-1
+- Update to 1.100.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.082-1
 - Update to 1.082.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2005 16:17:41 -0000	1.5
+++ sources	2 Jan 2006 16:31:58 -0000	1.6
@@ -1 +1 @@
-6f3c675acf177763f51394b7e087d507  Glib-1.082.tar.gz
+d49aa86f0c77f04c0a196414ba0a27fa  Glib-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:35:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:35:09 -0500
Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.6, 1.7 perl-Gtk2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200601021635.k02GZfOr009677@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9647

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Sync with devel branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 19:27:35 -0000	1.6
+++ .cvsignore	2 Jan 2006 16:35:08 -0000	1.7
@@ -1 +1 @@
-Gtk2-1.083.tar.gz
+Gtk2-1.102.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Gtk2.spec	29 Jul 2005 19:27:35 -0000	1.10
+++ perl-Gtk2.spec	2 Jan 2006 16:35:08 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Gtk2
-Version:        1.083
+Version:        1.102
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -10,9 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.082
+BuildRequires:  gtk2-devel, perl-Glib >= 1.102
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.082
+Requires:       perl-Glib >= 1.102
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -40,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 # Testing requires X
 %{?_with_tests:make test}
 
@@ -59,6 +59,15 @@
 
 
 %changelog
+* Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
+- Update to 1.102.
+
+* Thu Oct  6 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.101-1
+- Update to 1.101.
+
+* Thu Sep  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.100-1
+- Update to 1.100.
+
 * Fri Jul 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.083-1
 - Update to 1.083.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 19:27:35 -0000	1.6
+++ sources	2 Jan 2006 16:35:08 -0000	1.7
@@ -1 +1 @@
-4ccec16a8a87bbf0b058c92ac44d60ae  Gtk2-1.083.tar.gz
+8bd7173c8a2b6b8baf2fa3c3d48d4bb5  Gtk2-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:41:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Jan 2006 11:41:36 -0500
Subject: rpms/perl-Module-Signature/FC-4 .cvsignore, 1.3,
	1.4 perl-Module-Signature.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200601021642.k02Gg8rD009756@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9718/FC-4

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
- 0.51.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2005 16:10:12 -0000	1.3
+++ .cvsignore	2 Jan 2006 16:41:35 -0000	1.4
@@ -1 +1 @@
-Module-Signature-0.50.tar.gz
+Module-Signature-0.51.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/perl-Module-Signature.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Signature.spec	22 Aug 2005 16:10:12 -0000	1.3
+++ perl-Module-Signature.spec	2 Jan 2006 16:41:35 -0000	1.4
@@ -2,7 +2,7 @@
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
 Name:           perl-Module-Signature
-Version:        0.50
+Version:        0.51
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
+- 0.51.
+
 * Mon Aug 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-1
 - 0.50.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2005 16:10:12 -0000	1.3
+++ sources	2 Jan 2006 16:41:35 -0000	1.4
@@ -1 +1 @@
-3dd8abcf67f4fa5c85d898267e3cad53  Module-Signature-0.50.tar.gz
+c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:41:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Jan 2006 11:41:41 -0500
Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.4,
	1.5 perl-Module-Signature.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601021642.k02GgEiF009765@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9718/devel

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
- 0.51.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Aug 2005 16:10:13 -0000	1.4
+++ .cvsignore	2 Jan 2006 16:41:41 -0000	1.5
@@ -1 +1 @@
-Module-Signature-0.50.tar.gz
+Module-Signature-0.51.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Module-Signature.spec	22 Aug 2005 16:10:13 -0000	1.4
+++ perl-Module-Signature.spec	2 Jan 2006 16:41:41 -0000	1.5
@@ -2,7 +2,7 @@
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
 Name:           perl-Module-Signature
-Version:        0.50
+Version:        0.51
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
+- 0.51.
+
 * Mon Aug 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-1
 - 0.50.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Aug 2005 16:10:13 -0000	1.4
+++ sources	2 Jan 2006 16:41:41 -0000	1.5
@@ -1 +1 @@
-3dd8abcf67f4fa5c85d898267e3cad53  Module-Signature-0.50.tar.gz
+c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 18:46:47 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 2 Jan 2006 13:46:47 -0500
Subject: rpms/scponly/devel scponly-4.3-optreset.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 scponly.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601021846.k02IklXq013398@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/scponly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13387

Modified Files:
	.cvsignore scponly.spec sources 
Added Files:
	scponly-4.3-optreset.patch 
Log Message:
4.3 security update


scponly-4.3-optreset.patch:

--- NEW FILE scponly-4.3-optreset.patch ---
http://bugs.gentoo.org/show_bug.cgi?id=116526#c11

--- helper.c.orig	2005-12-23 06:08:59.000000000 +0100
+++ helper.c	2005-12-28 10:51:29.000000000 +0100
@@ -39,7 +39,9 @@
 
 extern char *optarg;
 extern int optind;
+#ifdef HAVE_OPTRESET
 extern int optreset;
+#endif
 
 #ifdef UNIX_COMPAT
 char* solaris_needs_strsep(char** str, char* delims)
@@ -160,8 +162,14 @@
 				 *	now use getopt to look for our problem option
 				 */
 #ifdef HAVE_GETOPT
+#ifdef HAVE_OPTRESET
 				optreset=1;
+#endif
+#ifdef __GLIBC__
+				optind=0;
+#else
 				optind=1;
+#endif
 				/*
 				 *	tell getopt to only be strict if the 'opts' is well defined
 				 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scponly/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 16:06:31 -0000	1.2
+++ .cvsignore	2 Jan 2006 18:46:47 -0000	1.3
@@ -1 +1 @@
-scponly-4.1.tgz
+scponly-4.3.tgz


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/devel/scponly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scponly.spec	3 Nov 2005 16:06:32 -0000	1.1
+++ scponly.spec	2 Jan 2006 18:46:47 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-4.3-optreset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -45,6 +47,10 @@
 %{_bindir}/scponly
 
 %changelog
+* Mon Jan 02 2006 Warren Togami <wtogami at redhat.com> - 4.3-1
+- security fixes
+- Gentoo's patch for optreset which is not supplied by glibc
+
 * Thu Nov 03 2005 Warren Togami <wtogami at redhat.com> - 4.1-6
 - use macro in substitution
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scponly/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 16:06:32 -0000	1.2
+++ sources	2 Jan 2006 18:46:47 -0000	1.3
@@ -1 +1 @@
-32e4b87dc46c78573010c1146e9744f0  scponly-4.1.tgz
+2cef26fe5ed740031a067f189c293e77  scponly-4.3.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 18:48:07 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 2 Jan 2006 13:48:07 -0500
Subject: rpms/scponly/FC-3 scponly-4.3-optreset.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 scponly.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601021848.k02Im7tQ013516@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/scponly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13505

Modified Files:
	.cvsignore scponly.spec sources 
Added Files:
	scponly-4.3-optreset.patch 
Log Message:
4.3 security update


scponly-4.3-optreset.patch:

--- NEW FILE scponly-4.3-optreset.patch ---
http://bugs.gentoo.org/show_bug.cgi?id=116526#c11

--- helper.c.orig	2005-12-23 06:08:59.000000000 +0100
+++ helper.c	2005-12-28 10:51:29.000000000 +0100
@@ -39,7 +39,9 @@
 
 extern char *optarg;
 extern int optind;
+#ifdef HAVE_OPTRESET
 extern int optreset;
+#endif
 
 #ifdef UNIX_COMPAT
 char* solaris_needs_strsep(char** str, char* delims)
@@ -160,8 +162,14 @@
 				 *	now use getopt to look for our problem option
 				 */
 #ifdef HAVE_GETOPT
+#ifdef HAVE_OPTRESET
 				optreset=1;
+#endif
+#ifdef __GLIBC__
+				optind=0;
+#else
 				optind=1;
+#endif
 				/*
 				 *	tell getopt to only be strict if the 'opts' is well defined
 				 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 16:06:31 -0000	1.2
+++ .cvsignore	2 Jan 2006 18:48:07 -0000	1.3
@@ -1 +1 @@
-scponly-4.1.tgz
+scponly-4.3.tgz


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/scponly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scponly.spec	3 Nov 2005 16:06:32 -0000	1.1
+++ scponly.spec	2 Jan 2006 18:48:07 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-4.3-optreset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -45,6 +47,10 @@
 %{_bindir}/scponly
 
 %changelog
+* Mon Jan 02 2006 Warren Togami <wtogami at redhat.com> - 4.3-1
+- security fixes
+- Gentoo's patch for optreset which is not supplied by glibc
+
 * Thu Nov 03 2005 Warren Togami <wtogami at redhat.com> - 4.1-6
 - use macro in substitution
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 16:06:32 -0000	1.2
+++ sources	2 Jan 2006 18:48:07 -0000	1.3
@@ -1 +1 @@
-32e4b87dc46c78573010c1146e9744f0  scponly-4.1.tgz
+2cef26fe5ed740031a067f189c293e77  scponly-4.3.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 18:48:42 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 2 Jan 2006 13:48:42 -0500
Subject: rpms/scponly/FC-4 scponly-4.3-optreset.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 scponly.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601021848.k02ImgDM013567@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/scponly/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13556

Modified Files:
	.cvsignore scponly.spec sources 
Added Files:
	scponly-4.3-optreset.patch 
Log Message:
4.3 security update


scponly-4.3-optreset.patch:

--- NEW FILE scponly-4.3-optreset.patch ---
http://bugs.gentoo.org/show_bug.cgi?id=116526#c11

--- helper.c.orig	2005-12-23 06:08:59.000000000 +0100
+++ helper.c	2005-12-28 10:51:29.000000000 +0100
@@ -39,7 +39,9 @@
 
 extern char *optarg;
 extern int optind;
+#ifdef HAVE_OPTRESET
 extern int optreset;
+#endif
 
 #ifdef UNIX_COMPAT
 char* solaris_needs_strsep(char** str, char* delims)
@@ -160,8 +162,14 @@
 				 *	now use getopt to look for our problem option
 				 */
 #ifdef HAVE_GETOPT
+#ifdef HAVE_OPTRESET
 				optreset=1;
+#endif
+#ifdef __GLIBC__
+				optind=0;
+#else
 				optind=1;
+#endif
 				/*
 				 *	tell getopt to only be strict if the 'opts' is well defined
 				 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 16:06:31 -0000	1.2
+++ .cvsignore	2 Jan 2006 18:48:42 -0000	1.3
@@ -1 +1 @@
-scponly-4.1.tgz
+scponly-4.3.tgz


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-4/scponly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scponly.spec	3 Nov 2005 16:06:32 -0000	1.1
+++ scponly.spec	2 Jan 2006 18:48:42 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-4.3-optreset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -45,6 +47,10 @@
 %{_bindir}/scponly
 
 %changelog
+* Mon Jan 02 2006 Warren Togami <wtogami at redhat.com> - 4.3-1
+- security fixes
+- Gentoo's patch for optreset which is not supplied by glibc
+
 * Thu Nov 03 2005 Warren Togami <wtogami at redhat.com> - 4.1-6
 - use macro in substitution
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 16:06:32 -0000	1.2
+++ sources	2 Jan 2006 18:48:42 -0000	1.3
@@ -1 +1 @@
-32e4b87dc46c78573010c1146e9744f0  scponly-4.1.tgz
+2cef26fe5ed740031a067f189c293e77  scponly-4.3.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 21:40:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Jan 2006 16:40:02 -0500
Subject: rpms/xforms/devel xforms-1.0.90-prelink.patch, NONE, 1.1 xforms.spec,
	1.13, 1.14
Message-ID: <200601022140.k02LeYEu019028@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006

Modified Files:
	xforms.spec 
Added Files:
	xforms-1.0.90-prelink.patch 
Log Message:
* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
- prelink.patch: fix undefined symbols in (shared) lib(s)


xforms-1.0.90-prelink.patch:

--- NEW FILE xforms-1.0.90-prelink.patch ---
--- xforms-1.0.90/fd2ps/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.in	2006-01-02 15:18:01.000000000 -0600
@@ -115,7 +115,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/fd2ps/Makefile.am.prelink	2003-11-13 15:46:47.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.am	2006-01-02 15:18:10.000000000 -0600
@@ -16,7 +16,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/image/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/image/Makefile.in	2006-01-02 15:05:52.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/image/Makefile.am.prelink	2003-11-13 15:46:48.000000000 -0600
+++ xforms-1.0.90/image/Makefile.am	2006-01-02 15:05:50.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/gl/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.in	2006-01-02 15:04:24.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/gl/Makefile.am.prelink	2003-11-20 03:33:11.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.am	2006-01-02 15:04:20.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/demos/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.in	2006-01-02 15:07:41.000000000 -0600
@@ -206,7 +206,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -263,12 +263,12 @@
 
 gl_SOURCES = gl.c
 gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 glwin_SOURCES = glwin.c
 glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 goodies_SOURCES = goodies.c
@@ -276,7 +276,7 @@
 
 ibrowser_SOURCES = ibrowser.c
 ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -284,7 +284,7 @@
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -295,7 +295,7 @@
 
 itest_SOURCES = itest.c
 itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -304,7 +304,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -355,7 +355,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
--- xforms-1.0.90/demos/Makefile.am.prelink	2004-02-24 09:42:43.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.am	2006-01-02 15:19:03.000000000 -0600
@@ -105,7 +105,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -168,11 +168,11 @@
 
 gl_SOURCES = gl.c
 gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 glwin_SOURCES = glwin.c
 glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 goodies_SOURCES = goodies.c
 group_SOURCES = group.c
@@ -180,14 +180,14 @@
 ibrowser_SOURCES = ibrowser.c
 ibrowser.$(OBJEXT): fd/ibrowser_gui.c
 ibrowser_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 iconify_SOURCES = iconify.c
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 inputall_SOURCES = inputall.c
@@ -199,7 +199,7 @@
 itest_SOURCES = itest.c
 itest.$(OBJEXT): fd/is_gui.c
 itest_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 lalign_SOURCES = lalign.c
@@ -207,7 +207,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 longlabel_SOURCES = longlabel.c
@@ -260,7 +260,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 yesno_SOURCES = yesno.c
--- xforms-1.0.90/lib/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.in	2006-01-02 14:52:11.000000000 -0600
@@ -116,7 +116,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \
--- xforms-1.0.90/lib/Makefile.am.prelink	2003-11-20 03:33:16.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.am	2006-01-02 14:52:19.000000000 -0600
@@ -17,7 +17,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \


Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xforms.spec	19 Dec 2005 21:17:13 -0000	1.13
+++ xforms.spec	2 Jan 2006 21:40:01 -0000	1.14
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -11,6 +11,9 @@
 Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# TODO: remove -lc (all), -lm (most) linker steps
+Patch1: xforms-1.0.90-prelink.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: libGL-devel
 %if "%{?fedora}" > "4"
@@ -46,6 +49,8 @@
 
 %setup -q
 
+%patch1 -p1 -b .prelink
+
 
 %build
 
@@ -53,7 +58,8 @@
   --disable-static \
   --enable-optimization="$RPM_OPT_FLAGS"
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags} \
+  X_PRE_LIBS=''
 
 
 %install
@@ -88,6 +94,9 @@
 
 
 %changelog 
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
+- prelink.patch: fix undefined symbols in (shared) lib(s)
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
 - BR: libXpm-devel
 - -devel: Req: libX11-devel 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:10:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:10:55 -0500
Subject: rpms/pl/FC-4 pl-5.6.0-multilib.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 pl.spec, 1.16, 1.17 sources, 1.4, 1.5
Message-ID: <200601022211.k02MBSEj021064@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21025

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.0-multilib.patch 
Log Message:
new version 5.6.0

pl-5.6.0-multilib.patch:

--- NEW FILE pl-5.6.0-multilib.patch ---
--- pl-5.6.0/src/rc/Makefile.in.multilib	2006-01-02 22:43:19.000000000 +0100
+++ pl-5.6.0/src/rc/Makefile.in	2006-01-02 22:43:46.000000000 +0100
@@ -18,7 +18,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=$(exec_prefix)/bin
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 man_prefix=$(prefix)/man
 mansec=1
 lmansec=3
--- pl-5.6.0/src/configure.multilib	2006-01-02 22:41:36.000000000 +0100
+++ pl-5.6.0/src/configure	2006-01-02 22:41:59.000000000 +0100
@@ -2546,7 +2546,7 @@
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
-PLBASE=$prefix/lib/$PL-$PLVERSION
+PLBASE=$libdir/$PL-$PLVERSION
 
 
 for ac_prog in gmake make
--- pl-5.6.0/src/Makefile.in.multilib	2006-01-02 22:42:12.000000000 +0100
+++ pl-5.6.0/src/Makefile.in	2006-01-02 22:42:46.000000000 +0100
@@ -46,7 +46,8 @@
 PLVERSION=@PLVERSION@
 PL=@PL@@RT@
 PLV=@PL@@RT at -@PLVERSION@
-PLBASE=$(prefix)/lib/@PL@@RT at -@PLVERSION@
+libdir=@libdir@
+PLBASE=$(libdir)/@PL@@RT at -@PLVERSION@
 BOOTFILE=@BOOTFILE@
 
 CC=@CC@
--- pl-5.6.0/packages/Makefile.in.multilib	2006-01-02 22:39:53.000000000 +0100
+++ pl-5.6.0/packages/Makefile.in	2006-01-02 22:41:19.000000000 +0100
@@ -30,7 +30,8 @@
 bindir=@bindir@
 PL=@PL@@RT@
 PLVERSION=@PLVERSION@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 PKGDOC=$(PLBASE)/doc/packages
 PLLIBS=@LIBS@
 PLARCH=@ARCH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 19:47:37 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:10:54 -0000	1.5
@@ -1,3 +1,3 @@
-pl-5.4.7.tar.gz
 HTMLmanual.tar.gz
+pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pl.spec	22 Jun 2005 19:47:37 -0000	1.16
+++ pl.spec	2 Jan 2006 22:10:54 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.4.7
+Version:	5.6.0
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,19 +7,18 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
-Patch0:		pl-5.4.6-rpath.patch
-Patch1:		pl-5.4.6-multilib.patch
-Patch2:		pl-5.4.6-visibilityabuse.patch
-Patch3:		pl-5.4.7-gcc4fix.patch
+Patch0:         pl-5.4.6-rpath.patch
+Patch1:         pl-5.6.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:	libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
+BuildRequires:  xorg-x11-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -29,12 +28,11 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .visibilityabuse
-%patch3 -p1 -b .gcc4fix
 (
    mkdir doc-install
    cd doc-install
@@ -42,6 +40,7 @@
    tar zxf %{SOURCE2}
 )
 
+
 %build
 %configure
 make COFLAGS="$RPM_OPT_FLAGS"
@@ -51,6 +50,7 @@
 make COFLAGS="$RPM_OPT_FLAGS"
 cd ..
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
@@ -67,9 +67,11 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
@@ -79,9 +81,13 @@
 %{_libdir}/pl*
 %{_bindir}/*
 
+
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
+- new version 5.6.0
+
 * Wed Jun 22 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.7-1
-- New Version 5.4.7
+- new version 5.4.7
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.4.6-9
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2005 19:47:37 -0000	1.4
+++ sources	2 Jan 2006 22:10:54 -0000	1.5
@@ -1,3 +1,3 @@
-5c57c9a752bd3c6f56e4ae506ab23726  pl-5.4.7.tar.gz
-e93a7d6ed002750f38dd3ae83f6e0fa8  HTMLmanual.tar.gz
-fbe3c4102f897fbfcadeb1cc94603dfa  userguide.html.tgz
+6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
+ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
+72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 22:25:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:25:57 -0500
Subject: rpms/pl/FC-3 pl-5.6.0-multilib.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 pl.spec, 1.13, 1.14 sources, 1.3, 1.4
Message-ID: <200601022226.k02MQTdc021185@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21161

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.0-multilib.patch 
Log Message:
new version 5.6.0

pl-5.6.0-multilib.patch:

--- NEW FILE pl-5.6.0-multilib.patch ---
--- pl-5.6.0/src/rc/Makefile.in.multilib	2006-01-02 22:43:19.000000000 +0100
+++ pl-5.6.0/src/rc/Makefile.in	2006-01-02 22:43:46.000000000 +0100
@@ -18,7 +18,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=$(exec_prefix)/bin
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 man_prefix=$(prefix)/man
 mansec=1
 lmansec=3
--- pl-5.6.0/src/configure.multilib	2006-01-02 22:41:36.000000000 +0100
+++ pl-5.6.0/src/configure	2006-01-02 22:41:59.000000000 +0100
@@ -2546,7 +2546,7 @@
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
-PLBASE=$prefix/lib/$PL-$PLVERSION
+PLBASE=$libdir/$PL-$PLVERSION
 
 
 for ac_prog in gmake make
--- pl-5.6.0/src/Makefile.in.multilib	2006-01-02 22:42:12.000000000 +0100
+++ pl-5.6.0/src/Makefile.in	2006-01-02 22:42:46.000000000 +0100
@@ -46,7 +46,8 @@
 PLVERSION=@PLVERSION@
 PL=@PL@@RT@
 PLV=@PL@@RT at -@PLVERSION@
-PLBASE=$(prefix)/lib/@PL@@RT at -@PLVERSION@
+libdir=@libdir@
+PLBASE=$(libdir)/@PL@@RT at -@PLVERSION@
 BOOTFILE=@BOOTFILE@
 
 CC=@CC@
--- pl-5.6.0/packages/Makefile.in.multilib	2006-01-02 22:39:53.000000000 +0100
+++ pl-5.6.0/packages/Makefile.in	2006-01-02 22:41:19.000000000 +0100
@@ -30,7 +30,8 @@
 bindir=@bindir@
 PL=@PL@@RT@
 PLVERSION=@PLVERSION@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 PKGDOC=$(PLBASE)/doc/packages
 PLLIBS=@LIBS@
 PLARCH=@ARCH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 02:19:11 -0000	1.3
+++ .cvsignore	2 Jan 2006 22:25:57 -0000	1.4
@@ -1,3 +1,3 @@
 HTMLmanual.tar.gz
-pl-5.4.6.tar.gz
+pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/pl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pl.spec	23 Feb 2005 16:04:06 -0000	1.13
+++ pl.spec	2 Jan 2006 22:25:57 -0000	1.14
@@ -1,23 +1,24 @@
 Name:		pl
-Version:	5.4.6
-Release:	7
+Version:	5.6.0
+Release:	1%{?dist}
+
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.6.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
-Patch:		pl-5.4.6-rpath.patch
-Patch1:		pl-5.4.6-multilib.patch
-Patch2:		pl-5.4.6-visibilityabuse.patch
+Patch0:         pl-5.4.6-rpath.patch
+Patch1:         pl-5.6.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:	libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
+BuildRequires:  xorg-x11-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -29,9 +30,8 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .vis
 (
    mkdir doc-install
    cd doc-install
@@ -77,6 +77,18 @@
 %{_bindir}/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
+- new version 5.6.0
+
+* Wed Jun 22 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.7-1
+- new version 5.4.7
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.4.6-9
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Feb 23 2005 David Woodhouse <dwmw2 at infradead.org> - 5.4.6-7
 - Fix visibility abuse. This may well fix x86_64 too, so re-enable that.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 02:16:37 -0000	1.3
+++ sources	2 Jan 2006 22:25:57 -0000	1.4
@@ -1,3 +1,3 @@
-e93a7d6ed002750f38dd3ae83f6e0fa8  HTMLmanual.tar.gz
-f4977a5b24e07f3ef67d805c1773dc2c  pl-5.4.6.tar.gz
-fbe3c4102f897fbfcadeb1cc94603dfa  userguide.html.tgz
+6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
+ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
+72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 22:29:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:29:21 -0500
Subject: rpms/pl/devel pl-5.6.0-multilib.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 pl.spec, 1.18, 1.19 sources, 1.4, 1.5
Message-ID: <200601022229.k02MTrp1021259@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21235

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.0-multilib.patch 
Log Message:
new version 5.6.0

pl-5.6.0-multilib.patch:

--- NEW FILE pl-5.6.0-multilib.patch ---
--- pl-5.6.0/src/rc/Makefile.in.multilib	2006-01-02 22:43:19.000000000 +0100
+++ pl-5.6.0/src/rc/Makefile.in	2006-01-02 22:43:46.000000000 +0100
@@ -18,7 +18,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=$(exec_prefix)/bin
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 man_prefix=$(prefix)/man
 mansec=1
 lmansec=3
--- pl-5.6.0/src/configure.multilib	2006-01-02 22:41:36.000000000 +0100
+++ pl-5.6.0/src/configure	2006-01-02 22:41:59.000000000 +0100
@@ -2546,7 +2546,7 @@
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
-PLBASE=$prefix/lib/$PL-$PLVERSION
+PLBASE=$libdir/$PL-$PLVERSION
 
 
 for ac_prog in gmake make
--- pl-5.6.0/src/Makefile.in.multilib	2006-01-02 22:42:12.000000000 +0100
+++ pl-5.6.0/src/Makefile.in	2006-01-02 22:42:46.000000000 +0100
@@ -46,7 +46,8 @@
 PLVERSION=@PLVERSION@
 PL=@PL@@RT@
 PLV=@PL@@RT at -@PLVERSION@
-PLBASE=$(prefix)/lib/@PL@@RT at -@PLVERSION@
+libdir=@libdir@
+PLBASE=$(libdir)/@PL@@RT at -@PLVERSION@
 BOOTFILE=@BOOTFILE@
 
 CC=@CC@
--- pl-5.6.0/packages/Makefile.in.multilib	2006-01-02 22:39:53.000000000 +0100
+++ pl-5.6.0/packages/Makefile.in	2006-01-02 22:41:19.000000000 +0100
@@ -30,7 +30,8 @@
 bindir=@bindir@
 PL=@PL@@RT@
 PLVERSION=@PLVERSION@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 PKGDOC=$(PLBASE)/doc/packages
 PLLIBS=@LIBS@
 PLARCH=@ARCH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 19:48:03 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:29:20 -0000	1.5
@@ -1,3 +1,3 @@
-pl-5.4.7.tar.gz
 HTMLmanual.tar.gz
+pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pl.spec	15 Nov 2005 19:18:21 -0000	1.18
+++ pl.spec	2 Jan 2006 22:29:20 -0000	1.19
@@ -1,22 +1,30 @@
 Name:		pl
-Version:	5.4.7
-Release:	3%{?dist}
+Version:	5.6.0
+Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
-Patch0:		pl-5.4.6-rpath.patch
-Patch1:		pl-5.4.6-multilib.patch
-Patch2:		pl-5.4.6-visibilityabuse.patch
-Patch3:		pl-5.4.7-gcc4fix.patch
+Patch0:         pl-5.4.6-rpath.patch
+Patch1:         pl-5.6.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:	libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
+Buildrequires:  freetype-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
 #ExcludeArch: x86_64
@@ -33,8 +41,6 @@
 %setup -q
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .visibilityabuse
-%patch3 -p1 -b .gcc4fix
 (
    mkdir doc-install
    cd doc-install
@@ -80,8 +86,11 @@
 %{_bindir}/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
+- new version 5.6.0
+
 * Wed Jun 22 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.7-1
-- New Version 5.4.7
+- new version 5.4.7
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.4.6-9
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2005 19:48:03 -0000	1.4
+++ sources	2 Jan 2006 22:29:20 -0000	1.5
@@ -1,3 +1,3 @@
-5c57c9a752bd3c6f56e4ae506ab23726  pl-5.4.7.tar.gz
-e93a7d6ed002750f38dd3ae83f6e0fa8  HTMLmanual.tar.gz
-fbe3c4102f897fbfcadeb1cc94603dfa  userguide.html.tgz
+6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
+ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
+72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 22:41:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:41:57 -0500
Subject: rpms/tkcvs/FC-4 tkcvs.spec,1.11,1.12
Message-ID: <200601022242.k02MgUM8021400@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21381

Modified Files:
	tkcvs.spec 
Log Message:
new version 8.0


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tkcvs.spec	13 Aug 2005 17:58:07 -0000	1.11
+++ tkcvs.spec	2 Jan 2006 22:41:57 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	7.2.4
+Version:	8.0
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,25 +7,40 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
 
 %description
-TkCVS is a Tcl/Tk-based graphical interface to the CVS configuration
-management system.  It displays the status of the files in the current
-working directory, and provides buttons and menus to execute CVS
-commands on the selected files. TkDiff is included for browsing and
-merging your changes.
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. TkDiff
+is included for browsing and merging your changes.
+
+TkCVS shows the status of the files in the current working directory,
+and has tools for tagging, merging, importing, exporting, checking
+in/out, and other user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the
+repository tree is browsed like an ordinary file tree. For CVS, the
+CVSROOT/modules file is read. TkCVS extends CVS with a method to
+produce a "user friendly" listing of modules. This requires special
+comments in the CVSROOT/modules file.
+
+Although TkCVS now supports Subversion, it will still work happily
+without it in your CVS directories. It didn't abandon CVS, it just
+grew some new capabilities.
+
 
 %prep
-%setup -q -n tkcvs_7_2_4
+%setup -q -n tkcvs_8_0
+
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
 perl -pi -e 's|\[file join \$TclRoot tkcvs bitmaps\]|\[file join \$TCDIR bitmaps\]|' tkcvs/tkcvs.tcl
 
+
 %install
 install -d ${RPM_BUILD_ROOT}%{_datadir}
 install -d ${RPM_BUILD_ROOT}%{_bindir}
@@ -38,11 +53,12 @@
 install -m 0755 tkdiff ${RPM_BUILD_ROOT}%{_bindir}
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
-cp -fr bitmaps ${RPM_BUILD_ROOT}%{_datadir}/tkcvs
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
@@ -50,12 +66,16 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
+- new version 8.0
+
 * Sat Aug 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.4
-- New Version 2.7.4
+- new version 7.2.4
 
 * Tue Jul  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.3-1
-- New Version 2.7.3
+- new version 7.2.3
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan  2 22:44:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:44:03 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore,1.3,1.4 tkcvs.spec,1.8,1.9
Message-ID: <200601022244.k02MiaQx021515@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21473/FC-3

Modified Files:
	.cvsignore tkcvs.spec 
Log Message:
new version 8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:23:15 -0000	1.3
+++ .cvsignore	2 Jan 2006 22:44:03 -0000	1.4
@@ -1 +1 @@
-tkcvs_7_2_2.tar.gz
+tkcvs_7_2_4.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tkcvs.spec	13 Aug 2005 17:58:53 -0000	1.8
+++ tkcvs.spec	2 Jan 2006 22:44:03 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	7.2.4
+Version:	8.0
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,20 +7,34 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
 
 %description
-TkCVS is a Tcl/Tk-based graphical interface to the CVS configuration
-management system.  It displays the status of the files in the current
-working directory, and provides buttons and menus to execute CVS
-commands on the selected files. TkDiff is included for browsing and
-merging your changes.
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. TkDiff
+is included for browsing and merging your changes.
+
+TkCVS shows the status of the files in the current working directory,
+and has tools for tagging, merging, importing, exporting, checking
+in/out, and other user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the
+repository tree is browsed like an ordinary file tree. For CVS, the
+CVSROOT/modules file is read. TkCVS extends CVS with a method to
+produce a "user friendly" listing of modules. This requires special
+comments in the CVSROOT/modules file.
+
+Although TkCVS now supports Subversion, it will still work happily
+without it in your CVS directories. It didn't abandon CVS, it just
+grew some new capabilities.
+
 
 %prep
-%setup -q -n tkcvs_7_2_4
+%setup -q -n tkcvs_8_0
+
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
@@ -38,7 +52,6 @@
 install -m 0755 tkdiff ${RPM_BUILD_ROOT}%{_bindir}
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
-cp -fr bitmaps ${RPM_BUILD_ROOT}%{_datadir}/tkcvs
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,11 +64,14 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
+- new version 8.0
+
 * Sat Aug 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.4
-- New Version 2.7.4
+- new version 7.2.4
 
 * Tue Jul  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.3-1
-- New Version 2.7.3
+- new version 7.2.3
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan  2 22:44:09 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:44:09 -0500
Subject: rpms/tkcvs/devel .cvsignore,1.4,1.5 tkcvs.spec,1.11,1.12
Message-ID: <200601022244.k02Mif4a021522@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21473/devel

Modified Files:
	.cvsignore tkcvs.spec 
Log Message:
new version 8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Jul 2005 16:51:32 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:44:09 -0000	1.5
@@ -1 +1 @@
-tkcvs_7_2_3.tar.gz
+tkcvs_7_2_4.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tkcvs.spec	13 Aug 2005 17:59:07 -0000	1.11
+++ tkcvs.spec	2 Jan 2006 22:44:09 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	7.2.4
+Version:	8.0
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,20 +7,34 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
 
 %description
-TkCVS is a Tcl/Tk-based graphical interface to the CVS configuration
-management system.  It displays the status of the files in the current
-working directory, and provides buttons and menus to execute CVS
-commands on the selected files. TkDiff is included for browsing and
-merging your changes.
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. TkDiff
+is included for browsing and merging your changes.
+
+TkCVS shows the status of the files in the current working directory,
+and has tools for tagging, merging, importing, exporting, checking
+in/out, and other user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the
+repository tree is browsed like an ordinary file tree. For CVS, the
+CVSROOT/modules file is read. TkCVS extends CVS with a method to
+produce a "user friendly" listing of modules. This requires special
+comments in the CVSROOT/modules file.
+
+Although TkCVS now supports Subversion, it will still work happily
+without it in your CVS directories. It didn't abandon CVS, it just
+grew some new capabilities.
+
 
 %prep
-%setup -q -n tkcvs_7_2_4
+%setup -q -n tkcvs_8_0
+
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
@@ -38,7 +52,6 @@
 install -m 0755 tkdiff ${RPM_BUILD_ROOT}%{_bindir}
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
-cp -fr bitmaps ${RPM_BUILD_ROOT}%{_datadir}/tkcvs
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,11 +64,14 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
+- new version 8.0
+
 * Sat Aug 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.4
-- New Version 2.7.4
+- new version 7.2.4
 
 * Tue Jul  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.3-1
-- New Version 2.7.3
+- new version 7.2.3
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan  2 22:48:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:48:21 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tkcvs.spec,
	1.9, 1.10
Message-ID: <200601022248.k02MmslC021642@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21584/FC-3

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2006 22:44:03 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:48:21 -0000	1.5
@@ -1 +1 @@
-tkcvs_7_2_4.tar.gz
+tkcvs_8_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Aug 2005 17:58:53 -0000	1.4
+++ sources	2 Jan 2006 22:48:21 -0000	1.5
@@ -1 +1 @@
-d5fc8adc92c197c9662512a698de62d0  tkcvs_7_2_4.tar.gz
+6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tkcvs.spec	2 Jan 2006 22:44:03 -0000	1.9
+++ tkcvs.spec	2 Jan 2006 22:48:21 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		tkcvs
 Version:	8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	TkCVS and TkDiff
 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:48:27 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:48:27 -0500
Subject: rpms/tkcvs/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tkcvs.spec, 
	1.12, 1.13
Message-ID: <200601022248.k02MmxvN021650@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21584/FC-4

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Aug 2005 17:58:07 -0000	1.5
+++ .cvsignore	2 Jan 2006 22:48:27 -0000	1.6
@@ -1 +1 @@
-tkcvs_7_2_4.tar.gz
+tkcvs_8_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Aug 2005 17:58:07 -0000	1.5
+++ sources	2 Jan 2006 22:48:27 -0000	1.6
@@ -1 +1 @@
-d5fc8adc92c197c9662512a698de62d0  tkcvs_7_2_4.tar.gz
+6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tkcvs.spec	2 Jan 2006 22:41:57 -0000	1.12
+++ tkcvs.spec	2 Jan 2006 22:48:27 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		tkcvs
 Version:	8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	TkCVS and TkDiff
 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:48:33 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:48:33 -0500
Subject: rpms/tkcvs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tkcvs.spec, 
	1.12, 1.13
Message-ID: <200601022249.k02Mn5kY021656@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21584/devel

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:44:09 -0000	1.5
+++ .cvsignore	2 Jan 2006 22:48:33 -0000	1.6
@@ -1 +1 @@
-tkcvs_7_2_4.tar.gz
+tkcvs_8_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Aug 2005 17:59:07 -0000	1.5
+++ sources	2 Jan 2006 22:48:33 -0000	1.6
@@ -1 +1 @@
-d5fc8adc92c197c9662512a698de62d0  tkcvs_7_2_4.tar.gz
+6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tkcvs.spec	2 Jan 2006 22:44:09 -0000	1.12
+++ tkcvs.spec	2 Jan 2006 22:48:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		tkcvs
 Version:	8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	TkCVS and TkDiff
 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:53:37 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:53:37 -0500
Subject: rpms/pl/devel pl.spec,1.19,1.20
Message-ID: <200601022254.k02Ms9ww021816@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21796

Modified Files:
	pl.spec 
Log Message:



Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pl.spec	2 Jan 2006 22:29:20 -0000	1.19
+++ pl.spec	2 Jan 2006 22:53:37 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		pl
 Version:	5.6.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -23,6 +23,7 @@
 BuildRequires:  libXext-devel
 BuildRequires:  libXft-devel
 BuildRequires:  libXmu-devel
+BuildRequires:  libXpm-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:04:15 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:04:15 -0500
Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.1,1.2
Message-ID: <200601022304.k02N4p4Y023514@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23496

Modified Files:
	nautilus-actions.spec 
Log Message:
Add dist tag



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-actions.spec	2 Jan 2006 15:21:52 -0000	1.1
+++ nautilus-actions.spec	2 Jan 2006 23:04:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5
+Release: 5%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8



From fedora-extras-commits at redhat.com  Mon Jan  2 23:06:35 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:06:35 -0500
Subject: rpms/nautilus-actions/FC-4 nautilus-actions.spec,1.1,1.2
Message-ID: <200601022307.k02N7ERY023575@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23558

Modified Files:
	nautilus-actions.spec 
Log Message:
Add dist tag



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/nautilus-actions.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-actions.spec	2 Jan 2006 15:21:52 -0000	1.1
+++ nautilus-actions.spec	2 Jan 2006 23:06:34 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5
+Release: 5%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8



From fedora-extras-commits at redhat.com  Mon Jan  2 23:08:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:08:26 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.1,1.2
Message-ID: <200601022309.k02N9JNV023636@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23619

Modified Files:
	nautilus-actions.spec 
Log Message:
Add dist tag



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-actions.spec	2 Jan 2006 15:21:52 -0000	1.1
+++ nautilus-actions.spec	2 Jan 2006 23:08:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5
+Release: 5%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8



From fedora-extras-commits at redhat.com  Mon Jan  2 23:14:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 18:14:24 -0500
Subject: rpms/plt-scheme/devel plt-scheme.spec,1.20,1.21
Message-ID: <200601022314.k02NEuFL023731@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23714

Modified Files:
	plt-scheme.spec 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plt-scheme.spec	20 Dec 2005 23:36:16 -0000	1.20
+++ plt-scheme.spec	2 Jan 2006 23:14:23 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        300
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -29,6 +29,8 @@
 BuildRequires:	mesa-libGLU-devel
 BuildRequires:	xorg-x11-xbitmaps
 BuildRequires:	desktop-file-utils
+BuildRequires:  cairo-devel
+BuildRequires:  pkgconfig
 Obsoletes:	plt, drscheme
 Provides:	plt, drscheme, mzscheme, mred, mrflow
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:27:24 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:27:24 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.2,1.3
Message-ID: <200601022327.k02NRu9b023820@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23796

Modified Files:
	nautilus-actions.spec 
Log Message:
Add --with-nautilus-extdir configure option



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-actions.spec	2 Jan 2006 23:08:26 -0000	1.2
+++ nautilus-actions.spec	2 Jan 2006 23:27:23 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -23,7 +23,8 @@
 %setup -q
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool
+%configure --disable-schemas-install --enable-commandline-tool  \
+           --with-nautilus-extdir=%{_libdir}/nautilus/extensions-1.0
 make %{?_smp_mflags} 
 
 %install
@@ -84,6 +85,9 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Mon Jan 2 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-6
+- Add nautilus extensions dir to configure arguments
+
 * Sun Jan 1 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-5
 - Remove libXdmcp-devel as BR, nautilus now takkes care of it
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:30:06 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:30:06 -0500
Subject: rpms/nautilus-actions/FC-4 nautilus-actions.spec,1.2,1.3
Message-ID: <200601022330.k02NUcaa023881@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864

Modified Files:
	nautilus-actions.spec 
Log Message:
Add -with-nautilus-extdir to configure options



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/nautilus-actions.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-actions.spec	2 Jan 2006 23:06:34 -0000	1.2
+++ nautilus-actions.spec	2 Jan 2006 23:30:05 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -23,7 +23,8 @@
 %setup -q
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool
+%configure --disable-schemas-install --enable-commandline-tool \
+          --with-nautilus-extdir=%{_libdir}/nautilus/extensions-1.0 
 make %{?_smp_mflags} 
 
 %install
@@ -84,6 +85,9 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Mon Jan 2 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-6
+- Add nautilus extensions dir to configure arguments
+
 * Sun Jan 1 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-5
 - Remove libXdmcp-devel as BR, nautilus now takkes care of it
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:32:22 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon,  2 Jan 2006 18:32:22 -0500
Subject: rpms/xfce4-battery-plugin/FC-4 xfce4-battery-plugin.spec,1.1,1.2
Message-ID: <200601022332.k02NWsQ6023947@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23930

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
add libxfcegui4-devel buildreq and fix %defattr


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-4/xfce4-battery-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-battery-plugin.spec	15 Dec 2005 03:10:03 -0000	1.1
+++ xfce4-battery-plugin.spec	2 Jan 2006 23:32:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,9 +8,9 @@
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 Source1:	GPL
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -34,11 +34,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
+- Add libxfcegui4-devel BuildReqs.
+- Fix %defattr.
+
 * Sat Nov 19 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
 - Use %{?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).



From fedora-extras-commits at redhat.com  Mon Jan  2 23:33:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon,  2 Jan 2006 18:33:36 -0500
Subject: rpms/xfce4-battery-plugin/FC-3 xfce4-battery-plugin.spec,1.1,1.2
Message-ID: <200601022334.k02NY8EL024008@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23991

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
add libxfcegui4-devel buildreq and fix %defattr


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-3/xfce4-battery-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-battery-plugin.spec	15 Dec 2005 03:10:03 -0000	1.1
+++ xfce4-battery-plugin.spec	2 Jan 2006 23:33:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,9 +8,9 @@
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 Source1:	GPL
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -34,11 +34,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
+- Add libxfcegui4-devel BuildReqs.
+- Fix %defattr.
+
 * Sat Nov 19 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
 - Use %{?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).



From fedora-extras-commits at redhat.com  Tue Jan  3 03:48:27 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon,  2 Jan 2006 22:48:27 -0500
Subject: rpms/linkchecker import.log,1.2,1.3
Message-ID: <200601030349.k033n0Ed031189@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31156

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.2-4 on branch devel from linkchecker-3.2-4.src.rpm





From fedora-extras-commits at redhat.com  Tue Jan  3 03:53:00 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon,  2 Jan 2006 22:53:00 -0500
Subject: rpms/linkchecker import.log,1.3,1.4
Message-ID: <200601030353.k033rW09031288@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31244

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.2-5 on branch devel from linkchecker-3.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Jan 2006 03:48:27 -0000	1.3
+++ import.log	3 Jan 2006 03:52:59 -0000	1.4
@@ -1,2 +1,3 @@
 linkchecker-3_2-3:HEAD:linkchecker-3.2-3.src.rpm:1132802837
 linkchecker-3_2-4:HEAD:linkchecker-3.2-4.src.rpm:1136260100
+linkchecker-3_2-5:HEAD:linkchecker-3.2-5.src.rpm:1136260374



From fedora-extras-commits at redhat.com  Tue Jan  3 03:53:05 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon,  2 Jan 2006 22:53:05 -0500
Subject: rpms/linkchecker/devel linkchecker.spec,1.1,1.2
Message-ID: <200601030353.k033rcK7031295@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31244/devel

Modified Files:
	linkchecker.spec 
Log Message:
auto-import linkchecker-3.2-5 on branch devel from linkchecker-3.2-5.src.rpm


Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linkchecker.spec	24 Nov 2005 03:27:27 -0000	1.1
+++ linkchecker.spec	3 Jan 2006 03:53:05 -0000	1.2
@@ -4,7 +4,7 @@
 Summary: Check HTML documents for broken links
 Name: linkchecker
 Version: 3.2
-Release: 3
+Release: 5
 License: GPL
 Group: Development/Tools
 Source: http://dl.sf.net/linkchecker/linkchecker-3.2.tar.gz
@@ -12,6 +12,8 @@
 Url: http://linkchecker.sourceforge.net/
 BuildRequires: python-devel
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+# Do not have one of these to test on:
+ExcludeArch: x86_64
 
 %description
 Linkchecker is a simple script that checks HTML documents for broken links.
@@ -67,6 +69,12 @@
 %doc TODO doc/ cgi/lconline/ test/ README LICENSE
 
 %changelog
+* Sun Jan 02 2006 W. Michael Petullo <mike[at]flyn.org> - 3.2-4
+   - Bump release number to re-import.
+
+* Sun Jan 02 2006 W. Michael Petullo <mike[at]flyn.org> - 3.2-4
+   - ExcludeArch: x86_64.  I don't have one to test on.
+
 * Sun Oct 23 2005 W. Michael Petullo <mike[at]flyn.org> - 3.2-3
    - %dir appropriate directories.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 04:57:26 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  2 Jan 2006 23:57:26 -0500
Subject: rpms/deskbar-applet/devel .cvsignore, 1.6, 1.7 deskbar-applet.spec, 
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200601030457.k034vxpp000706@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv685

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Dec 2005 04:43:38 -0000	1.6
+++ .cvsignore	3 Jan 2006 04:57:26 -0000	1.7
@@ -1 +1 @@
-deskbar-applet-0.8.6.1.tar.bz2
+deskbar-applet-0.8.7.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- deskbar-applet.spec	13 Dec 2005 04:43:38 -0000	1.11
+++ deskbar-applet.spec	3 Jan 2006 04:57:26 -0000	1.12
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        0.8.6.1
+Version:        0.8.7
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -59,6 +59,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.7-1
+- Upstream update
+
 * Mon Dec 12 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.6.1-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Dec 2005 04:43:38 -0000	1.6
+++ sources	3 Jan 2006 04:57:26 -0000	1.7
@@ -1 +1 @@
-6a4d4169cdb568f5555e3c824a856637  deskbar-applet-0.8.6.1.tar.bz2
+6ecb74c123b66aa2874d88b5b7cfbaf6  deskbar-applet-0.8.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 05:04:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  3 Jan 2006 00:04:43 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet-0.5.0-fedorabz.patch, 1.1, 
	NONE
Message-ID: <200601030504.k0354jZH002369@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2360

Removed Files:
	deskbar-applet-0.5.0-fedorabz.patch 
Log Message:
Obsolete patch


--- deskbar-applet-0.5.0-fedorabz.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 07:32:41 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  3 Jan 2006 02:32:41 -0500
Subject: rpms/ortp/devel ortp-0.8.1-Werror.patch, NONE, 1.1 .cvsignore, 1.3, 
	1.4 ortp.spec, 1.6, 1.7 sources, 1.3,
	1.4 ortp-0.7.1-Werror.patch, 1.1, NONE
Message-ID: <200601030733.k037XEnd005940@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914

Modified Files:
	.cvsignore ortp.spec sources 
Added Files:
	ortp-0.8.1-Werror.patch 
Removed Files:
	ortp-0.7.1-Werror.patch 
Log Message:
Upstream update

ortp-0.8.1-Werror.patch:

--- NEW FILE ortp-0.8.1-Werror.patch ---
--- ortp-0.8.1/configure.Werror	2006-01-03 02:03:58.000000000 -0500
+++ ortp-0.8.1/configure	2006-01-03 02:04:14.000000000 -0500
@@ -21310,10 +21310,6 @@
 _ACEOF
 
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2005 23:59:14 -0000	1.3
+++ .cvsignore	3 Jan 2006 07:32:41 -0000	1.4
@@ -1 +1 @@
-ortp-0.7.1.tar.gz
+ortp-0.8.1.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ortp.spec	22 Dec 2005 20:18:20 -0000	1.6
+++ ortp.spec	3 Jan 2006 07:32:41 -0000	1.7
@@ -1,13 +1,13 @@
 Name:           ortp
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.linphone.org/ortp/
 Source0:        http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz
-Patch0:         ortp-0.7.1-Werror.patch
+Patch0:         ortp-0.8.1-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.0.0
@@ -53,6 +53,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.1-1
+- Upstream update
+
 * Thu Dec 22 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.1-2
 - Added ortp.pc to -devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2005 23:59:14 -0000	1.3
+++ sources	3 Jan 2006 07:32:41 -0000	1.4
@@ -1 +1 @@
-e69ba3f5a2ac76e3b6117826d0c536b2  ortp-0.7.1.tar.gz
+5d8a8da638aec3a80214d64e0c7929af  ortp-0.8.1.tar.gz


--- ortp-0.7.1-Werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 08:44:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 03:44:50 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.9, 
	1.10 sources, 1.7, 1.8
Message-ID: <200601030845.k038jNV8007796@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7738/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 08:09:18 -0000	1.7
+++ .cvsignore	3 Jan 2006 08:44:50 -0000	1.8
@@ -1 +1 @@
-rxvt-unicode-6.1.tar.bz2
+rxvt-unicode-6.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rxvt-unicode.spec	28 Dec 2005 08:09:18 -0000	1.9
+++ rxvt-unicode.spec	3 Jan 2006 08:44:50 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.2-1
+- version upgrade
+
 * Wed Dec 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 08:09:18 -0000	1.7
+++ sources	3 Jan 2006 08:44:50 -0000	1.8
@@ -1 +1 @@
-9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2
+0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 08:44:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 03:44:56 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.9, 
	1.10 sources, 1.7, 1.8
Message-ID: <200601030845.k038jTq5007801@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7738/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 08:09:40 -0000	1.7
+++ .cvsignore	3 Jan 2006 08:44:56 -0000	1.8
@@ -1 +1 @@
-rxvt-unicode-6.1.tar.bz2
+rxvt-unicode-6.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rxvt-unicode.spec	28 Dec 2005 08:09:40 -0000	1.9
+++ rxvt-unicode.spec	3 Jan 2006 08:44:56 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.2-1
+- version upgrade
+
 * Wed Dec 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 08:09:40 -0000	1.7
+++ sources	3 Jan 2006 08:44:56 -0000	1.8
@@ -1 +1 @@
-9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2
+0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 08:45:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 03:45:02 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200601030845.k038jYoT007806@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7738/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 08:09:46 -0000	1.7
+++ .cvsignore	3 Jan 2006 08:45:02 -0000	1.8
@@ -1 +1 @@
-rxvt-unicode-6.1.tar.bz2
+rxvt-unicode-6.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rxvt-unicode.spec	28 Dec 2005 08:09:46 -0000	1.12
+++ rxvt-unicode.spec	3 Jan 2006 08:45:02 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.2-1 
+- version upgrade
+
 * Wed Dec 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 08:09:46 -0000	1.7
+++ sources	3 Jan 2006 08:45:02 -0000	1.8
@@ -1 +1 @@
-9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2
+0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 10:03:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 05:03:13 -0500
Subject: rpms/centericq/FC-3 centericq-4.21.0-kkstrtext.patch, NONE,
	1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.9, 1.10
Message-ID: <200601031003.k03A3keI012111@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/centericq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10431/FC-3

Modified Files:
	centericq.spec 
Added Files:
	centericq-4.21.0-kkstrtext.patch centericq-4.21.0.msn.patch 
Log Message:
- fix more security suff
- fix libmsn


centericq-4.21.0-kkstrtext.patch:

--- NEW FILE centericq-4.21.0-kkstrtext.patch ---
--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h	2004-11-17 23:00:38.000000000 +0000
+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h	2005-12-13 18:34:56.308723728 +0000
@@ -87,7 +87,7 @@
     { \
 	va_list vgs__ap; char vgs__buf[1024]; \
 	va_start(vgs__ap, fmt); \
-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
+	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
 	va_end(vgs__ap); \
     }

centericq-4.21.0.msn.patch:

--- NEW FILE centericq-4.21.0.msn.patch ---
diff -NPrc centericq-4.21.0-org/aclocal.m4 centericq-4.21.0/aclocal.m4
*** centericq-4.21.0-org/aclocal.m4	2005-09-02 16:46:00.000000000 +0200
--- centericq-4.21.0/aclocal.m4	2005-11-07 16:43:58.000000000 +0100
***************
*** 1,1146 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! 
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
! 
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
! dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
! dnl require excessive bracketing.
! ifdef([AC_HELP_STRING],
! [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
! [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
  
! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
! dnl to access previously installed libraries. The basic assumption is that
! dnl a user will want packages to use other packages he previously installed
! dnl with the same --prefix option.
! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
! dnl libraries, but is otherwise very convenient.
! AC_DEFUN([AC_LIB_PREFIX],
! [
!   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
!   AC_REQUIRE([AC_PROG_CC])
!   AC_REQUIRE([AC_CANONICAL_HOST])
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   dnl By default, look in $includedir and $libdir.
!   use_additional=yes
!   AC_LIB_WITH_FINAL_PREFIX([
!     eval additional_includedir=\"$includedir\"
!     eval additional_libdir=\"$libdir\"
!   ])
!   AC_LIB_ARG_WITH([lib-prefix],
! [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
!   --without-lib-prefix    don't search for libraries in includedir and libdir],
! [
!     if test "X$withval" = "Xno"; then
!       use_additional=no
!     else
!       if test "X$withval" = "X"; then
!         AC_LIB_WITH_FINAL_PREFIX([
!           eval additional_includedir=\"$includedir\"
!           eval additional_libdir=\"$libdir\"
!         ])
!       else
!         additional_includedir="$withval/include"
!         additional_libdir="$withval/lib"
!       fi
!     fi
! ])
!   if test $use_additional = yes; then
!     dnl Potentially add $additional_includedir to $CPPFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/include,
!     dnl   2. if it's already present in $CPPFLAGS,
!     dnl   3. if it's /usr/local/include and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_includedir" != "X/usr/include"; then
!       haveit=
!       for x in $CPPFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-I$additional_includedir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_includedir" = "X/usr/local/include"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux* | gnu* | k*bsd*-gnu) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_includedir"; then
!             dnl Really add $additional_includedir to $CPPFLAGS.
!             CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
!           fi
!         fi
!       fi
!     fi
!     dnl Potentially add $additional_libdir to $LDFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/lib,
!     dnl   2. if it's already present in $LDFLAGS,
!     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_libdir" != "X/usr/lib"; then
!       haveit=
!       for x in $LDFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-L$additional_libdir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_libdir" = "X/usr/local/lib"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux*) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_libdir"; then
!             dnl Really add $additional_libdir to $LDFLAGS.
!             LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
!           fi
!         fi
!       fi
!     fi
!   fi
! ])
  
! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
! dnl acl_final_exec_prefix, containing the values to which $prefix and
! dnl $exec_prefix will expand at the end of the configure script.
! AC_DEFUN([AC_LIB_PREPARE_PREFIX],
  [
!   dnl Unfortunately, prefix and exec_prefix get only finally determined
!   dnl at the end of configure.
!   if test "X$prefix" = "XNONE"; then
!     acl_final_prefix="$ac_default_prefix"
!   else
!     acl_final_prefix="$prefix"
!   fi
!   if test "X$exec_prefix" = "XNONE"; then
!     acl_final_exec_prefix='${prefix}'
!   else
!     acl_final_exec_prefix="$exec_prefix"
    fi
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-   prefix="$acl_save_prefix"
- ])
- 
- dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
- dnl variables prefix and exec_prefix bound to the values they will have
- dnl at the end of the configure script.
- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- [
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   acl_save_exec_prefix="$exec_prefix"
-   exec_prefix="$acl_final_exec_prefix"
-   $1
-   exec_prefix="$acl_save_exec_prefix"
-   prefix="$acl_save_prefix"
  ])
  
! # lib-link.m4 serial 6 (gettext-0.14.3)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! AC_PREREQ(2.50)
  
! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
! dnl the libraries corresponding to explicit and implicit dependencies.
! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
! dnl augments the CPPFLAGS variable.
! AC_DEFUN([AC_LIB_LINKFLAGS],
  [
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   AC_REQUIRE([AC_LIB_RPATH])
!   define([Name],[translit([$1],[./-], [___])])
!   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
!                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
!   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
!     AC_LIB_LINKFLAGS_BODY([$1], [$2])
!     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
!     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
!     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
    ])
-   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
[...78903 lines suppressed...]
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
+ 	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
+ 	  empty_fix=; \
+ 	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test ! -f $$subdir/TAGS || \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! 	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! 	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
! 	fi
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
! 
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	    distdir=`$(am__cd) $(distdir) && pwd`; \
! 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! 	    (cd $$subdir && \
! 	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
! 	        distdir) \
  	      || exit 1; \
  	  fi; \
  	done
  check-am: all-am
  check: check-recursive
! all-am: Makefile $(PROGRAMS)
! installdirs: installdirs-recursive
! installdirs-am:
! 	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
! install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
+ uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
+ installcheck: installcheck-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
  clean-generic:
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
! 	@echo "This command is intended for maintainers to use"
! 	@echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
  
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  
! distclean: distclean-recursive
! 	-rm -rf ./$(DEPDIR)
! 	-rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! 	distclean-tags
  
! dvi: dvi-recursive
! 
! dvi-am:
  
! html: html-recursive
  
! info: info-recursive
  
! info-am:
! 
! install-data-am:
! 
! install-exec-am: install-binPROGRAMS
! 
! install-info: install-info-recursive
! 
! install-man:
! 
! installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+ 
+ pdf: pdf-recursive
+ 
+ pdf-am:
+ 
+ ps: ps-recursive
+ 
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
! uninstall-info: uninstall-info-recursive
  
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ 	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ 	ctags-recursive distclean distclean-compile distclean-generic \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-exec install-exec-am \
+ 	install-info install-info-am install-man install-strip \
+ 	installcheck installcheck-am installdirs installdirs-am \
+ 	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-info-am
  
  # 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.
diff -NPrc centericq-4.21.0-org/stamp-h.in centericq-4.21.0/stamp-h.in
*** centericq-4.21.0-org/stamp-h.in	2005-09-02 16:46:28.000000000 +0200
--- centericq-4.21.0/stamp-h.in	1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- timestamp
--- 0 ----


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- centericq.spec	30 Nov 2005 21:19:20 -0000	1.9
+++ centericq.spec	3 Jan 2006 10:02:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -17,6 +17,11 @@
 # see redhat bugzilla #174611
 Patch4:         centericq-4.21.0-icq-short-read.diff.bz2
 Patch5:         centericq-4.21.0-memory-handling.diff.bz2
+# and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml 
+# and redhat bugzilla #176451
+Patch6:         centericq-4.21.0-kkstrtext.patch
+# Fix libmsn 
+Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -38,6 +43,8 @@
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch100 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -65,8 +72,14 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
-
+# we don't want that
+%exclude %{_includedir}/msn
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-3
+- Fix more security related stuff
+- Fix libmsn
+
 * Wed Nov 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.21.0-2
 - fix CVE-2005-3694 see (#174611)



From fedora-extras-commits at redhat.com  Tue Jan  3 10:03:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 05:03:19 -0500
Subject: rpms/centericq/FC-4 centericq-4.21.0-kkstrtext.patch, NONE,
	1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.19, 1.20
Message-ID: <200601031003.k03A3qgf012114@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/centericq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10431/FC-4

Modified Files:
	centericq.spec 
Added Files:
	centericq-4.21.0-kkstrtext.patch centericq-4.21.0.msn.patch 
Log Message:
- fix more security suff
- fix libmsn


centericq-4.21.0-kkstrtext.patch:

--- NEW FILE centericq-4.21.0-kkstrtext.patch ---
--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h	2004-11-17 23:00:38.000000000 +0000
+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h	2005-12-13 18:34:56.308723728 +0000
@@ -87,7 +87,7 @@
     { \
 	va_list vgs__ap; char vgs__buf[1024]; \
 	va_start(vgs__ap, fmt); \
-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
+	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
 	va_end(vgs__ap); \
     }

centericq-4.21.0.msn.patch:

--- NEW FILE centericq-4.21.0.msn.patch ---
diff -NPrc centericq-4.21.0-org/aclocal.m4 centericq-4.21.0/aclocal.m4
*** centericq-4.21.0-org/aclocal.m4	2005-09-02 16:46:00.000000000 +0200
--- centericq-4.21.0/aclocal.m4	2005-11-07 16:43:58.000000000 +0100
***************
*** 1,1146 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! 
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
! 
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
! dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
! dnl require excessive bracketing.
! ifdef([AC_HELP_STRING],
! [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
! [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
  
! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
! dnl to access previously installed libraries. The basic assumption is that
! dnl a user will want packages to use other packages he previously installed
! dnl with the same --prefix option.
! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
! dnl libraries, but is otherwise very convenient.
! AC_DEFUN([AC_LIB_PREFIX],
! [
!   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
!   AC_REQUIRE([AC_PROG_CC])
!   AC_REQUIRE([AC_CANONICAL_HOST])
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   dnl By default, look in $includedir and $libdir.
!   use_additional=yes
!   AC_LIB_WITH_FINAL_PREFIX([
!     eval additional_includedir=\"$includedir\"
!     eval additional_libdir=\"$libdir\"
!   ])
!   AC_LIB_ARG_WITH([lib-prefix],
! [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
!   --without-lib-prefix    don't search for libraries in includedir and libdir],
! [
!     if test "X$withval" = "Xno"; then
!       use_additional=no
!     else
!       if test "X$withval" = "X"; then
!         AC_LIB_WITH_FINAL_PREFIX([
!           eval additional_includedir=\"$includedir\"
!           eval additional_libdir=\"$libdir\"
!         ])
!       else
!         additional_includedir="$withval/include"
!         additional_libdir="$withval/lib"
!       fi
!     fi
! ])
!   if test $use_additional = yes; then
!     dnl Potentially add $additional_includedir to $CPPFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/include,
!     dnl   2. if it's already present in $CPPFLAGS,
!     dnl   3. if it's /usr/local/include and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_includedir" != "X/usr/include"; then
!       haveit=
!       for x in $CPPFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-I$additional_includedir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_includedir" = "X/usr/local/include"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux* | gnu* | k*bsd*-gnu) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_includedir"; then
!             dnl Really add $additional_includedir to $CPPFLAGS.
!             CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
!           fi
!         fi
!       fi
!     fi
!     dnl Potentially add $additional_libdir to $LDFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/lib,
!     dnl   2. if it's already present in $LDFLAGS,
!     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_libdir" != "X/usr/lib"; then
!       haveit=
!       for x in $LDFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-L$additional_libdir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_libdir" = "X/usr/local/lib"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux*) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_libdir"; then
!             dnl Really add $additional_libdir to $LDFLAGS.
!             LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
!           fi
!         fi
!       fi
!     fi
!   fi
! ])
  
! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
! dnl acl_final_exec_prefix, containing the values to which $prefix and
! dnl $exec_prefix will expand at the end of the configure script.
! AC_DEFUN([AC_LIB_PREPARE_PREFIX],
  [
!   dnl Unfortunately, prefix and exec_prefix get only finally determined
!   dnl at the end of configure.
!   if test "X$prefix" = "XNONE"; then
!     acl_final_prefix="$ac_default_prefix"
!   else
!     acl_final_prefix="$prefix"
!   fi
!   if test "X$exec_prefix" = "XNONE"; then
!     acl_final_exec_prefix='${prefix}'
!   else
!     acl_final_exec_prefix="$exec_prefix"
    fi
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-   prefix="$acl_save_prefix"
- ])
- 
- dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
- dnl variables prefix and exec_prefix bound to the values they will have
- dnl at the end of the configure script.
- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- [
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   acl_save_exec_prefix="$exec_prefix"
-   exec_prefix="$acl_final_exec_prefix"
-   $1
-   exec_prefix="$acl_save_exec_prefix"
-   prefix="$acl_save_prefix"
  ])
  
! # lib-link.m4 serial 6 (gettext-0.14.3)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! AC_PREREQ(2.50)
  
! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
! dnl the libraries corresponding to explicit and implicit dependencies.
! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
! dnl augments the CPPFLAGS variable.
! AC_DEFUN([AC_LIB_LINKFLAGS],
  [
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   AC_REQUIRE([AC_LIB_RPATH])
!   define([Name],[translit([$1],[./-], [___])])
!   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
!                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
!   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
!     AC_LIB_LINKFLAGS_BODY([$1], [$2])
!     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
!     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
!     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
    ])
-   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
[...78903 lines suppressed...]
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
+ 	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
+ 	  empty_fix=; \
+ 	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test ! -f $$subdir/TAGS || \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! 	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! 	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
! 	fi
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
! 
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	    distdir=`$(am__cd) $(distdir) && pwd`; \
! 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! 	    (cd $$subdir && \
! 	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
! 	        distdir) \
  	      || exit 1; \
  	  fi; \
  	done
  check-am: all-am
  check: check-recursive
! all-am: Makefile $(PROGRAMS)
! installdirs: installdirs-recursive
! installdirs-am:
! 	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
! install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
+ uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
+ installcheck: installcheck-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
  clean-generic:
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
! 	@echo "This command is intended for maintainers to use"
! 	@echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
  
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  
! distclean: distclean-recursive
! 	-rm -rf ./$(DEPDIR)
! 	-rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! 	distclean-tags
  
! dvi: dvi-recursive
! 
! dvi-am:
  
! html: html-recursive
  
! info: info-recursive
  
! info-am:
! 
! install-data-am:
! 
! install-exec-am: install-binPROGRAMS
! 
! install-info: install-info-recursive
! 
! install-man:
! 
! installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+ 
+ pdf: pdf-recursive
+ 
+ pdf-am:
+ 
+ ps: ps-recursive
+ 
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
! uninstall-info: uninstall-info-recursive
  
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ 	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ 	ctags-recursive distclean distclean-compile distclean-generic \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-exec install-exec-am \
+ 	install-info install-info-am install-man install-strip \
+ 	installcheck installcheck-am installdirs installdirs-am \
+ 	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-info-am
  
  # 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.
diff -NPrc centericq-4.21.0-org/stamp-h.in centericq-4.21.0/stamp-h.in
*** centericq-4.21.0-org/stamp-h.in	2005-09-02 16:46:28.000000000 +0200
--- centericq-4.21.0/stamp-h.in	1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- timestamp
--- 0 ----


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- centericq.spec	30 Nov 2005 21:19:25 -0000	1.19
+++ centericq.spec	3 Jan 2006 10:03:19 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -17,6 +17,11 @@
 # see redhat bugzilla #174611
 Patch4:         centericq-4.21.0-icq-short-read.diff.bz2
 Patch5:         centericq-4.21.0-memory-handling.diff.bz2
+# and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml 
+# and redhat bugzilla #176451
+Patch6:         centericq-4.21.0-kkstrtext.patch
+# Fix libmsn 
+Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -38,6 +43,8 @@
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch100 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -65,8 +72,14 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
-
+# we don't want that
+%exclude %{_includedir}/msn
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-3
+- Fix more security related stuff
+- Fix libmsn
+
 * Wed Nov 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.21.0-2
 - fix CVE-2005-3694 see (#174611)



From fedora-extras-commits at redhat.com  Tue Jan  3 10:03:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 05:03:25 -0500
Subject: rpms/centericq/devel centericq-4.21.0-kkstrtext.patch, NONE,
	1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.20, 1.21
Message-ID: <200601031004.k03A3xdA012115@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10431/devel

Modified Files:
	centericq.spec 
Added Files:
	centericq-4.21.0-kkstrtext.patch centericq-4.21.0.msn.patch 
Log Message:
- fix more security suff
- fix libmsn


centericq-4.21.0-kkstrtext.patch:

--- NEW FILE centericq-4.21.0-kkstrtext.patch ---
--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h	2004-11-17 23:00:38.000000000 +0000
+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h	2005-12-13 18:34:56.308723728 +0000
@@ -87,7 +87,7 @@
     { \
 	va_list vgs__ap; char vgs__buf[1024]; \
 	va_start(vgs__ap, fmt); \
-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
+	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
 	va_end(vgs__ap); \
     }

centericq-4.21.0.msn.patch:

--- NEW FILE centericq-4.21.0.msn.patch ---
diff -NPrc centericq-4.21.0-org/aclocal.m4 centericq-4.21.0/aclocal.m4
*** centericq-4.21.0-org/aclocal.m4	2005-09-02 16:46:00.000000000 +0200
--- centericq-4.21.0/aclocal.m4	2005-11-07 16:43:58.000000000 +0100
***************
*** 1,1146 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! 
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
! 
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
! dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
! dnl require excessive bracketing.
! ifdef([AC_HELP_STRING],
! [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
! [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
  
! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
! dnl to access previously installed libraries. The basic assumption is that
! dnl a user will want packages to use other packages he previously installed
! dnl with the same --prefix option.
! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
! dnl libraries, but is otherwise very convenient.
! AC_DEFUN([AC_LIB_PREFIX],
! [
!   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
!   AC_REQUIRE([AC_PROG_CC])
!   AC_REQUIRE([AC_CANONICAL_HOST])
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   dnl By default, look in $includedir and $libdir.
!   use_additional=yes
!   AC_LIB_WITH_FINAL_PREFIX([
!     eval additional_includedir=\"$includedir\"
!     eval additional_libdir=\"$libdir\"
!   ])
!   AC_LIB_ARG_WITH([lib-prefix],
! [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
!   --without-lib-prefix    don't search for libraries in includedir and libdir],
! [
!     if test "X$withval" = "Xno"; then
!       use_additional=no
!     else
!       if test "X$withval" = "X"; then
!         AC_LIB_WITH_FINAL_PREFIX([
!           eval additional_includedir=\"$includedir\"
!           eval additional_libdir=\"$libdir\"
!         ])
!       else
!         additional_includedir="$withval/include"
!         additional_libdir="$withval/lib"
!       fi
!     fi
! ])
!   if test $use_additional = yes; then
!     dnl Potentially add $additional_includedir to $CPPFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/include,
!     dnl   2. if it's already present in $CPPFLAGS,
!     dnl   3. if it's /usr/local/include and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_includedir" != "X/usr/include"; then
!       haveit=
!       for x in $CPPFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-I$additional_includedir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_includedir" = "X/usr/local/include"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux* | gnu* | k*bsd*-gnu) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_includedir"; then
!             dnl Really add $additional_includedir to $CPPFLAGS.
!             CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
!           fi
!         fi
!       fi
!     fi
!     dnl Potentially add $additional_libdir to $LDFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/lib,
!     dnl   2. if it's already present in $LDFLAGS,
!     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_libdir" != "X/usr/lib"; then
!       haveit=
!       for x in $LDFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-L$additional_libdir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_libdir" = "X/usr/local/lib"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux*) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_libdir"; then
!             dnl Really add $additional_libdir to $LDFLAGS.
!             LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
!           fi
!         fi
!       fi
!     fi
!   fi
! ])
  
! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
! dnl acl_final_exec_prefix, containing the values to which $prefix and
! dnl $exec_prefix will expand at the end of the configure script.
! AC_DEFUN([AC_LIB_PREPARE_PREFIX],
  [
!   dnl Unfortunately, prefix and exec_prefix get only finally determined
!   dnl at the end of configure.
!   if test "X$prefix" = "XNONE"; then
!     acl_final_prefix="$ac_default_prefix"
!   else
!     acl_final_prefix="$prefix"
!   fi
!   if test "X$exec_prefix" = "XNONE"; then
!     acl_final_exec_prefix='${prefix}'
!   else
!     acl_final_exec_prefix="$exec_prefix"
    fi
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-   prefix="$acl_save_prefix"
- ])
- 
- dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
- dnl variables prefix and exec_prefix bound to the values they will have
- dnl at the end of the configure script.
- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- [
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   acl_save_exec_prefix="$exec_prefix"
-   exec_prefix="$acl_final_exec_prefix"
-   $1
-   exec_prefix="$acl_save_exec_prefix"
-   prefix="$acl_save_prefix"
  ])
  
! # lib-link.m4 serial 6 (gettext-0.14.3)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! AC_PREREQ(2.50)
  
! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
! dnl the libraries corresponding to explicit and implicit dependencies.
! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
! dnl augments the CPPFLAGS variable.
! AC_DEFUN([AC_LIB_LINKFLAGS],
  [
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   AC_REQUIRE([AC_LIB_RPATH])
!   define([Name],[translit([$1],[./-], [___])])
!   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
!                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
!   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
!     AC_LIB_LINKFLAGS_BODY([$1], [$2])
!     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
!     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
!     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
    ])
-   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
[...78903 lines suppressed...]
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
+ 	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
+ 	  empty_fix=; \
+ 	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test ! -f $$subdir/TAGS || \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! 	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! 	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
! 	fi
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
! 
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	    distdir=`$(am__cd) $(distdir) && pwd`; \
! 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! 	    (cd $$subdir && \
! 	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
! 	        distdir) \
  	      || exit 1; \
  	  fi; \
  	done
  check-am: all-am
  check: check-recursive
! all-am: Makefile $(PROGRAMS)
! installdirs: installdirs-recursive
! installdirs-am:
! 	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
! install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
+ uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
+ installcheck: installcheck-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
  clean-generic:
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
! 	@echo "This command is intended for maintainers to use"
! 	@echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
  
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  
! distclean: distclean-recursive
! 	-rm -rf ./$(DEPDIR)
! 	-rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! 	distclean-tags
  
! dvi: dvi-recursive
! 
! dvi-am:
  
! html: html-recursive
  
! info: info-recursive
  
! info-am:
! 
! install-data-am:
! 
! install-exec-am: install-binPROGRAMS
! 
! install-info: install-info-recursive
! 
! install-man:
! 
! installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+ 
+ pdf: pdf-recursive
+ 
+ pdf-am:
+ 
+ ps: ps-recursive
+ 
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
! uninstall-info: uninstall-info-recursive
  
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ 	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ 	ctags-recursive distclean distclean-compile distclean-generic \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-exec install-exec-am \
+ 	install-info install-info-am install-man install-strip \
+ 	installcheck installcheck-am installdirs installdirs-am \
+ 	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-info-am
  
  # 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.
diff -NPrc centericq-4.21.0-org/stamp-h.in centericq-4.21.0/stamp-h.in
*** centericq-4.21.0-org/stamp-h.in	2005-09-02 16:46:28.000000000 +0200
--- centericq-4.21.0/stamp-h.in	1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- timestamp
--- 0 ----


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- centericq.spec	30 Nov 2005 21:19:31 -0000	1.20
+++ centericq.spec	3 Jan 2006 10:03:25 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -17,6 +17,12 @@
 # see redhat bugzilla #174611
 Patch4:         centericq-4.21.0-icq-short-read.diff.bz2
 Patch5:         centericq-4.21.0-memory-handling.diff.bz2
+# and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml 
+# and redhat bugzilla #176451
+Patch6:         centericq-4.21.0-kkstrtext.patch
+# Fix libmsn 
+Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -38,6 +44,8 @@
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch100 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -65,8 +73,15 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
+# we don't want that
+%exclude %{_includedir}/msn
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-4
+- Fix more security related stuff
+- Fix libmsn
+
 * Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.21.0-2
 - rebuild



From fedora-extras-commits at redhat.com  Tue Jan  3 10:15:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:15:40 -0500
Subject: rpms/perl-Digest-BubbleBabble - New directory
Message-ID: <200601031015.k03AFgeV012342@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12334/perl-Digest-BubbleBabble

Log Message:
Directory /cvs/extras/rpms/perl-Digest-BubbleBabble added to the repository




From fedora-extras-commits at redhat.com  Tue Jan  3 10:15:45 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:15:45 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel - New directory
Message-ID: <200601031015.k03AFl7x012357@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12334/perl-Digest-BubbleBabble/devel

Log Message:
Directory /cvs/extras/rpms/perl-Digest-BubbleBabble/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan  3 10:16:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:16:30 -0500
Subject: rpms/perl-Digest-BubbleBabble Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601031016.k03AGWhU012391@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Digest-BubbleBabble


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Digest-BubbleBabble
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan  3 10:16:35 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:16:35 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601031016.k03AGbEH012411@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Digest-BubbleBabble


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan  3 10:17:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:17:50 -0500
Subject: rpms/perl-Digest-BubbleBabble import.log,1.1,1.2
Message-ID: <200601031018.k03AIMhW012479@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12445

Modified Files:
	import.log 
Log Message:
auto-import perl-Digest-BubbleBabble-0.01-1 on branch devel from perl-Digest-BubbleBabble-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Jan 2006 10:16:29 -0000	1.1
+++ import.log	3 Jan 2006 10:17:49 -0000	1.2
@@ -0,0 +1 @@
+perl-Digest-BubbleBabble-0_01-1:HEAD:perl-Digest-BubbleBabble-0.01-1.src.rpm:1136283458



From fedora-extras-commits at redhat.com  Tue Jan  3 10:17:55 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:17:55 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel perl-Digest-BubbleBabble.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601031018.k03AISNM012483@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Digest-BubbleBabble.spec 
Log Message:
auto-import perl-Digest-BubbleBabble-0.01-1 on branch devel from perl-Digest-BubbleBabble-0.01-1.src.rpm


--- NEW FILE perl-Digest-BubbleBabble.spec ---
Summary:	Create bubble-babble fingerprints
Name:		perl-Digest-BubbleBabble
Version:	0.01
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Digest-BubbleBabble/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Digest-BubbleBabble-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Digest::BubbleBabble takes a message digest (generated by either of the MD5 or
SHA-1 message digest algorithms) and creates a fingerprint of that digest in
"bubble babble" format. Bubble babble is a method of representing a message
digest as a string of "real" words, to make the fingerprint easier to remember.
The "words" are not necessarily real words, but they look more like words than
a string of hex characters.

Bubble babble fingerprinting is used by the SSH2 suite (and, consequently, by
Net::SSH::Perl, the Perl SSH implementation) to display easy-to-remember key
fingerprints. The key (a DSA or RSA key) is converted into a textual form,
digested using Digest::SHA1, and run through bubblebabble to create the key
fingerprint.

%prep
%setup -q -n Digest-BubbleBabble-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%{perl_vendorlib}/Digest/
%{_mandir}/man3/Digest::BubbleBabble.3pm*

%changelog
* Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 0.01-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Jan 2006 10:16:35 -0000	1.1
+++ .cvsignore	3 Jan 2006 10:17:55 -0000	1.2
@@ -0,0 +1 @@
+Digest-BubbleBabble-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Jan 2006 10:16:35 -0000	1.1
+++ sources	3 Jan 2006 10:17:55 -0000	1.2
@@ -0,0 +1 @@
+0e8ef3de82ae909cfaeddf8269140c17  Digest-BubbleBabble-0.01.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 10:22:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:22:19 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel perl-Digest-BubbleBabble.spec,
	1.1, 1.2
Message-ID: <200601031022.k03AMpm9012549@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12525

Modified Files:
	perl-Digest-BubbleBabble.spec 
Log Message:
Don't include README (review comment)



Index: perl-Digest-BubbleBabble.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/devel/perl-Digest-BubbleBabble.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Digest-BubbleBabble.spec	3 Jan 2006 10:17:55 -0000	1.1
+++ perl-Digest-BubbleBabble.spec	3 Jan 2006 10:22:19 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Create bubble-babble fingerprints
 Name:		perl-Digest-BubbleBabble
 Version:	0.01
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Digest-BubbleBabble/
@@ -46,10 +46,13 @@
 
 %files
 %defattr(-,root,root,0755)
-%doc Changes README
+%doc Changes
 %{perl_vendorlib}/Digest/
 %{_mandir}/man3/Digest::BubbleBabble.3pm*
 
 %changelog
+* Tue Jan  3 2006 Paul Howarth <paul at city-fan.org> 0.01-2
+- Don't include README, which contains only install instructions (#175280)
+
 * Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 0.01-1
 - Initial build



From fedora-extras-commits at redhat.com  Tue Jan  3 10:26:21 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:26:21 -0500
Subject: owners owners.list,1.497,1.498
Message-ID: <200601031026.k03AQrRY012627@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12610

Modified Files:
	owners.list 
Log Message:
perl-Digest-BubbleBabble



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- owners.list	2 Jan 2006 15:30:50 -0000	1.497
+++ owners.list	3 Jan 2006 10:26:21 -0000	1.498
@@ -768,6 +768,7 @@
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan  3 11:24:15 2006
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue,  3 Jan 2006 06:24:15 -0500
Subject: rpms/dia/devel dia.spec,1.4,1.5
Message-ID: <200601031124.k03BOlu8014401@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14384

Modified Files:
	dia.spec 
Log Message:
rh#176504# add BuildRequires


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dia.spec	19 Dec 2005 09:17:27 -0000	1.4
+++ dia.spec	3 Jan 2006 11:24:14 -0000	1.5
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	17
+Release:	18
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -25,7 +25,7 @@
 BuildRequires:	glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel
 BuildRequires:	docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl
 BuildRequires:	openjade, libpng-devel, automake17, libart_lgpl-devel, 
-BuildRequires:  libxslt-devel
+BuildRequires:  libxslt-devel, libgnome-devel
 
 Patch0: dia-0.94-svgimport-fix.patch
 Patch1: dia-0.92.2-dtd.patch
@@ -113,6 +113,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-18
+- rh#176504# add BuildRequires
+
 * Mon Dec 19 2005 Caolan McNamara <caolanm at redhat.com> 1:0.94-17
 - rh#176003# rejig Pre/Post
 



From fedora-extras-commits at redhat.com  Tue Jan  3 12:05:15 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  3 Jan 2006 07:05:15 -0500
Subject: rpms/linphone/devel linphone-1.2.0-maxrtp.patch, NONE,
	1.1 linphone-1.2.0-ortp.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 linphone.spec, 1.15, 1.16 sources, 1.4,
	1.5 linphone-1.1.0-ortp.patch, 1.1, NONE
Message-ID: <200601031205.k03C5mUe016270@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16243

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.2.0-maxrtp.patch linphone-1.2.0-ortp.patch 
Removed Files:
	linphone-1.1.0-ortp.patch 
Log Message:
Upstream update

linphone-1.2.0-maxrtp.patch:

--- NEW FILE linphone-1.2.0-maxrtp.patch ---
--- linphone-1.2.0/mediastreamer/audiostream.c.maxrtp	2006-01-03 04:26:06.000000000 -0500
+++ linphone-1.2.0/mediastreamer/audiostream.c	2006-01-03 04:26:28.000000000 -0500
@@ -112,7 +112,7 @@
 			RtpSession **recvsend){
 	RtpSession *rtpr;
 	rtpr=rtp_session_new(RTP_SESSION_SENDRECV);
-	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
+/*	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);*/
 	rtp_session_set_profile(rtpr,profile);
 	rtp_session_set_local_addr(rtpr,get_local_addr_for(remip),locport);
 	if (remport>0) rtp_session_set_remote_addr(rtpr,remip,remport);
@@ -133,7 +133,7 @@
 	/* creates two rtp filters to recv send streams (remote part)*/
 	
 	rtps=rtp_session_new(RTP_SESSION_SENDONLY);
-	rtp_session_max_buf_size_set(rtps,MAX_RTP_SIZE);
+/*	rtp_session_max_buf_size_set(rtps,MAX_RTP_SIZE);*/
 	rtp_session_set_profile(rtps,profile);
 #ifdef INET6
 	rtp_session_set_local_addr(rtps,"::",locport+2);
@@ -147,7 +147,7 @@
 	rtp_session_set_jitter_compensation(rtps,jitt_comp);
 	
 	rtpr=rtp_session_new(RTP_SESSION_RECVONLY);
-	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
+/*	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);*/
 	rtp_session_set_profile(rtpr,profile);
 #ifdef INET6
 	rtp_session_set_local_addr(rtpr,"::",locport);

linphone-1.2.0-ortp.patch:

--- NEW FILE linphone-1.2.0-ortp.patch ---
--- linphone-1.2.0/gnome/Makefile.in.ortp	2005-12-16 17:05:06.000000000 -0500
+++ linphone-1.2.0/gnome/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -340,8 +340,7 @@
 @BUILD_GNOME_TRUE at INCLUDES = \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)\
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/intl \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/src \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/ \
+ at BUILD_GNOME_TRUE@	-I$(includedir)/ortp/ \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/mediastreamer \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/speex/libspeex \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/coreapi \
--- linphone-1.2.0/coreapi/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.2.0/coreapi/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -289,8 +289,7 @@
 INCLUDES = \
 	-I$(top_srcdir)\
 	-I$(top_srcdir)/exosip\
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS) \
 	-I$(osip_prefix)/include/ 
--- linphone-1.2.0/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.2.0/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -61,7 +61,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+DIST_SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
 	win32acm mediastreamer mediastreamer2 media_api exosip coreapi \
 	console gnome share developer-docs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -274,7 +274,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
-SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
 		media_api exosip coreapi console gnome share developer-docs
 
--- linphone-1.2.0/console/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.2.0/console/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -281,8 +281,7 @@
 	-I$(top_srcdir)/coreapi\
 	-I$(top_srcdir)/osipua/\
 	-I$(top_srcdir)/osipua/src \
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS)\
 	-I$(osip_prefix)/include \
--- linphone-1.2.0/mediastreamer/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.2.0/mediastreamer/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -67,7 +67,7 @@
 @BUILD_TRUESPEECH_TRUE at am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
 libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -348,6 +348,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -485,7 +486,7 @@
 libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SAMPLERATE_LIBS)\
 							$(SUPPORTLIB) \
@@ -551,8 +552,7 @@
 
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						$(SPEEX_CFLAGS) \
--- linphone-1.2.0/mediastreamer2/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.2.0/mediastreamer2/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -54,7 +54,7 @@
 @BUILD_UGLIB_TRUE@	$(top_builddir)/support/libuglib.la
 libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \
@@ -213,6 +213,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -313,7 +314,7 @@
 libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SUPPORTLIB) \
 							$(ALSA_LIBS) \
@@ -322,8 +323,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS)
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer2 \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						$(SPEEX_CFLAGS)
--- linphone-1.2.0/media_api/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.2.0/media_api/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -299,8 +299,7 @@
 INCLUDES = -I$(top_srcdir)/mediastreamer \
 		-I$(top_srcdir)/speex \
 		-I$(top_srcdir)/gsmlib \
-		-I$(top_srcdir)/oRTP \
-		-I$(top_srcdir)/oRTP/src \
+		-I$(includedir)/ortp \
 		-I$(top_srcdir)/lpc10-1.5 \
 		-I$(top_srcdir)/ffmpeg 
 
--- linphone-1.2.0/configure.ortp	2005-12-16 17:05:11.000000000 -0500
+++ linphone-1.2.0/configure	2006-01-03 00:59:50.000000000 -0500
@@ -463,7 +463,6 @@
 # include <unistd.h>
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all oRTP"
 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 LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RU!
 LE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS STRICT_OPTIONS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LI!
 BS SAMPLERATE_CFLAGS SAMPLERATE_LIBS osip_prefix OSIP_CFLAGS O!
 SIP_LI
EXOSIP_CFLAGS EXOSIP_LIBS SPEEX_CFLAGS SPEEX_LIBS ${NAME}_CFLAGS ${NAME}_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -30162,9 +30161,6 @@
 
 
 
-subdirs="$subdirs oRTP"
-
-
 ##################################################
 # Check for gtk-doc.
 ##################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2005 00:17:38 -0000	1.4
+++ .cvsignore	3 Jan 2006 12:05:15 -0000	1.5
@@ -1 +1 @@
-linphone-1.1.0.tar.gz
+linphone-1.2.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linphone.spec	6 Dec 2005 00:36:09 -0000	1.15
+++ linphone.spec	3 Jan 2006 12:05:15 -0000	1.16
@@ -1,16 +1,16 @@
 Name:           linphone
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.1.x/source/%{name}-%{version}.tar.gz
-Patch:          linphone-1.0.1-pkgconfig.patch
-Patch1:         linphone-1.0.1-desktop.patch
-Patch2:         linphone-1.1.0-ortp.patch
-Patch3:         linphone-1.1.0-Werror.patch
+Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
+Patch:          linphone-1.0.1-desktop.patch
+Patch1:         linphone-1.2.0-ortp.patch
+Patch2:         linphone-1.1.0-Werror.patch
+Patch3:         linphone-1.2.0-maxrtp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -43,10 +43,10 @@
 
 %prep
 %setup -q
-%patch -p 1 -b .pkgconfig
-%patch1 -p 1 -b .old
-%patch2 -p 1 -b .ortp
-%patch3 -p 1 -b .Werror
+%patch -p 1 -b .old
+%patch1 -p 1 -b .ortp
+%patch2 -p 1 -b .Werror
+%patch3 -p 1 -b .maxrtp
 rm -r oRTP
 
 %build
@@ -99,6 +99,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
+- Upstream update
+
 * Mon Dec  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.0-2
 - Added version on ortp-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2005 00:17:38 -0000	1.4
+++ sources	3 Jan 2006 12:05:15 -0000	1.5
@@ -1 +1 @@
-9f164b41c76ef1caca164909dea199a1  linphone-1.1.0.tar.gz
+bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz


--- linphone-1.1.0-ortp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 12:23:48 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:23:48 -0500
Subject: rpms/linkchecker import.log,1.4,1.5
Message-ID: <200601031224.k03COKLm016476@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16442

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.3-1 on branch devel from linkchecker-3.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Jan 2006 03:52:59 -0000	1.4
+++ import.log	3 Jan 2006 12:23:48 -0000	1.5
@@ -1,3 +1,4 @@
 linkchecker-3_2-3:HEAD:linkchecker-3.2-3.src.rpm:1132802837
 linkchecker-3_2-4:HEAD:linkchecker-3.2-4.src.rpm:1136260100
 linkchecker-3_2-5:HEAD:linkchecker-3.2-5.src.rpm:1136260374
+linkchecker-3_3-1:HEAD:linkchecker-3.3-1.src.rpm:1136291023



From fedora-extras-commits at redhat.com  Tue Jan  3 12:23:54 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:23:54 -0500
Subject: rpms/linkchecker/devel .cvsignore, 1.2, 1.3 linkchecker.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200601031224.k03COQ53016484@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16442/devel

Modified Files:
	.cvsignore linkchecker.spec sources 
Log Message:
auto-import linkchecker-3.3-1 on branch devel from linkchecker-3.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Nov 2005 03:27:27 -0000	1.2
+++ .cvsignore	3 Jan 2006 12:23:54 -0000	1.3
@@ -1 +1 @@
-linkchecker-3.2.tar.gz
+linkchecker-3.3.tar.gz


Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linkchecker.spec	3 Jan 2006 03:53:05 -0000	1.2
+++ linkchecker.spec	3 Jan 2006 12:23:54 -0000	1.3
@@ -3,11 +3,11 @@
 
 Summary: Check HTML documents for broken links
 Name: linkchecker
-Version: 3.2
-Release: 5
+Version: 3.3
+Release: 1
 License: GPL
 Group: Development/Tools
-Source: http://dl.sf.net/linkchecker/linkchecker-3.2.tar.gz
+Source: http://dl.sf.net/linkchecker/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://linkchecker.sourceforge.net/
 BuildRequires: python-devel
@@ -69,6 +69,9 @@
 %doc TODO doc/ cgi/lconline/ test/ README LICENSE
 
 %changelog
+* Mon Jan 03 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-1
+   - Update to linkchecker 3.3.
+
 * Sun Jan 02 2006 W. Michael Petullo <mike[at]flyn.org> - 3.2-4
    - Bump release number to re-import.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Nov 2005 03:27:27 -0000	1.2
+++ sources	3 Jan 2006 12:23:54 -0000	1.3
@@ -1 +1 @@
-95c79936dadbbe9b5a17c297e5c98fb5  linkchecker-3.2.tar.gz
+84b1ac29c8a638f77f9db5c2b27b5a79  linkchecker-3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 12:57:21 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:57:21 -0500
Subject: rpms/linkchecker import.log,1.5,1.6
Message-ID: <200601031257.k03CvrA7016791@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.3-2 on branch devel from linkchecker-3.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	3 Jan 2006 12:23:48 -0000	1.5
+++ import.log	3 Jan 2006 12:57:21 -0000	1.6
@@ -2,3 +2,4 @@
 linkchecker-3_2-4:HEAD:linkchecker-3.2-4.src.rpm:1136260100
 linkchecker-3_2-5:HEAD:linkchecker-3.2-5.src.rpm:1136260374
 linkchecker-3_3-1:HEAD:linkchecker-3.3-1.src.rpm:1136291023
+linkchecker-3_3-2:HEAD:linkchecker-3.3-2.src.rpm:1136293034



From fedora-extras-commits at redhat.com  Tue Jan  3 12:57:27 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:57:27 -0500
Subject: rpms/linkchecker/devel linkchecker.spec,1.3,1.4
Message-ID: <200601031257.k03Cvx2o016794@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/devel

Modified Files:
	linkchecker.spec 
Log Message:
auto-import linkchecker-3.3-2 on branch devel from linkchecker-3.3-2.src.rpm


Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linkchecker.spec	3 Jan 2006 12:23:54 -0000	1.3
+++ linkchecker.spec	3 Jan 2006 12:57:26 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: Check HTML documents for broken links
 Name: linkchecker
 Version: 3.3
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 Source: http://dl.sf.net/linkchecker/%{name}-%{version}.tar.gz
@@ -63,12 +63,27 @@
 %{python_sitelib}/linkcheck/logger/*.py
 %{python_sitelib}/linkcheck/logger/*.pyc
 %ghost %{python_sitelib}/linkcheck/logger/*.pyo
+%dir %{python_sitelib}/linkcheck/dns/rdtypes/ANY
+%{python_sitelib}/linkcheck/dns/rdtypes/ANY/*.py
+%{python_sitelib}/linkcheck/dns/rdtypes/ANY/*.pyc
+%ghost %{python_sitelib}/linkcheck/dns/rdtypes/ANY/*.pyo
+%dir %{python_sitelib}/linkcheck/dns/rdtypes/IN
+%{python_sitelib}/linkcheck/dns/rdtypes/IN/*.py
+%{python_sitelib}/linkcheck/dns/rdtypes/IN/*.pyc
+%ghost %{python_sitelib}/linkcheck/dns/rdtypes/IN/*.pyo
+%dir %{python_sitelib}/linkcheck/dns/rdtypes
+%{python_sitelib}/linkcheck/dns/rdtypes/*.py
+%{python_sitelib}/linkcheck/dns/rdtypes/*.pyc
+%ghost %{python_sitelib}/linkcheck/dns/rdtypes/*.pyo
 %dir %{_datadir}/linkchecker/
 %{_datadir}/linkchecker/*
 %{_mandir}/man1/*
 %doc TODO doc/ cgi/lconline/ test/ README LICENSE
 
 %changelog
+* Mon Jan 03 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-2
+   - Add some missing items to %%files.
+
 * Mon Jan 03 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-1
    - Update to linkchecker 3.3.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:18:04 2006
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue,  3 Jan 2006 09:18:04 -0500
Subject: rpms/dia/devel dia-0.94-gnomeflags.patch,NONE,1.1 dia.spec,1.5,1.6
Message-ID: <200601031418.k03EIkfj020414@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20394

Modified Files:
	dia.spec 
Added Files:
	dia-0.94-gnomeflags.patch 
Log Message:
make buildable

dia-0.94-gnomeflags.patch:

--- NEW FILE dia-0.94-gnomeflags.patch ---
--- dia-0.94.orig/plug-ins/cairo/Makefile.am	2006-01-03 13:45:06.000000000 +0000
+++ dia-0.94/plug-ins/cairo/Makefile.am	2006-01-03 13:45:30.000000000 +0000
@@ -11,4 +11,4 @@
 
 libcairo_filter_la_LIBADD = $(CAIRO_LIBS)
 
-INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
+INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS) $(GNOME_CFLAGS)
--- dia-0.94.orig/app/Makefile.am	2006-01-03 13:53:07.000000000 +0000
+++ dia-0.94/app/Makefile.am	2006-01-03 13:53:27.000000000 +0000
@@ -8,6 +8,7 @@
 	-I$(top_srcdir)/lib \
 	$(DEBUG_FLAGS) \
 	$(GTK_CFLAGS) \
+	$(GNOME_CFLAGS) \
         -DPREFIX=\""$(prefix)"\" \
         -DSYSCONFDIR=\""$(sysconfdir)"\" \
         -DDATADIR=\""$(datadir)"\" \
--- dia-0.94.orig/app/Makefile.am	2006-01-03 14:02:08.000000000 +0000
+++ dia-0.94/app/Makefile.am	2006-01-03 14:04:00.000000000 +0000
@@ -168,7 +168,7 @@
 
 dia_LDADD = ../lib/libdia.la \
 	$(EFENCE) \
-	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
+	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
 
 #diaconv_LDADD = ../lib/libdia.la \
 #	$(EFENCE) \


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dia.spec	3 Jan 2006 11:24:14 -0000	1.5
+++ dia.spec	3 Jan 2006 14:17:55 -0000	1.6
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	18
+Release:	19
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -33,6 +33,7 @@
 Patch3: dia-0.94-gcc4.patch
 Patch4: dia-0.94-fallbacktoxpmicons.patch
 Patch5: dia-0.94-rh165337.patch
+Patch6: dia-0.94-gnomeflags.patch
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -51,6 +52,7 @@
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .fallbacktoxpmicons
 %patch5 -p1 -b .rh165337
+%patch6 -p1 -b .gnomeflags
 
 %build
 rm doc/*/dia.1
@@ -60,6 +62,8 @@
 autoconf
 %configure --enable-gnome --enable-db2html --with-cairo=no
 
+export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0`
+export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0`
 CFLAGS=$RPM_OPT_FLAGS make
  
 %install
@@ -113,6 +117,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-19
+- make buildable
+
 * Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-18
 - rh#176504# add BuildRequires
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:43:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 09:43:54 -0500
Subject: rpms/geomview/devel .cvsignore, 1.2, 1.3 geomview-1.8.1-rh.patch,
	1.1, 
	1.2 geomview.desktop, 1.1, 1.2 geomview.spec, 1.4, 1.5 sources,
	1.2, 1.3 geomview-1.8.1-cH-2.diff, 1.1, NONE
Message-ID: <200601031444.k03EiRPH020540@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20512

Modified Files:
	.cvsignore geomview-1.8.1-rh.patch geomview.desktop 
	geomview.spec sources 
Removed Files:
	geomview-1.8.1-cH-2.diff 
Log Message:
* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
- cvs20040421
- --with-xforms unconditional, Obsoletes/Provides: geomview-plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Dec 2004 11:58:48 -0000	1.2
+++ .cvsignore	3 Jan 2006 14:43:54 -0000	1.3
@@ -1,3 +1,3 @@
-geomview-1.8.1.tar.gz
 maniview-2.0.0.tar.gz
 orrery-0.9.3.tar.gz
+geomview-snapshot-2004-02-21.tar.gz

geomview-1.8.1-rh.patch:

Index: geomview-1.8.1-rh.patch
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview-1.8.1-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview-1.8.1-rh.patch	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview-1.8.1-rh.patch	3 Jan 2006 14:43:54 -0000	1.2
@@ -1,4 +1,4 @@
---- geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
+--- Geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
 +++ geomview-1.8.1/configure.in	2004-03-16 13:05:13.000000000 -0600
 @@ -491,10 +491,10 @@
  


Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.desktop	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.desktop	3 Jan 2006 14:43:54 -0000	1.2
@@ -2,8 +2,8 @@
 Name=geomview
 Comment=An interactive 3D viewing program
 Exec=geomview
-Icon=geomview.png
-MimeType=
+Icon=geomview
+#MimeType=application/x-geomview
 Type=Application
 Encoding=UTF-8
 Categories=Application;Graphics;Scientific;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geomview.spec	6 Apr 2005 22:11:38 -0000	1.4
+++ geomview.spec	3 Jan 2006 14:43:54 -0000	1.5
@@ -1,57 +1,53 @@
-# $Id$
 
-%define xforms_ver 1.0
-%define maniview_ver 2.0.0
-%define orrery_ver 0.9.3
+## Conditional build:
+# FIXME
+%define _with_orrery --with-orrery
+%define _with_maniview --with-maniview
+
+%define beta -alpha
+%define cvs  20040221
 
 Name:    geomview
 Summary: Interactive 3D viewing program
-Version: 1.8.1
-Release: 11%{?dist_tag}
+Version: 1.8.2
+Release: 0.1.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
-#Url:     http://sourceforge.net/projects/geomview/
+#Url:    http://sourceforge.net/projects/geomview/
 Group:   Applications/Engineering
-Source:  http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+#Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz
+Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: geomview.desktop
 Source2: geomview.png
 
 # Other plugins
+%define orrery_ver 0.9.3
 Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
+%define maniview_ver 2.0.0
 Source11: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
 
 ## Patches
 # put moduledir and data in sane locations
 Patch1: geomview-1.8.1-rh.patch
-# from the "patches" section of http://sourceforge.net/projects/geomview/
-Patch2: geomview-1.8.1-cH-2.diff
 
 BuildRequires: desktop-file-utils
-BuildRequires: autoconf213 automake14 libtool flex
+#BuildRequires: automake libtool
+BuildRequires: flex
 BuildRequires: openmotif-devel
-# For libGL/libGLU (yuck, but I see no other way -- Rex)
+BuildRequires: xforms-devel
+## X/GL support
+%if "%{?fedora}" > "4"
+BuildRequires: libGL-devel libGLU-devel
+%else
 BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+%endif
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-## XForms configuration
-# use xforms by default, unless rpmbuild --without xforms
-%{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
-## plugins, default to yes, unless rpmbuild --without pluginname
-# default plugins
-#{?_without_xforms:Obsoletes: %{name}-plugins < %{version}-%{release}}
-# maniview (requires xforms)
-%{?_without_xforms:%define _without_maniview --without-maniview}
-%{!?_without_maniview:%define _with_maniview --with-maniview}
-#{?_without_maniview:Obsoletes: %{name}-maniview < %{maniview_ver}-%{release}}
-# orrery
-%{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
-
 %description
 Geomview is an interactive 3D viewing program for Unix. It lets you view and
 manipulate 3D objects: you use the mouse to rotate, translate, zoom in and out,
@@ -60,16 +56,8 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-
-%if "%{?_with_xforms:1}" == "1"
-%package plugins
-Group:   Applications/Engineering
-Summary: %{name} plugins
-Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
-%description plugins
-Geomview default plugins
-%endif
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
 
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
@@ -93,39 +81,68 @@
 Group:   Applications/Engineering
 Summary: Geomview module for viewing 3D manifolds
 Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
+BuildRequires: xforms-devel 
 Obsoletes: maniview < %{maniview_ver}-%{release}
-Provides: maniview = %{maniview_ver}-%{release}
+Provides:  maniview = %{maniview_ver}-%{release}
 %description maniview
-a Geomview module for viewing 3D manifolds.
+%{summary}.
 %endif
 
 
 %prep
-%setup -q %{?_with_orrery: -a 10} %{?_with_maniview: -a 11}
+%setup -q -n %{name}-%{version}%{?beta} 
 
 %patch1 -p1 -b .rh
-%patch2 -p1 -b .gcc3
 
 libtoolize --force
-aclocal-1.4 -I ./m4
-automake-1.4
-autoconf-2.13
-autoheader-2.13
-
-# Move misc plugins to correct location
-%{?_with_orrery:(  mv orrery* src/bin; ln -s src/bin/orrery*     ) }
-%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
+aclocal -I m4
+autoconf
+autoheader
+automake -a
+
+%if "%{?_with_orrery:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 10
+pushd orrery-%{orrery_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
+
+%if "%{?_with_maniview:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 11
+pushd maniview-%{maniview_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
 
 
 %build
 
-%{?CCC:export %{CCC}}
-%{?CXX:export %{CXX}}
+export ACLOCAL=aclocal
+export AUTOMAKE=automake
+
+# --config-cache (for maniview)
 %configure \
-  %{?_with_xforms} %{?_without_xforms}
+  --config-cache 
 
-make MATHLIB=-lm %{?CCC} %{?CXX}
+# Either do (re)automake steps above for addons, or this. -- Rex
+%if 0
+#--no-recursion
+%{?_with_orrery:(cd src/bin/orrery-%{orrery_ver};%configure)}
+%{?_with_maniview:(cd src/bin/maniview-%{maniview_ver};%configure --cache-file=../../../config.cache)}
+%endif
+
+# not smp-safe
+make MATHLIB=-lm
 
 
 %install
@@ -141,7 +158,7 @@
   %{SOURCE1}
 
 # app icon
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
 
 # move the html manual for inclusion later
 mv doc/html .
@@ -149,84 +166,97 @@
 # fixup info, We'll use install-info later
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-# Manually install maniview manpage
-%{?_with_maniview:install -D -m644 src/bin/maniview*/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
+# maniview manpage
+%{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
+%POST
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 
 %preun
 if [ $1 -eq 0 ] ;then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 fi
 
+%postun
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL INSTALL.Geomview NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %doc html
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_bindir}/*
 %{_infodir}/*
-%{_mandir}/man?/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/.geomview
-%{_datadir}/%{name}/geom
-%{_datadir}/%{name}/cmap.fmap
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/gvx
-%{_libexecdir}/%{name}/animate
-%{_libexecdir}/%{name}/.geomview-animate
-%{_libexecdir}/%{name}/drawbdy
-%{_libexecdir}/%{name}/.geomview-drawbdy
-
-%if "%{?_with_xforms:1}" == "1"
-%files plugins
-%defattr(-,root,root)
-%{_libexecdir}/%{name}/example
-%{_libexecdir}/%{name}/.geomview-example
-%{_libexecdir}/%{name}/ginsu
-%{_libexecdir}/%{name}/.geomview-ginsu
-%{_libexecdir}/%{name}/graffiti
-%{_libexecdir}/%{name}/.geomview-graffiti
-%{_libexecdir}/%{name}/stereo
-%{_libexecdir}/%{name}/.geomview-stereo
-%{_libexecdir}/%{name}/sweep
-%{_libexecdir}/%{name}/.geomview-sweep
-%{_libexecdir}/%{name}/tackdown
-%{_libexecdir}/%{name}/.geomview-tackdown
-%{_libexecdir}/%{name}/transformer
-%{_libexecdir}/%{name}/.geomview-transformer
-%{_libexecdir}/%{name}/origin
-%endif
+%{_mandir}/man1/*
+%{_datadir}/geomview/
+%{_libexecdir}/geomview/gvx
+%{_libexecdir}/geomview/animate
+%{_libexecdir}/geomview/.geomview-animate
+%{_libexecdir}/geomview/drawbdy
+%{_libexecdir}/geomview/.geomview-drawbdy
+%{_libexecdir}/geomview/example
+%{_libexecdir}/geomview/.geomview-example
+%{_libexecdir}/geomview/ginsu
+%{_libexecdir}/geomview/.geomview-ginsu
+%{_libexecdir}/geomview/graffiti
+%{_libexecdir}/geomview/.geomview-graffiti
+%{_libexecdir}/geomview/stereo
+%{_libexecdir}/geomview/.geomview-stereo
+%{_libexecdir}/geomview/sweep
+%{_libexecdir}/geomview/.geomview-sweep
+%{_libexecdir}/geomview/tackdown
+%{_libexecdir}/geomview/.geomview-tackdown
+%{_libexecdir}/geomview/transformer
+%{_libexecdir}/geomview/.geomview-transformer
+%{_libexecdir}/geomview/origin
+%{?_with_orrery:%exclude %{_datadir}/geomview/modules/ }
+%{?_with_maniview:%exclude %{_datadir}/geomview/groups/ }
+%{?_with_maniview:%exclude %{_mandir}/man1/maniview* }
 
 %if "%{?_with_orrery:1}" == "1"
 %files orrery
-%defattr(-,root,root)
-%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog
+%defattr(-,root,root,-)
+%doc src/bin/orrery*/AUTHORS src/bin/orrery*/ChangeLog src/bin/orrery*/COPYING
+%doc src/bin/orrery*/NEWS src/bin/orrery*/README
 %dir %{_datadir}/geomview/modules
 %{_datadir}/geomview/modules/orrery
-%{_libexecdir}/%{name}/.geomview-orrery
+%{_libexecdir}/geomview/.geomview-orrery
 %endif
 
 %if "%{?_with_maniview:1}" == "1"
 %files maniview
-%defattr(-,root,root)
-%doc maniview*/README maniview*/NEWS maniview*/AUTHORS maniview*/ChangeLog
-%{_datadir}/%{name}/groups
-%{_libexecdir}/%{name}/maniview
-%{_libexecdir}/%{name}/.geomview-maniview
+%defattr(-,root,root,-)
+%doc src/bin/maniview*/AUTHORS src/bin/maniview*/ChangeLog src/bin/maniview*/COPYING
+%doc src/bin/maniview*/README src/bin/maniview*/NEWS
+%{_datadir}/geomview/groups/
+%{_libexecdir}/geomview/maniview
+%{_libexecdir}/geomview/.geomview-maniview
 %{_mandir}/man1/maniview*
 %endif
 
 
 %changelog
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
+- cvs20040421
+- --with-xforms unconditional, Obsoletes/Provides: geomview-plugins
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]usres.sf.net> 1.8.1-12
+- follow/use icon spec
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Dec 2004 11:58:48 -0000	1.2
+++ sources	3 Jan 2006 14:43:54 -0000	1.3
@@ -1,3 +1,3 @@
-1cb0e07a6552e9fe122491af70171536  geomview-1.8.1.tar.gz
+776c3acefac602c422dacd45119f3560  geomview-snapshot-2004-02-21.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz


--- geomview-1.8.1-cH-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 14:51:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 09:51:10 -0500
Subject: rpms/xsupplicant/devel xsupplicant-1.2.2-buf.patch, NONE,
	1.1 xsupplicant.spec, 1.13, 1.14
Message-ID: <200601031451.k03EpgLm020651@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-buf.patch 
Log Message:
fix a possible bufferoverflow bz 170045

xsupplicant-1.2.2-buf.patch:

--- NEW FILE xsupplicant-1.2.2-buf.patch ---
--- xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c.buf	2006-01-03 08:38:37.000000000 +0100
+++ xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c	2006-01-03 08:40:18.000000000 +0100
@@ -806,7 +806,9 @@
   sockData = thisint->sockData;
 
   errno = 0;
-  resultsize = 1550;
+  resultsize = 1520; /* was 1550 but this can cause a bufoverflow, upstream
+                        has changed this to 1520 in CVS, so we fix this
+                        the same way */
 
   newsize = recvfrom(sockData->sockInt, resultframe, resultsize, 0, 0, 0);
   if (newsize <= 0)


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xsupplicant.spec	15 Nov 2005 19:50:16 -0000	1.13
+++ xsupplicant.spec	3 Jan 2006 14:51:09 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.2-compilefix.patch
+Patch2:		xsupplicant-1.2.2-buf.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Tue Jan  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-7
+- fix a possible bufferoverflow bz 170045
+
 * Tue Nov  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2-6
 - compile fix
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:51:54 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  3 Jan 2006 09:51:54 -0500
Subject: fedora-security/audit fc4,1.112,1.113 fc5,1.23,1.24
Message-ID: <200601031452.k03EqPcB020721@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20645

Modified Files:
	fc4 fc5 
Log Message:
Note an issue fixed in the latest ethereal release.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc4	20 Dec 2005 22:27:22 -0000	1.112
+++ fc4	3 Jan 2006 14:51:52 -0000	1.113
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fc5	21 Dec 2005 08:38:29 -0000	1.23
+++ fc5	3 Jan 2006 14:51:52 -0000	1.24
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2005-4585 version (ethereal, fixed 0.10.14)
 CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment



From fedora-extras-commits at redhat.com  Tue Jan  3 14:52:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 09:52:38 -0500
Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.2-buf.patch, NONE,
	1.1 xsupplicant.spec, 1.13, 1.14
Message-ID: <200601031453.k03ErAKj020763@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20733

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-buf.patch 
Log Message:
fix a possible bufferoverflow bz 170045

xsupplicant-1.2.2-buf.patch:

--- NEW FILE xsupplicant-1.2.2-buf.patch ---
--- xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c.buf	2006-01-03 08:38:37.000000000 +0100
+++ xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c	2006-01-03 08:40:18.000000000 +0100
@@ -806,7 +806,9 @@
   sockData = thisint->sockData;
 
   errno = 0;
-  resultsize = 1550;
+  resultsize = 1520; /* was 1550 but this can cause a bufoverflow, upstream
+                        has changed this to 1520 in CVS, so we fix this
+                        the same way */
 
   newsize = recvfrom(sockData->sockInt, resultframe, resultsize, 0, 0, 0);
   if (newsize <= 0)


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xsupplicant.spec	15 Nov 2005 19:50:11 -0000	1.13
+++ xsupplicant.spec	3 Jan 2006 14:52:38 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.2-compilefix.patch
+Patch2:		xsupplicant-1.2.2-buf.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Tue Jan  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-7
+- fix a possible bufferoverflow bz 170045
+
 * Tue Nov  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2-6
 - compile fix
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:57:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 09:57:42 -0500
Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.2-buf.patch, NONE,
	1.1 xsupplicant.spec, 1.13, 1.14
Message-ID: <200601031458.k03EwFhl020853@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20833

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-buf.patch 
Log Message:
fix a possible bufferoverflow bz 170045

xsupplicant-1.2.2-buf.patch:

--- NEW FILE xsupplicant-1.2.2-buf.patch ---
--- xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c.buf	2006-01-03 08:38:37.000000000 +0100
+++ xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c	2006-01-03 08:40:18.000000000 +0100
@@ -806,7 +806,9 @@
   sockData = thisint->sockData;
 
   errno = 0;
-  resultsize = 1550;
+  resultsize = 1520; /* was 1550 but this can cause a bufoverflow, upstream
+                        has changed this to 1520 in CVS, so we fix this
+                        the same way */
 
   newsize = recvfrom(sockData->sockInt, resultframe, resultsize, 0, 0, 0);
   if (newsize <= 0)


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xsupplicant.spec	15 Nov 2005 19:50:05 -0000	1.13
+++ xsupplicant.spec	3 Jan 2006 14:57:42 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -10,6 +10,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
+Patch1:		xsupplicant-1.2.2-buf.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -20,6 +21,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -50,6 +52,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Tue Jan  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-7
+- fix a possible bufferoverflow bz 170045
+
 * Tue Nov  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2-6
 - compile fix (FC-4 + only)
 



From fedora-extras-commits at redhat.com  Tue Jan  3 15:09:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 10:09:52 -0500
Subject: rpms/xsupplicant/devel xsupplicant-1.2.2-docsfix.patch, NONE,
	1.1 xsupplicant.spec, 1.14, 1.15 xsupplicant-1.2.1-docsfix.patch,
	1.5, NONE
Message-ID: <200601031510.k03FAOmX022556@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-docsfix.patch 
Removed Files:
	xsupplicant-1.2.1-docsfix.patch 
Log Message:
Fix docbook doc generation on devel

xsupplicant-1.2.2-docsfix.patch:

--- NEW FILE xsupplicant-1.2.2-docsfix.patch ---
--- xsupplicant-1.2.2/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.2/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+    "/usr/share/sgml/docbook/xml-dtd-4.3-1.0-30/docbookx.dtd"
     [
       <!ENTITY chapter1 SYSTEM "chapter1.xml">
       <!ENTITY chapter2 SYSTEM "chapter2.xml">


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xsupplicant.spec	3 Jan 2006 14:51:09 -0000	1.14
+++ xsupplicant.spec	3 Jan 2006 15:09:52 -0000	1.15
@@ -9,7 +9,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
-Patch0:		xsupplicant-1.2.1-docsfix.patch
+Patch0:		xsupplicant-1.2.2-docsfix.patch
 Patch1:		xsupplicant-1.2.2-compilefix.patch
 Patch2:		xsupplicant-1.2.2-buf.patch
 


--- xsupplicant-1.2.1-docsfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 15:11:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 10:11:53 -0500
Subject: rpms/geomview/FC-4 .cvsignore, 1.2, 1.3 geomview-1.8.1-rh.patch, 1.1,
	1.2 geomview.desktop, 1.1, 1.2 geomview.spec, 1.4, 1.5 sources,
	1.2, 1.3 geomview-1.8.1-cH-2.diff, 1.1, NONE
Message-ID: <200601031513.k03FD0uD022675@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22619

Modified Files:
	.cvsignore geomview-1.8.1-rh.patch geomview.desktop 
	geomview.spec sources 
Removed Files:
	geomview-1.8.1-cH-2.diff 
Log Message:
* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Dec 2004 11:58:48 -0000	1.2
+++ .cvsignore	3 Jan 2006 15:11:53 -0000	1.3
@@ -1,3 +1,3 @@
-geomview-1.8.1.tar.gz
 maniview-2.0.0.tar.gz
 orrery-0.9.3.tar.gz
+geomview-snapshot-2004-02-21.tar.gz

geomview-1.8.1-rh.patch:

Index: geomview-1.8.1-rh.patch
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview-1.8.1-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview-1.8.1-rh.patch	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview-1.8.1-rh.patch	3 Jan 2006 15:11:53 -0000	1.2
@@ -1,4 +1,4 @@
---- geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
+--- Geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
 +++ geomview-1.8.1/configure.in	2004-03-16 13:05:13.000000000 -0600
 @@ -491,10 +491,10 @@
  


Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.desktop	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.desktop	3 Jan 2006 15:11:53 -0000	1.2
@@ -2,8 +2,8 @@
 Name=geomview
 Comment=An interactive 3D viewing program
 Exec=geomview
-Icon=geomview.png
-MimeType=
+Icon=geomview
+#MimeType=application/x-geomview
 Type=Application
 Encoding=UTF-8
 Categories=Application;Graphics;Scientific;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geomview.spec	6 Apr 2005 22:11:38 -0000	1.4
+++ geomview.spec	3 Jan 2006 15:11:53 -0000	1.5
@@ -1,57 +1,52 @@
-# $Id$
 
-%define xforms_ver 1.0
-%define maniview_ver 2.0.0
-%define orrery_ver 0.9.3
+## Conditional build:
+%define _with_orrery --with-orrery
+%define _with_maniview --with-maniview
+
+%define beta -alpha
+%define cvs  20040221
 
 Name:    geomview
 Summary: Interactive 3D viewing program
-Version: 1.8.1
-Release: 11%{?dist_tag}
+Version: 1.8.2
+Release: 0.1.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
-#Url:     http://sourceforge.net/projects/geomview/
+#Url:    http://sourceforge.net/projects/geomview/
 Group:   Applications/Engineering
-Source:  http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+#Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz
+Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: geomview.desktop
 Source2: geomview.png
 
 # Other plugins
+%define orrery_ver 0.9.3
 Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
+%define maniview_ver 2.0.0
 Source11: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
 
 ## Patches
 # put moduledir and data in sane locations
 Patch1: geomview-1.8.1-rh.patch
-# from the "patches" section of http://sourceforge.net/projects/geomview/
-Patch2: geomview-1.8.1-cH-2.diff
 
 BuildRequires: desktop-file-utils
-BuildRequires: autoconf213 automake14 libtool flex
+#BuildRequires: automake libtool
+BuildRequires: flex
 BuildRequires: openmotif-devel
-# For libGL/libGLU (yuck, but I see no other way -- Rex)
+BuildRequires: xforms-devel
+## X/GL support
+%if "%{?fedora}" > "3"
+BuildRequires: libGL-devel libGLU-devel
+%else
 BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+%endif
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-## XForms configuration
-# use xforms by default, unless rpmbuild --without xforms
-%{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
-## plugins, default to yes, unless rpmbuild --without pluginname
-# default plugins
-#{?_without_xforms:Obsoletes: %{name}-plugins < %{version}-%{release}}
-# maniview (requires xforms)
-%{?_without_xforms:%define _without_maniview --without-maniview}
-%{!?_without_maniview:%define _with_maniview --with-maniview}
-#{?_without_maniview:Obsoletes: %{name}-maniview < %{maniview_ver}-%{release}}
-# orrery
-%{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
-
 %description
 Geomview is an interactive 3D viewing program for Unix. It lets you view and
 manipulate 3D objects: you use the mouse to rotate, translate, zoom in and out,
@@ -60,16 +55,8 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-
-%if "%{?_with_xforms:1}" == "1"
-%package plugins
-Group:   Applications/Engineering
-Summary: %{name} plugins
-Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
-%description plugins
-Geomview default plugins
-%endif
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
 
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
@@ -93,39 +80,68 @@
 Group:   Applications/Engineering
 Summary: Geomview module for viewing 3D manifolds
 Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
+BuildRequires: xforms-devel 
 Obsoletes: maniview < %{maniview_ver}-%{release}
-Provides: maniview = %{maniview_ver}-%{release}
+Provides:  maniview = %{maniview_ver}-%{release}
 %description maniview
-a Geomview module for viewing 3D manifolds.
+%{summary}.
 %endif
 
 
 %prep
-%setup -q %{?_with_orrery: -a 10} %{?_with_maniview: -a 11}
+%setup -q -n %{name}-%{version}%{?beta} 
 
 %patch1 -p1 -b .rh
-%patch2 -p1 -b .gcc3
 
 libtoolize --force
-aclocal-1.4 -I ./m4
-automake-1.4
-autoconf-2.13
-autoheader-2.13
-
-# Move misc plugins to correct location
-%{?_with_orrery:(  mv orrery* src/bin; ln -s src/bin/orrery*     ) }
-%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
+aclocal -I m4
+autoconf
+autoheader
+automake -a
+
+%if "%{?_with_orrery:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 10
+pushd orrery-%{orrery_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
+
+%if "%{?_with_maniview:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 11
+pushd maniview-%{maniview_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
 
 
 %build
 
-%{?CCC:export %{CCC}}
-%{?CXX:export %{CXX}}
+export ACLOCAL=aclocal
+export AUTOMAKE=automake
+
+# --config-cache (for maniview)
 %configure \
-  %{?_with_xforms} %{?_without_xforms}
+  --config-cache 
 
-make MATHLIB=-lm %{?CCC} %{?CXX}
+# Either do (re)automake steps above for addons, or this. -- Rex
+%if 0
+#--no-recursion
+%{?_with_orrery:(cd src/bin/orrery-%{orrery_ver};%configure)}
+%{?_with_maniview:(cd src/bin/maniview-%{maniview_ver};%configure --cache-file=../../../config.cache)}
+%endif
+
+# not smp-safe
+make MATHLIB=-lm
 
 
 %install
@@ -141,7 +157,7 @@
   %{SOURCE1}
 
 # app icon
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
 
 # move the html manual for inclusion later
 mv doc/html .
@@ -149,84 +165,97 @@
 # fixup info, We'll use install-info later
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-# Manually install maniview manpage
-%{?_with_maniview:install -D -m644 src/bin/maniview*/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
+# maniview manpage
+%{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
+%POST
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 
 %preun
 if [ $1 -eq 0 ] ;then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 fi
 
+%postun
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL INSTALL.Geomview NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %doc html
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_bindir}/*
 %{_infodir}/*
-%{_mandir}/man?/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/.geomview
-%{_datadir}/%{name}/geom
-%{_datadir}/%{name}/cmap.fmap
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/gvx
-%{_libexecdir}/%{name}/animate
-%{_libexecdir}/%{name}/.geomview-animate
-%{_libexecdir}/%{name}/drawbdy
-%{_libexecdir}/%{name}/.geomview-drawbdy
-
-%if "%{?_with_xforms:1}" == "1"
-%files plugins
-%defattr(-,root,root)
-%{_libexecdir}/%{name}/example
-%{_libexecdir}/%{name}/.geomview-example
-%{_libexecdir}/%{name}/ginsu
-%{_libexecdir}/%{name}/.geomview-ginsu
-%{_libexecdir}/%{name}/graffiti
-%{_libexecdir}/%{name}/.geomview-graffiti
-%{_libexecdir}/%{name}/stereo
-%{_libexecdir}/%{name}/.geomview-stereo
-%{_libexecdir}/%{name}/sweep
-%{_libexecdir}/%{name}/.geomview-sweep
-%{_libexecdir}/%{name}/tackdown
-%{_libexecdir}/%{name}/.geomview-tackdown
-%{_libexecdir}/%{name}/transformer
-%{_libexecdir}/%{name}/.geomview-transformer
-%{_libexecdir}/%{name}/origin
-%endif
+%{_mandir}/man1/*
+%{_datadir}/geomview/
+%{_libexecdir}/geomview/gvx
+%{_libexecdir}/geomview/animate
+%{_libexecdir}/geomview/.geomview-animate
+%{_libexecdir}/geomview/drawbdy
+%{_libexecdir}/geomview/.geomview-drawbdy
+%{_libexecdir}/geomview/example
+%{_libexecdir}/geomview/.geomview-example
+%{_libexecdir}/geomview/ginsu
+%{_libexecdir}/geomview/.geomview-ginsu
+%{_libexecdir}/geomview/graffiti
+%{_libexecdir}/geomview/.geomview-graffiti
+%{_libexecdir}/geomview/stereo
+%{_libexecdir}/geomview/.geomview-stereo
+%{_libexecdir}/geomview/sweep
+%{_libexecdir}/geomview/.geomview-sweep
+%{_libexecdir}/geomview/tackdown
+%{_libexecdir}/geomview/.geomview-tackdown
+%{_libexecdir}/geomview/transformer
+%{_libexecdir}/geomview/.geomview-transformer
+%{_libexecdir}/geomview/origin
+%{?_with_orrery:%exclude %{_datadir}/geomview/modules/ }
+%{?_with_maniview:%exclude %{_datadir}/geomview/groups/ }
+%{?_with_maniview:%exclude %{_mandir}/man1/maniview* }
 
 %if "%{?_with_orrery:1}" == "1"
 %files orrery
-%defattr(-,root,root)
-%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog
+%defattr(-,root,root,-)
+%doc src/bin/orrery*/AUTHORS src/bin/orrery*/ChangeLog src/bin/orrery*/COPYING
+%doc src/bin/orrery*/NEWS src/bin/orrery*/README
 %dir %{_datadir}/geomview/modules
 %{_datadir}/geomview/modules/orrery
-%{_libexecdir}/%{name}/.geomview-orrery
+%{_libexecdir}/geomview/.geomview-orrery
 %endif
 
 %if "%{?_with_maniview:1}" == "1"
 %files maniview
-%defattr(-,root,root)
-%doc maniview*/README maniview*/NEWS maniview*/AUTHORS maniview*/ChangeLog
-%{_datadir}/%{name}/groups
-%{_libexecdir}/%{name}/maniview
-%{_libexecdir}/%{name}/.geomview-maniview
+%defattr(-,root,root,-)
+%doc src/bin/maniview*/AUTHORS src/bin/maniview*/ChangeLog src/bin/maniview*/COPYING
+%doc src/bin/maniview*/README src/bin/maniview*/NEWS
+%{_datadir}/geomview/groups/
+%{_libexecdir}/geomview/maniview
+%{_libexecdir}/geomview/.geomview-maniview
 %{_mandir}/man1/maniview*
 %endif
 
 
 %changelog
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
+- cvs20040421
+- --with-xforms unconditional, Obsoletes/Provides: geomview-plugins
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]usres.sf.net> 1.8.1-12
+- follow/use icon spec
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Dec 2004 11:58:48 -0000	1.2
+++ sources	3 Jan 2006 15:11:53 -0000	1.3
@@ -1,3 +1,3 @@
-1cb0e07a6552e9fe122491af70171536  geomview-1.8.1.tar.gz
+776c3acefac602c422dacd45119f3560  geomview-snapshot-2004-02-21.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz


--- geomview-1.8.1-cH-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 15:50:47 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 10:50:47 -0500
Subject: rpms/pbzip2 import.log,1.2,1.3
Message-ID: <200601031551.k03FpJkG022902@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22868

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.5-1 on branch devel from pbzip2-0.9.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Sep 2005 15:28:58 -0000	1.2
+++ import.log	3 Jan 2006 15:50:47 -0000	1.3
@@ -1 +1,2 @@
 pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956
+pbzip2-0_9_5-1:HEAD:pbzip2-0.9.5-1.src.rpm:1136303439



From fedora-extras-commits at redhat.com  Tue Jan  3 15:50:53 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 10:50:53 -0500
Subject: rpms/pbzip2/devel .cvsignore, 1.2, 1.3 pbzip2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601031551.k03FpP3r022907@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22868/devel

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.5-1 on branch devel from pbzip2-0.9.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
+++ .cvsignore	3 Jan 2006 15:50:52 -0000	1.3
@@ -1 +1 @@
-pbzip2-0.9.4.tar.gz
+pbzip2-0.9.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/pbzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pbzip2.spec	7 Sep 2005 15:28:58 -0000	1.1
+++ pbzip2.spec	3 Jan 2006 15:50:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pbzip2
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
@@ -43,8 +43,8 @@
 
 
 %changelog
-* Wed Aug 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-2
-- Release 0.9.4-2
+* Sat Dec 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.5-1
+- Release 0.9.5
 
 * Tue Aug 30 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-1
 - Updated RPM spec with suggestions from Oliver Falk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 15:28:58 -0000	1.2
+++ sources	3 Jan 2006 15:50:52 -0000	1.3
@@ -1 +1 @@
-54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz
+94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 16:00:33 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:00:33 -0500
Subject: rpms/pbzip2 import.log,1.3,1.4
Message-ID: <200601031601.k03G14xZ024677@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23044

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-3 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Jan 2006 15:50:47 -0000	1.3
+++ import.log	3 Jan 2006 16:00:32 -0000	1.4
@@ -1,2 +1,3 @@
 pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956
 pbzip2-0_9_5-1:HEAD:pbzip2-0.9.5-1.src.rpm:1136303439
+pbzip2-0_9_5-1:FC-3:pbzip2-0.9.5-1.src.rpm:1136304021



From fedora-extras-commits at redhat.com  Tue Jan  3 16:00:38 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:00:38 -0500
Subject: rpms/pbzip2/FC-3 .cvsignore, 1.2, 1.3 pbzip2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601031601.k03G1ATv024682@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23044/FC-3

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-3 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
+++ .cvsignore	3 Jan 2006 16:00:38 -0000	1.3
@@ -1 +1 @@
-pbzip2-0.9.4.tar.gz
+pbzip2-0.9.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/pbzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pbzip2.spec	7 Sep 2005 15:28:58 -0000	1.1
+++ pbzip2.spec	3 Jan 2006 16:00:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pbzip2
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
@@ -43,8 +43,8 @@
 
 
 %changelog
-* Wed Aug 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-2
-- Release 0.9.4-2
+* Sat Dec 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.5-1
+- Release 0.9.5
 
 * Tue Aug 30 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-1
 - Updated RPM spec with suggestions from Oliver Falk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 15:28:58 -0000	1.2
+++ sources	3 Jan 2006 16:00:38 -0000	1.3
@@ -1 +1 @@
-54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz
+94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 16:09:12 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:09:12 -0500
Subject: rpms/pbzip2 import.log,1.4,1.5
Message-ID: <200601031610.k03GA42w024795@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24759

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-4 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Jan 2006 16:00:32 -0000	1.4
+++ import.log	3 Jan 2006 16:09:12 -0000	1.5
@@ -1,3 +1,4 @@
 pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956
 pbzip2-0_9_5-1:HEAD:pbzip2-0.9.5-1.src.rpm:1136303439
 pbzip2-0_9_5-1:FC-3:pbzip2-0.9.5-1.src.rpm:1136304021
+pbzip2-0_9_5-1:FC-4:pbzip2-0.9.5-1.src.rpm:1136304536



From fedora-extras-commits at redhat.com  Tue Jan  3 16:09:28 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:09:28 -0500
Subject: rpms/pbzip2/FC-4 .cvsignore, 1.2, 1.3 pbzip2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601031610.k03GA4aw024797@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24759/FC-4

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-4 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
+++ .cvsignore	3 Jan 2006 16:09:28 -0000	1.3
@@ -1 +1 @@
-pbzip2-0.9.4.tar.gz
+pbzip2-0.9.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/pbzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pbzip2.spec	7 Sep 2005 15:28:58 -0000	1.1
+++ pbzip2.spec	3 Jan 2006 16:09:28 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pbzip2
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
@@ -43,8 +43,8 @@
 
 
 %changelog
-* Wed Aug 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-2
-- Release 0.9.4-2
+* Sat Dec 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.5-1
+- Release 0.9.5
 
 * Tue Aug 30 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-1
 - Updated RPM spec with suggestions from Oliver Falk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 15:28:58 -0000	1.2
+++ sources	3 Jan 2006 16:09:28 -0000	1.3
@@ -1 +1 @@
-54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz
+94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 16:34:13 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  3 Jan 2006 11:34:13 -0500
Subject: fedora-security/audit fc4,1.113,1.114 fc5,1.24,1.25
Message-ID: <200601031634.k03GYhlG025007@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24987

Modified Files:
	fc4 fc5 
Log Message:
Some fixes from over the holidays
Note ethereal isn't fixed in fc5t1 (but we'll update this file after t2)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc4	3 Jan 2006 14:51:52 -0000	1.113
+++ fc4	3 Jan 2006 16:34:11 -0000	1.114
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment
@@ -11,6 +12,8 @@
 CVE-2005-4153 VULNERABLE (mailman)
 CVE-2005-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
+CVE-2005-4130 ** (HelixPlayer) no information available
+CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
@@ -54,6 +57,7 @@
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
 CVE-2005-3632 version (netpbm)
+CVE-2005-3631 version (udev)
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman)
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067]
@@ -747,7 +751,7 @@
 CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 version (gd, fixed 2.0.22)
+CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream bz#175414
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)
@@ -1254,6 +1258,7 @@
 CVE-2002-1793 version (mod_ssl), also only hp
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
+CVE-2002-1593 version (httpd, fixed 2.0.42)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fc5	3 Jan 2006 14:51:52 -0000	1.24
+++ fc5	3 Jan 2006 16:34:11 -0000	1.25
@@ -12,7 +12,8 @@
 
 ** are items that need attention
 
-CVE-2005-4585 version (ethereal, fixed 0.10.14)
+CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
@@ -20,6 +21,8 @@
 CVE-2005-4153 VULNERABLE (mailman)
 CVE-2005-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
+CVE-2005-4130 ** (HelixPlayer) no information available
+CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
@@ -60,6 +63,7 @@
 CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
 CVE-2005-3662 version (netpbm)
 CVE-2005-3632 version (netpbm)
+CVE-2005-3631 version (udev)
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman) not fixed 2.1.6 BZ#174166
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least)
@@ -783,7 +787,7 @@
 CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 version (gd, fixed 2.0.22)
+CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream fc4bz#175414
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)
@@ -1297,6 +1301,7 @@
 CVE-2002-1793 version (mod_ssl), also only hp
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
+CVE-2002-1593 version (httpd, fixed 2.0.42)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)



From fedora-extras-commits at redhat.com  Tue Jan  3 16:36:17 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  3 Jan 2006 11:36:17 -0500
Subject: fedora-security/audit fc4,1.114,1.115 fc5,1.25,1.26
Message-ID: <200601031636.k03Gal9P025033@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25013

Modified Files:
	fc4 fc5 
Log Message:
Note new kernel issue



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc4	3 Jan 2006 16:34:11 -0000	1.114
+++ fc4	3 Jan 2006 16:36:12 -0000	1.115
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2005-4605 VULNERABLE (kernel) bz#176813
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fc5	3 Jan 2006 16:34:11 -0000	1.25
+++ fc5	3 Jan 2006 16:36:12 -0000	1.26
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)



From fedora-extras-commits at redhat.com  Tue Jan  3 17:26:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Jan 2006 12:26:20 -0500
Subject: rpms/keychain/FC-3 .cvsignore, 1.2, 1.3 README.Fedora, 1.1,
	1.2 keychain-manpage.patch, 1.1, 1.2 keychain.csh, 1.2,
	1.3 keychain.sh, 1.2, 1.3 keychain.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601031726.k03HQr7w026928@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/keychain/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26896

Modified Files:
	.cvsignore README.Fedora keychain-manpage.patch keychain.csh 
	keychain.sh keychain.spec sources 
Log Message:
Sync with FC-4 (#176783).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 02:55:43 -0000	1.2
+++ .cvsignore	3 Jan 2006 17:26:20 -0000	1.3
@@ -1 +1 @@
-keychain-2.5.5.tar.bz2
+keychain-2.6.1.tar.bz2


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	5 Aug 2005 02:55:43 -0000	1.1
+++ README.Fedora	3 Jan 2006 17:26:20 -0000	1.2
@@ -7,9 +7,8 @@
 different options are documented in keychain(1).
 
 Installed from Fedora Extras keychain can be easily activated by simply
-touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or
-tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to
-their ~/.zlogin file.
+touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh,
+csh or tcsh.
 This will let the user's shell invoke a default setup of keychain where it
 loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are
 not loaded by default as the necessary gpg-agent is not part of the Fedora

keychain-manpage.patch:

Index: keychain-manpage.patch
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain-manpage.patch	5 Aug 2005 02:55:43 -0000	1.1
+++ keychain-manpage.patch	3 Jan 2006 17:26:20 -0000	1.2
@@ -1,79 +1,36 @@
-diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1
---- keychain-2.5.0.orig/keychain.1	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.1	2005-01-08 13:49:25.542402807 +0200
-@@ -291,9 +291,11 @@
+--- keychain-2.6.1/keychain.1~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.1	2005-11-26 16:56:14.000000000 +0200
+@@ -303,8 +303,13 @@
+ Show version information.
  .SH "EXAMPLES"
  .IX Header "EXAMPLES"
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++.PP
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  .PP
- .Vb 5
-+\&    which keychain &>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e
- \&                source $HOME/.keychain/$HOSTNAME-sh
-@@ -305,6 +307,7 @@
- \&.profile:
- .PP
- .Vb 6
-+\&    which keychain >/dev/null 2>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        [ -f $HOME/.keychain/$host-sh ] && \e
-@@ -316,6 +319,7 @@
- This snippet would work in .login for tcsh:
- .PP
- .Vb 7
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        if (-f $HOME/.keychain/$HOST-csh) then
- \&                source $HOME/.keychain/$HOST-csh
-@@ -328,6 +332,7 @@
- This snippet would work in .login for csh:
- .PP
- .Vb 8
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        if (-f $HOME/.keychain/$host-csh) then
-diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod
---- keychain-2.5.0.orig/keychain.pod	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.pod	2005-01-08 13:49:44.002694389 +0200
-@@ -193,8 +193,10 @@
- =head1 EXAMPLES
+ .Vb 1
+ \&    eval `keychain --eval id_rsa id_dsa 0123ABCD`
+--- keychain-2.6.1/keychain.pod~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.pod	2005-11-26 16:57:25.000000000 +0200
+@@ -207,8 +207,13 @@
  
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
- 
-+    which keychain &>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	[[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \
- 		source $HOME/.keychain/$HOSTNAME-sh
-@@ -204,6 +206,7 @@
- For other Bourne-compatible shells such as sh, you can use this in
- .profile:
- 
-+    which keychain >/dev/null 2>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	[ -f $HOME/.keychain/$host-sh ] && \
-@@ -213,6 +216,7 @@
- 
- This snippet would work in .login for tcsh:
+ =head1 EXAMPLES
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	if (-f $HOME/.keychain/$HOST-csh) then
- 		source $HOME/.keychain/$HOST-csh
-@@ -223,6 +227,7 @@
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  
- This snippet would work in .login for csh:
+     eval `keychain --eval id_rsa id_dsa 0123ABCD`
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	if (-f $HOME/.keychain/$host-csh) then


Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.csh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.csh	3 Jan 2006 17:26:20 -0000	1.3
@@ -10,10 +10,13 @@
     if (! $?KCHOPTS) then
 	set KCHOPTS = "--quiet"
     endif
+    if (! $?prompt) then
+	set KCHOPTS = ( $KCHOPTS --noask )
+    endif
     if (! $?SSHKEYS) then
 	set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*`
     endif
-    if (! $?GPGKEYS ) then
+    if (! $?GPGKEYS) then
 	set GPGKEYS = ""
     endif
 


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.sh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.sh	3 Jan 2006 17:26:20 -0000	1.3
@@ -7,11 +7,19 @@
     . $HOME/.keychainrc
 
     [ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
+    case $- in
+	*i*) ;;
+	*) KCHOPTS="$KCHOPTS --noask" ;;
+    esac
     [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \
 							   $HOME/.ssh/*`
     [ -n "$GPGKEYS" ] || GPGKEYS=""
 
-    keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    if [ -n "$ZSH_VERSION" ] ; then
+	keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS}
+    else
+	keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    fi
 
     HOST=`uname -n`
     [ -f $HOME/.keychain/$HOST-sh ] && \


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
+++ keychain.spec	3 Jan 2006 17:26:20 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:	2.5.5
-Release:	2%{?dist}
+Version:	2.6.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/
@@ -31,11 +31,11 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 mkdir -p %{buildroot}%{_mandir}/man1
-install -m 755 keychain %{buildroot}%{_bindir}/keychain
-install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
-install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
-install -m 644 keychain.1 %{buildroot}%{_mandir}/man1
-install -m 644 %{SOURCE3} README.Fedora
+install -pm 755 keychain %{buildroot}%{_bindir}/keychain
+install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
+install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
+install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1
+install -pm 644 %{SOURCE3} README.Fedora
 
 %clean
 rm -rf %{buildroot}
@@ -43,12 +43,21 @@
 %files
 %defattr(-,root,root)
 %doc COPYING ChangeLog README README.Fedora
-%doc %{_mandir}/man1/keychain.1.gz
-%{_bindir}/keychain
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh
+%{_bindir}/keychain
+%{_mandir}/man1/keychain.1*
 
 %changelog
+* Sat Nov 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.6.1-1
+- Update to 2.6.1.
+- Invoke keychain with --noask in opt-in scripts in non-interactive shells
+  to fix scp'ing to an opt-in enabled account for which keychain hasn't run.
+- Make opt-in config work the same way with zsh as with other shells.
+- Replace tweaks in manpage patch with more generic instructions.
+- Make profile.d snippets non-executable (#35714).
+- Preserve timestamps of installed files, other cosmetics.
+
 * Tue Aug 16 2005  Alexander Dalloz <alex {%} dalloz {*} de> - 2.5.5-2
 - Added test for homedir mismatch in opt-in scripts, covering
   `sudo -s' (reported by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2005 02:55:43 -0000	1.2
+++ sources	3 Jan 2006 17:26:20 -0000	1.3
@@ -1 +1 @@
-3afa5ce32a5c57e43caac82db3396aac  keychain-2.5.5.tar.bz2
+408caf4fe29cd88d5684410ef896c33d  keychain-2.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 17:53:58 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Jan 2006 12:53:58 -0500
Subject: rpms/apcupsd/devel apcupsd.spec,1.4,1.5
Message-ID: <200601031754.k03HsVTP027096@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27063

Modified Files:
	apcupsd.spec 
Log Message:
Rebuild



Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apcupsd.spec	21 Dec 2005 17:02:50 -0000	1.4
+++ apcupsd.spec	3 Jan 2006 17:53:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.10.18
-Release:      6%{?dist}
+Release:      7%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-7
+- Rebuild
+
 * Wed Dec 21 2005 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-6
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan  3 18:07:29 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:07:29 -0500
Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.6, 1.7 gaim-meanwhile.spec,
	1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200601031808.k03I8JKk028825@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28787/FC-4

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2005 13:44:43 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:07:29 -0000	1.7
@@ -1 +1 @@
-gaim-meanwhile-1.2.6.tar.gz
+gaim-meanwhile-1.2.7.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gaim-meanwhile.spec	15 Dec 2005 14:33:16 -0000	1.8
+++ gaim-meanwhile.spec	3 Jan 2006 18:07:29 -0000	1.9
@@ -6,8 +6,8 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.6
-Release:	2%{?dist}
+Version:	1.2.7
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
+- Update to latest release
+
 * Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
 - Fix meanwhile requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Dec 2005 13:44:43 -0000	1.7
+++ sources	3 Jan 2006 18:07:29 -0000	1.8
@@ -1 +1 @@
-215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz
+890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:07:49 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:07:49 -0500
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.6, 1.7 gaim-meanwhile.spec, 
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200601031808.k03I8MqE028830@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28787/devel

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2005 13:43:14 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:07:49 -0000	1.7
@@ -1 +1 @@
-gaim-meanwhile-1.2.6.tar.gz
+gaim-meanwhile-1.2.7.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gaim-meanwhile.spec	15 Dec 2005 14:24:02 -0000	1.8
+++ gaim-meanwhile.spec	3 Jan 2006 18:07:49 -0000	1.9
@@ -6,8 +6,8 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.6
-Release:	2%{?dist}
+Version:	1.2.7
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
+- Update to latest release
+
 * Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
 - Fix meanwhile requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Dec 2005 13:43:14 -0000	1.6
+++ sources	3 Jan 2006 18:07:49 -0000	1.7
@@ -1 +1 @@
-215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz
+890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:12:37 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:12:37 -0500
Subject: rpms/meanwhile/FC-4 .cvsignore, 1.6, 1.7 meanwhile.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200601031813.k03IDAJ9028921@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878/FC-4

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Dec 2005 02:58:58 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:12:37 -0000	1.7
@@ -1 +1 @@
-meanwhile-1.0.1.tar.gz
+meanwhile-1.0.2.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/meanwhile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- meanwhile.spec	17 Dec 2005 02:58:58 -0000	1.5
+++ meanwhile.spec	3 Jan 2006 18:12:37 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.1
+Version:	1.0.2
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.0.2-1
+- Update to latest release
+- Fixes crash when merging buddy list with server
+
 * Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
 - Update to latest release
 - Fixes mpi conflict with mozilla-nss


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Dec 2005 02:58:58 -0000	1.6
+++ sources	3 Jan 2006 18:12:37 -0000	1.7
@@ -1 +1 @@
-85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz
+bf4ced109a367b4c5d71fe63c043270e  meanwhile-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:12:43 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:12:43 -0500
Subject: rpms/meanwhile/devel .cvsignore, 1.6, 1.7 meanwhile.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200601031813.k03IDG06028926@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878/devel

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Dec 2005 02:57:09 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:12:43 -0000	1.7
@@ -1 +1 @@
-meanwhile-1.0.1.tar.gz
+meanwhile-1.0.2.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/meanwhile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- meanwhile.spec	17 Dec 2005 02:57:09 -0000	1.6
+++ meanwhile.spec	3 Jan 2006 18:12:43 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.1
+Version:	1.0.2
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.0.2-1
+- Update to latest release
+- Fixes crash when merging buddy list with server
+
 * Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
 - Update to latest release
 - Fixes mpi conflict with mozilla-nss


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Dec 2005 02:57:09 -0000	1.6
+++ sources	3 Jan 2006 18:12:43 -0000	1.7
@@ -1 +1 @@
-85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz
+bf4ced109a367b4c5d71fe63c043270e  meanwhile-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:13:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 13:13:20 -0500
Subject: rpms/clisp/FC-4 .cvsignore, 1.4, 1.5 clisp.spec, 1.13, 1.14 sources,
	1.4, 1.5
Message-ID: <200601031813.k03IDq0F029022@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28932

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.37


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Dec 2005 22:48:56 -0000	1.4
+++ .cvsignore	3 Jan 2006 18:13:19 -0000	1.5
@@ -1 +1 @@
-clisp-2.36.tar.bz2
+clisp-2.37.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- clisp.spec	28 Dec 2005 23:29:11 -0000	1.13
+++ clisp.spec	3 Jan 2006 18:13:19 -0000	1.14
@@ -1,17 +1,17 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.36
-Release: 	7%{?dist}
+Version:	2.37
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-ExcludeArch:	ppc ppc64 x86_64
+#ExcludeArch:	ppc ppc64 x86_64
 
 
 %description
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
+- new version 2.37
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.36-1
 - New Version 2.36
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2005 22:48:56 -0000	1.4
+++ sources	3 Jan 2006 18:13:19 -0000	1.5
@@ -1 +1 @@
-b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2
+f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 18:41:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 13:41:20 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.14,1.15
Message-ID: <200601031841.k03IfqGL029358@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29323

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clisp.spec	3 Jan 2006 18:13:19 -0000	1.14
+++ clisp.spec	3 Jan 2006 18:41:20 -0000	1.15
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.37
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,7 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-#ExcludeArch:	ppc ppc64 x86_64
+ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan  3 18:41:21 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Jan 2006 13:41:21 -0500
Subject: rpms/pytz/devel .cvsignore, 1.3, 1.4 pytz.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200601031841.k03Ifs8K029363@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/pytz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29319

Modified Files:
	.cvsignore pytz.spec sources 
Log Message:
Update to 2005r



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Dec 2005 00:09:35 -0000	1.3
+++ .cvsignore	3 Jan 2006 18:41:21 -0000	1.4
@@ -1 +1 @@
-pytz-2005m.tar.bz2
+pytz-2005r.tar.bz2


Index: pytz.spec
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pytz.spec	23 Dec 2005 00:09:35 -0000	1.4
+++ pytz.spec	3 Jan 2006 18:41:21 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pytz
-Version:        2005m
+Version:        2005r
 Release:        1%{?dist}
 Summary:        World Timezone Definitions for Python
 
@@ -47,6 +47,9 @@
 %{python_sitelib}/pytz/
 
 %changelog
+* Tue Jan  3 2006 Orion Poplawski <orion at cora.nwra.com> 2005r-1
+- Update to 2005r
+
 * Thu Dec 22 2005 Orion Poplawski <orion at cora.nwra.com> 2005m-1
 - Update to 2005m
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Dec 2005 00:09:35 -0000	1.3
+++ sources	3 Jan 2006 18:41:21 -0000	1.4
@@ -1 +1 @@
-d0b8fd7e4a5be5fc763cb22044fba854  pytz-2005m.tar.bz2
+53c366ec234c09f016f35cea5dee8db7  pytz-2005r.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:23:54 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue,  3 Jan 2006 14:23:54 -0500
Subject: rpms/shorewall/devel shorewall-3.0.3-init.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 shorewall.spec, 1.15, 1.16 sources, 1.9,
	1.10 shorewall-2.4.4-init.patch, 1.1, NONE
Message-ID: <200601031924.k03JOQHb031451@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31426

Modified Files:
	.cvsignore shorewall.spec sources 
Added Files:
	shorewall-3.0.3-init.patch 
Removed Files:
	shorewall-2.4.4-init.patch 
Log Message:
Update to upstream 3.0.3


shorewall-3.0.3-init.patch:

--- NEW FILE shorewall-3.0.3-init.patch ---
diff -Naur shorewall-3.0.3.original/init.sh shorewall-3.0.3/init.sh
--- shorewall-3.0.3.original/init.sh	2005-12-07 18:03:44.000000000 -0400
+++ shorewall-3.0.3/init.sh	2006-01-03 15:18:33.000000000 -0400
@@ -36,15 +36,15 @@
 #	   shorewall status			  Displays firewall status
 #
 
-# chkconfig: 2345 25 90
+# chkconfig: - 25 90
 # description: Packet filtering firewall
 
 ### BEGIN INIT INFO
 # Provides:	  shorewall
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 5
-# Default-Stop:	  0 1 6
+# Default-Start:
+# Default-Stop:	  0 1 2 3 4 5 6
 # Description:	  starts and stops the shorewall firewall
 ### END INIT INFO
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Nov 2005 21:18:20 -0000	1.9
+++ .cvsignore	3 Jan 2006 19:23:54 -0000	1.10
@@ -1 +1 @@
-shorewall-3.0.2.tar.bz2
+shorewall-3.0.3.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- shorewall.spec	27 Nov 2005 21:18:20 -0000	1.15
+++ shorewall.spec	3 Jan 2006 19:23:54 -0000	1.16
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.0.2
+Version: 3.0.3
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -8,7 +8,7 @@
 License: GPL
 URL: http://www.shorewall.net/
 Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
-Patch0: shorewall-2.4.4-init.patch
+Patch0: shorewall-3.0.3-init.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,6 +79,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Tue Jan 03 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.3-1
+- Update to upstream 3.0.3
+
 * Sun Nov 27 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.2-1
 - Update to upstream 3.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Nov 2005 21:18:20 -0000	1.9
+++ sources	3 Jan 2006 19:23:54 -0000	1.10
@@ -1 +1 @@
-5815914ce41f6a06209afc1a468319fe  shorewall-3.0.2.tar.bz2
+2f1ef054cf1c6dbfe0e15d982f90fe11  shorewall-3.0.3.tar.bz2


--- shorewall-2.4.4-init.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 19:34:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:34:24 -0500
Subject: rpms/xforms/FC-4 xforms-1.0.90-prelink.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 sources, 1.2, 1.3 xforms.spec, 1.8, 1.9
Message-ID: <200601031934.k03JYul3031549@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525

Modified Files:
	.cvsignore sources xforms.spec 
Added Files:
	xforms-1.0.90-prelink.patch 
Log Message:
sync w/devel, update to 1.0.90


xforms-1.0.90-prelink.patch:

--- NEW FILE xforms-1.0.90-prelink.patch ---
--- xforms-1.0.90/fd2ps/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.in	2006-01-02 15:18:01.000000000 -0600
@@ -115,7 +115,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/fd2ps/Makefile.am.prelink	2003-11-13 15:46:47.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.am	2006-01-02 15:18:10.000000000 -0600
@@ -16,7 +16,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/image/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/image/Makefile.in	2006-01-02 15:05:52.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/image/Makefile.am.prelink	2003-11-13 15:46:48.000000000 -0600
+++ xforms-1.0.90/image/Makefile.am	2006-01-02 15:05:50.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/gl/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.in	2006-01-02 15:04:24.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/gl/Makefile.am.prelink	2003-11-20 03:33:11.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.am	2006-01-02 15:04:20.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/demos/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.in	2006-01-02 15:07:41.000000000 -0600
@@ -206,7 +206,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -263,12 +263,12 @@
 
 gl_SOURCES = gl.c
 gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 glwin_SOURCES = glwin.c
 glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 goodies_SOURCES = goodies.c
@@ -276,7 +276,7 @@
 
 ibrowser_SOURCES = ibrowser.c
 ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -284,7 +284,7 @@
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -295,7 +295,7 @@
 
 itest_SOURCES = itest.c
 itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -304,7 +304,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -355,7 +355,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
--- xforms-1.0.90/demos/Makefile.am.prelink	2004-02-24 09:42:43.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.am	2006-01-02 15:19:03.000000000 -0600
@@ -105,7 +105,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -168,11 +168,11 @@
 
 gl_SOURCES = gl.c
 gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 glwin_SOURCES = glwin.c
 glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 goodies_SOURCES = goodies.c
 group_SOURCES = group.c
@@ -180,14 +180,14 @@
 ibrowser_SOURCES = ibrowser.c
 ibrowser.$(OBJEXT): fd/ibrowser_gui.c
 ibrowser_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 iconify_SOURCES = iconify.c
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 inputall_SOURCES = inputall.c
@@ -199,7 +199,7 @@
 itest_SOURCES = itest.c
 itest.$(OBJEXT): fd/is_gui.c
 itest_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 lalign_SOURCES = lalign.c
@@ -207,7 +207,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 longlabel_SOURCES = longlabel.c
@@ -260,7 +260,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 yesno_SOURCES = yesno.c
--- xforms-1.0.90/lib/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.in	2006-01-02 14:52:11.000000000 -0600
@@ -116,7 +116,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \
--- xforms-1.0.90/lib/Makefile.am.prelink	2003-11-20 03:33:16.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.am	2006-01-02 14:52:19.000000000 -0600
@@ -17,7 +17,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:33:57 -0000	1.2
+++ .cvsignore	3 Jan 2006 19:34:24 -0000	1.3
@@ -1 +1,2 @@
-xforms-1.0.tar.gz
+xforms-1.0.90.tar.gz
+xforms-1.0.90.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:33:57 -0000	1.2
+++ sources	3 Jan 2006 19:34:24 -0000	1.3
@@ -1 +1,2 @@
-64adf1c489b629a92218f7c140f4bdaf  xforms-1.0.tar.gz
+558b600402430f207e671e2d0d725b6d  xforms-1.0.90.tar.gz
+23989dbab27a1b406125bde2a2cc2b90  xforms-1.0.90.tar.gz.sig


Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/xforms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xforms.spec	23 May 2005 00:21:33 -0000	1.8
+++ xforms.spec	3 Jan 2006 19:34:24 -0000	1.9
@@ -1,68 +1,74 @@
-# $Id$
-
-# Since we're using xmkmf, we must match XFree86's notion of these
-%define _x11dir /usr/X11R6
-%define _prefix %{_x11dir}
-%define _mandir %{_prefix}/man
 
 Name:    xforms
-Summary: X11 toolkit library
-Version: 1.0
-Release: 4%{?dist_tag}
+Summary: XForms toolkit library
+Version: 1.0.90
+Release: 5%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
 URL:     http://www.nongnu.org/xforms/
-Source:  http://savannah.nongnu.org/download/xforms/stable.pkg/%{version}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
+Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# TODO: remove -lc (all), -lm (most) linker steps
+Patch1: xforms-1.0.90-prelink.patch
 
-BuildRequires: XFree86-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
+BuildRequires: libGL-devel
+%if "%{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%define x_deps libX11-devel
+%endif
 
-# for xforms' import/export of various image types, including: png, sgi
+# import/export: png, sgi (optional?)
 Requires: netpbm-progs
+# import eps,ps (optional?)
+#Requires: ghostscript
 
 
 %description
-xforms is an X11 toolkit library.
-This package contains the runtime libraries for the xforms toolkit.
+XForms is a GUI toolkit based on Xlib for X Window Systems. It
+features a rich set of objects, such as buttons, sliders, and menus
+etc. integrated into an easy and efficient object/event callback
+execution model that allows fast and easy construction of
+X-applications. In addition, the library is extensible and new objects
+can easily be created and added to the library.
 
-It has now gone Open Source (LGPL).
 
 %package devel
-Summary: Development files for the xforms toolkit
+Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-# legacy versions included -designer/-static subpkgs
-Obsoletes: %{name}-designer < %{version}-%{release}
-Provides:  %{name}-designer = %{version}-%{release}
-Obsoletes: %{name}-static < %{version}-%{release}
-Provides:  %{name}-static = %{version}-%{release}
+Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
 %description devel
-This package contains development headers and libraries for %{name}.
-
-Install this if you intend to develop / compile programs with %{name}.
+%{summary}.
 
 
 %prep
 
 %setup -q
 
+%patch1 -p1 -b .prelink
+
 
 %build
 
-(unset RPM_OPT_FLAGS; xmkmf -a)
+%configure \
+  --disable-static \
+  --enable-optimization="$RPM_OPT_FLAGS"
 
 make %{?_smp_mflags} \
-    CDEBUGFLAGS="$RPM_OPT_FLAGS"
+  X_PRE_LIBS=''
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# makeinstall macro doesn't work for this pkg.
-make install install.man DESTDIR="$RPM_BUILD_ROOT"
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
@@ -70,24 +76,43 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root)
-%doc *README Changes Copyright COPYING
+%doc COPYING.LIB Copyright ChangeLog NEWS README
 %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/fd*
+%{_bindir}/*
 %{_includedir}/*
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
-%{_mandir}/man*/fd*
+%{_mandir}/man*/*
+
+
+%changelog 
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
+- prelink.patch: fix undefined symbols in (shared) lib(s)
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
+- BR: libXpm-devel
+- -devel: Req: libX11-devel 
+
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-3
+- BR: libGL-devel
+- #BR: libXpm-devel (coming soon)
+
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-2
+- BR: libGL.so.1 -> BR: %%x_pkg-Mesa-libGL 
+- remove legacy crud
 
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-1
+- 1.0.90
+- new version removes use-of/references-to xmkmf,/usr/X11R6 (#170942)
 
-%changelog
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.0-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan  3 19:40:14 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 14:40:14 -0500
Subject: rpms/clisp/FC-3 .cvsignore, 1.3, 1.4 clisp.spec, 1.10, 1.11 sources,
	1.4, 1.5
Message-ID: <200601031940.k03Jekr1031677@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31656

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.37


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Dec 2005 22:38:04 -0000	1.3
+++ .cvsignore	3 Jan 2006 19:40:14 -0000	1.4
@@ -1 +1 @@
-clisp-2.36.tar.bz2
+clisp-2.37.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clisp.spec	28 Dec 2005 23:06:20 -0000	1.10
+++ clisp.spec	3 Jan 2006 19:40:14 -0000	1.11
@@ -1,17 +1,17 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.36
-Release: 	7%{?dist}
+Version:	2.37
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:	XFree86-devel
-ExcludeArch:	x86_64
+ExcludeArch:	ppc ppc64
 
 %description
 ANSI Common Lisp is a high-level, general-purpose programming
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
+- new version 2.37
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.36-1
 - New Version 2.36
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2005 22:41:01 -0000	1.4
+++ sources	3 Jan 2006 19:40:14 -0000	1.5
@@ -1 +1 @@
-b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2
+f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:40:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:40:54 -0500
Subject: rpms/geomview/devel geomview.spec,1.5,1.6
Message-ID: <200601031941.k03JfRJJ031753@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31683

Modified Files:
	geomview.spec 
Log Message:
* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
- rework Obsoletes/Provides: geomview-plugins



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.spec	3 Jan 2006 14:43:54 -0000	1.5
+++ geomview.spec	3 Jan 2006 19:40:54 -0000	1.6
@@ -1,6 +1,5 @@
 
 ## Conditional build:
-# FIXME
 %define _with_orrery --with-orrery
 %define _with_maniview --with-maniview
 
@@ -10,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.1.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -20,6 +19,9 @@
 Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
+
 Source1: geomview.desktop
 Source2: geomview.png
 
@@ -39,10 +41,10 @@
 BuildRequires: openmotif-devel
 BuildRequires: xforms-devel
 ## X/GL support
-%if "%{?fedora}" > "4"
+%if "%{?fedora}" > "3"
 BuildRequires: libGL-devel libGLU-devel
 %else
-BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+BuildRequires: libGL.so.1 libGLU.so.1
 %endif
 
 Requires(post): /sbin/install-info
@@ -56,9 +58,6 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-Obsoletes: %{name}-plugins < %{version}-%{release}
-Provides:  %{name}-plugins = %{version}-%{release}
-
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
 Group:   Applications/Engineering
@@ -250,6 +249,9 @@
 
 
 %changelog
+* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
+- rework Obsoletes/Provides: geomview-plugins
+
 * Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
 - cvs20040421
 - --with-xforms unconditional, Obsoletes/Provides: geomview-plugins



From fedora-extras-commits at redhat.com  Tue Jan  3 19:41:16 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 14:41:16 -0500
Subject: rpms/clisp/devel .cvsignore, 1.3, 1.4 clisp.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <200601031941.k03Jfmjk031765@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31703

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.37


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Dec 2005 19:49:58 -0000	1.3
+++ .cvsignore	3 Jan 2006 19:41:16 -0000	1.4
@@ -1 +1 @@
-clisp-2.36.tar.bz2
+clisp-2.37.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clisp.spec	28 Dec 2005 23:07:47 -0000	1.9
+++ clisp.spec	3 Jan 2006 19:41:16 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.36
-Release: 	7%{?dist}
+Version:	2.37
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -20,7 +20,7 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-ExcludeArch:	x86_64 ppc ppc64
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
+- new version 2.37
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.36-1
 - New Version 2.36
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2005 19:49:58 -0000	1.4
+++ sources	3 Jan 2006 19:41:16 -0000	1.5
@@ -1 +1 @@
-b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2
+f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:49:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:49:24 -0500
Subject: rpms/geomview/FC-4 geomview.spec,1.5,1.6
Message-ID: <200601031949.k03JnuHp031979@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31922

Modified Files:
	geomview.spec 
Log Message:
* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
- rework Obsoletes/Provides: geomview-plugins



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.spec	3 Jan 2006 15:11:53 -0000	1.5
+++ geomview.spec	3 Jan 2006 19:49:24 -0000	1.6
@@ -9,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.1.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -19,6 +19,9 @@
 Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
+
 Source1: geomview.desktop
 Source2: geomview.png
 
@@ -41,7 +44,7 @@
 %if "%{?fedora}" > "3"
 BuildRequires: libGL-devel libGLU-devel
 %else
-BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+BuildRequires: libGL.so.1 libGLU.so.1
 %endif
 
 Requires(post): /sbin/install-info
@@ -55,9 +58,6 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-Obsoletes: %{name}-plugins < %{version}-%{release}
-Provides:  %{name}-plugins = %{version}-%{release}
-
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
 Group:   Applications/Engineering
@@ -249,6 +249,9 @@
 
 
 %changelog
+* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
+- rework Obsoletes/Provides: geomview-plugins
+
 * Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
 - cvs20040421
 - --with-xforms unconditional, Obsoletes/Provides: geomview-plugins



From fedora-extras-commits at redhat.com  Tue Jan  3 19:49:19 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue,  3 Jan 2006 14:49:19 -0500
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.6,
	1.7 epiphany-extensions.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601031949.k03Jnqii031947@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31906

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
* Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com> - 1.9.4-1
- Update to 1.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2005 15:15:21 -0000	1.6
+++ .cvsignore	3 Jan 2006 19:49:19 -0000	1.7
@@ -2,3 +2,5 @@
 epiphany-extensions-1.7.4.tar.bz2
 epiphany-extensions-1.8.0.tar.bz2
 epiphany-extensions-1.8.1.tar.bz2
+epiphany-extensions-1.9.3.tar.bz2
+epiphany-extensions-1.9.4.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- epiphany-extensions.spec	10 Oct 2005 15:15:21 -0000	1.5
+++ epiphany-extensions.spec	3 Jan 2006 19:49:19 -0000	1.6
@@ -1,8 +1,8 @@
-%define ephy_major 1.8
+%define ephy_major 1.9
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.8.1
+Version: 1.9.4
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -21,7 +21,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-compiler-warnings
 %{__make} %{?_smp_mflags}
 
 %install
@@ -39,6 +39,12 @@
 %{_libdir}/epiphany
 
 %changelog
+* Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com> - 1.9.4-1
+- Update to 1.9.4
+
+* Fri Dec 30 2005 Christopher Aillon <caillon at redhat.com> - 1.9.3-1
+- Update to 1.9.3
+
 * Mon Oct 10 2005 Christopher Aillon <caillon at redhat.com> - 1.8.1-1
 - Update to 1.8.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2005 15:15:21 -0000	1.6
+++ sources	3 Jan 2006 19:49:19 -0000	1.7
@@ -1 +1 @@
-d1c40978c89a845973ed131774fa7769  epiphany-extensions-1.8.1.tar.bz2
+407b67286f6a18eacda5e21ae315cdf2  epiphany-extensions-1.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:51:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:51:44 -0500
Subject: rpms/geomview/FC-4 geomview.spec,1.6,1.7
Message-ID: <200601031952.k03JqGL5032041@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32024

Modified Files:
	geomview.spec 
Log Message:
microincrement Release for botched 'make tag'



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geomview.spec	3 Jan 2006 19:49:24 -0000	1.6
+++ geomview.spec	3 Jan 2006 19:51:43 -0000	1.7
@@ -9,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.2.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}.1
 
 License: LGPL
 Url:     http://www.geomview.org/



From fedora-extras-commits at redhat.com  Tue Jan  3 19:55:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 14:55:26 -0500
Subject: rpms/clisp/devel clisp.spec,1.10,1.11
Message-ID: <200601031955.k03Jtww2032190@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32154/devel

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clisp.spec	3 Jan 2006 19:41:16 -0000	1.10
+++ clisp.spec	3 Jan 2006 19:55:26 -0000	1.11
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.37
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel



From fedora-extras-commits at redhat.com  Tue Jan  3 19:55:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue,  3 Jan 2006 14:55:29 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.3,1.4
Message-ID: <200601031956.k03Ju1R1032193@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32150

Modified Files:
	nautilus-actions.spec 
Log Message:
Disable commandline-tool configure option on FC3



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nautilus-actions.spec	2 Jan 2006 23:27:23 -0000	1.3
+++ nautilus-actions.spec	3 Jan 2006 19:55:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -23,7 +23,7 @@
 %setup -q
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool  \
+%configure --disable-schemas-install --disable-commandline-tool  \
            --with-nautilus-extdir=%{_libdir}/nautilus/extensions-1.0
 make %{?_smp_mflags} 
 
@@ -85,6 +85,10 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Tue Jan 3 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-7
+- Disable commandline-tool option on FC3 as Glib-2.4 doesn't implement
+  the necesary api
+
 * Mon Jan 2 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-6
 - Add nautilus extensions dir to configure arguments
 



From fedora-extras-commits at redhat.com  Tue Jan  3 20:23:34 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue,  3 Jan 2006 15:23:34 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.4,1.5
Message-ID: <200601032024.k03KO7uw001686@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1656

Modified Files:
	nautilus-actions.spec 
Log Message:
Rebuild



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nautilus-actions.spec	3 Jan 2006 19:55:29 -0000	1.4
+++ nautilus-actions.spec	3 Jan 2006 20:23:34 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 7%{?dist}
+Release: 7.1%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -76,8 +76,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/nautilus-actions-config
-%{_bindir}/nautilus-actions-convert
-%{_bindir}/nautilus-actions-new-config
 %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-nact.desktop
@@ -85,7 +83,7 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
-* Tue Jan 3 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-7
+* Tue Jan 3 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-7.1
 - Disable commandline-tool option on FC3 as Glib-2.4 doesn't implement
   the necesary api
 



From fedora-extras-commits at redhat.com  Tue Jan  3 21:32:20 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Jan 2006 16:32:20 -0500
Subject: rpms/gdl/devel gdl.spec,1.6,1.7
Message-ID: <200601032132.k03LWqPG003686@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657

Modified Files:
	gdl.spec 
Log Message:
Rebuild



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdl.spec	21 Nov 2005 18:24:24 -0000	1.6
+++ gdl.spec	3 Jan 2006 21:32:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.8.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-2
+- Rebuild
+
 * Mon Nov 21 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-1
 - Upstream 0.8.11
 - Remove hdf patch fixed upstream



From fedora-extras-commits at redhat.com  Tue Jan  3 23:22:35 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  3 Jan 2006 18:22:35 -0500
Subject: rpms/rpy/FC-3 rpy.spec,1.3,1.4
Message-ID: <200601032323.k03NNCsh007458@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7438

Modified Files:
	rpy.spec 
Log Message:
Update to work with R-2.2.1


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpy.spec	11 Oct 2005 07:43:42 -0000	1.3
+++ rpy.spec	3 Jan 2006 23:22:34 -0000	1.4
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:	GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+- Update for R-2.2.1
+
 * Tue Oct 11 2005 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 23:31:56 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  3 Jan 2006 18:31:56 -0500
Subject: rpms/rpy/FC-4 rpy.spec,1.3,1.4
Message-ID: <200601032332.k03NWSiv007491@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7474

Modified Files:
	rpy.spec 
Log Message:
Update to work with R-2.2.1


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpy.spec	11 Oct 2005 07:42:50 -0000	1.3
+++ rpy.spec	3 Jan 2006 23:31:56 -0000	1.4
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:	GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+- Update for R-2.2.1
+
 * Tue Oct 11 2005 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 23:32:47 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  3 Jan 2006 18:32:47 -0500
Subject: rpms/rpy/devel rpy.spec,1.3,1.4
Message-ID: <200601032333.k03NXJ4H007514@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7497

Modified Files:
	rpy.spec 
Log Message:
Update to work with R-2.2.1


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpy.spec	11 Oct 2005 07:41:26 -0000	1.3
+++ rpy.spec	3 Jan 2006 23:32:47 -0000	1.4
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:	GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+- Update for R-2.2.1
+
 * Tue Oct 11 2005 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 



From fedora-extras-commits at redhat.com  Wed Jan  4 00:52:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 19:52:55 -0500
Subject: rpms/wine/FC-3 wine.spec,1.3,1.4
Message-ID: <200601040053.k040rRlR009508@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445/FC-3

Modified Files:
	wine.spec 
Log Message:
- fix #176834



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine.spec	2 Jan 2006 09:31:09 -0000	1.3
+++ wine.spec	4 Jan 2006 00:52:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -306,6 +306,7 @@
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
+%{_libdir}/wine/winecfg.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -600,7 +601,6 @@
 %{_libdir}/wine/taskmgr.exe.so
 %{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
-%{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
 %{_libdir}/wine/winemine.exe.so
@@ -675,6 +675,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-5
+- fix #176834 
+
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-4
 - bump for import



From fedora-extras-commits at redhat.com  Wed Jan  4 00:53:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 19:53:01 -0500
Subject: rpms/wine/FC-4 wine.spec,1.5,1.6
Message-ID: <200601040053.k040rYw6009515@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445/FC-4

Modified Files:
	wine.spec 
Log Message:
- fix #176834



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wine.spec	2 Jan 2006 09:27:20 -0000	1.5
+++ wine.spec	4 Jan 2006 00:53:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -306,6 +306,8 @@
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/uninstaller.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -598,9 +600,7 @@
 %{_libdir}/wine/notepad.exe.so
 %{_libdir}/wine/progman.exe.so
 %{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
-%{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
 %{_libdir}/wine/winemine.exe.so
@@ -675,6 +675,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-5
+- fix #176834 
+
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-4
 - bump for import



From fedora-extras-commits at redhat.com  Wed Jan  4 00:53:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 19:53:06 -0500
Subject: rpms/wine/devel wine.spec,1.5,1.6
Message-ID: <200601040053.k040rdx6009518@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445/devel

Modified Files:
	wine.spec 
Log Message:
- fix #176834



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wine.spec	2 Jan 2006 09:09:15 -0000	1.5
+++ wine.spec	4 Jan 2006 00:53:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -310,6 +310,8 @@
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/uninstaller.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -602,9 +604,7 @@
 %{_libdir}/wine/notepad.exe.so
 %{_libdir}/wine/progman.exe.so
 %{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
-%{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
 %{_libdir}/wine/winemine.exe.so
@@ -679,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>     
+0.9.4-5                                                                 
+- fix #176834 
+
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-4
 - add dist



From fedora-extras-commits at redhat.com  Wed Jan  4 04:08:14 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue,  3 Jan 2006 23:08:14 -0500
Subject: rpms/net6/FC-4 .cvsignore, 1.2, 1.3 net6.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200601040409.k0449BxE016749@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/net6/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16728

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/net6/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 22:22:10 -0000	1.2
+++ .cvsignore	4 Jan 2006 04:08:08 -0000	1.3
@@ -1 +1 @@
-net6-1.1.0.tar.gz
+net6-1.2.2.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/FC-4/net6.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net6.spec	3 Oct 2005 16:51:57 -0000	1.2
+++ net6.spec	4 Jan 2006 04:08:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           net6
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
@@ -70,6 +70,18 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 1.2.2-1
+- 1.2.2
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 1.2.1-2
+- Rebuild
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 1.2.1-1
+- Bump to 1.2.1
+
+* Wed Nov 16 2005 Luke Macken <lmacken at redhat.com> - 1.2.0-1
+- Bump to 1.2.0
+
 * Fri Sep 30 2005 Luke Macken <lmacken at redhat.com> - 1.1.0-2
 - Use find_lang macro
 - Add pkg-config to -devel Requires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/net6/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2005 22:22:10 -0000	1.2
+++ sources	4 Jan 2006 04:08:08 -0000	1.3
@@ -1 +1 @@
-522229474ff554a4ce883002011d0fbb  net6-1.1.0.tar.gz
+8a551a2d9785b2b0ed431bb9eeb6cfd6  net6-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 04:25:16 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue,  3 Jan 2006 23:25:16 -0500
Subject: rpms/obby/FC-4 .cvsignore, 1.2, 1.3 obby.spec, 1.6, 1.7 sources, 1.2,
	1.3
Message-ID: <200601040425.k044PmGY016895@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16874

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
0.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2005 06:43:46 -0000	1.2
+++ .cvsignore	4 Jan 2006 04:25:16 -0000	1.3
@@ -1 +1 @@
-obby-0.2.0.tar.gz
+obby-0.3.0.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- obby.spec	16 Oct 2005 23:51:21 -0000	1.6
+++ obby.spec	4 Jan 2006 04:25:16 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           obby
-Version:        0.2.0
-Release:        6%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@
 Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  net6-devel, gmp-devel, gettext-devel, howl-devel
+BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
 
 %description
 libobby is a library which provides synced document buffers. It supports
@@ -21,7 +21,7 @@
 Summary:        Development libraries for obby
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig, net6-devel, gmp-devel, howl-devel
+Requires:       pkgconfig, net6-devel, gmp-devel
 
 %description devel
 libobby is a library which provides synced document buffers. This package
@@ -36,7 +36,7 @@
 aclocal && autoconf
 sed -i 's!\(return (\)int\() gettext ("")\)!\1long\2!' configure
 
-%configure --disable-static --with-howl
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
 * Sun Oct 16 2005 Luke Macken <lmacken at redhat.com> - 0.2.0-6
 - Patch from Toshio Kuratomi to fix FC4 build on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2005 06:43:46 -0000	1.2
+++ sources	4 Jan 2006 04:25:16 -0000	1.3
@@ -1 +1 @@
-6bd46f9b8c7652d7bfa8413ed2c2af4b  obby-0.2.0.tar.gz
+b14135018a3093395296cf091f9f824f  obby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 04:32:59 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue,  3 Jan 2006 23:32:59 -0500
Subject: rpms/obby/FC-4 obby.spec,1.7,1.8
Message-ID: <200601040433.k044XVJD016961@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16944

Modified Files:
	obby.spec 
Log Message:
remove workarounds


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obby.spec	4 Jan 2006 04:25:16 -0000	1.7
+++ obby.spec	4 Jan 2006 04:32:58 -0000	1.8
@@ -33,9 +33,6 @@
 
 
 %build
-aclocal && autoconf
-sed -i 's!\(return (\)int\() gettext ("")\)!\1long\2!' configure
-
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -70,6 +67,7 @@
 %changelog
 * Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
+- Remove broken build workarounds
 
 * Sun Oct 16 2005 Luke Macken <lmacken at redhat.com> - 0.2.0-6
 - Patch from Toshio Kuratomi to fix FC4 build on x86_64



From fedora-extras-commits at redhat.com  Wed Jan  4 08:53:34 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed,  4 Jan 2006 03:53:34 -0500
Subject: rpms/python-myghty/devel .cvsignore, 1.3, 1.4 python-myghty.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601040854.k048s71C024023@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23996

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
0.99a


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 00:57:18 -0000	1.3
+++ .cvsignore	4 Jan 2006 08:53:33 -0000	1.4
@@ -1 +1 @@
-Myghty-0.99.tar.gz
+Myghty-0.99a.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-myghty.spec	6 Oct 2005 00:57:18 -0000	1.2
+++ python-myghty.spec	4 Jan 2006 08:53:33 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        0.99
+Version:        0.99a
 Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 0.99a-1
+- Bump to 0.99a
+
 * Wed Oct 05 2005 Luke Macken <lmacken at redhat.com> 0.99-1
 - Bump to version 0.99
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 00:57:18 -0000	1.3
+++ sources	4 Jan 2006 08:53:33 -0000	1.4
@@ -1 +1 @@
-01e8677f38e5f822038c12b120f05704  Myghty-0.99.tar.gz
+09953871f9616e4c5f6059fc6bf06b7e  Myghty-0.99a.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 09:17:35 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed,  4 Jan 2006 04:17:35 -0500
Subject: rpms/python-myghty/devel python-myghty.spec,1.3,1.4
Message-ID: <200601040918.k049I8OU026276@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26104

Modified Files:
	python-myghty.spec 
Log Message:
Install with --old-and-unmanageable to avoid Python Eggs annoyance


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-myghty.spec	4 Jan 2006 08:53:33 -0000	1.3
+++ python-myghty.spec	4 Jan 2006 09:17:21 -0000	1.4
@@ -33,9 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --old-and-unmanageable --root $RPM_BUILD_ROOT
 (cd doc ; %{__python} genhtml.py)
-find ./doc ./examples -type f -perm +001 | xargs chmod -x
 
 
 %clean
@@ -51,6 +50,7 @@
 %changelog
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 0.99a-1
 - Bump to 0.99a
+- Install with --old-and-unmanageable to avoid Python Eggs annoyance
 
 * Wed Oct 05 2005 Luke Macken <lmacken at redhat.com> 0.99-1
 - Bump to version 0.99



From fedora-extras-commits at redhat.com  Wed Jan  4 10:54:01 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed,  4 Jan 2006 05:54:01 -0500
Subject: rpms/tinyerp/devel tinyerp-server.logrotate, NONE, 1.1 tinyerp.spec,
	1.9, 1.10
Message-ID: <200601041054.k04AsXLD028375@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28336

Modified Files:
	tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - synced devel from FC-4 version



--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyerp.spec	28 Nov 2005 18:09:17 -0000	1.9
+++ tinyerp.spec	4 Jan 2006 10:54:00 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -13,13 +13,13 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
-BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb, xorg-x11-fonts-misc
+BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb
 Requires:	pygtk2, pygtk2-libglade, pydot
-Requires(pre):	fedora-usermgmt
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
 
@@ -38,6 +38,9 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
+Requires(pre):	fedora-usermgmt
+Requires(postun):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -49,7 +52,7 @@
 
 %build
 cd tinyerp-client-%{version}
-/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate -fp /usr/share/X11/fonts/misc &
+/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
@@ -57,7 +60,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 cd tinyerp-client-%{version}
-/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate -fp /usr/share/X11/fonts/misc &
+/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
@@ -78,6 +81,7 @@
 
 install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
 install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -97,8 +101,9 @@
 %files server
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
-%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -109,8 +114,6 @@
 /usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 exit 0
 
 %post server
@@ -132,17 +135,19 @@
 
 
 %changelog
-* Mon Nov 28 2005 Dan Horak <dan at danny.cz> 3.1.1-1
-- update to TinyERP 3.1.1
+* Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
+- added Requires(postun) to the -server package (Ville Skytt??)
+- improved startup script, suggested by Enrico Scholz
+- added log rotation
 
-* Wed Nov 23 2005 Dan Horak <dan at danny.cz> 3.1.0-4
-- modify BuildRequires again to support FC5
+* Sun Dec 11 2005 Dan Horak <dan at danny.cz> 3.1.1-4
+- moved Requires(pre) to the -server package (Ville Skytt??)
 
-* Tue Nov 22 2005 Dan Horak <dan at danny.cz> 3.1.0-3
-- modify path of Xvfb to support FC5
+* Thu Dec  7 2005 Dan Horak <dan at danny.cz> 3.1.1-3
+- chown for log and spool is not required
 
-* Sun Nov 20 2005 Dan Horak <dan at danny.cz> 3.1.0-2
-- modify BuildRequires to support FC5
+* Mon Nov 28 2005 Dan Horak <dan at danny.cz> 3.1.1-1
+- upgrade to tinyerp 3.1.1
 
 * Sun Nov 20 2005 Dan Horak <dan at danny.cz> 3.1.0-1
 - upgrade to tinyerp 3.1.x



From fedora-extras-commits at redhat.com  Wed Jan  4 11:19:49 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed,  4 Jan 2006 06:19:49 -0500
Subject: rpms/tinyerp/devel tinyerp.spec,1.10,1.11
Message-ID: <200601041120.k04BKLaf030112@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30093

Modified Files:
	tinyerp.spec 
Log Message:
 - updated Xorg dependencies



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec	4 Jan 2006 10:54:00 -0000	1.10
+++ tinyerp.spec	4 Jan 2006 11:19:48 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -18,7 +18,8 @@
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
-BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb
+BuildRequires:	desktop-file-utils
+BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base, xorg-x11-fonts-misc
 Requires:	pygtk2, pygtk2-libglade, pydot
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
@@ -52,7 +53,7 @@
 
 %build
 cd tinyerp-client-%{version}
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
@@ -60,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 cd tinyerp-client-%{version}
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
@@ -135,6 +136,9 @@
 
 
 %changelog
+* Wed Jan  4 2006 Dan Horak <dan at danny.cz> 3.1.1-6
+- added new Xorg dependencies
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
 - improved startup script, suggested by Enrico Scholz



From fedora-extras-commits at redhat.com  Wed Jan  4 20:20:40 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed,  4 Jan 2006 15:20:40 -0500
Subject: idweb - Imported sources
Message-ID: <200601042020.k04KKefb014585@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/idweb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14571

Log Message:
Initial import of skeleton.

Status:

Vendor Tag:	FEDORA
Release Tags:	V0_0
		
N idweb/README
N idweb/sql/fid.sql

No conflicts created by this import




From fedora-extras-commits at redhat.com  Wed Jan  4 20:27:34 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:27:34 -0500
Subject: rpms/python-basemap - New directory
Message-ID: <200601042027.k04KRaRu014695@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14687/python-basemap

Log Message:
Directory /cvs/extras/rpms/python-basemap added to the repository




From fedora-extras-commits at redhat.com  Wed Jan  4 20:27:40 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:27:40 -0500
Subject: rpms/python-basemap/devel - New directory
Message-ID: <200601042027.k04KRgiU014712@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14687/python-basemap/devel

Log Message:
Directory /cvs/extras/rpms/python-basemap/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan  4 20:28:00 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:28:00 -0500
Subject: rpms/python-basemap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601042028.k04KS2na014750@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14736

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-basemap


--- NEW FILE Makefile ---
# Top level Makefile for module python-basemap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan  4 20:28:06 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:28:06 -0500
Subject: rpms/python-basemap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601042028.k04KS8ae014770@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14736/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-basemap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan  4 20:29:15 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:29:15 -0500
Subject: rpms/python-basemap import.log,1.1,1.2
Message-ID: <200601042029.k04KTmgb014856@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14816

Modified Files:
	import.log 
Log Message:
auto-import python-basemap-0.7.2.1-1 on branch devel from python-basemap-0.7.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Jan 2006 20:28:00 -0000	1.1
+++ import.log	4 Jan 2006 20:29:15 -0000	1.2
@@ -0,0 +1 @@
+python-basemap-0_7_2_1-1:HEAD:python-basemap-0.7.2.1-1.src.rpm:1136406545



From fedora-extras-commits at redhat.com  Wed Jan  4 20:29:22 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:29:22 -0500
Subject: rpms/python-basemap/devel python-basemap-0.7.2.1.patch, NONE,
	1.1 python-basemap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601042029.k04KTsHK014860@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14816/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-basemap-0.7.2.1.patch python-basemap.spec 
Log Message:
auto-import python-basemap-0.7.2.1-1 on branch devel from python-basemap-0.7.2.1-1.src.rpm

python-basemap-0.7.2.1.patch:

--- NEW FILE python-basemap-0.7.2.1.patch ---
--- basemap-0.7.2.1/setup.py.orig	2005-11-18 06:44:22.000000000 -0700
+++ basemap-0.7.2.1/setup.py	2005-11-20 11:24:20.000000000 -0700
@@ -11,7 +11,7 @@
     DBFUpdateHeader is available, we scan shapefil.h for the string
     'DBFUpdateHeader'.
     """
-    f = open(convert_path("pyshapelib/shapelib/shapefil.h"))
+    f = open(convert_path("/usr/include/libshp//shapefil.h"))
     contents = f.read()
     f.close()
     if contents.find("DBFUpdateHeader") >= 0:
@@ -19,35 +19,30 @@
     else:
         return [("HAVE_UPDATE_HEADER", "0")]
 
-deps = glob.glob('src/*.c')
+#deps = glob.glob('src/*.c')
 
-extensions = [Extension("proj4",deps,include_dirs = ['src'],)]
+extensions = [Extension("proj4",['proj4.c'],libraries=["proj"])]
 packages          = ['matplotlib/toolkits','matplotlib/toolkits/basemap']
 package_dirs       = {'':'lib'}
 
-# don't build pyshapelib if it is already installed.
+# Always build pyshapelib for RPM consistency, uses system shapelib
 
-try:
-    import shapelib
-    import dbflib
-except:
-    packages = packages + ['shapelib','dbflib']
-    package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
-    package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
-    extensions = extensions + \
-             [Extension("shapelibc",
-                        ["pyshapelib/shapelib_wrap.c",
-                         "pyshapelib/shapelib/shpopen.c",
-                         "pyshapelib/shapelib/shptree.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
-              Extension("shptree",
-                        ["pyshapelib/shptreemodule.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
-              Extension("dbflibc",
-                        ["pyshapelib/dbflib_wrap.c",
-                         "pyshapelib/shapelib/dbfopen.c"],
-                        include_dirs = ["pyshapelib/shapelib"],
-                        define_macros = dbf_macros()) ]
+packages = packages + ['shapelib','dbflib']
+package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
+package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
+extensions = extensions + \
+         [Extension("shapelibc",
+                    ["pyshapelib/shapelib_wrap.c"],
+                    include_dirs = ["/usr/include/libshp"],
+                    libraries=["shp"]),
+          Extension("shptree",
+                    ["pyshapelib/shptreemodule.c"],
+                    include_dirs = ["/usr/include/libshp"]),
+          Extension("dbflibc",
+                    ["pyshapelib/dbflib_wrap.c"],
+                    include_dirs = ["/usr/include/libshp"],
+                    libraries = ["shp"],
+                    define_macros = dbf_macros()) ]
 
 setup(
   name              = "basemap",


--- NEW FILE python-basemap.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-basemap
Version:        0.7.2.1
Release:        1%{?dist}
Summary:        Plots data on map projections (with continental and political boundaries) 
Group:          Development/Libraries
License:        MIT and GPL
URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
Source0:        http://dl.sf.net/matplotlib/basemap-%{version}.tar.gz
Patch0:         python-basemap-0.7.2.1.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel, proj-devel, shapelib-devel
Requires:       python-matplotlib >= 0.81, python-basemap-data

%description
Basemap is a matplotlib toolkit that allows you to plot data on map
 projections (with continental and political boundaries)

%prep
%setup -q -n basemap-%{version}
%patch0 -p1 -b .orig

#We are going to use the system proj4 library
mv src/proj4.* .
rm -rf src

#Avoid name conflict
mv examples/README examples/README.examples

#Cleanup line endings
sed -i 's/\r$//' examples/*


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
#rm $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/toolkits/__init__.py*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changelog examples/* README LICENSE_pyshapelib
%{python_sitearch}/matplotlib/toolkits/
#%{python_sitearch}/matplotlib/toolkits/basemap/
%{python_sitearch}/proj4.so
%{python_sitearch}/dbflib/
%{python_sitearch}/dbflibc.so
%{python_sitearch}/shapelib/
%{python_sitearch}/shapelibc.so
%{python_sitearch}/shptree.so


%changelog
* Sun Nov 20 2005 Orion Poplawski <orion at cora.nwra.com> 0.7.2.1-1
- Update to upstream 0.7.2.1
- Split into python-basemap and python-basemap-data
- No longer requires python-numarray
- Use system shapelib for pyshapelib components

* Tue Sep 13 2005 Orion Poplawski <orion at cora.nwra.com> 0.6.2-1
- Update to upstream 0.6.2

* Tue Aug 02 2005 Orion Poplawski <orion at cora.nwra.com> 0.5.2-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2006 20:28:06 -0000	1.1
+++ .cvsignore	4 Jan 2006 20:29:21 -0000	1.2
@@ -0,0 +1 @@
+basemap-0.7.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2006 20:28:06 -0000	1.1
+++ sources	4 Jan 2006 20:29:21 -0000	1.2
@@ -0,0 +1 @@
+580144218a66e2cb227959f97809f68e  basemap-0.7.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 20:37:15 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed,  4 Jan 2006 15:37:15 -0500
Subject: CVSROOT avail,1.22,1.23 loginfo,1.11,1.12
Message-ID: <200601042037.k04Kbk0b014964@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14937

Modified Files:
	avail loginfo 
Log Message:
Split out mail a bit better


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- avail	20 Dec 2005 21:50:42 -0000	1.22
+++ avail	4 Jan 2006 20:37:13 -0000	1.23
@@ -23,15 +23,11 @@
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
 avail | havill,hp,nman64,ivazquez,jkeating | web
 avail | katzj | web/html/About/Projects/anaconda-installer
-#avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/About/Projects/desktop
-#avail | wcohen | web/html/projects/additional-projects/benchmarks
 avail | sopwith,dwalsh,kwade | web/html/About/Projects
-#avail | ezannoni | web/html/projects/additional-projects/gdb
 avail | alikins,trobert | web/html/Download
 avail | llch | web/html/About/Projects/i18n
 avail | sarahs | web/html/About/Projects/translations
-#avail | harald | web/html/projects/config-tools
 avail | kwade,pfrields | web/html/docs
 avail | sarahs | web/html/docs/translation-faq
 avail | sarahs | web/html/docs/translation-guide
@@ -40,9 +36,7 @@
 avail | dmalcolm | web/html/docs/stateless
 avail | riel | web/html/docs/virtualisation
 avail | riel | web/html/About/Projects/virtualisation
-#avail | ezannoni | web/html/projects/systemtap
 avail | harald | web/html/docs/udev
-#avail | cfeist | web/html/projects/cluster
 
 unavail | | fedora-security
 avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security
@@ -53,5 +47,3 @@
 avail | pfrields,mjohnson | web/html/participate/documentation-quick-start
 avail | pfrields | web/html/participate/developers-guide
 avail | tchung | web/html/News
-
-


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- loginfo	8 Dec 2005 20:11:44 -0000	1.11
+++ loginfo	4 Jan 2006 20:37:13 -0000	1.12
@@ -27,6 +27,8 @@
 #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
 
 ^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal
-ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
+^idweb $CVSROOT/CVSROOT/syncmail %{sVv} cvs-sysadmin at fedora.redhat.com
+^web $CVSROOT/CVSROOT/syncmail %{sVv} cvs-web at fedora.redhat.com
+DEFAULT	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
 ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org



From fedora-extras-commits at redhat.com  Wed Jan  4 20:58:40 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Jan 2006 15:58:40 -0500
Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.7,1.8
Message-ID: <200601042059.k04KxCuT015119@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102

Modified Files:
	perl-File-Tail.spec 
Log Message:
Correction of spelling error in the description.


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Tail.spec	15 Sep 2005 16:36:06 -0000	1.7
+++ perl-File-Tail.spec	4 Jan 2006 20:58:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-Tail
 Version:        0.99.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy usefull if you are
+while they are being written, which is especialy useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
+- Correction of spelling error in the description.
+
 * Thu Sep 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.99.3-1
 - 0.99.3.
 - Specfile cleanups.



From fedora-extras-commits at redhat.com  Wed Jan  4 21:02:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Jan 2006 16:02:12 -0500
Subject: rpms/perl-File-Tail/FC-3 .cvsignore, 1.2, 1.3 perl-File-Tail.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601042102.k04L2i9n016846@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808/FC-3

Modified Files:
	.cvsignore perl-File-Tail.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:29 -0000	1.2
+++ .cvsignore	4 Jan 2006 21:02:12 -0000	1.3
@@ -1 +1 @@
-File-Tail-0.98.tar.gz
+File-Tail-0.99.3.tar.gz


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-3/perl-File-Tail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Tail.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-File-Tail.spec	4 Jan 2006 21:02:12 -0000	1.5
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-File-Tail
-Version:        0.98
-Release:        3
-Epoch:          0
+Version:        0.99.3
+Release:        2%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/File-Tail/
-Source0:     http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-0.98.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy usefull if you are
+while they are being written, which is especialy useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -25,22 +22,19 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -51,12 +45,21 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/auto/File
-%{perl_vendorlib}/File
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Tail.3*
 
 
 %changelog
+* Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
+- Correction of spelling error in the description.
+
+* Thu Sep 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.99.3-1
+- 0.99.3.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.98-4
+- rebuilt
+
 * Sun Feb  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.98-0.fdr.3
 - BuildRequire Time::HiRes (bug 731).
 - Run tests in the %%check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:29 -0000	1.2
+++ sources	4 Jan 2006 21:02:12 -0000	1.3
@@ -1 +1 @@
-d16d67052577a5cdcde03d5cd2dc5569  File-Tail-0.98.tar.gz
+ef0fb7bcb4181ba593f4a09940f61d1c  File-Tail-0.99.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 21:02:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Jan 2006 16:02:19 -0500
Subject: rpms/perl-File-Tail/FC-4 .cvsignore, 1.2, 1.3 perl-File-Tail.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200601042103.k04L3Bd0016851@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808/FC-4

Modified Files:
	.cvsignore perl-File-Tail.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:29 -0000	1.2
+++ .cvsignore	4 Jan 2006 21:02:18 -0000	1.3
@@ -1 +1 @@
-File-Tail-0.98.tar.gz
+File-Tail-0.99.3.tar.gz


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-4/perl-File-Tail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Tail.spec	6 Apr 2005 22:12:44 -0000	1.6
+++ perl-File-Tail.spec	4 Jan 2006 21:02:18 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-File-Tail
-Version:        0.98
-Release:        4
-
+Version:        0.99.3
+Release:        2%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/File-Tail/
-Source0:     http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-0.98.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy usefull if you are
+while they are being written, which is especialy useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -25,22 +22,19 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -51,13 +45,19 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/auto/File
-%{perl_vendorlib}/File
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Tail.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
+- Correction of spelling error in the description.
+
+* Thu Sep 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.99.3-1
+- 0.99.3.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.98-4
 - rebuilt
 
 * Sun Feb  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.98-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:29 -0000	1.2
+++ sources	4 Jan 2006 21:02:18 -0000	1.3
@@ -1 +1 @@
-d16d67052577a5cdcde03d5cd2dc5569  File-Tail-0.98.tar.gz
+ef0fb7bcb4181ba593f4a09940f61d1c  File-Tail-0.99.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 23:17:44 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  4 Jan 2006 18:17:44 -0500
Subject: rpms/ocaml/devel .cvsignore, 1.4, 1.5 ocaml.spec, 1.21, 1.22 sources,
	1.6, 1.7
Message-ID: <200601042318.k04NIGjC020916@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20887

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2005 18:22:49 -0000	1.4
+++ .cvsignore	4 Jan 2006 23:17:43 -0000	1.5
@@ -1,4 +1,4 @@
-ocaml-3.08.3.tar.bz2
-ocaml-3.08-refman.html.tar.gz
-ocaml-3.08-refman.info.tar.gz
-ocaml-3.08-refman.ps.gz
+ocaml-3.09.1.tar.bz2
+ocaml-3.09-refman.html.tar.gz
+ocaml-3.09-refman.info.tar.gz
+ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ocaml.spec	1 Jan 2006 01:17:07 -0000	1.21
+++ ocaml.spec	4 Jan 2006 23:17:43 -0000	1.22
@@ -1,13 +1,13 @@
 Name:		ocaml
-Version:	3.09.0
-Release: 	3%{?dist}
+Version:	3.09.1
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
+- new version 3.09.1
+
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jan 2006 00:05:17 -0000	1.6
+++ sources	4 Jan 2006 23:17:43 -0000	1.7
@@ -1,4 +1,4 @@
-834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
 598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 23:21:28 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  4 Jan 2006 18:21:28 -0500
Subject: rpms/ocaml/FC-4 .cvsignore, 1.6, 1.7 ocaml.spec, 1.19, 1.20 sources,
	1.6, 1.7
Message-ID: <200601042322.k04NM0L7021015@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20972/FC-4

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jan 2006 00:01:59 -0000	1.6
+++ .cvsignore	4 Jan 2006 23:21:28 -0000	1.7
@@ -1,4 +1,4 @@
-ocaml-3.09.0.tar.bz2
+ocaml-3.09.1.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
 ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ocaml.spec	1 Jan 2006 00:07:21 -0000	1.19
+++ ocaml.spec	4 Jan 2006 23:21:28 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.0
+Version:	3.09.1
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
+- new version 3.09.1
+
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jan 2006 00:01:59 -0000	1.6
+++ sources	4 Jan 2006 23:21:28 -0000	1.7
@@ -1,4 +1,4 @@
-834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
 598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 00:09:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 19:09:57 -0500
Subject: rpms/apcupsd/devel .cvsignore, 1.2, 1.3 apcupsd.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200601050010.k050AT2t022990@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22969

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
Update to 3.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 02:59:11 -0000	1.2
+++ .cvsignore	5 Jan 2006 00:09:56 -0000	1.3
@@ -1 +1 @@
-apcupsd-3.10.18.tar.gz
+apcupsd-3.12.0.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apcupsd.spec	3 Jan 2006 17:53:58 -0000	1.5
+++ apcupsd.spec	5 Jan 2006 00:09:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.10.18
-Release:      7%{?dist}
+Version:      3.12.0
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -43,7 +43,7 @@
 %prep
 %setup -q
 %patch -p1 -b .init
-dos2unix examples/*status
+dos2unix examples/*status examples/*.c
 
 
 %build
@@ -92,7 +92,7 @@
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
-chmod -x examples/*.conf
+chmod -x examples/*.conf examples/*.c
 rm examples/*.in
 
 
@@ -102,7 +102,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog doc/README.apcaccess doc/developers_manual examples ReleaseNotes
+%doc COPYING ChangeLog examples ReleaseNotes
 %dir %{_sysconfdir}/apcupsd
 %{_initrddir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
@@ -112,8 +112,8 @@
 %{_sysconfdir}/apcupsd/changeme
 %{_sysconfdir}/apcupsd/commfailure
 %{_sysconfdir}/apcupsd/commok
+%{_sysconfdir}/apcupsd/offbattery
 %{_sysconfdir}/apcupsd/onbattery
-%{_sysconfdir}/apcupsd/mainsback
 %{_sysconfdir}/apcupsd/masterconnect
 %{_sysconfdir}/apcupsd/mastertimeout
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Wed Jan  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.0-1
+- Update to 3.12.0
+
 * Tue Jan  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 02:59:11 -0000	1.2
+++ sources	5 Jan 2006 00:09:56 -0000	1.3
@@ -1 +1 @@
-64104a1fface0253e77318ca84948bac  apcupsd-3.10.18.tar.gz
+7adb6274ede9dfaec7b6641105ae7a3a  apcupsd-3.12.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 04:49:11 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed,  4 Jan 2006 23:49:11 -0500
Subject: rpms/libeXosip2/FC-4 libeXosip2.spec,1.3,1.4
Message-ID: <200601050449.k054niZ5030766@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30749

Modified Files:
	libeXosip2.spec 
Log Message:
Update to 2.2.2.



Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/libeXosip2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libeXosip2.spec	29 Oct 2005 16:27:39 -0000	1.3
+++ libeXosip2.spec	5 Jan 2006 04:49:11 -0000	1.4
@@ -1,13 +1,12 @@
-%define pre 17
 
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 1.9.1
-Release: 0.5%{?pre:.pre%{pre}}%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}%{?pre:-pre%{pre}}.tar.gz
+Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
@@ -30,7 +29,7 @@
 Development files for libeXosip2.
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-pre%{pre}}
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --disable-static --disable-josua
@@ -70,6 +69,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jan  4 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 2.2.2
+- Update to 2.2.2.
+
 * Sat Oct 29 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 1.9.1-0.5.pre17
 - Update to next prerelease.
 



From fedora-extras-commits at redhat.com  Thu Jan  5 00:54:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  4 Jan 2006 19:54:49 -0500
Subject: rpms/openvpn/devel openvpn.spec,1.12,1.13
Message-ID: <200601050055.k050tL5b023446@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/devel

Modified Files:
	openvpn.spec 
Log Message:
Man page shouldn't be executable (BZ#176953)


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openvpn.spec	6 Dec 2005 15:52:51 -0000	1.12
+++ openvpn.spec	5 Jan 2006 00:54:49 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.4%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.5%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -75,7 +75,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m 0755 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+install -D -m 0644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -D -m 0755 sample-scripts/%{name}.init \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Jan 04 2006 Steven Pritchard <steve at kspei.com> 2.1-0.5.beta7
+- Man page shouldn't be executable (BZ#176953)
+
 * Tue Dec 06 2005 Steven Pritchard <steve at kspei.com> 2.1-0.4.beta7
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Jan  5 06:31:13 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 01:31:13 -0500
Subject: rpms/rkhunter/FC-1 rkhunter-1.1.9-app_check_default.patch, NONE,
	1.1 rkhunter-1.1.9-shared_man_search.patch, NONE,
	1.1 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 rkhunter.spec, 1.1, 1.2 sources, 1.2,
	1.3 rkhunter-1.1.8-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.8-app_check_default.patch, 1.1,
	NONE rkhunter-1.1.8-prelink_cleanup.patch, 1.1,
	NONE rkhunter-1.1.8-shared_man_search.patch, 1.1,
	NONE rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1, NONE
Message-ID: <200601050631.k056VjSK002253@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192/FC-1

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.1.9-app_check_default.patch 
	rkhunter-1.1.9-shared_man_search.patch 
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-0.fdr.1.src.md5 
	rkhunter-1.1.8-app_check_default.patch 
	rkhunter-1.1.8-prelink_cleanup.patch 
	rkhunter-1.1.8-shared_man_search.patch 
	rkhunter-1.1.8-whitelist_dir-conf.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-1 from rkhunter-1.2.7-1.src.rpm
auto-import rkhunter-1.2.7-1 from rkhunter-1.2.7-1.src.rpm

rkhunter-1.1.9-app_check_default.patch:

--- NEW FILE rkhunter-1.1.9-app_check_default.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:53:16.000000000 -0500
@@ -49,7 +49,7 @@
 # Skip passwd/group check
 PASSWDCHECK_SKIP=0
 # Application check
-APPLICATION_CHECK=1
+APPLICATION_CHECK=0
 
 USE_PATCHED_SOFTWARE=0
 
@@ -186,6 +186,9 @@
           shift
 	  ROOTDIR=$1
           ;;
+      --run-application-check | --runapplicationcheck | --run-applicationcheck)
+          APPLICATION_CHECK=1
+          ;;
       --scan-knownbad-files)
           PERFORMKNOWNBAD=1
           ;;
@@ -4957,7 +4960,8 @@
     echo $ECHOOPT "--report-mode*            : Don't show uninteresting information for reports"
     echo $ECHOOPT "--report-warnings-only*   : Show only warnings (lesser output than --report-mode,"
     echo $ECHOOPT "                            more than --quiet)"
-    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+#    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+    echo $ECHOOPT "--run-application-check*  : Run application version checks"
     echo $ECHOOPT "--skip-keypress*          : Don't wait after every test (non-interactive)"
     echo $ECHOOPT "--quick*                  : Perform quick scan (instead of full scan)"
     echo $ECHOOPT "--quiet*                  : Be quiet (only show warnings)"    

rkhunter-1.1.9-shared_man_search.patch:

--- NEW FILE rkhunter-1.1.9-shared_man_search.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:25:53.000000000 -0500
@@ -4127,7 +4127,7 @@
 	
 	displaytext -n "   Scanning for hidden files..."
 
-	SEARCHINDIRS="/dev /bin /usr /usr/man /usr/man/man1 /usr/man/man8 /usr/bin /usr/sbin /sbin /etc"
+	SEARCHINDIRS="/dev /bin /usr /usr/share/man /usr/share/man/man1 /usr/share/man/man8 /usr/bin /usr/sbin /sbin /etc"
 	# Only reset status once
 	STATUS=0
 


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.2
+++ .cvsignore	5 Jan 2006 06:31:13 -0000	1.3
@@ -1,2 +1,2 @@
-rkhunter-1.1.8.tar.gz
-rkhunter-scan_on_boot-rc.local.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-1/rkhunter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rkhunter.spec	8 Nov 2004 05:17:52 -0000	1.1
+++ rkhunter.spec	5 Jan 2006 06:31:13 -0000	1.2
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.8
-Release:        0.fdr.1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.8.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.8-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.8-shared_man_search.patch
-Patch4:         rkhunter-1.1.8-app_check_default.patch
-Patch5:         rkhunter-1.1.8-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,57 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#	s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-    ' rkhunter-scan_on_boot
+%patch0 -b .orig
+
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
+	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
+	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
+    ' files/%{name}.conf
 
 %{__perl} -pi.orig -e '
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
 	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
 	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot-rc.local
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
 %patch1 -b .orig
 %patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
-
-%{__cat} <<'EOF' >%{name}.conf
-## Next three lines installed automatically by RPM. Do not change
-## unless you know what you're doing...
-INSTALLDIR=%{_prefix}
-DBDIR=%{_var}/%{name}/db
-TMPDIR=%{_var}/%{name}/tmp
-
-EOF
-%{__cat} files/%{name}.conf >> %{name}.conf
-
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -108,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -131,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -142,17 +140,27 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
-%{__install} -m640 -p %{name}.conf              ${RPM_BUILD_ROOT}%{_sysconfdir}/
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#%{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
+
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
 
 %postun
 if [ "$1" = 0 ]; then
@@ -166,19 +174,35 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
+
+* Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
+- New package version release
+- Added the --run-application-check command line option
+  to listing in command help
+- Replaced 'Here' Doc editing of rkhunter.conf file
+  with in-place Perl edit
+- tweaked rpmbuild -bb Autoclean
+
 * Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited)
 - Removed redundant buildrequires /bin/sh, coreutils and perl
 - Revise postun scriptlet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:52 -0000	1.2
+++ sources	5 Jan 2006 06:31:13 -0000	1.3
@@ -1,2 +1,2 @@
-91cae6f04582fb0b27c96784ffe5adae  rkhunter-1.1.8.tar.gz
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.8-app_check_default.patch DELETED ---


--- rkhunter-1.1.8-prelink_cleanup.patch DELETED ---


--- rkhunter-1.1.8-shared_man_search.patch DELETED ---


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 06:31:07 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 01:31:07 -0500
Subject: rpms/rkhunter import.log,1.3,1.4
Message-ID: <200601050631.k056VdAI002248@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-1 from rkhunter-1.2.7-1.src.rpm
auto-import rkhunter-1.2.7-1 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 Jan 2005 08:31:35 -0000	1.3
+++ import.log	5 Jan 2006 06:31:07 -0000	1.4
@@ -1,2 +1,3 @@
 rkhunter-1_1_8-0_fdr_1:HEAD:rkhunter-1.1.8-0.fdr.1.src.rpm:1099891072
 rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718
+rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608



From fedora-extras-commits at redhat.com  Thu Jan  5 07:19:05 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:19:05 -0500
Subject: rpms/rkhunter import.log,1.5,1.6
Message-ID: <200601050719.k057JcPd004451@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4401

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-3 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	5 Jan 2006 07:06:21 -0000	1.5
+++ import.log	5 Jan 2006 07:19:05 -0000	1.6
@@ -2,3 +2,4 @@
 rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718
 rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608
 rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691
+rkhunter-1_2_7-1:FC-3:rkhunter-1.2.7-1.src.rpm:1136445493



From fedora-extras-commits at redhat.com  Thu Jan  5 00:54:37 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  4 Jan 2006 19:54:37 -0500
Subject: rpms/openvpn/FC-3 openvpn.spec,1.9,1.10
Message-ID: <200601050055.k050t9bg023440@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/FC-3

Modified Files:
	openvpn.spec 
Log Message:
Man page shouldn't be executable (BZ#176953)


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/openvpn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openvpn.spec	8 Nov 2005 15:34:56 -0000	1.9
+++ openvpn.spec	5 Jan 2006 00:54:37 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:              openvpn
 Version:           2.0.5
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -72,7 +72,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m 0755 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+install -D -m 0644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -D -m 0755 sample-scripts/%{name}.init \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Jan 04 2006 Steven Pritchard <steve at kspei.com> 2.0.5-3
+- Man page shouldn't be executable (BZ#176953)
+
 * Tue Nov 08 2005 Steven Pritchard <steve at kspei.com> 2.0.5-2
 - Make sample-scripts (etc.) non-executable to avoid some dependencies
 



From fedora-extras-commits at redhat.com  Thu Jan  5 04:57:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed,  4 Jan 2006 23:57:22 -0500
Subject: rpms/libeXosip2/devel .cvsignore, 1.3, 1.4 libeXosip2.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601050457.k054vsip030962@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30933

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2005 16:24:20 -0000	1.3
+++ .cvsignore	5 Jan 2006 04:57:22 -0000	1.4
@@ -1 +1 @@
-libeXosip2-1.9.1-pre17.tar.gz
+libeXosip2-2.2.2.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/libeXosip2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libeXosip2.spec	29 Oct 2005 16:24:20 -0000	1.3
+++ libeXosip2.spec	5 Jan 2006 04:57:22 -0000	1.4
@@ -1,13 +1,12 @@
-%define pre 17
 
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 1.9.1
-Release: 0.5%{?pre:.pre%{pre}}%{?dist}
+Version: 2.2.2
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}%{?pre:-pre%{pre}}.tar.gz
+Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
@@ -30,7 +29,7 @@
 Development files for libeXosip2.
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-pre%{pre}}
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --disable-static --disable-josua
@@ -70,6 +69,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jan  4 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 2.2.2
+- Update to 2.2.2.
+- Bump release because forgot to upload new source.
+
 * Sat Oct 29 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 1.9.1-0.5.pre17
 - Update to next prerelease.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2005 16:24:20 -0000	1.3
+++ sources	5 Jan 2006 04:57:22 -0000	1.4
@@ -1 +1 @@
-e16606a53c4c4660a7db7e1c6e3d5256  libeXosip2-1.9.1-pre17.tar.gz
+3434df493dc780b4bae76467ce29d689  libeXosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 07:06:22 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:06:22 -0500
Subject: rpms/rkhunter import.log,1.4,1.5
Message-ID: <200601050707.k0577QoR004192@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4132

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-2 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	5 Jan 2006 06:31:07 -0000	1.4
+++ import.log	5 Jan 2006 07:06:21 -0000	1.5
@@ -1,3 +1,4 @@
 rkhunter-1_1_8-0_fdr_1:HEAD:rkhunter-1.1.8-0.fdr.1.src.rpm:1099891072
 rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718
 rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608
+rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691



From fedora-extras-commits at redhat.com  Thu Jan  5 07:19:11 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:19:11 -0500
Subject: rpms/rkhunter/FC-3 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rkhunter.spec, 1.3, 1.4 sources, 1.3,
	1.4 rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1,
	NONE rkhunter-1.1.9-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.9-prelink_cleanup.patch, 1.1, NONE
Message-ID: <200601050719.k057Jihx004456@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4401/FC-3

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-whitelist_dir-conf.patch 
	rkhunter-1.1.9-0.fdr.1.src.md5 
	rkhunter-1.1.9-prelink_cleanup.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-3 from rkhunter-1.2.7-1.src.rpm


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jan 2005 08:31:35 -0000	1.3
+++ .cvsignore	5 Jan 2006 07:19:11 -0000	1.4
@@ -1,2 +1,2 @@
-rkhunter-scan_on_boot-rc.local.tar.gz
-rkhunter-1.1.9.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-3/rkhunter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rkhunter.spec	7 Jan 2005 08:31:35 -0000	1.3
+++ rkhunter.spec	5 Jan 2006 07:19:11 -0000	1.4
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.9
+Version:        1.2.7
 Release:        1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.9-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.9-shared_man_search.patch
-Patch4:         rkhunter-1.1.9-app_check_default.patch
-Patch5:         rkhunter-1.1.9-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,50 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#	s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
-	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
-	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot \
-        rkhunter-scan_on_boot-rc.local
+%patch0 -b .orig
 
-%{__perl} -pi.orig -e '
-	s|^#$|INSTALLDIR=%{_prefix}|;
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
 	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
 	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
     ' files/%{name}.conf
 
-%patch1 -b .0001
-%patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
+%{__perl} -pi.orig -e '
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
+	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@RKEXE\@|%{_bindir}/%{name}|g;
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch1 -b .orig
+%patch2 -b .orig
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -101,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -124,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -135,7 +140,7 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
@@ -143,9 +148,19 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#[ ! -d %{name} ] || %{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
+
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
 
 %postun
 if [ "$1" = 0 ]; then
@@ -159,19 +174,27 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
+
 * Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
 - New package version release
 - Added the --run-application-check command line option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jan 2005 08:31:35 -0000	1.3
+++ sources	5 Jan 2006 07:19:11 -0000	1.4
@@ -1,2 +1,2 @@
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
-2e24806cb1267124fba6132009e30f1b  rkhunter-1.1.9.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---


--- rkhunter-1.1.9-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.9-prelink_cleanup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 07:06:50 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:06:50 -0500
Subject: rpms/rkhunter/FC-2 rkhunter-1.1.9-app_check_default.patch, NONE,
	1.1 rkhunter-1.1.9-shared_man_search.patch, NONE,
	1.1 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 rkhunter.spec, 1.1, 1.2 sources, 1.2,
	1.3 rkhunter-1.1.8-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.8-app_check_default.patch, 1.1,
	NONE rkhunter-1.1.8-prelink_cleanup.patch, 1.1,
	NONE rkhunter-1.1.8-shared_man_search.patch, 1.1,
	NONE rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1, NONE
Message-ID: <200601050707.k0577QnK004193@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4132/FC-2

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.1.9-app_check_default.patch 
	rkhunter-1.1.9-shared_man_search.patch 
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-0.fdr.1.src.md5 
	rkhunter-1.1.8-app_check_default.patch 
	rkhunter-1.1.8-prelink_cleanup.patch 
	rkhunter-1.1.8-shared_man_search.patch 
	rkhunter-1.1.8-whitelist_dir-conf.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-2 from rkhunter-1.2.7-1.src.rpm

rkhunter-1.1.9-app_check_default.patch:

--- NEW FILE rkhunter-1.1.9-app_check_default.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:53:16.000000000 -0500
@@ -49,7 +49,7 @@
 # Skip passwd/group check
 PASSWDCHECK_SKIP=0
 # Application check
-APPLICATION_CHECK=1
+APPLICATION_CHECK=0
 
 USE_PATCHED_SOFTWARE=0
 
@@ -186,6 +186,9 @@
           shift
 	  ROOTDIR=$1
           ;;
+      --run-application-check | --runapplicationcheck | --run-applicationcheck)
+          APPLICATION_CHECK=1
+          ;;
       --scan-knownbad-files)
           PERFORMKNOWNBAD=1
           ;;
@@ -4957,7 +4960,8 @@
     echo $ECHOOPT "--report-mode*            : Don't show uninteresting information for reports"
     echo $ECHOOPT "--report-warnings-only*   : Show only warnings (lesser output than --report-mode,"
     echo $ECHOOPT "                            more than --quiet)"
-    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+#    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+    echo $ECHOOPT "--run-application-check*  : Run application version checks"
     echo $ECHOOPT "--skip-keypress*          : Don't wait after every test (non-interactive)"
     echo $ECHOOPT "--quick*                  : Perform quick scan (instead of full scan)"
     echo $ECHOOPT "--quiet*                  : Be quiet (only show warnings)"    

rkhunter-1.1.9-shared_man_search.patch:

--- NEW FILE rkhunter-1.1.9-shared_man_search.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:25:53.000000000 -0500
@@ -4127,7 +4127,7 @@
 	
 	displaytext -n "   Scanning for hidden files..."
 
-	SEARCHINDIRS="/dev /bin /usr /usr/man /usr/man/man1 /usr/man/man8 /usr/bin /usr/sbin /sbin /etc"
+	SEARCHINDIRS="/dev /bin /usr /usr/share/man /usr/share/man/man1 /usr/share/man/man8 /usr/bin /usr/sbin /sbin /etc"
 	# Only reset status once
 	STATUS=0
 


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.2
+++ .cvsignore	5 Jan 2006 07:06:50 -0000	1.3
@@ -1,2 +1,2 @@
-rkhunter-1.1.8.tar.gz
-rkhunter-scan_on_boot-rc.local.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-2/rkhunter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rkhunter.spec	8 Nov 2004 05:17:52 -0000	1.1
+++ rkhunter.spec	5 Jan 2006 07:06:50 -0000	1.2
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.8
-Release:        0.fdr.1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.8.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.8-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.8-shared_man_search.patch
-Patch4:         rkhunter-1.1.8-app_check_default.patch
-Patch5:         rkhunter-1.1.8-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,57 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#	s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-    ' rkhunter-scan_on_boot
+%patch0 -b .orig
+
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
+	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
+	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
+    ' files/%{name}.conf
 
 %{__perl} -pi.orig -e '
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
 	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
 	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot-rc.local
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
 %patch1 -b .orig
 %patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
-
-%{__cat} <<'EOF' >%{name}.conf
-## Next three lines installed automatically by RPM. Do not change
-## unless you know what you're doing...
-INSTALLDIR=%{_prefix}
-DBDIR=%{_var}/%{name}/db
-TMPDIR=%{_var}/%{name}/tmp
-
-EOF
-%{__cat} files/%{name}.conf >> %{name}.conf
-
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -108,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -131,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -142,17 +140,27 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
-%{__install} -m640 -p %{name}.conf              ${RPM_BUILD_ROOT}%{_sysconfdir}/
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#%{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
+
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
 
 %postun
 if [ "$1" = 0 ]; then
@@ -166,19 +174,35 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
+
+* Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
+- New package version release
+- Added the --run-application-check command line option
+  to listing in command help
+- Replaced 'Here' Doc editing of rkhunter.conf file
+  with in-place Perl edit
+- tweaked rpmbuild -bb Autoclean
+
 * Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited)
 - Removed redundant buildrequires /bin/sh, coreutils and perl
 - Revise postun scriptlet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:52 -0000	1.2
+++ sources	5 Jan 2006 07:06:50 -0000	1.3
@@ -1,2 +1,2 @@
-91cae6f04582fb0b27c96784ffe5adae  rkhunter-1.1.8.tar.gz
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.8-app_check_default.patch DELETED ---


--- rkhunter-1.1.8-prelink_cleanup.patch DELETED ---


--- rkhunter-1.1.8-shared_man_search.patch DELETED ---


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 14:56:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 09:56:22 -0500
Subject: rpms/maxima/devel maxima.spec,1.11,1.12 xmaxima.desktop,1.3,1.4
Message-ID: <200601051456.k05Eus3t019278@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19255

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
- rebuild for/with new clisp,sbcl



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maxima.spec	28 Oct 2005 18:49:41 -0000	1.11
+++ maxima.spec	5 Jan 2006 14:56:22 -0000	1.12
@@ -3,14 +3,15 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc (and maybe ppc64)  when lisps build again on ppc 
+# add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
+#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp
@@ -19,8 +20,8 @@
 %define _enable_clisp --enable-clisp 
 # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
 #define _enable_cmucl --enable-cmucl 
-# gcl not built for fc5/development (yet)
-%if "%{?fedora}" < "5"
+%if "%{?fedora}" != "5"
+# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %endif
 %define _enable_sbcl --enable-sbcl 
@@ -351,6 +352,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
+- rebuild for/with new clisp,sbcl
+
 * Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
 - --enable-sbcl
 - avoid rpmquery's at build-time


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmaxima.desktop	26 Nov 2005 19:38:20 -0000	1.3
+++ xmaxima.desktop	5 Jan 2006 14:56:22 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=Symbolic Computation Program
 Exec=xmaxima
 Icon=maxima
-MimeType=
+#MimeType=
 Type=Application
 Categories=Application;Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Jan  5 07:36:18 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:36:18 -0500
Subject: rpms/rkhunter/devel rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rkhunter.spec, 1.5, 1.6 sources, 1.3,
	1.4 rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1,
	NONE rkhunter-1.1.9-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.9-prelink_cleanup.patch, 1.1, NONE
Message-ID: <200601050736.k057apUB004818@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4763/devel

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-whitelist_dir-conf.patch 
	rkhunter-1.1.9-0.fdr.1.src.md5 
	rkhunter-1.1.9-prelink_cleanup.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch devel from rkhunter-1.2.7-1.src.rpm


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jan 2005 08:31:35 -0000	1.3
+++ .cvsignore	5 Jan 2006 07:36:18 -0000	1.4
@@ -1,2 +1,2 @@
-rkhunter-scan_on_boot-rc.local.tar.gz
-rkhunter-1.1.9.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rkhunter.spec	6 Apr 2005 22:13:31 -0000	1.5
+++ rkhunter.spec	5 Jan 2006 07:36:18 -0000	1.6
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.9
-Release:        2
-
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.9-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.9-shared_man_search.patch
-Patch4:         rkhunter-1.1.9-app_check_default.patch
-Patch5:         rkhunter-1.1.9-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,50 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#       s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
-	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
-	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot \
-      rkhunter-scan_on_boot-rc.local
+%patch0 -b .orig
 
-%{__perl} -pi.orig -e '
-	s|^#$|INSTALLDIR=%{_prefix}|;
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
 	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
 	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
     ' files/%{name}.conf
 
-%patch1 -b .0001
-%patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
+%{__perl} -pi.orig -e '
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
+	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@RKEXE\@|%{_bindir}/%{name}|g;
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch1 -b .orig
+%patch2 -b .orig
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -101,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -124,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -135,7 +140,7 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
@@ -143,10 +148,20 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#[ ! -d %{name} ] || %{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
 
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
+
 %postun
 if [ "$1" = 0 ]; then
     [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name}
@@ -159,21 +174,26 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
 
 * Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
 - New package version release
@@ -252,7 +272,7 @@
 - added recursive remove of old build root as prep for install phase
 
 * Wed Apr 28 2004 Doncho N. Gunchev - 1.0.9-0.mr700
-- dropped Requires: perl - rkhunter works without it
+- dropped Requires: perl - rkhunter works without it 
 - dropped the bash alignpatch (check the source or contact me)
 - various file mode fixes (.../tmp/, *.db)
 - optimized the %%files section - any new files in the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jan 2005 08:31:35 -0000	1.3
+++ sources	5 Jan 2006 07:36:18 -0000	1.4
@@ -1,2 +1,2 @@
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
-2e24806cb1267124fba6132009e30f1b  rkhunter-1.1.9.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---


--- rkhunter-1.1.9-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.9-prelink_cleanup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 15:05:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:05:51 -0500
Subject: rpms/maxima/devel maxima.spec,1.12,1.13
Message-ID: <200601051506.k05F6cZB021057@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21039

Modified Files:
	maxima.spec 
Log Message:
%files: fix icon



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maxima.spec	5 Jan 2006 14:56:22 -0000	1.12
+++ maxima.spec	5 Jan 2006 15:05:50 -0000	1.13
@@ -316,7 +316,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp



From fedora-extras-commits at redhat.com  Thu Jan  5 09:03:42 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  5 Jan 2006 04:03:42 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.8, 1.9 rxvt-unicode.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200601050904.k0594Fbt009141@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jan 2006 08:45:02 -0000	1.8
+++ .cvsignore	5 Jan 2006 09:03:42 -0000	1.9
@@ -1 +1 @@
-rxvt-unicode-6.2.tar.bz2
+rxvt-unicode-6.3.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rxvt-unicode.spec	3 Jan 2006 08:45:02 -0000	1.13
+++ rxvt-unicode.spec	5 Jan 2006 09:03:42 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.2
+Version:        6.3
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -68,8 +68,13 @@
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
 %{_datadir}/applications/*
+%{_libdir}/urxvt
 
 %changelog
+* Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.3-1
+- version upgrade
+
 * Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.2-1 
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 08:45:02 -0000	1.8
+++ sources	5 Jan 2006 09:03:42 -0000	1.9
@@ -1 +1 @@
-0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2
+411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 14:15:31 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:15:31 -0500
Subject: rpms/lib3ds/FC-4 .cvsignore, 1.2, 1.3 lib3ds.spec, 1.7, 1.8 sources,
	1.2, 1.3
Message-ID: <200601051416.k05EG35i019042@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19021

Modified Files:
	.cvsignore lib3ds.spec sources 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:41:15 -0000	1.2
+++ .cvsignore	5 Jan 2006 14:15:31 -0000	1.3
@@ -1 +1,2 @@
 lib3ds-1.2.0.tar.gz
+lib3ds-cvs-20060105.diff


Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/lib3ds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lib3ds.spec	23 May 2005 00:22:28 -0000	1.7
+++ lib3ds.spec	5 Jan 2006 14:15:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release: 5
+Release:        6%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -9,6 +9,7 @@
 URL:            http://lib3ds.sourceforge.net
 Source:         http://dl.sf.net/lib3ds/lib3ds-%{version}.tar.gz
 Patch0:         lib3ds-1.2.0.diff
+Patch1:         lib3ds-cvs-20060105.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -48,6 +49,7 @@
 %prep
 %setup -q
 %patch -p1 -P 0
+%patch -p2 -P 1
 
 %build
 %configure
@@ -70,6 +72,10 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <rc040203 at freenet.de> - 1.2.0-6
+- PR 176665: Apply upstream patch.
+- Add %%dist.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.0-5
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:41:15 -0000	1.2
+++ sources	5 Jan 2006 14:15:31 -0000	1.3
@@ -1 +1,2 @@
 3a7f891d18af0151876b98bc05d3b373  lib3ds-1.2.0.tar.gz
+f337a875d264c2e938d762ca82491451  lib3ds-cvs-20060105.diff



From fedora-extras-commits at redhat.com  Thu Jan  5 07:27:20 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:27:20 -0500
Subject: rpms/rkhunter/FC-4 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rkhunter.spec, 1.5, 1.6 sources, 1.3,
	1.4 rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1,
	NONE rkhunter-1.1.9-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.9-prelink_cleanup.patch, 1.1, NONE
Message-ID: <200601050727.k057RrhM004645@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590/FC-4

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-whitelist_dir-conf.patch 
	rkhunter-1.1.9-0.fdr.1.src.md5 
	rkhunter-1.1.9-prelink_cleanup.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-4 from rkhunter-1.2.7-1.src.rpm


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jan 2005 08:31:35 -0000	1.3
+++ .cvsignore	5 Jan 2006 07:27:20 -0000	1.4
@@ -1,2 +1,2 @@
-rkhunter-scan_on_boot-rc.local.tar.gz
-rkhunter-1.1.9.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-4/rkhunter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rkhunter.spec	6 Apr 2005 22:13:31 -0000	1.5
+++ rkhunter.spec	5 Jan 2006 07:27:20 -0000	1.6
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.9
-Release:        2
-
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.9-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.9-shared_man_search.patch
-Patch4:         rkhunter-1.1.9-app_check_default.patch
-Patch5:         rkhunter-1.1.9-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,50 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#       s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
-	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
-	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot \
-      rkhunter-scan_on_boot-rc.local
+%patch0 -b .orig
 
-%{__perl} -pi.orig -e '
-	s|^#$|INSTALLDIR=%{_prefix}|;
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
 	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
 	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
     ' files/%{name}.conf
 
-%patch1 -b .0001
-%patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
+%{__perl} -pi.orig -e '
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
+	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@RKEXE\@|%{_bindir}/%{name}|g;
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch1 -b .orig
+%patch2 -b .orig
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -101,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -124,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -135,7 +140,7 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
@@ -143,10 +148,20 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#[ ! -d %{name} ] || %{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
 
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
+
 %postun
 if [ "$1" = 0 ]; then
     [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name}
@@ -159,21 +174,26 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
 
 * Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
 - New package version release
@@ -252,7 +272,7 @@
 - added recursive remove of old build root as prep for install phase
 
 * Wed Apr 28 2004 Doncho N. Gunchev - 1.0.9-0.mr700
-- dropped Requires: perl - rkhunter works without it
+- dropped Requires: perl - rkhunter works without it 
 - dropped the bash alignpatch (check the source or contact me)
 - various file mode fixes (.../tmp/, *.db)
 - optimized the %%files section - any new files in the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jan 2005 08:31:35 -0000	1.3
+++ sources	5 Jan 2006 07:27:20 -0000	1.4
@@ -1,2 +1,2 @@
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
-2e24806cb1267124fba6132009e30f1b  rkhunter-1.1.9.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---


--- rkhunter-1.1.9-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.9-prelink_cleanup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 14:03:37 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:03:37 -0500
Subject: rpms/lib3ds/devel lib3ds.spec,1.7,1.8
Message-ID: <200601051404.k05E4K9X018856@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18839

Modified Files:
	lib3ds.spec 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lib3ds.spec	23 May 2005 00:22:28 -0000	1.7
+++ lib3ds.spec	5 Jan 2006 14:03:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release: 5
+Release:        6%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -9,6 +9,7 @@
 URL:            http://lib3ds.sourceforge.net
 Source:         http://dl.sf.net/lib3ds/lib3ds-%{version}.tar.gz
 Patch0:         lib3ds-1.2.0.diff
+Patch1:         lib3ds-cvs-20060105.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -48,6 +49,7 @@
 %prep
 %setup -q
 %patch -p1 -P 0
+%patch -p2 -P 1
 
 %build
 %configure
@@ -70,6 +72,10 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <rc040203 at freenet.de> - 1.2.0-6
+- PR 176665: Apply upstream patch.
+- Add %%dist.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.0-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Jan  5 13:02:00 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu,  5 Jan 2006 08:02:00 -0500
Subject: fedora-security/audit fc4,1.115,1.116 fc5,1.26,1.27
Message-ID: <200601051302.k05D2Geu016933@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895

Modified Files:
	fc4 fc5 
Log Message:
Updates for ImageMagick and kernel



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc4	3 Jan 2006 16:36:12 -0000	1.115
+++ fc4	5 Jan 2006 13:01:32 -0000	1.116
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20051219
-Up to date FC4 as of 20051219
+Up to date CVE as of CVE email 20060104
+Up to date FC4 as of 20060104
 
 ** are items that need attention
 
+CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176813
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fc5	3 Jan 2006 16:36:12 -0000	1.26
+++ fc5	5 Jan 2006 13:01:32 -0000	1.27
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051219
+Up to date CVE as of CVE email 20060104
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -12,6 +12,8 @@
 
 ** are items that need attention
 
+CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only



From fedora-extras-commits at redhat.com  Thu Jan  5 09:03:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  5 Jan 2006 04:03:20 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.8, 1.9 rxvt-unicode.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200601050904.k0594bY6009147@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jan 2006 08:44:56 -0000	1.8
+++ .cvsignore	5 Jan 2006 09:03:19 -0000	1.9
@@ -1 +1 @@
-rxvt-unicode-6.2.tar.bz2
+rxvt-unicode-6.3.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rxvt-unicode.spec	3 Jan 2006 08:44:56 -0000	1.10
+++ rxvt-unicode.spec	5 Jan 2006 09:03:19 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.2
+Version:        6.3
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -63,8 +63,13 @@
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
 %{_datadir}/applications/*
+%{_libdir}/urxvt
 
 %changelog
+* Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.3-1
+- version upgrade
+
 * Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 08:44:56 -0000	1.8
+++ sources	5 Jan 2006 09:03:19 -0000	1.9
@@ -1 +1 @@
-0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2
+411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 15:28:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:28:49 -0500
Subject: rpms/maxima/FC-4 maxima.spec,1.13,1.14
Message-ID: <200601051529.k05FTLFb021307@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21263/FC-4

Modified Files:
	maxima.spec 
Log Message:
mention "sbcl doesn't build on ppc" bz



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- maxima.spec	5 Jan 2006 15:24:48 -0000	1.13
+++ maxima.spec	5 Jan 2006 15:28:48 -0000	1.14
@@ -12,6 +12,7 @@
 # add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
 #  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
+#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp



From fedora-extras-commits at redhat.com  Thu Jan  5 14:07:47 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:07:47 -0500
Subject: rpms/lib3ds/devel sources,1.2,1.3 .cvsignore,1.2,1.3
Message-ID: <200601051408.k05E8KDG018898@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18879

Modified Files:
	sources .cvsignore 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:41:15 -0000	1.2
+++ sources	5 Jan 2006 14:07:47 -0000	1.3
@@ -1 +1,2 @@
 3a7f891d18af0151876b98bc05d3b373  lib3ds-1.2.0.tar.gz
+f337a875d264c2e938d762ca82491451  lib3ds-cvs-20060105.diff


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:41:15 -0000	1.2
+++ .cvsignore	5 Jan 2006 14:07:47 -0000	1.3
@@ -1 +1,2 @@
 lib3ds-1.2.0.tar.gz
+lib3ds-cvs-20060105.diff



From fedora-extras-commits at redhat.com  Thu Jan  5 14:13:31 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:13:31 -0500
Subject: rpms/lib3ds/FC-3 .cvsignore, 1.2, 1.3 lib3ds.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200601051414.k05EE3l4019013@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18992

Modified Files:
	.cvsignore lib3ds.spec sources 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.
- Sync spec with devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:41:15 -0000	1.2
+++ .cvsignore	5 Jan 2006 14:13:30 -0000	1.3
@@ -1 +1,2 @@
 lib3ds-1.2.0.tar.gz
+lib3ds-cvs-20060105.diff


Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-3/lib3ds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lib3ds.spec	10 Dec 2004 22:03:04 -0000	1.3
+++ lib3ds.spec	5 Jan 2006 14:13:30 -0000	1.4
@@ -1,36 +1,37 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        3
-Epoch:          0
-Summary:        The 3D Studio File Format Library
+Release:        6%{?dist}
 
-Group: 		System Environment/Libraries
+Summary:        3D Studio file format library
+
+Group:          System Environment/Libraries
 License:        LGPL
-URL: 		http://lib3ds.sourceforge.net
-Source: 	http://download.sourceforge.net/lib3ds/lib3ds-%{version}.tar.gz
-Patch0:		lib3ds-1.2.0.diff
+URL:            http://lib3ds.sourceforge.net
+Source:         http://dl.sf.net/lib3ds/lib3ds-%{version}.tar.gz
+Patch0:         lib3ds-1.2.0.diff
+Patch1:         lib3ds-cvs-20060105.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 lib3ds is a free ANSI-C library for working with the popular "3ds" 3D model
 format.
 
-Supported platforms include GNU (autoconf, automake, libtool, make, GCC) on 
-Unix and Cygwin, and MS Visual C++ 6.0. lib3ds loads and saves Atmosphere 
-settings, Background settings, Shadow map settings, Viewport setting, 
-Materials, Cameras, Lights, Meshes, Hierarchy, Animation keyframes. It also 
-contains useful matrix, vector and quaternion mathematics tools. lib3ds 
-usually integrates well with OpenGL. In addition, some diagnostic and 
-conversion tools are included. 
+Supported platforms include GNU (autoconf, automake, libtool, make, GCC) on
+Unix and Cygwin, and MS Visual C++ 6.0. lib3ds loads and saves Atmosphere
+settings, Background settings, Shadow map settings, Viewport setting,
+Materials, Cameras, Lights, Meshes, Hierarchy, Animation keyframes. It also
+contains useful matrix, vector and quaternion mathematics tools. lib3ds
+usually integrates well with OpenGL. In addition, some diagnostic and
+conversion tools are included.
 
-%package	tools
+%package        tools
 Summary:        %summary
 Group:          Applications/Multimedia
 
 %description    tools
 Some tools to process 3ds files.
 
-%files		tools
+%files          tools
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/3dsdump
@@ -48,6 +49,7 @@
 %prep
 %setup -q
 %patch -p1 -P 0
+%patch -p2 -P 1
 
 %build
 %configure
@@ -70,6 +72,11 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <rc040203 at freenet.de> - 1.2.0-6
+- PR 176665: Apply upstream patch.
+- Add %%dist.
+- Sync spec with devel.
+
 * Mon Aug 09 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 0:1.2.0-0.fdr.3
 - Fix m4-underquoting in lib3d.m4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:41:15 -0000	1.2
+++ sources	5 Jan 2006 14:13:30 -0000	1.3
@@ -1 +1,2 @@
 3a7f891d18af0151876b98bc05d3b373  lib3ds-1.2.0.tar.gz
+f337a875d264c2e938d762ca82491451  lib3ds-cvs-20060105.diff



From fedora-extras-commits at redhat.com  Thu Jan  5 15:28:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:28:55 -0500
Subject: rpms/maxima/devel maxima.spec,1.14,1.15
Message-ID: <200601051529.k05FTRAP021312@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21263/devel

Modified Files:
	maxima.spec 
Log Message:
mention "sbcl doesn't build on ppc" bz



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maxima.spec	5 Jan 2006 15:23:26 -0000	1.14
+++ maxima.spec	5 Jan 2006 15:28:54 -0000	1.15
@@ -12,6 +12,7 @@
 # add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
 #  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
+#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp



From fedora-extras-commits at redhat.com  Thu Jan  5 15:00:16 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 10:00:16 -0500
Subject: rpms/abiword/devel abiword-2.4.2-desktop.patch, NONE,
	1.1 abiword.spec, 1.26, 1.27
Message-ID: <200601051500.k05F0nFD019381@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.2-desktop.patch 
Log Message:
Commit missing patch



abiword-2.4.2-desktop.patch:

--- NEW FILE abiword-2.4.2-desktop.patch ---
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop	2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop	2006-01-02 00:32:33.000000000 +0100
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- abiword.spec	5 Jan 2006 14:57:02 -0000	1.26
+++ abiword.spec	5 Jan 2006 15:00:16 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -141,6 +141,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc5
+- Bump release, forgot to add desktop patch
+
 * Mon Jan 02 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc5
 - Update to 2.4.2
 - Add BuildRequires readline-devel for the AbiCommand plugin



From fedora-extras-commits at redhat.com  Thu Jan  5 15:23:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:23:27 -0500
Subject: rpms/maxima/devel maxima.spec,1.13,1.14
Message-ID: <200601051523.k05FNxaf021216@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21198

Modified Files:
	maxima.spec 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
- tighten Req: on clisp/sbcl runtimes



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- maxima.spec	5 Jan 2006 15:05:50 -0000	1.13
+++ maxima.spec	5 Jan 2006 15:23:26 -0000	1.14
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -102,8 +102,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-# To appease those who are paranoid about rpm queries at build time
-#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -141,9 +140,8 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.6
-## To appease those who are paranoid about rpm queries at build time
-#define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
+BuildRequires: sbcl 
+%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -352,6 +350,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
+- tighten Req: on clisp/sbcl runtimes
+
 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
 - rebuild for/with new clisp,sbcl
 



From fedora-extras-commits at redhat.com  Thu Jan  5 14:57:02 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 09:57:02 -0500
Subject: rpms/abiword/devel abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 abiword.spec, 1.25, 1.26 sources, 1.12,
	1.13 abiword-2.2.6-desktop.patch, 1.1, NONE
Message-ID: <200601051457.k05EvYUR019306@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19276

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+        ABI_PLUGIN_REPORT([OpenDocument: okay])
 ],[        ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+        ABI_PLUGIN_REPORT([OpenWriter: okay])
 ],[        ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Oct 2005 22:56:47 -0000	1.12
+++ .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- abiword.spec	9 Nov 2005 10:28:53 -0000	1.25
+++ abiword.spec	5 Jan 2006 14:57:02 -0000	1.26
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.1
-Release: 4%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,9 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: readline-devel
+BuildRequires: bzip2-devel
+BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
 BuildRequires: librsvg2-devel
@@ -43,7 +46,8 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.6-desktop.patch
+Patch1: abiword-2.4.2-desktop.patch
+Patch2: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -53,6 +57,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -136,6 +141,13 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Jan 02 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc5
+- Update to 2.4.2
+- Add BuildRequires readline-devel for the AbiCommand plugin
+- Add BuildRequires bzip2-devel and poppler-devel for plugins
+- Update desktop patch
+- Patch to fix plugin marcros
+
 * Wed Nov 09 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-4.fc5
 - Fix bug 171928
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Oct 2005 22:56:47 -0000	1.12
+++ sources	5 Jan 2006 14:57:02 -0000	1.13
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 09:03:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  5 Jan 2006 04:03:12 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.8, 1.9 rxvt-unicode.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200601050904.k0594FJX009142@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jan 2006 08:44:50 -0000	1.8
+++ .cvsignore	5 Jan 2006 09:03:11 -0000	1.9
@@ -1 +1 @@
-rxvt-unicode-6.2.tar.bz2
+rxvt-unicode-6.3.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rxvt-unicode.spec	3 Jan 2006 08:44:50 -0000	1.10
+++ rxvt-unicode.spec	5 Jan 2006 09:03:11 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.2
+Version:        6.3
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -63,8 +63,13 @@
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
 %{_datadir}/applications/*
+%{_libdir}/urxvt
 
 %changelog
+* Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.3-1
+- version upgrade
+
 * Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 08:44:50 -0000	1.8
+++ sources	5 Jan 2006 09:03:11 -0000	1.9
@@ -1 +1 @@
-0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2
+411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 07:27:14 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:27:14 -0500
Subject: rpms/rkhunter import.log,1.6,1.7
Message-ID: <200601050727.k057RlaJ004640@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-4 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	5 Jan 2006 07:19:05 -0000	1.6
+++ import.log	5 Jan 2006 07:27:14 -0000	1.7
@@ -3,3 +3,4 @@
 rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608
 rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691
 rkhunter-1_2_7-1:FC-3:rkhunter-1.2.7-1.src.rpm:1136445493
+rkhunter-1_2_7-1:FC-4:rkhunter-1.2.7-1.src.rpm:1136445982



From fedora-extras-commits at redhat.com  Thu Jan  5 15:24:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:24:49 -0500
Subject: rpms/maxima/FC-4 maxima.spec,1.12,1.13 xmaxima.desktop,1.3,1.4
Message-ID: <200601051525.k05FPLMB021255@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21234

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:

 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
 - tighten Req: on clisp/sbcl runtimes

 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
 - rebuild for/with new clisp,sbcl




Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maxima.spec	28 Oct 2005 19:10:46 -0000	1.12
+++ maxima.spec	5 Jan 2006 15:24:48 -0000	1.13
@@ -3,14 +3,15 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 6%{?dist} 
+Release: 8%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc (and maybe ppc64)  when lisps build again on ppc 
+# add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
+#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp
@@ -19,8 +20,8 @@
 %define _enable_clisp --enable-clisp 
 # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
 #define _enable_cmucl --enable-cmucl 
-# gcl not built for fc5/development (yet)
-%if "%{?fedora}" < "5"
+%if "%{?fedora}" != "5"
+# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %endif
 %define _enable_sbcl --enable-sbcl 
@@ -101,8 +102,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-# To appease those who are paranoid about rpm queries at build time
-#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -140,9 +140,8 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.6
-## To appease those who are paranoid about rpm queries at build time
-#define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
+BuildRequires: sbcl 
+%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -315,7 +314,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
@@ -351,6 +350,12 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
+- tighten Req: on clisp/sbcl runtimes
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
+- rebuild for/with new clisp,sbcl
+
 * Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
 - --enable-sbcl
 - avoid rpmquery's at build-time


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/xmaxima.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmaxima.desktop	26 Nov 2005 19:38:14 -0000	1.3
+++ xmaxima.desktop	5 Jan 2006 15:24:48 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=Symbolic Computation Program
 Exec=xmaxima
 Icon=maxima
-MimeType=
+#MimeType=
 Type=Application
 Categories=Application;Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Jan  5 15:40:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:40:45 -0500
Subject: rpms/maxima/FC-4 maxima.spec,1.14,1.15
Message-ID: <200601051541.k05FfHB6021550@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21525

Modified Files:
	maxima.spec 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
- OK, loosen Req's again (buildsystem can't handle it)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maxima.spec	5 Jan 2006 15:28:48 -0000	1.14
+++ maxima.spec	5 Jan 2006 15:40:44 -0000	1.15
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -103,7 +103,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
+#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -142,7 +142,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 BuildRequires: sbcl 
-%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
+#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -351,6 +351,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
+- OK, loosen Req's again (buildsystem can't handle it)
+
 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
 - tighten Req: on clisp/sbcl runtimes
 



From fedora-extras-commits at redhat.com  Thu Jan  5 16:54:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:54:31 -0500
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Plugin-RetrieveAll.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051655.k05Gt3Ww024735@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674/devel

Modified Files:
	.cvsignore perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

Bump to 1.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 18:53:58 -0000	1.2
+++ .cvsignore	5 Jan 2006 16:54:31 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+Class-DBI-Plugin-RetrieveAll-1.02.tar.gz


Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Plugin-RetrieveAll.spec	7 Sep 2005 18:53:58 -0000	1.1
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
+- bump to 1.02
+
 * Wed Aug 31 2005 Paul Howarth <paul at city-fan.org> 1.01-3
 - remove redundant BR: perl
 - use %%{?_smp_mflags} with make in %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:53:58 -0000	1.2
+++ sources	5 Jan 2006 16:54:31 -0000	1.3
@@ -1 +1 @@
-27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:14:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:14:15 -0500
Subject: rpms/swatch/FC-3 swatch-3.1.1.patch,NONE,1.1 swatch.spec,1.5,1.6
Message-ID: <200601051714.k05HElbh026681@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/swatch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-3

Modified Files:
	swatch.spec 
Added Files:
	swatch-3.1.1.patch 
Log Message:
Sync with devel

swatch-3.1.1.patch:

--- NEW FILE swatch-3.1.1.patch ---
diff -ruN swatch-3.1.1-orig/swatch swatch-3.1.1/swatch
--- swatch-3.1.1-orig/swatch	2004-07-19 21:14:54.000000000 +0100
+++ swatch-3.1.1/swatch	2005-08-29 20:52:13.000000000 +0100
@@ -32,7 +32,7 @@
 [ B<--input-record-separator> I<regex> ] 
 [ [ B<--examine> I<file_to_examine> ] 
 | [ B<--read-pipe> I<program_to_pipe_from> ] 
-| [ B<--tail> I<file_to_tail> ] ]
+| [ B<--tail-file> I<file_to_tail> ] ]
 [ B<--daemon> ] 
 [ B<--use-cpan-file-tail> ]
 [ B<--awk-field-syntax> ]
@@ -68,7 +68,7 @@
 
 Restart at the specified time where I<hh> is hours and I<mm> is minutes. 
 If the am/pm indicator is omitted, then a 24-hour clock is assumed. 
-If the time is preceeded by the "+" character, then the restart time 
+If the time is preceded by the "+" character, then the restart time 
 will be set to the current time plus the specified time and the am/pm
 indicator will be ignored.
 
@@ -124,18 +124,12 @@
 If swatch is called with no options, it is the same as typing the 
 command line
 
-=over 5
-
-=item
-
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog>
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog
 
 or if /var/log/messages exists
 
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/messages>
-
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/messages
 
-=back
 
 If the configuration file doesn't exist then the following configuration
 is used:
@@ -152,7 +146,7 @@
 
 Each line should contain a keyword and a, sometimes optional,
 value for that keyword. The keyword and value are separated by 
-space or an equal (=) sign.
+a space or an equal (=) sign.
 
 watchfor regex
 
@@ -162,7 +156,7 @@
 
 =item B<echo [modes]>
 
-.Echo the matched line. The text mode may be I<normal>,
+Echo the matched line. The text mode may be I<normal>,
 I<bold>, I<underscore>, I<blink>, I<inverse>, 
 I<black>, I<red>, I<green>, I<yellow>, I<blue>, I<magenta>, I<cyan>, I<white>,
 I<black_h>, I<red_h>, I<green_h>, I<yellow_h>, I<blue_h>, 
@@ -180,7 +174,7 @@
 Execute I<command>. The I<command> may contain variables which are 
 substituted with fields from the matched line. A I<$N> will be replaced
 by the I<Nth> field in the line. A I<$0> or I<$*> will be replaced by the
- entire line.
+entire line.
 
 =item B<mail [addresses=address:address:...][,subject=your_text_here]>
 
@@ -197,7 +191,7 @@
 
 Use B<write(1)> to send matched lines to I<user(s)>.
 
-=item B<throttle hours:minutes:seconds,[use=message|regex|<regex>]>
+=item B<throttle hours:minutes:seconds,[use=message|regex|<regexE<gt>]>
 
 Use this action to limit the number of times that the matched pattern 
 has actions performed on it.
@@ -205,7 +199,15 @@
 The B<use=regex> option will cause throttling to be based on the regular
 expression instead of the message.
 
-You can also specify a perl compliant regular expression as the value for B,use>. The default is use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)" causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
+You can also specify a perl compliant regular expression as the value for B<use>. The default is
+
+=over 4
+
+use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)"
+
+=back
+
+and causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
 
 =item B<threshold events:seconds,[repeat=no|yes]>
 
@@ -223,7 +225,7 @@
  
 Note that this is similar to, but different from, the standard "throttle"
 command, since "throttle" shows the first line and ignores the rest, while
-"threshold" shows the last line and ignores the preceeding (and optionally
+"threshold" shows the last line and ignores the preceding (and optionally
 the following).  However, an action like "threshold 1:120" should perform
 similarly to "throttle 0:2:0,use=regex" and has the advantage of not relying
 on a particular timestamp format in the source log entry.
@@ -268,9 +270,13 @@
 conditional used by the current watchfor statement, and 3=inside the throttle
 block).
 
-Its intended use is to permit variable substitution through use like.
+Its intended use is to permit variable substitution. For example:
+
+=over 4
+
+perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";
 
-C<perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";>
+=back
  
 watchfor /$syslog hostname pppd/>
  
@@ -315,7 +321,7 @@
 
 =head1 NOTES
 
-Upon receiving a ALRM or HUP signal swatch will re-read the
+Upon receiving an ALRM or HUP signal swatch will re-read the
 configuration file and restart, except when used with the I<--daemon> 
 command line option where it will simply exit.
 Swatch will terminate gracefully
@@ -382,7 +388,8 @@
 my @Swatch_ARGV = join(' ', $0, @ARGV); # Save just in case we need to restart 
 (my $Me = $0) =~ s%.*/%%;	      # Strip the path off of the program name
 
-$SIG{'CHLD'} = 'IGNORE';
+#$SIG{'CHLD'} = 'IGNORE';
+$SIG{'CHLD'} = 'DEFAULT';
 
 my $DEF_CONFIG_FILE = "$ENV{'HOME'}/.swatchrc";
 my $DEF_INPUT;
@@ -406,13 +413,13 @@
     --config-file=FILENAME               Use FILENAME for configuration.
     --old-style-config                   Parse a pre-version 3 configuration.
     --restart-time=[+]HH:MM[AM|PM]       Send a HUP signal to swatch at the specified time.
-    --input-record-separator=REGEX       Specify an what should be used to separate "lines."
+    --input-record-separator=REGEX       Specify what should be used to separate "lines."
     --help                               Display this message.
     --version                            Display author and version information.
     --tail-file=FILENAME                 Watch a tail of FILENAME.
-    --read-pipe=COMMAND                  Watch a pipe from COMMAND
-    --examine=FILENAME                   Perform a single pass through FILENAME
-    --pid-file=FILENAME			 File to write pid of process to
+    --read-pipe=COMMAND                  Watch a pipe from COMMAND.
+    --examine=FILENAME                   Perform a single pass through FILENAME.
+    --pid-file=FILENAME			 File to write pid of process to.
     --use-cpan-file-tail                 Use the File::Tail CPAN module to read the log file.
 /;
 
@@ -566,8 +573,8 @@
     s/^\s+//; ## strip off leading blank space
     s/\s+$//; ## strip off trailing blank space
 
-    ### Skip comments blank lines ###
-    next if (/^\#/ or /^\s*$/);
+    ### Skip comments and blank lines ###
+    next if (/^\#/ or /^$/);
 
     s/\#.*$//; ## strip trailing comments
 
@@ -746,7 +753,8 @@
 /;
 
 \$SIG{'TERM'} = \$SIG{'HUP'} = 'goodbye';
-\$SIG{'CHLD'} = 'IGNORE';
+##\$SIG{'CHLD'} = 'IGNORE';
+\$SIG{'CHLD'} = 'DEFAULT';
 
 ## Constants
 (my \$Me = \$0) =~ s%.*/%%;
@@ -759,7 +767,7 @@
 my \$swatch_last_flush = time;
 
 use IO::Handle;
-STDOUT->autoflush(1);;
+STDOUT->autoflush(1);
 
 sub goodbye {
   \$| = 0;
@@ -959,8 +967,13 @@
     } else {
       my $opt = $v;
       $opt =~ s/@/\\@/g;
-      $opt =~ s/^['" ]*//;
-      $opt =~ s/['" ]*$//;
+#     $opt =~ s/^['" ]*//;
+#     $opt =~ s/['" ]*$//;
+      $opt =~ s/^\s+//o;
+      $opt =~ s/\s+$//o;
+      $opt = $1 if ($opt =~ /^['"]\s*(.*)\s*['"]$/o);
+      $opt =~ s/"/\\"/go;
+
       if ($actinfo->{$key}{'def_arg'} eq 'MODES') { 
         ## Modes are processed as an array ##
 	push(@{$options{$actinfo->{$key}{'def_arg'}}}, $opt);
@@ -1038,7 +1051,7 @@
   }
 #  $command =~ s/\$([0-9]+)/\$_[$1]/g;
 
-  return join(' ', @new_cmd);;
+  return join(' ', @new_cmd);
 }
 
  


Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/FC-3/swatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- swatch.spec	25 Feb 2005 20:36:41 -0000	1.5
+++ swatch.spec	5 Jan 2006 17:14:15 -0000	1.6
@@ -1,15 +1,13 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           swatch
 Version:        3.1.1
-Release:        1
-Epoch:          0
-Summary:        A tool for actively monitoring log files.
+Release:        4%{?dist}
+Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
 URL:            http://swatch.sourceforge.net/
 Source0:        http://dl.sf.net/swatch/swatch-3.1.1.tar.gz
+Patch0:         swatch-3.1.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -19,14 +17,15 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-The Simple WATCHer is an automated monitoring tool that is capable 
-of alerting system administrators of anything that matches the 
-patterns described in the configuration file, whilst constantly 
+The Simple WATCHer is an automated monitoring tool that is capable
+of alerting system administrators of anything that matches the
+patterns described in the configuration file, whilst constantly
 searching logfiles using perl.
 
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 tools/*
 
 %build
@@ -42,11 +41,11 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check ||:
+%check
 make test
 
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -54,12 +53,22 @@
 %defattr(-,root,root,-)
 %doc CHANGES COPYRIGHT COPYING KNOWN_BUGS README examples/ tools/
 %{_bindir}/swatch
-%{_mandir}/man[13]/*
+%{_mandir}/man1/*.1*
+%{_mandir}/man3/*.3*
 %{perl_vendorlib}/Swatch/
 %{perl_vendorlib}/auto/Swatch/
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-4
+- Patch supplied by John Horne: doc updates and $0 handling (#160817).
+
+* Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-3
+- Add dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.1.1-2
+- rebuilt
+
 * Thu Aug 26 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:3.1.1-1
 - Retaking ownership, thanks jpo and updating for version 3.1.1
 



From fedora-extras-commits at redhat.com  Thu Jan  5 15:29:39 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 10:29:39 -0500
Subject: rpms/abiword/FC-4 abiword-2.4.2-desktop.patch, NONE,
	1.1 abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 abiword.spec, 1.19, 1.20 sources, 1.9,
	1.10 abiword-2.2.6-desktop.patch, 1.1,
	NONE abiword-2.4.1-gsf.patch, 1.1, NONE
Message-ID: <200601051530.k05FUBIa021355@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21316

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch abiword-2.4.1-gsf.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-desktop.patch:

--- NEW FILE abiword-2.4.2-desktop.patch ---
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop	2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop	2006-01-02 00:32:33.000000000 +0100
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor

abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+        ABI_PLUGIN_REPORT([OpenDocument: okay])
 ],[        ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+        ABI_PLUGIN_REPORT([OpenWriter: okay])
 ],[        ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Oct 2005 19:55:56 -0000	1.9
+++ .cvsignore	5 Jan 2006 15:29:38 -0000	1.10
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- abiword.spec	30 Dec 2005 21:32:37 -0000	1.19
+++ abiword.spec	5 Jan 2006 15:29:38 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.1
-Release: 5%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -46,8 +46,8 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.4.1-gsf.patch
+Patch1: abiword-2.4.2-desktop.patch
+Patch2: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -57,7 +57,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .gsf
+%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -141,6 +141,12 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc4
+- Update to 2.4.2;
+- Drop the gsf patch
+- Update the desktop patch
+- Add a plugins macros patch
+
 * Fri Dec 30 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-5.fc4
 - Add BuildRequires readline-devel for the AbiCommand plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Oct 2005 19:55:56 -0000	1.9
+++ sources	5 Jan 2006 15:29:38 -0000	1.10
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---


--- abiword-2.4.1-gsf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 16:32:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 11:32:46 -0500
Subject: rpms/swatch/devel swatch-3.1.1.patch,NONE,1.1 swatch.spec,1.8,1.9
Message-ID: <200601051633.k05GXIvu024081@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/swatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24057

Modified Files:
	swatch.spec 
Added Files:
	swatch-3.1.1.patch 
Log Message:
Doc updates and /bin/bash handling (#160817).

swatch-3.1.1.patch:

--- NEW FILE swatch-3.1.1.patch ---
diff -ruN swatch-3.1.1-orig/swatch swatch-3.1.1/swatch
--- swatch-3.1.1-orig/swatch	2004-07-19 21:14:54.000000000 +0100
+++ swatch-3.1.1/swatch	2005-08-29 20:52:13.000000000 +0100
@@ -32,7 +32,7 @@
 [ B<--input-record-separator> I<regex> ] 
 [ [ B<--examine> I<file_to_examine> ] 
 | [ B<--read-pipe> I<program_to_pipe_from> ] 
-| [ B<--tail> I<file_to_tail> ] ]
+| [ B<--tail-file> I<file_to_tail> ] ]
 [ B<--daemon> ] 
 [ B<--use-cpan-file-tail> ]
 [ B<--awk-field-syntax> ]
@@ -68,7 +68,7 @@
 
 Restart at the specified time where I<hh> is hours and I<mm> is minutes. 
 If the am/pm indicator is omitted, then a 24-hour clock is assumed. 
-If the time is preceeded by the "+" character, then the restart time 
+If the time is preceded by the "+" character, then the restart time 
 will be set to the current time plus the specified time and the am/pm
 indicator will be ignored.
 
@@ -124,18 +124,12 @@
 If swatch is called with no options, it is the same as typing the 
 command line
 
-=over 5
-
-=item
-
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog>
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog
 
 or if /var/log/messages exists
 
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/messages>
-
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/messages
 
-=back
 
 If the configuration file doesn't exist then the following configuration
 is used:
@@ -152,7 +146,7 @@
 
 Each line should contain a keyword and a, sometimes optional,
 value for that keyword. The keyword and value are separated by 
-space or an equal (=) sign.
+a space or an equal (=) sign.
 
 watchfor regex
 
@@ -162,7 +156,7 @@
 
 =item B<echo [modes]>
 
-.Echo the matched line. The text mode may be I<normal>,
+Echo the matched line. The text mode may be I<normal>,
 I<bold>, I<underscore>, I<blink>, I<inverse>, 
 I<black>, I<red>, I<green>, I<yellow>, I<blue>, I<magenta>, I<cyan>, I<white>,
 I<black_h>, I<red_h>, I<green_h>, I<yellow_h>, I<blue_h>, 
@@ -180,7 +174,7 @@
 Execute I<command>. The I<command> may contain variables which are 
 substituted with fields from the matched line. A I<$N> will be replaced
 by the I<Nth> field in the line. A I<$0> or I<$*> will be replaced by the
- entire line.
+entire line.
 
 =item B<mail [addresses=address:address:...][,subject=your_text_here]>
 
@@ -197,7 +191,7 @@
 
 Use B<write(1)> to send matched lines to I<user(s)>.
 
-=item B<throttle hours:minutes:seconds,[use=message|regex|<regex>]>
+=item B<throttle hours:minutes:seconds,[use=message|regex|<regexE<gt>]>
 
 Use this action to limit the number of times that the matched pattern 
 has actions performed on it.
@@ -205,7 +199,15 @@
 The B<use=regex> option will cause throttling to be based on the regular
 expression instead of the message.
 
-You can also specify a perl compliant regular expression as the value for B,use>. The default is use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)" causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
+You can also specify a perl compliant regular expression as the value for B<use>. The default is
+
+=over 4
+
+use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)"
+
+=back
+
+and causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
 
 =item B<threshold events:seconds,[repeat=no|yes]>
 
@@ -223,7 +225,7 @@
  
 Note that this is similar to, but different from, the standard "throttle"
 command, since "throttle" shows the first line and ignores the rest, while
-"threshold" shows the last line and ignores the preceeding (and optionally
+"threshold" shows the last line and ignores the preceding (and optionally
 the following).  However, an action like "threshold 1:120" should perform
 similarly to "throttle 0:2:0,use=regex" and has the advantage of not relying
 on a particular timestamp format in the source log entry.
@@ -268,9 +270,13 @@
 conditional used by the current watchfor statement, and 3=inside the throttle
 block).
 
-Its intended use is to permit variable substitution through use like.
+Its intended use is to permit variable substitution. For example:
+
+=over 4
+
+perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";
 
-C<perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";>
+=back
  
 watchfor /$syslog hostname pppd/>
  
@@ -315,7 +321,7 @@
 
 =head1 NOTES
 
-Upon receiving a ALRM or HUP signal swatch will re-read the
+Upon receiving an ALRM or HUP signal swatch will re-read the
 configuration file and restart, except when used with the I<--daemon> 
 command line option where it will simply exit.
 Swatch will terminate gracefully
@@ -382,7 +388,8 @@
 my @Swatch_ARGV = join(' ', $0, @ARGV); # Save just in case we need to restart 
 (my $Me = $0) =~ s%.*/%%;	      # Strip the path off of the program name
 
-$SIG{'CHLD'} = 'IGNORE';
+#$SIG{'CHLD'} = 'IGNORE';
+$SIG{'CHLD'} = 'DEFAULT';
 
 my $DEF_CONFIG_FILE = "$ENV{'HOME'}/.swatchrc";
 my $DEF_INPUT;
@@ -406,13 +413,13 @@
     --config-file=FILENAME               Use FILENAME for configuration.
     --old-style-config                   Parse a pre-version 3 configuration.
     --restart-time=[+]HH:MM[AM|PM]       Send a HUP signal to swatch at the specified time.
-    --input-record-separator=REGEX       Specify an what should be used to separate "lines."
+    --input-record-separator=REGEX       Specify what should be used to separate "lines."
     --help                               Display this message.
     --version                            Display author and version information.
     --tail-file=FILENAME                 Watch a tail of FILENAME.
-    --read-pipe=COMMAND                  Watch a pipe from COMMAND
-    --examine=FILENAME                   Perform a single pass through FILENAME
-    --pid-file=FILENAME			 File to write pid of process to
+    --read-pipe=COMMAND                  Watch a pipe from COMMAND.
+    --examine=FILENAME                   Perform a single pass through FILENAME.
+    --pid-file=FILENAME			 File to write pid of process to.
     --use-cpan-file-tail                 Use the File::Tail CPAN module to read the log file.
 /;
 
@@ -566,8 +573,8 @@
     s/^\s+//; ## strip off leading blank space
     s/\s+$//; ## strip off trailing blank space
 
-    ### Skip comments blank lines ###
-    next if (/^\#/ or /^\s*$/);
+    ### Skip comments and blank lines ###
+    next if (/^\#/ or /^$/);
 
     s/\#.*$//; ## strip trailing comments
 
@@ -746,7 +753,8 @@
 /;
 
 \$SIG{'TERM'} = \$SIG{'HUP'} = 'goodbye';
-\$SIG{'CHLD'} = 'IGNORE';
+##\$SIG{'CHLD'} = 'IGNORE';
+\$SIG{'CHLD'} = 'DEFAULT';
 
 ## Constants
 (my \$Me = \$0) =~ s%.*/%%;
@@ -759,7 +767,7 @@
 my \$swatch_last_flush = time;
 
 use IO::Handle;
-STDOUT->autoflush(1);;
+STDOUT->autoflush(1);
 
 sub goodbye {
   \$| = 0;
@@ -959,8 +967,13 @@
     } else {
       my $opt = $v;
       $opt =~ s/@/\\@/g;
-      $opt =~ s/^['" ]*//;
-      $opt =~ s/['" ]*$//;
+#     $opt =~ s/^['" ]*//;
+#     $opt =~ s/['" ]*$//;
+      $opt =~ s/^\s+//o;
+      $opt =~ s/\s+$//o;
+      $opt = $1 if ($opt =~ /^['"]\s*(.*)\s*['"]$/o);
+      $opt =~ s/"/\\"/go;
+
       if ($actinfo->{$key}{'def_arg'} eq 'MODES') { 
         ## Modes are processed as an array ##
 	push(@{$options{$actinfo->{$key}{'def_arg'}}}, $opt);
@@ -1038,7 +1051,7 @@
   }
 #  $command =~ s/\$([0-9]+)/\$_[$1]/g;
 
-  return join(' ', @new_cmd);;
+  return join(' ', @new_cmd);
 }
 
  


Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/devel/swatch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- swatch.spec	12 May 2005 23:27:11 -0000	1.8
+++ swatch.spec	5 Jan 2006 16:32:46 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           swatch
 Version:        3.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
 URL:            http://swatch.sourceforge.net/
 Source0:        http://dl.sf.net/swatch/swatch-3.1.1.tar.gz
+Patch0:         swatch-3.1.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 tools/*
 
 %build
@@ -39,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check ||:
+%check
 make test
 
 
@@ -58,6 +60,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-4
+- Patch supplied by John Horne: doc updates and $0 handling (#160817).
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-3
 - Add dist tag.
 



From fedora-extras-commits at redhat.com  Thu Jan  5 15:49:50 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:49:50 -0500
Subject: rpms/maxima/FC-3 maxima.spec,1.12,1.13 xmaxima.desktop,1.3,1.4
Message-ID: <200601051550.k05FoM9d021667@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21648

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
sync w/devel branch



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/maxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maxima.spec	28 Oct 2005 19:10:40 -0000	1.12
+++ maxima.spec	5 Jan 2006 15:49:49 -0000	1.13
@@ -3,14 +3,16 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 6%{?dist} 
+Release: 9%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc (and maybe ppc64)  when lisps build again on ppc 
+# add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
+#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
+#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp
@@ -19,8 +21,8 @@
 %define _enable_clisp --enable-clisp 
 # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
 #define _enable_cmucl --enable-cmucl 
-# gcl not built for fc5/development (yet)
-%if "%{?fedora}" < "5"
+%if "%{?fedora}" != "5"
+# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %endif
 %define _enable_sbcl --enable-sbcl 
@@ -101,8 +103,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-# To appease those who are paranoid about rpm queries at build time
-#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -140,9 +141,8 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.6
-## To appease those who are paranoid about rpm queries at build time
-#define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
+BuildRequires: sbcl 
+#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -315,7 +315,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
@@ -351,6 +351,15 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
+- OK, loosen Req's again (buildsystem can't handle it)
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
+- tighten Req: on clisp/sbcl runtimes
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
+- rebuild for/with new clisp,sbcl
+
 * Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
 - --enable-sbcl
 - avoid rpmquery's at build-time


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/xmaxima.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmaxima.desktop	26 Nov 2005 19:38:09 -0000	1.3
+++ xmaxima.desktop	5 Jan 2006 15:49:49 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=Symbolic Computation Program
 Exec=xmaxima
 Icon=maxima
-MimeType=
+#MimeType=
 Type=Application
 Categories=Application;Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Jan  5 16:47:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:47:16 -0500
Subject: rpms/perl-DBIx-ContextualFetch/FC-3 perl-DBIx-ContextualFetch.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051647.k05GlmXi024455@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385/FC-3

Modified Files:
	perl-DBIx-ContextualFetch.spec sources 
Log Message:

Bump to 1.03



Index: perl-DBIx-ContextualFetch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-3/perl-DBIx-ContextualFetch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBIx-ContextualFetch.spec	18 Aug 2005 03:49:29 -0000	1.1
+++ perl-DBIx-ContextualFetch.spec	5 Jan 2006 16:47:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-ContextualFetch
-Version:        1.02
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        Add contextual fetches to DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,8 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(DBD::SQLite2)
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(DBD::SQLite), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(DBI)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.03-1
+- bump to 1.03
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-3
 - more cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:49:29 -0000	1.2
+++ sources	5 Jan 2006 16:47:16 -0000	1.3
@@ -1 +1 @@
-e0e2d7db498de03fb3aef95ebd1e0947  DBIx-ContextualFetch-1.02.tar.gz
+20a78432ae26b266216b7b30ff7941c3  DBIx-ContextualFetch-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:47:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:47:28 -0500
Subject: rpms/perl-DBIx-ContextualFetch/devel .cvsignore, 1.2,
	1.3 perl-DBIx-ContextualFetch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051648.k05Gm0xj024465@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385/devel

Modified Files:
	.cvsignore perl-DBIx-ContextualFetch.spec sources 
Log Message:

Bump to 1.03



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 03:49:29 -0000	1.2
+++ .cvsignore	5 Jan 2006 16:47:27 -0000	1.3
@@ -1 +1,2 @@
 DBIx-ContextualFetch-1.02.tar.gz
+DBIx-ContextualFetch-1.03.tar.gz


Index: perl-DBIx-ContextualFetch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/perl-DBIx-ContextualFetch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBIx-ContextualFetch.spec	18 Aug 2005 03:49:29 -0000	1.1
+++ perl-DBIx-ContextualFetch.spec	5 Jan 2006 16:47:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-ContextualFetch
-Version:        1.02
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        Add contextual fetches to DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,8 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(DBD::SQLite2)
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(DBD::SQLite), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(DBI)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.03-1
+- bump to 1.03
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-3
 - more cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:49:29 -0000	1.2
+++ sources	5 Jan 2006 16:47:27 -0000	1.3
@@ -1 +1 @@
-e0e2d7db498de03fb3aef95ebd1e0947  DBIx-ContextualFetch-1.02.tar.gz
+20a78432ae26b266216b7b30ff7941c3  DBIx-ContextualFetch-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:36:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:36:09 -0500
Subject: rpms/perl-Apache-Session-Wrapper/FC-4
	perl-Apache-Session-Wrapper.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051636.k05Gafit024192@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24135/FC-4

Modified Files:
	perl-Apache-Session-Wrapper.spec sources 
Log Message:

Bump to 0.26



Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-4/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session-Wrapper.spec	12 Sep 2005 14:44:40 -0000	1.1
+++ perl-Apache-Session-Wrapper.spec	5 Jan 2006 16:36:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session-Wrapper
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+APACHE_TEST_HTTPD=/usr/sbin/httpd ./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.26-1
+- bump to 0.26
+
 * Mon Sep 12 2005 Paul Howarth <paul at city-fan.org> 0.25-2
 - Use Module::Build
 - Add dep perl(Class::Container)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2005 14:44:40 -0000	1.2
+++ sources	5 Jan 2006 16:36:09 -0000	1.3
@@ -1 +1 @@
-fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz
+3da1330b76d1305bde3bbfee7e82ae17  Apache-Session-Wrapper-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:04 -0500
Subject: rpms/perl-Text-CSV_XS - New directory
Message-ID: <200601051722.k05HM6I6026830@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/perl-Text-CSV_XS

Log Message:
Directory /cvs/extras/rpms/perl-Text-CSV_XS added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 16:47:22 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:47:22 -0500
Subject: rpms/perl-DBIx-ContextualFetch/FC-4 perl-DBIx-ContextualFetch.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051647.k05GlteM024459@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385/FC-4

Modified Files:
	perl-DBIx-ContextualFetch.spec sources 
Log Message:

Bump to 1.03



Index: perl-DBIx-ContextualFetch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-4/perl-DBIx-ContextualFetch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBIx-ContextualFetch.spec	18 Aug 2005 03:49:29 -0000	1.1
+++ perl-DBIx-ContextualFetch.spec	5 Jan 2006 16:47:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-ContextualFetch
-Version:        1.02
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        Add contextual fetches to DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,8 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(DBD::SQLite2)
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(DBD::SQLite), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(DBI)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.03-1
+- bump to 1.03
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-3
 - more cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:49:29 -0000	1.2
+++ sources	5 Jan 2006 16:47:22 -0000	1.3
@@ -1 +1 @@
-e0e2d7db498de03fb3aef95ebd1e0947  DBIx-ContextualFetch-1.02.tar.gz
+20a78432ae26b266216b7b30ff7941c3  DBIx-ContextualFetch-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 00:54:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  4 Jan 2006 19:54:43 -0500
Subject: rpms/openvpn/FC-4 openvpn.spec,1.10,1.11
Message-ID: <200601050055.k050tFV7023443@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/FC-4

Modified Files:
	openvpn.spec 
Log Message:
Man page shouldn't be executable (BZ#176953)


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/openvpn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openvpn.spec	8 Nov 2005 15:35:33 -0000	1.10
+++ openvpn.spec	5 Jan 2006 00:54:43 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:              openvpn
 Version:           2.0.5
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -72,7 +72,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m 0755 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+install -D -m 0644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -D -m 0755 sample-scripts/%{name}.init \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Jan 04 2006 Steven Pritchard <steve at kspei.com> 2.0.5-3
+- Man page shouldn't be executable (BZ#176953)
+
 * Tue Nov 08 2005 Steven Pritchard <steve at kspei.com> 2.0.5-2
 - Make sample-scripts (etc.) non-executable to avoid some dependencies
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:10 -0500
Subject: rpms/perl-Text-CSV_XS/devel - New directory
Message-ID: <200601051722.k05HMCMm026845@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/perl-Text-CSV_XS/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-CSV_XS/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 17:23:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:23:05 -0500
Subject: rpms/perl-Text-CSV_XS import.log,1.1,1.2
Message-ID: <200601051723.k05HNiJX026973@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26936

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-CSV_XS-0.23-1 on branch devel from perl-Text-CSV_XS-0.23-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jan 2006 17:22:27 -0000	1.1
+++ import.log	5 Jan 2006 17:23:04 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-CSV_XS-0_23-1:HEAD:perl-Text-CSV_XS-0.23-1.src.rpm:1136481777



From fedora-extras-commits at redhat.com  Thu Jan  5 17:29:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:29:30 -0500
Subject: rpms/perl-Text-CSV_XS/devel perl-Text-CSV_XS.spec,1.1,1.2
Message-ID: <200601051730.k05HU3xM027045@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023

Modified Files:
	perl-Text-CSV_XS.spec 
Log Message:
Build section: simplified RPM_OPT_FLAGS handling (#175898).


Index: perl-Text-CSV_XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/perl-Text-CSV_XS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-CSV_XS.spec	5 Jan 2006 17:23:10 -0000	1.1
+++ perl-Text-CSV_XS.spec	5 Jan 2006 17:29:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-CSV_XS
 Version:        0.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Comma-separated values manipulation routines
 
 Group:          Development/Libraries
@@ -22,8 +22,8 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-2
+- Build section: simplified RPM_OPT_FLAGS handling (#175898).
+
 * Sat Nov 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
 - First build.



From fedora-extras-commits at redhat.com  Thu Jan  5 15:51:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:51:40 -0500
Subject: rpms/maxima/devel maxima.spec,1.15,1.16
Message-ID: <200601051552.k05FqCAO021738@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21720

Modified Files:
	maxima.spec 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
- OK, loosen Req's again (buildsystem can't handle it)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- maxima.spec	5 Jan 2006 15:28:54 -0000	1.15
+++ maxima.spec	5 Jan 2006 15:51:40 -0000	1.16
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -103,7 +103,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
+#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -142,7 +142,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 BuildRequires: sbcl 
-%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
+#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -351,6 +351,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
+- OK, loosen Req's again (buildsystem can't handle it)
+
 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
 - tighten Req: on clisp/sbcl runtimes
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:34 -0500
Subject: rpms/perl-Text-CSV_XS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601051722.k05HMaBe026900@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26867/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-CSV_XS


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan  5 04:53:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed,  4 Jan 2006 23:53:44 -0500
Subject: rpms/libeXosip2/FC-4 .cvsignore, 1.3, 1.4 libeXosip2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601050454.k054sGiE030860@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30826

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Upload new source.
Bump release because forgot to upload new source.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2005 16:27:39 -0000	1.3
+++ .cvsignore	5 Jan 2006 04:53:43 -0000	1.4
@@ -1 +1 @@
-libeXosip2-1.9.1-pre17.tar.gz
+libeXosip2-2.2.2.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/libeXosip2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libeXosip2.spec	5 Jan 2006 04:49:11 -0000	1.4
+++ libeXosip2.spec	5 Jan 2006 04:53:43 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
 Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
@@ -71,6 +71,7 @@
 %changelog
 * Wed Jan  4 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 2.2.2
 - Update to 2.2.2.
+- Bump release because forgot to upload new source.
 
 * Sat Oct 29 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 1.9.1-0.5.pre17
 - Update to next prerelease.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2005 16:27:39 -0000	1.3
+++ sources	5 Jan 2006 04:53:43 -0000	1.4
@@ -1 +1 @@
-e16606a53c4c4660a7db7e1c6e3d5256  libeXosip2-1.9.1-pre17.tar.gz
+3434df493dc780b4bae76467ce29d689  libeXosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 15:53:23 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 10:53:23 -0500
Subject: rpms/abiword/FC-3 abiword-2.4.2-desktop.patch, NONE,
	1.1 abiword-2.4.2-gsf.patch, NONE,
	1.1 abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 abiword.spec, 1.31, 1.32 sources, 1.12,
	1.13 abiword-2.2.6-desktop.patch, 1.1,
	NONE abiword-2.4.1-gsf.patch, 1.1, NONE
Message-ID: <200601051553.k05FrusO021834@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21802

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-gsf.patch 
	abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch abiword-2.4.1-gsf.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-desktop.patch:

--- NEW FILE abiword-2.4.2-desktop.patch ---
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop	2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop	2006-01-02 00:32:33.000000000 +0100
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor

abiword-2.4.2-gsf.patch:

--- NEW FILE abiword-2.4.2-gsf.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-11-25 18:20:59.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-02 00:35:51.000000000 +0100
@@ -28,7 +28,7 @@
 # Checks for libraries.
 # Checks for header files.
 
-LIBGSF_REQUIRED_VERSION=1.11.1
+LIBGSF_REQUIRED_VERSION=1.10.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
         ABI_PLUGIN_REPORT([OpenDocument: okay]), \
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:17:38.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-02 00:36:00.000000000 +0100
@@ -28,7 +28,7 @@
 # Checks for libraries.
 # Checks for header files.
 
-LIBGSF_REQUIRED_VERSION=1.11.1
+LIBGSF_REQUIRED_VERSION=1.10.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
         ABI_PLUGIN_REPORT([OpenWriter: okay]), \

abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+        ABI_PLUGIN_REPORT([OpenDocument: okay])
 ],[        ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+        ABI_PLUGIN_REPORT([OpenWriter: okay])
 ],[        ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Oct 2005 21:58:57 -0000	1.12
+++ .cvsignore	5 Jan 2006 15:53:23 -0000	1.13
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- abiword.spec	30 Dec 2005 21:31:50 -0000	1.31
+++ abiword.spec	5 Jan 2006 15:53:23 -0000	1.32
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.1
-Release: 8%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -45,8 +45,9 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.4.1-gsf.patch
+Patch1: abiword-2.4.2-desktop.patch
+Patch2: abiword-2.4.2-gsf.patch
+Patch3: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -57,6 +58,7 @@
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .gsf
+%patch3 -p1 -b .macros
 
 %build
 cd abi
@@ -140,6 +142,11 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc3
+- Update to 2.4.2
+- Update the gsf and desktop patches
+- Add a plugin macros patch
+
 * Fri Dec 30 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-8.fc3
 - Add BuildRequires readline-devel for the AbiCommand plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Oct 2005 21:58:57 -0000	1.12
+++ sources	5 Jan 2006 15:53:23 -0000	1.13
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---


--- abiword-2.4.1-gsf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:35:25 -0500
Subject: owners owners.list,1.498,1.499
Message-ID: <200601051735.k05HZwi6027214@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27159

Modified Files:
	owners.list 
Log Message:
New package: perl-Text-CSV_XS (#175898).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- owners.list	3 Jan 2006 10:26:21 -0000	1.498
+++ owners.list	5 Jan 2006 17:35:25 -0000	1.499
@@ -905,6 +905,7 @@
 Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Jan  5 16:36:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:36:15 -0500
Subject: rpms/perl-Apache-Session-Wrapper/devel .cvsignore, 1.2,
	1.3 perl-Apache-Session-Wrapper.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051636.k05GaleW024198@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24135/devel

Modified Files:
	.cvsignore perl-Apache-Session-Wrapper.spec sources 
Log Message:

Bump to 0.26



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2005 14:44:40 -0000	1.2
+++ .cvsignore	5 Jan 2006 16:36:15 -0000	1.3
@@ -1 +1,2 @@
 Apache-Session-Wrapper-0.25.tar.gz
+Apache-Session-Wrapper-0.26.tar.gz


Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session-Wrapper.spec	12 Sep 2005 14:44:40 -0000	1.1
+++ perl-Apache-Session-Wrapper.spec	5 Jan 2006 16:36:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session-Wrapper
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+APACHE_TEST_HTTPD=/usr/sbin/httpd ./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.26-1
+- bump to 0.26
+
 * Mon Sep 12 2005 Paul Howarth <paul at city-fan.org> 0.25-2
 - Use Module::Build
 - Add dep perl(Class::Container)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2005 14:44:40 -0000	1.2
+++ sources	5 Jan 2006 16:36:15 -0000	1.3
@@ -1 +1 @@
-fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz
+3da1330b76d1305bde3bbfee7e82ae17  Apache-Session-Wrapper-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:28 -0500
Subject: rpms/perl-Text-CSV_XS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601051722.k05HMUbu026879@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26867

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-CSV_XS


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-CSV_XS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:35:26 -0500
Subject: rpms/perl-SQL-Abstract/devel .cvsignore, 1.2,
	1.3 perl-SQL-Abstract.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051736.k05HZw4v027215@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27127/devel

Modified Files:
	.cvsignore perl-SQL-Abstract.spec sources 
Log Message:

Bump to 1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jul 2005 01:35:59 -0000	1.2
+++ .cvsignore	5 Jan 2006 17:35:25 -0000	1.3
@@ -1 +1,2 @@
 SQL-Abstract-1.19.tar.gz
+SQL-Abstract-1.20.tar.gz


Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/perl-SQL-Abstract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Abstract.spec	30 Jul 2005 01:35:59 -0000	1.1
+++ perl-SQL-Abstract.spec	5 Jan 2006 17:35:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-1
+- bump to 1.20
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 01:35:59 -0000	1.2
+++ sources	5 Jan 2006 17:35:25 -0000	1.3
@@ -1 +1 @@
-d0e937d2f7781ed56c4ba855ee4ab47a  SQL-Abstract-1.19.tar.gz
+0a6fd0dab5d69f5ae800c4f39caa5cbf  SQL-Abstract-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:35:14 -0500
Subject: rpms/perl-SQL-Abstract/FC-3 perl-SQL-Abstract.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601051735.k05HZk0w027202@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27127/FC-3

Modified Files:
	perl-SQL-Abstract.spec sources 
Log Message:

Bump to 1.20



Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/perl-SQL-Abstract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Abstract.spec	30 Jul 2005 01:35:59 -0000	1.1
+++ perl-SQL-Abstract.spec	5 Jan 2006 17:35:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-1
+- bump to 1.20
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 01:35:59 -0000	1.2
+++ sources	5 Jan 2006 17:35:13 -0000	1.3
@@ -1 +1 @@
-d0e937d2f7781ed56c4ba855ee4ab47a  SQL-Abstract-1.19.tar.gz
+0a6fd0dab5d69f5ae800c4f39caa5cbf  SQL-Abstract-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 07:36:12 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:36:12 -0500
Subject: rpms/rkhunter import.log,1.7,1.8
Message-ID: <200601050736.k057ajhr004813@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4763

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch devel from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	5 Jan 2006 07:27:14 -0000	1.7
+++ import.log	5 Jan 2006 07:36:12 -0000	1.8
@@ -4,3 +4,4 @@
 rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691
 rkhunter-1_2_7-1:FC-3:rkhunter-1.2.7-1.src.rpm:1136445493
 rkhunter-1_2_7-1:FC-4:rkhunter-1.2.7-1.src.rpm:1136445982
+rkhunter-1_2_7-1:HEAD:rkhunter-1.2.7-1.src.rpm:1136446530



From fedora-extras-commits at redhat.com  Thu Jan  5 17:51:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:51:26 -0500
Subject: owners owners.list,1.499,1.500
Message-ID: <200601051751.k05HpxrA027628@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27564

Modified Files:
	owners.list 
Log Message:
Add python-basemap and python-basemap-data



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -r1.499 -r1.500
--- owners.list	5 Jan 2006 17:35:25 -0000	1.499
+++ owners.list	5 Jan 2006 17:51:25 -0000	1.500
@@ -995,6 +995,8 @@
 Fedora Extras|python-adns|Python interface for the GNU adns library|colin at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-basemap|Plots data on map projections (with continental and political boundaries)|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-basemap-data|Data for python-basemap|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-bibtex|Python extension to parse BibTeX files|z.kota at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org|
 Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan  5 17:51:47 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:51:47 -0500
Subject: rpms/python-basemap-data/devel python-basemap-data.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601051752.k05HqJ5i027637@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27594/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-basemap-data.spec 
Log Message:
auto-import python-basemap-data-0.7-1 on branch devel from python-basemap-data-0.7-1.src.rpm


--- NEW FILE python-basemap-data.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-basemap-data
Version:        0.7
Release:        1%{?dist}
Summary:        Data for python-basemap
Group:          Development/Libraries
License:        GPL
URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
Source0:        http://dl.sf.net/matplotlib/basemap-data-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel, proj-devel
BuildArch:      noarch

%description
Data for python-basemap

%prep
%setup -q -n basemap-data-%{version}


%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 LICENSE_data
%{_datadir}/basemap/


%changelog
* Sun Nov 20 2005 Orion Poplawski <orion at cora.nwra.com> 0.7-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Jan 2006 17:48:03 -0000	1.1
+++ .cvsignore	5 Jan 2006 17:51:47 -0000	1.2
@@ -0,0 +1 @@
+basemap-data-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Jan 2006 17:48:03 -0000	1.1
+++ sources	5 Jan 2006 17:51:47 -0000	1.2
@@ -0,0 +1 @@
+8f745d4575e996348e3b315859b354e0  basemap-data-0.7.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:53:12 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:53:12 -0500
Subject: rpms/python-basemap-data/devel python-basemap-data.spec,1.1,1.2
Message-ID: <200601051753.k05HrjvE027711@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27678

Modified Files:
	python-basemap-data.spec 
Log Message:
Remove dist tag to avoid unnecessary upgrades - this is static data



Index: python-basemap-data.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/python-basemap-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-basemap-data.spec	5 Jan 2006 17:51:47 -0000	1.1
+++ python-basemap-data.spec	5 Jan 2006 17:53:12 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-basemap-data
 Version:        0.7
-Release:        1%{?dist}
+Release:        1
 Summary:        Data for python-basemap
 Group:          Development/Libraries
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Jan  5 18:59:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 13:59:43 -0500
Subject: rpms/perl-CGI-Untaint/devel .cvsignore, 1.2,
	1.3 perl-CGI-Untaint.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051900.k05J0GE2030109@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042/devel

Modified Files:
	.cvsignore perl-CGI-Untaint.spec sources 
Log Message:

bump to 1.26



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 03:28:34 -0000	1.2
+++ .cvsignore	5 Jan 2006 18:59:43 -0000	1.3
@@ -1 +1,2 @@
 CGI-Untaint-1.25.tar.gz
+CGI-Untaint-1.26.tar.gz


Index: perl-CGI-Untaint.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/perl-CGI-Untaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint.spec	18 Aug 2005 03:28:34 -0000	1.1
+++ perl-CGI-Untaint.spec	5 Jan 2006 18:59:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint
-Version:        1.25
-Release:        3%{?dist}
+Version:        1.26
+Release:        1%{?dist}
 Summary:        Process CGI input parameters
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.26-1
+- bump to 1.26
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.25-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:28:34 -0000	1.2
+++ sources	5 Jan 2006 18:59:43 -0000	1.3
@@ -1 +1 @@
-f75b2641202e441a16db5040c37170c0  CGI-Untaint-1.25.tar.gz
+1ed11830476470d4895b632bf2222606  CGI-Untaint-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:57:23 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:57:23 -0500
Subject: rpms/logjam/FC-4 logjam-4.5.2-gtkhtml38.patch, NONE, 1.1 logjam.spec,
	1.21, 1.22 sources, 1.6, 1.7
Message-ID: <200601051757.k05Hvtrl027934@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869/FC-4

Modified Files:
	logjam.spec sources 
Added Files:
	logjam-4.5.2-gtkhtml38.patch 
Log Message:

Bump to 4.5.2


logjam-4.5.2-gtkhtml38.patch:

--- NEW FILE logjam-4.5.2-gtkhtml38.patch ---
--- logjam-4.5.2/configure.in.BAD	2006-01-05 11:45:05.000000000 -0600
+++ logjam-4.5.2/configure.in	2006-01-05 11:46:58.000000000 -0600
@@ -74,21 +74,29 @@
                    [compile with GtkSpell support (default autodetect)]),
     gtkspell-2.0)
 
-  LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
-    AC_HELP_STRING([--with-gtkhtml36],
-                   [compile with GtkHtml3.6 support (default autodetect)]),
-    libgtkhtml-3.6)
-  if test "$with_gtkhtml36" = "yes"; then
-    with_gtkhtml="3.6"
+  LJ_PKG_ARG_WITH(gtkhtml38, GTKHTML38,
+    AC_HELP_STRING([--with-gtkhtml38],
+                   [compile with GtkHtml3.8 support (default autodetect)]),   
+    libgtkhtml-3.8)
+  if test "$with_gtkhtml38" = "yes"; then
+    with_gtkhtml="3.8"
   else
-    LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
-      AC_HELP_STRING([--with-gtkhtml30],
-                     [compile with GtkHtml3.0 support (default autodetect)]),
-      libgtkhtml-3.0)
-    if test "$with_gtkhtml30" = "yes"; then
-      with_gtkhtml="3.0"
+    LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
+      AC_HELP_STRING([--with-gtkhtml36],
+                     [compile with GtkHtml3.6 support (default autodetect)]),
+      libgtkhtml-3.6)
+    if test "$with_gtkhtml36" = "yes"; then
+      with_gtkhtml="3.6"
     else
-      with_gtkhtml="no"
+      LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
+        AC_HELP_STRING([--with-gtkhtml30],
+                       [compile with GtkHtml3.0 support (default autodetect)]),
+        libgtkhtml-3.0)
+      if test "$with_gtkhtml30" = "yes"; then
+        with_gtkhtml="3.0"
+      else
+        with_gtkhtml="no"
+      fi
     fi
   fi
   if test "$with_gtkhtml" != "no"; then


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- logjam.spec	6 Sep 2005 22:02:26 -0000	1.21
+++ logjam.spec	5 Jan 2006 17:57:23 -0000	1.22
@@ -1,8 +1,8 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.1
-Release:	5%{?dist}
+Version:	4.5.2
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -18,11 +18,11 @@
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		logjam-4.4.1-offline-segfaultfix.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
 Patch5:		logjam-4.5-patch8-manfix.patch
+Patch6:		logjam-4.5.2-gtkhtml38.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -41,13 +41,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .offline-segfaultfix
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
+%patch6 -p1 -b .gtkhtml38
 
 %build
+autoconf
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -82,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.2-1
+- bump to 4.5.2
+
 * Tue Sep  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.1-5
 - add BR: libgcrypt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 22:02:26 -0000	1.6
+++ sources	5 Jan 2006 17:57:23 -0000	1.7
@@ -1 +1 @@
-ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2
+4c06324355ba01a2a1cf1ad5b48f4c85  logjam-4.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan  4 23:21:22 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  4 Jan 2006 18:21:22 -0500
Subject: rpms/ocaml/FC-3 .cvsignore, 1.5, 1.6 ocaml.spec, 1.13, 1.14 sources,
	1.6, 1.7
Message-ID: <200601042321.k04NLsiA021010@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20972/FC-3

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jan 2006 00:07:03 -0000	1.5
+++ .cvsignore	4 Jan 2006 23:21:22 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.09.0.tar.bz2
+ocaml-3.09.1.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
 ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocaml.spec	1 Jan 2006 00:07:03 -0000	1.13
+++ ocaml.spec	4 Jan 2006 23:21:22 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.0
+Version:	3.09.1
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
@@ -18,6 +18,7 @@
 BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  XFree86-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -180,6 +181,9 @@
 %doc emacs/README
 
 %changelog
+* Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
+- new version 3.09.1
+
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jan 2006 00:07:03 -0000	1.6
+++ sources	4 Jan 2006 23:21:22 -0000	1.7
@@ -1,4 +1,4 @@
-834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
 598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:54:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:54:25 -0500
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051654.k05Gswrv024730@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674/FC-4

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

Bump to 1.02



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Plugin-RetrieveAll.spec	7 Sep 2005 18:53:58 -0000	1.1
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
+- bump to 1.02
+
 * Wed Aug 31 2005 Paul Howarth <paul at city-fan.org> 1.01-3
 - remove redundant BR: perl
 - use %%{?_smp_mflags} with make in %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:53:58 -0000	1.2
+++ sources	5 Jan 2006 16:54:25 -0000	1.3
@@ -1 +1 @@
-27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:36:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:36:03 -0500
Subject: rpms/perl-Apache-Session-Wrapper/FC-3
	perl-Apache-Session-Wrapper.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051636.k05GaZ1H024188@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24135/FC-3

Modified Files:
	perl-Apache-Session-Wrapper.spec sources 
Log Message:

Bump to 0.26



Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-3/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session-Wrapper.spec	12 Sep 2005 14:44:40 -0000	1.1
+++ perl-Apache-Session-Wrapper.spec	5 Jan 2006 16:36:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session-Wrapper
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+APACHE_TEST_HTTPD=/usr/sbin/httpd ./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.26-1
+- bump to 0.26
+
 * Mon Sep 12 2005 Paul Howarth <paul at city-fan.org> 0.25-2
 - Use Module::Build
 - Add dep perl(Class::Container)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2005 14:44:40 -0000	1.2
+++ sources	5 Jan 2006 16:36:03 -0000	1.3
@@ -1 +1 @@
-fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz
+3da1330b76d1305bde3bbfee7e82ae17  Apache-Session-Wrapper-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 19:55:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  5 Jan 2006 14:55:27 -0500
Subject: rpms/svgalib/devel svgalib.spec, 1.5, 1.6 svgalib-1.9.21-wip.patch, 
	1.2, NONE svgalib-1.9.22.diff, 1.2, NONE
Message-ID: <200601051955.k05JtxE5032492@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32475

Modified Files:
	svgalib.spec 
Removed Files:
	svgalib-1.9.21-wip.patch svgalib-1.9.22.diff 
Log Message:
New upstream version, drop merged patches


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svgalib.spec	16 Aug 2005 11:55:30 -0000	1.5
+++ svgalib.spec	5 Jan 2006 19:55:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		svgalib
-Version:	1.9.21
-Release:	5
+Version:	1.9.24
+Release:	1
 Exclusivearch:	%{ix86} x86_64
 Summary:	Low-level fullscreen SVGA graphics library
 
@@ -9,13 +9,11 @@
 URL:		http://www.svgalib.org/
 Source0:	http://www.arava.co.il/matan/svgalib/svgalib-%{version}.tar.gz
 Source1:	svgalib-todo
-Patch0:		svgalib-1.9.22.diff
-Patch1:		svgalib-1.9.21-makefiles.patch
-Patch2:		svgalib-1.4.3-fhs.patch
-Patch3:		svgalib-1.9.21-demos.patch
-Patch4:		svgalib-1.9.21-wip.patch
-Patch5:		svgalib-1.9.21-cfg.patch
-Patch6:		svgalib-1.9.21-x86_64.patch
+Patch0:		svgalib-1.9.21-makefiles.patch
+Patch1:		svgalib-1.4.3-fhs.patch
+Patch2:		svgalib-1.9.21-demos.patch
+Patch3:		svgalib-1.9.21-cfg.patch
+Patch4:		svgalib-1.9.21-x86_64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	libvga = %{version}-%{release}
 
@@ -39,14 +37,12 @@
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p1 -b .makefiles
-%patch2 -p1 -b .fhs
-%patch3 -p1
-%patch4 -p1 -b .wip
-%patch5 -p1 -b .defaultcfg
+%patch0 -p1 -b .makefiles
+%patch1 -p1 -b .fhs
+%patch2 -p1
+%patch3 -p1 -b .defaultcfg
 %ifnarch %{ix86}
-%patch6 -p1 -b .x86_64
+%patch4 -p1 -b .x86_64
 %endif
 
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
@@ -76,7 +72,7 @@
 cd ..
 cd threeDKit
 make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
-  prefix=%{_prefix} lib3dkit.so.1.9.22
+  prefix=%{_prefix} lib3dkit.so.%{version}
 cd ..
 
 %install
@@ -129,6 +125,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.24-1
+- New upstream version, drop merged patches.
+
 * Tue Aug 16 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.21-5
 - Merge with upstream, drop merged patches, fix dark vga modes on radeon.
 


--- svgalib-1.9.21-wip.patch DELETED ---


--- svgalib-1.9.22.diff DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 19:00:40 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu,  5 Jan 2006 14:00:40 -0500
Subject: rpms/gazpacho/FC-4 .cvsignore, 1.7, 1.8 gazpacho.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200601051901.k05J1Xe0031854@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-4

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Oct 2005 22:53:09 -0000	1.7
+++ .cvsignore	5 Jan 2006 19:00:40 -0000	1.8
@@ -1,2 +1,2 @@
+gazpacho-0.6.3.tar.bz2
 gazpacho-0.6.1-nox.patch
-gazpacho-0.6.2.tar.bz2


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/gazpacho.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gazpacho.spec	25 Nov 2005 14:16:22 -0000	1.13
+++ gazpacho.spec	5 Jan 2006 19:00:40 -0000	1.14
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://gazpacho.sicem.biz/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/%{name}-%{version}.tar.bz2
-Patch0:         gazpacho-0.6.1-nox.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nox
 sed -i -e 's/\(^docs_dir =.*\)gazpacho/\1gazpacho-%{version}/' setup.py
 
 
@@ -37,7 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/gazpacho
+rm -rf $RPM_BUILD_ROOT%{_docdir}/gazpacho
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -75,6 +73,10 @@
 
 
 %changelog
+* Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
+- Version 0.6.3
+- .nox patch no longer needed
+
 * Tue Nov 22 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.2-2
 - Handle docdir correctly
 - Package missed docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Oct 2005 22:53:09 -0000	1.7
+++ sources	5 Jan 2006 19:00:40 -0000	1.8
@@ -1,2 +1 @@
-40f1dc10bebd7f3f06bbb53ea533bf75  gazpacho-0.6.1-nox.patch
-64311aa9688c456838903b3777703981  gazpacho-0.6.2.tar.bz2
+12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 17:51:41 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:51:41 -0500
Subject: rpms/python-basemap-data import.log,1.1,1.2
Message-ID: <200601051752.k05HqD3S027631@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27594

Modified Files:
	import.log 
Log Message:
auto-import python-basemap-data-0.7-1 on branch devel from python-basemap-data-0.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jan 2006 17:47:57 -0000	1.1
+++ import.log	5 Jan 2006 17:51:41 -0000	1.2
@@ -0,0 +1 @@
+python-basemap-data-0_7-1:HEAD:python-basemap-data-0.7-1.src.rpm:1136483497



From fedora-extras-commits at redhat.com  Thu Jan  5 17:48:03 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:48:03 -0500
Subject: rpms/python-basemap-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601051748.k05Hm5Qb027520@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27488/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-basemap-data


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan  5 20:00:39 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu,  5 Jan 2006 15:00:39 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.4,1.5
Message-ID: <200601052001.k05K1CpN001895@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32607

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdesklets.spec	18 Dec 2005 10:32:11 -0000	1.4
+++ gdesklets.spec	5 Jan 2006 20:00:39 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
 License:        GPL
 
-URL:            http://gdesklets.gnomedesktop.org/
+URL:            http://www.gdesklets.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
 Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 
 BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires: libXau-devel, libXdmcp-devel
+BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -98,10 +98,12 @@
 %{_mandir}/man1/*
 
 
-
-
 %changelog
-* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-23.fc5
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
+- Rebuilt against libgtop2-devel
+- Changed url of the provider
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-24.fc5
 - Added libXdmcp-devel on BuildRequires
 
 * Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-23.fc5



From fedora-extras-commits at redhat.com  Thu Jan  5 17:47:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:47:57 -0500
Subject: rpms/python-basemap-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601051747.k05Hlx1l027500@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27488

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-basemap-data


--- NEW FILE Makefile ---
# Top level Makefile for module python-basemap-data
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan  5 19:00:46 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu,  5 Jan 2006 14:00:46 -0500
Subject: rpms/gazpacho/devel .cvsignore, 1.8, 1.9 gazpacho.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <200601051901.k05J1MEI031846@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/devel

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Oct 2005 22:55:41 -0000	1.8
+++ .cvsignore	5 Jan 2006 19:00:46 -0000	1.9
@@ -1,2 +1,2 @@
-gazpacho-0.6.2.tar.bz2
+gazpacho-0.6.3.tar.bz2
 gazpacho-0.6.1-nox.patch


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gazpacho.spec	25 Nov 2005 14:16:27 -0000	1.14
+++ gazpacho.spec	5 Jan 2006 19:00:46 -0000	1.15
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://gazpacho.sicem.biz/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/%{name}-%{version}.tar.bz2
-Patch0:         gazpacho-0.6.1-nox.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nox
 sed -i -e 's/\(^docs_dir =.*\)gazpacho/\1gazpacho-%{version}/' setup.py
 
 
@@ -37,7 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/gazpacho
+rm -rf $RPM_BUILD_ROOT%{_docdir}/gazpacho
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -75,6 +73,10 @@
 
 
 %changelog
+* Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
+- Version 0.6.3
+- .nox patch no longer needed
+
 * Tue Nov 22 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.2-2
 - Handle docdir correctly
 - Package missed docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Oct 2005 22:55:41 -0000	1.8
+++ sources	5 Jan 2006 19:00:46 -0000	1.9
@@ -1,2 +1 @@
-64311aa9688c456838903b3777703981  gazpacho-0.6.2.tar.bz2
-40f1dc10bebd7f3f06bbb53ea533bf75  gazpacho-0.6.1-nox.patch
+12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 18:59:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 13:59:37 -0500
Subject: rpms/perl-CGI-Untaint/FC-4 perl-CGI-Untaint.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200601051900.k05J0A2d030104@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042/FC-4

Modified Files:
	perl-CGI-Untaint.spec sources 
Log Message:

bump to 1.26



Index: perl-CGI-Untaint.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-4/perl-CGI-Untaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint.spec	18 Aug 2005 03:28:34 -0000	1.1
+++ perl-CGI-Untaint.spec	5 Jan 2006 18:59:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint
-Version:        1.25
-Release:        3%{?dist}
+Version:        1.26
+Release:        1%{?dist}
 Summary:        Process CGI input parameters
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.26-1
+- bump to 1.26
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.25-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:28:34 -0000	1.2
+++ sources	5 Jan 2006 18:59:37 -0000	1.3
@@ -1 +1 @@
-f75b2641202e441a16db5040c37170c0  CGI-Untaint-1.25.tar.gz
+1ed11830476470d4895b632bf2222606  CGI-Untaint-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:47:44 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:47:44 -0500
Subject: rpms/python-basemap-data/devel - New directory
Message-ID: <200601051747.k05HlkX5027466@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27443/python-basemap-data/devel

Log Message:
Directory /cvs/extras/rpms/python-basemap-data/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 17:23:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:23:11 -0500
Subject: rpms/perl-Text-CSV_XS/devel perl-Text-CSV_XS.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601051723.k05HNiMi026972@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26936/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-CSV_XS.spec 
Log Message:
auto-import perl-Text-CSV_XS-0.23-1 on branch devel from perl-Text-CSV_XS-0.23-1.src.rpm


--- NEW FILE perl-Text-CSV_XS.spec ---
Name:           perl-Text-CSV_XS
Version:        0.23
Release:        1%{?dist}
Summary:        Comma-separated values manipulation routines

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Text-CSV_XS/
Source0:        http://www.cpan.org/authors/id/J/JW/JWIED/Text-CSV_XS-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::CSV provides facilities for the composition and decomposition of
comma-separated values.  An instance of the Text::CSV class can combine
fields into a CSV string and parse a CSV string into fields.


%prep
%setup -q -n Text-CSV_XS-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorarch}/Text/
%{perl_vendorarch}/auto/Text/
%{_mandir}/man3/*.3*


%changelog
* Sat Nov 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Jan 2006 17:22:33 -0000	1.1
+++ .cvsignore	5 Jan 2006 17:23:10 -0000	1.2
@@ -0,0 +1 @@
+Text-CSV_XS-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Jan 2006 17:22:33 -0000	1.1
+++ sources	5 Jan 2006 17:23:10 -0000	1.2
@@ -0,0 +1 @@
+936eca163a09e92353565ad37ee7a4fa  Text-CSV_XS-0.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:35:19 -0500
Subject: rpms/perl-SQL-Abstract/FC-4 perl-SQL-Abstract.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601051735.k05HZqRQ027207@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27127/FC-4

Modified Files:
	perl-SQL-Abstract.spec sources 
Log Message:

Bump to 1.20



Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/perl-SQL-Abstract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Abstract.spec	30 Jul 2005 01:35:59 -0000	1.1
+++ perl-SQL-Abstract.spec	5 Jan 2006 17:35:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-1
+- bump to 1.20
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 01:35:59 -0000	1.2
+++ sources	5 Jan 2006 17:35:19 -0000	1.3
@@ -1 +1 @@
-d0e937d2f7781ed56c4ba855ee4ab47a  SQL-Abstract-1.19.tar.gz
+0a6fd0dab5d69f5ae800c4f39caa5cbf  SQL-Abstract-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 09:26:48 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 04:26:48 -0500
Subject: rpms/gtkglext/devel gtkglext.spec,1.5,1.6
Message-ID: <200601050927.k059RO1U009570@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/gtkglext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9553

Modified Files:
	gtkglext.spec 
Log Message:
- Add %%dist.
- Adaptations to modular X .
- Remove gcc-c++ (Already in default deps).




Index: gtkglext.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglext/devel/gtkglext.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtkglext.spec	6 Apr 2005 22:11:58 -0000	1.5
+++ gtkglext.spec	5 Jan 2006 09:26:48 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	OpenGL Extension to GTK
 Name:		gtkglext
 Version:	%{base_version}
-Release:	2
+Release:	3%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -15,14 +15,14 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
-BuildRequires:	Mesa, libGL.so.1, libGLU.so.1
+BuildRequires:	libGLU-devel
+BuildRequires:	libGL-devel
+# The configure script checks for X11/Intrinsic.h
+BuildRequires:	libXt-devel
 
 Requires(postun):	/sbin/ldconfig
 Requires(post):		/sbin/ldconfig
 
-# Work around to the broken libtool being used
-BuildRequires:	gcc-c++
-
 %description
 GtkGLExt is an OpenGL extension to GTK. It provides the GDK objects
 which support OpenGL rendering in GTK, and GtkWidget API add-ons to
@@ -79,6 +79,11 @@
 %doc %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <ralf at links2linux.de> - 1.0.6-3
+- Add %%dist.
+- Adaptations to modular X .
+- Remove gcc-c++ (Already in default deps).
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:47:38 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:47:38 -0500
Subject: rpms/python-basemap-data - New directory
Message-ID: <200601051747.k05Hle48027451@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27443/python-basemap-data

Log Message:
Directory /cvs/extras/rpms/python-basemap-data added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 17:57:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:57:29 -0500
Subject: rpms/logjam/devel logjam-4.5.2-gtkhtml38.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 logjam.spec, 1.21, 1.22 sources, 1.6, 1.7
Message-ID: <200601051758.k05Hw27Y027941@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869/devel

Modified Files:
	.cvsignore logjam.spec sources 
Added Files:
	logjam-4.5.2-gtkhtml38.patch 
Log Message:

Bump to 4.5.2


logjam-4.5.2-gtkhtml38.patch:

--- NEW FILE logjam-4.5.2-gtkhtml38.patch ---
--- logjam-4.5.2/configure.in.BAD	2006-01-05 11:45:05.000000000 -0600
+++ logjam-4.5.2/configure.in	2006-01-05 11:46:58.000000000 -0600
@@ -74,21 +74,29 @@
                    [compile with GtkSpell support (default autodetect)]),
     gtkspell-2.0)
 
-  LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
-    AC_HELP_STRING([--with-gtkhtml36],
-                   [compile with GtkHtml3.6 support (default autodetect)]),
-    libgtkhtml-3.6)
-  if test "$with_gtkhtml36" = "yes"; then
-    with_gtkhtml="3.6"
+  LJ_PKG_ARG_WITH(gtkhtml38, GTKHTML38,
+    AC_HELP_STRING([--with-gtkhtml38],
+                   [compile with GtkHtml3.8 support (default autodetect)]),   
+    libgtkhtml-3.8)
+  if test "$with_gtkhtml38" = "yes"; then
+    with_gtkhtml="3.8"
   else
-    LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
-      AC_HELP_STRING([--with-gtkhtml30],
-                     [compile with GtkHtml3.0 support (default autodetect)]),
-      libgtkhtml-3.0)
-    if test "$with_gtkhtml30" = "yes"; then
-      with_gtkhtml="3.0"
+    LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
+      AC_HELP_STRING([--with-gtkhtml36],
+                     [compile with GtkHtml3.6 support (default autodetect)]),
+      libgtkhtml-3.6)
+    if test "$with_gtkhtml36" = "yes"; then
+      with_gtkhtml="3.6"
     else
-      with_gtkhtml="no"
+      LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
+        AC_HELP_STRING([--with-gtkhtml30],
+                       [compile with GtkHtml3.0 support (default autodetect)]),
+        libgtkhtml-3.0)
+      if test "$with_gtkhtml30" = "yes"; then
+        with_gtkhtml="3.0"
+      else
+        with_gtkhtml="no"
+      fi
     fi
   fi
   if test "$with_gtkhtml" != "no"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Sep 2005 14:38:20 -0000	1.4
+++ .cvsignore	5 Jan 2006 17:57:29 -0000	1.5
@@ -1,2 +1,3 @@
 logjam-4.4.1.tar.bz2
 logjam-4.5.1.tar.bz2
+logjam-4.5.2.tar.bz2


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- logjam.spec	6 Sep 2005 22:02:54 -0000	1.21
+++ logjam.spec	5 Jan 2006 17:57:29 -0000	1.22
@@ -1,8 +1,8 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.1
-Release:	5%{?dist}
+Version:	4.5.2
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -18,11 +18,11 @@
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		logjam-4.4.1-offline-segfaultfix.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
 Patch5:		logjam-4.5-patch8-manfix.patch
+Patch6:		logjam-4.5.2-gtkhtml38.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -41,13 +41,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .offline-segfaultfix
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
+%patch6 -p1 -b .gtkhtml38
 
 %build
+autoconf
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -82,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.2-1
+- bump to 4.5.2
+
 * Tue Sep  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.1-5
 - add BR: libgcrypt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 22:02:54 -0000	1.6
+++ sources	5 Jan 2006 17:57:29 -0000	1.7
@@ -1 +1 @@
-ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2
+4c06324355ba01a2a1cf1ad5b48f4c85  logjam-4.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 20:16:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  5 Jan 2006 15:16:05 -0500
Subject: rpms/svgalib/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200601052016.k05KGbV3002558@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2538

Modified Files:
	.cvsignore sources 
Log Message:
New upstream version, drop merged patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 09:37:40 -0000	1.2
+++ .cvsignore	5 Jan 2006 20:16:05 -0000	1.3
@@ -1 +1 @@
-svgalib-1.9.21.tar.gz
+svgalib-1.9.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2005 09:37:40 -0000	1.2
+++ sources	5 Jan 2006 20:16:05 -0000	1.3
@@ -1 +1 @@
-1bd8892ee38481051e4b4d85008c86be  svgalib-1.9.21.tar.gz
+3be376c08462caf88cfc150239481110  svgalib-1.9.24.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:54:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:54:19 -0500
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051654.k05Gsqok024726@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674/FC-3

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

Bump to 1.02



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Plugin-RetrieveAll.spec	7 Sep 2005 18:53:58 -0000	1.1
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
+- bump to 1.02
+
 * Wed Aug 31 2005 Paul Howarth <paul at city-fan.org> 1.01-3
 - remove redundant BR: perl
 - use %%{?_smp_mflags} with make in %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:53:58 -0000	1.2
+++ sources	5 Jan 2006 16:54:19 -0000	1.3
@@ -1 +1 @@
-27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:14:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:14:21 -0500
Subject: rpms/swatch/FC-4 swatch-3.1.1.patch,NONE,1.1 swatch.spec,1.8,1.9
Message-ID: <200601051714.k05HErVE026684@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/swatch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-4

Modified Files:
	swatch.spec 
Added Files:
	swatch-3.1.1.patch 
Log Message:
Sync with devel

swatch-3.1.1.patch:

--- NEW FILE swatch-3.1.1.patch ---
diff -ruN swatch-3.1.1-orig/swatch swatch-3.1.1/swatch
--- swatch-3.1.1-orig/swatch	2004-07-19 21:14:54.000000000 +0100
+++ swatch-3.1.1/swatch	2005-08-29 20:52:13.000000000 +0100
@@ -32,7 +32,7 @@
 [ B<--input-record-separator> I<regex> ] 
 [ [ B<--examine> I<file_to_examine> ] 
 | [ B<--read-pipe> I<program_to_pipe_from> ] 
-| [ B<--tail> I<file_to_tail> ] ]
+| [ B<--tail-file> I<file_to_tail> ] ]
 [ B<--daemon> ] 
 [ B<--use-cpan-file-tail> ]
 [ B<--awk-field-syntax> ]
@@ -68,7 +68,7 @@
 
 Restart at the specified time where I<hh> is hours and I<mm> is minutes. 
 If the am/pm indicator is omitted, then a 24-hour clock is assumed. 
-If the time is preceeded by the "+" character, then the restart time 
+If the time is preceded by the "+" character, then the restart time 
 will be set to the current time plus the specified time and the am/pm
 indicator will be ignored.
 
@@ -124,18 +124,12 @@
 If swatch is called with no options, it is the same as typing the 
 command line
 
-=over 5
-
-=item
-
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog>
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog
 
 or if /var/log/messages exists
 
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/messages>
-
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/messages
 
-=back
 
 If the configuration file doesn't exist then the following configuration
 is used:
@@ -152,7 +146,7 @@
 
 Each line should contain a keyword and a, sometimes optional,
 value for that keyword. The keyword and value are separated by 
-space or an equal (=) sign.
+a space or an equal (=) sign.
 
 watchfor regex
 
@@ -162,7 +156,7 @@
 
 =item B<echo [modes]>
 
-.Echo the matched line. The text mode may be I<normal>,
+Echo the matched line. The text mode may be I<normal>,
 I<bold>, I<underscore>, I<blink>, I<inverse>, 
 I<black>, I<red>, I<green>, I<yellow>, I<blue>, I<magenta>, I<cyan>, I<white>,
 I<black_h>, I<red_h>, I<green_h>, I<yellow_h>, I<blue_h>, 
@@ -180,7 +174,7 @@
 Execute I<command>. The I<command> may contain variables which are 
 substituted with fields from the matched line. A I<$N> will be replaced
 by the I<Nth> field in the line. A I<$0> or I<$*> will be replaced by the
- entire line.
+entire line.
 
 =item B<mail [addresses=address:address:...][,subject=your_text_here]>
 
@@ -197,7 +191,7 @@
 
 Use B<write(1)> to send matched lines to I<user(s)>.
 
-=item B<throttle hours:minutes:seconds,[use=message|regex|<regex>]>
+=item B<throttle hours:minutes:seconds,[use=message|regex|<regexE<gt>]>
 
 Use this action to limit the number of times that the matched pattern 
 has actions performed on it.
@@ -205,7 +199,15 @@
 The B<use=regex> option will cause throttling to be based on the regular
 expression instead of the message.
 
-You can also specify a perl compliant regular expression as the value for B,use>. The default is use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)" causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
+You can also specify a perl compliant regular expression as the value for B<use>. The default is
+
+=over 4
+
+use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)"
+
+=back
+
+and causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
 
 =item B<threshold events:seconds,[repeat=no|yes]>
 
@@ -223,7 +225,7 @@
  
 Note that this is similar to, but different from, the standard "throttle"
 command, since "throttle" shows the first line and ignores the rest, while
-"threshold" shows the last line and ignores the preceeding (and optionally
+"threshold" shows the last line and ignores the preceding (and optionally
 the following).  However, an action like "threshold 1:120" should perform
 similarly to "throttle 0:2:0,use=regex" and has the advantage of not relying
 on a particular timestamp format in the source log entry.
@@ -268,9 +270,13 @@
 conditional used by the current watchfor statement, and 3=inside the throttle
 block).
 
-Its intended use is to permit variable substitution through use like.
+Its intended use is to permit variable substitution. For example:
+
+=over 4
+
+perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";
 
-C<perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";>
+=back
  
 watchfor /$syslog hostname pppd/>
  
@@ -315,7 +321,7 @@
 
 =head1 NOTES
 
-Upon receiving a ALRM or HUP signal swatch will re-read the
+Upon receiving an ALRM or HUP signal swatch will re-read the
 configuration file and restart, except when used with the I<--daemon> 
 command line option where it will simply exit.
 Swatch will terminate gracefully
@@ -382,7 +388,8 @@
 my @Swatch_ARGV = join(' ', $0, @ARGV); # Save just in case we need to restart 
 (my $Me = $0) =~ s%.*/%%;	      # Strip the path off of the program name
 
-$SIG{'CHLD'} = 'IGNORE';
+#$SIG{'CHLD'} = 'IGNORE';
+$SIG{'CHLD'} = 'DEFAULT';
 
 my $DEF_CONFIG_FILE = "$ENV{'HOME'}/.swatchrc";
 my $DEF_INPUT;
@@ -406,13 +413,13 @@
     --config-file=FILENAME               Use FILENAME for configuration.
     --old-style-config                   Parse a pre-version 3 configuration.
     --restart-time=[+]HH:MM[AM|PM]       Send a HUP signal to swatch at the specified time.
-    --input-record-separator=REGEX       Specify an what should be used to separate "lines."
+    --input-record-separator=REGEX       Specify what should be used to separate "lines."
     --help                               Display this message.
     --version                            Display author and version information.
     --tail-file=FILENAME                 Watch a tail of FILENAME.
-    --read-pipe=COMMAND                  Watch a pipe from COMMAND
-    --examine=FILENAME                   Perform a single pass through FILENAME
-    --pid-file=FILENAME			 File to write pid of process to
+    --read-pipe=COMMAND                  Watch a pipe from COMMAND.
+    --examine=FILENAME                   Perform a single pass through FILENAME.
+    --pid-file=FILENAME			 File to write pid of process to.
     --use-cpan-file-tail                 Use the File::Tail CPAN module to read the log file.
 /;
 
@@ -566,8 +573,8 @@
     s/^\s+//; ## strip off leading blank space
     s/\s+$//; ## strip off trailing blank space
 
-    ### Skip comments blank lines ###
-    next if (/^\#/ or /^\s*$/);
+    ### Skip comments and blank lines ###
+    next if (/^\#/ or /^$/);
 
     s/\#.*$//; ## strip trailing comments
 
@@ -746,7 +753,8 @@
 /;
 
 \$SIG{'TERM'} = \$SIG{'HUP'} = 'goodbye';
-\$SIG{'CHLD'} = 'IGNORE';
+##\$SIG{'CHLD'} = 'IGNORE';
+\$SIG{'CHLD'} = 'DEFAULT';
 
 ## Constants
 (my \$Me = \$0) =~ s%.*/%%;
@@ -759,7 +767,7 @@
 my \$swatch_last_flush = time;
 
 use IO::Handle;
-STDOUT->autoflush(1);;
+STDOUT->autoflush(1);
 
 sub goodbye {
   \$| = 0;
@@ -959,8 +967,13 @@
     } else {
       my $opt = $v;
       $opt =~ s/@/\\@/g;
-      $opt =~ s/^['" ]*//;
-      $opt =~ s/['" ]*$//;
+#     $opt =~ s/^['" ]*//;
+#     $opt =~ s/['" ]*$//;
+      $opt =~ s/^\s+//o;
+      $opt =~ s/\s+$//o;
+      $opt = $1 if ($opt =~ /^['"]\s*(.*)\s*['"]$/o);
+      $opt =~ s/"/\\"/go;
+
       if ($actinfo->{$key}{'def_arg'} eq 'MODES') { 
         ## Modes are processed as an array ##
 	push(@{$options{$actinfo->{$key}{'def_arg'}}}, $opt);
@@ -1038,7 +1051,7 @@
   }
 #  $command =~ s/\$([0-9]+)/\$_[$1]/g;
 
-  return join(' ', @new_cmd);;
+  return join(' ', @new_cmd);
 }
 
  


Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/FC-4/swatch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- swatch.spec	12 May 2005 23:27:11 -0000	1.8
+++ swatch.spec	5 Jan 2006 17:14:21 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           swatch
 Version:        3.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
 URL:            http://swatch.sourceforge.net/
 Source0:        http://dl.sf.net/swatch/swatch-3.1.1.tar.gz
+Patch0:         swatch-3.1.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 tools/*
 
 %build
@@ -39,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check ||:
+%check
 make test
 
 
@@ -58,6 +60,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-4
+- Patch supplied by John Horne: doc updates and $0 handling (#160817).
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-3
 - Add dist tag.
 



From fedora-extras-commits at redhat.com  Thu Jan  5 20:23:26 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu,  5 Jan 2006 15:23:26 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.5,1.6
Message-ID: <200601052023.k05KNwkl002658@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2641

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdesklets.spec	5 Jan 2006 20:00:39 -0000	1.5
+++ gdesklets.spec	5 Jan 2006 20:23:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        25%{?dist}
+Release:        26%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -99,7 +99,10 @@
 
 
 %changelog
-* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-26.fc5
+- Minor rebuilt
+
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
 - Rebuilt against libgtop2-devel
 - Changed url of the provider
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:57:17 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:57:17 -0500
Subject: rpms/logjam/FC-3 logjam-4.5.2-gtkhtml38.patch, NONE, 1.1 logjam.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200601051757.k05HvnmP027930@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869/FC-3

Modified Files:
	logjam.spec sources 
Added Files:
	logjam-4.5.2-gtkhtml38.patch 
Log Message:

Bump to 4.5.2


logjam-4.5.2-gtkhtml38.patch:

--- NEW FILE logjam-4.5.2-gtkhtml38.patch ---
--- logjam-4.5.2/configure.in.BAD	2006-01-05 11:45:05.000000000 -0600
+++ logjam-4.5.2/configure.in	2006-01-05 11:46:58.000000000 -0600
@@ -74,21 +74,29 @@
                    [compile with GtkSpell support (default autodetect)]),
     gtkspell-2.0)
 
-  LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
-    AC_HELP_STRING([--with-gtkhtml36],
-                   [compile with GtkHtml3.6 support (default autodetect)]),
-    libgtkhtml-3.6)
-  if test "$with_gtkhtml36" = "yes"; then
-    with_gtkhtml="3.6"
+  LJ_PKG_ARG_WITH(gtkhtml38, GTKHTML38,
+    AC_HELP_STRING([--with-gtkhtml38],
+                   [compile with GtkHtml3.8 support (default autodetect)]),   
+    libgtkhtml-3.8)
+  if test "$with_gtkhtml38" = "yes"; then
+    with_gtkhtml="3.8"
   else
-    LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
-      AC_HELP_STRING([--with-gtkhtml30],
-                     [compile with GtkHtml3.0 support (default autodetect)]),
-      libgtkhtml-3.0)
-    if test "$with_gtkhtml30" = "yes"; then
-      with_gtkhtml="3.0"
+    LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
+      AC_HELP_STRING([--with-gtkhtml36],
+                     [compile with GtkHtml3.6 support (default autodetect)]),
+      libgtkhtml-3.6)
+    if test "$with_gtkhtml36" = "yes"; then
+      with_gtkhtml="3.6"
     else
-      with_gtkhtml="no"
+      LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
+        AC_HELP_STRING([--with-gtkhtml30],
+                       [compile with GtkHtml3.0 support (default autodetect)]),
+        libgtkhtml-3.0)
+      if test "$with_gtkhtml30" = "yes"; then
+        with_gtkhtml="3.0"
+      else
+        with_gtkhtml="no"
+      fi
     fi
   fi
   if test "$with_gtkhtml" != "no"; then


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- logjam.spec	6 Sep 2005 22:02:24 -0000	1.12
+++ logjam.spec	5 Jan 2006 17:57:17 -0000	1.13
@@ -1,8 +1,8 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.1
-Release:	5%{?dist}
+Version:	4.5.2
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -18,11 +18,11 @@
 BuildRequires:	libsoup-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		logjam-4.4.1-offline-segfaultfix.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
 Patch5:		logjam-4.5-patch8-manfix.patch
+Patch6:		logjam-4.5.2-gtkhtml38.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -41,13 +41,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .offline-segfaultfix
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
+%patch6 -p1 -b .gtkhtml38
 
 %build
+autoconf
 %configure \
 %if %{use_xmms}
 	--with-xmms
@@ -82,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.2-1
+- bump to 4.5.2
+
 * Tue Sep  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.1-5
 - add BR: libgcrypt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 22:02:24 -0000	1.6
+++ sources	5 Jan 2006 17:57:17 -0000	1.7
@@ -1 +1 @@
-ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2
+4c06324355ba01a2a1cf1ad5b48f4c85  logjam-4.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 18:59:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 13:59:31 -0500
Subject: rpms/perl-CGI-Untaint/FC-3 perl-CGI-Untaint.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200601051900.k05J04Dp030095@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042/FC-3

Modified Files:
	perl-CGI-Untaint.spec sources 
Log Message:

bump to 1.26



Index: perl-CGI-Untaint.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-3/perl-CGI-Untaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint.spec	18 Aug 2005 03:28:34 -0000	1.1
+++ perl-CGI-Untaint.spec	5 Jan 2006 18:59:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint
-Version:        1.25
-Release:        3%{?dist}
+Version:        1.26
+Release:        1%{?dist}
 Summary:        Process CGI input parameters
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.26-1
+- bump to 1.26
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.25-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:28:34 -0000	1.2
+++ sources	5 Jan 2006 18:59:31 -0000	1.3
@@ -1 +1 @@
-f75b2641202e441a16db5040c37170c0  CGI-Untaint-1.25.tar.gz
+1ed11830476470d4895b632bf2222606  CGI-Untaint-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 21:00:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 16:00:44 -0500
Subject: rpms/perl-Class-DBI-AsForm/FC-3 perl-Class-DBI-AsForm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601052101.k05L1ET2004855@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188/FC-3

Modified Files:
	perl-Class-DBI-AsForm.spec sources 
Log Message:

Bump to 2.42



Index: perl-Class-DBI-AsForm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-3/perl-Class-DBI-AsForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AsForm.spec	8 Sep 2005 15:22:24 -0000	1.1
+++ perl-Class-DBI-AsForm.spec	5 Jan 2006 21:00:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AsForm
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.42
+Release:        1%{?dist}
 Summary:        Produce HTML form elements for database columns
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,7 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
-BuildRequires:  perl(DBD::SQLite2)
+BuildRequires:  perl(DBD::SQLite)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.42-1
+- bump to 2.42
+
 * Wed Sep  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.41-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:22:24 -0000	1.2
+++ sources	5 Jan 2006 21:00:42 -0000	1.3
@@ -1 +1 @@
-123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz
+5799ef3305aff13b911b2f13f36951f5  Class-DBI-AsForm-2.42.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 21:00:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 16:00:49 -0500
Subject: rpms/perl-Class-DBI-AsForm/FC-4 perl-Class-DBI-AsForm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601052101.k05L1Lqn004859@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188/FC-4

Modified Files:
	perl-Class-DBI-AsForm.spec sources 
Log Message:

Bump to 2.42



Index: perl-Class-DBI-AsForm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-4/perl-Class-DBI-AsForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AsForm.spec	8 Sep 2005 15:22:24 -0000	1.1
+++ perl-Class-DBI-AsForm.spec	5 Jan 2006 21:00:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AsForm
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.42
+Release:        1%{?dist}
 Summary:        Produce HTML form elements for database columns
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,7 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
-BuildRequires:  perl(DBD::SQLite2)
+BuildRequires:  perl(DBD::SQLite)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.42-1
+- bump to 2.42
+
 * Wed Sep  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.41-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:22:24 -0000	1.2
+++ sources	5 Jan 2006 21:00:49 -0000	1.3
@@ -1 +1 @@
-123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz
+5799ef3305aff13b911b2f13f36951f5  Class-DBI-AsForm-2.42.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 21:00:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 16:00:55 -0500
Subject: rpms/perl-Class-DBI-AsForm/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-AsForm.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601052101.k05L1RJI004864@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188/devel

Modified Files:
	.cvsignore perl-Class-DBI-AsForm.spec sources 
Log Message:

Bump to 2.42



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:22:24 -0000	1.2
+++ .cvsignore	5 Jan 2006 21:00:55 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-AsForm-2.41.tar.gz
+Class-DBI-AsForm-2.42.tar.gz


Index: perl-Class-DBI-AsForm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/perl-Class-DBI-AsForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AsForm.spec	8 Sep 2005 15:22:24 -0000	1.1
+++ perl-Class-DBI-AsForm.spec	5 Jan 2006 21:00:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AsForm
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.42
+Release:        1%{?dist}
 Summary:        Produce HTML form elements for database columns
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,7 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
-BuildRequires:  perl(DBD::SQLite2)
+BuildRequires:  perl(DBD::SQLite)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.42-1
+- bump to 2.42
+
 * Wed Sep  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.41-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:22:24 -0000	1.2
+++ sources	5 Jan 2006 21:00:55 -0000	1.3
@@ -1 +1 @@
-123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz
+5799ef3305aff13b911b2f13f36951f5  Class-DBI-AsForm-2.42.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 22:09:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 17:09:33 -0500
Subject: rpms/lincity-ng/FC-3 lincity-ng-1.0.2-gcc4.patch, NONE,
	1.1 lincity-ng.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601052210.k05MAsq1007164@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7086/FC-3

Modified Files:
	lincity-ng.spec sources 
Added Files:
	lincity-ng-1.0.2-gcc4.patch 
Log Message:

bump to 1.0.2


lincity-ng-1.0.2-gcc4.patch:

--- NEW FILE lincity-ng-1.0.2-gcc4.patch ---
--- lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp.BAD	2006-01-05 15:32:35.000000000 -0600
+++ lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp	2006-01-05 15:32:40.000000000 -0600
@@ -62,7 +62,7 @@
   int previousTool;
   int lastShownTechType;
  
-  std::string ButtonPanel::createTooltip( int module, bool root = true );
+  std::string createTooltip( int module, bool root = true );
   std::vector<std::string> mMenuButtons;
   std::vector<std::string> mMenus;
   std::vector<std::string> mButtons;


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lincity-ng.spec	5 Oct 2005 15:09:54 -0000	1.2
+++ lincity-ng.spec	5 Jan 2006 22:09:28 -0000	1.3
@@ -1,17 +1,18 @@
 Name:		lincity-ng
-Version:	1.0.1
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
-Source0:	http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
+Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -60,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- bump to 1.0.2
+
 * Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-3
 - add Requires: kdelibs to resolve bz 169941
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2005 21:59:13 -0000	1.2
+++ sources	5 Jan 2006 22:09:28 -0000	1.3
@@ -1 +1 @@
-1576a0765eb29a668f7af3084de00739  lincity-ng-1.0.1.tar.bz2
+3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 22:10:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 17:10:25 -0500
Subject: rpms/lincity-ng/devel lincity-ng-1.0.2-gcc4.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lincity-ng.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601052211.k05MBEpI007171@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7086/devel

Modified Files:
	.cvsignore lincity-ng.spec sources 
Added Files:
	lincity-ng-1.0.2-gcc4.patch 
Log Message:

bump to 1.0.2


lincity-ng-1.0.2-gcc4.patch:

--- NEW FILE lincity-ng-1.0.2-gcc4.patch ---
--- lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp.BAD	2006-01-05 15:32:35.000000000 -0600
+++ lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp	2006-01-05 15:32:40.000000000 -0600
@@ -62,7 +62,7 @@
   int previousTool;
   int lastShownTechType;
  
-  std::string ButtonPanel::createTooltip( int module, bool root = true );
+  std::string createTooltip( int module, bool root = true );
   std::vector<std::string> mMenuButtons;
   std::vector<std::string> mMenus;
   std::vector<std::string> mButtons;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Sep 2005 21:59:13 -0000	1.2
+++ .cvsignore	5 Jan 2006 22:10:07 -0000	1.3
@@ -1 +1,2 @@
 lincity-ng-1.0.1.tar.bz2
+lincity-ng-1.0.2.tar.bz2


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lincity-ng.spec	5 Oct 2005 15:09:55 -0000	1.2
+++ lincity-ng.spec	5 Jan 2006 22:10:07 -0000	1.3
@@ -1,17 +1,19 @@
 Name:		lincity-ng
-Version:	1.0.1
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
-Source0:	http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
-BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
+BuildRequires:	SDL_ttf-devel, desktop-file-utils
+BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
+Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -29,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- bump to 1.0.2
+
 * Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-3
 - add Requires: kdelibs to resolve bz 169941
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2005 21:59:13 -0000	1.2
+++ sources	5 Jan 2006 22:10:07 -0000	1.3
@@ -1 +1 @@
-1576a0765eb29a668f7af3084de00739  lincity-ng-1.0.1.tar.bz2
+3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 22:09:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 17:09:49 -0500
Subject: rpms/lincity-ng/FC-4 lincity-ng-1.0.2-gcc4.patch, NONE,
	1.1 lincity-ng.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601052211.k05MBEds007170@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7086/FC-4

Modified Files:
	lincity-ng.spec sources 
Added Files:
	lincity-ng-1.0.2-gcc4.patch 
Log Message:

bump to 1.0.2


lincity-ng-1.0.2-gcc4.patch:

--- NEW FILE lincity-ng-1.0.2-gcc4.patch ---
--- lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp.BAD	2006-01-05 15:32:35.000000000 -0600
+++ lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp	2006-01-05 15:32:40.000000000 -0600
@@ -62,7 +62,7 @@
   int previousTool;
   int lastShownTechType;
  
-  std::string ButtonPanel::createTooltip( int module, bool root = true );
+  std::string createTooltip( int module, bool root = true );
   std::vector<std::string> mMenuButtons;
   std::vector<std::string> mMenus;
   std::vector<std::string> mButtons;


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lincity-ng.spec	5 Oct 2005 15:09:54 -0000	1.2
+++ lincity-ng.spec	5 Jan 2006 22:09:49 -0000	1.3
@@ -1,17 +1,18 @@
 Name:		lincity-ng
-Version:	1.0.1
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
-Source0:	http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
+Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -60,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- bump to 1.0.2
+
 * Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-3
 - add Requires: kdelibs to resolve bz 169941
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2005 21:59:13 -0000	1.2
+++ sources	5 Jan 2006 22:09:49 -0000	1.3
@@ -1 +1 @@
-1576a0765eb29a668f7af3084de00739  lincity-ng-1.0.1.tar.bz2
+3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan  6 00:31:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:31:03 -0500
Subject: rpms/lincity-ng/devel lincity-ng.spec,1.3,1.4
Message-ID: <200601060031.k060Vgiv011704@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11650/devel

Modified Files:
	lincity-ng.spec 
Log Message:

Missing BR for devel



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lincity-ng.spec	5 Jan 2006 22:10:07 -0000	1.3
+++ lincity-ng.spec	6 Jan 2006 00:31:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -10,7 +10,7 @@
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
 BuildRequires:	SDL_ttf-devel, desktop-file-utils
-BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel
+BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
 Patch0:		lincity-ng-1.0.2-gcc4.patch
@@ -63,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-2
+- FC5: BR: mesa-libGLU-devel
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
 - bump to 1.0.2
 



From fedora-extras-commits at redhat.com  Fri Jan  6 00:30:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:30:30 -0500
Subject: rpms/lincity-ng/FC-3 lincity-ng.spec,1.3,1.4
Message-ID: <200601060031.k060VoCC011709@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11650/FC-3

Modified Files:
	lincity-ng.spec 
Log Message:

Missing BR for devel



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lincity-ng.spec	5 Jan 2006 22:09:28 -0000	1.3
+++ lincity-ng.spec	6 Jan 2006 00:30:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -62,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-2
+- FC5: BR: mesa-libGLU-devel
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
 - bump to 1.0.2
 



From fedora-extras-commits at redhat.com  Fri Jan  6 00:30:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:30:48 -0500
Subject: rpms/lincity-ng/FC-4 lincity-ng.spec,1.3,1.4
Message-ID: <200601060031.k060VoKe011712@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11650/FC-4

Modified Files:
	lincity-ng.spec 
Log Message:

Missing BR for devel



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lincity-ng.spec	5 Jan 2006 22:09:49 -0000	1.3
+++ lincity-ng.spec	6 Jan 2006 00:30:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -62,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-2
+- FC5: BR: mesa-libGLU-devel
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
 - bump to 1.0.2
 



From fedora-extras-commits at redhat.com  Fri Jan  6 00:48:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:48:07 -0500
Subject: rpms/comical/FC-4 comical-0.7-jpe.patch, NONE,
	1.1 comical-0.7-nostrip.patch, NONE,
	1.1 comical-0.7-optflags.patch, NONE, 1.1 comical.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200601060048.k060mdVv011929@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11875/FC-4

Modified Files:
	comical.spec sources 
Added Files:
	comical-0.7-jpe.patch comical-0.7-nostrip.patch 
	comical-0.7-optflags.patch 
Log Message:

Update to 0.7


comical-0.7-jpe.patch:

--- NEW FILE comical-0.7-jpe.patch ---
--- comical-0.7/src/ComicBookZIP.cpp.BAD	2006-01-05 17:39:58.000000000 -0600
+++ comical-0.7/src/ComicBookZIP.cpp	2006-01-05 17:40:31.000000000 -0600
@@ -47,7 +47,7 @@
 	wxZipEntry *entry;
 	while ((entry = zipFile->GetNextEntry()) != NULL) {
 		page = entry->GetName();
-		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 			page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 			page.Right(4).Upper() == wxT(".GIF") ||
 			page.Right(4).Upper() == wxT(".PNG"))
--- comical-0.7/src/ComicBookRAR.cpp.BAD	2006-01-05 18:00:37.000000000 -0600
+++ comical-0.7/src/ComicBookRAR.cpp	2006-01-05 18:00:48.000000000 -0600
@@ -63,7 +63,7 @@
 #else
 		page = wxString(HeaderData.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))

comical-0.7-nostrip.patch:

--- NEW FILE comical-0.7-nostrip.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:17:52.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:17:59.000000000 -0600
@@ -14,7 +14,6 @@
 
 comical: $(ALL.O) unrar/libunrar.a
 	$(CC) -o $@ $(ALL.O) $(LDFLAGS)
-	$(STRIP) $@
 
 unrar/libunrar.a:
 	$(MAKE) lib -C unrar -f makefile.linux

comical-0.7-optflags.patch:

--- NEW FILE comical-0.7-optflags.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:08:30.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:08:45.000000000 -0600
@@ -1,7 +1,7 @@
 CC = `wx-config --cxx`
 LD = `wx-config --ld`
 INCLUDE = -Iunrar
-CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE)
+CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE) $(RPM_OPT_FLAGS)
 LDFLAGS = `wx-config --libs` -Lunrar -lunrar
 STRIP = strip
 
--- comical-0.7/unrar/makefile.linux.BAD	2006-01-05 18:15:53.000000000 -0600
+++ comical-0.7/unrar/makefile.linux	2006-01-05 18:16:03.000000000 -0600
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/comical.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comical.spec	4 Jun 2005 16:48:34 -0000	1.5
+++ comical.spec	6 Jan 2006 00:48:06 -0000	1.6
@@ -1,23 +1,25 @@
 Name: comical
-Version: 0.4
-Release: 9%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://jathey.home.comcast.net/comical-0.4.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
 Source1: comical.png
 Source2: comical.desktop
 Patch0: comical-0.4-bracket.patch
 Patch1: comical-0.4-sort.patch
 Patch2: comical-0.4-nounrar.patch
 Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.4-jpe.patch
+Patch4: comical-0.7-jpe.patch
 Patch5: comical-0.4-minfix.patch
+Patch6: comical-0.7-optflags.patch
+Patch7: comical-0.7-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
-Requires: unzip, bzip2
+Requires: unzip
 
 %description
 Comical is a fully featured GUI comic book viewer using wxWidgets. It 
@@ -27,19 +29,21 @@
 %prep
 %setup -q
 #%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
-%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m0755 comical $RPM_BUILD_ROOT%{_bindir}
 
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor fedora                            \
@@ -58,6 +62,11 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- bump to 0.7
+- disable all the sort patches, the 0.7 sort is no better than the 
+  original 0.4 sort, but they changed how they did it, so the old sort
+  patches would have to be reworked... and I'm not motivated right now.
 * Sat Jun  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-9
 - fix x86_64 by not using std::min
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2005 03:49:47 -0000	1.2
+++ sources	6 Jan 2006 00:48:06 -0000	1.3
@@ -1 +1 @@
-ad7c93b5527b2ea4fde2bbed6eab920c  comical-0.4.tar.gz
+b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 00:48:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:48:13 -0500
Subject: rpms/comical/devel comical-0.7-jpe.patch, NONE,
	1.1 comical-0.7-nostrip.patch, NONE,
	1.1 comical-0.7-optflags.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 comical.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200601060048.k060mjUp011934@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11875/devel

Modified Files:
	.cvsignore comical.spec sources 
Added Files:
	comical-0.7-jpe.patch comical-0.7-nostrip.patch 
	comical-0.7-optflags.patch 
Log Message:

Update to 0.7


comical-0.7-jpe.patch:

--- NEW FILE comical-0.7-jpe.patch ---
--- comical-0.7/src/ComicBookZIP.cpp.BAD	2006-01-05 17:39:58.000000000 -0600
+++ comical-0.7/src/ComicBookZIP.cpp	2006-01-05 17:40:31.000000000 -0600
@@ -47,7 +47,7 @@
 	wxZipEntry *entry;
 	while ((entry = zipFile->GetNextEntry()) != NULL) {
 		page = entry->GetName();
-		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 			page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 			page.Right(4).Upper() == wxT(".GIF") ||
 			page.Right(4).Upper() == wxT(".PNG"))
--- comical-0.7/src/ComicBookRAR.cpp.BAD	2006-01-05 18:00:37.000000000 -0600
+++ comical-0.7/src/ComicBookRAR.cpp	2006-01-05 18:00:48.000000000 -0600
@@ -63,7 +63,7 @@
 #else
 		page = wxString(HeaderData.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))

comical-0.7-nostrip.patch:

--- NEW FILE comical-0.7-nostrip.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:17:52.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:17:59.000000000 -0600
@@ -14,7 +14,6 @@
 
 comical: $(ALL.O) unrar/libunrar.a
 	$(CC) -o $@ $(ALL.O) $(LDFLAGS)
-	$(STRIP) $@
 
 unrar/libunrar.a:
 	$(MAKE) lib -C unrar -f makefile.linux

comical-0.7-optflags.patch:

--- NEW FILE comical-0.7-optflags.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:08:30.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:08:45.000000000 -0600
@@ -1,7 +1,7 @@
 CC = `wx-config --cxx`
 LD = `wx-config --ld`
 INCLUDE = -Iunrar
-CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE)
+CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE) $(RPM_OPT_FLAGS)
 LDFLAGS = `wx-config --libs` -Lunrar -lunrar
 STRIP = strip
 
--- comical-0.7/unrar/makefile.linux.BAD	2006-01-05 18:15:53.000000000 -0600
+++ comical-0.7/unrar/makefile.linux	2006-01-05 18:16:03.000000000 -0600
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2005 03:49:47 -0000	1.2
+++ .cvsignore	6 Jan 2006 00:48:12 -0000	1.3
@@ -1 +1,2 @@
 comical-0.4.tar.gz
+comical-0.7.tar.gz


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/comical.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comical.spec	4 Jun 2005 16:48:34 -0000	1.5
+++ comical.spec	6 Jan 2006 00:48:12 -0000	1.6
@@ -1,23 +1,25 @@
 Name: comical
-Version: 0.4
-Release: 9%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://jathey.home.comcast.net/comical-0.4.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
 Source1: comical.png
 Source2: comical.desktop
 Patch0: comical-0.4-bracket.patch
 Patch1: comical-0.4-sort.patch
 Patch2: comical-0.4-nounrar.patch
 Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.4-jpe.patch
+Patch4: comical-0.7-jpe.patch
 Patch5: comical-0.4-minfix.patch
+Patch6: comical-0.7-optflags.patch
+Patch7: comical-0.7-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
-Requires: unzip, bzip2
+Requires: unzip
 
 %description
 Comical is a fully featured GUI comic book viewer using wxWidgets. It 
@@ -27,19 +29,21 @@
 %prep
 %setup -q
 #%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
-%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m0755 comical $RPM_BUILD_ROOT%{_bindir}
 
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor fedora                            \
@@ -58,6 +62,11 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- bump to 0.7
+- disable all the sort patches, the 0.7 sort is no better than the 
+  original 0.4 sort, but they changed how they did it, so the old sort
+  patches would have to be reworked... and I'm not motivated right now.
 * Sat Jun  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-9
 - fix x86_64 by not using std::min
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2005 03:49:47 -0000	1.2
+++ sources	6 Jan 2006 00:48:12 -0000	1.3
@@ -1 +1 @@
-ad7c93b5527b2ea4fde2bbed6eab920c  comical-0.4.tar.gz
+b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 01:04:43 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu,  5 Jan 2006 20:04:43 -0500
Subject: rpms/ldns import.log,1.2,1.3
Message-ID: <200601060105.k0615F9x013920@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886

Modified Files:
	import.log 
Log Message:
auto-import ldns-1.0.1-1 on branch devel from ldns-1.0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ldns/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Dec 2005 04:08:01 -0000	1.2
+++ import.log	6 Jan 2006 01:04:20 -0000	1.3
@@ -1 +1,2 @@
 ldns-1_0_0-5:HEAD:ldns-1.0.0-5.src.rpm:1134446913
+ldns-1_0_1-1:HEAD:ldns-1.0.1-1.src.rpm:1136509466



From fedora-extras-commits at redhat.com  Fri Jan  6 01:05:03 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu,  5 Jan 2006 20:05:03 -0500
Subject: rpms/ldns/devel .cvsignore, 1.2, 1.3 ldns.spec, 1.6, 1.7 sources,
	1.2, 1.3
Message-ID: <200601060105.k0615a4H013925@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886/devel

Modified Files:
	.cvsignore ldns.spec sources 
Log Message:
auto-import ldns-1.0.1-1 on branch devel from ldns-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 04:08:25 -0000	1.2
+++ .cvsignore	6 Jan 2006 01:05:03 -0000	1.3
@@ -1 +1 @@
-ldns-1.0.0.tar.gz
+ldns-1.0.1.tar.gz


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ldns.spec	19 Dec 2005 02:39:14 -0000	1.6
+++ ldns.spec	6 Jan 2006 01:05:03 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.0.0
-Release: 8%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -25,13 +25,9 @@
 
 %prep
 %setup -q 
-# only for 1.0.0, since upstream left .o files in release and 'make clean'
-# won't work without the Makefile.
-rm drill/*.o
-
-rm config.sub config.guess
-libtoolize
-autoreconf
+
+#libtoolize
+#autoreconf
 
 %configure
 
@@ -81,6 +77,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+- Upgraded to 1.0.1. Removed temporary clean hack from spec file.
+
 * Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8
 - Cannot use make clean because there are no Makefiles. Use hardcoded rm.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 04:08:25 -0000	1.2
+++ sources	6 Jan 2006 01:05:03 -0000	1.3
@@ -1 +1 @@
-bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz
+39210ff3bb2673d57e024f7908d31be5  ldns-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 08:56:49 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  6 Jan 2006 03:56:49 -0500
Subject: rpms/perl-MailTools/devel .cvsignore, 1.5, 1.6 perl-MailTools.spec, 
	1.12, 1.13 sources, 1.5, 1.6
Message-ID: <200601060857.k068vLF0027277@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27256

Modified Files:
	.cvsignore perl-MailTools.spec sources 
Log Message:
* Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.71-1
- 1.71.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2005 11:15:37 -0000	1.5
+++ .cvsignore	6 Jan 2006 08:56:48 -0000	1.6
@@ -1 +1 @@
-MailTools-1.67.tar.gz
+MailTools-1.71.tar.gz


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-MailTools.spec	14 Dec 2005 21:09:15 -0000	1.12
+++ perl-MailTools.spec	6 Jan 2006 08:56:48 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
-Version:        1.67
-Release:        2%{?dist}
+Version:        1.71
+Release:        1%{?dist}
 
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.71-1
+- 1.71.
+
 * Wed Dec 14 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.67-2
 - Fix demo scripts.
 - Sync with fedora-rpmdevtools' perl spec template.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jul 2005 11:15:37 -0000	1.5
+++ sources	6 Jan 2006 08:56:48 -0000	1.6
@@ -1 +1 @@
-7871c38e42792c5e0920b3817e1523fd  MailTools-1.67.tar.gz
+f42de7cd61246870b9c08369fd4a5e60  MailTools-1.71.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 09:29:34 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Fri,  6 Jan 2006 04:29:34 -0500
Subject: rpms/monotone/FC-4 .cvsignore, 1.5, 1.6 monotone.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200601060930.k069U7sg029570@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29549

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
Update to 0.25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Dec 2005 02:38:33 -0000	1.5
+++ .cvsignore	6 Jan 2006 09:29:34 -0000	1.6
@@ -1 +1 @@
-monotone-0.24.tar.gz
+monotone-0.25.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- monotone.spec	13 Dec 2005 07:33:54 -0000	1.12
+++ monotone.spec	6 Jan 2006 09:29:34 -0000	1.13
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.24
+Version: 0.25
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Roland McGrath <roland at redhat.com> - 0.25-1
+- Updated for 0.25 release.
+
 * Sun Dec 11 2005 Roland McGrath <roland at redhat.com> - 0.24-1
 - Updated for 0.24 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Dec 2005 02:38:33 -0000	1.5
+++ sources	6 Jan 2006 09:29:34 -0000	1.6
@@ -1 +1 @@
-8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz
+fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 10:27:47 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Fri,  6 Jan 2006 05:27:47 -0500
Subject: rpms/monotone/FC-4 monotone-xfail-if-root.patch, 1.2,
	1.3 monotone.spec, 1.13, 1.14
Message-ID: <200601061028.k06ASKRb031558@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31536

Modified Files:
	monotone.spec 
Added Files:
	monotone-xfail-if-root.patch 
Log Message:
Test suite patch for mock builds to cope

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: monotone-xfail-if-root.patch
diff -N monotone-xfail-if-root.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ monotone-xfail-if-root.patch	6 Jan 2006 10:27:47 -0000	1.3
@@ -0,0 +1,22 @@
+--- monotone-0.23/testsuite
++++ monotone-0.23/testsuite
+@@ -67479,7 +67479,7 @@ $at_traceon
+     at_desc='checkout validates target directory'
+     $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
+     at_xfail=no
+-      test -O / && at_xfail=yes
++      test -w test_dir4 && at_xfail=yes
+     (
+       echo "64. t_checkout_dir.at:1: testing ..."
+       $at_traceon
+--- monotone-0.23/tests/t_checkout_dir.at
++++ monotone-0.23/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- monotone.spec	6 Jan 2006 09:29:34 -0000	1.13
+++ monotone.spec	6 Jan 2006 10:27:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,6 +12,8 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
+Patch1: monotone-xfail-if-root.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -59,6 +61,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
 	   --with-bundled-sqlite=%{bundled_sqlite}
@@ -162,6 +166,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
+- Restore testsuite fix for nonroot owner of / in build chroot.
+
 * Thu Jan  5 2006 Roland McGrath <roland at redhat.com> - 0.25-1
 - Updated for 0.25 release.
 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:00:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 06:00:54 -0500
Subject: rpms/wine/FC-3 .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 wine-winemine.desktop, 1.1, 1.2 wine.spec, 1.4, 1.5
Message-ID: <200601061101.k06B1QWP000997@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31800/FC-3

Modified Files:
	.cvsignore sources wine-winemine.desktop wine.spec 
Log Message:
- upgrade
- bugfix #177089



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:32:54 -0000	1.2
+++ .cvsignore	6 Jan 2006 11:00:54 -0000	1.3
@@ -1 +1,2 @@
-Wine-20030911.tar.gz
+wine-0.9.5.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jan 2006 09:31:09 -0000	1.3
+++ sources	6 Jan 2006 11:00:54 -0000	1.4
@@ -1,2 +1,2 @@
-73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine-winemine.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine-winemine.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winemine.desktop	2 Jan 2006 09:31:09 -0000	1.1
+++ wine-winemine.desktop	6 Jan 2006 11:00:54 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Game;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine.spec	4 Jan 2006 00:52:54 -0000	1.4
+++ wine.spec	6 Jan 2006 11:00:54 -0000	1.5
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.4
-Release:	5%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -49,7 +49,7 @@
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -307,6 +307,7 @@
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/uninstaller.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -599,7 +600,6 @@
 %{_libdir}/wine/notepad.exe.so
 %{_libdir}/wine/progman.exe.so
 %{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
@@ -675,6 +675,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-1
+- version upgrade
+- fix #177089
+
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-5
 - fix #176834 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:01:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 06:01:00 -0500
Subject: rpms/wine/FC-4 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 wine-winemine.desktop, 1.1, 1.2 wine.spec, 1.6, 1.7
Message-ID: <200601061101.k06B1Wt0001003@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31800/FC-4

Modified Files:
	sources wine-winemine.desktop wine.spec 
Added Files:
	.cvsignore 
Log Message:
- upgrade
- bugfix #177089



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	6 Jan 2006 11:01:00 -0000	1.4
@@ -0,0 +1,2 @@
+wine-0.9.5.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 09:24:37 -0000	1.4
+++ sources	6 Jan 2006 11:01:00 -0000	1.5
@@ -1,2 +1,2 @@
-73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine-winemine.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine-winemine.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winemine.desktop	2 Jan 2006 09:24:37 -0000	1.1
+++ wine-winemine.desktop	6 Jan 2006 11:01:00 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Game;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wine.spec	4 Jan 2006 00:53:00 -0000	1.6
+++ wine.spec	6 Jan 2006 11:01:00 -0000	1.7
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.4
-Release:	5%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -49,7 +49,7 @@
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -675,6 +675,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-1
+- version upgrade
+- fix #177089 (winemine desktop entry should be in Game not in System)
+
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-5
 - fix #176834 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:01:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 06:01:06 -0500
Subject: rpms/wine/devel .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 wine-winemine.desktop, 1.1, 1.2 wine.spec, 1.6, 1.7
Message-ID: <200601061101.k06B1dEi001021@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31800/devel

Modified Files:
	sources wine-winemine.desktop wine.spec 
Added Files:
	.cvsignore 
Log Message:
- upgrade
- bugfix #177089



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	6 Jan 2006 11:01:06 -0000	1.4
@@ -0,0 +1,2 @@
+wine-0.9.5.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 09:04:37 -0000	1.4
+++ sources	6 Jan 2006 11:01:06 -0000	1.5
@@ -1,2 +1,2 @@
-73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine-winemine.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winemine.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winemine.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winemine.desktop	6 Jan 2006 11:01:06 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Game;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wine.spec	4 Jan 2006 00:53:06 -0000	1.6
+++ wine.spec	6 Jan 2006 11:01:06 -0000	1.7
@@ -1,12 +1,14 @@
+%define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
+
 Name:		wine
-Version:	0.9.4
-Release:	5%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -53,7 +55,7 @@
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -679,6 +681,12 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-1
+- version upgrade
+- fix #177089 (winemine desktop entry should be in Game not in System)
+- fix cflags for compile
+
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>     
 0.9.4-5                                                                 
 - fix #176834 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:19:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Jan 2006 06:19:12 -0500
Subject: fedora-security/audit fc4,1.116,1.117 fc5,1.27,1.28
Message-ID: <200601061119.k06BJCXG001246@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1226

Modified Files:
	fc4 fc5 
Log Message:
Deal with new updates, bad ordering in fc4, and a stock of new fc4
releases, although we'll need to fill in their real FEDORA-2006 id's when
I've looked them up



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc4	5 Jan 2006 13:01:32 -0000	1.116
+++ fc4	6 Jan 2006 11:19:04 -0000	1.117
@@ -1,12 +1,12 @@
-Up to date CVE as of CVE email 20060104
-Up to date FC4 as of 20060104
+Up to date CVE as of CVE email 20060105
+Up to date FC4 as of 20060105 (except netpbm)
 
 ** are items that need attention
 
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176813
-CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
@@ -18,28 +18,10 @@
 CVE-2005-4130 ** (HelixPlayer) no information available
 CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
-CVE-2005-3896 ignore (mozilla) recoverable DoS only
-CVE-2005-3651 VULNERABLE (ethereal)
-CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
-CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1144]
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3883 VULNERABLE (php)
 CVE-2005-3858 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
 CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15)
@@ -59,8 +41,13 @@
 CVE-2005-3675 VULNERABLE (kernel) optack
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
+CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
+CVE-2005-3627 backport (cups) [since FEDORA-2005-000**]
+CVE-2005-3626 backport (cups) [since FEDORA-2005-000**]
+CVE-2005-3625 backport (cups) [since FEDORA-2005-000**]
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman)
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067]
@@ -70,12 +57,14 @@
 CVE-2005-3390 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3389 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
+CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]
 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-3322 version (squid, not upstream) SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
-CVE-2005-3313 VULNERABLE (ethereal)
+CVE-2005-3313 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-3276 version (kernel, fixed 2.6.12.4) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3275 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3274 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
@@ -93,9 +82,21 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
-CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1122]
-CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1122]
-CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1122]
+CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
 CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fc5	5 Jan 2006 13:01:32 -0000	1.27
+++ fc5	6 Jan 2006 11:19:04 -0000	1.28
@@ -29,6 +29,9 @@
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
@@ -65,6 +68,7 @@
 CVE-2005-3675 VULNERABLE (kernel) optack
 CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
 CVE-2005-3662 version (netpbm)
+CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3582 version (ImageMagick) gentoo only



From fedora-extras-commits at redhat.com  Fri Jan  6 11:34:11 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Fri,  6 Jan 2006 06:34:11 -0500
Subject: rpms/monotone/devel monotone-xfail-if-root.patch, 1.2,
	1.3 .cvsignore, 1.5, 1.6 monotone.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200601061134.k06BYhsN001323@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1296

Modified Files:
	.cvsignore monotone.spec sources 
Added Files:
	monotone-xfail-if-root.patch 
Log Message:
Update to 0.25

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: monotone-xfail-if-root.patch
diff -N monotone-xfail-if-root.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ monotone-xfail-if-root.patch	6 Jan 2006 11:34:11 -0000	1.3
@@ -0,0 +1,22 @@
+--- monotone-0.23/testsuite
++++ monotone-0.23/testsuite
+@@ -67479,7 +67479,7 @@ $at_traceon
+     at_desc='checkout validates target directory'
+     $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
+     at_xfail=no
+-      test -O / && at_xfail=yes
++      test -w test_dir4 && at_xfail=yes
+     (
+       echo "64. t_checkout_dir.at:1: testing ..."
+       $at_traceon
+--- monotone-0.23/tests/t_checkout_dir.at
++++ monotone-0.23/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Dec 2005 07:35:07 -0000	1.5
+++ .cvsignore	6 Jan 2006 11:34:11 -0000	1.6
@@ -1 +1 @@
-monotone-0.24.tar.gz
+monotone-0.25.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- monotone.spec	18 Dec 2005 06:15:35 -0000	1.8
+++ monotone.spec	6 Jan 2006 11:34:11 -0000	1.9
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.24
+Version: 0.25
 Release: 2%{?dist}
 
 Summary: A free, distributed version control system
@@ -12,7 +12,7 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
-Patch1: monotone-0.24-gcc41.patch
+Patch1: monotone-xfail-if-root.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -166,8 +166,11 @@
 
 
 %changelog
-* Sat Dec 17 2005 Roland McGrath <roland at redhat.com> - 0.24-2
-- Patched to work with gcc 4.1.
+* Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
+- Restore testsuite fix for nonroot owner of / in build chroot.
+
+* Thu Jan  5 2006 Roland McGrath <roland at redhat.com> - 0.25-1
+- Updated for 0.25 release.
 
 * Sun Dec 11 2005 Roland McGrath <roland at redhat.com> - 0.24-1
 - Updated for 0.24 release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Dec 2005 07:35:07 -0000	1.5
+++ sources	6 Jan 2006 11:34:11 -0000	1.6
@@ -1 +1 @@
-8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz
+fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 12:34:06 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri,  6 Jan 2006 07:34:06 -0500
Subject: rpms/yumex/devel .cvsignore, 1.7, 1.8 sources, 1.10, 1.11 yumex.spec,
	1.10, 1.11
Message-ID: <200601061234.k06CYdAH004592@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4569

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
New Release 0.45-02


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Dec 2005 17:15:19 -0000	1.7
+++ .cvsignore	6 Jan 2006 12:34:06 -0000	1.8
@@ -1 +1 @@
-yumex-0.45-1.tar.gz
+yumex-0.45-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Dec 2005 17:15:19 -0000	1.10
+++ sources	6 Jan 2006 12:34:06 -0000	1.11
@@ -1 +1 @@
-ada14317266254793e180a4e32c5408a  yumex-0.45-1.tar.gz
+9c064934cf21ca340b45ff13ca232e55  yumex-0.45-2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yumex.spec	20 Dec 2005 17:15:19 -0000	1.10
+++ yumex.spec	6 Jan 2006 12:34:06 -0000	1.11
@@ -1,8 +1,8 @@
-%define   build_v 1
+%define   build_v 3
 
 Name:     yumex
 Version:  0.45
-Release:  1.0%{?dist}
+Release:  3.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,7 +67,12 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Tue Dec 20 2005 Tim Lauridsen <tla at rasmil.dk> - 0.44-1.0
+* Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-3.0
+- Development Release 0.45-3.0
+* Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-2.0
+- Development Release 0.45-2.0
+- Lot of changes, check the changelog.
+* Tue Dec 20 2005 Tim Lauridsen <tla at rasmil.dk> - 0.45-1.0
 - Development Release 0.45-1.0
 - Changed to work with yum 2.5.0
 - Requires: yum >= 2.5



From fedora-extras-commits at redhat.com  Fri Jan  6 12:35:45 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri,  6 Jan 2006 07:35:45 -0500
Subject: rpms/yumex/devel yumex.spec,1.11,1.12
Message-ID: <200601061236.k06CaIIp004644@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627

Modified Files:
	yumex.spec 
Log Message:
New Release 0.45-02


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yumex.spec	6 Jan 2006 12:34:06 -0000	1.11
+++ yumex.spec	6 Jan 2006 12:35:45 -0000	1.12
@@ -1,8 +1,8 @@
-%define   build_v 3
+%define   build_v 2
 
 Name:     yumex
 Version:  0.45
-Release:  3.0%{?dist}
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,8 +67,6 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-3.0
-- Development Release 0.45-3.0
 * Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-2.0
 - Development Release 0.45-2.0
 - Lot of changes, check the changelog.



From fedora-extras-commits at redhat.com  Fri Jan  6 12:58:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 07:58:03 -0500
Subject: rpms/wine/devel wine.spec,1.7,1.8
Message-ID: <200601061258.k06CwZik004823@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4806

Modified Files:
	wine.spec 
Log Message:
- test new BR



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine.spec	6 Jan 2006 11:01:06 -0000	1.7
+++ wine.spec	6 Jan 2006 12:58:02 -0000	1.8
@@ -52,6 +52,10 @@
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
 
+BuildRequires:  fontconfig-devel
+BuildRequires:  giflib-devel
+BuildRequires:  cups-devel
+
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
@@ -154,7 +158,8 @@
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 %configure \
-	--sysconfdir=%{_sysconfdir}/wine --disable-static
+	--sysconfdir=%{_sysconfdir}/wine --disable-static \
+	--x-includes=%{_includedir} --x-libraries=%{_libdir}
 
 %{__make} depend
 %{__make}
@@ -686,6 +691,7 @@
 - version upgrade
 - fix #177089 (winemine desktop entry should be in Game not in System)
 - fix cflags for compile
+- test new BR
 
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>     
 0.9.4-5                                                                 



From fedora-extras-commits at redhat.com  Fri Jan  6 13:12:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 08:12:24 -0500
Subject: rpms/gift/devel gift.spec,1.1,1.2 giftd.sh,1.1,1.2
Message-ID: <200601061313.k06DDEoB006587@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6568

Modified Files:
	gift.spec giftd.sh 
Log Message:
* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
- giftd.sh (wrapper): pass on command-line params/options



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gift.spec	20 Dec 2005 14:24:40 -0000	1.1
+++ gift.spec	6 Jan 2006 13:12:24 -0000	1.2
@@ -10,7 +10,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
+- giftd.sh (wrapper): pass on command-line params/options
+
 * Wed Dec 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-3
 - --enable-libmagic (on platforms where file > 4 available)
 


Index: giftd.sh
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/giftd.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- giftd.sh	20 Dec 2005 14:24:40 -0000	1.1
+++ giftd.sh	6 Jan 2006 13:12:24 -0000	1.2
@@ -17,4 +17,4 @@
 fi
 
 # Hopefully we're good to go now
-exec ${GIFTD} 
+exec ${GIFTD} ${1+"$@"}



From fedora-extras-commits at redhat.com  Fri Jan  6 13:14:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 08:14:44 -0500
Subject: rpms/gift/FC-4 gift.spec,1.1,1.2 giftd.sh,1.1,1.2
Message-ID: <200601061315.k06DFHmn006663@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6637

Modified Files:
	gift.spec giftd.sh 
Log Message:
* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
- giftd.sh (wrapper): pass on command-line params/options



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-4/gift.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gift.spec	20 Dec 2005 14:24:40 -0000	1.1
+++ gift.spec	6 Jan 2006 13:14:44 -0000	1.2
@@ -10,7 +10,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
+- giftd.sh (wrapper): pass on command-line params/options
+
 * Wed Dec 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-3
 - --enable-libmagic (on platforms where file > 4 available)
 


Index: giftd.sh
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-4/giftd.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- giftd.sh	20 Dec 2005 14:24:40 -0000	1.1
+++ giftd.sh	6 Jan 2006 13:14:44 -0000	1.2
@@ -17,4 +17,4 @@
 fi
 
 # Hopefully we're good to go now
-exec ${GIFTD} 
+exec ${GIFTD} ${1+"$@"}



From fedora-extras-commits at redhat.com  Fri Jan  6 13:35:49 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:35:49 -0500
Subject: rpms/streamtuner - New directory
Message-ID: <200601061335.k06DZp7h006885@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6877/streamtuner

Log Message:
Directory /cvs/extras/rpms/streamtuner added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 13:35:55 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:35:55 -0500
Subject: rpms/streamtuner/devel - New directory
Message-ID: <200601061335.k06DZvkn006900@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6877/streamtuner/devel

Log Message:
Directory /cvs/extras/rpms/streamtuner/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 13:36:17 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:36:17 -0500
Subject: rpms/streamtuner Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061336.k06DaJ9S006939@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927

Added Files:
	Makefile import.log 
Log Message:
Setup of module streamtuner


--- NEW FILE Makefile ---
# Top level Makefile for module streamtuner
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 13:36:23 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:36:23 -0500
Subject: rpms/streamtuner/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061336.k06DaPOJ006959@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module streamtuner


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 13:37:41 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:37:41 -0500
Subject: rpms/streamtuner import.log,1.1,1.2
Message-ID: <200601061338.k06DcE5L007071@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7023

Modified Files:
	import.log 
Log Message:
auto-import streamtuner-0.99.99-6.fc4 on branch devel from streamtuner-0.99.99-6.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 13:36:16 -0000	1.1
+++ import.log	6 Jan 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+streamtuner-0_99_99-6_fc4:HEAD:streamtuner-0.99.99-6.fc4.src.rpm:1136554650



From fedora-extras-commits at redhat.com  Fri Jan  6 13:37:47 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:37:47 -0500
Subject: rpms/streamtuner/devel streamtuner-0.99.99-defaultconfig.patch, NONE,
	1.1 streamtuner-0.99.99-live365.patch, NONE,
	1.1 streamtuner-0.99.99-pkgconfig.patch, NONE,
	1.1 streamtuner-0.99.99-pygtk-2.6.patch, NONE,
	1.1 streamtuner.png, NONE, 1.1 streamtuner.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061338.k06DcKOQ007075@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7023/devel

Modified Files:
	.cvsignore sources 
Added Files:
	streamtuner-0.99.99-defaultconfig.patch 
	streamtuner-0.99.99-live365.patch 
	streamtuner-0.99.99-pkgconfig.patch 
	streamtuner-0.99.99-pygtk-2.6.patch streamtuner.png 
	streamtuner.spec 
Log Message:
auto-import streamtuner-0.99.99-6.fc4 on branch devel from streamtuner-0.99.99-6.fc4.src.rpm

streamtuner-0.99.99-defaultconfig.patch:

--- NEW FILE streamtuner-0.99.99-defaultconfig.patch ---
--- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
@@ -1410,8 +1410,8 @@
   init_handler();
 
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
 
   return TRUE;
 }

--- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
@@ -1057,8 +1057,8 @@
 
   init_handler();
 
-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
 
   return TRUE;
 }

--- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
@@ -959,9 +959,9 @@
 
   init_handler();
   
-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
 
   return TRUE;
 }

--- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
@@ -957,7 +957,7 @@
   init_handler();
 
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
 
   return TRUE;
 }

--- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
@@ -123,7 +123,7 @@
 {
   actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
   st_action_register("view-ghelp", _("Open a GNOME help document"), "yelp %q");
 }
 

--- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
@@ -390,9 +390,9 @@
 {
   st_preselections_init_handler();
   
-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
 }
 
 void

streamtuner-0.99.99-live365.patch:

--- NEW FILE streamtuner-0.99.99-live365.patch ---
--- src/plugins/live365/live365.c.orig	Wed May 11 03:49:30 2005
+++ src/plugins/live365/live365.c	Wed May 11 03:51:11 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, 2004 Jean-Yves Lefort
+ * Copyright (C) 2002-2005 Jean-Yves Lefort
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,9 @@
 {
   ACCESS_ALL,
   ACCESS_VIP,
-  ACCESS_SUBSCRIPTION
+  ACCESS_SUBSCRIPTION,
+  ACCESS_SOLD_OUT,
+  ACCESS_UNKNOWN
 } Access;
 
 typedef struct
@@ -94,7 +96,8 @@
 {
   GList			**streams;
   Live365Stream		*stream;
-  Live365Stream		*finished_stream;
+  gboolean		first_page;
+  gboolean		looped;
   gboolean		has_next_page;
 } ReloadStreamsInfo;
 
@@ -263,13 +266,16 @@
 
     case FIELD_ACCESS_STRING:
       {
-	const char *str = NULL;
+	const char *str;
 
 	switch (stream->access)
 	  {
 	  case ACCESS_ALL:		str = _("All"); break;
 	  case ACCESS_VIP:		str = _("VIP"); break;
 	  case ACCESS_SUBSCRIPTION:	str = _("Subscription"); break;
+	  case ACCESS_SOLD_OUT:		str = _("Sold out"); break;
+	  case ACCESS_UNKNOWN:		str = _("Unknown"); break;
+	  default:			str = NULL; break;
 	  }
 
 	g_value_set_string(value, str);
@@ -707,14 +713,16 @@
   char *s1, *s2, *s3, *s4, *s5;
 
   if ((s1 = st_strstr_span(line, "<a href=\"/cgi-bin/directory"))
-      && (s2 = st_strstr_span(s1, "&genre="))
+      && (s2 = st_strstr_span(s1, "genre="))
       && (s3 = strchr(s2, '"'))
       && (s4 = st_strchr_span(s3, '>'))
       && (s5 = strstr(s4, "</a>")))
     {
       category = st_category_new();
       category->name = g_strndup(s2, s3 - s2);
-      category->label = st_sgml_ref_expand_len(s4, s5 - s4);
+      category->label = ! strcmp(category->name, "Recommendations")
+	? g_strdup(_("Recommendations"))
+	: st_sgml_ref_expand_len(s4, s5 - s4);
       category->url_postfix = g_strconcat(DIRECTORY_PREFIX, category->name, NULL);
     }
   else if ((s1 = st_strstr_span(line, "<a href=\"/genres/"))
@@ -755,6 +763,8 @@
 
   *streams = NULL;
   info.streams = streams;
+  info.first_page = TRUE;
+  info.looped = FALSE;
 
   session = st_transfer_session_new();
 
@@ -802,9 +812,11 @@
 	  if (status) /* only display warning if the transfer was otherwise correct */
 	    PARSE_ERROR;
 	}
+
+      info.first_page = FALSE;
     }
-  while (status && info.has_next_page
-	 && (stream_limit == -1 || received_streams < stream_limit));
+  while (status && info.has_next_page && ! info.looped
+	  && (stream_limit == -1 || received_streams < stream_limit));
 
   st_transfer_session_free(session);
 
@@ -818,6 +830,10 @@
   char *s1, *s2, *s3, *s4, *s5, *s6, *s7;
   char *word1, *word2, *word3;
 
+  /* if we have detected a loop, we just ignore the page */
+  if (info->looped)
+    return;
+
   if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"icon\""))
       && (s2 = st_strstr_span(s1, "DrawPlayIcon")))
     {
@@ -834,15 +850,18 @@
 	info->stream->access = ACCESS_VIP;
       else if (strstr(s2, "'SUBSCRIPTION'"))
 	info->stream->access = ACCESS_SUBSCRIPTION;
+      else if (strstr(s2, "'SOLD_OUT'"))
+	info->stream->access = ACCESS_SOLD_OUT;
       else
-	PARSE_ERROR;
-
-      info->finished_stream = NULL;
+	{
+	  PARSE_ERROR;
+	  info->stream->access = ACCESS_UNKNOWN;
+	}
     }
   else if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"title"))
-      && (s2 = st_strstr_span(s1, "href='"))
-      && (s3 = strstr(s2, "'>"))
-      && (s4 = strstr(s3, "</a>")))
+	   && (s2 = st_strstr_span(s1, "href='"))
+	   && (s3 = strstr(s2, "'>"))
+	   && (s4 = strstr(s3, "</a>")))
     {
       if (info->stream)
 	{
@@ -865,12 +884,19 @@
       else
 	PARSE_ERROR;
     }
-  else if ((s1 = st_strstr_span(line, "&station_id="))
-	   && (s2 = strchr(s1, '&')))
+  else if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"handle\""))
+	   && (s2 = st_strstr_span(s1, "ReadCookie("))
+	   && (s3 = st_strstr_span(s2, ", '"))
+	   && (s4 = strchr(s3, '\''))
+	   && (s5 = st_strstr_span(s4, "&station_id="))
+	   && (s6 = strchr(s5, '&')))
     {
       if (info->stream)
 	{
-	  word1 = g_strndup(s1, s2 - s1);
+	  g_free(info->stream->broadcaster);
+	  info->stream->broadcaster = st_sgml_ref_expand_len(s3, s4 - s3);
+
+	  word1 = g_strndup(s5, s6 - s5);
 	  if (st_str_like(word1, ST_NUMERIC))
 	    info->stream->station_id = atoi(word1);
 	  g_free(word1);
@@ -878,34 +904,23 @@
       else
 	PARSE_ERROR;
     }
-  else if ((s1 = st_strstr_span(line, "alt=\"More broadcaster info"))
-	   && (s2 = st_strchr_span(s1, '>'))
-	   && (s3 = strstr(s2, "</a>")))
-    {
-      if (info->stream)
-	{
-	  g_free(info->stream->broadcaster);
-	  info->stream->broadcaster = st_sgml_ref_expand_len(s2, s3 - s2);
-	}
-      else
-	PARSE_ERROR;
-    }
   else if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"connection\""))
 	   && (s2 = st_strchr_span(s1, '>'))
-	   && (s3 = strstr(s2, "<br>"))
-	   && ((s4 = strstr(s3, "<img src='/images/mp3pro"))
-	       || (s4 = strstr(s3, "</TD>"))))
+	   && (s3 = strchr(s2, '<')))
     {
       if (info->stream)
 	{
 	  word1 = st_sgml_ref_expand_len(s2, s3 - s2);
-	  s3 += 4; word2 = st_sgml_ref_expand_len(s3, s4 - s3);
-	  
+
 	  g_free(info->stream->audio);
-	  info->stream->audio = g_strdup_printf(g_str_has_prefix(s4, "</TD>") ? "%s %s" : "%s %s, MP3Pro", word2, word1);
 
-	  g_free(word1);
-	  g_free(word2);
+	  if (strstr(s3, "<img src='/images/mp3pro"))
+	    {
+	      info->stream->audio = g_strdup_printf("%s, MP3Pro", word1);
+	      g_free(word1);
+	    }
+	  else
+	    info->stream->audio = word1;
 	}
       else
 	PARSE_ERROR;
@@ -947,12 +962,17 @@
       else
 	PARSE_ERROR;
     }
-  else if (strstr(line, "TD  CLASS=\"tabledesc2\""))
+  else if ((s1 = st_strstr_span(line, "<TD  CLASS=\"desc\"")))
     {
       if (info->stream)
 	{
 	  if (info->stream->station_id)
 	    {
+	      if ((s2 = st_strstr_span(s1, "<a class='desc-link' href='"))
+		  && (s3 = st_strchr_span(s2, '>'))
+		  && (s4 = strstr(s3, "<BR>")))
+		info->stream->description = st_sgml_ref_expand_len(s3, s4 - s3);
+
 	      ((STStream *) info->stream)->name = g_strdup_printf("%i", info->stream->station_id);
 	      *(info->streams) = g_list_append(*(info->streams), info->stream);
 	    }
@@ -962,23 +982,23 @@
 	      stream_free_cb(info->stream, NULL);
 	    }
 
-	  info->finished_stream = info->stream;
 	  info->stream = NULL;
 	}
       else
 	PARSE_ERROR;
     }
-  else if ((s1 = st_strstr_span(line, "<a class='desc-link' href='"))
-	   && (s2 = st_strchr_span(s1, '>'))
-	   && (s3 = strstr(s2, "<BR>")))
-    {
-      if (info->finished_stream)
-	{
-	  info->finished_stream->description = st_sgml_ref_expand_len(s2, s3 - s2);
-	  info->finished_stream = NULL;
+  else if ((s1 = st_strstr_span(line, "<TD class=\"pagination\""))
+	   && (s2 = st_strstr_span(s1, ">Showing "))
+	   && (s3 = strchr(s2, '-')))
+    {
+      word1 = g_strndup(s2, s3 - s2);
+      if (st_str_like(word1, ST_NUMERIC))
+	{
+	  int n = atoi(word1);
+	  if (n == 1 && ! info->first_page)
+	    info->looped = TRUE;
 	}
-      else
-	PARSE_ERROR;
+      g_free(word1);
     }
   else if (strstr(line, "Next</A>"))
     info->has_next_page = TRUE;

streamtuner-0.99.99-pkgconfig.patch:

--- NEW FILE streamtuner-0.99.99-pkgconfig.patch ---
diff -Nur streamtuner-0.99.99-orig/data/streamtuner.pc.in streamtuner-0.99.99/data/streamtuner.pc.in
--- streamtuner-0.99.99-orig/data/streamtuner.pc.in	2004-12-11 03:03:20.000000000 +0100
+++ streamtuner-0.99.99/data/streamtuner.pc.in	2006-01-01 01:33:39.000000000 +0100
@@ -1,9 +1,8 @@
 prefix=@prefix@
 includedir=@includedir@/streamtuner
-oldincludedir=@includedir@
 
 Name: @PACKAGE@
 Description: A stream directory browser
 Version: @VERSION@
 Requires: gmodule-2.0 gtk+-2.0
-Cflags: -I${includedir} -I${oldincludedir}
+Cflags: -I${includedir}

streamtuner-0.99.99-pygtk-2.6.patch:

--- NEW FILE streamtuner-0.99.99-pygtk-2.6.patch ---
--- src/plugins/python/pst-main.c.orig	Thu Mar 24 15:52:58 2005
+++ src/plugins/python/pst-main.c	Thu Mar 24 15:53:59 2005
@@ -94,6 +94,7 @@
 {
   gboolean status = FALSE;
   PyObject *module;
+  char *argv[] = { "" };
 
   if (! check_api_version(err))
     return FALSE;
@@ -109,6 +110,7 @@
     }
 
   Py_Initialize();
+  PySys_SetArgv(G_N_ELEMENTS(argv), argv);
   PyEval_InitThreads();
 
   module = PyImport_AddModule("__main__");


--- NEW FILE streamtuner.spec ---
Summary: A stream directory browser
Name: streamtuner
Version: 0.99.99
Release: 6%{?dist}
URL: http://streamtuner.sourceforge.net
Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
Source1: %{name}.png
Patch0: %{name}-%{version}-live365.patch
Patch1: %{name}-%{version}-pygtk-2.6.patch
Patch2: %{name}-%{version}-defaultconfig.patch
Patch3: %{name}-%{version}-pkgconfig.patch
License: BSD
Group: Applications/Internet
Requires: python, pygtk2, htmlview, bmp, xterm
Requires(post): desktop-file-utils, scrollkeeper
Requires(postun): desktop-file-utils, scrollkeeper
BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel
BuildRequires: gettext, desktop-file-utils
Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                
BuildRoot: %{_tmppath}/%{name}-%{version}-root

%description 
Streamtuner is a stream directory browser,
it offers an intuitive GTK+ 2.0 interface
to Internet radio directories such as SHOUTcast and Live365

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

%description devel
Streamtuner is a stream directory browser,
it offers an intuitive GTK+ 2.0 interface
to Internet radio directories such as SHOUTcast and Live365
This package contains the libraries and includes files necessary
to develop applications for Streamtuner

%prep
%setup -q
%patch0 -p0 -b .%{name}-%{version}-live365
%patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
%patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
%patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}

%makeinstall
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%{__rm} -rf %{buildroot}%{_localstatedir}
%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
%{__rm} -f %{buildroot}%{_libdir}/%{name}/plugins/*.*a

cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
StartupNotify=true
Name=Streamtuner
Comment=A stream directory browser.
Exec=%{name}
Icon=%{name}.png
Terminal=false
Type=Application
EOF
mkdir -p %{buildroot}%{_datadir}/applications 
desktop-file-install --vendor=fedora         \
  --dir %{buildroot}%{_datadir}/applications \
  --add-category X-Fedora                    \
  --add-category Application                 \
  --add-category AudioVideo                  \
  %{name}.desktop

%find_lang %{name}

%post
scrollkeeper-update -q || :

%postun
scrollkeeper-update -q || :

%clean
%{__rm} -rf %{buildroot}

%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README TODO
%{_bindir}/%{name}
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/*.so
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%dir %{_datadir}/omf/%{name}
%{_datadir}/omf/%{name}/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/gtk-doc/html/*
%dir %{_datadir}/help
%{_datadir}/help/*


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


%changelog
* Mon Jan  2 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-6
- redundant dependencies removed
- useless update-desktop-database call removed
- pkgconfig.patch added
 
* Thu Dec 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-5
- defaultconfig patch for htmlview and beep-media-player
- htmlview, bmp and xterm added to deps
- more cleanups

* Mon Dec 19 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-4
- more cleanups
- libxml2-devel and desktop-file-utils added to BuildRequires

* Sun Dec 18 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-3
- cleanups

* Wed Jun 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-2.fc4
- update-desktop-database added to post and postun

* Thu Jun 16 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99-1
- Update to 0.99.99
- File list changed
- Patches added
- Rebuild for Fedora Core 4

* Wed Nov 10 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Added libidn and libidn-devel
- Rebuild for Fedora Core 3

* Sat Oct 23 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.99
- Many changes because the plugins have been now included in the core distribution
- Taglib and taglib-devel added to deps

* Wed Aug 11 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.5
_ Category changed to AudioVideo for desktop link

* Tue Aug 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.4
- ChangeLog removed from the documentation

* Thu Jun 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for Fedora Core 2

* Tue May 12 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.3

* Fri Apr 02 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.1
- scrollkeeper and some cleanups

* Wed Feb 18 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.11.1

* Sat Jan 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.2

* Sun Nov 09 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for Fedora Core 1

* Mon Sep 29 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.1
- Some new translations

* Wed Jul 16 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.0
- Theme directorys are removed and some cleanups are done

* Sat Apr 05 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild of 0.9.1 for RH9

* Tue Mar 18 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for 0.9.1

* Sun Feb 02 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Changes in order to match the GNU build system
- Split into binary/devel packages
- Rebuild for 0.9.0

* Wed Dec 25 2002 Matthias Haase <matthias_haase at bennewitz.com>
- Some cleanups in order to match RH8
- smp flag added
- RPM_OPT_FLAGS added
- debugging disabled

* Sat Oct 29 2002 Rudolf Kastl
- Cosmetical changes.

* Sat Oct 05 2002 Rudolf Kastl
- Minor fixes and new version.

* Wed Aug 21 2002 Rudolf Kastl
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 13:36:22 -0000	1.1
+++ .cvsignore	6 Jan 2006 13:37:47 -0000	1.2
@@ -0,0 +1 @@
+streamtuner-0.99.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 13:36:22 -0000	1.1
+++ sources	6 Jan 2006 13:37:47 -0000	1.2
@@ -0,0 +1 @@
+2027b7c34e85b594524b0b4351c14362  streamtuner-0.99.99.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 13:56:30 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:56:30 -0500
Subject: owners owners.list,1.500,1.501
Message-ID: <200601061357.k06Dv3B8007255@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7214

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- owners.list	5 Jan 2006 17:51:25 -0000	1.500
+++ owners.list	6 Jan 2006 13:56:30 -0000	1.501
@@ -1339,3 +1339,4 @@
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:02 -0500
Subject: rpms/akode - New directory
Message-ID: <200601061449.k06En4pT009120@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9112/akode

Log Message:
Directory /cvs/extras/rpms/akode added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:07 -0500
Subject: rpms/akode/devel - New directory
Message-ID: <200601061449.k06En9Xe009135@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9112/akode/devel

Log Message:
Directory /cvs/extras/rpms/akode/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:19 -0500
Subject: rpms/akode Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061449.k06EnLig009169@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9157

Added Files:
	Makefile import.log 
Log Message:
Setup of module akode


--- NEW FILE Makefile ---
# Top level Makefile for module akode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:25 -0500
Subject: rpms/akode/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601061449.k06EnR0j009189@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9157/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module akode


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 14:50:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:50:12 -0500
Subject: rpms/akode import.log,1.1,1.2
Message-ID: <200601061450.k06Eoi0k009261@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9223

Modified Files:
	import.log 
Log Message:
auto-import akode-2.0-1 on branch devel from akode-2.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/akode/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 14:49:19 -0000	1.1
+++ import.log	6 Jan 2006 14:50:11 -0000	1.2
@@ -0,0 +1 @@
+akode-2_0-1:HEAD:akode-2.0-1.src.rpm:1136559007



From fedora-extras-commits at redhat.com  Fri Jan  6 14:50:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:50:18 -0500
Subject: rpms/akode/devel akode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601061450.k06EooiZ009265@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9223/devel

Modified Files:
	.cvsignore sources 
Added Files:
	akode.spec 
Log Message:
auto-import akode-2.0-1 on branch devel from akode-2.0-1.src.rpm


--- NEW FILE akode.spec ---

Summary: Audio-decoding framework 
Name:	 akode 
Version: 2.0 
Release: 1%{?dist}
License: LGPL
Group: 	 System Environment/Libraries
URL:	 http://carewolf.com/akode/  
#URL:	 http://www.kde-apps.org/content/show.php?content=30375
Source:	 http://www.kde-apps.org/content/files/30375-akode-2.0.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: automake
BuildRequires: alsa-lib-devel
BuildRequires: flac-devel
BuildRequires: libsamplerate-devel
BuildRequires: speex-devel
BuildRequires: libvorbis-devel
BuildRequires: libtool

%description
aKode is a simple audio-decoding frame-work that provides a uniform
interface to decode the most common audio-formats. It also has a direct
playback option for a number of audio-outputs.

aKode currently has the following decoder plugins:
* mpc: Decodes musepack aka mpc audio.
* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. 

aKode also has the following audio outputs:
* oss: Outputs to the OSS (Open Sound System)
* alsa: Outputs to ALSA (dmix is recommended).
%if 0
TODO
* jack: Outputs using Jack audio backend.
* polyp: Output to the polypaudio server.  Recommended for network 
  transparent audio. 
%endif

%package devel
Summary: Headers for developing programs that will use %{name} 
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
%{summary}.


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

[ ! -f configure ] && make -f Makefile.cvs


%build
%configure \
  --disable-static \
  --disable-debug --disable-warnings --disable-dependency-tracking \
  --without-libltdl \
  --with-alsa \
  --with-flac \
  --with-libsamplerate \
  --with-speex \
  --with-vorbis \
  --without-jack \
  --without-polypaudio \
  --without-ffmpeg \
  --without-libmad 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

# unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
# NEWS omitted, currently empty
#doc NEWS
%{_bindir}/akodeplay
%{_libdir}/libakode.so.*
%{_libdir}/libakode_*_*.so

%files devel
%defattr(-,root,root,-)
%{_bindir}/akode-config
%{_includedir}/*
%{_libdir}/libakode.so


%changelog
* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-1
- 2.0(final)

* Wed Nov 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-0.4.rc1
- 2.0rc1 

* Wed Nov 23 2005 Rex Dieter <rexdieter[AT]users.sf.net. 2.0-0.2.b3
- --without-libltdl

* Tue Nov 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-0.1.b3
- akode-2.0b3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/akode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 14:49:25 -0000	1.1
+++ .cvsignore	6 Jan 2006 14:50:17 -0000	1.2
@@ -0,0 +1 @@
+30375-akode-2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/akode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 14:49:25 -0000	1.1
+++ sources	6 Jan 2006 14:50:17 -0000	1.2
@@ -0,0 +1 @@
+04f79cda65c8e9966fa462eaaaa282dc  30375-akode-2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 14:52:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:52:08 -0500
Subject: owners owners.list,1.501,1.502
Message-ID: <200601061452.k06EqeZm009330@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9309

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- owners.list	6 Jan 2006 13:56:30 -0000	1.501
+++ owners.list	6 Jan 2006 14:52:08 -0000	1.502
@@ -20,6 +20,7 @@
 Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 15:01:27 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Fri,  6 Jan 2006 10:01:27 -0500
Subject: owners owners.list,1.502,1.503
Message-ID: <200601061502.k06F24rm011067@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11038

Modified Files:
	owners.list 
Log Message:
Sorted the list, added a comment to keep it sorted.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- owners.list	6 Jan 2006 14:52:08 -0000	1.502
+++ owners.list	6 Jan 2006 15:01:27 -0000	1.503
@@ -6,6 +6,9 @@
 # initialqacontact is the initial qa contact of bugs on this component
 # initialcclist is the list of people initially CC'd for bugs on this component
 #
+# Please keep the list sorted alphabetically when adding new packages, treating
+# uppercase and lowercase letters equivalently.
+#
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 
 Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -77,6 +80,7 @@
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
+Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
@@ -1142,6 +1146,7 @@
 Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|
 Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|superkaramba|Custom content on the desktop|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1339,5 +1344,3 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
-Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 15:14:32 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 10:14:32 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.1,1.2
Message-ID: <200601061515.k06FF651011167@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11138

Modified Files:
	streamtuner.spec 
Log Message:
desktop-file-utils dependency removed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner.spec	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner.spec	6 Jan 2006 15:14:32 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -16,7 +16,7 @@
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel
-BuildRequires: gettext, desktop-file-utils
+BuildRequires: gettext
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
+- desktop-file-utils dependency removed
+
 * Mon Jan  2 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-6
 - redundant dependencies removed
 - useless update-desktop-database call removed



From fedora-extras-commits at redhat.com  Fri Jan  6 15:26:55 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Jan 2006 10:26:55 -0500
Subject: fedora-security/audit fc4,1.117,1.118 fc5,1.28,1.29
Message-ID: <200601061526.k06FQtku011434@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409

Modified Files:
	fc4 fc5 
Log Message:
Deal with netpbm release - although upstream fixed this CVE at least in
10.31 we still have a patch to use PARANOIDSAFER instead of SAFER.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc4	6 Jan 2006 11:19:04 -0000	1.117
+++ fc4	6 Jan 2006 15:26:47 -0000	1.118
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060105
-Up to date FC4 as of 20060105 (except netpbm)
+Up to date FC4 as of 20060105
 
 ** are items that need attention
 
@@ -212,7 +212,7 @@
 CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2490 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2475 VULNERABLE (unzip) bz#164928
-CVE-2005-2471 backport (netpbm) [since FEDORA-2005-728]
+CVE-2005-2471 version (netpbm, 10.31 at least) [since FEDORA-2005-000**] was backport since FEDORA-2005-728
 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible
 CVE-2005-2458 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 CVE-2005-2457 ignore (kernel, fixed 2.6.12.5) this is just a bug


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fc5	6 Jan 2006 11:19:04 -0000	1.28
+++ fc5	6 Jan 2006 15:26:47 -0000	1.29
@@ -216,7 +216,7 @@
 CVE-2005-2492 version (kernel, fixed 2.6.13.1)
 CVE-2005-2490 version (kernel, fixed 2.6.13.1)
 CVE-2005-2475 backport (unzip)
-CVE-2005-2471 backport (netpbm) netpbm-10.28-CAN-2005-2471.patch
+CVE-2005-2471 backport (netpbm, fixed 10.31 at least) netpbm-10.28-CAN-2005-2471.patch
 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible
 CVE-2005-2458 version (kernel, fixed 2.6.12.5)
 CVE-2005-2457 version (kernel, fixed 2.6.12.5)



From fedora-extras-commits at redhat.com  Fri Jan  6 15:31:53 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 10:31:53 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.2,1.3
Message-ID: <200601061532.k06FWPlf011483@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11466

Modified Files:
	streamtuner.spec 
Log Message:
cosmetic change


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- streamtuner.spec	6 Jan 2006 15:14:32 -0000	1.2
+++ streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
@@ -15,8 +15,7 @@
 Requires(post): desktop-file-utils, scrollkeeper
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
-BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel
-BuildRequires: gettext
+BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 



From fedora-extras-commits at redhat.com  Fri Jan  6 15:36:09 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri,  6 Jan 2006 10:36:09 -0500
Subject: rpms/baobab/devel baobab.spec,1.9,1.10
Message-ID: <200601061536.k06Fafih011573@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11539

Modified Files:
	baobab.spec 
Log Message:
rebuild due to new libgtop


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- baobab.spec	1 Jan 2006 15:29:45 -0000	1.9
+++ baobab.spec	6 Jan 2006 15:36:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -56,6 +56,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Fri Jan 06 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-2
+- rebuild
+
 * Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
 - Update to 2.3.0
 



From fedora-extras-commits at redhat.com  Fri Jan  6 15:40:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  6 Jan 2006 10:40:02 -0500
Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.8,1.9
Message-ID: <200601061540.k06FeYVL011696@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11668

Modified Files:
	perl-File-Tail.spec 
Log Message:
Another typo corrected.


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-File-Tail.spec	4 Jan 2006 20:58:40 -0000	1.8
+++ perl-File-Tail.spec	6 Jan 2006 15:40:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-File-Tail
 Version:        0.99.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy useful if you are
+while they are being written, which is especially useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-3
+- Another typo corrected.
+
 * Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
 - Correction of spelling error in the description.
 



From fedora-extras-commits at redhat.com  Fri Jan  6 16:10:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:10:07 -0500
Subject: rpms/compat-wxGTK - New directory
Message-ID: <200601061610.k06GADCQ013661@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652/compat-wxGTK

Log Message:
Directory /cvs/extras/rpms/compat-wxGTK added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:10:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:10:24 -0500
Subject: rpms/compat-wxGTK/devel - New directory
Message-ID: <200601061610.k06GAQCa013679@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652/compat-wxGTK/devel

Log Message:
Directory /cvs/extras/rpms/compat-wxGTK/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:10:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:10:59 -0500
Subject: rpms/compat-wxGTK Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061611.k06GB1Fa013734@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13722

Added Files:
	Makefile import.log 
Log Message:
Setup of module compat-wxGTK


--- NEW FILE Makefile ---
# Top level Makefile for module compat-wxGTK
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:11:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:11:37 -0500
Subject: rpms/compat-wxGTK/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061611.k06GBeuj013766@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13722/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compat-wxGTK


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:14:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:14:47 -0500
Subject: rpms/compat-wxGTK import.log,1.1,1.2
Message-ID: <200601061615.k06GFJHv013934@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13873

Modified Files:
	import.log 
Log Message:
auto-import compat-wxGTK-2.4.2-15 on branch devel from compat-wxGTK-2.4.2-15.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 16:10:59 -0000	1.1
+++ import.log	6 Jan 2006 16:14:46 -0000	1.2
@@ -0,0 +1 @@
+compat-wxGTK-2_4_2-15:HEAD:compat-wxGTK-2.4.2-15.src.rpm:1136564071



From fedora-extras-commits at redhat.com  Fri Jan  6 16:14:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:14:53 -0500
Subject: rpms/compat-wxGTK/devel compat-wxGTK.spec, NONE,
	1.1 wxGTK-2.4.2-aclocal18.patch, NONE,
	1.1 wxGTK-2.4.2-gcc4.patch, NONE, 1.1 wxGTK-2.4.2-privates.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061615.k06GFP9R013947@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13873/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-wxGTK.spec wxGTK-2.4.2-aclocal18.patch 
	wxGTK-2.4.2-gcc4.patch wxGTK-2.4.2-privates.patch 
Log Message:
auto-import compat-wxGTK-2.4.2-15 on branch devel from compat-wxGTK-2.4.2-15.src.rpm


--- NEW FILE compat-wxGTK.spec ---
%define x11libdir %{_prefix}/X11R6/%{_lib}

Name:           compat-wxGTK
Version:        2.4.2
Release:        15%{?dist}
Summary:        Compatibility version of the wxWidgets GTK GUI library
License:        BSD
Group:          System Environment/Libraries
URL:            http://www.wxwidgets.org/
Source0:        http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
Patch0:         wxGTK-2.4.2-privates.patch
Patch1:         wxGTK-2.4.2-aclocal18.patch
Patch2:         wxGTK-2.4.2-gcc4.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
BuildRequires:  libpng-devel libjpeg-devel libtiff-devel
BuildRequires:  libGL libGLU
Requires:       %{name}-common = %{version}-%{release}
Obsoletes:      wxGTK <= 2.4.2-12

Provides:       wxGTK = %{version}-%{release}

%description
wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.

%package        devel
Group:          Development/Libraries
Summary:        Development files for the wxGTK library
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-common-devel = %{version}-%{release}
Requires:       %{name}-gl = %{version}-%{release}
Requires:       %{name}-stc = %{version}-%{release}
Requires:       %{name}-xrc = %{version}-%{release}
Requires:       gtk+-devel
Conflicts:      %{name}2-devel
Obsoletes:      wxGTK-devel <= 2.4.2-12
Provides:       wxGTK-devel = %{version}-%{release}

%description    devel
This package includes files needed to link with the wxGTK library.

%package     -n %{name}2
Group:          System Environment/Libraries
Summary:        Compatibility version of the wxWidgets GTK2 GUI library
Requires:       %{name}-common = %{version}-%{release}
Obsoletes:      wxGTK2 <= 2.4.2-12
Provides:       wxGTK2 = %{version}-%{release}

%description -n %{name}2
wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.

%package     -n %{name}2-devel
Group:          Development/Libraries
Summary:        Development files for the wxGTK2 library
Requires:       %{name}2 = %{version}-%{release}
Requires:       %{name}-common-devel = %{version}-%{release}
Requires:       %{name}2-gl = %{version}-%{release}
Requires:       %{name}2-stc = %{version}-%{release}
Requires:       %{name}2-xrc = %{version}-%{release}
Requires:       gtk2-devel
Conflicts:      %{name}-devel
Obsoletes:      wxGTK2-devel <= 2.4.2-12
Provides:       wxGTK2-devel = %{version}-%{release}

%description -n %{name}2-devel
This package include files needed to link with the wxGTK2 library.

%package        common
Group:          System Environment/Libraries
Summary:        wxGTK* common files
Obsoletes:      wxGTK-common <= 2.4.2-12
Provides:       wxGTK-common = %{version}-%{release}

%description    common
Common files for wxWidgets/GTK1 and GTK2.

%package        common-devel
Group:          Development/Libraries
Summary:        wxGTK* common development files
Obsoletes:      wxGTK-common-devel <= 2.4.2-12
Provides:       wxGTK-common-devel = %{version}-%{release}

%description    common-devel
Common development files for wxWidgets/GTK1 and GTK2.

%package        gl
Summary:        OpenGL add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Obsoletes:      wxGTK-gl <= 2.4.2-12
Provides:       wxGTK-gl = %{version}-%{release}

%description    gl
%{summary}.

%package     -n %{name}2-gl
Summary:        OpenGL add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name}2 = %{version}-%{release}
Obsoletes:      wxGTK2-gl <= 2.4.2-12
Provides:       wxGTK2-gl = %{version}-%{release}

%description -n %{name}2-gl
%{summary}.

%package        stc
Summary:        Styled text control add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Obsoletes:      wxGTK-stc <= 2.4.2-12
Provides:       wxGTK-stc = %{version}-%{release}

%description    stc
Styled text control add-on for wxGTK. Based on the Scintillia project.

%package     -n %{name}2-stc
Summary:        Styled text control add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name}2 = %{version}-%{release}
Obsoletes:      wxGTK2-stc <= 2.4.2-12
Provides:       wxGTK2-stc = %{version}-%{release}

%description -n %{name}2-stc
Styled text control add-on for wxGTK2. Based on the Scintillia project.

%package        xrc
Summary:        The XML-based resource system for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Obsoletes:      wxGTK-xrc <= 2.4.2-12
Provides:       wxGTK-xrc = %{version}-%{release}

%description    xrc
The XML-based resource system, known as XRC, allows user interface
elements such as dialogs, menu bars and toolbars, to be stored in
text files and loaded into the application at run-time.
This package is for the GTK 1.2 backend

%package     -n %{name}2-xrc
Summary:        The XML-based resource system for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name}2 = %{version}-%{release}
Obsoletes:      wxGTK2-xrc <= 2.4.2-12
Provides:       wxGTK2-xrc = %{version}-%{release}

%description -n %{name}2-xrc
The XML-based resource system, known as XRC, allows user interface
elements such as dialogs, menu bars and toolbars, to be stored in
text files and loaded into the application at run-time.
This package is for the GTK2 backend.


%prep
%setup -q -n wxGTK-%{version}
%patch0 -p1 -b .privates
%patch1 -p0 -b .aclocal18
%patch2 -p1 -b .gcc4

sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure


%build
mkdir _gtk1 _gtk2
export CC="%{__cc}"
export CXX="%{__cxx}"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
# (see OPTIMISE in configure).

cd _gtk1
../configure \
  --prefix=%{_prefix} \
  --libdir=%{_libdir} \
  --x-libraries=%{x11libdir} \
  --with-opengl \
  --enable-shared \
  --enable-soname \
  --disable-optimise
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/xrc
cd ..

cd _gtk2
../configure \
  --prefix=%{_prefix} \
  --libdir=%{_libdir} \
  --x-libraries=%{x11libdir} \
  --with-opengl \
  --enable-shared \
  --enable-soname \
  --disable-optimise \
  --enable-gtk2
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/xrc

cd ..


%install
rm -rf $RPM_BUILD_ROOT

# Since we're not using %%configure, we would really like to use
# "make install DESTDIR=..." instead of %%makeinstall here to keep things in
# sync.  Unfortunately that does not work.
cd _gtk1
%makeinstall
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/xrc
cd ..
cd _gtk2
%makeinstall
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/xrc
cd ..

# Deal with conflicting files
rm -f $RPM_BUILD_ROOT%{_bindir}/wx-config
touch $RPM_BUILD_ROOT%{_bindir}/wx-2.4-config
chmod 755 $RPM_BUILD_ROOT%{_bindir}/wx-2.4-config
mv $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin.m4 \
   $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin-2.4.m4

%find_lang wxstd


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%post devel
ln -sf $(basename %{_bindir}/wxgtk-*-config) %{_bindir}/wx-2.4-config

%post gl -p /sbin/ldconfig
%postun gl -p /sbin/ldconfig

%post stc -p /sbin/ldconfig
%postun stc -p /sbin/ldconfig

%post xrc -p /sbin/ldconfig
%postun xrc -p /sbin/ldconfig

%post -n %{name}2 -p /sbin/ldconfig
%postun -n %{name}2 -p /sbin/ldconfig

%post -n %{name}2-devel
ln -sf $(basename %{_bindir}/wxgtk2-*-config) %{_bindir}/wx-2.4-config

%post -n %{name}2-gl -p /sbin/ldconfig
%postun -n %{name}2-gl -p /sbin/ldconfig

%post -n %{name}2-stc -p /sbin/ldconfig
%postun -n %{name}2-stc -p /sbin/ldconfig

%post -n %{name}2-xrc -p /sbin/ldconfig
%postun -n %{name}2-xrc -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk-*.so.*

%files devel
%defattr(-,root,root,-)
%ghost %{_bindir}/wx-2.4-config
%{_bindir}/wxgtk-*-config
%{_libdir}/libwx_gtk[-_]*.so
%{_libdir}/wx/include/gtk-*

%files -n %{name}2
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2-*.so.*

%files -n %{name}2-devel
%defattr(-,root,root,-)
%ghost %{_bindir}/wx-2.4-config
%{_bindir}/wxgtk2-*-config
%{_libdir}/libwx_gtk2[-_]*.so
%{_libdir}/wx/include/gtk-2*

%files common -f wxstd.lang
%defattr(-,root,root,-)
%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
%{_datadir}/wx/

%files common-devel
%defattr(-,root,root,-)
%{_datadir}/aclocal/*
%{_includedir}/wx/
%dir %{_libdir}/wx/
%dir %{_libdir}/wx/include/

%files gl
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk_gl-*.so.*

%files -n %{name}2-gl
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2_gl-*.so.*

%files stc
%defattr(-,root,root,-)
%doc contrib/src/stc/README.txt
%{_libdir}/libwx_gtk_stc-*.so.*

%files -n %{name}2-stc
%defattr(-,root,root,-)
%doc contrib/src/stc/README.txt
%{_libdir}/libwx_gtk2_stc-*.so.*

%files xrc
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk_xrc-*.so.*

%files -n %{name}2-xrc
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2_xrc-*.so.*


%changelog
* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-15
- spec file cleanups

* Mon Aug 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-14
- Make all packages Provide their old name = r-v

* Sat Aug 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-13
- take ownership
- rename to "compat-wxGTK"
- add dist tag

* Sun May  8 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.4.2-12
- sed -i -e 's|/usr/lib\b|%%{_libdir}|' in configure also to fix
  x86_64

* Sat May  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-11
- Add BR libGL and libGLU to fix FC4 build failure
  (alternatively use xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU).

* Fri Apr 22 2005 Dams <anvil[AT]livna.org> - 2.4.2-10
- Added patch from Ignacio and Denis to fix build with gcc4 

* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt

* Sun Jan 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.2-8
- Fix wx-config for x86_64 (#145508).
- Honor $RPM_OPT_FLAGS better, as well as %%{__cc} and %%{__cxx}.

* Mon Dec  6 2004 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.2-7
- Patch to avoid aclocal >= 1.8 warnings from wxwin.m4.
- Move unversioned *.so links for -gl, -stc and -xrc to -devel, make -devel
  require them.

* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 2.4.2-6
- Bump release to provide Extras upgrade path.
- Fix spaces/tabs in spec.
- Remove unneeded zero epochs.
- Add full source URL.

* Tue Jun 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.2-0.fdr.2
- s/wxWindows/wxWidgets/
- Fix release tag.

* Sat May 22 2004 Noa Resare <noa at resare.com> - 0:2.4.2-0.fdr.1.3
- Merged fix from wxGTK cvs head, now works with recent gtk2

* Sat Oct 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.2-0.fdr.1
- Update to 2.4.2.

* Mon Aug  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.1-0.fdr.4
- Borrow Matthias Saou's -gl and -stc subpackages.

* Mon Jun 16 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.3
- Removed libwx_gtk2_xrc*so* from wxGTK2/wxGTK2-devel packages

* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.2
- Removed *-devel postun scriptlets (from Ville Skytt??)

* Sat Jun 14 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.1
- Updated to 2.4.1

* Wed May 28 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.7
- Added xrc contrib in separate packages

* Wed May 21 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.6
- Corrected typo in postun devel

* Wed May 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.0-0.fdr.5
- Make -devel packages require the corresponding GTK devel package.
- Save .spec in UTF-8.
- Fixes from Dams:
- Don't build --with-unicode, it breaks stuff (as was already noted by Dams).
- Don't remove wx-config symlinks on upgrades.
- Remove duplicates from docs.

* Tue May 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.0-0.fdr.4
- Split into subpackages, spec file rewrite.
- Use bzipped upstream tarball.
- Clean up BuildRequirement versions.

* Fri May  9 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.3
- Now build/include both gtk/gtk2 libs
- buildroot -> RPM_BUILD_ROOT

* Mon Mar  3 2003 Dams <anvil at livna.org>
- Initial build.
- Disable unicode as it breaks lmule
- use the %find_lang macro for locale

wxGTK-2.4.2-aclocal18.patch:

--- NEW FILE wxGTK-2.4.2-aclocal18.patch ---
--- wxwin.m4~	2003-09-21 14:31:27.000000000 +0300
+++ wxwin.m4	2004-12-06 11:33:44.097041699 +0200
@@ -33,7 +33,7 @@
 dnl command line options
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN(AM_OPTIONS_WXCONFIG,
+AC_DEFUN([AM_OPTIONS_WXCONFIG],
 [
    AC_ARG_WITH(wx-prefix, [  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)],
                wx_config_prefix="$withval", wx_config_prefix="")
@@ -56,7 +56,7 @@
 dnl
 dnl Get the cflags and libraries from the wx-config script
 dnl
-AC_DEFUN(AM_PATH_WXCONFIG,
+AC_DEFUN([AM_PATH_WXCONFIG],
 [
   dnl do we have wx-config name: it can be wx-config or wxd-config or ...
   if test x${WX_CONFIG_NAME+set} != xset ; then

wxGTK-2.4.2-gcc4.patch:

--- NEW FILE wxGTK-2.4.2-gcc4.patch ---
--- wxGTK-2.4.2/contrib/src/xrc/xml.cpp.gcc4	2003-09-21 07:32:56.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/xrc/xml.cpp	2005-04-15 06:59:47.000000000 -0400
@@ -354,8 +354,8 @@
 #else
     if ( conv )
     {
-        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
-                          nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
+        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
+                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
 
         wchar_t *buf = new wchar_t[nLen+1];
         wxConvUTF8.MB2WC(buf, s, nLen);
--- wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c.gcc4	2003-09-21 07:32:54.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c	2005-04-15 06:59:47.000000000 -0400
@@ -203,8 +203,10 @@
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
 	 const char *end, int tok, const char *next, const char **nextPtr);
+#ifdef XML_DTD
 static enum XML_Error
 processInternalParamEntity(XML_Parser parser, ENTITY *entity);
+#endif /* XML_DTD */
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
 	  const char *start, const char *end, const char **endPtr);
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx.gcc4	2003-09-21 07:32:47.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx	2005-04-15 06:59:47.000000000 -0400
@@ -850,6 +850,7 @@
 	DocumentIndexer(Document *pdoc_, int end_) :
 		pdoc(pdoc_), end(end_) {
 	}
+	virtual ~DocumentIndexer() {};
 
 	virtual char CharAt(int index) {
 		if (index < 0 || index >= end)
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h.gcc4	2003-09-21 07:32:50.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h	2005-04-15 06:59:47.000000000 -0400
@@ -38,6 +38,7 @@
 		strncpy(name, languageName_, sizeof(name));
 		languageName = name;
 	};
+	virtual ~ExternalLexerModule() {};
 	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
 					WordList *keywordlists[], Accessor &styler) const;
 	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h.gcc4	2003-09-21 07:32:50.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h	2005-04-15 06:59:47.000000000 -0400
@@ -20,6 +20,7 @@
 class CharacterIndexer {
 public: 
 	virtual char CharAt(int index)=0;
+	virtual ~CharacterIndexer() {};
 };
 
 class RESearch {
--- wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h.gcc4	2003-09-21 07:32:47.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h	2005-04-15 06:59:47.000000000 -0400
@@ -29,6 +29,7 @@
 	LexerModule(int language_, LexerFunction fnLexer_, 
 		const char *languageName_=0, LexerFunction fnFolder_=0,
 		const char * const wordListDescriptions_[] = NULL);
+	virtual ~LexerModule() {};
 	int GetLanguage() const { return language; }
 
 	// -1 is returned if no WordList information is available
--- wxGTK-2.4.2/src/common/dircmn.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
+++ wxGTK-2.4.2/src/common/dircmn.cpp	2005-04-15 06:59:47.000000000 -0400
@@ -147,6 +147,7 @@
 {
 public:
     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
+    virtual ~wxDirTraverserSimple() {};
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
--- wxGTK-2.4.2/src/common/xpmdecod.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
+++ wxGTK-2.4.2/src/common/xpmdecod.cpp	2005-04-15 14:06:53.000000000 -0400
@@ -669,7 +669,7 @@
     wxChar key[64];
     const char *clr_def;
     bool hasMask;
-    wxXPMColourMapData clr_data;
+    wxXPMColourMapData clr_data = {0, 0, 0};
     wxXPMColourMap clr_tbl;
 
     /*
@@ -712,7 +712,7 @@
         }
         else
         {
-            bool isNone;
+            bool isNone = false;
             if ( !GetRGBFromName(clr_def, &isNone,
                                  &clr_data.R, &clr_data.G, &clr_data.B) )
             {
--- wxGTK-2.4.2/src/unix/mimetype.cpp.gcc4	2003-09-21 07:31:40.000000000 -0400
+++ wxGTK-2.4.2/src/unix/mimetype.cpp	2005-04-15 06:59:47.000000000 -0400
@@ -1580,7 +1580,7 @@
     {
         // now got a file we can write to ....
         wxMimeTypeCommands * entries = m_aEntries[index];
-        size_t iOpen;
+        size_t iOpen = 0;
         wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
         wxString sTmp;
 
--- wxGTK-2.4.2/include/wx/statline.h.gcc4	2003-09-21 07:31:35.000000000 -0400
+++ wxGTK-2.4.2/include/wx/statline.h	2005-04-15 06:59:47.000000000 -0400
@@ -39,6 +39,7 @@
 public:
     // constructor
     wxStaticLineBase() { }
+    virtual ~wxStaticLineBase() {};
 
     // is the line vertical?
     bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
--- wxGTK-2.4.2/include/wx/datetime.h.gcc4	2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/datetime.h	2005-04-15 06:59:47.000000000 -0400
@@ -1300,6 +1300,7 @@
 {
 friend class wxDateTimeHolidaysModule;
 public:
+    virtual ~wxDateTimeHolidayAuthority() {};
     // returns TRUE if the given date is a holiday
     static bool IsHoliday(const wxDateTime& dt);
 
@@ -1340,6 +1341,8 @@
 // the holidays for this class are all Saturdays and Sundays
 class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
 {
+public:
+    virtual ~wxDateTimeWorkDays() {};
 protected:
     virtual bool DoIsHoliday(const wxDateTime& dt) const;
     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
--- wxGTK-2.4.2/include/wx/notebook.h.gcc4	2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/notebook.h	2005-04-15 06:59:47.000000000 -0400
@@ -193,6 +193,7 @@
             m_nSel = nSel;
             m_nOldSel = nOldSel;
         }
+    virtual ~wxNotebookEvent() {};
 
     // accessors
         // the currently selected page (-1 if none)
--- wxGTK-2.4.2/include/wx/event.h.gcc4	2003-09-21 07:31:33.000000000 -0400
+++ wxGTK-2.4.2/include/wx/event.h	2005-04-15 06:59:47.000000000 -0400
@@ -1952,6 +1952,7 @@
         : wxEventTableEntryBase(id, idLast, fn, data),
         m_eventType(evType)
     { }
+    virtual ~wxEventTableEntry() {};
 
     // the reference to event type: this allows us to not care about the
     // (undefined) order in which the event table entries and the event types
--- wxGTK-2.4.2/include/wx/geometry.h.gcc4	2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/geometry.h	2005-04-15 06:59:47.000000000 -0400
@@ -785,6 +785,7 @@
 class wxTransform2D
 {
 public :
+    virtual ~wxTransform2D() {};
     virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
     virtual void                    Transform( wxRect2DInt* r ) const;
     virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
--- wxGTK-2.4.2/include/wx/list.h.gcc4	2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/list.h	2005-04-15 14:05:22.000000000 -0400
@@ -384,6 +384,7 @@
                  T *data = (T *)NULL,                                       \
                  const wxListKey& key = wxDefaultListKey)                   \
             : wxNodeBase(list, previous, next, data, key) { }               \
+        virtual ~nodetype() {};                                             \
                                                                             \
         nodetype *GetNext() const                                           \
             { return (nodetype *)wxNodeBase::GetNext(); }                   \
@@ -410,6 +411,7 @@
                                                                             \
         name& operator=(const name& list)                                   \
             { (void) wxListBase::operator=(list); return *this; }           \
+        virtual ~name() {};                                                 \
                                                                             \
         nodetype *GetFirst() const                                          \
             { return (nodetype *)wxListBase::GetFirst(); }                  \
--- wxGTK-2.4.2/include/wx/radiobox.h.gcc4	2003-09-21 07:31:35.000000000 -0400
+++ wxGTK-2.4.2/include/wx/radiobox.h	2005-04-15 06:59:47.000000000 -0400
@@ -35,6 +35,7 @@
 class WXDLLEXPORT wxRadioBoxBase
 {
 public:
+    virtual ~wxRadioBoxBase() {};
     // selection
     virtual void SetSelection(int n) = 0;
     virtual int GetSelection() const = 0;
--- wxGTK-2.4.2/include/wx/caret.h.gcc4	2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/caret.h	2005-04-15 06:59:47.000000000 -0400
@@ -60,6 +60,7 @@
 
         (void)Create(window, size);
     }
+    virtual ~wxCaretBase() {};
 
     // Create() functions - same as ctor but returns the success code
     // --------------------------------------------------------------
--- wxGTK-2.4.2/include/wx/dir.h.gcc4	2003-09-21 07:31:32.000000000 -0400
+++ wxGTK-2.4.2/include/wx/dir.h	2005-04-15 06:59:47.000000000 -0400
@@ -52,6 +52,7 @@
 class WXDLLEXPORT wxDirTraverser
 {
 public:
+    virtual ~wxDirTraverser() {};
     // called for each file found by wxDir::Traverse()
     //
     // return wxDIR_STOP or wxDIR_CONTINUE from here
--- wxGTK-2.4.2/include/wx/clipbrd.h.gcc4	2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/clipbrd.h	2005-04-15 06:59:47.000000000 -0400
@@ -39,6 +39,7 @@
 {
 public:
     wxClipboardBase();
+    virtual ~wxClipboardBase() {};
 
     // open the clipboard before Add/SetData() and GetData()
     virtual bool Open() = 0;
--- wxGTK-2.4.2/src/common/sckfile.cpp.orig	2005-04-16 16:50:11.000000000 -0700
+++ wxGTK-2.4.2/src/common/sckfile.cpp	2005-04-16 16:50:14.000000000 -0700
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 #ifdef __GNUG__
-#pragma implementation "sckfile.h"
+#pragma implementation "file.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

wxGTK-2.4.2-privates.patch:

--- NEW FILE wxGTK-2.4.2-privates.patch ---
diff -ur wxGTK-2.4.2.vanilla/src/gtk/menu.cpp wxGTK-2.4.2/src/gtk/menu.cpp
--- wxGTK-2.4.2.vanilla/src/gtk/menu.cpp	2003-09-21 13:31:57.000000000 +0200
+++ wxGTK-2.4.2/src/gtk/menu.cpp	2004-05-22 20:57:58.753013328 +0200
@@ -30,13 +30,13 @@
 #ifdef __WXGTK20__
     #include <glib-object.h>
 
-    #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
-    #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
+    #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
+    #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
     #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
 
-    #define ACCEL_OBJECT        GObject
+    #define ACCEL_OBJECT        GtkWindow
     #define ACCEL_OBJECTS(a)    (a)->acceleratables
-    #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
+    #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
 #else // GTK+ 1.x
     #define ACCEL_OBJECT        GtkObject
     #define ACCEL_OBJECTS(a)    (a)->attach_objects
Endast i wxGTK-2.4.2/src/gtk: menu.cppprivates
diff -ur wxGTK-2.4.2.vanilla/src/gtk/settings.cpp wxGTK-2.4.2/src/gtk/settings.cpp
--- wxGTK-2.4.2.vanilla/src/gtk/settings.cpp	2003-09-21 13:31:57.000000000 +0200
+++ wxGTK-2.4.2/src/gtk/settings.cpp	2004-05-22 20:57:15.330585304 +0200
@@ -340,9 +340,20 @@
                 }  
                 else  
                 {  
-                    const gchar *font_name =
-                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
-                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
+                    GtkSettings *settings = gtk_settings_get_default();
+                    gchar *font_name = NULL;
+                    g_object_get ( settings,
+                                   "gtk-font-name",
+                                   &font_name,
+                                   NULL);
+
+                    if (!font_name) 
+                            g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+
+                    else
+	                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
+                    g_free (font_name);
+			
                 }  
                 gtk_widget_destroy( widget );
 #else
Endast i wxGTK-2.4.2/src/gtk: settings.cppprivates


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 16:11:20 -0000	1.1
+++ .cvsignore	6 Jan 2006 16:14:52 -0000	1.2
@@ -0,0 +1 @@
+wxGTK-2.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 16:11:20 -0000	1.1
+++ sources	6 Jan 2006 16:14:52 -0000	1.2
@@ -0,0 +1 @@
+cdadfe82fc93f8a65a2ae18a95b0b0e3  wxGTK-2.4.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan  6 16:15:17 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:15:17 -0500
Subject: owners owners.list,1.503,1.504
Message-ID: <200601061615.k06GFnIB013976@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13842

Modified Files:
	owners.list 
Log Message:

Here come compat-wxGTK & compat-wxPythonGTK2, swinging proud and free, flying through the air, watch out for that tree!



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -r1.503 -r1.504
--- owners.list	6 Jan 2006 15:01:27 -0000	1.503
+++ owners.list	6 Jan 2006 16:15:17 -0000	1.504
@@ -114,6 +114,8 @@
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|compat-wxGTK|Compatibility version of the wxWidgets GUI library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|compat-wxPythonGTK2|Compatibility version of the wxWidgets GUI toolkit for Python|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|compface|Library for handling X-Faces|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 16:16:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:16:53 -0500
Subject: rpms/compat-wxPythonGTK2 - New directory
Message-ID: <200601061616.k06GGtRO014033@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14025/compat-wxPythonGTK2

Log Message:
Directory /cvs/extras/rpms/compat-wxPythonGTK2 added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:16:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:16:59 -0500
Subject: rpms/compat-wxPythonGTK2/devel - New directory
Message-ID: <200601061617.k06GH1DZ014048@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14025/compat-wxPythonGTK2/devel

Log Message:
Directory /cvs/extras/rpms/compat-wxPythonGTK2/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:17:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:17:15 -0500
Subject: rpms/compat-wxPythonGTK2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061617.k06GHHLP014082@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14070

Added Files:
	Makefile import.log 
Log Message:
Setup of module compat-wxPythonGTK2


--- NEW FILE Makefile ---
# Top level Makefile for module compat-wxPythonGTK2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:17:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:17:21 -0500
Subject: rpms/compat-wxPythonGTK2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061617.k06GHN8u014102@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14070/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compat-wxPythonGTK2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:22:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:22:14 -0500
Subject: owners owners.list,1.504,1.505
Message-ID: <200601061622.k06GMkJJ014151@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14133

Modified Files:
	owners.list 
Log Message:

perl-Clone attacks!



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- owners.list	6 Jan 2006 16:15:17 -0000	1.504
+++ owners.list	6 Jan 2006 16:22:14 -0000	1.505
@@ -753,6 +753,7 @@
 Fedora Extras|perl-Class-Singleton|Class::Singleton Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 16:23:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:23:06 -0500
Subject: rpms/compat-wxPythonGTK2 import.log,1.1,1.2
Message-ID: <200601061623.k06GNkPi014209@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171

Modified Files:
	import.log 
Log Message:
auto-import compat-wxPythonGTK2-2.4.2.4-9 on branch devel from compat-wxPythonGTK2-2.4.2.4-9.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 16:17:14 -0000	1.1
+++ import.log	6 Jan 2006 16:23:03 -0000	1.2
@@ -0,0 +1 @@
+compat-wxPythonGTK2-2_4_2_4-9:HEAD:compat-wxPythonGTK2-2.4.2.4-9.src.rpm:1136564568



From fedora-extras-commits at redhat.com  Fri Jan  6 16:23:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:23:12 -0500
Subject: rpms/compat-wxPythonGTK2/devel compat-wxPython.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061623.k06GNkP0014210@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-wxPython.spec 
Log Message:
auto-import compat-wxPythonGTK2-2.4.2.4-9 on branch devel from compat-wxPythonGTK2-2.4.2.4-9.src.rpm


--- NEW FILE compat-wxPython.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

%define buildflags WXPORT=gtk2 UNICODE=1 WX_CONFIG=%{_bindir}/wx-2.4-config

Name:           compat-wxPythonGTK2
Version:        2.4.2.4
Release:        9%{?dist}
Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
Group:          Development/Languages
License:        LGPL
URL:            http://www.wxpython.org/
Source0:        http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires:  python-devel

# This is what other packages should depend on, NOT the package name!
Provides:       wxPython = %{version}-%{release}
Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
Obsoletes:      wxPython <= 2.4.2.4-7

%description
wxPython is a GUI toolkit for the Python programming language. It allows
Python programmers to create programs with a robust, highly functional
graphical user interface, simply and easily. It is implemented as a Python
extension module (native code) that wraps the popular wxWindows cross
platform GUI library, which is written in C++.

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

%build
# Just build the wxPython part, not all of wxWindows which we already have
# in Fedora
cd wxPython
# included disutils is not multilib aware; use normal
rm -rf distutils
python setup.py %{buildflags} build

# There's a binary included in sources resulting in bogus libwx_gtk2-2.3.so.0
# dependency for the package, clean it up
cd demo/dllwidget
make clean

%install
rm -rf $RPM_BUILD_ROOT
cd wxPython
python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc wxPython/docs/ wxPython/demo/ wxPython/licence/ wxPython/samples/
%{_bindir}/*
# These binaries are now in the wxPython 2.6 package
%exclude %{_bindir}/helpviewer
%exclude %{_bindir}/img2png
%exclude %{_bindir}/img2py
%exclude %{_bindir}/img2xpm
%exclude %{_bindir}/xrced
%{python_sitearch}/wxPython/
%{python_sitearch}/wx/

%changelog
* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
- spec cleanups

* Mon Aug 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-8
- rename to compat-wxPythonGTK2

* Wed May 11 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.4.2.4-7
- d'oh, it's sitearch here

* Wed May 11 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.4.2.4-6
- rebuilt
- use %%python_sitelib macro
- drop dependency on python binary, python(abi) dependency is automatic

* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.4.2.4-5
- rebuilt

* Tue Feb 08 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:2.4.2.4-4
- remove included disutils - it is not multilib aware; this
  fixes build on x86_64

* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.3
- rename package to wxPythonGTK2, provide wxPython (see bug 927)
- dont ship binaries in /usr/share

* Thu Nov 20 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.2
- add missing buildrequires: python-devel, wxGTK2-gl

* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 16:17:20 -0000	1.1
+++ .cvsignore	6 Jan 2006 16:23:11 -0000	1.2
@@ -0,0 +1 @@
+wxPythonSrc-2.4.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 16:17:20 -0000	1.1
+++ sources	6 Jan 2006 16:23:11 -0000	1.2
@@ -0,0 +1 @@
+ea4eb68e10a0c2a9be643b35dcb78e41  wxPythonSrc-2.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 16:24:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:24:50 -0500
Subject: rpms/perl-Clone - New directory
Message-ID: <200601061624.k06GOqcD014297@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14289/perl-Clone

Log Message:
Directory /cvs/extras/rpms/perl-Clone added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:24:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:24:55 -0500
Subject: rpms/perl-Clone/devel - New directory
Message-ID: <200601061624.k06GOvRK014312@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14289/perl-Clone/devel

Log Message:
Directory /cvs/extras/rpms/perl-Clone/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:10 -0500
Subject: rpms/perl-Clone Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061625.k06GPCFJ014346@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14334

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Clone


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Clone
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:25 -0500
Subject: rpms/perl-Clone/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061625.k06GPRKW014366@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14334/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Clone


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:47 -0500
Subject: rpms/perl-Clone import.log,1.1,1.2
Message-ID: <200601061626.k06GQKMZ014482@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14400

Modified Files:
	import.log 
Log Message:
auto-import perl-Clone-0.18-2 on branch devel from perl-Clone-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 16:25:10 -0000	1.1
+++ import.log	6 Jan 2006 16:25:47 -0000	1.2
@@ -0,0 +1 @@
+perl-Clone-0_18-2:HEAD:perl-Clone-0.18-2.src.rpm:1136564733



From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:53 -0500
Subject: rpms/perl-Clone/devel perl-Clone.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601061626.k06GQQvM014486@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14400/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Clone.spec 
Log Message:
auto-import perl-Clone-0.18-2 on branch devel from perl-Clone-0.18-2.src.rpm


--- NEW FILE perl-Clone.spec ---
Name:           perl-Clone
Version:        0.18
Release:        2%{?dist}
Summary:        Recursively copy perl datatypes
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Clone
Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	perl(ExtUtils::ParseXS)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a clone() method which makes recursive
copies of nested hash, array, scalar and reference types,
including tied variables and objects.

clone() takes a scalar argument and an optional parameter that
can be used to limit the depth of the copy. To duplicate lists,
arrays or hashes, pass them in by reference.

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

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorarch}/auto/Clone/
%{perl_vendorarch}/Clone.pm
%{_mandir}/man3/*.3*


%changelog
* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-2
- don't pass optflags twice
- remove .bs files

* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 16:25:25 -0000	1.1
+++ .cvsignore	6 Jan 2006 16:25:53 -0000	1.2
@@ -0,0 +1 @@
+Clone-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 16:25:25 -0000	1.1
+++ sources	6 Jan 2006 16:25:53 -0000	1.2
@@ -0,0 +1 @@
+7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 17:35:43 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:35:43 -0500
Subject: rpms/perl-String-CRC32 - New directory
Message-ID: <200601061735.k06HZjtb016940@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932/perl-String-CRC32

Log Message:
Directory /cvs/extras/rpms/perl-String-CRC32 added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 17:35:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:35:49 -0500
Subject: rpms/perl-String-CRC32/devel - New directory
Message-ID: <200601061735.k06HZpnx016955@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932/perl-String-CRC32/devel

Log Message:
Directory /cvs/extras/rpms/perl-String-CRC32/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 17:38:41 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:38:41 -0500
Subject: rpms/perl-String-CRC32 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061738.k06HciE4016999@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16987

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-String-CRC32


--- NEW FILE Makefile ---
# Top level Makefile for module perl-String-CRC32
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 17:38:57 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:38:57 -0500
Subject: rpms/perl-String-CRC32/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601061738.k06HcxfP017019@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16987/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-String-CRC32


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 17:42:43 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:42:43 -0500
Subject: rpms/perl-String-CRC32 import.log,1.1,1.2
Message-ID: <200601061743.k06HhFCm017140@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17106

Modified Files:
	import.log 
Log Message:
auto-import perl-String-CRC32-1.3-1 on branch devel from perl-String-CRC32-1.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 17:38:41 -0000	1.1
+++ import.log	6 Jan 2006 17:42:43 -0000	1.2
@@ -0,0 +1 @@
+perl-String-CRC32-1_3-1:HEAD:perl-String-CRC32-1.3-1.src.rpm:1136569332



From fedora-extras-commits at redhat.com  Fri Jan  6 17:42:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:42:49 -0500
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061743.k06HhLMN017144@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17106/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-String-CRC32.spec 
Log Message:
auto-import perl-String-CRC32-1.3-1 on branch devel from perl-String-CRC32-1.3-1.src.rpm


--- NEW FILE perl-String-CRC32.spec ---
Summary:	Perl interface for cyclic redundency check generation
Name:		perl-String-CRC32
Version:	1.3
Release:	1%{?dist}
License:	Public Domain
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/String-CRC32/
Source0:	http://search.cpan.org/CPAN/authors/id/S/SO/SOENKE/String-CRC32-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The CRC32 module calculates CRC sums of 32 bit lengths. It generates the same
CRC values as ZMODEM, PKZIP, PICCHECK and many others. Despite its name, this
module is able to compute the checksum of files as well as strings.

%prep
%setup -q -n String-CRC32-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc README
%{perl_vendorarch}/String/
%{perl_vendorarch}/auto/String/
%{_mandir}/man3/String::CRC32.3pm*

%changelog
* Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 17:38:56 -0000	1.1
+++ .cvsignore	6 Jan 2006 17:42:49 -0000	1.2
@@ -0,0 +1 @@
+String-CRC32-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 17:38:56 -0000	1.1
+++ sources	6 Jan 2006 17:42:49 -0000	1.2
@@ -0,0 +1 @@
+7683cd1b183a6af807f20ee5fd076d0b  String-CRC32-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 17:47:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:47:10 -0500
Subject: owners owners.list,1.505,1.506
Message-ID: <200601061747.k06Hlh75017205@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17188

Modified Files:
	owners.list 
Log Message:
perl-String-CRC32



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- owners.list	6 Jan 2006 16:22:14 -0000	1.505
+++ owners.list	6 Jan 2006 17:47:10 -0000	1.506
@@ -891,6 +891,7 @@
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundency check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 17:50:48 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:50:48 -0500
Subject: owners owners.list,1.506,1.507
Message-ID: <200601061751.k06HpLaw017242@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17223

Modified Files:
	owners.list 
Log Message:
Fix typo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- owners.list	6 Jan 2006 17:47:10 -0000	1.506
+++ owners.list	6 Jan 2006 17:50:48 -0000	1.507
@@ -891,7 +891,7 @@
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundency check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 17:52:11 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:52:11 -0500
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.1,1.2
Message-ID: <200601061752.k06Hqhgc017292@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17250

Modified Files:
	perl-String-CRC32.spec 
Log Message:
Fix typo



Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-String-CRC32.spec	6 Jan 2006 17:42:49 -0000	1.1
+++ perl-String-CRC32.spec	6 Jan 2006 17:52:11 -0000	1.2
@@ -1,4 +1,4 @@
-Summary:	Perl interface for cyclic redundency check generation
+Summary:	Perl interface for cyclic redundancy check generation
 Name:		perl-String-CRC32
 Version:	1.3
 Release:	1%{?dist}



From fedora-extras-commits at redhat.com  Fri Jan  6 17:52:38 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 12:52:38 -0500
Subject: rpms/compat-wxGTK/devel compat-wxGTK.spec,1.1,1.2
Message-ID: <200601061753.k06HrA8Q017308@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17274/devel

Modified Files:
	compat-wxGTK.spec 
Log Message:

Fix spec for FC5 modular X.



Index: compat-wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/compat-wxGTK.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxGTK.spec	6 Jan 2006 16:14:52 -0000	1.1
+++ compat-wxGTK.spec	6 Jan 2006 17:52:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           compat-wxGTK
 Version:        2.4.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Compatibility version of the wxWidgets GTK GUI library
 License:        BSD
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@
 
 BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel libjpeg-devel libtiff-devel
-BuildRequires:  libGL libGLU
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 Requires:       %{name}-common = %{version}-%{release}
 Obsoletes:      wxGTK <= 2.4.2-12
 
@@ -330,6 +330,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-16
+- FC5 modular X deps
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-15
 - spec file cleanups
 



From fedora-extras-commits at redhat.com  Fri Jan  6 20:16:16 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri,  6 Jan 2006 15:16:16 -0500
Subject: fedora-security/audit fc4,1.118,1.119 fc5,1.29,1.30
Message-ID: <200601062016.k06KGGWO023041@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23021

Modified Files:
	fc4 fc5 
Log Message:
Add lots of xpdf CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc4	6 Jan 2006 15:26:47 -0000	1.118
+++ fc4	6 Jan 2006 20:16:08 -0000	1.119
@@ -4,6 +4,27 @@
 ** are items that need attention
 
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3624 VULNERABLE (cups)
+CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176813
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fc5	6 Jan 2006 15:26:47 -0000	1.29
+++ fc5	6 Jan 2006 20:16:08 -0000	1.30
@@ -13,6 +13,26 @@
 ** are items that need attention
 
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2005-3628 VULNERABLE (cups)
+CVE-2005-3628 VULNERABLE (poppler)
+CVE-2005-3628 VULNERABLE (xpdf)
+CVE-2005-3628 backport (kdegraphics)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (kdegraphics)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (kdegraphics)
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (kdegraphics)
+CVE-2005-3624 VULNERABLE (cups)
+CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (kdegraphics)
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)



From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:19 -0500
Subject: rpms/perl-Text-Diff - New directory
Message-ID: <200601062122.k06LMLlM024986@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24978/perl-Text-Diff

Log Message:
Directory /cvs/extras/rpms/perl-Text-Diff added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:25 -0500
Subject: rpms/perl-Text-Diff/devel - New directory
Message-ID: <200601062122.k06LMRVq025001@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24978/perl-Text-Diff/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-Diff/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:43 -0500
Subject: rpms/perl-Text-Diff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601062122.k06LMjcw025035@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25023

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-Diff


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-Diff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:49 -0500
Subject: rpms/perl-Text-Diff/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601062122.k06LMpOh025055@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25023/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-Diff


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 21:23:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:23:05 -0500
Subject: owners owners.list,1.507,1.508
Message-ID: <200601062123.k06LNev0025111@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25074

Modified Files:
	owners.list 
Log Message:
Add perl-Text-Diff.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- owners.list	6 Jan 2006 17:50:48 -0000	1.507
+++ owners.list	6 Jan 2006 21:23:04 -0000	1.508
@@ -915,6 +915,7 @@
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 21:23:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:23:43 -0500
Subject: rpms/perl-Text-Diff import.log,1.1,1.2
Message-ID: <200601062124.k06LOF75025149@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25115

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-Diff-0.35-2 on branch devel from perl-Text-Diff-0.35-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 21:22:43 -0000	1.1
+++ import.log	6 Jan 2006 21:23:42 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-Diff-0_35-2:HEAD:perl-Text-Diff-0.35-2.src.rpm:1136582596



From fedora-extras-commits at redhat.com  Fri Jan  6 21:24:02 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:24:02 -0500
Subject: rpms/perl-Text-Diff/devel perl-Text-Diff.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601062124.k06LOYTK025153@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25115/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-Diff.spec 
Log Message:
auto-import perl-Text-Diff-0.35-2 on branch devel from perl-Text-Diff-0.35-2.src.rpm


--- NEW FILE perl-Text-Diff.spec ---
Name:           perl-Text-Diff
Version:        0.35
Release:        2%{?dist}
Summary:        Text::Diff Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Diff/
Source0:        http://www.cpan.org/modules/by-module/Text/Text-Diff-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Algorithm::Diff)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Diff - Perform diffs on files and record sets.

%prep
%setup -q -n Text-Diff-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Sep 16 2005 Steven Pritchard <steve at kspei.com> 0.35-2
- Minor spec cleanup.

* Sat Aug 27 2005 Steven Pritchard <steve at kspei.com> 0.35-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 21:22:48 -0000	1.1
+++ .cvsignore	6 Jan 2006 21:24:01 -0000	1.2
@@ -0,0 +1 @@
+Text-Diff-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 21:22:48 -0000	1.1
+++ sources	6 Jan 2006 21:24:01 -0000	1.2
@@ -0,0 +1 @@
+4931662ea353384dec2a54a71b26ee8c  Text-Diff-0.35.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 23:07:27 2006
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri,  6 Jan 2006 18:07:27 -0500
Subject: rpms/balsa/devel .cvsignore, 1.9, 1.10 balsa.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200601062307.k06N7xGH030960@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30939

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to 2.3.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Dec 2005 16:08:31 -0000	1.9
+++ .cvsignore	6 Jan 2006 23:07:17 -0000	1.10
@@ -1,2 +1,2 @@
-balsa-2.3.8.tar.bz2
 gmime-2.1.17.tar.bz2
+balsa-2.3.9.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- balsa.spec	28 Dec 2005 16:08:31 -0000	1.12
+++ balsa.spec	6 Jan 2006 23:07:17 -0000	1.13
@@ -2,7 +2,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.8
+Version:        2.3.9
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
+- update to 2.3.9.
+
 * Wed Dec 28 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.8-1
 - update to 2.3.8; enable gtkhtml and gtkspell.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Dec 2005 16:08:31 -0000	1.9
+++ sources	6 Jan 2006 23:07:17 -0000	1.10
@@ -1,2 +1,2 @@
-517c0a1cbd4dc85ec06a6c7b0f522ffa  balsa-2.3.8.tar.bz2
 4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
+65872d953f0c3c7d2dc50bb09f800629  balsa-2.3.9.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan  7 03:59:31 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Fri,  6 Jan 2006 22:59:31 -0500
Subject: owners owners.list,1.508,1.509
Message-ID: <200601070400.k07403De006502@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6441

Modified Files:
	owners.list 
Log Message:
Assign ownership of libapreq2 to bojan at rexursive.com


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -r1.508 -r1.509
--- owners.list	6 Jan 2006 21:23:04 -0000	1.508
+++ owners.list	7 Jan 2006 03:59:30 -0000	1.509
@@ -477,7 +477,7 @@
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|libapreq2|Apache HTTP request library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan  7 05:18:37 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:18:37 -0500
Subject: rpms/python-feedparser - New directory
Message-ID: <200601070518.k075IdZ6010183@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10175/python-feedparser

Log Message:
Directory /cvs/extras/rpms/python-feedparser added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 05:18:43 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:18:43 -0500
Subject: rpms/python-feedparser/devel - New directory
Message-ID: <200601070518.k075IjVe010199@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10175/python-feedparser/devel

Log Message:
Directory /cvs/extras/rpms/python-feedparser/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 05:18:55 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:18:55 -0500
Subject: rpms/python-feedparser Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601070518.k075IvKZ010236@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10222

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-feedparser


--- NEW FILE Makefile ---
# Top level Makefile for module python-feedparser
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan  7 05:19:00 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:19:00 -0500
Subject: rpms/python-feedparser/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601070519.k075J3SL010260@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10222/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-feedparser


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan  7 05:19:19 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:19:19 -0500
Subject: rpms/python-feedparser import.log,1.1,1.2
Message-ID: <200601070519.k075Jpuk010333@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10295

Modified Files:
	import.log 
Log Message:
auto-import python-feedparser-4.0.2-2 on branch devel from python-feedparser-4.0.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jan 2006 05:18:54 -0000	1.1
+++ import.log	7 Jan 2006 05:19:18 -0000	1.2
@@ -0,0 +1 @@
+python-feedparser-4_0_2-2:HEAD:python-feedparser-4.0.2-2.src.rpm:1136611155



From fedora-extras-commits at redhat.com  Sat Jan  7 05:19:24 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:19:24 -0500
Subject: rpms/python-feedparser/devel python-feedparser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601070519.k075JvjS010337@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10295/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-feedparser.spec 
Log Message:
auto-import python-feedparser-4.0.2-2 on branch devel from python-feedparser-4.0.2-2.src.rpm


--- NEW FILE python-feedparser.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-feedparser
Version:        4.0.2
Release:        2%{?dist}
Summary:        Parse RSS and Atom feeds in Python

Group:          Development/Languages
License:        BSD-ish
URL:            http://feedparser.org/
Source0:        http://download.sourceforge.net/feedparser/feedparser-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Universal Feed Parser is a Python module for downloading and parsing 
syndicated feeds. It can handle RSS 0.90, Netscape RSS 0.91, 
Userland RSS 0.91, RSS 0.92, RSS 0.93, RSS 0.94, RSS 1.0, RSS 2.0, 
Atom 0.3, Atom 1.0, and CDF feeds. It also parses several popular extension 
modules, including Dublin Core and Apple's iTunes extensions.


%prep
%setup -q -c


%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
cp -a docs html
chmod 0644 LICENSE README
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE README html
%{python_sitelib}/*.py
%{python_sitelib}/*.pyc
%ghost %{python_sitelib}/*.pyo


%changelog
* Sat Jan 07 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-2
- Set sane permissions on doc files.

* Wed Jan 04 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2006 05:19:00 -0000	1.1
+++ .cvsignore	7 Jan 2006 05:19:24 -0000	1.2
@@ -0,0 +1 @@
+feedparser-4.0.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2006 05:19:00 -0000	1.1
+++ sources	7 Jan 2006 05:19:24 -0000	1.2
@@ -0,0 +1 @@
+85cc43faf40f8aefdb5885bdabc1a94c  feedparser-4.0.2.zip



From fedora-extras-commits at redhat.com  Sat Jan  7 05:25:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:25:58 -0500
Subject: owners owners.list,1.509,1.510
Message-ID: <200601070526.k075QV72010441@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10424/owners

Modified Files:
	owners.list 
Log Message:
Adding ownership of python-feedparser



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- owners.list	7 Jan 2006 03:59:30 -0000	1.509
+++ owners.list	7 Jan 2006 05:25:58 -0000	1.510
@@ -1017,6 +1017,7 @@
 Fedora Extras|python-docutils|A system for processing plaintext documentation|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-elementtree|Fast XML parser and writer|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-feedparser|Parse RSS and Atom feeds in Python|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-formencode|FormEncode is a validation and form generation package.|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan  7 09:37:27 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 04:37:27 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.3,1.4
Message-ID: <200601070937.k079bxqT019227@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19210

Modified Files:
	streamtuner.spec 
Log Message:
desktop-file-utils added to deps again


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
+++ streamtuner.spec	7 Jan 2006 09:37:26 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -15,6 +15,7 @@
 Requires(post): desktop-file-utils, scrollkeeper
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
+BuildRequires: desktop-file-utils
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
@@ -115,6 +116,9 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
+- desktop-file-utils dependency added again
+
 * Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
 - desktop-file-utils dependency removed
 



From fedora-extras-commits at redhat.com  Sat Jan  7 09:47:07 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 04:47:07 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.4,1.5
Message-ID: <200601070947.k079ldVs019267@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19250

Modified Files:
	streamtuner.spec 
Log Message:
cosmetics


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- streamtuner.spec	7 Jan 2006 09:37:26 -0000	1.4
+++ streamtuner.spec	7 Jan 2006 09:47:06 -0000	1.5
@@ -15,8 +15,8 @@
 Requires(post): desktop-file-utils, scrollkeeper
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
-BuildRequires: desktop-file-utils
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
+BuildRequires: desktop-file-utils
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 



From fedora-extras-commits at redhat.com  Sat Jan  7 10:13:24 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 05:13:24 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.5,1.6
Message-ID: <200601071013.k07ADvgJ021053@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21015

Modified Files:
	streamtuner.spec 
Log Message:
desktop-file-utils dependency removed from requires(post) and requires(postun)


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- streamtuner.spec	7 Jan 2006 09:47:06 -0000	1.5
+++ streamtuner.spec	7 Jan 2006 10:13:24 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -12,8 +12,8 @@
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, bmp, xterm
-Requires(post): desktop-file-utils, scrollkeeper
-Requires(postun): desktop-file-utils, scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
 BuildRequires: desktop-file-utils
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
+- desktop-file-utils dependency removed from requires(post) and requires(postun)  
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
 - desktop-file-utils dependency added again
 



From fedora-extras-commits at redhat.com  Sat Jan  7 10:18:09 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 05:18:09 -0500
Subject: rpms/streamtuner/FC-3 streamtuner.spec,1.3,1.4
Message-ID: <200601071018.k07AIf9B021141@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21124

Modified Files:
	streamtuner.spec 
Log Message:
sync specfile with FC-4


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
+++ streamtuner.spec	7 Jan 2006 10:18:09 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 7%{?dist}
+Release: 9%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -12,10 +12,11 @@
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, bmp, xterm
-Requires(post): desktop-file-utils, scrollkeeper
-Requires(postun): desktop-file-utils, scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
+BuildRequires: desktop-file-utils
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 
@@ -115,6 +116,12 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
+- desktop-file-utils dependency removed from requires(post) and requires(postun)  
+
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
+- desktop-file-utils dependency added again
+
 * Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
 - desktop-file-utils dependency removed
 



From fedora-extras-commits at redhat.com  Sat Jan  7 10:23:02 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 05:23:02 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.3,1.4
Message-ID: <200601071023.k07ANhDp021218@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21199

Modified Files:
	streamtuner.spec 
Log Message:
sync specfile with FC-4


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
+++ streamtuner.spec	7 Jan 2006 10:23:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 7%{?dist}
+Release: 9%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -12,10 +12,11 @@
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, bmp, xterm
-Requires(post): desktop-file-utils, scrollkeeper
-Requires(postun): desktop-file-utils, scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
+BuildRequires: desktop-file-utils
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 
@@ -115,6 +116,12 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
+- desktop-file-utils dependency removed from requires(post) and requires(postun)  
+
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
+- desktop-file-utils dependency added again
+
 * Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
 - desktop-file-utils dependency removed
 



From fedora-extras-commits at redhat.com  Sat Jan  7 17:58:56 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:58:56 -0500
Subject: rpms/geos - New directory
Message-ID: <200601071758.k07Hwwnh002328@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/geos

Log Message:
Directory /cvs/extras/rpms/geos added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 17:59:02 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:59:02 -0500
Subject: rpms/geos/devel - New directory
Message-ID: <200601071759.k07Hx4L3002343@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/geos/devel

Log Message:
Directory /cvs/extras/rpms/geos/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 17:59:23 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:59:23 -0500
Subject: rpms/geos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601071759.k07HxPcZ002377@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365

Added Files:
	Makefile import.log 
Log Message:
Setup of module geos


--- NEW FILE Makefile ---
# Top level Makefile for module geos
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan  7 17:59:29 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:59:29 -0500
Subject: rpms/geos/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601071759.k07HxVVT002397@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module geos


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan  7 18:00:41 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 13:00:41 -0500
Subject: rpms/geos import.log,1.1,1.2
Message-ID: <200601071801.k07I1CNt004121@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2445

Modified Files:
	import.log 
Log Message:
auto-import geos-2.2.1-1 on branch devel from geos-2.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geos/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jan 2006 17:59:23 -0000	1.1
+++ import.log	7 Jan 2006 18:00:40 -0000	1.2
@@ -0,0 +1 @@
+geos-2_2_1-1:HEAD:geos-2.2.1-1.src.rpm:1136656826



From fedora-extras-commits at redhat.com  Sat Jan  7 18:00:46 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 13:00:46 -0500
Subject: rpms/geos/devel geos-config.in.patch, NONE, 1.1 geos.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601071801.k07I1Lxi004125@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	geos-config.in.patch geos.spec 
Log Message:
auto-import geos-2.2.1-1 on branch devel from geos-2.2.1-1.src.rpm

geos-config.in.patch:

--- NEW FILE geos-config.in.patch ---
--- tools/geos-config.in~	2006-01-05 16:55:49.000000000 -0800
+++ tools/geos-config.in	2006-01-05 16:56:33.000000000 -0800
@@ -32,13 +32,13 @@
     echo @VERSION@
      ;;
     --cflags)
-    echo -I at prefix@/include 
+    echo 
       ;;
     --libs)
-      echo -L at prefix@/lib -lgeos
+      echo -lgeos
       ;;
     --ldflags)
-      echo -L at prefix@/lib
+      echo 
       ;;
     --includes)
       echo @prefix@/include


--- NEW FILE geos.spec ---
Name: geos
Version: 2.2.1
Release: 1
Summary: GEOS is a C++ port of the Java Topology Suite

Group: Applications/Engineering
License: LGPL
URL: http://geos.refractions.net
Source0: http://geos.refractions.net/%{name}-%{version}.tar.bz2
Patch0: geos-config.in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen

%description
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
Suite (JTS). As such, it aims to contain the complete functionality of 
JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial 
predicate functions and spatial operators, as well as specific JTS topology 
functions such as IsValid()

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

%description devel
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
Suite (JTS). As such, it aims to contain the complete functionality of 
JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial 
predicate functions and spatial operators, as well as specific JTS topology 
functions such as IsValid()

This package contains the development files to build applications that 
use GEOS

%prep
%setup -q
%patch0 -p0 -b .buildroot 

%build
%configure --disable-static --disable-dependency-tracking
make %{?_smp_mflags}

# Make doxygen documentation files
cd doc
make doxygen-html

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_libdir}/libgeos*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/doxygen_docs
%{_bindir}/geos-config
%{_includedir}/*
%{_libdir}/*.so
%exclude %{_bindir}/XMLTester
%exclude %{_libdir}/*.la

%changelog
* Sat Dec 31 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-1
- Updated to address review comments in bug 17039

* Fri Dec 30 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2006 17:59:29 -0000	1.1
+++ .cvsignore	7 Jan 2006 18:00:46 -0000	1.2
@@ -0,0 +1 @@
+geos-2.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2006 17:59:29 -0000	1.1
+++ sources	7 Jan 2006 18:00:46 -0000	1.2
@@ -0,0 +1 @@
+272132bfb64422915d0f748f5e26932b  geos-2.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan  7 18:06:37 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 13:06:37 -0500
Subject: owners owners.list,1.510,1.511
Message-ID: <200601071807.k07I7AVJ004211@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4194

Modified Files:
	owners.list 
Log Message:
Added entry for geos



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -r1.510 -r1.511
--- owners.list	7 Jan 2006 05:25:58 -0000	1.510
+++ owners.list	7 Jan 2006 18:06:15 -0000	1.511
@@ -265,6 +265,7 @@
 Fedora Extras|gentium-fonts|SIL Gentium fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|geos|GEOS is a C++ port of the Java Topology Suite|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gfontview|A font viewer for Type 1 and TrueType fonts|mpeters at mac.com|extras-qa at fedoraproject.org|ksfiles at gmail.com
 Fedora Extras|gforth|Fast and portable implementation of the ANS Forth language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ghasher|GUI hasher for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan  7 21:09:32 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 16:09:32 -0500
Subject: rpms/istanbul/devel istanbul.spec,1.2,1.3
Message-ID: <200601072110.k07LA7vR009608@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/istanbul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9582

Modified Files:
	istanbul.spec 
Log Message:
* Sat Jan 07 2006 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-6
- Change requirements to gstreamer08* to match rawhide change



Index: istanbul.spec
===================================================================
RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- istanbul.spec	18 Aug 2005 22:22:57 -0000	1.2
+++ istanbul.spec	7 Jan 2006 21:09:29 -0000	1.3
@@ -8,27 +8,23 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.1.1 
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
 Source: http://http://live.hujjat.org/istanbul-%{version}.tar.bz2
-#Patch0: istanbul-0.1.0-pythondir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: pygtk2 >= %{pygtk2_version}
 Requires: gnome-desktop >= 2.6.0
-Requires: gstreamer >= %gstreamer_version
-Requires: gstreamer-plugins >= %gstreamer_plugins_version
+Requires: gstreamer08 >= %gstreamer_version
+Requires: gstreamer08-plugins >= %gstreamer_plugins_version
 Requires: gstreamer-python
 
 BuildRequires: python, python-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gstreamer-plugins-devel >= %gstreamer_plugins_version
-BuildRequires: gstreamer-python-devel, gtk2-devel 
-#BuildRequires: gstreamer-devel >= %gstreamer_version
-#BuildRequires: automake, autoconf 
-#BuildRequires: gnome-common
+BuildRequires: gstreamer08-plugins-devel >= %gstreamer_plugins_version
+BuildRequires: gstreamer08-python-devel, gtk2-devel 
 
 %description
 Istanbul is a desktop session recorder.  You can use it to record your 
@@ -96,6 +92,9 @@
 %{python_sitelib}/%{name}/configure/*.py*
 
 %changelog
+* Sat Jan 07 2006 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-6
+- Change requirements to gstreamer08* to match rawhide change
+
 * Thu Aug 18 2005 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Jan  7 21:48:31 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 16:48:31 -0500
Subject: rpms/glabels import.log,1.2,1.3
Message-ID: <200601072149.k07Ln3ps009869@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	import.log 
Log Message:
auto-import glabels-2.0.4-1 on branch devel from glabels-2.0.4-1.src.rpm
update to new stable version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glabels/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Jul 2005 14:35:20 -0000	1.2
+++ import.log	7 Jan 2006 21:48:31 -0000	1.3
@@ -1 +1,2 @@
 glabels-2_0_3-1:HEAD:glabels-2.0.3-1.src.rpm:1120660509
+glabels-2_0_4-1:HEAD:glabels-2.0.4-1.src.rpm:1136670507



From fedora-extras-commits at redhat.com  Sat Jan  7 21:48:37 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 16:48:37 -0500
Subject: rpms/glabels/devel .cvsignore, 1.2, 1.3 glabels.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601072149.k07Ln9UQ009874@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835/devel

Modified Files:
	.cvsignore glabels.spec sources 
Log Message:
auto-import glabels-2.0.4-1 on branch devel from glabels-2.0.4-1.src.rpm
update to new stable version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glabels/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jul 2005 14:35:20 -0000	1.2
+++ .cvsignore	7 Jan 2006 21:48:37 -0000	1.3
@@ -1 +1 @@
-glabels-2.0.3.tar.gz
+glabels-2.0.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/extras/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glabels.spec	18 Aug 2005 22:11:38 -0000	1.3
+++ glabels.spec	7 Jan 2006 21:48:37 -0000	1.4
@@ -1,12 +1,12 @@
 Name: glabels
-Version: 2.0.3
-Release: 3%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: A program for creating labels and business cards for GNOME
 
 Group: Applications/Publishing
 License: GPL
 URL: http://glabels.sf.net
-Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz
+Source0: http://dl.sf.net/glabels/glabels-2.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1
@@ -99,6 +99,9 @@
 %exclude %{_libdir}/libglabels.la
 
 %changelog
+* Sat Jan 01 2006 Jef Spaleta <jspaleta at gmail.com> - 2.0.4-1
+- Update to new stable upstream version
+
 * Thu Aug 18 2005 Jef Spaleta <jspaleta at gmail.com> - 2.0.3-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glabels/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jul 2005 14:35:20 -0000	1.2
+++ sources	7 Jan 2006 21:48:37 -0000	1.3
@@ -1 +1 @@
-c077afdeac5ba0c685e404eea1d794e8  glabels-2.0.3.tar.gz
+76a6f1f8055f75ab4204fdca79627006  glabels-2.0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan  7 22:38:38 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 17:38:38 -0500
Subject: rpms/glabels import.log,1.3,1.4
Message-ID: <200601072239.k07MdAk0011876@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842

Modified Files:
	import.log 
Log Message:
auto-import glabels-2.0.4-1 on branch FC-4 from glabels-2.0.4-1.src.rpm
update to new stable version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glabels/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 Jan 2006 21:48:31 -0000	1.3
+++ import.log	7 Jan 2006 22:38:38 -0000	1.4
@@ -1,2 +1,3 @@
 glabels-2_0_3-1:HEAD:glabels-2.0.3-1.src.rpm:1120660509
 glabels-2_0_4-1:HEAD:glabels-2.0.4-1.src.rpm:1136670507
+glabels-2_0_4-1:FC-4:glabels-2.0.4-1.src.rpm:1136673514



From fedora-extras-commits at redhat.com  Sat Jan  7 22:38:44 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 17:38:44 -0500
Subject: rpms/glabels/FC-4 .cvsignore, 1.2, 1.3 glabels.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601072239.k07MdGR4011881@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842/FC-4

Modified Files:
	.cvsignore glabels.spec sources 
Log Message:
auto-import glabels-2.0.4-1 on branch FC-4 from glabels-2.0.4-1.src.rpm
update to new stable version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glabels/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jul 2005 14:35:20 -0000	1.2
+++ .cvsignore	7 Jan 2006 22:38:43 -0000	1.3
@@ -1 +1 @@
-glabels-2.0.3.tar.gz
+glabels-2.0.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/extras/rpms/glabels/FC-4/glabels.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glabels.spec	8 Jul 2005 04:16:32 -0000	1.2
+++ glabels.spec	7 Jan 2006 22:38:43 -0000	1.3
@@ -1,12 +1,12 @@
 Name: glabels
-Version: 2.0.3
-Release: 2%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: A program for creating labels and business cards for GNOME
 
 Group: Applications/Publishing
 License: GPL
 URL: http://glabels.sf.net
-Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz
+Source0: http://dl.sf.net/glabels/glabels-2.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1
@@ -99,6 +99,12 @@
 %exclude %{_libdir}/libglabels.la
 
 %changelog
+* Sat Jan 01 2006 Jef Spaleta <jspaleta at gmail.com> - 2.0.4-1
+- Update to new stable upstream version
+
+* Thu Aug 18 2005 Jef Spaleta <jspaleta at gmail.com> - 2.0.3-3
+- rebuild
+
 * Thu Jul 7 2005 Jef Spaleta <jspaleta at gmail.com> - 2.0.3-2
 - use Source0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glabels/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jul 2005 14:35:20 -0000	1.2
+++ sources	7 Jan 2006 22:38:43 -0000	1.3
@@ -1 +1 @@
-c077afdeac5ba0c685e404eea1d794e8  glabels-2.0.3.tar.gz
+76a6f1f8055f75ab4204fdca79627006  glabels-2.0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan  7 23:15:33 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Jan 2006 18:15:33 -0500
Subject: rpms/wine/devel wine.spec,1.8,1.9
Message-ID: <200601072316.k07NG64x013851@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13832

Modified Files:
	wine.spec 
Log Message:
- more new BR



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine.spec	6 Jan 2006 12:58:02 -0000	1.8
+++ wine.spec	7 Jan 2006 23:15:33 -0000	1.9
@@ -48,13 +48,15 @@
 BuildRequires:  fontforge
 # modular x
 BuildRequires:  libX11-devel
-BuildRequires:  mesa-libGL-devel mesa-libGLU-devel mesa-libGLw-devel
+BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
 
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXi-devel
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database



From fedora-extras-commits at redhat.com  Sun Jan  8 04:36:19 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat,  7 Jan 2006 23:36:19 -0500
Subject: rpms/nethack-vultures/FC-3 .cvsignore, 1.4,
	1.5 nethack-vultures.spec, 1.14, 1.15 sources, 1.4, 1.5
Message-ID: <200601080436.k084apnl023195@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23140/FC-3

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgrade tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2005 17:29:25 -0000	1.4
+++ .cvsignore	8 Jan 2006 04:36:18 -0000	1.5
@@ -1 +1 @@
-vultures-1.11.1-full.tar.bz2
+vultures-1.11.2-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nethack-vultures.spec	24 Dec 2005 06:48:06 -0000	1.14
+++ nethack-vultures.spec	8 Jan 2006 04:36:18 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.1
-Release:        3%{?dist}
+Version:        1.11.2
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
+- Upgraded the tarball to the latest version.
+
 * Fri Dec 23 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.1-3
 - Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2005 17:29:25 -0000	1.4
+++ sources	8 Jan 2006 04:36:18 -0000	1.5
@@ -1 +1 @@
-d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2
+2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  8 04:36:25 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat,  7 Jan 2006 23:36:25 -0500
Subject: rpms/nethack-vultures/FC-4 .cvsignore, 1.4,
	1.5 nethack-vultures.spec, 1.15, 1.16 sources, 1.4, 1.5
Message-ID: <200601080436.k084awrv023200@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23140/FC-4

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgrade tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2005 17:29:31 -0000	1.4
+++ .cvsignore	8 Jan 2006 04:36:25 -0000	1.5
@@ -1 +1 @@
-vultures-1.11.1-full.tar.bz2
+vultures-1.11.2-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack-vultures.spec	24 Dec 2005 06:48:13 -0000	1.15
+++ nethack-vultures.spec	8 Jan 2006 04:36:25 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.1
-Release:        3%{?dist}
+Version:        1.11.2
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
+- Upgraded the tarball to the latest version.
+
 * Fri Dec 23 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.1-3
 - Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2005 17:29:31 -0000	1.4
+++ sources	8 Jan 2006 04:36:25 -0000	1.5
@@ -1 +1 @@
-d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2
+2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  8 04:36:31 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat,  7 Jan 2006 23:36:31 -0500
Subject: rpms/nethack-vultures/devel .cvsignore, 1.5,
	1.6 nethack-vultures.spec, 1.15, 1.16 sources, 1.4, 1.5
Message-ID: <200601080437.k084b33K023205@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23140/devel

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgrade tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 17:29:37 -0000	1.5
+++ .cvsignore	8 Jan 2006 04:36:31 -0000	1.6
@@ -1 +1 @@
-vultures-1.11.1-full.tar.bz2
+vultures-1.11.2-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack-vultures.spec	24 Dec 2005 06:48:19 -0000	1.15
+++ nethack-vultures.spec	8 Jan 2006 04:36:31 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.1
-Release:        3%{?dist}
+Version:        1.11.2
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
+- Upgraded the tarball to the latest version.
+
 * Fri Dec 23 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.1-3
 - Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2005 17:29:37 -0000	1.4
+++ sources	8 Jan 2006 04:36:31 -0000	1.5
@@ -1 +1 @@
-d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2
+2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  8 06:37:24 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 01:37:24 -0500
Subject: rpms/obby/FC-4 obby.spec,1.8,1.9
Message-ID: <200601080637.k086bvGo027023@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27002

Modified Files:
	obby.spec 
Log Message:
rebuild


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- obby.spec	4 Jan 2006 04:32:58 -0000	1.8
+++ obby.spec	8 Jan 2006 06:37:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           obby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Rebuild
+
 * Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 - Remove broken build workarounds



From fedora-extras-commits at redhat.com  Sun Jan  8 06:48:17 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 01:48:17 -0500
Subject: rpms/obby/FC-4 obby.spec,1.9,1.10
Message-ID: <200601080648.k086mn2o027156@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27139

Modified Files:
	obby.spec 
Log Message:
typos


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- obby.spec	8 Jan 2006 06:37:24 -0000	1.9
+++ obby.spec	8 Jan 2006 06:48:17 -0000	1.10
@@ -65,10 +65,10 @@
 
 
 %changelog
-* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
 - Rebuild
 
-* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+* Tue Jan 03 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 - Remove broken build workarounds
 



From fedora-extras-commits at redhat.com  Sun Jan  8 06:49:29 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 01:49:29 -0500
Subject: rpms/gobby/FC-4 .cvsignore, 1.2, 1.3 gobby.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601080650.k086o1BS027189@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27168

Modified Files:
	.cvsignore gobby.spec sources 
Log Message:
0.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Oct 2005 19:13:54 -0000	1.2
+++ .cvsignore	8 Jan 2006 06:49:29 -0000	1.3
@@ -1 +1 @@
-gobby-0.2.2.tar.gz
+gobby-0.3.0.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gobby.spec	22 Oct 2005 01:47:16 -0000	1.2
+++ gobby.spec	8 Jan 2006 06:49:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gobby
-Version:        0.2.2
-Release:        6%{?dist}
+Version:        0.3.0
+Release:        4%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -62,10 +62,22 @@
 %doc README NEWS AUTHORS COPYING ChangeLog TODO
 %{_bindir}/gobby
 %{_datadir}/applications/fedora-gobby.desktop
-%{_datadir}/pixmaps/gobby.png
+%{_datadir}/pixmaps/*
 
 
 %changelog
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
+- Rebuild
+
+* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Add libXau-devel to BuildRequires
+
+* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
+- Bump to 0.3.0rc3
+
 * Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
 - Update Summary
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Oct 2005 19:13:54 -0000	1.2
+++ sources	8 Jan 2006 06:49:29 -0000	1.3
@@ -1 +1 @@
-9a1b61ee3aebe737e5d9918f7601b5d4  gobby-0.2.2.tar.gz
+1b674f42654cc1960d37e0a6a2fcff1f  gobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 07:16:37 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 02:16:37 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.3,1.4
Message-ID: <200601080717.k087H9BW029060@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29034

Modified Files:
	gobby.spec 
Log Message:
update BR


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gobby.spec	8 Jan 2006 06:49:29 -0000	1.3
+++ gobby.spec	8 Jan 2006 07:16:36 -0000	1.4
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
+BuildRequires:  desktop-file-utils
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils



From fedora-extras-commits at redhat.com  Sun Jan  8 07:25:52 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 02:25:52 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.4,1.5
Message-ID: <200601080726.k087QO5W029224@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29207

Modified Files:
	gobby.spec 
Log Message:
rebuild


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gobby.spec	8 Jan 2006 07:16:36 -0000	1.4
+++ gobby.spec	8 Jan 2006 07:25:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -66,7 +66,29 @@
 
 
 %changelog
-* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-5
+- Rebuild
+
+* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Add libXau-devel to BuildRequires
+
+* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
+- Bump to 0.3.0rc3
+
+* Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
+- Update Summary
+
+* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-5
+- Use desktop-file-install to install the desktop file
+
+* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-4
+- Add desktop-file-utils to Requires(post/postun) and remove howl-devel BR
+
+* Fri Oct 07 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-3
+- Build with gnome support
 - Rebuild
 
 * Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2



From fedora-extras-commits at redhat.com  Sun Jan  8 09:06:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Jan 2006 04:06:39 -0500
Subject: rpms/wine/FC-3 wine-CVE-2005-4560.patch,NONE,1.1 wine.spec,1.5,1.6
Message-ID: <200601080907.k0897hgn000892@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828/FC-3

Modified Files:
	wine.spec 
Added Files:
	wine-CVE-2005-4560.patch 
Log Message:
- fix CVE-2005-4560


wine-CVE-2005-4560.patch:

--- NEW FILE wine-CVE-2005-4560.patch ---
===================================================================
RCS file: /home/wine/wine/dlls/gdi/metafile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- wine/dlls/gdi/metafile.c	2006/01/03 12:43:52	1.11
+++ wine/dlls/gdi/metafile.c	2006/01/06 20:52:46	1.12
@@ -863,6 +863,13 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc,
         break;
 
     case META_ESCAPE:
+        switch (mr->rdParm[0]) {
+        case GETSCALINGFACTOR: /* get function ... would just NULL dereference */
+             return FALSE;
+        case SETABORTPROC:
+             FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");
+             return FALSE;
+        }
         Escape(hdc, mr->rdParm[0], mr->rdParm[1], (LPCSTR)&mr->rdParm[2], NULL);
         break;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wine.spec	6 Jan 2006 11:00:54 -0000	1.5
+++ wine.spec	8 Jan 2006 09:06:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -19,6 +19,8 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
+# CVS-2005-4560 wmf exploit
+Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -45,6 +47,7 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fontforge
+BuildRequires:  cups-devel
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
@@ -143,6 +146,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
+%patch100 -p1
 autoconf
 
 %build
@@ -675,10 +679,15 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-2
+- fix for CVE-2005-4560
+- add fix BR from devel
+
 * Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-1
 - version upgrade
-- fix #177089
+- fix #177089 (winemine desktop entry should be in Game not in System)
 
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-5



From fedora-extras-commits at redhat.com  Sun Jan  8 09:07:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Jan 2006 04:07:13 -0500
Subject: rpms/wine/devel wine-CVE-2005-4560.patch, NONE, 1.1 wine.spec, 1.9,
	1.10
Message-ID: <200601080907.k0897kXP000895@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828/devel

Modified Files:
	wine.spec 
Added Files:
	wine-CVE-2005-4560.patch 
Log Message:
- fix CVE-2005-4560


wine-CVE-2005-4560.patch:

--- NEW FILE wine-CVE-2005-4560.patch ---
===================================================================
RCS file: /home/wine/wine/dlls/gdi/metafile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- wine/dlls/gdi/metafile.c	2006/01/03 12:43:52	1.11
+++ wine/dlls/gdi/metafile.c	2006/01/06 20:52:46	1.12
@@ -863,6 +863,13 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc,
         break;
 
     case META_ESCAPE:
+        switch (mr->rdParm[0]) {
+        case GETSCALINGFACTOR: /* get function ... would just NULL dereference */
+             return FALSE;
+        case SETABORTPROC:
+             FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");
+             return FALSE;
+        }
         Escape(hdc, mr->rdParm[0], mr->rdParm[1], (LPCSTR)&mr->rdParm[2], NULL);
         break;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wine.spec	7 Jan 2006 23:15:33 -0000	1.9
+++ wine.spec	8 Jan 2006 09:07:13 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		wine
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -21,6 +21,10 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
+# CVS-2005-4560 wmf exploit from wine cvs
+# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
+Patch100:       wine-CVE-2005-4560.patch
+
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch: %{ix86}
@@ -155,6 +159,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
+%patch100 -p1
 autoconf
 
 %build
@@ -688,6 +693,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-2
+- fix for CVE-2005-4560
+
 * Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Jan  8 09:06:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Jan 2006 04:06:46 -0500
Subject: rpms/wine/FC-4 wine-CVE-2005-4560.patch,NONE,1.1 wine.spec,1.7,1.8
Message-ID: <200601080908.k0898DO3000898@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828/FC-4

Modified Files:
	wine.spec 
Added Files:
	wine-CVE-2005-4560.patch 
Log Message:
- fix CVE-2005-4560


wine-CVE-2005-4560.patch:

--- NEW FILE wine-CVE-2005-4560.patch ---
===================================================================
RCS file: /home/wine/wine/dlls/gdi/metafile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- wine/dlls/gdi/metafile.c	2006/01/03 12:43:52	1.11
+++ wine/dlls/gdi/metafile.c	2006/01/06 20:52:46	1.12
@@ -863,6 +863,13 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc,
         break;
 
     case META_ESCAPE:
+        switch (mr->rdParm[0]) {
+        case GETSCALINGFACTOR: /* get function ... would just NULL dereference */
+             return FALSE;
+        case SETABORTPROC:
+             FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");
+             return FALSE;
+        }
         Escape(hdc, mr->rdParm[0], mr->rdParm[1], (LPCSTR)&mr->rdParm[2], NULL);
         break;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine.spec	6 Jan 2006 11:01:00 -0000	1.7
+++ wine.spec	8 Jan 2006 09:06:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -19,6 +19,9 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
+# CVS-2005-4560 wmf exploit from wine cvs
+# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
+Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -45,6 +48,7 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fontforge
+BuildRequires:  cups-devel
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
@@ -143,6 +147,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
+%patch100 -p1
 autoconf
 
 %build
@@ -675,6 +680,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-2
+- fix for CVE-2005-4560
+- add fix BR from devel
+
 * Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Jan  8 12:52:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:52:32 -0500
Subject: rpms/perl-Net-Server import.log,1.4,1.5
Message-ID: <200601081253.k08Cr5tp010368@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.90-1.fc5 on branch devel from perl-Net-Server-0.90-1.fc5.src.rpm
0.90 + Multiplex


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:06:35 -0000	1.4
+++ import.log	8 Jan 2006 12:52:32 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Net-Server-0_87-0_fdr_2_rh90:HEAD:perl-Net-Server-0.87-0.fdr.2.rh90.src.rpm:1099890383
 perl-Net-Server-0_87-0_fdr_2_1:HEAD:perl-Net-Server-0.87-0.fdr.2.1.src.rpm:1099890389
 perl-Net-Server-0_87-0_fdr_2_2:HEAD:perl-Net-Server-0.87-0.fdr.2.2.src.rpm:1099890395
+perl-Net-Server-0_90-1_fc5:HEAD:perl-Net-Server-0.90-1.fc5.src.rpm:1136724741



From fedora-extras-commits at redhat.com  Sun Jan  8 12:52:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:52:38 -0500
Subject: rpms/perl-Net-Server/devel .cvsignore, 1.3, 1.4 perl-Net-Server.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601081253.k08CrBsO010373@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324/devel

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.90-1.fc5 on branch devel from perl-Net-Server-0.90-1.fc5.src.rpm
0.90 + Multiplex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jun 2005 05:53:27 -0000	1.3
+++ .cvsignore	8 Jan 2006 12:52:38 -0000	1.4
@@ -1 +1 @@
-Net-Server-0.88.tar.gz
+Net-Server-0.90.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Net-Server.spec	23 Jun 2005 05:53:27 -0000	1.9
+++ perl-Net-Server.spec	8 Jan 2006 12:52:38 -0000	1.10
@@ -1,19 +1,22 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.88
+Version: 0.90
 Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
 License:   Artistic
-URL:       http://perl-net-server.sourceforge.net/
+URL:       http://search.cpan.org/dist/Net-Server/
 Source:    http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 BuildRequires: perl
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# IO::Multiplex support is optional, but since it's in FE and not including it 
+# causes build problems in some packages...
+Requires:      perl(IO::Multiplex)
 
 
 %description
@@ -58,6 +61,10 @@
 
 
 %changelog
+* Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
+- Updated to 0.90
+- add IO::Multiplex dep
+
 * Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0.88-1
 - Updated to 0.88, fixes remote format string vulnerability
 - Remove perl macros integrated in rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2005 05:53:27 -0000	1.3
+++ sources	8 Jan 2006 12:52:38 -0000	1.4
@@ -1 +1 @@
-f068d68fb3ccac2ee93860d1fcdbdb4e  Net-Server-0.88.tar.gz
+6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 12:54:47 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:54:47 -0500
Subject: rpms/perl-Net-Server import.log,1.5,1.6
Message-ID: <200601081255.k08CtJX1010477@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10443

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.90-1.fc4 on branch FC-4 from perl-Net-Server-0.90-1.fc4.src.rpm
0.90 + Multiplex


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Jan 2006 12:52:32 -0000	1.5
+++ import.log	8 Jan 2006 12:54:47 -0000	1.6
@@ -2,3 +2,4 @@
 perl-Net-Server-0_87-0_fdr_2_1:HEAD:perl-Net-Server-0.87-0.fdr.2.1.src.rpm:1099890389
 perl-Net-Server-0_87-0_fdr_2_2:HEAD:perl-Net-Server-0.87-0.fdr.2.2.src.rpm:1099890395
 perl-Net-Server-0_90-1_fc5:HEAD:perl-Net-Server-0.90-1.fc5.src.rpm:1136724741
+perl-Net-Server-0_90-1_fc4:FC-4:perl-Net-Server-0.90-1.fc4.src.rpm:1136724876



From fedora-extras-commits at redhat.com  Sun Jan  8 12:54:53 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:54:53 -0500
Subject: rpms/perl-Net-Server/FC-4 .cvsignore, 1.3, 1.4 perl-Net-Server.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601081255.k08CtPE2010482@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10443/FC-4

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.90-1.fc4 on branch FC-4 from perl-Net-Server-0.90-1.fc4.src.rpm
0.90 + Multiplex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jun 2005 05:53:26 -0000	1.3
+++ .cvsignore	8 Jan 2006 12:54:53 -0000	1.4
@@ -1 +1 @@
-Net-Server-0.88.tar.gz
+Net-Server-0.90.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/perl-Net-Server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Net-Server.spec	23 Jun 2005 05:53:26 -0000	1.9
+++ perl-Net-Server.spec	8 Jan 2006 12:54:53 -0000	1.10
@@ -1,19 +1,22 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.88
+Version: 0.90
 Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
 License:   Artistic
-URL:       http://perl-net-server.sourceforge.net/
+URL:       http://search.cpan.org/dist/Net-Server/
 Source:    http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 BuildRequires: perl
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# IO::Multiplex support is optional, but since it's in FE and not including it 
+# causes build problems in some packages...
+Requires:      perl(IO::Multiplex)
 
 
 %description
@@ -58,6 +61,10 @@
 
 
 %changelog
+* Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
+- Updated to 0.90
+- add IO::Multiplex dep
+
 * Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0.88-1
 - Updated to 0.88, fixes remote format string vulnerability
 - Remove perl macros integrated in rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2005 05:53:26 -0000	1.3
+++ sources	8 Jan 2006 12:54:53 -0000	1.4
@@ -1 +1 @@
-f068d68fb3ccac2ee93860d1fcdbdb4e  Net-Server-0.88.tar.gz
+6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 12:56:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:56:36 -0500
Subject: rpms/perl-Net-Server import.log,1.6,1.7
Message-ID: <200601081257.k08Cv8F3010577@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10543

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.90-1.fc3 on branch FC-3 from perl-Net-Server-0.90-1.fc3.src.rpm
0.90 + Multiplex


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	8 Jan 2006 12:54:47 -0000	1.6
+++ import.log	8 Jan 2006 12:56:35 -0000	1.7
@@ -3,3 +3,4 @@
 perl-Net-Server-0_87-0_fdr_2_2:HEAD:perl-Net-Server-0.87-0.fdr.2.2.src.rpm:1099890395
 perl-Net-Server-0_90-1_fc5:HEAD:perl-Net-Server-0.90-1.fc5.src.rpm:1136724741
 perl-Net-Server-0_90-1_fc4:FC-4:perl-Net-Server-0.90-1.fc4.src.rpm:1136724876
+perl-Net-Server-0_90-1_fc3:FC-3:perl-Net-Server-0.90-1.fc3.src.rpm:1136724984



From fedora-extras-commits at redhat.com  Sun Jan  8 12:56:46 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:56:46 -0500
Subject: rpms/perl-Net-Server/FC-3 .cvsignore, 1.3, 1.4 perl-Net-Server.spec,
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200601081257.k08CvIFb010582@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10543/FC-3

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.90-1.fc3 on branch FC-3 from perl-Net-Server-0.90-1.fc3.src.rpm
0.90 + Multiplex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jun 2005 05:53:26 -0000	1.3
+++ .cvsignore	8 Jan 2006 12:56:46 -0000	1.4
@@ -1 +1 @@
-Net-Server-0.88.tar.gz
+Net-Server-0.90.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-3/perl-Net-Server.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-Server.spec	23 Jun 2005 05:53:26 -0000	1.6
+++ perl-Net-Server.spec	8 Jan 2006 12:56:46 -0000	1.7
@@ -1,20 +1,22 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.88
+Version: 0.90
 Release: 1%{?dist}
-Epoch:   0
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
 License:   Artistic
-URL:       http://perl-net-server.sourceforge.net/
+URL:       http://search.cpan.org/dist/Net-Server/
 Source:    http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 BuildRequires: perl
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# IO::Multiplex support is optional, but since it's in FE and not including it 
+# causes build problems in some packages...
+Requires:      perl(IO::Multiplex)
 
 
 %description
@@ -59,11 +61,18 @@
 
 
 %changelog
-* Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0:0.88-1
+* Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
+- Updated to 0.90
+- add IO::Multiplex dep
+
+* Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0.88-1
 - Updated to 0.88, fixes remote format string vulnerability
 - Remove perl macros integrated in rpm
 - merge fedora perl template changes
 
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.87-4
+- rebuilt
+
 * Fri Feb 11 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:0.87-3
 - Use perl_vendorlib macro; Fixes x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2005 05:53:26 -0000	1.3
+++ sources	8 Jan 2006 12:56:46 -0000	1.4
@@ -1 +1 @@
-f068d68fb3ccac2ee93860d1fcdbdb4e  Net-Server-0.88.tar.gz
+6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 15:12:25 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 10:12:25 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.16,1.17
Message-ID: <200601081512.k08FCvIm016129@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped revision to get it to build on the server properly.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nethack-vultures.spec	8 Jan 2006 04:36:25 -0000	1.16
+++ nethack-vultures.spec	8 Jan 2006 15:12:25 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
+- Upped revision to try to get package to build on the server.
+
 * Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
 - Upgraded the tarball to the latest version.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 15:12:46 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 10:12:46 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.16,1.17
Message-ID: <200601081513.k08FDIPn016132@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped revision to get it to build on the server properly.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nethack-vultures.spec	8 Jan 2006 04:36:31 -0000	1.16
+++ nethack-vultures.spec	8 Jan 2006 15:12:45 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
+- Upped revision to try to get package to build on the server.
+
 * Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
 - Upgraded the tarball to the latest version.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 15:12:18 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 10:12:18 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.15,1.16
Message-ID: <200601081513.k08FDLS3016135@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped revision to get it to build on the server properly.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack-vultures.spec	8 Jan 2006 04:36:18 -0000	1.15
+++ nethack-vultures.spec	8 Jan 2006 15:12:15 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
+- Upped revision to try to get package to build on the server.
+
 * Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
 - Upgraded the tarball to the latest version.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 16:31:54 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 11:31:54 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.16,1.17
Message-ID: <200601081632.k08GWQZv018179@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Trying to work around a strange plague build error on the guidebook that I
don't get locally.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nethack-vultures.spec	8 Jan 2006 15:12:15 -0000	1.16
+++ nethack-vultures.spec	8 Jan 2006 16:31:53 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
+- Upped revision for consistancy with FC-4 and devel builds.
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 16:32:00 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 11:32:00 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.17,1.18
Message-ID: <200601081632.k08GWW7d018182@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Trying to work around a strange plague build error on the guidebook that I
don't get locally.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nethack-vultures.spec	8 Jan 2006 15:12:25 -0000	1.17
+++ nethack-vultures.spec	8 Jan 2006 16:31:59 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -21,6 +21,7 @@
 BuildRequires:  flex
 BuildRequires:  desktop-file-utils
 BuildRequires:  groff
+BuildRequires:  util-linux
 Requires:       /usr/bin/bzip2
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
@@ -163,6 +164,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
+- To fix a strange error on the plague server, added a req for util-linux.
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 16:32:06 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 11:32:06 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.17,1.18
Message-ID: <200601081632.k08GWcDd018185@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Trying to work around a strange plague build error on the guidebook that I
don't get locally.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nethack-vultures.spec	8 Jan 2006 15:12:45 -0000	1.17
+++ nethack-vultures.spec	8 Jan 2006 16:32:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -21,6 +21,7 @@
 BuildRequires:  flex
 BuildRequires:  desktop-file-utils
 BuildRequires:  groff
+BuildRequires:  util-linux
 Requires:       /usr/bin/bzip2
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
@@ -163,6 +164,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
+- To fix a strange error on the plague server, added a req for util-linux.
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 17:13:51 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:13:51 -0500
Subject: rpms/clearsilver - New directory
Message-ID: <200601081713.k08HDrb3020270@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20262/clearsilver

Log Message:
Directory /cvs/extras/rpms/clearsilver added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:13:57 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:13:57 -0500
Subject: rpms/clearsilver/devel - New directory
Message-ID: <200601081713.k08HDxoU020285@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20262/clearsilver/devel

Log Message:
Directory /cvs/extras/rpms/clearsilver/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:14:18 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:14:18 -0500
Subject: rpms/clearsilver Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601081714.k08HEKFU020319@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307

Added Files:
	Makefile import.log 
Log Message:
Setup of module clearsilver


--- NEW FILE Makefile ---
# Top level Makefile for module clearsilver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:14:24 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:14:24 -0500
Subject: rpms/clearsilver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601081714.k08HEQk3020337@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clearsilver


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:15:12 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:15:12 -0500
Subject: rpms/clearsilver import.log,1.1,1.2
Message-ID: <200601081715.k08HFi7D020415@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378

Modified Files:
	import.log 
Log Message:
auto-import clearsilver-0.10.2-2 on branch devel from clearsilver-0.10.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Jan 2006 17:14:17 -0000	1.1
+++ import.log	8 Jan 2006 17:15:12 -0000	1.2
@@ -0,0 +1 @@
+clearsilver-0_10_2-2:HEAD:clearsilver-0.10.2-2.src.rpm:1136740503



From fedora-extras-commits at redhat.com  Sun Jan  8 17:15:18 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:15:18 -0500
Subject: rpms/clearsilver/devel clearsilver-0.10.2-fedora.patch, NONE,
	1.1 clearsilver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601081715.k08HFowr020419@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clearsilver-0.10.2-fedora.patch clearsilver.spec 
Log Message:
auto-import clearsilver-0.10.2-2 on branch devel from clearsilver-0.10.2-2.src.rpm

clearsilver-0.10.2-fedora.patch:

--- NEW FILE clearsilver-0.10.2-fedora.patch ---
diff -Nur clearsilver-0.10.2.orig/cgi/cgi.c clearsilver-0.10.2/cgi/cgi.c
--- clearsilver-0.10.2.orig/cgi/cgi.c	2005-12-02 10:34:04.000000000 +0100
+++ clearsilver-0.10.2/cgi/cgi.c	2005-12-15 20:45:13.000000000 +0100
@@ -641,7 +641,7 @@
 
   if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL)
   {
-    debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d";
+    debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d";
   }
 
   if (!pid)
diff -Nur clearsilver-0.10.2.orig/configure clearsilver-0.10.2/configure
--- clearsilver-0.10.2.orig/configure	2005-12-15 01:26:08.000000000 +0100
+++ clearsilver-0.10.2/configure	2005-12-15 20:56:46.000000000 +0100
@@ -6002,7 +6002,7 @@
   echo "$as_me:$LINENO: checking for python includes" >&5
 echo $ECHO_N "checking for python includes... $ECHO_C" >&6
   python_inc=no
-  python_search_path="/neo/opt /usr/local /usr /c"
+  python_search_path="/usr"
   python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15"
   if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then
     python_bin=$cs_cv_python_path
@@ -6023,7 +6023,7 @@
 	  python_site=$path/lib/python$vers/site-packages
 	  break 2
 	fi
-			if test -f $path/python$vers/include/Python.h; then
+	if test -f $path/python$vers/include/Python.h; then
 	  python_inc=$path/python$vers/include
 	  python_lib="-L$path/python$vers/libs -lpython$vers"
 	  python_site=$path/python$vers/Lib/site-packages
@@ -6034,14 +6034,14 @@
   fi
   if test "x$python_inc" = "xno"; then
     echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+    echo "${ECHO_T}not found" >&6
     PYTHON=
     PYTHON_INC=
     PYTHON_LIB=
     PYTHON_SITE=
   else
     echo "$as_me:$LINENO: result: found $python_inc" >&5
-echo "${ECHO_T}found $python_inc" >&6
+    echo "${ECHO_T}found $python_inc" >&6
     PYTHON=$python_bin
     PYTHON_INC="-I$python_inc"
     PYTHON_LIB=$python_lib
@@ -6050,6 +6050,7 @@
     fi
     BUILD_WRAPPERS="$BUILD_WRAPPERS python"
   fi
+  PYTHON_SITE=`$python_bin -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"`
 fi
 
 cs_cv_perl=yes
@@ -6278,7 +6279,8 @@
 done
 _ACJNI_FOLLOWED="$_cur"
 
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
+#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
+_JTOPDIR="$java_path"
 case "$host_os" in
         darwin*)        _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
                         _JINC="$_JTOPDIR/Headers";;
diff -Nur clearsilver-0.10.2.orig/imd/imdm.py clearsilver-0.10.2/imd/imdm.py
--- clearsilver-0.10.2.orig/imd/imdm.py	2005-06-30 20:51:54.000000000 +0200
+++ clearsilver-0.10.2/imd/imdm.py	2005-12-15 20:45:14.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 #
 # imdm
 # 
diff -Nur clearsilver-0.10.2.orig/java-jni/Makefile clearsilver-0.10.2/java-jni/Makefile
--- clearsilver-0.10.2.orig/java-jni/Makefile	2005-12-02 11:35:28.000000000 +0100
+++ clearsilver-0.10.2/java-jni/Makefile	2005-12-15 20:45:13.000000000 +0100
@@ -37,14 +37,14 @@
 org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR)
 	$(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS
 
-CSTest.class: CSTest.java
+CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR)
 	$(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java
 
 gold: CSTest.class
 	@/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold
 	@echo "Generated gold files"
 
-test: CSTest.class
+test: CSTest.class $(NEO_UTIL_SO)
 	@echo "Running java test"
 	@failed=0; \
 	rm -f javatest.out; \
diff -Nur clearsilver-0.10.2.orig/ruby/Makefile clearsilver-0.10.2/ruby/Makefile
--- clearsilver-0.10.2.orig/ruby/Makefile	2005-12-02 11:35:52.000000000 +0100
+++ clearsilver-0.10.2/ruby/Makefile	2005-12-15 20:45:14.000000000 +0100
@@ -41,7 +41,7 @@
 
 
 install: all
-	$(RUBY) install.rb install
+	$(RUBY) install.rb install --prefix=$(DESTDIR)
 
 clean:
 	$(RM) ext/hdf/*.o ext/hdf/*.so
diff -Nur clearsilver-0.10.2.orig/scripts/document.py clearsilver-0.10.2/scripts/document.py
--- clearsilver-0.10.2.orig/scripts/document.py	2005-07-28 02:53:10.000000000 +0200
+++ clearsilver-0.10.2/scripts/document.py	2005-12-15 20:45:14.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 """
   document.py -- Simple script to generate manpages from C header
   files.  Looks for the following formatted C comments in the C header files:


--- NEW FILE clearsilver.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           clearsilver
Version:        0.10.2
Release:        2%{?dist}
Summary:        Fast and powerful HTML templating system
Group:          Development/Libraries
License:        Neotonic ClearSilver Software License
URL:            http://www.clearsilver.net/
Source0:        http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
Patch0:         %{name}-0.10.2-fedora.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  zlib-devel
Provides:       %{name}-devel = %{version}-%{release}

%description
ClearSilver is a fast, powerful, and language-neutral HTML template
system.  In both static content sites and dynamic HTML applications,
it provides a separation between presentation code and application
logic which makes working with your project easier.  The design of
ClearSilver began in 1999, and evolved during its use at onelist.com,
egroups.com, and Yahoo! Groups.  Today many other projects and
websites are using it.

%package        devel
Summary:        ClearSilver development package
Group:          Development/Libraries

%description devel
This package provides needed files to develop extensions
to ClearSilver.

%package     -n python-%{name}
Summary:        Python interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  python-devel >= 2.1
Provides:       %{name}-python = %{version}-%{release}

%description -n python-%{name}
%{summary}.

%package     -n perl-%{name}
Summary:        Perl interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  perl
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       %{name}-perl = %{version}-%{release}

%description -n perl-%{name}
%{summary}.

%ifarch %{ix86} ppc 
%package     -n ruby-%{name}
Summary:        Ruby interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  ruby
BuildRequires:  ruby-devel
Provides:       %{name}-ruby = %{version}-%{release}
%endif

%ifarch %{ix86} ppc 
%description -n ruby-%{name}
%{summary}.
%endif

%ifarch %{ix86} ppc
%package     -n java-%{name}
Summary:        Java interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  java-devel
Provides:       %{name}-java = %{version}-%{release}
%endif

%ifarch %{ix86} ppc 
%description -n java-%{name}
%{summary}.
%endif

%prep
%setup -q
%patch0 -p1
touch configure
sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py
find python/examples -type f | xargs chmod -x

%build
# java and ruby does not build on x86_64
%ifarch %{ix86} ppc 
%configure \
  --with-java=%{_libdir}/jvm/java \
  --with-python=%{__python} \
  --disable-csharp 
%else
%configure \
  --with-python=%{__python} \
  --disable-java \
  --disable-ruby \
  --disable-csharp
%endif
cd perl && %{__perl} Makefile.PL INSTALLDIRS=vendor && cd ..
make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%ifarch %{ix86} ppc 
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/java
mv $RPM_BUILD_ROOT%{_libdir}{,/java}/libclearsilver-jni.so
mv $RPM_BUILD_ROOT%{_libdir}/clearsilver.jar \
  $RPM_BUILD_ROOT%{_libdir}/java/clearsilver-%{version}.jar
chmod 644 $RPM_BUILD_ROOT%{_libdir}/java/clearsilver-%{version}.jar
ln -s clearsilver-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/java/clearsilver.jar
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CS_LICENSE INSTALL LICENSE README
%{_bindir}/cstest
%{_bindir}/static.cgi
%{_mandir}/man3/*

%files devel
%defattr(-, root, root, 0755)
%doc CS_LICENSE LICENSE
%{_includedir}/ClearSilver/
%{_libdir}/libneo_*.a

%files -n python-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%doc README.python python/examples/
%{python_sitearch}/neo_cgi.so

%files -n perl-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%{perl_vendorarch}/auto/ClearSilver/
%{perl_vendorarch}/ClearSilver.pm

%ifarch %{ix86} ppc 
%files -n ruby-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%{_libdir}/site_ruby/*/*/hdf.so
%{_libdir}/site_ruby/*/neo.rb
%endif

%ifarch %{ix86} ppc 
%files -n java-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%{_libdir}/java/*clearsilver*
%endif

%changelog
* Fri Jan  6 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.2-2
- Rebuild with disable-ruby, disable-java for any arch other than i386
- hardcoded version in Patch0
- extra line in prep-section
- license files in all subpackages

* Thu Dec 15 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.2-1
- Rebuild for 0.10.2

* Tue Nov 29 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.1-1
- Rebuild for Fedora Extras

* Sun Jul 31 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-0.1
- 0.10.1, PIC issues fixed upstream.

* Sun May 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.14-0.3
- Rebuild for FC4.
- Rename subpackages to $foo-clearsilver.

* Mon Apr 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.14-0.2
- Build as PIC, fixes Ruby and Java builds on FC4.
- More parallel make fixing.

* Fri Apr  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.14-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Jan 2006 17:14:23 -0000	1.1
+++ .cvsignore	8 Jan 2006 17:15:17 -0000	1.2
@@ -0,0 +1 @@
+clearsilver-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Jan 2006 17:14:23 -0000	1.1
+++ sources	8 Jan 2006 17:15:17 -0000	1.2
@@ -0,0 +1 @@
+10e19526e87b712068e9073469b10d94  clearsilver-0.10.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 17:19:27 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:19:27 -0500
Subject: owners owners.list,1.511,1.512
Message-ID: <200601081719.k08HJxYb020474@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20457

Modified Files:
	owners.list 
Log Message:
added clearsilver



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- owners.list	7 Jan 2006 18:06:15 -0000	1.511
+++ owners.list	8 Jan 2006 17:19:27 -0000	1.512
@@ -107,6 +107,7 @@
 Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan  8 17:22:38 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:22:38 -0500
Subject: rpms/rootsh - New directory
Message-ID: <200601081722.k08HMexY020565@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20557/rootsh

Log Message:
Directory /cvs/extras/rpms/rootsh added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:22:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:22:44 -0500
Subject: rpms/rootsh/devel - New directory
Message-ID: <200601081722.k08HMkTt020580@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20557/rootsh/devel

Log Message:
Directory /cvs/extras/rpms/rootsh/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:22:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:22:58 -0500
Subject: rpms/rootsh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601081723.k08HN0OD020614@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20602

Added Files:
	Makefile import.log 
Log Message:
Setup of module rootsh


--- NEW FILE Makefile ---
# Top level Makefile for module rootsh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:23:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:23:04 -0500
Subject: rpms/rootsh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601081723.k08HN6kg020636@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20602/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rootsh


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:23:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:23:29 -0500
Subject: rpms/rootsh import.log,1.1,1.2
Message-ID: <200601081724.k08HO1Se020706@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20670

Modified Files:
	import.log 
Log Message:
auto-import rootsh-1.5.2-2 on branch devel from rootsh-1.5.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rootsh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Jan 2006 17:22:57 -0000	1.1
+++ import.log	8 Jan 2006 17:23:29 -0000	1.2
@@ -0,0 +1 @@
+rootsh-1_5_2-2:HEAD:rootsh-1.5.2-2.src.rpm:1136740994



From fedora-extras-commits at redhat.com  Sun Jan  8 17:23:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:23:35 -0500
Subject: rpms/rootsh/devel rootsh.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601081724.k08HOEFH020708@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20670/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rootsh.spec 
Log Message:
auto-import rootsh-1.5.2-2 on branch devel from rootsh-1.5.2-2.src.rpm


--- NEW FILE rootsh.spec ---
Name:		rootsh
Summary: 	Shell wrapper for auditing
Version:	1.5.2
Release:	2%{?dist}
License:	GPL
Group:		Applications/System
Source0:	http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz
URL:		http://sourceforge.net/projects/rootsh
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Rootsh is a wrapper for shells which logs all echoed keystrokes and 
terminal output to a file and/or to syslog. Its main purpose is the 
auditing of users who need a shell with root privileges. They start 
rootsh through the sudo mechanism.

%prep
%setup -q 

%build
%configure
make %{?smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS ChangeLog THANKS INSTALL NEWS TODO COPYING
%{_bindir}/rootsh
%{_mandir}/man1/rootsh.1.gz

%changelog
* Sat Jan  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.2-2
- forgot to include COPYING

* Wed Jan  4 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.2-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rootsh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Jan 2006 17:23:03 -0000	1.1
+++ .cvsignore	8 Jan 2006 17:23:35 -0000	1.2
@@ -0,0 +1 @@
+rootsh-1.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rootsh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Jan 2006 17:23:03 -0000	1.1
+++ sources	8 Jan 2006 17:23:35 -0000	1.2
@@ -0,0 +1 @@
+39e3a876b991fe235af3150335d1a0f8  rootsh-1.5.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 17:27:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:27:39 -0500
Subject: owners owners.list,1.512,1.513
Message-ID: <200601081728.k08HSC3g020767@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20750

Modified Files:
	owners.list 
Log Message:

rootsh



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- owners.list	8 Jan 2006 17:19:27 -0000	1.512
+++ owners.list	8 Jan 2006 17:27:39 -0000	1.513
@@ -1083,6 +1083,7 @@
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan  8 21:11:28 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 16:11:28 -0500
Subject: rpms/fortune-firefly/devel firefly, 1.5, 1.6 fortune-firefly.spec,
	1.7, 1.8
Message-ID: <200601082111.k08LBjEv028146@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28092/devel

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Lots of new content.




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 firefly
Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/firefly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- firefly	6 Dec 2005 02:56:40 -0000	1.5
+++ firefly	8 Jan 2006 21:11:28 -0000	1.6
@@ -1,35 +1,9 @@
-Drunk: "Hey, you gonna toast unification with me?  Six years today, the
-Alliance sent the Browncoats runnin', pissin' their pants... You know, your
-coat is kinda a brownish color."
-
-Mal: "It was on sale."
-
-%
 Mal: "We're not gonna die. We can't die, Bendis. You know why? Because we
 are so...very...pretty. We are just too pretty for God to let us die."
-
+				--Episode #1, "Serenity"
 %
 Mal: "We've done the impossible, and that makes us mighty."
-
-%
-Mal: "If you can't do something smart, do something right."
-
-%
-Inara: "This is just a moment in time.  Step aside and let it happen."
-
-%
-Mal: "When you can't run anymore, you crawl, and when you can't do that, you
-find someone to carry you."
-
-%
-Early: "Well... here I am..."
-
-%
-Mal (naked, alone in the desert): "Yep... that went well."
-
-%
-River (startling Jayne, jumping up from unconsciousness): "Copper for a kiss?"
-
+				--Episode #1, "Serenity"
 %
 Wash: "Everything looks good from here... (beat...playing with plastic
 dinosaurs over his console) Yes. Yes, this is a fertile land, and we will
@@ -43,34 +17,167 @@
 (Stegosaurus) "Ah, curse your sudden but inevitable betrayal!"
 
 (T-Rex) "Ha ha HA! Mine is an evil laugh...now die!"
+				--Episode #1, "Serenity"
+%
+Take my love, take my land
+Take me where I cannot stand
+I don't care, I'm still free
+You can't take the sky from me
+
+Take me out to the black
+Tell them I ain't comin' back
+Burn the land and boil the sea
+You can't take the sky from me
 
+There's no place I can be
+Since I found Serenity
+But you can't take the sky from me...
 %
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+				--Episode #1, "Serenity"
+%
+Zoe: "Something ain't right."
+
+Wash: "Sweetie, we're crooks.  If everything were right, we'd be in jail."
+				--Episode #1, "Serenity"
+%
+Wash: "Just a couple of days lying around.  You with the bathing, 
+me with the watching you bathe."
+				--Episode #1, "Serenity"
+%
+Kaylee: "I'd sure like to get a new compression coil."
+
+Mal: "And I'd like to be the king of all Londinum and wear a shiny hat."
+				--Episode #1, "Serenity"
+%
+Mal: "Wheel always keeps on turning, Badger."
 
+Badger: "That only matters to people on the rim."
+				--Episode #1, "Serenity"
+%
+Badger: "Crime and politics, little girl.  The situation is always... fluid."
+
+Jayne: "The only fluid I see here is the puddle of piss refusing to pay our wage."
+				--Episode #1, "Serenity"
+%
+Book: "The destination's not important.  How you get there's the worthier
+part."
+				--Episode #1, "Serenity"
+%
+Book: "Been out of the world for a spell.  Like to walk it a while."
+				--Episode #1, "Serenity"
 %
 Jayne: "Ten percent of nuthin' is...let me do the math here...nuthin' into
 nuthin'...carry the nuthin'..."
+				--Episode #1, "Serenity"
+%
+Mal: "Jayne! Your mouth is talking, you'd might wanna look to that."
+				--Episode #1, "Serenity"
+%
+Zoe: "Sir, we don't want to deal with Patience again."
+
+Mal: "Why not?"
+
+Zoe: "She shot you."
+
+Mal: "Well, yeah, she did a bit..."
+				--Episode #1, "Serenity"
+%
+Mal: "Ain't no way in the verse they could find that compartment, even if
+they were lookin' for it."
+
+Zoe: "Why not?"
+
+Mal: "... cause?"
 
+Zoe: "Oh yeah, this is going to go great."
+				--Episode #1, "Serenity"
 %
 Mal: "If anyone gets nosy, just...you know... shoot 'em. "
 
 Zoe: "Shoot 'em?"
 
 Mal: "Politely."
+				--Episode #1, "Serenity"
+%
+Mal: "Send word to Patience?"
 
+Wash: "Haven't heard back yet.  Didn't she soot you one time?"
+
+Mal: "Everyone's making a fuss."
+				--Episode #1, "Serenity"
 %
-Book: "The destination's not important.  How you get there's the worthier
-part."
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
-Jayne: "I was gonna get me an ear."
+Book: "Captain, do you mind if I say grace?"
+
+Mal: "Only if you say it out loud."
+				--Episode #1, "Serenity"
+%
+Mal: "How's business?"
+
+Inara: "None of yours."
+				--Episode #1, "Serenity"
+%
+Book: "The important thing is the spices.  A man could live on enough 
+packaged food from here till judgement day as long as he has 
+enough rosemary."
+				--Episode #1, "Serenity"
+%
+Mal: "That's what governments are for, to get in a man's way."
+				--Episode #1, "Serenity"
+%
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
+Inara: "So, would you like to lecture me on the wickedness of my ways?"
+
 Book: "I brought you some supper but if you'd prefer a lecture, I've a few
 very catchy ones prepped...sin and hellfire... one has lepers."
+				--Episode #1, "Serenity"
+%
+Wash: "Can we maybe vote on the whole murdering people issue?"
+				--Episode #1, "Serenity"
+%
+Mal: "Now, you only gotta scare him."
+
+Jayne: (beat) "Pain is scary."
+				--Episode #1, "Serenity"
+%
+Jayne: "It's a girl. Cute too.  'Cept I don't think she's all there, you know?
+Course, not all of her has to be."
+ 				--Episode #1, "Serenity"
+%
+Jayne: "I was gonna get me an ear."
+				--Episode #1, "Serenity"
+%
+Simon: "What will they do?"
+
+Zoe: "If they take the ship, they'll rape us to death, eat our flesh and
+sew our skins into their clothing and if we're very very lucky, they'll
+do it in that order."
+				--Episode #1, "Serenity"
[...5555 lines suppressed...]
 %
 Fanty: "You're unpredictable, Mal... you run when you oughtta fight, 
 fight when you oughtta deal.  Makes a business person twitchy..."
-
+				--"Serenity"
 %
 River: "Show me off like a dog, old men covered in blood, it never 
 touched them but they're drowning in it... I don't know what I'm 
 saying, I never know what I'm saying..."
-
+				--"Serenity"
 %
 Operative: "We locked on to Serenity's pulse beacon the moment you 
 hit atmo.  I can speak a word and send a missile to that exact location 
@@ -3454,20 +3818,20 @@
 (tosses a gadget to the Operative)
 
 Operative: "... pulse beacon..."
-
+				--"Serenity"
 %
 Mal: "Piece of shrapnel tore up that nerve cluster my first
 tour.  Had it moved."
-
+				--"Serenity"
 %
 River: "Miranda."
-
+				--"Serenity"
 %
 Mal: "What was that?"
-
+				--"Serenity"
 %
 Mal: "I, uh, better go see how the inevitable mutiny is coming along..."
-
+				--"Serenity"
 %
 Teacher: "...so why would [the independents] fight so hard against us?"
 
@@ -3481,46 +3845,152 @@
 
 Teacher: "River, we're not telling people what to think.  We're just trying 
 to show them how."
-
+				--"Serenity"
 %
 Dr. Mathias: "All our subjects are conditioned for combat, but River... 
 she's a creature of extraordinary grace."
 
 Simon: "Yes.  She always did love to dance."
-
+				--"Serenity"
 %
 Operative: "We're making a better world.  All of them, better worlds."
-
+				--"Serenity"
 %
 Zoe: "Nobody flies like my mister."
-
+				--"Serenity"
 %
 Simon: "I bring River all the way out to the raggedy edge of the 'verse 
 so she can hide from the Alliance by robbing banks."
 
 Kaylee: "I know the cap'n'll look out for her.  They'll be back before you 
 can spit." (beat)  "Not that you spit."
-
+				--"Serenity"
 %
 Jayne: "How come they ain't blowin' us out of the air?"
 
 Mal: "They wanna run us down.  The up close kill."
 
 River: "They want us alive when they eat us."
-
+				--"Serenity"
 %
 Screen in a bar, advertizing candy: "Not Mandatory"
 
 [Ed: There's mandatory candy?]
-
+				--"Serenity"
 %
 Mal: "Hello, little one.  You know your part in this?"
 
 River: (beat) "Do you?"
 
 Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+				--"Serenity"
+%
+Mal: "Ready to go to work, darlin'?"
+
+River: "There's no pattern to the pebbles here.  Completely random.  "I
+tried to count them, but you drove too fast.  Hummingbird.
+
+Mal: "Alright.  Great.  Lets go."
+				--"Serenity", deleted scenes
+%
+Sheydra: "All the more reason the girls look to you.  You've seen so much.
+You're a figure of great romance to them."
+
+Inara: "Great romance has nothing to do with being a companion, Sheydra; you
+should know better."
+
+Sheydra: (coyly) "I'm not the one who had a torrid affair with a pirate."
+
+Inara: (shocked) "A who?  With a what?"
 
+Sheydra: "It's the talk of the house.  The girls all trade stories in the
+dorms at night."
+
+Inara: "I... didn't... have a... pirate!"
+
+Sheydra: "In one of the stories, you make love in a burning temple.  I think
+that's my favorite."
+				--"Serenity", deleted scenes
+%
+Book: "Lord - I'm walking your way.  Let me in, for my feet are sore.  My
+clothes are ragged.  Look in my eyes, Lord, and my sins will play out in
+them as on the screen.  Read them off.  Forgive what you can, and send me
+on my path.  I will walk on until you give me rest."
+				--"Serenity", deleted scenes
+%
+Mal:"They take you down, I don't expect to grieve over it much.  I'd like
+to kill you myself if I ever see you again."
+
+Operative: "You won't." (pause) "There is nothing left to see."
+
+(Operative walks off, then stops near the engine, looking up at the ship
+through the rain)
+
+Operative: "Serenity.  You lost everything in that battle.  Everything you
+had, everything you were.  How did you go on?"
+
+Mal: "You're still standing there when that engine starts, you never will
+figure it out." (walks into Serenity)  "What a whiner!"
+				--"Serenity", deleted scenes
+%
+Zoe: (to Wash, lovingly) "That was close."  (They hug each other playfully)
+
+Mal: "Hey, what are you guys doin?" (beat) "Making out?"
+
+Wash: (flips off Mal) "Blow it, captain."
+				--"Serenity", outtakes
+%
+Mal: "Whoa, Whoa, you see that?  You see it, right?  You see that?"
+
+Mal: "Turn?  Would you turn?"
+
+Wash: "You want to fly this thing?"
+
+Mal: "You want me... would you pull over?  Is that what you call what you're
+doing?"
+
+Wash: "I will pull over this spaceship right now!"
+
+Mal: "Christ almighty!"
+
+Wash: "Dammit, I don't need a back spaceship driver!"
+
+Mal: "Get out of the way!!!"
+
+Wash: "Christ, that's it!" (throws up hands, leaves seat) "You wanna fly,
+f'in fly!" (off set) "I'll be in my bunk."
+				--"Serenity", outtakes
+%
+Everyone: "Summer!"
+
+[Ed: It was a running joke on-set that whenever anything went wrong, it was
+actress Summer Glau (River)'s fault.]
+
+				--"Serenity", outtakes
+%
+Mal: "TRAAAAAAAAAAPPP!!!!!!!!!!!!"
+				--"Serenity", outtakes
+%
+Mal: "Don't f'in tell me what to goddamn do!"
+
+Kaylee: (laughing) "Goddamn do?"
+				--"Serenity", outtakes
+%
+Mal: "Get these bodies together!"
+
+Zoe: "We got time for gravedigging?"
+
+Mal: "Zoe, take this and rope them together; five or six of them, I want
+them laid out on the nose of our ship."
+
+Simon: "Are you insane?"
+
+Mal: "Put Book front and center.  He's our friend; we should honor him. 
+Kaylee!  Find that kid who's taking a dirt nap with Baby Jesus; we need a
+hood ornament.  Jayne!  Try not to steal too much of their shit."
+				--"Serenity", outtakes
 %
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.
+


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/fortune-firefly.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fortune-firefly.spec	6 Dec 2005 02:56:40 -0000	1.7
+++ fortune-firefly.spec	8 Jan 2006 21:11:28 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.0.1
+Version:	2.1.0
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,11 +49,17 @@
 
 %changelog
 
+* Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
+- Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
+- Added quotes from unfilmed episode, "Dead or Alive"
+- Added quotes from deleted scenes
+- Added quotes from outtakes
+
 * Mon Dec 05 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.1
 - Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
 - Changed the versioning style
 
-* Wed Oct 12 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.3
+* Wed Oct 12 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0
 - Fixed some quotes, added one more.
 
 * Wed Oct 12 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0



From fedora-extras-commits at redhat.com  Sun Jan  8 21:11:22 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 16:11:22 -0500
Subject: rpms/fortune-firefly/FC-4 firefly, 1.4, 1.5 fortune-firefly.spec,
	1.4, 1.5
Message-ID: <200601082111.k08LBsJO028150@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28092/FC-4

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Lots of new content.




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 firefly
Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/firefly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefly	6 Dec 2005 02:56:34 -0000	1.4
+++ firefly	8 Jan 2006 21:11:21 -0000	1.5
@@ -1,35 +1,9 @@
-Drunk: "Hey, you gonna toast unification with me?  Six years today, the
-Alliance sent the Browncoats runnin', pissin' their pants... You know, your
-coat is kinda a brownish color."
-
-Mal: "It was on sale."
-
-%
 Mal: "We're not gonna die. We can't die, Bendis. You know why? Because we
 are so...very...pretty. We are just too pretty for God to let us die."
-
+				--Episode #1, "Serenity"
 %
 Mal: "We've done the impossible, and that makes us mighty."
-
-%
-Mal: "If you can't do something smart, do something right."
-
-%
-Inara: "This is just a moment in time.  Step aside and let it happen."
-
-%
-Mal: "When you can't run anymore, you crawl, and when you can't do that, you
-find someone to carry you."
-
-%
-Early: "Well... here I am..."
-
-%
-Mal (naked, alone in the desert): "Yep... that went well."
-
-%
-River (startling Jayne, jumping up from unconsciousness): "Copper for a kiss?"
-
+				--Episode #1, "Serenity"
 %
 Wash: "Everything looks good from here... (beat...playing with plastic
 dinosaurs over his console) Yes. Yes, this is a fertile land, and we will
@@ -43,34 +17,167 @@
 (Stegosaurus) "Ah, curse your sudden but inevitable betrayal!"
 
 (T-Rex) "Ha ha HA! Mine is an evil laugh...now die!"
+				--Episode #1, "Serenity"
+%
+Take my love, take my land
+Take me where I cannot stand
+I don't care, I'm still free
+You can't take the sky from me
+
+Take me out to the black
+Tell them I ain't comin' back
+Burn the land and boil the sea
+You can't take the sky from me
 
+There's no place I can be
+Since I found Serenity
+But you can't take the sky from me...
 %
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+				--Episode #1, "Serenity"
+%
+Zoe: "Something ain't right."
+
+Wash: "Sweetie, we're crooks.  If everything were right, we'd be in jail."
+				--Episode #1, "Serenity"
+%
+Wash: "Just a couple of days lying around.  You with the bathing, 
+me with the watching you bathe."
+				--Episode #1, "Serenity"
+%
+Kaylee: "I'd sure like to get a new compression coil."
+
+Mal: "And I'd like to be the king of all Londinum and wear a shiny hat."
+				--Episode #1, "Serenity"
+%
+Mal: "Wheel always keeps on turning, Badger."
 
+Badger: "That only matters to people on the rim."
+				--Episode #1, "Serenity"
+%
+Badger: "Crime and politics, little girl.  The situation is always... fluid."
+
+Jayne: "The only fluid I see here is the puddle of piss refusing to pay our wage."
+				--Episode #1, "Serenity"
+%
+Book: "The destination's not important.  How you get there's the worthier
+part."
+				--Episode #1, "Serenity"
+%
+Book: "Been out of the world for a spell.  Like to walk it a while."
+				--Episode #1, "Serenity"
 %
 Jayne: "Ten percent of nuthin' is...let me do the math here...nuthin' into
 nuthin'...carry the nuthin'..."
+				--Episode #1, "Serenity"
+%
+Mal: "Jayne! Your mouth is talking, you'd might wanna look to that."
+				--Episode #1, "Serenity"
+%
+Zoe: "Sir, we don't want to deal with Patience again."
+
+Mal: "Why not?"
+
+Zoe: "She shot you."
+
+Mal: "Well, yeah, she did a bit..."
+				--Episode #1, "Serenity"
+%
+Mal: "Ain't no way in the verse they could find that compartment, even if
+they were lookin' for it."
+
+Zoe: "Why not?"
+
+Mal: "... cause?"
 
+Zoe: "Oh yeah, this is going to go great."
+				--Episode #1, "Serenity"
 %
 Mal: "If anyone gets nosy, just...you know... shoot 'em. "
 
 Zoe: "Shoot 'em?"
 
 Mal: "Politely."
+				--Episode #1, "Serenity"
+%
+Mal: "Send word to Patience?"
 
+Wash: "Haven't heard back yet.  Didn't she soot you one time?"
+
+Mal: "Everyone's making a fuss."
+				--Episode #1, "Serenity"
 %
-Book: "The destination's not important.  How you get there's the worthier
-part."
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
-Jayne: "I was gonna get me an ear."
+Book: "Captain, do you mind if I say grace?"
+
+Mal: "Only if you say it out loud."
+				--Episode #1, "Serenity"
+%
+Mal: "How's business?"
+
+Inara: "None of yours."
+				--Episode #1, "Serenity"
+%
+Book: "The important thing is the spices.  A man could live on enough 
+packaged food from here till judgement day as long as he has 
+enough rosemary."
+				--Episode #1, "Serenity"
+%
+Mal: "That's what governments are for, to get in a man's way."
+				--Episode #1, "Serenity"
+%
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
+Inara: "So, would you like to lecture me on the wickedness of my ways?"
+
 Book: "I brought you some supper but if you'd prefer a lecture, I've a few
 very catchy ones prepped...sin and hellfire... one has lepers."
+				--Episode #1, "Serenity"
+%
+Wash: "Can we maybe vote on the whole murdering people issue?"
+				--Episode #1, "Serenity"
+%
+Mal: "Now, you only gotta scare him."
+
+Jayne: (beat) "Pain is scary."
+				--Episode #1, "Serenity"
+%
+Jayne: "It's a girl. Cute too.  'Cept I don't think she's all there, you know?
+Course, not all of her has to be."
+ 				--Episode #1, "Serenity"
+%
+Jayne: "I was gonna get me an ear."
+				--Episode #1, "Serenity"
+%
+Simon: "What will they do?"
+
+Zoe: "If they take the ship, they'll rape us to death, eat our flesh and
+sew our skins into their clothing and if we're very very lucky, they'll
+do it in that order."
+				--Episode #1, "Serenity"
[...5555 lines suppressed...]
 %
 Fanty: "You're unpredictable, Mal... you run when you oughtta fight, 
 fight when you oughtta deal.  Makes a business person twitchy..."
-
+				--"Serenity"
 %
 River: "Show me off like a dog, old men covered in blood, it never 
 touched them but they're drowning in it... I don't know what I'm 
 saying, I never know what I'm saying..."
-
+				--"Serenity"
 %
 Operative: "We locked on to Serenity's pulse beacon the moment you 
 hit atmo.  I can speak a word and send a missile to that exact location 
@@ -3454,20 +3818,20 @@
 (tosses a gadget to the Operative)
 
 Operative: "... pulse beacon..."
-
+				--"Serenity"
 %
 Mal: "Piece of shrapnel tore up that nerve cluster my first
 tour.  Had it moved."
-
+				--"Serenity"
 %
 River: "Miranda."
-
+				--"Serenity"
 %
 Mal: "What was that?"
-
+				--"Serenity"
 %
 Mal: "I, uh, better go see how the inevitable mutiny is coming along..."
-
+				--"Serenity"
 %
 Teacher: "...so why would [the independents] fight so hard against us?"
 
@@ -3481,46 +3845,152 @@
 
 Teacher: "River, we're not telling people what to think.  We're just trying 
 to show them how."
-
+				--"Serenity"
 %
 Dr. Mathias: "All our subjects are conditioned for combat, but River... 
 she's a creature of extraordinary grace."
 
 Simon: "Yes.  She always did love to dance."
-
+				--"Serenity"
 %
 Operative: "We're making a better world.  All of them, better worlds."
-
+				--"Serenity"
 %
 Zoe: "Nobody flies like my mister."
-
+				--"Serenity"
 %
 Simon: "I bring River all the way out to the raggedy edge of the 'verse 
 so she can hide from the Alliance by robbing banks."
 
 Kaylee: "I know the cap'n'll look out for her.  They'll be back before you 
 can spit." (beat)  "Not that you spit."
-
+				--"Serenity"
 %
 Jayne: "How come they ain't blowin' us out of the air?"
 
 Mal: "They wanna run us down.  The up close kill."
 
 River: "They want us alive when they eat us."
-
+				--"Serenity"
 %
 Screen in a bar, advertizing candy: "Not Mandatory"
 
 [Ed: There's mandatory candy?]
-
+				--"Serenity"
 %
 Mal: "Hello, little one.  You know your part in this?"
 
 River: (beat) "Do you?"
 
 Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+				--"Serenity"
+%
+Mal: "Ready to go to work, darlin'?"
+
+River: "There's no pattern to the pebbles here.  Completely random.  "I
+tried to count them, but you drove too fast.  Hummingbird.
+
+Mal: "Alright.  Great.  Lets go."
+				--"Serenity", deleted scenes
+%
+Sheydra: "All the more reason the girls look to you.  You've seen so much.
+You're a figure of great romance to them."
+
+Inara: "Great romance has nothing to do with being a companion, Sheydra; you
+should know better."
+
+Sheydra: (coyly) "I'm not the one who had a torrid affair with a pirate."
+
+Inara: (shocked) "A who?  With a what?"
 
+Sheydra: "It's the talk of the house.  The girls all trade stories in the
+dorms at night."
+
+Inara: "I... didn't... have a... pirate!"
+
+Sheydra: "In one of the stories, you make love in a burning temple.  I think
+that's my favorite."
+				--"Serenity", deleted scenes
+%
+Book: "Lord - I'm walking your way.  Let me in, for my feet are sore.  My
+clothes are ragged.  Look in my eyes, Lord, and my sins will play out in
+them as on the screen.  Read them off.  Forgive what you can, and send me
+on my path.  I will walk on until you give me rest."
+				--"Serenity", deleted scenes
+%
+Mal:"They take you down, I don't expect to grieve over it much.  I'd like
+to kill you myself if I ever see you again."
+
+Operative: "You won't." (pause) "There is nothing left to see."
+
+(Operative walks off, then stops near the engine, looking up at the ship
+through the rain)
+
+Operative: "Serenity.  You lost everything in that battle.  Everything you
+had, everything you were.  How did you go on?"
+
+Mal: "You're still standing there when that engine starts, you never will
+figure it out." (walks into Serenity)  "What a whiner!"
+				--"Serenity", deleted scenes
+%
+Zoe: (to Wash, lovingly) "That was close."  (They hug each other playfully)
+
+Mal: "Hey, what are you guys doin?" (beat) "Making out?"
+
+Wash: (flips off Mal) "Blow it, captain."
+				--"Serenity", outtakes
+%
+Mal: "Whoa, Whoa, you see that?  You see it, right?  You see that?"
+
+Mal: "Turn?  Would you turn?"
+
+Wash: "You want to fly this thing?"
+
+Mal: "You want me... would you pull over?  Is that what you call what you're
+doing?"
+
+Wash: "I will pull over this spaceship right now!"
+
+Mal: "Christ almighty!"
+
+Wash: "Dammit, I don't need a back spaceship driver!"
+
+Mal: "Get out of the way!!!"
+
+Wash: "Christ, that's it!" (throws up hands, leaves seat) "You wanna fly,
+f'in fly!" (off set) "I'll be in my bunk."
+				--"Serenity", outtakes
+%
+Everyone: "Summer!"
+
+[Ed: It was a running joke on-set that whenever anything went wrong, it was
+actress Summer Glau (River)'s fault.]
+
+				--"Serenity", outtakes
+%
+Mal: "TRAAAAAAAAAAPPP!!!!!!!!!!!!"
+				--"Serenity", outtakes
+%
+Mal: "Don't f'in tell me what to goddamn do!"
+
+Kaylee: (laughing) "Goddamn do?"
+				--"Serenity", outtakes
+%
+Mal: "Get these bodies together!"
+
+Zoe: "We got time for gravedigging?"
+
+Mal: "Zoe, take this and rope them together; five or six of them, I want
+them laid out on the nose of our ship."
+
+Simon: "Are you insane?"
+
+Mal: "Put Book front and center.  He's our friend; we should honor him. 
+Kaylee!  Find that kid who's taking a dirt nap with Baby Jesus; we need a
+hood ornament.  Jayne!  Try not to steal too much of their shit."
+				--"Serenity", outtakes
 %
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.
+


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/fortune-firefly.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fortune-firefly.spec	6 Dec 2005 02:56:34 -0000	1.4
+++ fortune-firefly.spec	8 Jan 2006 21:11:21 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.0.1
+Version:	2.1.0
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,12 @@
 
 %changelog
 
+* Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
+- Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
+- Added quotes from unfilmed episode, "Dead or Alive"
+- Added quotes from deleted scenes
+- Added quotes from outtakes
+
 * Mon Dec 05 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.1
 - Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
 - Changed the versioning style



From fedora-extras-commits at redhat.com  Sun Jan  8 21:10:59 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 16:10:59 -0500
Subject: rpms/fortune-firefly/FC-3 firefly, 1.4, 1.5 fortune-firefly.spec,
	1.3, 1.4
Message-ID: <200601082112.k08LC4es028154@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28092/FC-3

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Lots of new content.




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 firefly
Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/firefly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefly	6 Dec 2005 02:56:29 -0000	1.4
+++ firefly	8 Jan 2006 21:10:57 -0000	1.5
@@ -1,35 +1,9 @@
-Drunk: "Hey, you gonna toast unification with me?  Six years today, the
-Alliance sent the Browncoats runnin', pissin' their pants... You know, your
-coat is kinda a brownish color."
-
-Mal: "It was on sale."
-
-%
 Mal: "We're not gonna die. We can't die, Bendis. You know why? Because we
 are so...very...pretty. We are just too pretty for God to let us die."
-
+				--Episode #1, "Serenity"
 %
 Mal: "We've done the impossible, and that makes us mighty."
-
-%
-Mal: "If you can't do something smart, do something right."
-
-%
-Inara: "This is just a moment in time.  Step aside and let it happen."
-
-%
-Mal: "When you can't run anymore, you crawl, and when you can't do that, you
-find someone to carry you."
-
-%
-Early: "Well... here I am..."
-
-%
-Mal (naked, alone in the desert): "Yep... that went well."
-
-%
-River (startling Jayne, jumping up from unconsciousness): "Copper for a kiss?"
-
+				--Episode #1, "Serenity"
 %
 Wash: "Everything looks good from here... (beat...playing with plastic
 dinosaurs over his console) Yes. Yes, this is a fertile land, and we will
@@ -43,34 +17,167 @@
 (Stegosaurus) "Ah, curse your sudden but inevitable betrayal!"
 
 (T-Rex) "Ha ha HA! Mine is an evil laugh...now die!"
+				--Episode #1, "Serenity"
+%
+Take my love, take my land
+Take me where I cannot stand
+I don't care, I'm still free
+You can't take the sky from me
+
+Take me out to the black
+Tell them I ain't comin' back
+Burn the land and boil the sea
+You can't take the sky from me
 
+There's no place I can be
+Since I found Serenity
+But you can't take the sky from me...
 %
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+				--Episode #1, "Serenity"
+%
+Zoe: "Something ain't right."
+
+Wash: "Sweetie, we're crooks.  If everything were right, we'd be in jail."
+				--Episode #1, "Serenity"
+%
+Wash: "Just a couple of days lying around.  You with the bathing, 
+me with the watching you bathe."
+				--Episode #1, "Serenity"
+%
+Kaylee: "I'd sure like to get a new compression coil."
+
+Mal: "And I'd like to be the king of all Londinum and wear a shiny hat."
+				--Episode #1, "Serenity"
+%
+Mal: "Wheel always keeps on turning, Badger."
 
+Badger: "That only matters to people on the rim."
+				--Episode #1, "Serenity"
+%
+Badger: "Crime and politics, little girl.  The situation is always... fluid."
+
+Jayne: "The only fluid I see here is the puddle of piss refusing to pay our wage."
+				--Episode #1, "Serenity"
+%
+Book: "The destination's not important.  How you get there's the worthier
+part."
+				--Episode #1, "Serenity"
+%
+Book: "Been out of the world for a spell.  Like to walk it a while."
+				--Episode #1, "Serenity"
 %
 Jayne: "Ten percent of nuthin' is...let me do the math here...nuthin' into
 nuthin'...carry the nuthin'..."
+				--Episode #1, "Serenity"
+%
+Mal: "Jayne! Your mouth is talking, you'd might wanna look to that."
+				--Episode #1, "Serenity"
+%
+Zoe: "Sir, we don't want to deal with Patience again."
+
+Mal: "Why not?"
+
+Zoe: "She shot you."
+
+Mal: "Well, yeah, she did a bit..."
+				--Episode #1, "Serenity"
+%
+Mal: "Ain't no way in the verse they could find that compartment, even if
+they were lookin' for it."
+
+Zoe: "Why not?"
+
+Mal: "... cause?"
 
+Zoe: "Oh yeah, this is going to go great."
+				--Episode #1, "Serenity"
 %
 Mal: "If anyone gets nosy, just...you know... shoot 'em. "
 
 Zoe: "Shoot 'em?"
 
 Mal: "Politely."
+				--Episode #1, "Serenity"
+%
+Mal: "Send word to Patience?"
 
+Wash: "Haven't heard back yet.  Didn't she soot you one time?"
+
+Mal: "Everyone's making a fuss."
+				--Episode #1, "Serenity"
 %
-Book: "The destination's not important.  How you get there's the worthier
-part."
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
-Jayne: "I was gonna get me an ear."
+Book: "Captain, do you mind if I say grace?"
+
+Mal: "Only if you say it out loud."
+				--Episode #1, "Serenity"
+%
+Mal: "How's business?"
+
+Inara: "None of yours."
+				--Episode #1, "Serenity"
+%
+Book: "The important thing is the spices.  A man could live on enough 
+packaged food from here till judgement day as long as he has 
+enough rosemary."
+				--Episode #1, "Serenity"
+%
+Mal: "That's what governments are for, to get in a man's way."
+				--Episode #1, "Serenity"
+%
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
+Inara: "So, would you like to lecture me on the wickedness of my ways?"
+
 Book: "I brought you some supper but if you'd prefer a lecture, I've a few
 very catchy ones prepped...sin and hellfire... one has lepers."
+				--Episode #1, "Serenity"
+%
+Wash: "Can we maybe vote on the whole murdering people issue?"
+				--Episode #1, "Serenity"
+%
+Mal: "Now, you only gotta scare him."
+
+Jayne: (beat) "Pain is scary."
+				--Episode #1, "Serenity"
+%
+Jayne: "It's a girl. Cute too.  'Cept I don't think she's all there, you know?
+Course, not all of her has to be."
+ 				--Episode #1, "Serenity"
+%
+Jayne: "I was gonna get me an ear."
+				--Episode #1, "Serenity"
+%
+Simon: "What will they do?"
+
+Zoe: "If they take the ship, they'll rape us to death, eat our flesh and
+sew our skins into their clothing and if we're very very lucky, they'll
+do it in that order."
+				--Episode #1, "Serenity"
[...5555 lines suppressed...]
 %
 Fanty: "You're unpredictable, Mal... you run when you oughtta fight, 
 fight when you oughtta deal.  Makes a business person twitchy..."
-
+				--"Serenity"
 %
 River: "Show me off like a dog, old men covered in blood, it never 
 touched them but they're drowning in it... I don't know what I'm 
 saying, I never know what I'm saying..."
-
+				--"Serenity"
 %
 Operative: "We locked on to Serenity's pulse beacon the moment you 
 hit atmo.  I can speak a word and send a missile to that exact location 
@@ -3454,20 +3818,20 @@
 (tosses a gadget to the Operative)
 
 Operative: "... pulse beacon..."
-
+				--"Serenity"
 %
 Mal: "Piece of shrapnel tore up that nerve cluster my first
 tour.  Had it moved."
-
+				--"Serenity"
 %
 River: "Miranda."
-
+				--"Serenity"
 %
 Mal: "What was that?"
-
+				--"Serenity"
 %
 Mal: "I, uh, better go see how the inevitable mutiny is coming along..."
-
+				--"Serenity"
 %
 Teacher: "...so why would [the independents] fight so hard against us?"
 
@@ -3481,46 +3845,152 @@
 
 Teacher: "River, we're not telling people what to think.  We're just trying 
 to show them how."
-
+				--"Serenity"
 %
 Dr. Mathias: "All our subjects are conditioned for combat, but River... 
 she's a creature of extraordinary grace."
 
 Simon: "Yes.  She always did love to dance."
-
+				--"Serenity"
 %
 Operative: "We're making a better world.  All of them, better worlds."
-
+				--"Serenity"
 %
 Zoe: "Nobody flies like my mister."
-
+				--"Serenity"
 %
 Simon: "I bring River all the way out to the raggedy edge of the 'verse 
 so she can hide from the Alliance by robbing banks."
 
 Kaylee: "I know the cap'n'll look out for her.  They'll be back before you 
 can spit." (beat)  "Not that you spit."
-
+				--"Serenity"
 %
 Jayne: "How come they ain't blowin' us out of the air?"
 
 Mal: "They wanna run us down.  The up close kill."
 
 River: "They want us alive when they eat us."
-
+				--"Serenity"
 %
 Screen in a bar, advertizing candy: "Not Mandatory"
 
 [Ed: There's mandatory candy?]
-
+				--"Serenity"
 %
 Mal: "Hello, little one.  You know your part in this?"
 
 River: (beat) "Do you?"
 
 Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+				--"Serenity"
+%
+Mal: "Ready to go to work, darlin'?"
+
+River: "There's no pattern to the pebbles here.  Completely random.  "I
+tried to count them, but you drove too fast.  Hummingbird.
+
+Mal: "Alright.  Great.  Lets go."
+				--"Serenity", deleted scenes
+%
+Sheydra: "All the more reason the girls look to you.  You've seen so much.
+You're a figure of great romance to them."
+
+Inara: "Great romance has nothing to do with being a companion, Sheydra; you
+should know better."
+
+Sheydra: (coyly) "I'm not the one who had a torrid affair with a pirate."
+
+Inara: (shocked) "A who?  With a what?"
 
+Sheydra: "It's the talk of the house.  The girls all trade stories in the
+dorms at night."
+
+Inara: "I... didn't... have a... pirate!"
+
+Sheydra: "In one of the stories, you make love in a burning temple.  I think
+that's my favorite."
+				--"Serenity", deleted scenes
+%
+Book: "Lord - I'm walking your way.  Let me in, for my feet are sore.  My
+clothes are ragged.  Look in my eyes, Lord, and my sins will play out in
+them as on the screen.  Read them off.  Forgive what you can, and send me
+on my path.  I will walk on until you give me rest."
+				--"Serenity", deleted scenes
+%
+Mal:"They take you down, I don't expect to grieve over it much.  I'd like
+to kill you myself if I ever see you again."
+
+Operative: "You won't." (pause) "There is nothing left to see."
+
+(Operative walks off, then stops near the engine, looking up at the ship
+through the rain)
+
+Operative: "Serenity.  You lost everything in that battle.  Everything you
+had, everything you were.  How did you go on?"
+
+Mal: "You're still standing there when that engine starts, you never will
+figure it out." (walks into Serenity)  "What a whiner!"
+				--"Serenity", deleted scenes
+%
+Zoe: (to Wash, lovingly) "That was close."  (They hug each other playfully)
+
+Mal: "Hey, what are you guys doin?" (beat) "Making out?"
+
+Wash: (flips off Mal) "Blow it, captain."
+				--"Serenity", outtakes
+%
+Mal: "Whoa, Whoa, you see that?  You see it, right?  You see that?"
+
+Mal: "Turn?  Would you turn?"
+
+Wash: "You want to fly this thing?"
+
+Mal: "You want me... would you pull over?  Is that what you call what you're
+doing?"
+
+Wash: "I will pull over this spaceship right now!"
+
+Mal: "Christ almighty!"
+
+Wash: "Dammit, I don't need a back spaceship driver!"
+
+Mal: "Get out of the way!!!"
+
+Wash: "Christ, that's it!" (throws up hands, leaves seat) "You wanna fly,
+f'in fly!" (off set) "I'll be in my bunk."
+				--"Serenity", outtakes
+%
+Everyone: "Summer!"
+
+[Ed: It was a running joke on-set that whenever anything went wrong, it was
+actress Summer Glau (River)'s fault.]
+
+				--"Serenity", outtakes
+%
+Mal: "TRAAAAAAAAAAPPP!!!!!!!!!!!!"
+				--"Serenity", outtakes
+%
+Mal: "Don't f'in tell me what to goddamn do!"
+
+Kaylee: (laughing) "Goddamn do?"
+				--"Serenity", outtakes
+%
+Mal: "Get these bodies together!"
+
+Zoe: "We got time for gravedigging?"
+
+Mal: "Zoe, take this and rope them together; five or six of them, I want
+them laid out on the nose of our ship."
+
+Simon: "Are you insane?"
+
+Mal: "Put Book front and center.  He's our friend; we should honor him. 
+Kaylee!  Find that kid who's taking a dirt nap with Baby Jesus; we need a
+hood ornament.  Jayne!  Try not to steal too much of their shit."
+				--"Serenity", outtakes
 %
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.
+


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/fortune-firefly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fortune-firefly.spec	6 Dec 2005 02:56:29 -0000	1.3
+++ fortune-firefly.spec	8 Jan 2006 21:10:57 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.0.1
+Version:	2.1.0
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,12 @@
 
 %changelog
 
+* Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
+- Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
+- Added quotes from unfilmed episode, "Dead or Alive"
+- Added quotes from deleted scenes
+- Added quotes from outtakes
+
 * Mon Dec 05 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.1
 - Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
 - Changed the versioning style



From fedora-extras-commits at redhat.com  Sun Jan  8 22:14:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Jan 2006 17:14:15 -0500
Subject: rpms/opensc/devel .cvsignore, 1.4, 1.5 opensc.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200601082214.k08MEmR4030109@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30088

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-1
- 0.10.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 15:11:14 -0000	1.4
+++ .cvsignore	8 Jan 2006 22:14:15 -0000	1.5
@@ -1 +1 @@
-opensc-0.10.0.tar.gz
+opensc-0.10.1.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- opensc.spec	12 Nov 2005 15:11:14 -0000	1.7
+++ opensc.spec	8 Jan 2006 22:14:15 -0000	1.8
@@ -1,14 +1,14 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.10.0
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/%{name}-%{version}.tar.gz
+Source0:        http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-1
+- 0.10.1.
+
 * Wed Nov  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.0-1
 - 0.10.0.
 - Adapt to modularized X.Org.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 15:11:14 -0000	1.4
+++ sources	8 Jan 2006 22:14:15 -0000	1.5
@@ -1 +1 @@
-d25271140776df94ada13f45dad34996  opensc-0.10.0.tar.gz
+5549c7c339775356784837887750d232  opensc-0.10.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 22:40:02 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 17:40:02 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.5,1.6
Message-ID: <200601082240.k08MeZoI030277@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30260

Modified Files:
	gobby.spec 
Log Message:
rebuild and fix typos


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gobby.spec	8 Jan 2006 07:25:51 -0000	1.5
+++ gobby.spec	8 Jan 2006 22:40:02 -0000	1.6
@@ -69,6 +69,12 @@
 * Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-5
 - Rebuild
 
+* Sat Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
+- rebuild
+
+* Fri Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
+- Remove modular Xorg BR's for FC-4 package
+
 * Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
 - Add libXau-devel to BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Jan  8 22:47:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sun,  8 Jan 2006 17:47:03 -0500
Subject: rpms/libcaca/devel libcaca.spec,1.8,1.9
Message-ID: <200601082247.k08MlZ42030389@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30338

Modified Files:
	libcaca.spec 
Log Message:
Include fixes from Ville (#176796).



Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/devel/libcaca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libcaca.spec	17 Nov 2005 15:19:28 -0000	1.8
+++ libcaca.spec	8 Jan 2006 22:47:03 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://sam.zoy.org/projects/libcaca/
@@ -100,10 +100,16 @@
 %{_mandir}/man1/cacaball.1*
 %{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
+%{_mandir}/man1/cacamoir.1*
+%{_mandir}/man1/cacaplas.1*
 %{_mandir}/man1/cacaview.1*
 
 
 %changelog
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-8
+- Include unpackaged man page symlinks.
+- Rebuild against new slang.
+
 * Thu Nov 17 2005 Matthias Saou <http://freshrpms.net/> 0.9-7
 - Change XFree86-devel requirements to libX11-devel.
 - Force --x-includes= and --x-libraries=, otherwise -L gets passed empty.



From fedora-extras-commits at redhat.com  Sun Jan  8 22:55:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Jan 2006 17:55:34 -0500
Subject: rpms/cvsweb/devel cvsweb-3.0.6-fedora-config.patch, NONE,
	1.1 cvsweb.spec, 1.7, 1.8 cvsweb-fedora-config.patch, 1.2, NONE
Message-ID: <200601082256.k08Mu6XG030523@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cvsweb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502

Modified Files:
	cvsweb.spec 
Added Files:
	cvsweb-3.0.6-fedora-config.patch 
Removed Files:
	cvsweb-fedora-config.patch 
Log Message:
* Mon Jan  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.6-2
- Use enscript by default if it's installed (enscript >= 1.6.3 in FC5+).
- Fix cvsweb.css permissions.


cvsweb-3.0.6-fedora-config.patch:

--- NEW FILE cvsweb-3.0.6-fedora-config.patch ---
--- cvsweb-3.0.6/cvsweb.conf.fedora-config	2005-06-19 12:13:50.000000000 +0300
+++ cvsweb-3.0.6/cvsweb.conf	2006-01-09 00:34:39.000000000 +0200
@@ -24,7 +24,7 @@
 #   cvsgraph (if you enable $allow_graph)
 #   enscript (if you enable $allow_enscript)
 #
- at command_path = qw(/bin /usr/bin /usr/local/bin);
+ at command_path = qw(/bin /usr/bin);
 
 # Search the above directories for each command (prefer gtar over tar).
 #
@@ -226,14 +226,14 @@
 # check out the "mini" versions in the icons/ directory; they have a
 # width/height of 16/16.
 #
-my $iconsdir = '/icons';
+my $iconsdir = '/icons/small';
 
 # format:          TEXT       ICON-URL                  width height
 %ICONS = (
-     back    => [('[BACK]',   "$iconsdir/back.gif",      20,   22)],
-     dir     => [('[DIR]',    "$iconsdir/dir.gif",       20,   22)],
-     file    => [('[TXT]',    "$iconsdir/text.gif",      20,   22)],
-     binfile => [('[BIN]',    "$iconsdir/binary.gif",    20,   22)],
+     back    => [('[BACK]',   "$iconsdir/back.gif",      16,   16)],
+     dir     => [('[DIR]',    "$iconsdir/dir.gif",       16,   16)],
+     file    => [('[TXT]',    "$iconsdir/text.gif",      16,   16)],
+     binfile => [('[BIN]',    "$iconsdir/binary.gif",    16,   16)],
      graph   => [('[GRAPH]',  "$iconsdir/minigraph.png", 16,   16)],
 );
 undef $iconsdir;
@@ -368,7 +368,7 @@
 # The traditional mime.types file, eg. the one from Apache is fine.
 # See above where this gets used.
 #
-$mime_types = '/usr/local/etc/apache/mime.types';
+$mime_types = '/etc/mime.types';
 
 # Charset appended to the Content-Type HTTP header for text/* MIME types.
 # Note that the web server may default to some charset which may take effect
@@ -518,7 +518,7 @@
 # versions, the user account running CVSweb needs write access to
 # CVSROOT/val-tags.  See also the tar, gzip and zip options below.
 #
-#$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
+$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
 
 # Options to pass to tar(1).
 # For example: @tar_options = qw(--ignore-failed-read);
@@ -526,7 +526,7 @@
 # Other useful options include "--owner=0" and "--group=0", see
 # the tar(1) (or gtar(1)) manpage for details.
 #
- at tar_options = qw();
+ at tar_options = qw(--owner=0 --group=0);
 
 # Options to pass to gzip(1) when compressing a tarball to download.
 # For example: @gzip_options = qw(-3);
@@ -564,7 +564,7 @@
 # To make annotate work against a read only repository, add -n, ie.:
 # @annotate_options = (@cvs_options, '-n');
 #
- at annotate_options = @cvs_options;
+ at annotate_options = (@cvs_options, '-n');
 
 # Options to pass to rcsdiff(1).
 # Probably the only useful one here is -q (suppress diagnostic output).
@@ -574,7 +574,7 @@
 # Enables syntax highlighting using GNU Enscript if set.
 # You will need GNU Enscript version 1.6.3 or newer for this to work.
 #
-#$allow_enscript = $CMD{enscript} ? 1 : 0;
+$allow_enscript = $CMD{enscript} ? 1 : 0;
 
 # Options to pass to enscript(1).
 # Do not set the -q, --language, -o or --highlight options here.
@@ -639,9 +639,9 @@
 # Enable this to let CVSweb load extra configuration files from the "conf.d"
 # subdirectory of the directory this file is located in.  This enables site
 # specific configuration without having to modify this "master" configuration
-# file (except for enabling this functionality below :)
+# file.
 #
-if (0) {
+if (1) {
   my $confdir = catdir(dirname(__FILE__), 'conf.d');
   if (opendir(CONFD, $confdir)) {
     my @files = sort(map(catfile($confdir, $_), readdir(CONFD)));
--- cvsweb-3.0.6/cvsweb.cgi.fedora-config	2005-09-25 23:28:51.000000000 +0300
+++ cvsweb-3.0.6/cvsweb.cgi	2006-01-09 00:33:32.000000000 +0200
@@ -208,22 +208,8 @@
 # (think mod_perl)...
 delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});
 
-my ($mydir) = (dirname($0) =~ /(.*)/);    # untaint
-
-##### Start of Configuration Area ########
-
-# == EDIT this ==
-# Locations to search for user configuration, in order:
-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
-  if (-r $_) {
-    $config = $_;
-    last;
-  }
-}
-
-##### End of Configuration Area   ########
-
-undef $mydir;
+# Path to the configuration file.
+$config = '/etc/cvsweb/cvsweb.conf';
 
 ######## Configuration parameters #########
 


Index: cvsweb.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/devel/cvsweb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvsweb.spec	25 Sep 2005 21:02:24 -0000	1.7
+++ cvsweb.spec	8 Jan 2006 22:55:34 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           cvsweb
 Version:        3.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web interface for CVS repositories
 
 License:        BSD
 Group:          Development/Tools
 URL:            http://www.freebsd.org/projects/cvsweb.html
 Source0:        http://people.freebsd.org/~scop/cvsweb/%{name}-%{version}.tar.gz
-Patch0:         %{name}-fedora-config.patch
+Patch0:         %{name}-3.0.6-fedora-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +34,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 cvsweb.cgi \
   $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/cvsweb.cgi
-install -Dpm 755 css/cvsweb.css \
+install -Dpm 644 css/cvsweb.css \
   $RPM_BUILD_ROOT%{_localstatedir}/www/html/css/cvsweb.css
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb/conf.d
 install -pm 644 cvsweb.conf $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb
@@ -53,12 +53,16 @@
 %doc ChangeLog NEWS README TODO INSTALL samples/cvsweb-httpd.conf
 %config(noreplace) %{_sysconfdir}/cvsweb/
 %{_localstatedir}/www/cgi-bin/cvsweb.cgi
-%{_localstatedir}/www/html/css
+%{_localstatedir}/www/html/css/
 %{_localstatedir}/www/icons/small/minigraph.png
 %{_datadir}/enscript/
 
 
 %changelog
+* Mon Jan  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.6-2
+- Use enscript by default if it's installed (enscript >= 1.6.3 in FC5+).
+- Fix cvsweb.css permissions.
+
 * Sun Sep 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.6-1
 - 3.0.6.
 


--- cvsweb-fedora-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan  9 00:08:45 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 19:08:45 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.6,1.7
Message-ID: <200601090010.k090A2YQ001903@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1886

Modified Files:
	gobby.spec 
Log Message:
- fix tag/branch issues, and regress FC5 changes for FC4 branch



Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gobby.spec	8 Jan 2006 22:40:02 -0000	1.6
+++ gobby.spec	9 Jan 2006 00:07:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -66,46 +66,9 @@
 
 
 %changelog
-* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-5
-- Rebuild
-
-* Sat Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
-- rebuild
-
-* Fri Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
-- Remove modular Xorg BR's for FC-4 package
-
-* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
-- Add libXau-devel to BuildRequires
-
-* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 
-* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
-- Bump to 0.3.0rc3
-
-* Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
-- Update Summary
-
-* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-5
-- Use desktop-file-install to install the desktop file
-
-* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-4
-- Add desktop-file-utils to Requires(post/postun) and remove howl-devel BR
-
-* Fri Oct 07 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-3
-- Build with gnome support
-- Rebuild
-
-* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
-- Add libXau-devel to BuildRequires
-
-* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
-- 0.3.0
-
-* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
-- Bump to 0.3.0rc3
-
 * Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
 - Update Summary
 



From fedora-extras-commits at redhat.com  Mon Jan  9 02:32:13 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun,  8 Jan 2006 21:32:13 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.3,1.4
Message-ID: <200601090232.k092Wjc8006172@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6155

Modified Files:
	ldns.spec 
Log Message:
* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
- Upgraded to 1.0.1. Removed temporary clean hack from spec file.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
+++ ldns.spec	9 Jan 2006 02:32:12 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.0.0
-Release: 7%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -25,21 +25,20 @@
 
 %prep
 %setup -q 
-rm config.sub config.guess
-libtoolize
-autoreconf
-# only for 2.3.3, since upstream left .o files in release
-make clean
+
+#libtoolize
+#autoreconf
 
 %configure
 
 
 %build
-%{__make} %{?_smp_mflags} allautoconf
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} drill
-%{__make} %{?_smp_mflags} examples
-%{__make} %{?_smp_mflags} doc
+make %{?_smp_mflags} clean
+make %{?_smp_mflags} allautoconf
+make %{?_smp_mflags}
+make %{?_smp_mflags} drill
+make %{?_smp_mflags} examples
+make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
@@ -78,8 +77,17 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+- Upgraded to 1.0.1. Removed temporary clean hack from spec file.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8
+- Cannot use make clean because there are no Makefiles. Use hardcoded rm.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-7
+- Patched 'make clean' target to get rid of object files shipped with 1.0.0
+
 * Sun Dec 13 2005 Paul Wouters <paul at xelerance.com> 1.0.0-6
-- added a make clean for 1.0.0 since .o files were left behind upstream,
+- added a make clean for 2.3.3 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.0-5



From fedora-extras-commits at redhat.com  Mon Jan  9 02:34:27 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun,  8 Jan 2006 21:34:27 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.4,1.5
Message-ID: <200601090234.k092YxYu006230@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6213

Modified Files:
	ldns.spec 
Log Message:
bumped version



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldns.spec	9 Jan 2006 02:32:12 -0000	1.4
+++ ldns.spec	9 Jan 2006 02:34:27 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -77,7 +77,7 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-2
 - Upgraded to 1.0.1. Removed temporary clean hack from spec file.
 
 * Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8



From fedora-extras-commits at redhat.com  Mon Jan  9 02:59:50 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  8 Jan 2006 21:59:50 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.1,1.2
Message-ID: <200601090300.k0930NjH006350@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6320

Modified Files:
	tclxml.spec 
Log Message:
Package now owns the directories that it creates.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclxml.spec	5 Dec 2005 17:56:35 -0000	1.1
+++ tclxml.spec	9 Jan 2006 02:59:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -101,6 +101,7 @@
 
 %files
 %defattr(-,root,root)
+%dir %{_libdir}/Tclxml%{version}
 %{_libdir}/Tclxml%{version}/*.so
 %{_libdir}/Tclxml%{version}/*.tcl
 %doc LICENSE ANNOUNCE ChangeLog README RELNOTES
@@ -121,6 +122,8 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Sun Jan 8 2006 Wart <wart at kobold.org> - 3.1-2
+- Package now owns the directories that it creates.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.1-1
 - Update to new upstream sources.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.0-3



From fedora-extras-commits at redhat.com  Mon Jan  9 03:00:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  8 Jan 2006 22:00:48 -0500
Subject: rpms/tclxml/FC-4 tclxml.spec,1.1,1.2
Message-ID: <200601090301.k0931L57007765@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6356/FC-4

Modified Files:
	tclxml.spec 
Log Message:
Package now owns the directories that it creates.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/FC-4/tclxml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclxml.spec	5 Dec 2005 17:56:35 -0000	1.1
+++ tclxml.spec	9 Jan 2006 03:00:47 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -101,6 +101,7 @@
 
 %files
 %defattr(-,root,root)
+%dir %{_libdir}/Tclxml%{version}
 %{_libdir}/Tclxml%{version}/*.so
 %{_libdir}/Tclxml%{version}/*.tcl
 %doc LICENSE ANNOUNCE ChangeLog README RELNOTES
@@ -121,6 +122,8 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Sun Jan 8 2006 Wart <wart at kobold.org> - 3.1-2
+- Package now owns the directories that it creates.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.1-1
 - Update to new upstream sources.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.0-3



From fedora-extras-commits at redhat.com  Mon Jan  9 07:52:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  9 Jan 2006 02:52:39 -0500
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 sylpheed-claws.spec, 1.31, 1.32
Message-ID: <200601090753.k097rBL6015975@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15942

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 Dec 2005 09:26:51 -0000	1.12
+++ .cvsignore	9 Jan 2006 07:52:38 -0000	1.13
@@ -1 +1 @@
-sylpheed-claws-2.0.0-rc2.tar.bz2
+sylpheed-claws-2.0.0-rc3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Dec 2005 09:26:51 -0000	1.13
+++ sources	9 Jan 2006 07:52:38 -0000	1.14
@@ -1 +1 @@
-1becc85e57825d4e654c34bf14e2877b  sylpheed-claws-2.0.0-rc2.tar.bz2
+105875aa5c853f47c38996bd8820a49e  sylpheed-claws-2.0.0-rc3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sylpheed-claws.spec	28 Dec 2005 08:46:36 -0000	1.31
+++ sylpheed-claws.spec	9 Jan 2006 07:52:38 -0000	1.32
@@ -2,12 +2,12 @@
 
 Name:           sylpheed-claws
 Version:        2.0.0
-Release:        0.rc2%{?dist}
+Release:        0.rc3%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc2.tar.bz2
+Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -47,7 +47,7 @@
 for development with %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q -n %{name}-%{version}-rc3
 
 %build
 #%if %openssl_pc
@@ -82,7 +82,7 @@
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
-%{__install} %{_builddir}/%{name}-%{version}-rc2/sylpheed-claws.png \
+%{__install} %{_builddir}/%{name}-%{version}-rc3/sylpheed-claws.png \
 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
 %clean
@@ -113,6 +113,10 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Mon Jan 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.0.0-0.rc3
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-0.rc2
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Jan  9 08:22:17 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Mon,  9 Jan 2006 03:22:17 -0500
Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.5,
	1.6
Message-ID: <200601090822.k098MnR3017779@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-netspeed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17762

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
Bumping devel for new libgtop



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-applet-netspeed.spec	21 Sep 2005 20:09:25 -0000	1.5
+++ gnome-applet-netspeed.spec	9 Jan 2006 08:22:17 -0000	1.6
@@ -53,6 +53,9 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-3
+- Rebuild for libgtop soname change
+
 * Wed Sep 21 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-2
 - Proper buildreps this time
 



From fedora-extras-commits at redhat.com  Mon Jan  9 09:35:21 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Jan 2006 04:35:21 -0500
Subject: fedora-security/audit fc4,1.119,1.120 fc5,1.30,1.31
Message-ID: <200601090935.k099ZLdR020147@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20127

Modified Files:
	fc4 fc5 
Log Message:
kernel update and some others (note the FEDORA-* id's in the announce
emails are incorrect)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc4	6 Jan 2006 20:16:08 -0000	1.119
+++ fc4	9 Jan 2006 09:35:13 -0000	1.120
@@ -1,8 +1,9 @@
-Up to date CVE as of CVE email 20060105
-Up to date FC4 as of 20060105
+Up to date CVE as of CVE email 20060108
+Up to date FC4 as of 20060108
 
 ** are items that need attention
 
+CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
@@ -26,7 +27,7 @@
 CVE-2005-3624 VULNERABLE (xpdf)
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-4618 VULNERABLE (kernel)
-CVE-2005-4605 VULNERABLE (kernel) bz#176813
+CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
@@ -62,7 +63,7 @@
 CVE-2005-3675 VULNERABLE (kernel) optack
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
-CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3656 backport (mod_auth_pgsql, fixed 2.0.3) [since FEDORA-2006-015]
 CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
@@ -79,6 +80,7 @@
 CVE-2005-3389 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3358 version (kernel, fixed 2.6.11)
+CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fc5	6 Jan 2006 20:16:08 -0000	1.30
+++ fc5	9 Jan 2006 09:35:13 -0000	1.31
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
 CVE-2005-3628 VULNERABLE (cups)
 CVE-2005-3628 VULNERABLE (poppler)
@@ -53,6 +54,7 @@
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
+CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)



From fedora-extras-commits at redhat.com  Mon Jan  9 10:51:12 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon,  9 Jan 2006 05:51:12 -0500
Subject: rpms/esmtp/FC-4 esmtp.spec,1.3,1.4
Message-ID: <200601091051.k09ApiRS022628@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/esmtp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22606

Modified Files:
	esmtp.spec 
Log Message:
* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
- convert man pages to utf8 (Dmitry Butskoy report)
- remove the workaround for libesmtp not requiring openssl (#166844 closed)




Index: esmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/esmtp/FC-4/esmtp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esmtp.spec	30 Aug 2005 09:05:27 -0000	1.3
+++ esmtp.spec	9 Jan 2006 10:51:11 -0000	1.4
@@ -2,7 +2,7 @@
 Summary(de):   Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
 Name:		esmtp
 Version:	0.5.1
-Release:	7%{?dist}
+Release:	10%{?dist}
 Source: 	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Source1:	esmtp-0.4.1-mutt
 Url:		http://esmtp.sourceforge.net/
@@ -11,8 +11,6 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):	%{_sbindir}/alternatives
-# workaround a missing libesmtp-devel Requires:
-BuildRequires:	openssl-devel
 BuildRequires:	libesmtp-devel
 Provides:       %{_sbindir}/sendmail
 # esmtp doesn't listen on port 25, so it cannot provide smtpdaemon. 
@@ -53,6 +51,9 @@
 %prep
 %setup -q
 cp %{SOURCE1} mutt-esmtp
+for file in esmtp.1 esmtprc.5; do
+   iconv -f ISO8859-1 -t UTF8 < $file > $file.new && mv -f $file.new $file
+done
 
 %build
 %configure
@@ -96,6 +97,12 @@
 %{_mandir}/man[^3]/esmtp*
 
 %changelog
+* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
+- convert man pages to utf8 (Dmitry Butskoy report)
+
+* Wed Nov 16 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-9
+- remove the workaround for libesmtp not requiring openssl (#166844 closed)
+
 * Mon Aug 29 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-7
 - uncomment german translation
 



From fedora-extras-commits at redhat.com  Mon Jan  9 11:02:18 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon,  9 Jan 2006 06:02:18 -0500
Subject: rpms/esmtp/devel esmtp.spec,1.5,1.6
Message-ID: <200601091103.k09B34ra024366@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/esmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24349

Modified Files:
	esmtp.spec 
Log Message:
* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
- convert man pages to utf8 (Dmitry Butskoy report)



Index: esmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/esmtp/devel/esmtp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- esmtp.spec	16 Nov 2005 12:07:33 -0000	1.5
+++ esmtp.spec	9 Jan 2006 11:02:18 -0000	1.6
@@ -2,7 +2,7 @@
 Summary(de):   Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
 Name:		esmtp
 Version:	0.5.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Source: 	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Source1:	esmtp-0.4.1-mutt
 Url:		http://esmtp.sourceforge.net/
@@ -51,6 +51,9 @@
 %prep
 %setup -q
 cp %{SOURCE1} mutt-esmtp
+for file in esmtp.1 esmtprc.5; do
+   iconv -f ISO8859-1 -t UTF8 < $file > $file.new && mv -f $file.new $file
+done
 
 %build
 %configure
@@ -94,6 +97,9 @@
 %{_mandir}/man[^3]/esmtp*
 
 %changelog
+* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
+- convert man pages to utf8 (Dmitry Butskoy report)
+
 * Wed Nov 16 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-9
 - remove the workaround for libesmtp not requiring openssl (#166844 closed)
 



From fedora-extras-commits at redhat.com  Mon Jan  9 11:26:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  9 Jan 2006 06:26:36 -0500
Subject: owners owners.list,1.513,1.514
Message-ID: <200601091127.k09BREfl024508@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24476

Modified Files:
	owners.list 
Log Message:
Add at-poke (as orphaned, because maintainer listed in changelog is not reachable and not via fedora-maintainers either)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- owners.list	8 Jan 2006 17:27:39 -0000	1.513
+++ owners.list	9 Jan 2006 11:26:36 -0000	1.514
@@ -49,6 +49,7 @@
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info



From fedora-extras-commits at redhat.com  Mon Jan  9 12:51:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Jan 2006 07:51:12 -0500
Subject: fedora-security/audit fc4,1.120,1.121
Message-ID: <200601091251.k09CpCjK026494@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26474

Modified Files:
	fc4 
Log Message:
Use proper errata id that bressers looked up



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc4	9 Jan 2006 09:35:13 -0000	1.120
+++ fc4	9 Jan 2006 12:51:04 -0000	1.121
@@ -12,23 +12,23 @@
 CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (poppler)
-CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (poppler)
-CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (poppler)
-CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3624 VULNERABLE (cups)
 CVE-2005-3624 VULNERABLE (poppler)
-CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
-CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
+CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
@@ -64,7 +64,7 @@
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
 CVE-2005-3656 backport (mod_auth_pgsql, fixed 2.0.3) [since FEDORA-2006-015]
-CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
+CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3627 backport (cups) [since FEDORA-2005-000**]
@@ -87,7 +87,7 @@
 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-3322 version (squid, not upstream) SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
-CVE-2005-3313 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
+CVE-2005-3313 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-3276 version (kernel, fixed 2.6.12.4) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3275 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3274 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]



From fedora-extras-commits at redhat.com  Mon Jan  9 13:54:14 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Jan 2006 08:54:14 -0500
Subject: fedora-security/audit fc4,1.121,1.122 fc5,1.31,1.32
Message-ID: <200601091354.k09DsEV7028425@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28406

Modified Files:
	fc4 fc5 
Log Message:
Deal with pdf issues which got messed out of order in the files - so sort
the files as well



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc4	9 Jan 2006 12:51:04 -0000	1.121
+++ fc4	9 Jan 2006 13:54:05 -0000	1.122
@@ -5,27 +5,7 @@
 
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
-CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (poppler)
-CVE-2005-3627 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (poppler)
-CVE-2005-3626 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (poppler)
-CVE-2005-3625 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3624 VULNERABLE (cups)
-CVE-2005-3624 VULNERABLE (poppler)
-CVE-2005-3624 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
@@ -67,9 +47,28 @@
 CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
-CVE-2005-3627 backport (cups) [since FEDORA-2005-000**]
-CVE-2005-3626 backport (cups) [since FEDORA-2005-000**]
-CVE-2005-3625 backport (cups) [since FEDORA-2005-000**]
+CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3627 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3627 VULNERABLE (poppler) bz#176873
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3626 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3626 VULNERABLE (poppler) bz#176873
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3625 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3625 VULNERABLE (poppler) bz#176873
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3624 VULNERABLE (poppler) bz#176873
+CVE-2005-3624 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3623 backport (kernel, fixed 2.6.14.5) [since FEDORA-2006-013]
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman)
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067]
@@ -105,25 +104,25 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
-CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
+CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
-CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE
+CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3185 blocked (wget) by FORTIFY_SOURCE
+CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE
 CVE-2005-3184 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3183 backport (w3c-libwww) [since FEDORA-2005-952]
 CVE-2005-3181 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013
@@ -149,29 +148,29 @@
 CVE-2005-2978 version (netpbm, fixed 10.25)
 CVE-2005-2977 backport (pam) [since FEDORA-2005-1031]
 CVE-2005-2976 backport (gdk-pixbuf) [since FEDORA-2005-1085]
-CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-2975 backport (gtk2) [since FEDORA-2005-1088]
+CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-2974 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-2973 version (kernel, 2.6.14 at least) [since FEODRA-2005-1067]
 CVE-2005-2970 VULNERABLE (httpd) bz#171759
-CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986]
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h) [since FEDORA-2005-986]
+CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986]
+CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963]
 CVE-2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh
 CVE-2005-2968 version (firefox) [since FEDORA-2005-926]
-CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963]
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md)
-CVE-2005-2933 VULNERABLE (uw-imap) bz#171345
 CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115]
+CVE-2005-2933 VULNERABLE (uw-imap) bz#171345
 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079]
 CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913]
 CVE-2005-2876 backport (util-linux) [since FEDORA-2005-887]
 CVE-2005-2874 version (cups, fixed 1.1.23)
 CVE-2005-2873 VULNERABLE (kernel) not upstream fixed
 CVE-2005-2872 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
-CVE-2005-2871 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] was backport [since FEDORA-2005-871]
-CVE-2005-2871 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] was backport [since FEDORA-2005-873]
 CVE-2005-2871 version (thunderbird) (moderate only) [since FEDORA-2005-963]
+CVE-2005-2871 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] was backport [since FEDORA-2005-873]
+CVE-2005-2871 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] was backport [since FEDORA-2005-871]
 CVE-2005-2811 version (net-snmp, not upstream) gentoo only
 CVE-2005-2801 version (kernel, fixed 2.6.11)
 CVE-2005-2800 version (kernel, fixed 2.6.12.6) [since FEDORA-2005-949] was backport since FEDORA-2005-906
@@ -184,25 +183,25 @@
 CVE-2005-2709 backport (kernel, fixed 2.6.14.3) [since FEDORA-2005-1104]
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2707 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2706 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2706 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2706 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2706 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2705 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2705 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2705 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2705 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2704 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2704 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2704 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2704 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2703 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2703 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2703 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2703 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2702 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2702 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2702 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
-CVE-2005-2701 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
+CVE-2005-2702 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2701 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2701 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]
 CVE-2005-2693 backport (cvs) [since FEDORA-2005-790]
 CVE-2005-2672 backport (lm_sensors) [since FEDORA-2005-1053]
@@ -211,10 +210,10 @@
 CVE-2005-2641 VULNERABLE (pam_ldap) bz#166164
 CVE-2005-2629 version (helixplayer, fixed 1.0.6) [since FEDORA-2005-940]
 CVE-2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
-CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2602 ignore (thunderbird) probably
-CVE-2005-2558 ignore (mysql) not an issue
+CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2558 version (mysql, fixed 4.1.13) [since FEDORA-2005-974]
+CVE-2005-2558 ignore (mysql) not an issue
 CVE-2005-2555 version (kernel, fixed 2.6.12.6pre) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-2553 version (kernel, not 2.6)
 CVE-2005-2550 backport (evolution) [since FEDORA-2005-743]
@@ -228,11 +227,11 @@
 CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
 CVE-2005-2495 backport (xorg-x11) [since FEDORA-2005-894]
 CVE-2005-2494 version (kdebase, fixed after 3.4.2) [since FEDORA-2005-1152]
+CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2491 ignore (python, fc4 python does not contain pcre)
-CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
-CVE-2005-2491 ignore (httpd, pcre uses system pcre)
 CVE-2005-2491 ignore (php, pcre uses system pcre)
-CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
+CVE-2005-2491 ignore (httpd, pcre uses system pcre)
+CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
 CVE-2005-2490 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2475 VULNERABLE (unzip) bz#164928
 CVE-2005-2471 version (netpbm, 10.31 at least) [since FEDORA-2005-000**] was backport since FEDORA-2005-728
@@ -260,34 +259,34 @@
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3) [since FEDORA-2005-936]
 CVE-2005-2335 version (fetchmail, fixed 6.2.5.2) [since FEDORA-2005-1108] was backport since FEDORA-2005-613
-CVE-2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2269 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2269 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+CVE-2005-2269 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2268 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2267 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2267 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2266 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2266 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
-CVE-2005-2265 version (mozilla, fixed 1.7.9) [si [since FEDORA-2005-619]
+CVE-2005-2266 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2265 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+CVE-2005-2265 version (mozilla, fixed 1.7.9) [si [since FEDORA-2005-619]
+CVE-2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
 CVE-2005-2264 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2263 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2262 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2261 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2261 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
-CVE-2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+CVE-2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2260 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
-CVE-2005-2114 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2114 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2114 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2104 version (sysreport, fixed 1.4.1-5) [since FEDORA-2005-1071]
 CVE-2005-2103 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
 CVE-2005-2102 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
@@ -295,8 +294,8 @@
 CVE-2005-2100 version (kernel, not upstream) only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 CVE-2005-2098 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
-CVE-2005-2097 backport (cups) [since FEDORA-2005-732]
 CVE-2005-2097 version (xpdf, fixed 3.0.1) [since FEDORA-2005-755] was backport since FEDORA-2005-729
+CVE-2005-2097 backport (cups) [since FEDORA-2005-732]
 CVE-2005-2096 backport (zlib) [since FEDORA-2005-523]
 CVE-2005-2096 backport (rpm) [since FEDORA-2005-565]
 CVE-2005-2095 version (squirrelmail, fixed 1.4.5) since [FEDORA-2005-780]
@@ -306,8 +305,8 @@
 CVE-2005-2023 version (gnupg, fixed 1.9.15)
 CVE-2005-1993 backport (sudo, fixed 1.6.8p9) [since FEDORA-2005-472]
 CVE-2005-1992 version (ruby, fixed 1.8.3 at least) [since FEDORA-2005-936] was backport since FEDORA-2005-475
-CVE-2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-1937 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
 CVE-2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 CVE-2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
@@ -325,11 +324,11 @@
 CVE-2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 CVE-2005-1761 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
 CVE-2005-1760 VULNERABLE (sysreport)
-CVE-2005-1759 ignore (openldap, fixed shtool 2.0.2) flawed code path not used
 CVE-2005-1759 ignore (php) dead code path
-CVE-2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
+CVE-2005-1759 ignore (openldap, fixed shtool 2.0.2) flawed code path not used
 CVE-2005-1751 ignore (openldap, fixed shtool 2.0.2) flawed code path not used
 CVE-2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
+CVE-2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
 CVE-2005-1740 backport (net-snmp, not fixed)
 CVE-2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1]
 CVE-2005-1705 backport (gdb) [since FEDORA-2005-1033]
@@ -341,11 +340,11 @@
 CVE-2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0
 CVE-2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 CVE-2005-1544 version (libtiff, fixed 3.7.1 at least)
-CVE-2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
 CVE-2005-1532 version (thunderbird) [since FEDORA-2005-606]
 CVE-2005-1532 version (mozilla, fixed 1.7.8) [since re0522.0]
-CVE-2005-1531 version (firefox, fixed 1.0.4) [since re0522.0]
+CVE-2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
 CVE-2005-1531 version (mozilla, fixed 1.7.8) [since re0522.0]
+CVE-2005-1531 version (firefox, fixed 1.0.4) [since re0522.0]
 CVE-2005-1519 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA (re0522.0)
 CVE-2005-1470 version (ethereal, fixed 0.10.11)
 CVE-2005-1469 version (ethereal, fixed 0.10.11)
@@ -393,10 +392,10 @@
 CVE-2005-1184 ignore (kernel) expected to not be an issue
 CVE-2005-1175 backport (krb5) [since FEDORA-2005-553]
 CVE-2005-1174 backport (krb5) [since FEDORA-2005-553]
-CVE-2005-1160 version (firefox, mozilla)
 CVE-2005-1160 version (thunderbird) [since FEDORA-2005-606]
-CVE-2005-1159 version (firefox, mozilla)
+CVE-2005-1160 version (firefox, mozilla)
 CVE-2005-1159 version (thunderbird) [since FEDORA-2005-606]
+CVE-2005-1159 version (firefox, mozilla)
 CVE-2005-1158 version (firefox, fixed 1.0.3)
 CVE-2005-1157 version (firefox, mozilla)
 CVE-2005-1156 version (firefox, mozilla)
@@ -413,9 +412,9 @@
 CVE-2005-1039 ignore (coreutils) not fixed upstream, not a real issue
 CVE-2005-1038 backport (cron) from srpm
 CVE-2005-0990 backport (sharutils) from srpm
+CVE-2005-0989 version (thunderbird) [since FEDORA-2005-606]
 CVE-2005-0989 version (mozilla, fixed 1.7.7)
 CVE-2005-0989 version (firefox, fixed 1.0.3)
-CVE-2005-0989 version (thunderbird) [since FEDORA-2005-606]
 CVE-2005-0988 backport (gzip) from srpm
 CVE-2005-0977 version (kernel, fixed 2.6.11)
 CVE-2005-0967 version (gaim, fixed 1.2.1)
@@ -470,6 +469,7 @@
 CVE-2005-0593 version (firefox, mozilla)
 CVE-2005-0592 version (firefox, mozilla)
 CVE-2005-0591 version (firefox, fixed 1.0.1)
+CVE-2005-0590 version (openswan, fixed 2.1.4)
 CVE-2005-0590 version (firefox, mozilla, thunderbird)
 CVE-2005-0589 version (firefox, fixed 1.0.1)
 CVE-2005-0588 version (firefox, mozilla)
@@ -478,6 +478,7 @@
 CVE-2005-0585 version (firefox, mozilla)
 CVE-2005-0584 version (firefox, mozilla)
 CVE-2005-0578 version (firefox, mozilla)
+CVE-2005-0565 version (kernel, not 2.6)
 CVE-2005-0532 version (kernel, fixed 2.6.11)
 CVE-2005-0531 version (kernel, fixed 2.6.11)
 CVE-2005-0530 version (kernel, fixed 2.6.11)
@@ -502,8 +503,8 @@
 CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020
 CVE-2005-0403 version (kernel, not upstream)
 CVE-2005-0402 version (firefox, fixed 1.0.2)
-CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0401 version (mozilla, fixed 1.7.7)
+CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0400 version (kernel, fixed in bk since 20050325, therefore 2.6.11.6) [since FEDORA-2005-510] was backport
 CVE-2005-0399 version (mozilla, Firefox, thunderbird)
 CVE-2005-0398 version (ipsec-tools, fixed 0.5)
@@ -513,8 +514,8 @@
 CVE-2005-0372 version (gftp, fixed in 2.0.18 at least by inspection)
 CVE-2005-0365 version (kdelibs, not 3.4)
 CVE-2005-0337 version (postfix, not 2.2)
-CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (thunderbird, fixed 1.0.2)
+CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (firefox, fixed 1.0.1)
 CVE-2005-0247 version (postgresql, fixed after 8.0)
 CVE-2005-0246 version (postgresql, fixed 8.0.1)
@@ -529,8 +530,8 @@
 CVE-2005-0232 version (firefox, fixed 1.0.1)
 CVE-2005-0231 version (mozilla, fixed 1.7.6)
 CVE-2005-0231 version (firefox, fixed 1.0.1)
-CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (thunderbird, fixed 1.0.2)
+CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (firefox, fixed 1.0.1)
 CVE-2005-0227 version (postgresql, fixed 8.0.1)
 CVE-2005-0215 version (mozilla)
@@ -593,10 +594,10 @@
 CVE-2005-0077 version (perl-DBI, fixed in 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0069 backport (vim) in vim-6.3-tmpfile.patch
+CVE-2005-0064 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since GA
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kpdf, not 3.4)
 CVE-2005-0064 backport (cups) patch in SRPM
-CVE-2005-0064 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since GA
 CVE-2005-0039 ignore (not a vulnerability) don't do this says the rfc
 CVE-2005-0034 version (bind, fixed after 9.3.0)
 CVE-2005-0033 version (bind, not 9)
@@ -713,9 +714,9 @@
 CVE-2004-1139 version (ethereal, fixed 0.10.8)
 CVE-2004-1138 version (vim, fixed 6.3)
 CVE-2004-1137 version (kernel, fixed 2.6.10)
-CVE-2004-1125 version (kdegraphics, not 3.4)
-CVE-2004-1125 version (tetex, at least 3.0)
 CVE-2004-1125 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
+CVE-2004-1125 version (tetex, at least 3.0)
+CVE-2004-1125 version (kdegraphics, not 3.4)
 CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)
 CVE-2004-1093 version (mc, fixed 4.6.0)
 CVE-2004-1092 version (mc, fixed 4.6.0)
@@ -759,8 +760,8 @@
 CVE-2004-0981 version (ImageMagick, fixed 6.1.0)
 CVE-2004-0977 version (postgresql, fixed after 7.4.6)
 CVE-2004-0976 backport (perl) [since FEDORA-2005-1077]
-CVE-2004-0975 backport (openssl097a, fixed 0.9.7f) from srpm
 CVE-2004-0975 version (openssl, fixed 0.9.7f)
+CVE-2004-0975 backport (openssl097a, fixed 0.9.7f) from srpm
 CVE-2004-0974 version (netatalk, fixed 2.0.1 says netatalk ChangeLog)
 CVE-2004-0972 version (lvm2, fixed 2.2.01.8 at least)
 CVE-2004-0971 backport (krb5, see bug 136307) fixed by patch in SRPM
@@ -775,7 +776,6 @@
 CVE-2004-0958 version (php, fixed 4.3.9)
 CVE-2004-0957 version (mysql, fixed 4.0.21)
 CVE-2004-0956 version (mysql, fixed 4.0.20)
-CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
 CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream bz#175414
@@ -796,16 +796,17 @@
 CVE-2004-0902 version (mozilla #133023, fixed 1.7.3)
 CVE-2004-0891 version (gaim, fixed 1.0.2)
 CVE-2004-0889 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
-CVE-2004-0888 version (kpdegraphics, not 3.4)
+CVE-2004-0888 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
 CVE-2004-0888 version (tetex, fixed 3.0)
+CVE-2004-0888 version (kpdegraphics, not 3.4)
 CVE-2004-0888 backport (cups) patch in SRPM
-CVE-2004-0888 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
 CVE-2004-0887 version (kernel, fixed 2.6.10)
-CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0886 version (libtiff, fixed 3.7.1 at least)
+CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0885 version (httpd, fixed after 2.0.52)
 CVE-2004-0884 version (cyrus-sasl, fixed 2.1.20)
 CVE-2004-0883 version (kernel, fixed 2.6.11)
+CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0882 version (samba, fixed 3.0.8)
 CVE-2004-0871 ignore (mozilla, unfixed upstream with no patch)
 CVE-2004-0870 ignore (kde) upstream won't fix
@@ -828,27 +829,27 @@
 CVE-2004-0808 version (samba, fixed 3.0.7)
 CVE-2004-0807 version (samba, fixed 3.0.7)
 CVE-2004-0806 version (cdrtools, fixed 2.0.1)
-CVE-2004-0804 version (kdegraphics)
 CVE-2004-0804 version (libtiff, fixed after 3.6.1)
-CVE-2004-0803 version (kdegraphics)
+CVE-2004-0804 version (kdegraphics)
 CVE-2004-0803 version (libtiff, fixed after 3.6.1)
+CVE-2004-0803 version (kdegraphics)
 CVE-2004-0802 version (imlib, fixed 1.1.2)
 CVE-2004-0801 version (foomatic, fixed 3.0.2)
 CVE-2004-0797 version (zlib, fixed in 1.2.2.2 at least)
+CVE-2004-0797 version (zlib)
 CVE-2004-0796 version (spamassassin, fixed 2.64)
 CVE-2004-0792 version (rsync, fixed 2.6.3)
 CVE-2004-0791 version (kernel, fixed 2.6.9)
 CVE-2004-0790 version (doesn't affect linux 2.4, 2.6)
-CVE-2004-0797 version (zlib)
-CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0788 version (gtk2, fixed 2.6.7 at least by inspection)
+CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0786 version (apr-util, fixed 2.0.51)
 CVE-2004-0785 version (gaim, fixed 0.82)
 CVE-2004-0784 version (gaim, fixed 0.82)
-CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0783 version (gtk2, fixed 2.6.7 at least by inspection)
-CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
+CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0782 version (gtk2, fixed 2.6.7 at least by inspection)
+CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0779 version (mozilla, firefox, thunderbird)
 CVE-2004-0778 version (cvs, fixed 1.11.17)
 CVE-2004-0772 version (krb5, fixed after 1.2.8)
@@ -866,8 +867,8 @@
 CVE-2004-0757 version (mozilla #229374, fixed 1.7)
 CVE-2004-0755 version (ruby, fixed 1.8.1)
 CVE-2004-0754 version (gaim, fixed 0.82)
-CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0753 version (gtk2, fixed after 2.2.4)
+CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0752 version (openoffice.org, fixed after 1.1.2)
 CVE-2004-0751 version (httpd, fixed 2.0.51)
 CVE-2004-0750 version (system-config-nfs, fixed 1.0.13)
@@ -916,11 +917,9 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
-CVE-2005-0590 version (openswan, fixed 2.1.4)
 CVE-2004-0587 version (kernel, not upstream flaw)
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
-CVE-2005-0565 version (kernel, not 2.6)
 CVE-2004-0554 version (kernel, fixed 2.6.7)
 CVE-2004-0548 ignore (aspell, not fixed 0.50.5) not a security issue
 CVE-2004-0547 version (postgresql, fixed 7.2.1)
@@ -944,9 +943,9 @@
 CVE-2004-0492 version (httpd, not 2.0)
 CVE-2004-0491 version (kernel, not upstream)
 CVE-2004-0488 version (httpd, fixed 2.0.50)
+CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0461 version (dhcp, fixed after 3.0.1rc13)
 CVE-2004-0460 version (dhcp, fixed after 3.0.1rc13)
-CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0457 version (mysql, fixed after 4.0.20)
 CVE-2004-0452 backport (perl, not 5.8.6)
 CVE-2004-0447 version (kernel, fixed 2.6.5)
@@ -1009,8 +1008,8 @@
 CVE-2004-0150 version (python, fixed 2.2.2)
 CVE-2004-0133 version (kernel, 2.6.4)
 CVE-2004-0113 version (httpd, fixed 2.0.49)
-CVE-2004-0112 backport (openssl097a, fixed 0.9.7d) from srpm
 CVE-2004-0112 version (openssl, fixed 0.9.7d)
+CVE-2004-0112 backport (openssl097a, fixed 0.9.7d) from srpm
 CVE-2004-0111 version (gdk-pixbuf, fixed 0.20)
 CVE-2004-0110 version (libxml2, fixed 2.6.6)
 CVE-2004-0109 version (kernel, fixed 2.6.6)
@@ -1028,8 +1027,8 @@
 CVE-2004-0081 version (openssl097a, fixed 0.9.6d)
 CVE-2004-0081 version (openssl, fixed 0.9.6d)
 CVE-2004-0080 version (util-linux, fixed after 2.11f)
-CVE-2004-0079 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2004-0079 version (openssl, fixed 0.9.7c)
+CVE-2004-0079 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2004-0078 version (mutt, fixed 1.4.2)
 CVE-2004-0077 version (kernel, fixed 2.6.3)
 CVE-2004-0075 version (kernel, not 2.6)
@@ -1043,8 +1042,8 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1265 VULNERABLE (mozilla)
+CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1232 version (emacs, fixed 21.3)
 CVE-2003-1201 version (openldap, not 2.2)
 CVE-2003-1161 version (kernel, not released version)
@@ -1054,14 +1053,14 @@
 CVE-2003-1013 version (ethereal, fixed 0.10.0)
 CVE-2003-1012 version (ethereal, fixed 0.10.0)
 CVE-2003-0993 version (httpd, not 2.0)
+CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0992 version (mailman, fixed 2.1.3)
 CVE-2003-0991 version (mailman, fixed 2.0.14)
 CVE-2003-0990 version (squirrelmail, fixed after 1.4.0)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
-CVE-2003-0988 version (kde, fixed 3.1.5)
-CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
 CVE-2003-0988 version (kdepim, fixed 3.1.5)
+CVE-2003-0988 version (kde, fixed 3.1.5)
 CVE-2003-0987 version (httpd, not 2.0)
 CVE-2003-0985 version (kernel, not 2.6)
 CVE-2003-0984 version (kernel, fixed 2.4.23)
@@ -1143,12 +1142,12 @@
 CVE-2003-0548 version (gdm, fixed 2.4.1.6)
 CVE-2003-0547 version (gdm, fixed 2.4.1.6)
 CVE-2003-0546 version (up2date, fixed after 3.1.23)
-CVE-2003-0545 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0545 version (openssl, fixed 0.9.7c)
-CVE-2003-0544 backport (openssl097a, fixed 0.9.7c) in srpm
+CVE-2003-0545 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0544 version (openssl, fixed 0.9.7c)
-CVE-2003-0543 backport (openssl097a, fixed 0.9.7c) in srpm
+CVE-2003-0544 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0543 version (openssl, fixed 0.9.7c)
+CVE-2003-0543 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0542 version (httpd, fixed 2.0.48)
 CVE-2003-0541 backport (gtkhtml, fixed 1.1.10) gtkhtml-1.1.9-textslave.patch
 CVE-2003-0540 version (postfix, not 2.0 onwards)
@@ -1190,13 +1189,13 @@
 CVE-2003-0289 version (cdrtools, fixed 2.01a14)
 CVE-2003-0282 version (unzip, fixed 5.51)
 CVE-2003-0255 version (gnupg, fixed 1.2.2)
-CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0253 version (httpd, fixed 2.0.47)
 CVE-2003-0252 version (nfs-utils, fixed 1.0.4)
 CVE-2003-0251 version (ypserv, fixed 2.7)
 CVE-2003-0248 version (kernel, not 2.6)
 CVE-2003-0247 version (kernel, not 2.6)
 CVE-2003-0246 version (kernel, not 2.6)
+CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0245 version (httpd, fixed 2.0.46)
 CVE-2003-0244 version (kernel, not 2.6)
 CVE-2003-0211 version (xinetd, fixed 2.3.11)
@@ -1217,8 +1216,8 @@
 CVE-2003-0160 version (squirrelmail, fixed 1.2.11)
 CVE-2003-0159 version (ethereal, fixed after 0.9.9)
 CVE-2003-0150 version (mysql, fixed 3.23.56)
-CVE-2003-0147 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0147 version (openssl, fixed 0.9.7b)
+CVE-2003-0147 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0146 version (netpbm, fixed 10.18)
 CVE-2003-0145 version (tcpdump, fixed 3.7.2)
 CVE-2003-0140 version (mutt, fixed 1.4.1)
@@ -1227,8 +1226,8 @@
 CVE-2003-0135 version (vsftpd, not upstream)
 CVE-2003-0133 version (evolution, fixed 1.2.4)
 CVE-2003-0132 version (httpd, fixed 2.0.45)
-CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0131 version (openssl, fixed 0.9.7b)
+CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0130 version (evolution, fixed 1.2.3)
 CVE-2003-0129 version (evolution, fixed 1.2.3)
 CVE-2003-0128 version (evolution, fixed 1.2.3)
@@ -1259,8 +1258,8 @@
 CVE-2003-0043 version (tomcat, fixed 3.3.1a)
 CVE-2003-0041 version (krb5, fixed after 1.2.7)
 CVE-2003-0038 version (mailman, fixed 2.0.13 at least)
-CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0028 version (krb5, fixed after 1.2.7)
+CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0026 version (dhcpd, fixed 3.0.1)
 CVE-2003-0020 version (httpd, fixed 2.0.49)
 CVE-2003-0019 version (kernel-utils, not upstream)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fc5	9 Jan 2006 09:35:13 -0000	1.31
+++ fc5	9 Jan 2006 13:54:05 -0000	1.32
@@ -14,26 +14,7 @@
 
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
-CVE-2005-3628 VULNERABLE (cups)
-CVE-2005-3628 VULNERABLE (poppler)
-CVE-2005-3628 VULNERABLE (xpdf)
-CVE-2005-3628 backport (kdegraphics)
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (poppler)
-CVE-2005-3627 VULNERABLE (xpdf)
-CVE-2005-3627 backport (kdegraphics)
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (poppler)
-CVE-2005-3626 VULNERABLE (xpdf)
-CVE-2005-3626 backport (kdegraphics)
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (poppler)
-CVE-2005-3625 VULNERABLE (xpdf)
-CVE-2005-3625 backport (kdegraphics)
-CVE-2005-3624 VULNERABLE (cups)
-CVE-2005-3624 VULNERABLE (poppler)
-CVE-2005-3624 VULNERABLE (xpdf)
-CVE-2005-3624 backport (kdegraphics)
+CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
@@ -48,29 +29,10 @@
 CVE-2005-4130 ** (HelixPlayer) no information available
 CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 VULNERABLE (curl)
-CVE-2005-3896 ignore (mozilla) recoverable DoS only
-CVE-2005-3651 VULNERABLE (ethereal)
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
-CVE-2005-3193 VULNERABLE (xpdf)
-CVE-2005-3193 VULNERABLE (kdegraphics)
-CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler)
-CVE-2005-3192 VULNERABLE (xpdf)
-CVE-2005-3192 VULNERABLE (kdegraphics)
-CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler)
-CVE-2005-3191 VULNERABLE (xpdf)
-CVE-2005-3191 VULNERABLE (kdegraphics)
-CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler)
 CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 VULNERABLE (perl)
 CVE-2005-3912 ** (perl)
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3883 VULNERABLE (php)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
 CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
@@ -91,8 +53,33 @@
 CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
 CVE-2005-3662 version (netpbm)
 CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
+CVE-2005-3628 VULNERABLE (xpdf)
+CVE-2005-3628 VULNERABLE (poppler)
+CVE-2005-3628 VULNERABLE (kdegraphics)
+CVE-2005-3628 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (kdegraphics)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (kdegraphics)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (kdegraphics)
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (kdegraphics)
+CVE-2005-3624 VULNERABLE (cups)
+CVE-2005-3623 VULNERABLE (kernel, fixed 2.6.14.5)
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman) not fixed 2.1.6 BZ#174166
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least)
@@ -102,7 +89,10 @@
 CVE-2005-3390 VULNERABLE (php) BZ#174167
 CVE-2005-3389 VULNERABLE (php) BZ#174168
 CVE-2005-3388 VULNERABLE (php) BZ#174169
+CVE-2005-3358 version (kernel, fixed 2.6.11)
+CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
 CVE-2005-3353 version (php, not 5.0)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3351 version (spamassassin, fixed 3.1.0)
 CVE-2005-3322 version (squid) not upstream, SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
@@ -125,12 +115,21 @@
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
 CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3193 VULNERABLE (tetex)
+CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3192 VULNERABLE (tetex)
+CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (kdegraphics)
 CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3186 backport (gdk-pixbuf)
+CVE-2005-3191 VULNERABLE (tetex)
+CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
-CVE-2005-3185 version (curl, fixed 7.15)
+CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
+CVE-2005-3185 version (curl, fixed 7.15)
 CVE-2005-3184 version (ethereal, fixed 0.10.13)
 CVE-2005-3181 version (kernel, fixed 2.6.13.4 at least)
 CVE-2005-3180 version (kernel, fixed 2.6.13.4 at least)
@@ -155,15 +154,15 @@
 CVE-2005-2978 version (netpbm, fixed 10.25)
 CVE-2005-2977 backport (pam)
 CVE-2005-2976 backport (gdk-pixbuf)
-CVE-2005-2975 backport (gdk-pixbuf)
 CVE-2005-2975 version (gtk2, fixed 2.8.7)
+CVE-2005-2975 backport (gdk-pixbuf)
 CVE-2005-2973 version (kernel, fixed 2.6.14 at least)
 CVE-2005-2970 VULNERABLE (httpd, fixed 2.0.55) BZ#174170
 CVE-2005-2969 version (openssl, fixed 0.9.8a)
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h)
+CVE-2005-2968 version (thunderbird)
 CVE-2005-2968 version (mozilla, not 1.7.10)
 CVE-2005-2968 version (firefox)
-CVE-2005-2968 version (thunderbird)
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 version (openssl, fixed 0.9.8)
 CVE-2005-2933 VULNERABLE (libc-client) BZ#174171
@@ -173,9 +172,9 @@
 CVE-2005-2874 version (cups, fixed 1.1.23)
 CVE-2005-2873 VULNERABLE (kernel) not fixed upstream
 CVE-2005-2872 version (kernel, fixed 2.6.12)
-CVE-2005-2871 version (firefox, fixed 1.0.7)
-CVE-2005-2871 version (mozilla, fixed 1.7.12)
 CVE-2005-2871 version (thunderbird)
+CVE-2005-2871 version (mozilla, fixed 1.7.12)
+CVE-2005-2871 version (firefox, fixed 1.0.7)
 CVE-2005-2811 version (net-snmp) not upstream, gentoo only
 CVE-2005-2801 version (kernel, fixed 2.6.11)
 CVE-2005-2800 version (kernel, fixed 2.6.12.6)
@@ -188,25 +187,25 @@
 CVE-2005-2709 VULNERABLE (kernel, fixed 2.6.14.3)
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird)
-CVE-2005-2707 version (firefox, fixed 1.0.7)
 CVE-2005-2707 version (mozilla, fixed 1.7.12)
+CVE-2005-2707 version (firefox, fixed 1.0.7)
 CVE-2005-2706 version (thunderbird)
-CVE-2005-2706 version (firefox, fixed 1.0.7)
 CVE-2005-2706 version (mozilla, fixed 1.7.12)
+CVE-2005-2706 version (firefox, fixed 1.0.7)
 CVE-2005-2705 version (thunderbird)
-CVE-2005-2705 version (firefox, fixed 1.0.7)
 CVE-2005-2705 version (mozilla, fixed 1.7.12)
+CVE-2005-2705 version (firefox, fixed 1.0.7)
 CVE-2005-2704 version (thunderbird)
-CVE-2005-2704 version (firefox, fixed 1.0.7)
 CVE-2005-2704 version (mozilla, fixed 1.7.12)
+CVE-2005-2704 version (firefox, fixed 1.0.7)
 CVE-2005-2703 version (thunderbird)
-CVE-2005-2703 version (firefox, fixed 1.0.7)
 CVE-2005-2703 version (mozilla, fixed 1.7.12)
+CVE-2005-2703 version (firefox, fixed 1.0.7)
 CVE-2005-2702 version (thunderbird)
-CVE-2005-2702 version (firefox, fixed 1.0.7)
 CVE-2005-2702 version (mozilla, fixed 1.7.12)
-CVE-2005-2701 version (firefox, fixed 1.0.7)
+CVE-2005-2702 version (firefox, fixed 1.0.7)
 CVE-2005-2701 version (mozilla, fixed 1.7.12)
+CVE-2005-2701 version (firefox, fixed 1.0.7)
 CVE-2005-2700 backport (httpd, fixed 2.0.55) 
 CVE-2005-2693 backport (cvs) cvs-1.11.19-tmp.patch
 CVE-2005-2672 backport (lm_sensors)
@@ -215,10 +214,10 @@
 CVE-2005-2641 version (nss_ldap, fixed pam_ldap:180)
 CVE-2005-2629 version (HelixPlayer, fixed 1.0.6)
 CVE-2005-2617 version (kernel, fixed 2.6.12.5)
-CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2602 ignore (thunderbird) probably
-CVE-2005-2558 ignore (mysql) not an issue
+CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2558 version (mysql, fixed 4.1.13)
+CVE-2005-2558 ignore (mysql) not an issue
 CVE-2005-2555 version (kernel, fixed 2.6.12.6pre)
 CVE-2005-2553 version (kernel, not 2.6)
 CVE-2005-2550 version (evolution, fixed after 2.3.6.1)
@@ -231,11 +230,11 @@
 CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
 CVE-2005-2495 version (xorg-x11-server, fixed 0.99.3 at least)
 CVE-2005-2494 version (kdebase, fixed after 3.4.2)
-CVE-2005-2491 ignore (python) fc4 python does not contain pcre
+CVE-2005-2492 version (kernel, fixed 2.6.13.1)
 CVE-2005-2491 version (pcre, fixed 6.2)
-CVE-2005-2491 ignore (httpd) httpd uses system pcre
+CVE-2005-2491 ignore (python) fc4 python does not contain pcre
 CVE-2005-2491 ignore (php) php uses system pcre
-CVE-2005-2492 version (kernel, fixed 2.6.13.1)
+CVE-2005-2491 ignore (httpd) httpd uses system pcre
 CVE-2005-2490 version (kernel, fixed 2.6.13.1)
 CVE-2005-2475 backport (unzip)
 CVE-2005-2471 backport (netpbm, fixed 10.31 at least) netpbm-10.28-CAN-2005-2471.patch
@@ -263,34 +262,34 @@
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3)
 CVE-2005-2335 version (fetchmail, fixed 6.2.5.2)
-CVE-2005-2270 version (firefox, fixed 1.0.5)
-CVE-2005-2270 version (mozilla, fixed 1.7.9)
 CVE-2005-2270 version (thunderbird, fixed 1.0.5)
-CVE-2005-2269 version (firefox, fixed 1.0.5)
-CVE-2005-2269 version (mozilla, fixed 1.7.9)
+CVE-2005-2270 version (mozilla, fixed 1.7.9)
+CVE-2005-2270 version (firefox, fixed 1.0.5)
 CVE-2005-2269 version (thunderbird, fixed 1.0.5)
-CVE-2005-2268 version (firefox, fixed 1.0.5)
+CVE-2005-2269 version (mozilla, fixed 1.7.9)
+CVE-2005-2269 version (firefox, fixed 1.0.5)
 CVE-2005-2268 version (mozilla, fixed 1.7.9)
+CVE-2005-2268 version (firefox, fixed 1.0.5)
 CVE-2005-2267 version (mozilla, fixed 1.7.9)
 CVE-2005-2267 version (firefox, fixed 1.0.5)
-CVE-2005-2266 version (firefox, fixed 1.0.5)
-CVE-2005-2266 version (mozilla, fixed 1.7.9)
 CVE-2005-2266 version (thunderbird, fixed 1.0.5)
-CVE-2005-2265 version (firefox, fixed 1.0.5)
-CVE-2005-2265 version (mozilla, fixed 1.7.9)
+CVE-2005-2266 version (mozilla, fixed 1.7.9)
+CVE-2005-2266 version (firefox, fixed 1.0.5)
 CVE-2005-2265 version (thunderbird, fixed 1.0.5)
+CVE-2005-2265 version (mozilla, fixed 1.7.9)
+CVE-2005-2265 version (firefox, fixed 1.0.5)
 CVE-2005-2264 version (firefox, fixed 1.0.5)
-CVE-2005-2263 version (firefox, fixed 1.0.5)
 CVE-2005-2263 version (mozilla, fixed 1.7.9)
+CVE-2005-2263 version (firefox, fixed 1.0.5)
 CVE-2005-2262 version (firefox, fixed 1.0.5)
 CVE-2005-2261 version (thunderbird, fixed 1.0.5)
-CVE-2005-2261 version (firefox, fixed 1.0.5)
 CVE-2005-2261 version (mozilla, fixed 1.7.9)
-CVE-2005-2260 version (firefox, fixed 1.0.5)
+CVE-2005-2261 version (firefox, fixed 1.0.5)
 CVE-2005-2260 version (mozilla, fixed 1.7.9)
+CVE-2005-2260 version (firefox, fixed 1.0.5)
 CVE-2005-2177 version (net-snmp, fixed 5.2.1.2)
-CVE-2005-2114 version (firefox, fixed 1.0.5)
 CVE-2005-2114 version (mozilla, fixed 1.7.9)
+CVE-2005-2114 version (firefox, fixed 1.0.5)
 CVE-2005-2104 version (sysreport, fixed 1.4.1-5)
 CVE-2005-2103 version (gaim, fixed 1.5.0)
 CVE-2005-2102 version (gaim, fixed 1.5.0)
@@ -298,19 +297,19 @@
 CVE-2005-2100 version (kernel, not 2.6) not upstream only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5)
 CVE-2005-2098 version (kernel, fixed 2.6.12.5)
-CVE-2005-2097 backport (cups)
 CVE-2005-2097 version (xpdf, fixed 3.0.1)
-CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
+CVE-2005-2097 backport (cups)
 CVE-2005-2096 version (rpm, fixed 4.4.2)
+CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
 CVE-2005-2095 version (squirrelmail, fixed 1.4.5)
 CVE-2005-2088 backport (httpd, fixed 2.0.55)
-CVE-2005-2069 backport (openldap) openldap-2.2.13-tls-fix-connection-test.patch
 CVE-2005-2069 version (nss_ldap, fixed pam_ldap:180)
+CVE-2005-2069 backport (openldap) openldap-2.2.13-tls-fix-connection-test.patch
 CVE-2005-2023 version (gnupg, fixed 1.9.15)
 CVE-2005-1993 version (sudo, fixed 1.6.8p9)
 CVE-2005-1992 version (ruby, fixed 1.8.3 at least)
-CVE-2005-1937 version (firefox, fixed 1.0.5)
 CVE-2005-1937 version (mozilla, fixed 1.7.9)
+CVE-2005-1937 version (firefox, fixed 1.0.5)
 CVE-2005-1934 version (gaim, fixed 1.3.1)
 CVE-2005-1921 version (php, fixed xml_rpc:1.3.1)
 CVE-2005-1920 version (kdelibs, fixed 3.4.1)
@@ -328,27 +327,27 @@
 CVE-2005-1762 version (kernel, fixed 2.6.12)
 CVE-2005-1761 version (kernel, fixed 2.6.12.2)
 CVE-2005-1760 version (sysreport, fixed 1.4.1-3)
-CVE-2005-1759 ignore (openldap) fixed shtool 2.0.2 flawed code path not used
 CVE-2005-1759 ignore (php) dead code path
+CVE-2005-1759 ignore (openldap) fixed shtool 2.0.2 flawed code path not used
 CVE-2005-1751 version (nmap, fixed 3.93 at least)
 CVE-2005-1751 ignore (openldap) fixed shtool 2.0.2. Flawed code path not used
 CVE-2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
 CVE-2005-1740 version (net-snmp, fixed 5.2.2.rc5 at least)
 CVE-2005-1739 version (ImageMagick, fixed 6.2.2.3)
 CVE-2005-1705 backport (gdb)
-CVE-2005-1704 backport (gdb)
 CVE-2005-1704 version (binutils, fixed 2.16.91.0.3 at least)
+CVE-2005-1704 backport (gdb)
 CVE-2005-1689 version (krb5, fixed 1.4.2)
 CVE-2005-1686 ignore (gedit) not a vulnerability
 CVE-2005-1636 version (mysql, fixed 4.1.12)
 CVE-2005-1589 version (kernel, fixed 2.6.11.10)
 CVE-2005-1571 version (php, fixed shtool 2.0.2)
 CVE-2005-1544 version (libtiff, fixed 3.7.1 at least)
-CVE-2005-1532 version (firefox, fixed 1.0.4)
 CVE-2005-1532 version (thunderbird)
 CVE-2005-1532 version (mozilla, fixed 1.7.8)
-CVE-2005-1531 version (firefox, fixed 1.0.4)
+CVE-2005-1532 version (firefox, fixed 1.0.4)
 CVE-2005-1531 version (mozilla, fixed 1.7.8)
+CVE-2005-1531 version (firefox, fixed 1.0.4)
 CVE-2005-1519 version (squid, fixed 2.5.STABLE10)
 CVE-2005-1470 version (ethereal, fixed 0.10.11)
 CVE-2005-1469 version (ethereal, fixed 0.10.11)
@@ -396,12 +395,12 @@
 CVE-2005-1184 ignore (kernel) expected to not be an issue
 CVE-2005-1175 version (krb5, fixed 1.4.2)
 CVE-2005-1174 version (krb5, fixed 1.4.2)
+CVE-2005-1160 version (thunderbird)
 CVE-2005-1160 version (mozilla)
 CVE-2005-1160 version (firefox)
-CVE-2005-1160 version (thunderbird)
+CVE-2005-1159 version (thunderbird)
 CVE-2005-1159 version (mozilla)
 CVE-2005-1159 version (firefox)
-CVE-2005-1159 version (thunderbird)
 CVE-2005-1158 version (firefox, fixed 1.0.3)
 CVE-2005-1157 version (mozilla)
 CVE-2005-1157 version (firefox)
@@ -423,9 +422,9 @@
 CVE-2005-1039 ignore (coreutils) not fixed upstream, not a real issue
 CVE-2005-1038 backport (vixie-cron)
 CVE-2005-0990 version (sharutils, fixed 4.6 at least)
+CVE-2005-0989 version (thunderbird)
 CVE-2005-0989 version (mozilla, fixed 1.7.7)
 CVE-2005-0989 version (firefox, fixed 1.0.3)
-CVE-2005-0989 version (thunderbird)
 CVE-2005-0988 backport (gzip)
 CVE-2005-0977 version (kernel, fixed 2.6.11)
 CVE-2005-0967 version (gaim, fixed 1.2.1)
@@ -482,9 +481,10 @@
 CVE-2005-0592 version (mozilla)
 CVE-2005-0592 version (firefox)
 CVE-2005-0591 version (firefox, fixed 1.0.1)
-CVE-2005-0590 version (firefox)
-CVE-2005-0590 version (mozilla)
 CVE-2005-0590 version (thunderbird)
+CVE-2005-0590 version (openswan, fixed 2.1.4)
+CVE-2005-0590 version (mozilla)
+CVE-2005-0590 version (firefox)
 CVE-2005-0589 version (firefox, fixed 1.0.1)
 CVE-2005-0588 version (mozilla)
 CVE-2005-0588 version (firefox)
@@ -498,6 +498,7 @@
 CVE-2005-0584 version (firefox)
 CVE-2005-0578 version (mozilla)
 CVE-2005-0578 version (firefox)
+CVE-2005-0565 version (kernel, not 2.6)
 CVE-2005-0532 version (kernel, fixed 2.6.11)
 CVE-2005-0531 version (kernel, fixed 2.6.11)
 CVE-2005-0530 version (kernel, fixed 2.6.11)
@@ -522,12 +523,12 @@
 CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020
 CVE-2005-0403 version (kernel) not upstream
 CVE-2005-0402 version (firefox, fixed 1.0.2)
-CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0401 version (mozilla, fixed 1.7.7)
+CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0400 version (kernel, fixed 2.6.11.6)
+CVE-2005-0399 version (thunderbird)
 CVE-2005-0399 version (mozilla)
 CVE-2005-0399 version (firefox)
-CVE-2005-0399 version (thunderbird)
 CVE-2005-0398 version (ipsec-tools, fixed 0.5)
 CVE-2005-0397 version (ImageMagick, fixed 6.0.2.5)
 CVE-2005-0396 version (kdelibs, fixed 3.4.0)
@@ -535,8 +536,8 @@
 CVE-2005-0372 version (gftp, fixed 2.0.18 at least)
 CVE-2005-0365 version (kdelibs, not 3.4)
 CVE-2005-0337 version (postfix, not 2.2)
-CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (thunderbird, fixed 1.0.2)
+CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (firefox, fixed 1.0.1)
 CVE-2005-0247 version (postgresql, fixed after 8.0)
 CVE-2005-0246 version (postgresql, fixed 8.0.1)
@@ -551,8 +552,8 @@
 CVE-2005-0232 version (firefox, fixed 1.0.1)
 CVE-2005-0231 version (mozilla, fixed 1.7.6)
 CVE-2005-0231 version (firefox, fixed 1.0.1)
-CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (thunderbird, fixed 1.0.2)
+CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (firefox, fixed 1.0.1)
 CVE-2005-0227 version (postgresql, fixed 8.0.1)
 CVE-2005-0215 version (mozilla)
@@ -580,27 +581,27 @@
 CVE-2005-0155 backport (perl) perl-5.8.5-CAN-2005-0155+0156.patch
 CVE-2005-0152 version (squirrelmail, not 1.4)
 CVE-2005-0150 version (firefox, fixed 1.0)
-CVE-2005-0149 version (firefox)
 CVE-2005-0149 version (mozilla)
-CVE-2005-0147 version (firefox)
+CVE-2005-0149 version (firefox)
 CVE-2005-0147 version (mozilla)
-CVE-2005-0146 version (firefox)
+CVE-2005-0147 version (firefox)
 CVE-2005-0146 version (mozilla)
+CVE-2005-0146 version (firefox)
 CVE-2005-0145 version (firefox, fixed 1.0)
-CVE-2005-0144 version (firefox)
 CVE-2005-0144 version (mozilla)
-CVE-2005-0143 version (firefox)
+CVE-2005-0144 version (firefox)
 CVE-2005-0143 version (mozilla)
+CVE-2005-0143 version (firefox)
 CVE-2005-0142 version (thunderbird)
-CVE-2005-0142 version (firefox)
 CVE-2005-0142 version (mozilla)
-CVE-2005-0141 version (firefox)
+CVE-2005-0142 version (firefox)
 CVE-2005-0141 version (mozilla)
+CVE-2005-0141 version (firefox)
 CVE-2005-0137 version (kernel, not 2.6)
 CVE-2005-0135 version (kernel, fixed 2.6.11)
 CVE-2005-0124 version (kernel, fixed 2.6.11)
-CVE-2005-0109 backport (openssl097a)
 CVE-2005-0109 version (openssl, not 0.9.8a) 
+CVE-2005-0109 backport (openssl097a)
 CVE-2005-0104 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0103 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0102 version (evolution-data-server, fixed 1.2.2 at least)
@@ -623,10 +624,10 @@
 CVE-2005-0077 version (perl-DBI, fixed 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0069 VULNERABLE (vim) fc4 fixes vim-6.3-tmpfile.patch BZ#174173
+CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kpdf, not 3.4)
 CVE-2005-0064 backport (cups)
-CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0039 ignore (kernel) not a vulnerability: don't do this says the rfc
 CVE-2005-0034 version (bind, fixed after 9.3.0)
 CVE-2005-0033 version (bind, not 9)
@@ -677,8 +678,8 @@
 CVE-2004-1761 version (ethereal, fixed 0.10.3)
 CVE-2004-1689 version (sudo, fixed 1.6.8p1)
 CVE-2004-1653 ignore (openssh)
-CVE-2004-1639 version (firefox)
 CVE-2004-1639 version (mozilla)
+CVE-2004-1639 version (firefox)
 CVE-2004-1617 ignore (lynx) not able to verify flaw
 CVE-2004-1614 version (mozilla, fixed 1.7.5)
 CVE-2004-1613 version (mozilla, fixed 1.7.5)
@@ -687,18 +688,18 @@
 CVE-2004-1453 version (glibc, fixed 2.3.5)
 CVE-2004-1452 version (tomcat, fixed 5.0.27-r3)
 CVE-2004-1451 version (thunderbird)
-CVE-2004-1451 version (firefox)
 CVE-2004-1451 version (mozilla)
+CVE-2004-1451 version (firefox)
 CVE-2004-1450 version (thunderbird)
-CVE-2004-1450 version (firefox)
 CVE-2004-1450 version (mozilla)
+CVE-2004-1450 version (firefox)
 CVE-2004-1449 version (thunderbird)
-CVE-2004-1449 version (firefox)
 CVE-2004-1449 version (mozilla)
+CVE-2004-1449 version (firefox)
 CVE-2004-1392 version (php, fixed 5.0.4)
 CVE-2004-1382 version (glibc, not 2.3.5)
-CVE-2004-1381 version (firefox)
 CVE-2004-1381 version (mozilla)
+CVE-2004-1381 version (firefox)
 CVE-2004-1380 version (mozilla)
 CVE-2004-1380 version (firefox)
 CVE-2004-1377 backport (a2ps) a2ps-4.13-security.patch
@@ -751,9 +752,9 @@
 CVE-2004-1139 version (ethereal, fixed 0.10.8)
 CVE-2004-1138 version (vim, fixed 6.3)
 CVE-2004-1137 version (kernel, fixed 2.6.10)
-CVE-2004-1125 version (kdegraphics, not 3.4)
-CVE-2004-1125 version (tetex, at least 3.0)
 CVE-2004-1125 version (xpdf, fixed 3.0.1)
+CVE-2004-1125 version (tetex, at least 3.0)
+CVE-2004-1125 version (kdegraphics, not 3.4)
 CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)
 CVE-2004-1093 version (mc, fixed 4.6.0)
 CVE-2004-1092 version (mc, fixed 4.6.0)
@@ -797,8 +798,8 @@
 CVE-2004-0981 version (ImageMagick, fixed 6.1.0)
 CVE-2004-0977 version (postgresql, fixed after 7.4.6)
 CVE-2004-0976 backport (perl) perl-5.8.7-CAN-2004-0976.patch
-CVE-2004-0975 backport (openssl097a, fixed 0.9.7f)
 CVE-2004-0975 version (openssl, not 0.9.8)
+CVE-2004-0975 backport (openssl097a, fixed 0.9.7f)
 CVE-2004-0974 version (netatalk, fixed 2.0.1)
 CVE-2004-0972 version (lvm2, fixed 2.2.01.8 at least)
 CVE-2004-0971 backport (krb5) krb5-1.3.4-send-pr-tempfile.patch
@@ -813,7 +814,6 @@
 CVE-2004-0958 version (php, fixed 4.3.9)
 CVE-2004-0957 version (mysql, fixed 4.0.21)
 CVE-2004-0956 version (mysql, fixed 4.0.20)
-CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
 CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream fc4bz#175414
@@ -824,15 +824,15 @@
 CVE-2004-0923 version (cups, fixed 1.2.22)
 CVE-2004-0918 version (squid, fixed 2.4.STABLE7)
 CVE-2004-0914 version (xorg-x11, fixed after 6.8.1)
-CVE-2004-0909 version (mozilla)
 CVE-2004-0909 version (thunderbird)
+CVE-2004-0909 version (mozilla)
 CVE-2004-0909 version (firefox)
 CVE-2004-0908 version (mozilla, fixed 1.7.3)
-CVE-2004-0907 version (mozilla)
 CVE-2004-0907 version (thunderbird)
+CVE-2004-0907 version (mozilla)
 CVE-2004-0907 version (firefox)
-CVE-2004-0906 version (mozilla)
 CVE-2004-0906 version (thunderbird)
+CVE-2004-0906 version (mozilla)
 CVE-2004-0906 version (firefox)
 CVE-2004-0905 version (mozilla, fixed 1.7.3)
 CVE-2004-0904 version (mozilla, fixed 1.7.3)
@@ -840,16 +840,17 @@
 CVE-2004-0902 version (mozilla, fixed 1.7.3)
 CVE-2004-0891 version (gaim, fixed 1.0.2)
 CVE-2004-0889 version (xpdf, fixed 3.0.1)
-CVE-2004-0888 version (kpdegraphics, not 3.4)
+CVE-2004-0888 version (xpdf, fixed 3.0.1)
 CVE-2004-0888 version (tetex, fixed 3.0)
+CVE-2004-0888 version (kpdegraphics, not 3.4)
 CVE-2004-0888 backport (cups)
-CVE-2004-0888 version (xpdf, fixed 3.0.1)
 CVE-2004-0887 version (kernel, fixed 2.6.10)
-CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0886 version (libtiff, fixed 3.7.1 at least)
+CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0885 version (httpd, fixed after 2.0.52)
 CVE-2004-0884 version (cyrus-sasl, fixed 2.1.20)
 CVE-2004-0883 version (kernel, fixed 2.6.11)
+CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0882 version (samba, fixed 3.0.8)
 CVE-2004-0871 ignore (mozilla) unfixed upstream with no patch
 CVE-2004-0870 ignore (kde) upstream won't fix
@@ -872,30 +873,30 @@
 CVE-2004-0808 version (samba, fixed 3.0.7)
 CVE-2004-0807 version (samba, fixed 3.0.7)
 CVE-2004-0806 version (cdrtools, fixed 2.0.1)
-CVE-2004-0804 version (kdegraphics)
 CVE-2004-0804 version (libtiff, fixed after 3.6.1)
-CVE-2004-0803 version (kdegraphics)
+CVE-2004-0804 version (kdegraphics)
 CVE-2004-0803 version (libtiff, fixed after 3.6.1)
+CVE-2004-0803 version (kdegraphics)
 CVE-2004-0802 version (imlib, fixed 1.1.2)
 CVE-2004-0801 version (foomatic, fixed 3.0.2)
 CVE-2004-0797 version (zlib, fixed 1.2.2.2 at least)
+CVE-2004-0797 version (zlib)
 CVE-2004-0796 version (spamassassin, fixed 2.64)
 CVE-2004-0792 version (rsync, fixed 2.6.3)
 CVE-2004-0791 version (kernel, fixed 2.6.9)
 CVE-2004-0790 version (doesn't affect linux 2.6)
-CVE-2004-0797 version (zlib)
-CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0788 version (gtk2, fixed 2.6.7 at least)
+CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0786 version (apr-util, fixed 2.0.51)
 CVE-2004-0785 version (gaim, fixed 0.82)
 CVE-2004-0784 version (gaim, fixed 0.82)
-CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0783 version (gtk2, fixed 2.6.7 at least)
-CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
+CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0782 version (gtk2, fixed 2.6.7 at least)
+CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
+CVE-2004-0779 version (thunderbird)
 CVE-2004-0779 version (mozilla)
 CVE-2004-0779 version (firefox)
-CVE-2004-0779 version (thunderbird)
 CVE-2004-0778 version (cvs, fixed 1.11.17)
 CVE-2004-0772 version (krb5, fixed after 1.2.8)
 CVE-2004-0771 backport (lha, changelog)
@@ -912,8 +913,8 @@
 CVE-2004-0757 version (mozilla, fixed 1.7)
 CVE-2004-0755 version (ruby, fixed 1.8.1)
 CVE-2004-0754 version (gaim, fixed 0.82)
-CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0753 version (gtk2, fixed after 2.2.4)
+CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0752 version (openoffice.org, fixed after 1.1.2)
 CVE-2004-0751 version (httpd, fixed 2.0.51)
 CVE-2004-0750 version (system-config-nfs, fixed 1.0.13)
@@ -937,8 +938,8 @@
 CVE-2004-0686 version (samba, fixed 3.0.6)
 CVE-2004-0685 version (kernel, not 2.6)
 CVE-2004-0658 ignore (kernel) not a security issue
-CVE-2004-0648 version (mozilla)
 CVE-2004-0648 version (thunderbird)
+CVE-2004-0648 version (mozilla)
 CVE-2004-0648 version (firefox)
 CVE-2004-0644 version (krb5, fixed after 1.3.4)
 CVE-2004-0643 version (krb5, fixed after 1.3.1)
@@ -964,11 +965,9 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
-CVE-2005-0590 version (openswan, fixed 2.1.4)
 CVE-2004-0587 version (kernel) not upstream flaw
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
-CVE-2005-0565 version (kernel, not 2.6)
 CVE-2004-0554 version (kernel, fixed 2.6.7)
 CVE-2004-0548 ignore (aspell, not fixed 0.50.5) not a security issue
 CVE-2004-0547 version (postgresql, fixed 7.2.1)
@@ -992,9 +991,9 @@
 CVE-2004-0492 version (httpd, not 2.0)
 CVE-2004-0491 version (kernel, not upstream)
 CVE-2004-0488 version (httpd, fixed 2.0.50)
+CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0461 version (dhcp, fixed after 3.0.1rc13)
 CVE-2004-0460 version (dhcp, fixed after 3.0.1rc13)
-CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0457 version (mysql, fixed after 4.0.20)
 CVE-2004-0452 backport (perl) perl-5.8.5-CAN-2005-0155+0156.patch
 CVE-2004-0447 version (kernel, fixed 2.6.5)
@@ -1057,8 +1056,8 @@
 CVE-2004-0150 version (python, fixed 2.2.2)
 CVE-2004-0133 version (kernel, 2.6.4)
 CVE-2004-0113 version (httpd, fixed 2.0.49)
-CVE-2004-0112 backport (openssl097a, fixed 0.9.7d)
 CVE-2004-0112 version (openssl, not 0.9.8)
+CVE-2004-0112 backport (openssl097a, fixed 0.9.7d)
 CVE-2004-0111 version (gdk-pixbuf, fixed 0.20)
 CVE-2004-0110 version (libxml2, fixed 2.6.6)
 CVE-2004-0109 version (kernel, fixed 2.6.6)
@@ -1076,8 +1075,8 @@
 CVE-2004-0081 version (openssl097a, not 0.9.7)
 CVE-2004-0081 version (openssl, not 0.9.8)
 CVE-2004-0080 version (util-linux, fixed after 2.11f)
-CVE-2004-0079 backport (openssl097a, fixed 0.9.7c)
 CVE-2004-0079 version (openssl, not 0.9.8)
+CVE-2004-0079 backport (openssl097a, fixed 0.9.7c)
 CVE-2004-0078 version (mutt, fixed 1.4.2)
 CVE-2004-0077 version (kernel, fixed 2.6.3)
 CVE-2004-0075 version (kernel, not 2.6)
@@ -1091,8 +1090,8 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1265 VULNERABLE (mozilla)
+CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1232 version (emacs, fixed 21.3)
 CVE-2003-1201 version (openldap, not 2.2)
 CVE-2003-1161 version (kernel, not released version)
@@ -1102,14 +1101,14 @@
 CVE-2003-1013 version (ethereal, fixed 0.10.0)
 CVE-2003-1012 version (ethereal, fixed 0.10.0)
 CVE-2003-0993 version (httpd, not 2.0)
+CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0992 version (mailman, fixed 2.1.3)
 CVE-2003-0991 version (mailman, fixed 2.0.14)
 CVE-2003-0990 version (squirrelmail, fixed after 1.4.0)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
-CVE-2003-0988 version (kde, fixed 3.1.5)
-CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
 CVE-2003-0988 version (kdepim, fixed 3.1.5)
+CVE-2003-0988 version (kde, fixed 3.1.5)
 CVE-2003-0987 version (httpd, not 2.0)
 CVE-2003-0985 version (kernel, not 2.6)
 CVE-2003-0984 version (kernel, fixed 2.4.23)
@@ -1190,12 +1189,12 @@
 CVE-2003-0548 version (gdm, fixed 2.4.1.6)
 CVE-2003-0547 version (gdm, fixed 2.4.1.6)
 CVE-2003-0546 version (up2date, fixed after 3.1.23)
-CVE-2003-0545 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0545 version (openssl, not 0.9.8)
-CVE-2003-0544 backport (openssl097a, fixed 0.9.7c)
+CVE-2003-0545 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0544 version (openssl, not 0.9.8)
-CVE-2003-0543 backport (openssl097a, fixed 0.9.7c)
+CVE-2003-0544 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0543 version (openssl, not 0.9.8)
+CVE-2003-0543 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0542 version (httpd, fixed 2.0.48)
 CVE-2003-0541 backport (gtkhtml, fixed 1.1.10) gtkhtml-1.1.9-textslave.patch
 CVE-2003-0540 version (postfix, not 2.0 onwards)
@@ -1236,13 +1235,13 @@
 CVE-2003-0289 version (cdrtools, fixed 2.01a14)
 CVE-2003-0282 version (unzip, fixed 5.51)
 CVE-2003-0255 version (gnupg, fixed 1.2.2)
-CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0253 version (httpd, fixed 2.0.47)
 CVE-2003-0252 version (nfs-utils, fixed 1.0.4)
 CVE-2003-0251 version (ypserv, fixed 2.7)
 CVE-2003-0248 version (kernel, not 2.6)
 CVE-2003-0247 version (kernel, not 2.6)
 CVE-2003-0246 version (kernel, not 2.6)
+CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0245 version (httpd, fixed 2.0.46)
 CVE-2003-0244 version (kernel, not 2.6)
 CVE-2003-0211 version (xinetd, fixed 2.3.11)
@@ -1263,8 +1262,8 @@
 CVE-2003-0160 version (squirrelmail, fixed 1.2.11)
 CVE-2003-0159 version (ethereal, fixed after 0.9.9)
 CVE-2003-0150 version (mysql, fixed 3.23.56)
-CVE-2003-0147 backport (openssl097a, fixed 0.9.7b)
 CVE-2003-0147 version (openssl, not 0.9.8)
+CVE-2003-0147 backport (openssl097a, fixed 0.9.7b)
 CVE-2003-0146 version (netpbm, fixed 10.18)
 CVE-2003-0145 version (tcpdump, fixed 3.7.2)
 CVE-2003-0140 version (mutt, fixed 1.4.1)
@@ -1273,8 +1272,8 @@
 CVE-2003-0135 version (vsftpd, not upstream)
 CVE-2003-0133 version (evolution, fixed 1.2.4)
 CVE-2003-0132 version (httpd, fixed 2.0.45)
-CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) 
 CVE-2003-0131 version (openssl, not 0.9.8)
+CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) 
 CVE-2003-0130 version (evolution, fixed 1.2.3)
 CVE-2003-0129 version (evolution, fixed 1.2.3)
 CVE-2003-0128 version (evolution, fixed 1.2.3)
@@ -1304,8 +1303,8 @@
 CVE-2003-0043 version (tomcat, fixed 3.3.1a)
 CVE-2003-0041 version (krb5, fixed after 1.2.7)
 CVE-2003-0038 version (mailman, fixed 2.0.13 at least)
-CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0028 version (krb5, fixed after 1.2.7)
+CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0026 version (dhcpd, fixed 3.0.1)
 CVE-2003-0020 version (httpd, fixed 2.0.49)
 CVE-2003-0019 version (kernel-utils, not upstream)



From fedora-extras-commits at redhat.com  Mon Jan  9 14:26:30 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:26:30 -0500
Subject: rpms/chmlib/devel chmlib-chm_lib_c-ppc-patch.diff, NONE,
	1.1 chmlib.spec, 1.2, 1.3
Message-ID: <200601091427.k09ER3Ql030177@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30156

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:

First try to fix PPC-arch builds



chmlib-chm_lib_c-ppc-patch.diff:

--- NEW FILE chmlib-chm_lib_c-ppc-patch.diff ---
--- src/chm_lib.c	2005-10-26 16:17:50.000000000 +0400
+++ src/chm_lib.c	2006-01-09 17:12:12.000000000 +0300
@@ -160,7 +160,7 @@
 /* Sparc        */
 /* MIPS         */
 /* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
+#elif __i386__ || __sun || __sgi || __ppc__ || ppc
 typedef unsigned char           UChar;
 typedef short                   Int16;
 typedef unsigned short          UInt16;


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chmlib.spec	15 Dec 2005 15:29:43 -0000	1.2
+++ chmlib.spec	9 Jan 2006 14:26:30 -0000	1.3
@@ -1,11 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	1%{?dist}
+Release: 	2
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
 Source: 	http://66.93.236.84/~jedwin/projects/chmlib/%{name}-%{version}.tgz
+Patch0:		chmlib-chm_lib_c-ppc-patch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -25,10 +26,11 @@
 
 %prep
 %setup -q -n chmlib-0.37
+%patch0 -p0
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+%{__make5} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -54,6 +56,9 @@
 
 %changelog
 
+* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-2
+- Fix for PPC-arch
+
 * Sat Nov 12 2005 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-1
 - Initial build for FC-Extras
 



From fedora-extras-commits at redhat.com  Mon Jan  9 14:44:01 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:44:01 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.3,1.4
Message-ID: <200601091444.k09EiYBU030270@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30246

Modified Files:
	chmlib.spec 
Log Message:

Typo fix.



Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chmlib.spec	9 Jan 2006 14:26:30 -0000	1.3
+++ chmlib.spec	9 Jan 2006 14:44:01 -0000	1.4
@@ -30,7 +30,7 @@
 
 %build
 %configure --disable-static
-%{__make5} %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}



From fedora-extras-commits at redhat.com  Mon Jan  9 14:50:47 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:50:47 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.4,1.5
Message-ID: <200601091451.k09EpJRN030394@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30377

Modified Files:
	chmlib.spec 
Log Message:

Added dist-tag



Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chmlib.spec	9 Jan 2006 14:44:01 -0000	1.4
+++ chmlib.spec	9 Jan 2006 14:50:46 -0000	1.5
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	2
+Release: 	2%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/



From fedora-extras-commits at redhat.com  Mon Jan  9 14:55:56 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:55:56 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.5,1.6
Message-ID: <200601091456.k09EuSYG030504@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30483

Modified Files:
	chmlib.spec 
Log Message:

rev. 3



Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- chmlib.spec	9 Jan 2006 14:50:46 -0000	1.5
+++ chmlib.spec	9 Jan 2006 14:55:56 -0000	1.6
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
@@ -56,7 +56,10 @@
 
 %changelog
 
-* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-2
+* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-3%{?dist}
+- Typo fix
+
+* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-2%{?dist}
 - Fix for PPC-arch
 
 * Sat Nov 12 2005 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-1



From fedora-extras-commits at redhat.com  Mon Jan  9 15:21:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:21:09 -0500
Subject: rpms/perl-Digest-MD4 - New directory
Message-ID: <200601091521.k09FLBnc032319@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32311/perl-Digest-MD4

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD4 added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:21:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:21:35 -0500
Subject: rpms/perl-Digest-MD4/devel - New directory
Message-ID: <200601091521.k09FLba1032334@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32311/perl-Digest-MD4/devel

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD4/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:22:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:22:27 -0500
Subject: rpms/perl-Digest-MD4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091522.k09FMTq4032370@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32358

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Digest-MD4


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Digest-MD4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:22:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:22:46 -0500
Subject: rpms/perl-Digest-MD4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601091522.k09FMmRh032390@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32358/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Digest-MD4


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:24:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:24:03 -0500
Subject: rpms/perl-Digest-MD4 import.log,1.1,1.2
Message-ID: <200601091524.k09FOqGH032466@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32432

Modified Files:
	import.log 
Log Message:
auto-import perl-Digest-MD4-1.5-1 on branch devel from perl-Digest-MD4-1.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 15:22:26 -0000	1.1
+++ import.log	9 Jan 2006 15:24:03 -0000	1.2
@@ -0,0 +1 @@
+perl-Digest-MD4-1_5-1:HEAD:perl-Digest-MD4-1.5-1.src.rpm:1136820226



From fedora-extras-commits at redhat.com  Mon Jan  9 15:24:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:24:22 -0500
Subject: rpms/perl-Digest-MD4/devel perl-Digest-MD4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091524.k09FOs5C032470@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32432/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Digest-MD4.spec 
Log Message:
auto-import perl-Digest-MD4-1.5-1 on branch devel from perl-Digest-MD4-1.5-1.src.rpm


--- NEW FILE perl-Digest-MD4.spec ---
Name:           perl-Digest-MD4
Version:        1.5
Release:        1%{?dist}
Summary:        Perl interface to the MD4 Algorithm

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Digest-MD4/
Source0:        http://www.cpan.org/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Digest::MD4 module allows you to use the RSA Data Security
Inc. MD4 Message Digest algorithm from within Perl programs.  The
algorithm takes as input a message of arbitrary length and produces as
output a 128-bit "fingerprint" or "message digest" of the input.


%prep
%setup -q -n Digest-MD4-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README rfc1320.txt
%{perl_vendorarch}/Digest/
%{perl_vendorarch}/auto/Digest/
%{_mandir}/man3/*.3*


%changelog
* Sat Sep 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.5-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 15:22:42 -0000	1.1
+++ .cvsignore	9 Jan 2006 15:24:22 -0000	1.2
@@ -0,0 +1 @@
+Digest-MD4-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 15:22:42 -0000	1.1
+++ sources	9 Jan 2006 15:24:22 -0000	1.2
@@ -0,0 +1 @@
+594d661c18b46a4aea97931dcaf5ce14  Digest-MD4-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 15:30:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:30:05 -0500
Subject: owners owners.list,1.514,1.515
Message-ID: <200601091530.k09FUbvw032601@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32584

Modified Files:
	owners.list 
Log Message:
New component: perl-Digest-MD4 (#177167)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- owners.list	9 Jan 2006 11:26:36 -0000	1.514
+++ owners.list	9 Jan 2006 15:30:05 -0000	1.515
@@ -780,6 +780,7 @@
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Digest-MD4|Perl interface to the MD4 Algorithm|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:19 -0500
Subject: rpms/perl-Compress-Bzip2 - New directory
Message-ID: <200601091539.k09FdLR6032715@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707/perl-Compress-Bzip2

Log Message:
Directory /cvs/extras/rpms/perl-Compress-Bzip2 added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:25 -0500
Subject: rpms/perl-Compress-Bzip2/devel - New directory
Message-ID: <200601091539.k09FdR9e032730@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707/perl-Compress-Bzip2/devel

Log Message:
Directory /cvs/extras/rpms/perl-Compress-Bzip2/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:44 -0500
Subject: rpms/perl-Compress-Bzip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091539.k09FdkJf032764@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32752

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Compress-Bzip2


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Compress-Bzip2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:50 -0500
Subject: rpms/perl-Compress-Bzip2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601091539.k09Fdq9B000316@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32752/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Compress-Bzip2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:40:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:40:23 -0500
Subject: rpms/perl-Compress-Bzip2 import.log,1.1,1.2
Message-ID: <200601091540.k09Fetxr000384@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350

Modified Files:
	import.log 
Log Message:
auto-import perl-Compress-Bzip2-2.09-1 on branch devel from perl-Compress-Bzip2-2.09-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 15:39:44 -0000	1.1
+++ import.log	9 Jan 2006 15:40:22 -0000	1.2
@@ -0,0 +1 @@
+perl-Compress-Bzip2-2_09-1:HEAD:perl-Compress-Bzip2-2.09-1.src.rpm:1136821214



From fedora-extras-commits at redhat.com  Mon Jan  9 15:40:29 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:40:29 -0500
Subject: rpms/perl-Compress-Bzip2/devel perl-Compress-Bzip2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091541.k09Ff1wh000390@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Compress-Bzip2.spec 
Log Message:
auto-import perl-Compress-Bzip2-2.09-1 on branch devel from perl-Compress-Bzip2-2.09-1.src.rpm


--- NEW FILE perl-Compress-Bzip2.spec ---
Name:           perl-Compress-Bzip2
Version:        2.09
Release:        1%{?dist}
Summary:        Interface to Bzip2 compression library

Group:          Development/Libraries
License:        GPL
URL:            http://search.cpan.org/dist/Compress-Bzip2/
Source0:        http://www.cpan.org/authors/id/A/AR/ARJAY/Compress-Bzip2-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl
BuildRequires:  bzip2-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Compress::Bzip2 module provides a Perl interface to the Bzip2
compression library.  A relevant subset of the functionality provided
by Bzip2 is available in Compress::Bzip2.

All string parameters can either be a scalar or a scalar reference.

The module can be split into two general areas of functionality,
namely in-memory compression/decompression and read/write access
to bzip2 files.


%prep
%setup -q -n Compress-Bzip2-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes COPYING NEWS README
%{perl_vendorarch}/Compress/
%{perl_vendorarch}/auto/Compress/
%{_mandir}/man3/*.3*


%changelog
* Thu Aug 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
- Update to 2.09.

* Mon May 02 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.07-1
- Update to 2.07.

* Mon Apr 25 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.04-1
- Update to 2.04.

* Sun Apr 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.03-1
- Update to 2.03.

* Sun Apr 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.00-1
- Update to 2.00.

* Thu Apr 21 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 15:39:50 -0000	1.1
+++ .cvsignore	9 Jan 2006 15:40:28 -0000	1.2
@@ -0,0 +1 @@
+Compress-Bzip2-2.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 15:39:50 -0000	1.1
+++ sources	9 Jan 2006 15:40:28 -0000	1.2
@@ -0,0 +1 @@
+1699fde3e86f2a036f135ae606d456bf  Compress-Bzip2-2.09.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 15:44:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:44:22 -0500
Subject: owners owners.list,1.515,1.516
Message-ID: <200601091544.k09FitEs000470@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv449

Modified Files:
	owners.list 
Log Message:
New component: perl-Compress-Bzip2 (#177166)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -r1.515 -r1.516
--- owners.list	9 Jan 2006 15:30:05 -0000	1.515
+++ owners.list	9 Jan 2006 15:44:22 -0000	1.516
@@ -757,6 +757,7 @@
 Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Compress-Bzip2|Interface to Bzip2 compression library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:00 -0500
Subject: rpms/perl-SQL-Statement - New directory
Message-ID: <200601091547.k09Fl2WU000557@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv549/perl-SQL-Statement

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Statement added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:06 -0500
Subject: rpms/perl-SQL-Statement/devel - New directory
Message-ID: <200601091547.k09Fl84G000574@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv549/perl-SQL-Statement/devel

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Statement/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:26 -0500
Subject: rpms/perl-SQL-Statement Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091547.k09FlS3P000612@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv600

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-SQL-Statement


--- NEW FILE Makefile ---
# Top level Makefile for module perl-SQL-Statement
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:32 -0500
Subject: rpms/perl-SQL-Statement/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601091547.k09FlYMh000632@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv600/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SQL-Statement


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:48:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:48:07 -0500
Subject: rpms/perl-SQL-Statement import.log,1.1,1.2
Message-ID: <200601091548.k09FmdDv000710@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv670

Modified Files:
	import.log 
Log Message:
auto-import perl-SQL-Statement-1.14-1 on branch devel from perl-SQL-Statement-1.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 15:47:26 -0000	1.1
+++ import.log	9 Jan 2006 15:48:07 -0000	1.2
@@ -0,0 +1 @@
+perl-SQL-Statement-1_14-1:HEAD:perl-SQL-Statement-1.14-1.src.rpm:1136821678



From fedora-extras-commits at redhat.com  Mon Jan  9 15:48:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:48:13 -0500
Subject: rpms/perl-SQL-Statement/devel perl-SQL-Statement.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091548.k09Fmj2H000714@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv670/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SQL-Statement.spec 
Log Message:
auto-import perl-SQL-Statement-1.14-1 on branch devel from perl-SQL-Statement-1.14-1.src.rpm


--- NEW FILE perl-SQL-Statement.spec ---
Name:           perl-SQL-Statement
Version:        1.14
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(DBI)
BuildRequires:  perl(DBD::XBase)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The SQL::Statement module implements a pure Perl SQL parsing and execution
engine.  While it by no means implements full ANSI standard, it does support
many features including column and table aliases, built-in and user-defined
functions, implicit and explicit joins, complexly nested search conditions, and
other features.


%prep
%setup -q -n SQL-Statement-%{version}
find . -type f -exec chmod a-x {} ';'
%{__perl} -pi -e 's/\r\n/\n/' Changes README


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/SQL/
%{_mandir}/man3/*.3*


%changelog
* Sun Sep 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 15:47:32 -0000	1.1
+++ .cvsignore	9 Jan 2006 15:48:13 -0000	1.2
@@ -0,0 +1 @@
+SQL-Statement-1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 15:47:32 -0000	1.1
+++ sources	9 Jan 2006 15:48:13 -0000	1.2
@@ -0,0 +1 @@
+1a450225dfd1400d507dde6def577cb3  SQL-Statement-1.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 15:52:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:52:21 -0500
Subject: owners owners.list,1.516,1.517
Message-ID: <200601091552.k09Fqsgk000833@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv802

Modified Files:
	owners.list 
Log Message:
New component: perl-SQL-Statement (#175896)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- owners.list	9 Jan 2006 15:44:22 -0000	1.516
+++ owners.list	9 Jan 2006 15:52:21 -0000	1.517
@@ -896,6 +896,7 @@
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 16:05:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 11:05:31 -0500
Subject: rpms/perl-Compress-Bzip2/devel perl-Compress-Bzip2.spec,1.1,1.2
Message-ID: <200601091606.k09G63H7002870@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2848

Modified Files:
	perl-Compress-Bzip2.spec 
Log Message:
Applied two of the Ville's suggestions (#177166): trimmed down
the description to the first paragraph and added the file ANNOUNCE
as documentation.



Index: perl-Compress-Bzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/devel/perl-Compress-Bzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Compress-Bzip2.spec	9 Jan 2006 15:40:28 -0000	1.1
+++ perl-Compress-Bzip2.spec	9 Jan 2006 16:05:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Compress-Bzip2
 Version:        2.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interface to Bzip2 compression library
 
 Group:          Development/Libraries
@@ -18,12 +18,6 @@
 compression library.  A relevant subset of the functionality provided
 by Bzip2 is available in Compress::Bzip2.
 
-All string parameters can either be a scalar or a scalar reference.
-
-The module can be split into two general areas of functionality,
-namely in-memory compression/decompression and read/write access
-to bzip2 files.
-
 
 %prep
 %setup -q -n Compress-Bzip2-%{version}
@@ -53,13 +47,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes COPYING NEWS README
+%doc ANNOUNCE Changes COPYING NEWS README
 %{perl_vendorarch}/Compress/
 %{perl_vendorarch}/auto/Compress/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-2
+- Applied two of the Ville's suggestions (#177166): trimmed down
+  the description to the first paragraph and added the file ANNOUNCE
+  as documentation.
+
 * Thu Aug 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
 - Update to 2.09.
 



From fedora-extras-commits at redhat.com  Mon Jan  9 16:11:09 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:11:09 -0500
Subject: rpms/grace - New directory
Message-ID: <200601091611.k09GBBvA003126@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3114/grace

Log Message:
Directory /cvs/extras/rpms/grace added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 16:11:16 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:11:16 -0500
Subject: rpms/grace/devel - New directory
Message-ID: <200601091611.k09GBIu0003141@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3114/grace/devel

Log Message:
Directory /cvs/extras/rpms/grace/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 16:12:13 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:12:13 -0500
Subject: rpms/grace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601091612.k09GCFKj003199@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3167/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grace


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 16:12:06 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:12:06 -0500
Subject: rpms/grace Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091612.k09GCCbc003180@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3167

Added Files:
	Makefile import.log 
Log Message:
Setup of module grace


--- NEW FILE Makefile ---
# Top level Makefile for module grace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 16:15:06 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:15:06 -0500
Subject: rpms/grace import.log,1.1,1.2
Message-ID: <200601091615.k09GFcPt003332@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3283

Modified Files:
	import.log 
Log Message:
auto-import grace-5.1.18-7 on branch devel from grace-5.1.18-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/grace/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 16:12:05 -0000	1.1
+++ import.log	9 Jan 2006 16:15:06 -0000	1.2
@@ -0,0 +1 @@
+grace-5_1_18-7:HEAD:grace-5.1.18-7.src.rpm:1136823283



From fedora-extras-commits at redhat.com  Mon Jan  9 16:15:13 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:15:13 -0500
Subject: rpms/grace/devel LICENSE.cephes, NONE, 1.1 cephes-license.email,
	NONE, 
	1.1 grace-gracerc-no_auxiliary.diff, NONE, 1.1 grace.csh, NONE,
	1.1 grace.desktop, NONE, 1.1 grace.png, NONE, 1.1 grace.sh, NONE,
	1.1 grace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091615.k09GFj5B003336@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE.cephes cephes-license.email 
	grace-gracerc-no_auxiliary.diff grace.csh grace.desktop 
	grace.png grace.sh grace.spec 
Log Message:
auto-import grace-5.1.18-7 on branch devel from grace-5.1.18-7.src.rpm


--- NEW FILE LICENSE.cephes ---
 
 This software is derived from the Cephes Math Library. It is
 incorporated herein, and licensed in accordance with the Gnu
 General Public License, Version 2, by permission of the author. 


--- NEW FILE cephes-license.email ---
Copyright for the cephes library (details):

  This email from Steve Moshier, the copyright owner of cephes, to Helen 
  Faulkner (Debian maintainer of labplot), and other interested parties 
  (labplot and grace authors, grace maintainer and labplot sponsor), confirms 
  that we may release labplot with cephes licensed under the GPL.
 

  -------- Original Message --------
  Subject: Re: licensing of cephes
  Date: Sun, 2 Jan 2005 21:48:02 -0500 (EST)
  From: Steve Moshier <steve at moshier.net>
  To: Helen Faulkner <helen_ml_faulkner at yahoo.co.uk>
  CC: twerner at debian.org, Ben Burton <bab at debian.org>, evgeny at stambulchik.net,
  Stefan Gerlach <gerlach at mbi-berlin.de>
  References: <41D14354.4040506 at yahoo.co.uk> 
  <Pine.LNX.4.58.0412280836250.9987 at moshier.net> 
  <41D17BE3.3020708 at yahoo.co.uk>
  <Pine.LNX.4.58.0412281219420.10873 at moshier.net> 
  <41D1FB8D.6030002 at yahoo.co.uk> 
  <Pine.LNX.4.58.0412291032190.15474 at moshier.net> 
  <41D2D8EF.9010702 at yahoo.co.uk> 
  <Pine.LNX.4.58.0412291632540.17032 at moshier.net> 
  <41D41B2E.80508 at yahoo.co.uk>



  On Thu, 30 Dec 2004, Helen Faulkner wrote:

  >   http://www.debian.org/social_contract#guidelines

  This is fine with me.  To acknowedge your terms explicily,
  how about augmenting the permission to read something like
  the following --

    This software is derived from the Cephes Math Library. It is
    incorporated herein, and licensed in accordance with DFSG,
    by permission of the author.


  If you are trying to get me to suggest a specific form for your
  license, then from looking at Debian programs such as dpkg it seems to
  me that you would find the GPL to be appropriate and the permission
  statement could reference one of the GPL documents instead of DFSG.
  Alternatively, the packages you have been talking about distributing
  with Debian presumably come with some sort of licenses and it would
  make sense to propose those licenses.

grace-gracerc-no_auxiliary.diff:

--- NEW FILE grace-gracerc-no_auxiliary.diff ---
--- gracerc.old	2005-09-03 20:18:51.000000000 +0200
+++ gracerc	2005-09-03 20:19:04.000000000 +0200
@@ -7,7 +7,7 @@
 DEFINE IFILTER "bin/grconvert %s -" MAGIC "00000031" 
 #
 # This one is for automatic import of Origin-4 fit description files
-DEFINE IFILTER "auxiliary/fdf2fit %s -" PATTERN "*.fdf"
+DEFINE IFILTER "bin/fdf2fit %s -" PATTERN "*.fdf"
 #
 # Save disk space by keeping files gzip'ed
 DEFINE IFILTER "gzip -dc %s" PATTERN "*.gz"


--- NEW FILE grace.csh ---
#!/bin/tcsh
setenv GRACE_HOME "/usr/share/grace"


--- NEW FILE grace.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Grace
Comment=Numerical Data Processing and Visualization Tool
Exec=/usr/bin/xmgrace
Icon=grace.png
Terminal=false
Type=Application
Categories=Application;Graphics;


--- NEW FILE grace.sh ---
#!/bin/bash
export GRACE_HOME="/usr/share/grace"


--- NEW FILE grace.spec ---
Name:           grace
Version:        5.1.18
Release:        7%{?dist}
Summary:        Numerical Data Processing and Visualization Tool (grace)

License:        GPL
# Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
URL:            http://plasma-gate.weizmann.ac.il/Grace/
Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Source2:        %{name}.png
Source3:        %{name}.sh
Source4:        %{name}.csh
Source5:	cephes-license.email
Source6:	LICENSE.cephes
Patch:          %{name}-gracerc-no_auxiliary.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Group:          Applications/Engineering

BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
BuildRequires:  zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel
BuildRequires:  openmotif-devel, gcc-gfortran
BuildRequires:  desktop-file-utils, font-utils
Requires:	nedit
Requires(post): chkfontpath
Requires(postun): chkfontpath

%description
Grace is a Motif application for two-dimensional data visualization.
Grace can transform the data using free equations, FFT, cross- and
auto-correlation, differences, integrals, histograms, and much more. The
generated figures are of high quality.  Grace is a very convenient tool
for data inspection, data transformation, and and for making figures for
publications.


%package devel
Summary:        Files needed for grace development
Group:          Development/Libraries
License:        LGPL
Requires:       %{name} = %{version}-%{release}

%description devel
Install these files if you need to compile software that requires grace.


%prep
%setup -q
%patch

%build
cp %{SOURCE5} %{SOURCE6} .
%configure \
    --enable-editres \
    --with-editor=nedit \
    --with-printcmd="lpr" \
    --enable-grace-home=%{_datadir}/%{name} \
    --disable-pdfdrv \
    --with-x \
    --with-f77=gfortran \
    --with-extra-incpath=%{_includedir}/netcdf-3 \
    --with-extra-ldpath=%{_libdir}/netcdf-3
    
make %{?_smp_mflags}


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

cp Xbae/LICENSE LICENSE.Xbae
rm -f doc/*.1

mkdir -pm 755                               \
    %{buildroot}%{_bindir}                  \
    %{buildroot}%{_includedir}              \
    %{buildroot}%{_libdir}		    \
    %{buildroot}%{_datadir}/pixmaps         \
    %{buildroot}%{_datadir}/applications    \
    %{buildroot}%{_mandir}/man1             \
    %{buildroot}%{_sysconfdir}/profile.d    \
    %{buildroot}%{_sysconfdir}/%{name}
##
# Let's have some sanity
#
pushd %{buildroot}%{_datadir}/%{name}
install -pm 755 bin/*   %{buildroot}%{_bindir}/
rm -rf bin
ln -s %{_bindir} bin
install -pm 755 lib/*   %{buildroot}%{_libdir}/
rm -rf lib
ln -s %{_libdir} lib
install -pm 644 include/* %{buildroot}%{_includedir}/
rm -rf include
ln -s %{_includedir} include
install -pm 644 doc/*.1 %{buildroot}%{_mandir}/man1/
# doc and example directories are removed from GRACE_HOME and put in %doc
rm -rf doc
rm -rf examples
# the convcal source file shouldn't appear in %doc, it is removed here
rm -f auxiliary/convcal.c
# move config files to %{_sysconfdir} and do symlinks
for conf in gracerc templates gracerc.user; do
    mv $conf %{buildroot}%{_sysconfdir}/%{name}
    ln -s %{_sysconfdir}/%{name}/$conf $conf
done
mv fonts/FontDataBase %{buildroot}%{_sysconfdir}/%{name}
ln -s %{_sysconfdir}/%{name}/FontDataBase fonts/FontDataBase
popd
mkfontdir %{buildroot}%{_datadir}/%{name}/fonts/type1
##
# Desktop stuff
#
install -pm 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-install --vendor fedora --delete-original    \
    --dir %{buildroot}%{_datadir}/applications          \
    --add-category Application                          \
    --add-category Graphics	                            \
    %{buildroot}%{_datadir}/applications/%{name}.desktop
##
# Profile scripts
#
install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh


%clean
rm -rf %{buildroot}


%post
%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1


%postun
%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1


%files
%defattr(-,root,root,-)
%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
%doc cephes-license.email LICENSE.cephes
%doc examples/ doc/ 
%{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/%{name}/
%{_bindir}/*
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/include
%exclude %{_datadir}/%{name}/lib
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_mandir}/man*/*


%files devel
%defattr(-,root,root,-)
%doc grace_np/LICENSE
%{_includedir}/*
%{_datadir}/%{name}/include
%{_libdir}/*
%{_datadir}/%{name}/lib


%changelog
* Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
- put config files in /etc
- licence is GPL and not BSD/GPL, as it is not dual licensed

* Wed Sep 14 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-6
- Require nedit as an explicit Require.

* Tue Sep 13 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-5
- Normalize buildroot and change default editor to nedit.

* Fri Sep  9 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-4
- Add license to cephes library as well as the original mail where permission is given.
- Move permission of profile.d files from 644 to 755.

* Sat Sep  3 2005 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-3
- cleanup licences
- put examples/ and doc/ in %doc
- remove duplicate manpages 
- add patch to change fdf2fit path in graderc

* Sun Aug 21 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-2
- Add post and postun requires.

* Sat Aug 20 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-1

- Prepare for Fedora Extras submission, based on a previous spec file
  from Konstantin Ryabitsev (icon) and Seth Vidal from duke.edu


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 16:12:13 -0000	1.1
+++ .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
@@ -0,0 +1 @@
+grace-5.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 16:12:13 -0000	1.1
+++ sources	9 Jan 2006 16:15:12 -0000	1.2
@@ -0,0 +1 @@
+9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 16:22:20 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  9 Jan 2006 11:22:20 -0500
Subject: owners owners.list,1.517,1.518
Message-ID: <200601091622.k09GMjU9003464@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3440

Modified Files:
	owners.list 
Log Message:
perl-GnuPG-Interface now owned by Matt Domsch, with thanks to spot for holding it for me before.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- owners.list	9 Jan 2006 15:52:21 -0000	1.517
+++ owners.list	9 Jan 2006 16:22:20 -0000	1.518
@@ -809,7 +809,7 @@
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 16:31:59 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:31:59 -0500
Subject: owners owners.list,1.518,1.519
Message-ID: <200601091632.k09GWVfg003587@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3567

Modified Files:
	owners.list 
Log Message:
Add grace


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- owners.list	9 Jan 2006 16:22:20 -0000	1.518
+++ owners.list	9 Jan 2006 16:31:59 -0000	1.519
@@ -338,6 +338,7 @@
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|grace|Numerical Data Processing and Visualization Tool|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|oliver at linux-kernel.at|extras-qa at fedoraproject.org|ellson at research.att.com



From fedora-extras-commits at redhat.com  Mon Jan  9 18:17:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:17:57 -0500
Subject: rpms/perl-Class-Accessor/FC-3 perl-Class-Accessor.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091818.k09IITZM007445@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Accessor/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-3

Modified Files:
	perl-Class-Accessor.spec sources 
Log Message:

Bump to 0.22



Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/perl-Class-Accessor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Accessor.spec	14 Aug 2005 18:39:08 -0000	1.1
+++ perl-Class-Accessor.spec	9 Jan 2006 18:17:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.19
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.22-1
+- bump to 0.22
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
 - add examples/ to %doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 18:39:08 -0000	1.2
+++ sources	9 Jan 2006 18:17:56 -0000	1.3
@@ -1 +1 @@
-c61a058df6901b4ebae2596fd6352197  Class-Accessor-0.19.tar.gz
+6259a41d8a0cb44742f0d9a772df3156  Class-Accessor-0.22.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:18:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:18:04 -0500
Subject: rpms/perl-Class-Accessor/FC-4 perl-Class-Accessor.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091818.k09IIari007449@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Accessor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-4

Modified Files:
	perl-Class-Accessor.spec sources 
Log Message:

Bump to 0.22



Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/perl-Class-Accessor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Accessor.spec	14 Aug 2005 18:39:08 -0000	1.1
+++ perl-Class-Accessor.spec	9 Jan 2006 18:18:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.19
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.22-1
+- bump to 0.22
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
 - add examples/ to %doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 18:39:08 -0000	1.2
+++ sources	9 Jan 2006 18:18:03 -0000	1.3
@@ -1 +1 @@
-c61a058df6901b4ebae2596fd6352197  Class-Accessor-0.19.tar.gz
+6259a41d8a0cb44742f0d9a772df3156  Class-Accessor-0.22.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:18:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:18:10 -0500
Subject: rpms/perl-Class-Accessor/devel .cvsignore, 1.2,
	1.3 perl-Class-Accessor.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091818.k09IIgwX007454@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Accessor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/devel

Modified Files:
	.cvsignore perl-Class-Accessor.spec sources 
Log Message:

Bump to 0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 18:39:08 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:18:09 -0000	1.3
@@ -1 +1,2 @@
 Class-Accessor-0.19.tar.gz
+Class-Accessor-0.22.tar.gz


Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/perl-Class-Accessor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Accessor.spec	14 Aug 2005 18:39:08 -0000	1.1
+++ perl-Class-Accessor.spec	9 Jan 2006 18:18:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.19
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.22-1
+- bump to 0.22
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
 - add examples/ to %doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 18:39:08 -0000	1.2
+++ sources	9 Jan 2006 18:18:09 -0000	1.3
@@ -1 +1 @@
-c61a058df6901b4ebae2596fd6352197  Class-Accessor-0.19.tar.gz
+6259a41d8a0cb44742f0d9a772df3156  Class-Accessor-0.22.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:25:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:25:03 -0500
Subject: rpms/perl-Class-DBI-FromCGI/FC-3 perl-Class-DBI-FromCGI.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200601091825.k09IPaLm007639@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587/FC-3

Modified Files:
	perl-Class-DBI-FromCGI.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-FromCGI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-3/perl-Class-DBI-FromCGI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-FromCGI.spec	8 Sep 2005 15:19:27 -0000	1.1
+++ perl-Class-DBI-FromCGI.spec	9 Jan 2006 18:25:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-FromCGI
-Version:        0.94
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Update Class::DBI data using CGI::Untaint
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
+BuildRequires:	perl(Test::More)
 Requires:  perl(Class::DBI), perl(CGI::Untaint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.00-1
+- bump to 1.00
+
 * Wed Sep  7 2005 Paul Howarth <paul at city-fan.org> - 0.94-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:19:27 -0000	1.2
+++ sources	9 Jan 2006 18:25:03 -0000	1.3
@@ -1 +1 @@
-126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz
+b7ff8430745c3a72930310da5fc39ded  Class-DBI-FromCGI-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:25:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:25:10 -0500
Subject: rpms/perl-Class-DBI-FromCGI/FC-4 perl-Class-DBI-FromCGI.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200601091825.k09IPgP1007643@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587/FC-4

Modified Files:
	perl-Class-DBI-FromCGI.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-FromCGI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-4/perl-Class-DBI-FromCGI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-FromCGI.spec	8 Sep 2005 15:19:27 -0000	1.1
+++ perl-Class-DBI-FromCGI.spec	9 Jan 2006 18:25:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-FromCGI
-Version:        0.94
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Update Class::DBI data using CGI::Untaint
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
+BuildRequires:	perl(Test::More)
 Requires:  perl(Class::DBI), perl(CGI::Untaint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.00-1
+- bump to 1.00
+
 * Wed Sep  7 2005 Paul Howarth <paul at city-fan.org> - 0.94-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:19:27 -0000	1.2
+++ sources	9 Jan 2006 18:25:09 -0000	1.3
@@ -1 +1 @@
-126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz
+b7ff8430745c3a72930310da5fc39ded  Class-DBI-FromCGI-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:25:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:25:15 -0500
Subject: rpms/perl-Class-DBI-FromCGI/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-FromCGI.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091825.k09IPmPp007648@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587/devel

Modified Files:
	.cvsignore perl-Class-DBI-FromCGI.spec sources 
Log Message:

Bump to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:19:27 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:25:15 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-FromCGI-0.94.tar.gz
+Class-DBI-FromCGI-1.00.tar.gz


Index: perl-Class-DBI-FromCGI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/perl-Class-DBI-FromCGI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-FromCGI.spec	8 Sep 2005 15:19:27 -0000	1.1
+++ perl-Class-DBI-FromCGI.spec	9 Jan 2006 18:25:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-FromCGI
-Version:        0.94
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Update Class::DBI data using CGI::Untaint
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,7 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
+BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite) 
+BuildRequires:	perl(Test::More)
 Requires:  perl(Class::DBI), perl(CGI::Untaint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.00-1
+- bump to 1.00
+
 * Wed Sep  7 2005 Paul Howarth <paul at city-fan.org> - 0.94-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:19:27 -0000	1.2
+++ sources	9 Jan 2006 18:25:15 -0000	1.3
@@ -1 +1 @@
-126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz
+b7ff8430745c3a72930310da5fc39ded  Class-DBI-FromCGI-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:31:38 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:31:38 -0500
Subject: rpms/perl-Class-Data-Inheritable/FC-3
	perl-Class-Data-Inheritable.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091832.k09IWAcT007828@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/FC-3

Modified Files:
	perl-Class-Data-Inheritable.spec sources 
Log Message:

Bump to 0.04



Index: perl-Class-Data-Inheritable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-3/perl-Class-Data-Inheritable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Data-Inheritable.spec	10 Jul 2005 20:32:47 -0000	1.1
+++ perl-Class-Data-Inheritable.spec	9 Jan 2006 18:31:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Inheritable
-Version:        0.02
-Release:        3%{?dist}
+Version:        0.04
+Release:        1%{?dist}
 Summary:        Inheritable, overridable class data
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -40,11 +40,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{perl_vendorlib}/Class
+%{perl_vendorlib}/Class/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-1
+- bump to 0.04
+
 * Sun Jul 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.02-3
 - changed /Class/Data to /Class, for proper ownership
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 20:32:47 -0000	1.2
+++ sources	9 Jan 2006 18:31:38 -0000	1.3
@@ -1 +1 @@
-d3a9fff92ede1085643341179fd9263b  Class-Data-Inheritable-0.02.tar.gz
+49bc899e194c69bc014b14165437f1eb  Class-Data-Inheritable-0.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:31:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:31:44 -0500
Subject: rpms/perl-Class-Data-Inheritable/FC-4
	perl-Class-Data-Inheritable.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091832.k09IWGB6007832@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/FC-4

Modified Files:
	perl-Class-Data-Inheritable.spec sources 
Log Message:

Bump to 0.04



Index: perl-Class-Data-Inheritable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-4/perl-Class-Data-Inheritable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Data-Inheritable.spec	10 Jul 2005 20:32:47 -0000	1.1
+++ perl-Class-Data-Inheritable.spec	9 Jan 2006 18:31:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Inheritable
-Version:        0.02
-Release:        3%{?dist}
+Version:        0.04
+Release:        1%{?dist}
 Summary:        Inheritable, overridable class data
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -40,11 +40,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{perl_vendorlib}/Class
+%{perl_vendorlib}/Class/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-1
+- bump to 0.04
+
 * Sun Jul 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.02-3
 - changed /Class/Data to /Class, for proper ownership
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 20:32:47 -0000	1.2
+++ sources	9 Jan 2006 18:31:44 -0000	1.3
@@ -1 +1 @@
-d3a9fff92ede1085643341179fd9263b  Class-Data-Inheritable-0.02.tar.gz
+49bc899e194c69bc014b14165437f1eb  Class-Data-Inheritable-0.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:31:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:31:50 -0500
Subject: rpms/perl-Class-Data-Inheritable/devel .cvsignore, 1.2,
	1.3 perl-Class-Data-Inheritable.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091832.k09IWMWC007837@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/devel

Modified Files:
	.cvsignore perl-Class-Data-Inheritable.spec sources 
Log Message:

Bump to 0.04



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jul 2005 20:32:47 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:31:50 -0000	1.3
@@ -1 +1,2 @@
 Class-Data-Inheritable-0.02.tar.gz
+Class-Data-Inheritable-0.04.tar.gz


Index: perl-Class-Data-Inheritable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/perl-Class-Data-Inheritable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Data-Inheritable.spec	10 Jul 2005 20:32:47 -0000	1.1
+++ perl-Class-Data-Inheritable.spec	9 Jan 2006 18:31:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Inheritable
-Version:        0.02
-Release:        3%{?dist}
+Version:        0.04
+Release:        1%{?dist}
 Summary:        Inheritable, overridable class data
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -40,11 +40,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{perl_vendorlib}/Class
+%{perl_vendorlib}/Class/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-1
+- bump to 0.04
+
 * Sun Jul 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.02-3
 - changed /Class/Data to /Class, for proper ownership
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 20:32:47 -0000	1.2
+++ sources	9 Jan 2006 18:31:50 -0000	1.3
@@ -1 +1 @@
-d3a9fff92ede1085643341179fd9263b  Class-Data-Inheritable-0.02.tar.gz
+49bc899e194c69bc014b14165437f1eb  Class-Data-Inheritable-0.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:45:36 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:45:36 -0500
Subject: rpms/perl-CGI-Untaint-date/FC-3 perl-CGI-Untaint-date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091846.k09Ik9BH008032@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint-date/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978/FC-3

Modified Files:
	perl-CGI-Untaint-date.spec sources 
Log Message:

Bump to 1.00



Index: perl-CGI-Untaint-date.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-3/perl-CGI-Untaint-date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint-date.spec	24 Aug 2005 16:34:21 -0000	1.1
+++ perl-CGI-Untaint-date.spec	9 Jan 2006 18:45:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-date
-Version:        0.03
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Validate a date
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Tue Aug 23 2005 Paul Howarth <paul at city-fan.org> 0.03-3
 - add BR: perl(Date::Simple) and perl(Date::Manip)
 - add license text for GPL and Artistic licenses


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2005 16:34:21 -0000	1.2
+++ sources	9 Jan 2006 18:45:36 -0000	1.3
@@ -1 +1 @@
-8244770c2a93e8c1f08085bfffa64d4a  CGI-Untaint-date-0.03.tar.gz
+d042ddc051a289514943860e7effb56e  CGI-Untaint-date-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:45:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:45:42 -0500
Subject: rpms/perl-CGI-Untaint-date/FC-4 perl-CGI-Untaint-date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091846.k09IkFxq008036@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint-date/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978/FC-4

Modified Files:
	perl-CGI-Untaint-date.spec sources 
Log Message:

Bump to 1.00



Index: perl-CGI-Untaint-date.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-4/perl-CGI-Untaint-date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint-date.spec	24 Aug 2005 16:34:21 -0000	1.1
+++ perl-CGI-Untaint-date.spec	9 Jan 2006 18:45:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-date
-Version:        0.03
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Validate a date
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Tue Aug 23 2005 Paul Howarth <paul at city-fan.org> 0.03-3
 - add BR: perl(Date::Simple) and perl(Date::Manip)
 - add license text for GPL and Artistic licenses


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2005 16:34:21 -0000	1.2
+++ sources	9 Jan 2006 18:45:42 -0000	1.3
@@ -1 +1 @@
-8244770c2a93e8c1f08085bfffa64d4a  CGI-Untaint-date-0.03.tar.gz
+d042ddc051a289514943860e7effb56e  CGI-Untaint-date-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:45:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:45:48 -0500
Subject: rpms/perl-CGI-Untaint-date/devel .cvsignore, 1.2,
	1.3 perl-CGI-Untaint-date.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091846.k09IkKrZ008041@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint-date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978/devel

Modified Files:
	.cvsignore perl-CGI-Untaint-date.spec sources 
Log Message:

Bump to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2005 16:34:21 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:45:48 -0000	1.3
@@ -1 +1,2 @@
 CGI-Untaint-date-0.03.tar.gz
+CGI-Untaint-date-1.00.tar.gz


Index: perl-CGI-Untaint-date.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/devel/perl-CGI-Untaint-date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint-date.spec	24 Aug 2005 16:34:21 -0000	1.1
+++ perl-CGI-Untaint-date.spec	9 Jan 2006 18:45:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-date
-Version:        0.03
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Validate a date
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Tue Aug 23 2005 Paul Howarth <paul at city-fan.org> 0.03-3
 - add BR: perl(Date::Simple) and perl(Date::Manip)
 - add license text for GPL and Artistic licenses


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2005 16:34:21 -0000	1.2
+++ sources	9 Jan 2006 18:45:48 -0000	1.3
@@ -1 +1 @@
-8244770c2a93e8c1f08085bfffa64d4a  CGI-Untaint-date-0.03.tar.gz
+d042ddc051a289514943860e7effb56e  CGI-Untaint-date-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:50:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:50:33 -0500
Subject: rpms/perl-Class-DBI-SQLite/FC-3 perl-Class-DBI-SQLite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091851.k09Ip5CZ008573@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521/FC-3

Modified Files:
	perl-Class-DBI-SQLite.spec sources 
Log Message:

Bump to 0.11



Index: perl-Class-DBI-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-3/perl-Class-DBI-SQLite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-SQLite.spec	4 Sep 2005 21:43:49 -0000	1.1
+++ perl-Class-DBI-SQLite.spec	9 Jan 2006 18:50:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-SQLite
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Extension to Class::DBI for sqlite
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.11-1
+- bump to 0.11
+
 * Sun Sep  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
 - add R: perl(DBD::SQLite)
 - remove R: perl(Class::DBI)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2005 21:43:49 -0000	1.2
+++ sources	9 Jan 2006 18:50:33 -0000	1.3
@@ -1 +1 @@
-13ee636b0bfd08e0b9c6cf0e7429810a  Class-DBI-SQLite-0.10.tar.gz
+25e80b9d2f2d66e6fc51d487f0894802  Class-DBI-SQLite-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:50:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:50:39 -0500
Subject: rpms/perl-Class-DBI-SQLite/FC-4 perl-Class-DBI-SQLite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091851.k09IpBBc008577@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521/FC-4

Modified Files:
	perl-Class-DBI-SQLite.spec sources 
Log Message:

Bump to 0.11



Index: perl-Class-DBI-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-4/perl-Class-DBI-SQLite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-SQLite.spec	4 Sep 2005 21:43:49 -0000	1.1
+++ perl-Class-DBI-SQLite.spec	9 Jan 2006 18:50:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-SQLite
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Extension to Class::DBI for sqlite
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.11-1
+- bump to 0.11
+
 * Sun Sep  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
 - add R: perl(DBD::SQLite)
 - remove R: perl(Class::DBI)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2005 21:43:49 -0000	1.2
+++ sources	9 Jan 2006 18:50:38 -0000	1.3
@@ -1 +1 @@
-13ee636b0bfd08e0b9c6cf0e7429810a  Class-DBI-SQLite-0.10.tar.gz
+25e80b9d2f2d66e6fc51d487f0894802  Class-DBI-SQLite-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:50:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:50:45 -0500
Subject: rpms/perl-Class-DBI-SQLite/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-SQLite.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091851.k09IpHbo008582@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521/devel

Modified Files:
	.cvsignore perl-Class-DBI-SQLite.spec sources 
Log Message:

Bump to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Sep 2005 21:43:49 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:50:44 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-SQLite-0.10.tar.gz
+Class-DBI-SQLite-0.11.tar.gz


Index: perl-Class-DBI-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/perl-Class-DBI-SQLite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-SQLite.spec	4 Sep 2005 21:43:49 -0000	1.1
+++ perl-Class-DBI-SQLite.spec	9 Jan 2006 18:50:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-SQLite
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Extension to Class::DBI for sqlite
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.11-1
+- bump to 0.11
+
 * Sun Sep  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
 - add R: perl(DBD::SQLite)
 - remove R: perl(Class::DBI)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2005 21:43:49 -0000	1.2
+++ sources	9 Jan 2006 18:50:44 -0000	1.3
@@ -1 +1 @@
-13ee636b0bfd08e0b9c6cf0e7429810a  Class-DBI-SQLite-0.10.tar.gz
+25e80b9d2f2d66e6fc51d487f0894802  Class-DBI-SQLite-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:14:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:14:37 -0500
Subject: rpms/gxemul/FC-3 gxemul.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601091915.k09JFQEP010573@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gxemul/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10519/FC-3

Modified Files:
	gxemul.spec sources 
Log Message:

Bump to 0.3.7



Index: gxemul.spec
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-3/gxemul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gxemul.spec	29 Jul 2005 16:51:26 -0000	1.1
+++ gxemul.spec	9 Jan 2006 19:14:37 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		gxemul
-Version:	0.3.4
+Version:	0.3.7
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
@@ -7,6 +7,7 @@
 URL:		http://gavare.se/gxemul
 Source0:	http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	xorg-x11-devel
 
 %description
 GXemul is an experimental instruction-level machine emulator. It can be
@@ -20,7 +21,7 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-all
 make %{?_smp_mflags}
 
 %install
@@ -40,5 +41,9 @@
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.7-1
+- bump to 0.3.7
+- enable all the cpu types by default (MIPS, ARM, PPC are primary)
+
 * Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.4-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jul 2005 16:51:26 -0000	1.2
+++ sources	9 Jan 2006 19:14:37 -0000	1.3
@@ -1 +1 @@
-dbf7ef59d2bb8f1e3082d0fa5fb434af  gxemul-0.3.4.tar.gz
+48301bcba8ee51c0f6bcf462277668c5  gxemul-0.3.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:14:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:14:56 -0500
Subject: rpms/gxemul/FC-4 gxemul.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601091915.k09JFURa010575@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gxemul/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10519/FC-4

Modified Files:
	gxemul.spec sources 
Log Message:

Bump to 0.3.7



Index: gxemul.spec
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-4/gxemul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gxemul.spec	29 Jul 2005 16:51:26 -0000	1.1
+++ gxemul.spec	9 Jan 2006 19:14:56 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		gxemul
-Version:	0.3.4
+Version:	0.3.7
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
@@ -7,6 +7,7 @@
 URL:		http://gavare.se/gxemul
 Source0:	http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	xorg-x11-devel
 
 %description
 GXemul is an experimental instruction-level machine emulator. It can be
@@ -20,7 +21,7 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-all
 make %{?_smp_mflags}
 
 %install
@@ -40,5 +41,9 @@
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.7-1
+- bump to 0.3.7
+- enable all the cpu types by default (MIPS, ARM, PPC are primary)
+
 * Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.4-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jul 2005 16:51:26 -0000	1.2
+++ sources	9 Jan 2006 19:14:56 -0000	1.3
@@ -1 +1 @@
-dbf7ef59d2bb8f1e3082d0fa5fb434af  gxemul-0.3.4.tar.gz
+48301bcba8ee51c0f6bcf462277668c5  gxemul-0.3.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:15:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:15:10 -0500
Subject: rpms/gxemul/devel .cvsignore, 1.2, 1.3 gxemul.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601091915.k09JFgl2010582@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gxemul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10519/devel

Modified Files:
	.cvsignore gxemul.spec sources 
Log Message:

Bump to 0.3.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jul 2005 16:51:26 -0000	1.2
+++ .cvsignore	9 Jan 2006 19:15:09 -0000	1.3
@@ -1 +1,2 @@
 gxemul-0.3.4.tar.gz
+gxemul-0.3.7.tar.gz


Index: gxemul.spec
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/gxemul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gxemul.spec	29 Jul 2005 16:51:26 -0000	1.1
+++ gxemul.spec	9 Jan 2006 19:15:09 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		gxemul
-Version:	0.3.4
+Version:	0.3.7
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
@@ -7,6 +7,7 @@
 URL:		http://gavare.se/gxemul
 Source0:	http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libX11-devel, xorg-x11-proto-devel
 
 %description
 GXemul is an experimental instruction-level machine emulator. It can be
@@ -20,7 +21,7 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-all
 make %{?_smp_mflags}
 
 %install
@@ -40,5 +41,9 @@
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.7-1
+- bump to 0.3.7
+- enable all the cpu types by default (MIPS, ARM, PPC are primary)
+
 * Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.4-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jul 2005 16:51:26 -0000	1.2
+++ sources	9 Jan 2006 19:15:09 -0000	1.3
@@ -1 +1 @@
-dbf7ef59d2bb8f1e3082d0fa5fb434af  gxemul-0.3.4.tar.gz
+48301bcba8ee51c0f6bcf462277668c5  gxemul-0.3.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:26:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:26:13 -0500
Subject: rpms/R/FC-3 R.spec,1.12,1.13
Message-ID: <200601091926.k09JQl77010810@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763/FC-3

Modified Files:
	R.spec 
Log Message:

fix BR: XFree86-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- R.spec	31 Dec 2005 21:29:40 -0000	1.12
+++ R.spec	9 Jan 2006 19:26:12 -0000	1.13
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-3
+- fix BR: XFree86-devel for FC-5
+
 * Sat Dec 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-2
 - missing BR: libXt-devel for FC-5
 



From fedora-extras-commits at redhat.com  Mon Jan  9 19:26:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:26:25 -0500
Subject: rpms/R/FC-4 R.spec,1.11,1.12
Message-ID: <200601091926.k09JQwHV010813@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763/FC-4

Modified Files:
	R.spec 
Log Message:

fix BR: XFree86-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- R.spec	31 Dec 2005 21:29:46 -0000	1.11
+++ R.spec	9 Jan 2006 19:26:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-3
+- fix BR: XFree86-devel for FC-5
+
 * Sat Dec 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-2
 - missing BR: libXt-devel for FC-5
 



From fedora-extras-commits at redhat.com  Mon Jan  9 19:26:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:26:31 -0500
Subject: rpms/R/devel R.spec,1.11,1.12
Message-ID: <200601091927.k09JR4dn010816@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763/devel

Modified Files:
	R.spec 
Log Message:

fix BR: XFree86-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- R.spec	31 Dec 2005 21:29:52 -0000	1.11
+++ R.spec	9 Jan 2006 19:26:31 -0000	1.12
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -70,7 +70,7 @@
 # You need all the BuildRequires for the development version
 Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo 
 Requires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
-Requires: XFree86-devel
+Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 Requires: tcl-devel, tk-devel
 
 %description devel
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-3
+- fix BR: XFree86-devel for FC-5
+
 * Sat Dec 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-2
 - missing BR: libXt-devel for FC-5
 



From fedora-extras-commits at redhat.com  Mon Jan  9 20:51:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 15:51:25 -0500
Subject: rpms/scalapack/FC-3 scalapack.spec,1.7,1.8
Message-ID: <200601092051.k09KpvnP012862@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-3

Modified Files:
	scalapack.spec 
Log Message:

Fix BR.



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scalapack.spec	19 Dec 2005 23:49:05 -0000	1.7
+++ scalapack.spec	9 Jan 2006 20:51:25 -0000	1.8
@@ -1,12 +1,12 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack, blas, lam, blacs
+BuildRequires: lapack, blas, lam, blacs-devel
 BuildRequires: gcc-g77
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
+- fix BR
+
 * Mon Dec 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-8
 - rebuild for gcc4.1
 



From fedora-extras-commits at redhat.com  Mon Jan  9 20:51:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 15:51:31 -0500
Subject: rpms/scalapack/FC-4 scalapack.spec,1.9,1.10
Message-ID: <200601092052.k09Kq3s9012865@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-4

Modified Files:
	scalapack.spec 
Log Message:

Fix BR.



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scalapack.spec	19 Dec 2005 23:49:11 -0000	1.9
+++ scalapack.spec	9 Jan 2006 20:51:30 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack, blas, lam, blacs
+BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
 BuildRequires: gcc-gfortran
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
+- fix BR
+
 * Mon Dec 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-8
 - rebuild for gcc4.1
 



From fedora-extras-commits at redhat.com  Mon Jan  9 20:51:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 15:51:37 -0500
Subject: rpms/scalapack/devel scalapack.spec,1.9,1.10
Message-ID: <200601092052.k09Kq9FJ012868@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/devel

Modified Files:
	scalapack.spec 
Log Message:

Fix BR.



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scalapack.spec	19 Dec 2005 23:49:16 -0000	1.9
+++ scalapack.spec	9 Jan 2006 20:51:36 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack, blas, lam, blacs
+BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
 BuildRequires: gcc-gfortran
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
+- fix BR
+
 * Mon Dec 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-8
 - rebuild for gcc4.1
 



From fedora-extras-commits at redhat.com  Mon Jan  9 21:12:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 16:12:02 -0500
Subject: rpms/perl-Class-DBI-mysql/FC-3 perl-Class-DBI-mysql.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601092112.k09LCYJo014780@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14697/FC-3

Modified Files:
	perl-Class-DBI-mysql.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-3/perl-Class-DBI-mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-mysql.spec	7 Sep 2005 18:30:08 -0000	1.1
+++ perl-Class-DBI-mysql.spec	9 Jan 2006 21:12:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-mysql
-Version:        0.23
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Extensions to Class::DBI for MySQL
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Fri Sep  2 2005 Paul Howarth <paul at city-fan.org> 0.23-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:30:08 -0000	1.2
+++ sources	9 Jan 2006 21:12:01 -0000	1.3
@@ -1 +1 @@
-6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz
+3bee2423ba61348a54201f4aca25e79b  Class-DBI-mysql-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 21:12:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 16:12:08 -0500
Subject: rpms/perl-Class-DBI-mysql/FC-4 perl-Class-DBI-mysql.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601092112.k09LCeWO014784@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14697/FC-4

Modified Files:
	perl-Class-DBI-mysql.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-4/perl-Class-DBI-mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-mysql.spec	7 Sep 2005 18:30:08 -0000	1.1
+++ perl-Class-DBI-mysql.spec	9 Jan 2006 21:12:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-mysql
-Version:        0.23
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Extensions to Class::DBI for MySQL
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Fri Sep  2 2005 Paul Howarth <paul at city-fan.org> 0.23-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:30:08 -0000	1.2
+++ sources	9 Jan 2006 21:12:08 -0000	1.3
@@ -1 +1 @@
-6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz
+3bee2423ba61348a54201f4aca25e79b  Class-DBI-mysql-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 21:12:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 16:12:14 -0500
Subject: rpms/perl-Class-DBI-mysql/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-mysql.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092112.k09LCkYl014789@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14697/devel

Modified Files:
	.cvsignore perl-Class-DBI-mysql.spec sources 
Log Message:

Bump to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 18:30:08 -0000	1.2
+++ .cvsignore	9 Jan 2006 21:12:14 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-mysql-0.23.tar.gz
+Class-DBI-mysql-1.00.tar.gz


Index: perl-Class-DBI-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/perl-Class-DBI-mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-mysql.spec	7 Sep 2005 18:30:08 -0000	1.1
+++ perl-Class-DBI-mysql.spec	9 Jan 2006 21:12:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-mysql
-Version:        0.23
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Extensions to Class::DBI for MySQL
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Fri Sep  2 2005 Paul Howarth <paul at city-fan.org> 0.23-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:30:08 -0000	1.2
+++ sources	9 Jan 2006 21:12:14 -0000	1.3
@@ -1 +1 @@
-6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz
+3bee2423ba61348a54201f4aca25e79b  Class-DBI-mysql-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 22:51:30 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Mon,  9 Jan 2006 17:51:30 -0500
Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.6,
	1.7
Message-ID: <200601092252.k09Mq2r8016945@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-netspeed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16924

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
Proper soname rebuild



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-netspeed.spec	9 Jan 2006 08:22:17 -0000	1.6
+++ gnome-applet-netspeed.spec	9 Jan 2006 22:51:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name: gnome-applet-netspeed    
 Version: 0.13
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: GNOME applet that shows traffic on a network device
 
 Group: Applications/Internet
@@ -53,6 +53,9 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-4
+-Proper soname rebuild
+
 * Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-3
 - Rebuild for libgtop soname change
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:00:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:00:28 -0500
Subject: rpms/pychart/FC-3 pychart-1.39-mkhowto.patch, NONE, 1.1 pychart.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092301.k09N10AJ017254@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17011/FC-3

Modified Files:
	pychart.spec sources 
Added Files:
	pychart-1.39-mkhowto.patch 
Log Message:

Bump to 1.39.


pychart-1.39-mkhowto.patch:

--- NEW FILE pychart-1.39-mkhowto.patch ---
--- PyChart/doc/Makefile.BAD	2006-01-09 16:16:34.000000000 -0600
+++ PyChart/doc/Makefile	2006-01-09 16:17:00.000000000 -0600
@@ -1,5 +1,5 @@
 PYCHART_DIR=..
-PYTHON_DOC_DIR=$(HOME)/Python-2.4.2/Doc
+PYTHON_DOC_DIR=$(PYCHART_DIR)/Doc
 all: pychart examples
 
 pychart: pychart.tex


Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/pychart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pychart.spec	22 Sep 2005 18:15:41 -0000	1.1
+++ pychart.spec	9 Jan 2006 23:00:27 -0000	1.2
@@ -1,16 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pychart
-Version:	1.38
-Release:	2%{?dist}
+Version:	1.39
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
 URL:		http://home.gna.org/pychart/
-Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+# This is the good upstream source. Unfortunately, we need to remove the dot to make latex2html happy.
+# Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+Source0:	PyChart-1_39.tar.gz
+# Fedora Core Python doesn't include the Doc/* directory in any binary package, so we can't build without
+# it as an addon source tarball. This is BZ #177350
+Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ghostscript-devel
 BuildArch:	noarch
+Patch0:		pychart-1.39-mkhowto.patch
 
 %description
 PyChart is a Python library for creating high quality Encapsulated Postscript,
@@ -33,11 +39,14 @@
 that tell you how to program with the pychart library.
 
 %prep
-%setup -q -n PyChart-%{version}
+%setup -q -n PyChart-1_39 -T -b 0 -a 1
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-cd doc/
+cd demos/
+make colorps colorpdf colorpng
+cd ../doc
 make
 
 %install
@@ -57,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
+- bump to 1.39
+
 * Mon Sep 19 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.38-2
 - Create a doc subpackage with the developers documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 18:15:41 -0000	1.2
+++ sources	9 Jan 2006 23:00:27 -0000	1.3
@@ -1 +1,2 @@
-30b41cb4e0cd4957a8e54b0a58ee48a2  PyChart-1.38.tar.gz
+6e5aa0836a3ccfb2c558072e067fd5a6  PyChart-1_39.tar.gz
+d5db2c4d2c0af6c3fc84ce013954ce4c  python-2.4.2-Doc.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:00:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:00:33 -0500
Subject: rpms/pychart/FC-4 pychart-1.39-mkhowto.patch, NONE, 1.1 pychart.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092301.k09N16fB018463@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17011/FC-4

Modified Files:
	pychart.spec sources 
Added Files:
	pychart-1.39-mkhowto.patch 
Log Message:

Bump to 1.39.


pychart-1.39-mkhowto.patch:

--- NEW FILE pychart-1.39-mkhowto.patch ---
--- PyChart/doc/Makefile.BAD	2006-01-09 16:16:34.000000000 -0600
+++ PyChart/doc/Makefile	2006-01-09 16:17:00.000000000 -0600
@@ -1,5 +1,5 @@
 PYCHART_DIR=..
-PYTHON_DOC_DIR=$(HOME)/Python-2.4.2/Doc
+PYTHON_DOC_DIR=$(PYCHART_DIR)/Doc
 all: pychart examples
 
 pychart: pychart.tex


Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/pychart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pychart.spec	22 Sep 2005 18:15:41 -0000	1.1
+++ pychart.spec	9 Jan 2006 23:00:33 -0000	1.2
@@ -1,16 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pychart
-Version:	1.38
-Release:	2%{?dist}
+Version:	1.39
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
 URL:		http://home.gna.org/pychart/
-Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+# This is the good upstream source. Unfortunately, we need to remove the dot to make latex2html happy.
+# Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+Source0:	PyChart-1_39.tar.gz
+# Fedora Core Python doesn't include the Doc/* directory in any binary package, so we can't build without
+# it as an addon source tarball. This is BZ #177350
+Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ghostscript-devel
 BuildArch:	noarch
+Patch0:		pychart-1.39-mkhowto.patch
 
 %description
 PyChart is a Python library for creating high quality Encapsulated Postscript,
@@ -33,11 +39,14 @@
 that tell you how to program with the pychart library.
 
 %prep
-%setup -q -n PyChart-%{version}
+%setup -q -n PyChart-1_39 -T -b 0 -a 1
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-cd doc/
+cd demos/
+make colorps colorpdf colorpng
+cd ../doc
 make
 
 %install
@@ -57,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
+- bump to 1.39
+
 * Mon Sep 19 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.38-2
 - Create a doc subpackage with the developers documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 18:15:41 -0000	1.2
+++ sources	9 Jan 2006 23:00:33 -0000	1.3
@@ -1 +1,2 @@
-30b41cb4e0cd4957a8e54b0a58ee48a2  PyChart-1.38.tar.gz
+6e5aa0836a3ccfb2c558072e067fd5a6  PyChart-1_39.tar.gz
+d5db2c4d2c0af6c3fc84ce013954ce4c  python-2.4.2-Doc.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:00:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:00:39 -0500
Subject: rpms/pychart/devel pychart-1.39-mkhowto.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 pychart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092301.k09N1CjD018467@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17011/devel

Modified Files:
	.cvsignore pychart.spec sources 
Added Files:
	pychart-1.39-mkhowto.patch 
Log Message:

Bump to 1.39.


pychart-1.39-mkhowto.patch:

--- NEW FILE pychart-1.39-mkhowto.patch ---
--- PyChart/doc/Makefile.BAD	2006-01-09 16:16:34.000000000 -0600
+++ PyChart/doc/Makefile	2006-01-09 16:17:00.000000000 -0600
@@ -1,5 +1,5 @@
 PYCHART_DIR=..
-PYTHON_DOC_DIR=$(HOME)/Python-2.4.2/Doc
+PYTHON_DOC_DIR=$(PYCHART_DIR)/Doc
 all: pychart examples
 
 pychart: pychart.tex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 18:15:41 -0000	1.2
+++ .cvsignore	9 Jan 2006 23:00:39 -0000	1.3
@@ -1 +1,3 @@
 PyChart-1.38.tar.gz
+PyChart-1_39.tar.gz
+python-2.4.2-Doc.tar.gz


Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/pychart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pychart.spec	22 Sep 2005 18:15:41 -0000	1.1
+++ pychart.spec	9 Jan 2006 23:00:39 -0000	1.2
@@ -1,16 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pychart
-Version:	1.38
-Release:	2%{?dist}
+Version:	1.39
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
 URL:		http://home.gna.org/pychart/
-Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+# This is the good upstream source. Unfortunately, we need to remove the dot to make latex2html happy.
+# Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+Source0:	PyChart-1_39.tar.gz
+# Fedora Core Python doesn't include the Doc/* directory in any binary package, so we can't build without
+# it as an addon source tarball. This is BZ #177350
+Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ghostscript-devel
 BuildArch:	noarch
+Patch0:		pychart-1.39-mkhowto.patch
 
 %description
 PyChart is a Python library for creating high quality Encapsulated Postscript,
@@ -33,11 +39,14 @@
 that tell you how to program with the pychart library.
 
 %prep
-%setup -q -n PyChart-%{version}
+%setup -q -n PyChart-1_39 -T -b 0 -a 1
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-cd doc/
+cd demos/
+make colorps colorpdf colorpng
+cd ../doc
 make
 
 %install
@@ -57,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
+- bump to 1.39
+
 * Mon Sep 19 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.38-2
 - Create a doc subpackage with the developers documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 18:15:41 -0000	1.2
+++ sources	9 Jan 2006 23:00:39 -0000	1.3
@@ -1 +1,2 @@
-30b41cb4e0cd4957a8e54b0a58ee48a2  PyChart-1.38.tar.gz
+6e5aa0836a3ccfb2c558072e067fd5a6  PyChart-1_39.tar.gz
+d5db2c4d2c0af6c3fc84ce013954ce4c  python-2.4.2-Doc.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:08:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:08:34 -0500
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-3
	perl-Class-DBI-Loader-Relationship.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092309.k09N9eno018913@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/FC-3

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec sources 
Log Message:

Bump to 1.3



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader-Relationship.spec	14 Sep 2005 18:30:34 -0000	1.1
+++ perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader-Relationship
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        Distributable
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
+- bump to 1.3
+
 * Wed Sep 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-4
 - set license to Distributable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:30:34 -0000	1.2
+++ sources	9 Jan 2006 23:08:17 -0000	1.3
@@ -1 +1 @@
-d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz
+2eef3eb51e740067f3aceddac31b0190  Class-DBI-Loader-Relationship-1.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:08:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:08:42 -0500
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-4
	perl-Class-DBI-Loader-Relationship.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092309.k09N9iHb018915@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/FC-4

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec sources 
Log Message:

Bump to 1.3



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader-Relationship.spec	14 Sep 2005 18:30:34 -0000	1.1
+++ perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader-Relationship
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        Distributable
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
+- bump to 1.3
+
 * Wed Sep 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-4
 - set license to Distributable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:30:34 -0000	1.2
+++ sources	9 Jan 2006 23:08:41 -0000	1.3
@@ -1 +1 @@
-d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz
+2eef3eb51e740067f3aceddac31b0190  Class-DBI-Loader-Relationship-1.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:09:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:09:12 -0500
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Loader-Relationship.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601092309.k09N9mYa018918@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/devel

Modified Files:
	.cvsignore perl-Class-DBI-Loader-Relationship.spec sources 
Log Message:

Bump to 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2005 18:30:34 -0000	1.2
+++ .cvsignore	9 Jan 2006 23:09:12 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Loader-Relationship-1.2.tar.gz
+Class-DBI-Loader-Relationship-1.3.tar.gz


Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader-Relationship.spec	14 Sep 2005 18:30:34 -0000	1.1
+++ perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:09:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader-Relationship
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        Distributable
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
+- bump to 1.3
+
 * Wed Sep 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-4
 - set license to Distributable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:30:34 -0000	1.2
+++ sources	9 Jan 2006 23:09:12 -0000	1.3
@@ -1 +1 @@
-d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz
+2eef3eb51e740067f3aceddac31b0190  Class-DBI-Loader-Relationship-1.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:10:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:10:45 -0500
Subject: rpms/pychart/FC-3 pychart.spec,1.2,1.3
Message-ID: <200601092311.k09NBpjA019087@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18957/FC-3

Modified Files:
	pychart.spec 
Log Message:

Fix missing BR



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/pychart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pychart.spec	9 Jan 2006 23:00:27 -0000	1.2
+++ pychart.spec	9 Jan 2006 23:10:45 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel
+BuildRequires:	ghostscript-devel, tetex-latex, latex2html
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
+- BR: tetex-latex, latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
 - bump to 1.39
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:11:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:11:30 -0500
Subject: rpms/pychart/devel pychart.spec,1.2,1.3
Message-ID: <200601092312.k09NC3IM019103@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18957/devel

Modified Files:
	pychart.spec 
Log Message:

Fix missing BR



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/pychart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pychart.spec	9 Jan 2006 23:00:39 -0000	1.2
+++ pychart.spec	9 Jan 2006 23:11:13 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel
+BuildRequires:	ghostscript-devel, tetex-latex, latex2html
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
+- BR: tetex-latex, latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
 - bump to 1.39
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:10:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:10:53 -0500
Subject: rpms/pychart/FC-4 pychart.spec,1.2,1.3
Message-ID: <200601092312.k09NC0Bb019097@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18957/FC-4

Modified Files:
	pychart.spec 
Log Message:

Fix missing BR



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/pychart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pychart.spec	9 Jan 2006 23:00:33 -0000	1.2
+++ pychart.spec	9 Jan 2006 23:10:53 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel
+BuildRequires:	ghostscript-devel, tetex-latex, latex2html
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
+- BR: tetex-latex, latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
 - bump to 1.39
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:26:41 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  9 Jan 2006 18:26:41 -0500
Subject: rpms/clamav/FC-3 clamav.spec,1.19,1.20 sources,1.11,1.12
Message-ID: <200601092327.k09NRDlb019448@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19411/FC-3

Modified Files:
	clamav.spec sources 
Log Message:
- updated to 0.88
- added pseudo-versions for the 'init(...)' provides as a first step
  for the support of alternative initmethods



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- clamav.spec	4 Nov 2005 12:55:19 -0000	1.19
+++ clamav.spec	9 Jan 2006 23:26:40 -0000	1.20
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.87.1
+Version:	0.88
 Release:	%release_func 1
 
 License:	GPL
@@ -84,7 +84,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
-Provides:	init(clamav-server)
+Provides:	init(clamav-server) = sysv
 Requires:	data(clamav)
 Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
@@ -96,7 +96,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-milter)
-Provides:	init(clamav-milter)
+Provides:	init(clamav-milter) = sysv
 %{!?_without_milter:BuildRequires:	sendmail-devel}
 Requires:		sendmail
 Requires(pre):		%_initrddir
@@ -426,6 +426,11 @@
 %endif	# _without_milter
 
 %changelog
+* Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
+- updated to 0.88
+- added pseudo-versions for the 'init(...)' provides as a first step
+  for the support of alternative initmethods
+
 * Fri Nov  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-1
 - updated to 0.87.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Nov 2005 12:55:19 -0000	1.11
+++ sources	9 Jan 2006 23:26:40 -0000	1.12
@@ -1,2 +1,2 @@
-bf9f038edf0b6d5f76552e1b8d014b81  clamav-0.87.1.tar.gz
-4685754c9888f14dfa0bd879002566b3  clamav-0.87.1.tar.gz.sig
+5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
+12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jan  9 23:26:47 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  9 Jan 2006 18:26:47 -0500
Subject: rpms/clamav/FC-4 clamav.spec,1.29,1.30 sources,1.13,1.14
Message-ID: <200601092327.k09NRJs3019452@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19411/FC-4

Modified Files:
	clamav.spec sources 
Log Message:
- updated to 0.88
- added pseudo-versions for the 'init(...)' provides as a first step
  for the support of alternative initmethods



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- clamav.spec	4 Nov 2005 12:46:23 -0000	1.29
+++ clamav.spec	9 Jan 2006 23:26:46 -0000	1.30
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.87.1
+Version:	0.88
 Release:	%release_func 1
 
 License:	GPL
@@ -84,7 +84,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
-Provides:	init(clamav-server)
+Provides:	init(clamav-server) = sysv
 Requires:	data(clamav)
 Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
@@ -96,7 +96,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-milter)
-Provides:	init(clamav-milter)
+Provides:	init(clamav-milter) = sysv
 %{!?_without_milter:BuildRequires:	sendmail-devel}
 Requires:		sendmail
 Requires(pre):		%_initrddir
@@ -426,6 +426,11 @@
 %endif	# _without_milter
 
 %changelog
+* Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
+- updated to 0.88
+- added pseudo-versions for the 'init(...)' provides as a first step
+  for the support of alternative initmethods
+
 * Fri Nov  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-1
 - updated to 0.87.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Nov 2005 12:46:23 -0000	1.13
+++ sources	9 Jan 2006 23:26:46 -0000	1.14
@@ -1,2 +1,2 @@
-bf9f038edf0b6d5f76552e1b8d014b81  clamav-0.87.1.tar.gz
-4685754c9888f14dfa0bd879002566b3  clamav-0.87.1.tar.gz.sig
+5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
+12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jan  9 23:27:47 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  9 Jan 2006 18:27:47 -0500
Subject: rpms/clamav/devel clamav.spec,1.30,1.31 sources,1.13,1.14
Message-ID: <200601092328.k09NSJZE019479@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19458/devel

Modified Files:
	clamav.spec sources 
Log Message:
- updated to 0.88
- added pseudo-versions for the 'init(...)' provides as a first step
  for the support of alternative initmethods
- moved 'freshclam.conf.5' man page into the -update subpackage (#173221)
- ship 'clamd.conf.5' man page in the -server subpackage *too*. The
  same file is contained in multiple packages now, but this man-page
  can not be removed from the base package because it also applies to
  'clamdscan' there (#173221).



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- clamav.spec	4 Nov 2005 12:55:25 -0000	1.30
+++ clamav.spec	9 Jan 2006 23:27:46 -0000	1.31
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.87.1
+Version:	0.88
 Release:	%release_func 1
 
 License:	GPL
@@ -84,7 +84,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
-Provides:	init(clamav-server)
+Provides:	init(clamav-server) = sysv
 Requires:	data(clamav)
 Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
@@ -96,7 +96,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-milter)
-Provides:	init(clamav-milter)
+Provides:	init(clamav-milter) = sysv
 %{!?_without_milter:BuildRequires:	sendmail-devel}
 Requires:		sendmail
 Requires(pre):		%_initrddir
@@ -348,7 +348,7 @@
 %{_bindir}/*
 %exclude %_bindir/clamav-config
 %exclude %_bindir/freshclam
-%exclude %_mandir/man1/freshclam*
+%exclude %_mandir/*/freshclam*
 
 ## -----------------------
 
@@ -384,7 +384,7 @@
 %files update
 %defattr(-,root,root,-)
 %_bindir/freshclam
-%_mandir/man1/freshclam*
+%_mandir/*/freshclam*
 %pkgdatadir/freshclam-sleep
 %config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
 %config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
@@ -398,7 +398,7 @@
 %files server
 %defattr(-,root,root,-)
 %doc _doc_server/*
-%doc %{_mandir}/man8/*
+%doc %_mandir/*/clamd*
 %{_sbindir}/*
 %_initrddir/clamd-wrapper
 %dir %pkgdatadir
@@ -426,6 +426,18 @@
 %endif	# _without_milter
 
 %changelog
+* Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
+- updated to 0.88
+- added pseudo-versions for the 'init(...)' provides as a first step
+  for the support of alternative initmethods
+
+* Tue Nov 15 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-2
+- moved 'freshclam.conf.5' man page into the -update subpackage (#173221)
+- ship 'clamd.conf.5' man page in the -server subpackage *too*. The
+  same file is contained in multiple packages now, but this man-page
+  can not be removed from the base package because it also applies to
+  'clamdscan' there (#173221).
+
 * Fri Nov  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-1
 - updated to 0.87.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Nov 2005 12:55:25 -0000	1.13
+++ sources	9 Jan 2006 23:27:46 -0000	1.14
@@ -1,2 +1,2 @@
-bf9f038edf0b6d5f76552e1b8d014b81  clamav-0.87.1.tar.gz
-4685754c9888f14dfa0bd879002566b3  clamav-0.87.1.tar.gz.sig
+5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
+12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig



From fedora-extras-commits at redhat.com  Tue Jan 10 00:00:32 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  9 Jan 2006 19:00:32 -0500
Subject: rpms/moodle/FC-4 moodle-1.5.3-SA18267.patch, NONE, 1.1 moodle.spec, 
	1.2, 1.3
Message-ID: <200601100001.k0A014dH021305@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19761/FC-4

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.5.3-SA18267.patch 
Log Message:
Add security patch for adodb (SA18267)

moodle-1.5.3-SA18267.patch:

--- NEW FILE moodle-1.5.3-SA18267.patch ---
diff -urN moodle/lib/adodb/server.php moodle.adodb/lib/adodb/server.php
--- moodle/lib/adodb/server.php	2005-11-10 21:05:24.000000000 -0500
+++ moodle.adodb/lib/adodb/server.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,98 +1,10 @@
 <?php
 
-/** 
- * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- */
- 
-/* Documentation on usage is at http://php.weblogs.com/adodb_csv
- *
- * Legal query string parameters:
- * 
- * sql = holds sql string
- * nrows = number of rows to return 
- * offset = skip offset rows of data
- * fetch = $ADODB_FETCH_MODE
- * 
- * example:
- *
- * http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
- */
+require_once('../../config.php');
+require_once('../weblib.php');
 
-
-/* 
- * Define the IP address you want to accept requests from 
- * as a security measure. If blank we accept anyone promisciously!
- */
-$ACCEPTIP = '';
-
-/*
- * Connection parameters
- */
-$driver = 'mysql';
-$host = 'localhost'; // DSN for odbc
-$uid = 'root';
-$pwd = '';
-$database = 'test';
-
-/*============================ DO NOT MODIFY BELOW HERE =================================*/
-// $sep must match csv2rs() in adodb.inc.php
-$sep = ' :::: ';
-
-include('./adodb.inc.php');
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-
-function err($s)
-{
-	die('**** '.$s.' ');
-}
-
-// undo stupid magic quotes
-function undomq(&$m) 
-{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-		
-	}
-	return $m;
-}
-
-///////////////////////////////////////// DEFINITIONS
-
-
-$remote = $_SERVER["REMOTE_ADDR"]; 
- 
-if (empty($_REQUEST['sql'])) err('No SQL');
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
- 	err("Unauthorised client: '$remote'");
-
-
-$conn = &ADONewConnection($driver);
-
-if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($_REQUEST['sql']);
-
-if (isset($_REQUEST['fetch']))
-	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
-	
-if (isset($_REQUEST['nrows'])) {
-	$nrows = $_REQUEST['nrows'];
-	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
-	//$rs->timeToLive = 1;
-	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
-} else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/server.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/adodb/server.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/server.php');
 
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/benchmark.php moodle.adodb/lib/adodb/tests/benchmark.php
--- moodle/lib/adodb/tests/benchmark.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/benchmark.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>ADODB Benchmarks</title>
-</head> 
-
-<body>
-<?php 
-/*
-V4.66 28 Sept 2005  (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Benchmark code to test the speed to the ADODB library with different databases.
-  This is a simplistic benchmark to be used as the basis for further testing.
-  It should not be used as proof of the superiority of one database over the other.
-*/ 
- 
-$testmssql = true;
-//$testvfp = true;
-$testoracle = true;
-$testado = true; 
-$testibase = true;
-$testaccess = true;
-$testmysql = true;
-$testsqlite = true;;
-
-set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_version,$ADODB_FETCH_MODE;
-
-	adodb_backtrace();
-	
-	$max = 100;
-	$sql = 'select * from ADOXYZ';
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	//print "<h3>ADODB Version: $ADODB_version Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i></h3>";
-	
-	// perform query once to cache results so we are only testing throughput 
-	$rs = $db->Execute($sql);
-	if (!$rs){
-		print "Error in recordset<p>";
-		return;
-	}	
-	$arr = $rs->GetArray();
-	//$db->debug = true;
-	global $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	$start = microtime();
-	for ($i=0; $i < $max; $i++) {
-		$rs =& $db->Execute($sql);	
-		$arr =& $rs->GetArray();
-	   //		 print $arr[0][1];
-	}
-	$end =  microtime();
-	$start = explode(' ',$start);
-	$end = explode(' ',$end);
-	
-	//print_r($start);
-	//print_r($end);
-	
-	  //  print_r($arr);
-	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
-	printf ("<p>seconds = %8.2f for %d iterations each with %d records</p>",$total,$max, sizeof($arr));
-	flush();
-
-
-		//$db->Close();
-}
-include("testdatabases.inc.php");
-
-?>
-
-
-</body>
-</html>
diff -urN moodle/lib/adodb/tests/client.php moodle.adodb/lib/adodb/tests/client.php
--- moodle/lib/adodb/tests/client.php	2004-07-12 23:13:35.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/client.php	1969-12-31 19:00:00.000000000 -0500
[...3782 lines suppressed...]
-			print "<p>Random session destroy</p>";
-			session_destroy();
-		}
-	}
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/test-xmlschema.php moodle.adodb/lib/adodb/tests/test-xmlschema.php
--- moodle/lib/adodb/tests/test-xmlschema.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/test-xmlschema.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,54 +0,0 @@
-<?PHP
-
-// V4.50 6 July 2004
-
-error_reporting(E_ALL);
-include_once( "../adodb.inc.php" );
-include_once( "../adodb-xmlschema.inc.php" );
-
-// To build the schema, start by creating a normal ADOdb connection:
-$db = ADONewConnection( 'mysql' );
-$db->Connect( 'localhost', 'root', '', 'schematest' );
-
-// To create a schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// To upgrade an existing schema object, use the following 
-// To upgrade an existing database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-print "<b>SQL to build xmlschema.xml</b>:\n<pre>";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
-
-
-
-print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-$db2->debug=1;
-
-foreach ($sql as $s)
-$db2->Execute($s);
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/time.php moodle.adodb/lib/adodb/tests/time.php
--- moodle/lib/adodb/tests/time.php	2003-10-22 04:52:42.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/time.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,17 +0,0 @@
-<?php
-
-include_once('../adodb-time.inc.php');
-//adodb_date_test();
-?>
-<?php 
-//require("adodb-time.inc.php"); 
-
-$datestring = "1963-12-04"; // string normally from mySQL 
-$stringArray = explode("-", $datestring);
-$date = adodb_mktime(0,0,0,$stringArray[1],$stringArray[2],$stringArray[0]); 
-
-$convertedDate = date("d-M-Y", $date); // converted string to UK style date
-
-echo( "Birthday: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
-
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/tmssql.php moodle.adodb/lib/adodb/tests/tmssql.php
--- moodle/lib/adodb/tests/tmssql.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/tmssql.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,65 +1,10 @@
 <?php
-error_reporting(E_ALL);
-ini_set('mssql.datetimeconvert',0); 
 
-function tmssql()
-{
-	print "<h3>mssql</h3>";
-	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
-	mssql_select_db('northwind',$db);
-	
-	$rs = mssql_query('select getdate() as date',$db);
-	$o = mssql_fetch_row($rs);
-	print_r($o);
-	mssql_free_result($rs);
-	
-	print "<p>Delete</p>"; flush();
-	$rs2 = mssql_query('delete from adoxyz',$db);
-	$p = mssql_num_rows($rs2);
-	mssql_free_result($rs2);
+require_once('../../../config.php');
+require_once('../../weblib.php');
 
-}
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/tests/tmssql.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/tests/tmssql.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/tests/tmssql.php');
 
-function tpear()
-{
-include_once('DB.php');
-
-	print "<h3>PEAR</h3>";
-	$username = 'adodb';
-	$password = 'natsoft';
-	$hostname = 'JAGUAR\vsdotnet';
-	$databasename = 'northwind';
-	
-	$dsn = "mssql://$username:$password@$hostname/$databasename";
-	$conn = &DB::connect($dsn);
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	@$conn->query('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->query('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-
-function tadodb()
-{
-include_once('../adodb.inc.php');
-
-	print "<h3>ADOdb</h3>";
-	$conn = NewADOConnection('mssql');
-	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-//	$conn->debug=1;
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	$conn->Execute('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->Execute('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-?>
-<a href=tmssql.php?do=tmssql>mssql</a>
-<a href=tmssql.php?do=tpear>pear</a>
-<a href=tmssql.php?do=tadodb>adodb</a>
-<?php
-if (!empty($_GET['do'])) {
-	$do = $_GET['do'];
-	$do();
-}
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/xmlschema.xml moodle.adodb/lib/adodb/tests/xmlschema.xml
--- moodle/lib/adodb/tests/xmlschema.xml	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/xmlschema.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.2">
-  <table name="mytable">
-    <field name="row1" type="I">
-      <descr>An integer row that's a primary key and autoincrements</descr>
-      <KEY/>
-      <AUTOINCREMENT/>
-    </field>
-    <field name="row2" type="C" size="16">
-      <descr>A 16 character varchar row that can't be null</descr>
-      <NOTNULL/>
-    </field>
-    <index name="myindex">
-      <col>row1</col>
-      <col>row2</col>
-    </index>
-  </table>
-  <sql>
-    <descr>SQL to be executed only on specific platforms</descr>
-    <query platform="postgres|postgres7">
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    </query>
-    <query platform="mysql">
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    </query>
-	<query platform="mssql">
-      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
-    </query>
-  </sql>
-  <table name="obsoletetable">
-    <DROP/>
-  </table>
-</schema>
\ No newline at end of file


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- moodle.spec	12 Dec 2005 21:05:20 -0000	1.2
+++ moodle.spec	10 Jan 2006 00:00:32 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -24,6 +24,7 @@
 Source6:        moodle-README-rpm
 Patch0:         moodle-1.5.2-mimetex-linux.patch
 Patch1:         moodle-1.5.2-mimetex-fedora.patch
+Patch2:         moodle-1.5.3-SA18267.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -628,6 +629,7 @@
 %setup -q -n %{name}
 %patch0 -p1 -b .mimetex-linux
 %patch1 -p1 -b .mimetex-fedora
+%patch2 -p1 -b .SA18267
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
@@ -692,6 +694,9 @@
 %endif
 
 %changelog
+* Mon Jan  9 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-2
+- Add security patch for adodb (SA18267)
+
 * Sat Dec 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-1
 - Update to 1.5.3
 - Split off spell check package due to lack of Text::Aspell



From fedora-extras-commits at redhat.com  Tue Jan 10 00:00:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  9 Jan 2006 19:00:38 -0500
Subject: rpms/moodle/devel moodle-1.5.3-SA18267.patch, NONE, 1.1 moodle.spec,
	1.2, 1.3
Message-ID: <200601100001.k0A01AXB021433@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19761/devel

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.5.3-SA18267.patch 
Log Message:
Add security patch for adodb (SA18267)

moodle-1.5.3-SA18267.patch:

--- NEW FILE moodle-1.5.3-SA18267.patch ---
diff -urN moodle/lib/adodb/server.php moodle.adodb/lib/adodb/server.php
--- moodle/lib/adodb/server.php	2005-11-10 21:05:24.000000000 -0500
+++ moodle.adodb/lib/adodb/server.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,98 +1,10 @@
 <?php
 
-/** 
- * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- */
- 
-/* Documentation on usage is at http://php.weblogs.com/adodb_csv
- *
- * Legal query string parameters:
- * 
- * sql = holds sql string
- * nrows = number of rows to return 
- * offset = skip offset rows of data
- * fetch = $ADODB_FETCH_MODE
- * 
- * example:
- *
- * http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
- */
+require_once('../../config.php');
+require_once('../weblib.php');
 
-
-/* 
- * Define the IP address you want to accept requests from 
- * as a security measure. If blank we accept anyone promisciously!
- */
-$ACCEPTIP = '';
-
-/*
- * Connection parameters
- */
-$driver = 'mysql';
-$host = 'localhost'; // DSN for odbc
-$uid = 'root';
-$pwd = '';
-$database = 'test';
-
-/*============================ DO NOT MODIFY BELOW HERE =================================*/
-// $sep must match csv2rs() in adodb.inc.php
-$sep = ' :::: ';
-
-include('./adodb.inc.php');
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-
-function err($s)
-{
-	die('**** '.$s.' ');
-}
-
-// undo stupid magic quotes
-function undomq(&$m) 
-{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-		
-	}
-	return $m;
-}
-
-///////////////////////////////////////// DEFINITIONS
-
-
-$remote = $_SERVER["REMOTE_ADDR"]; 
- 
-if (empty($_REQUEST['sql'])) err('No SQL');
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
- 	err("Unauthorised client: '$remote'");
-
-
-$conn = &ADONewConnection($driver);
-
-if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($_REQUEST['sql']);
-
-if (isset($_REQUEST['fetch']))
-	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
-	
-if (isset($_REQUEST['nrows'])) {
-	$nrows = $_REQUEST['nrows'];
-	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
-	//$rs->timeToLive = 1;
-	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
-} else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/server.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/adodb/server.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/server.php');
 
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/benchmark.php moodle.adodb/lib/adodb/tests/benchmark.php
--- moodle/lib/adodb/tests/benchmark.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/benchmark.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>ADODB Benchmarks</title>
-</head> 
-
-<body>
-<?php 
-/*
-V4.66 28 Sept 2005  (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Benchmark code to test the speed to the ADODB library with different databases.
-  This is a simplistic benchmark to be used as the basis for further testing.
-  It should not be used as proof of the superiority of one database over the other.
-*/ 
- 
-$testmssql = true;
-//$testvfp = true;
-$testoracle = true;
-$testado = true; 
-$testibase = true;
-$testaccess = true;
-$testmysql = true;
-$testsqlite = true;;
-
-set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_version,$ADODB_FETCH_MODE;
-
-	adodb_backtrace();
-	
-	$max = 100;
-	$sql = 'select * from ADOXYZ';
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	//print "<h3>ADODB Version: $ADODB_version Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i></h3>";
-	
-	// perform query once to cache results so we are only testing throughput 
-	$rs = $db->Execute($sql);
-	if (!$rs){
-		print "Error in recordset<p>";
-		return;
-	}	
-	$arr = $rs->GetArray();
-	//$db->debug = true;
-	global $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	$start = microtime();
-	for ($i=0; $i < $max; $i++) {
-		$rs =& $db->Execute($sql);	
-		$arr =& $rs->GetArray();
-	   //		 print $arr[0][1];
-	}
-	$end =  microtime();
-	$start = explode(' ',$start);
-	$end = explode(' ',$end);
-	
-	//print_r($start);
-	//print_r($end);
-	
-	  //  print_r($arr);
-	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
-	printf ("<p>seconds = %8.2f for %d iterations each with %d records</p>",$total,$max, sizeof($arr));
-	flush();
-
-
-		//$db->Close();
-}
-include("testdatabases.inc.php");
-
-?>
-
-
-</body>
-</html>
diff -urN moodle/lib/adodb/tests/client.php moodle.adodb/lib/adodb/tests/client.php
--- moodle/lib/adodb/tests/client.php	2004-07-12 23:13:35.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/client.php	1969-12-31 19:00:00.000000000 -0500
[...3782 lines suppressed...]
-			print "<p>Random session destroy</p>";
-			session_destroy();
-		}
-	}
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/test-xmlschema.php moodle.adodb/lib/adodb/tests/test-xmlschema.php
--- moodle/lib/adodb/tests/test-xmlschema.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/test-xmlschema.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,54 +0,0 @@
-<?PHP
-
-// V4.50 6 July 2004
-
-error_reporting(E_ALL);
-include_once( "../adodb.inc.php" );
-include_once( "../adodb-xmlschema.inc.php" );
-
-// To build the schema, start by creating a normal ADOdb connection:
-$db = ADONewConnection( 'mysql' );
-$db->Connect( 'localhost', 'root', '', 'schematest' );
-
-// To create a schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// To upgrade an existing schema object, use the following 
-// To upgrade an existing database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-print "<b>SQL to build xmlschema.xml</b>:\n<pre>";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
-
-
-
-print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-$db2->debug=1;
-
-foreach ($sql as $s)
-$db2->Execute($s);
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/time.php moodle.adodb/lib/adodb/tests/time.php
--- moodle/lib/adodb/tests/time.php	2003-10-22 04:52:42.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/time.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,17 +0,0 @@
-<?php
-
-include_once('../adodb-time.inc.php');
-//adodb_date_test();
-?>
-<?php 
-//require("adodb-time.inc.php"); 
-
-$datestring = "1963-12-04"; // string normally from mySQL 
-$stringArray = explode("-", $datestring);
-$date = adodb_mktime(0,0,0,$stringArray[1],$stringArray[2],$stringArray[0]); 
-
-$convertedDate = date("d-M-Y", $date); // converted string to UK style date
-
-echo( "Birthday: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
-
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/tmssql.php moodle.adodb/lib/adodb/tests/tmssql.php
--- moodle/lib/adodb/tests/tmssql.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/tmssql.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,65 +1,10 @@
 <?php
-error_reporting(E_ALL);
-ini_set('mssql.datetimeconvert',0); 
 
-function tmssql()
-{
-	print "<h3>mssql</h3>";
-	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
-	mssql_select_db('northwind',$db);
-	
-	$rs = mssql_query('select getdate() as date',$db);
-	$o = mssql_fetch_row($rs);
-	print_r($o);
-	mssql_free_result($rs);
-	
-	print "<p>Delete</p>"; flush();
-	$rs2 = mssql_query('delete from adoxyz',$db);
-	$p = mssql_num_rows($rs2);
-	mssql_free_result($rs2);
+require_once('../../../config.php');
+require_once('../../weblib.php');
 
-}
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/tests/tmssql.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/tests/tmssql.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/tests/tmssql.php');
 
-function tpear()
-{
-include_once('DB.php');
-
-	print "<h3>PEAR</h3>";
-	$username = 'adodb';
-	$password = 'natsoft';
-	$hostname = 'JAGUAR\vsdotnet';
-	$databasename = 'northwind';
-	
-	$dsn = "mssql://$username:$password@$hostname/$databasename";
-	$conn = &DB::connect($dsn);
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	@$conn->query('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->query('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-
-function tadodb()
-{
-include_once('../adodb.inc.php');
-
-	print "<h3>ADOdb</h3>";
-	$conn = NewADOConnection('mssql');
-	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-//	$conn->debug=1;
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	$conn->Execute('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->Execute('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-?>
-<a href=tmssql.php?do=tmssql>mssql</a>
-<a href=tmssql.php?do=tpear>pear</a>
-<a href=tmssql.php?do=tadodb>adodb</a>
-<?php
-if (!empty($_GET['do'])) {
-	$do = $_GET['do'];
-	$do();
-}
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/xmlschema.xml moodle.adodb/lib/adodb/tests/xmlschema.xml
--- moodle/lib/adodb/tests/xmlschema.xml	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/xmlschema.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.2">
-  <table name="mytable">
-    <field name="row1" type="I">
-      <descr>An integer row that's a primary key and autoincrements</descr>
-      <KEY/>
-      <AUTOINCREMENT/>
-    </field>
-    <field name="row2" type="C" size="16">
-      <descr>A 16 character varchar row that can't be null</descr>
-      <NOTNULL/>
-    </field>
-    <index name="myindex">
-      <col>row1</col>
-      <col>row2</col>
-    </index>
-  </table>
-  <sql>
-    <descr>SQL to be executed only on specific platforms</descr>
-    <query platform="postgres|postgres7">
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    </query>
-    <query platform="mysql">
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    </query>
-	<query platform="mssql">
-      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
-    </query>
-  </sql>
-  <table name="obsoletetable">
-    <DROP/>
-  </table>
-</schema>
\ No newline at end of file


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- moodle.spec	12 Dec 2005 21:05:20 -0000	1.2
+++ moodle.spec	10 Jan 2006 00:00:38 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -24,6 +24,7 @@
 Source6:        moodle-README-rpm
 Patch0:         moodle-1.5.2-mimetex-linux.patch
 Patch1:         moodle-1.5.2-mimetex-fedora.patch
+Patch2:         moodle-1.5.3-SA18267.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -628,6 +629,7 @@
 %setup -q -n %{name}
 %patch0 -p1 -b .mimetex-linux
 %patch1 -p1 -b .mimetex-fedora
+%patch2 -p1 -b .SA18267
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
@@ -692,6 +694,9 @@
 %endif
 
 %changelog
+* Mon Jan  9 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-2
+- Add security patch for adodb (SA18267)
+
 * Sat Dec 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-1
 - Update to 1.5.3
 - Split off spell check package due to lack of Text::Aspell



From fedora-extras-commits at redhat.com  Tue Jan 10 07:27:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Jan 2006 02:27:09 -0500
Subject: rpms/obby/FC-4 obby.spec,1.10,1.11
Message-ID: <200601100727.k0A7RfSW001941@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-4

Modified Files:
	obby.spec 
Log Message:
Remove libsigc++ from BuildRequires since this dep is filled by net6


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- obby.spec	8 Jan 2006 06:48:17 -0000	1.10
+++ obby.spec	10 Jan 2006 07:27:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           obby
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@
 Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
+BuildRequires:  net6-devel, gmp-devel, gettext-devel
 
 %description
 libobby is a library which provides synced document buffers. It supports
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
+- Remove libsigc++ from BuildRequires
+
 * Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan 10 07:27:15 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Jan 2006 02:27:15 -0500
Subject: rpms/obby/devel obby.spec,1.12,1.13
Message-ID: <200601100727.k0A7RlXn001944@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/devel

Modified Files:
	obby.spec 
Log Message:
Remove libsigc++ from BuildRequires since this dep is filled by net6


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- obby.spec	22 Dec 2005 08:56:58 -0000	1.12
+++ obby.spec	10 Jan 2006 07:27:15 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           obby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@
 Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
+BuildRequires:  net6-devel, gmp-devel, gettext-devel
 
 %description
 libobby is a library which provides synced document buffers. It supports
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Remove libsigc++ from BuildRequires
+
 * Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 



From fedora-extras-commits at redhat.com  Tue Jan 10 08:11:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:11:01 -0500
Subject: rpms/perl-Digest-MD2 - New directory
Message-ID: <200601100811.k0A8B3ix003832@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3824/perl-Digest-MD2

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD2 added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 08:11:07 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:11:07 -0500
Subject: rpms/perl-Digest-MD2/devel - New directory
Message-ID: <200601100811.k0A8B9Tq003847@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3824/perl-Digest-MD2/devel

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD2/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 08:12:14 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:12:14 -0500
Subject: rpms/perl-Digest-MD2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601100812.k0A8CIjo003888@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3876

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Digest-MD2


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Digest-MD2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 10 08:12:32 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:12:32 -0500
Subject: rpms/perl-Digest-MD2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601100812.k0A8CY3k003911@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3876/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Digest-MD2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 10 08:14:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:14:29 -0500
Subject: rpms/perl-Digest-MD2 import.log,1.1,1.2
Message-ID: <200601100815.k0A8F1O5004027@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3983

Modified Files:
	import.log 
Log Message:
auto-import perl-Digest-MD2-2.03-1 on branch devel from perl-Digest-MD2-2.03-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Jan 2006 08:12:13 -0000	1.1
+++ import.log	10 Jan 2006 08:14:28 -0000	1.2
@@ -0,0 +1 @@
+perl-Digest-MD2-2_03-1:HEAD:perl-Digest-MD2-2.03-1.src.rpm:1136880856



From fedora-extras-commits at redhat.com  Tue Jan 10 08:14:35 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:14:35 -0500
Subject: rpms/perl-Digest-MD2/devel perl-Digest-MD2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601100815.k0A8F8Jg004031@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3983/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Digest-MD2.spec 
Log Message:
auto-import perl-Digest-MD2-2.03-1 on branch devel from perl-Digest-MD2-2.03-1.src.rpm


--- NEW FILE perl-Digest-MD2.spec ---
Summary:	Perl interface to the MD2 Algorithm
Name:		perl-Digest-MD2
Version:	2.03
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Digest-MD2/
Source0:	http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-MD2-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Digest::MD2 module allows you to use the RSA Data Security Inc. MD2 Message
Digest algorithm from within Perl programs. The algorithm takes as input a
message of arbitrary length and produces as output a 128-bit "fingerprint" or
"message digest" of the input.

The Digest::MD2 programming interface is identical to the interface of
Digest::MD5.

%prep
%setup -q -n Digest-MD2-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc README Changes rfc1319.txt 
%{perl_vendorarch}/Digest/
%{perl_vendorarch}/auto/Digest/
%{_mandir}/man3/Digest::MD2.3pm*

%changelog
* Mon Dec  5 2005 Paul Howarth <paul at city-fan.org> 2.03-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Jan 2006 08:12:31 -0000	1.1
+++ .cvsignore	10 Jan 2006 08:14:34 -0000	1.2
@@ -0,0 +1 @@
+Digest-MD2-2.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Jan 2006 08:12:31 -0000	1.1
+++ sources	10 Jan 2006 08:14:34 -0000	1.2
@@ -0,0 +1 @@
+feecf9faa1b0a499a48fce214a309a78  Digest-MD2-2.03.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 08:18:58 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:18:58 -0500
Subject: owners owners.list,1.519,1.520
Message-ID: <200601100819.k0A8JUhk004131@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4114

Modified Files:
	owners.list 
Log Message:
Add perl-Digest-MD2



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- owners.list	9 Jan 2006 16:31:59 -0000	1.519
+++ owners.list	10 Jan 2006 08:18:57 -0000	1.520
@@ -782,6 +782,7 @@
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Digest-MD2|Perl interface to the MD2 Algorithm|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-MD4|Perl interface to the MD4 Algorithm|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 10 14:22:08 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 10 Jan 2006 09:22:08 -0500
Subject: rpms/chmlib/devel chmlib-chm_lib_c-ppc-patch.diff, 1.1,
	1.2 chmlib.spec, 1.6, 1.7
Message-ID: <200601101422.k0AEMf9m016188@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16166

Modified Files:
	chmlib-chm_lib_c-ppc-patch.diff chmlib.spec 
Log Message:

Next try to fix builds for powerpc



chmlib-chm_lib_c-ppc-patch.diff:

Index: chmlib-chm_lib_c-ppc-patch.diff
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib-chm_lib_c-ppc-patch.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chmlib-chm_lib_c-ppc-patch.diff	9 Jan 2006 14:26:30 -0000	1.1
+++ chmlib-chm_lib_c-ppc-patch.diff	10 Jan 2006 14:22:07 -0000	1.2
@@ -5,7 +5,7 @@
  /* MIPS         */
  /* PPC          */
 -#elif __i386__ || __sun || __sgi || __ppc__
-+#elif __i386__ || __sun || __sgi || __ppc__ || ppc
++#elif __i386__ || __sun || __sgi || __ppc__ || __powerpc__
  typedef unsigned char           UChar;
  typedef short                   Int16;
  typedef unsigned short          UInt16;


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- chmlib.spec	9 Jan 2006 14:55:56 -0000	1.6
+++ chmlib.spec	10 Jan 2006 14:22:07 -0000	1.7
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
@@ -56,6 +56,9 @@
 
 %changelog
 
+* Tue Jan 10 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-4%{?dist}
+- Next try to fix powerpc-arch 
+
 * Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-3%{?dist}
 - Typo fix
 



From fedora-extras-commits at redhat.com  Tue Jan 10 14:39:23 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 10 Jan 2006 09:39:23 -0500
Subject: fedora-security/audit fc4,1.122,1.123 fc5,1.32,1.33
Message-ID: <200601101439.k0AEdNKv016273@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253

Modified Files:
	fc4 fc5 
Log Message:
Note a PHP CVE id that we can safely ignore.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc4	9 Jan 2006 13:54:05 -0000	1.122
+++ fc4	10 Jan 2006 14:39:15 -0000	1.123
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fc5	9 Jan 2006 13:54:05 -0000	1.32
+++ fc5	10 Jan 2006 14:39:15 -0000	1.33
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]



From fedora-extras-commits at redhat.com  Tue Jan 10 15:07:53 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 10 Jan 2006 10:07:53 -0500
Subject: fedora-security/audit fc4,1.123,1.124 fc5,1.33,1.34
Message-ID: <200601101507.k0AF7rC2018020@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17999

Modified Files:
	fc4 fc5 
Log Message:
Note an rxvt-unicode issue that doesn't affect us.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fc4	10 Jan 2006 14:39:15 -0000	1.123
+++ fc4	10 Jan 2006 15:07:25 -0000	1.124
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fc5	10 Jan 2006 14:39:15 -0000	1.33
+++ fc5	10 Jan 2006 15:07:25 -0000	1.34
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)



From fedora-extras-commits at redhat.com  Tue Jan 10 15:23:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:23:44 -0500
Subject: rpms/pychart/FC-3 pychart.spec,1.3,1.4
Message-ID: <200601101524.k0AFOGOX018145@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18063/FC-3

Modified Files:
	pychart.spec 
Log Message:

Fix FC-3 build.



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/pychart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pychart.spec	9 Jan 2006 23:10:45 -0000	1.3
+++ pychart.spec	10 Jan 2006 15:23:40 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel, tetex-latex, latex2html
+BuildRequires:	ghostscript-devel, tetex-latex
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-3
+- FC3 doesn't need latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
 - BR: tetex-latex, latex2html
 



From fedora-extras-commits at redhat.com  Tue Jan 10 15:23:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:23:50 -0500
Subject: rpms/pychart/FC-4 pychart.spec,1.3,1.4
Message-ID: <200601101524.k0AFOMZD018148@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18063/FC-4

Modified Files:
	pychart.spec 
Log Message:

Fix FC-3 build.



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/pychart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pychart.spec	9 Jan 2006 23:10:53 -0000	1.3
+++ pychart.spec	10 Jan 2006 15:23:49 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-3
+- FC3 doesn't need latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
 - BR: tetex-latex, latex2html
 



From fedora-extras-commits at redhat.com  Tue Jan 10 15:23:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:23:56 -0500
Subject: rpms/pychart/devel pychart.spec,1.3,1.4
Message-ID: <200601101524.k0AFOSJc018151@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18063/devel

Modified Files:
	pychart.spec 
Log Message:

Fix FC-3 build.



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/pychart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pychart.spec	9 Jan 2006 23:11:13 -0000	1.3
+++ pychart.spec	10 Jan 2006 15:23:56 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-3
+- FC3 doesn't need latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
 - BR: tetex-latex, latex2html
 



From fedora-extras-commits at redhat.com  Tue Jan 10 15:35:36 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 10 Jan 2006 10:35:36 -0500
Subject: fedora-security/audit fc4,1.124,1.125 fc5,1.34,1.35
Message-ID: <200601101535.k0AFZaiB018310@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18290

Modified Files:
	fc4 fc5 
Log Message:
Fixup a kernel issue
Don't bother mentioning things in these files that we don't ship



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fc4	10 Jan 2006 15:07:25 -0000	1.124
+++ fc4	10 Jan 2006 15:35:28 -0000	1.125
@@ -3,12 +3,11 @@
 
 ** are items that need attention
 
-CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
-CVE-2005-4618 VULNERABLE (kernel)
+CVE-2005-4618 verson (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-4442 version (openldap) gentoo only


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fc5	10 Jan 2006 15:07:25 -0000	1.34
+++ fc5	10 Jan 2006 15:35:28 -0000	1.35
@@ -12,12 +12,11 @@
 
 ** are items that need attention
 
-CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
-CVE-2005-4618 VULNERABLE (kernel)
+CVE-2005-4618 VULNERABLE (kernel, fixed 2.6.15)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only



From fedora-extras-commits at redhat.com  Tue Jan 10 15:39:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:39:03 -0500
Subject: rpms/perl-Ima-DBI/FC-3 perl-Ima-DBI.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601101539.k0AFdZr4018377@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Ima-DBI/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18325/FC-3

Modified Files:
	perl-Ima-DBI.spec sources 
Log Message:

Bump to 0.34



Index: perl-Ima-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-3/perl-Ima-DBI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ima-DBI.spec	18 Aug 2005 04:28:25 -0000	1.1
+++ perl-Ima-DBI.spec	10 Jan 2006 15:39:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Ima-DBI
-Version:        0.33
-Release:        3%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Database connection caching and organization
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,9 +10,12 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Data::Inheritable) 
-BuildRequires:  perl(Class::WhiteHole)
+# No longer needed as of 0.34
+# BuildRequires:  perl(Class::WhiteHole)
 BuildRequires:  perl(DBIx::ContextualFetch)
-Requires:  perl(Class::Data::Inheritable), perl(Class::WhiteHole) 
+Requires:  perl(Class::Data::Inheritable)
+# No longer needed as of 0.34
+# Requires: perl(Class::WhiteHole) 
 Requires:  perl(DBIx::ContextualFetch)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,6 +50,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.34-1
+- bump to 0.34
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 04:28:25 -0000	1.2
+++ sources	10 Jan 2006 15:39:03 -0000	1.3
@@ -1 +1 @@
-3d72cfbca2aa5e2b631020122858e3ae  Ima-DBI-0.33.tar.gz
+1ccc6eb89ec4beb1b231fc69209b87c6  Ima-DBI-0.34.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:39:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:39:09 -0500
Subject: rpms/perl-Ima-DBI/FC-4 perl-Ima-DBI.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601101539.k0AFdf9R018381@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Ima-DBI/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18325/FC-4

Modified Files:
	perl-Ima-DBI.spec sources 
Log Message:

Bump to 0.34



Index: perl-Ima-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-4/perl-Ima-DBI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ima-DBI.spec	18 Aug 2005 04:28:25 -0000	1.1
+++ perl-Ima-DBI.spec	10 Jan 2006 15:39:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Ima-DBI
-Version:        0.33
-Release:        3%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Database connection caching and organization
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,9 +10,12 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Data::Inheritable) 
-BuildRequires:  perl(Class::WhiteHole)
+# No longer needed as of 0.34
+# BuildRequires:  perl(Class::WhiteHole)
 BuildRequires:  perl(DBIx::ContextualFetch)
-Requires:  perl(Class::Data::Inheritable), perl(Class::WhiteHole) 
+Requires:  perl(Class::Data::Inheritable)
+# No longer needed as of 0.34
+# Requires: perl(Class::WhiteHole) 
 Requires:  perl(DBIx::ContextualFetch)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,6 +50,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.34-1
+- bump to 0.34
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 04:28:25 -0000	1.2
+++ sources	10 Jan 2006 15:39:09 -0000	1.3
@@ -1 +1 @@
-3d72cfbca2aa5e2b631020122858e3ae  Ima-DBI-0.33.tar.gz
+1ccc6eb89ec4beb1b231fc69209b87c6  Ima-DBI-0.34.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:39:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:39:15 -0500
Subject: rpms/perl-Ima-DBI/devel .cvsignore, 1.2, 1.3 perl-Ima-DBI.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101539.k0AFdlRV018386@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Ima-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18325/devel

Modified Files:
	.cvsignore perl-Ima-DBI.spec sources 
Log Message:

Bump to 0.34



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 04:28:25 -0000	1.2
+++ .cvsignore	10 Jan 2006 15:39:15 -0000	1.3
@@ -1 +1,2 @@
 Ima-DBI-0.33.tar.gz
+Ima-DBI-0.34.tar.gz


Index: perl-Ima-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/perl-Ima-DBI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ima-DBI.spec	18 Aug 2005 04:28:25 -0000	1.1
+++ perl-Ima-DBI.spec	10 Jan 2006 15:39:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Ima-DBI
-Version:        0.33
-Release:        3%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Database connection caching and organization
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,9 +10,12 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Data::Inheritable) 
-BuildRequires:  perl(Class::WhiteHole)
+# No longer needed as of 0.34
+# BuildRequires:  perl(Class::WhiteHole)
 BuildRequires:  perl(DBIx::ContextualFetch)
-Requires:  perl(Class::Data::Inheritable), perl(Class::WhiteHole) 
+Requires:  perl(Class::Data::Inheritable)
+# No longer needed as of 0.34
+# Requires: perl(Class::WhiteHole) 
 Requires:  perl(DBIx::ContextualFetch)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,6 +50,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.34-1
+- bump to 0.34
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 04:28:25 -0000	1.2
+++ sources	10 Jan 2006 15:39:15 -0000	1.3
@@ -1 +1 @@
-3d72cfbca2aa5e2b631020122858e3ae  Ima-DBI-0.33.tar.gz
+1ccc6eb89ec4beb1b231fc69209b87c6  Ima-DBI-0.34.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:52:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:52:56 -0500
Subject: rpms/perl-Image-ExifTool/FC-3 perl-Image-ExifTool.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101553.k0AFrS4X018632@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568/FC-3

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 5.89



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/perl-Image-ExifTool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Image-ExifTool.spec	4 Aug 2005 20:55:50 -0000	1.1
+++ perl-Image-ExifTool.spec	10 Jan 2006 15:52:56 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	5.53
+Version:	5.89
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 5.89-1
+- bump to 5.89
+
 * Thu Aug  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 5.53-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 20:55:50 -0000	1.2
+++ sources	10 Jan 2006 15:52:56 -0000	1.3
@@ -1 +1 @@
-61cb796b444d16d2af7bb1c9c4d4991d  Image-ExifTool-5.53.tar.gz
+93c9a877256b0a2c2847346528bb18ca  Image-ExifTool-5.89.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:53:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:53:02 -0500
Subject: rpms/perl-Image-ExifTool/FC-4 perl-Image-ExifTool.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101553.k0AFrYuC018636@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568/FC-4

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 5.89



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/perl-Image-ExifTool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Image-ExifTool.spec	4 Aug 2005 20:55:50 -0000	1.1
+++ perl-Image-ExifTool.spec	10 Jan 2006 15:53:02 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	5.53
+Version:	5.89
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 5.89-1
+- bump to 5.89
+
 * Thu Aug  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 5.53-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 20:55:50 -0000	1.2
+++ sources	10 Jan 2006 15:53:02 -0000	1.3
@@ -1 +1 @@
-61cb796b444d16d2af7bb1c9c4d4991d  Image-ExifTool-5.53.tar.gz
+93c9a877256b0a2c2847346528bb18ca  Image-ExifTool-5.89.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:53:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:53:08 -0500
Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.2,
	1.3 perl-Image-ExifTool.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601101553.k0AFrekK018641@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568/devel

Modified Files:
	.cvsignore perl-Image-ExifTool.spec sources 
Log Message:

bump to 5.89



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2005 20:55:50 -0000	1.2
+++ .cvsignore	10 Jan 2006 15:53:08 -0000	1.3
@@ -1 +1,2 @@
 Image-ExifTool-5.53.tar.gz
+Image-ExifTool-5.89.tar.gz


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Image-ExifTool.spec	4 Aug 2005 20:55:50 -0000	1.1
+++ perl-Image-ExifTool.spec	10 Jan 2006 15:53:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	5.53
+Version:	5.89
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 5.89-1
+- bump to 5.89
+
 * Thu Aug  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 5.53-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 20:55:50 -0000	1.2
+++ sources	10 Jan 2006 15:53:08 -0000	1.3
@@ -1 +1 @@
-61cb796b444d16d2af7bb1c9c4d4991d  Image-ExifTool-5.53.tar.gz
+93c9a877256b0a2c2847346528bb18ca  Image-ExifTool-5.89.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:03:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 11:03:43 -0500
Subject: rpms/ebtables/FC-3 ebtables.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200601101604.k0AG4Nem020464@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20412/FC-3

Modified Files:
	ebtables.spec sources 
Log Message:

v2.0.8-rc1



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ebtables.spec	4 Jul 2005 17:09:41 -0000	1.4
+++ ebtables.spec	10 Jan 2006 16:03:38 -0000	1.5
@@ -1,14 +1,14 @@
+%define prever	rc1
+
 Name:		ebtables
-Version:	2.0.6
-Release:	7%{?dist}
+Version:	2.0.8
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
 URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz
+Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-%{prever}.tar.gz
 Source1:	ebtables.sysv
-Patch0:		ebtables-2.0.6-gcc34.patch
-Patch1:		ebtables-2.0.6-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq:		/sbin/chkconfig
 PreReq:		/sbin/service
@@ -25,9 +25,7 @@
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -n ebtables-v%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n ebtables-v%{version}-%{prever}
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -55,7 +53,7 @@
 fi
 
 %postun
-if [ $1 -ge 1 ]
+if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
 
@@ -71,6 +69,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc1
+- bump to 2.0.8-rc1
+
 * Mon Jul  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-7
 - buildsystem error requires artificial release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2005 16:03:23 -0000	1.2
+++ sources	10 Jan 2006 16:03:38 -0000	1.3
@@ -1 +1 @@
-c4559af2366c764c6c42a3fdd40d60d3  ebtables-v2.0.6.tar.gz
+e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:03:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 11:03:55 -0500
Subject: rpms/ebtables/FC-4 ebtables.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200601101604.k0AG4RGV020468@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20412/FC-4

Modified Files:
	ebtables.spec sources 
Log Message:

v2.0.8-rc1



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ebtables.spec	4 Jul 2005 17:09:41 -0000	1.4
+++ ebtables.spec	10 Jan 2006 16:03:54 -0000	1.5
@@ -1,14 +1,14 @@
+%define prever	rc1
+
 Name:		ebtables
-Version:	2.0.6
-Release:	7%{?dist}
+Version:	2.0.8
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
 URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz
+Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-%{prever}.tar.gz
 Source1:	ebtables.sysv
-Patch0:		ebtables-2.0.6-gcc34.patch
-Patch1:		ebtables-2.0.6-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq:		/sbin/chkconfig
 PreReq:		/sbin/service
@@ -25,9 +25,7 @@
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -n ebtables-v%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n ebtables-v%{version}-%{prever}
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -55,7 +53,7 @@
 fi
 
 %postun
-if [ $1 -ge 1 ]
+if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
 
@@ -71,6 +69,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc1
+- bump to 2.0.8-rc1
+
 * Mon Jul  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-7
 - buildsystem error requires artificial release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2005 16:03:23 -0000	1.2
+++ sources	10 Jan 2006 16:03:54 -0000	1.3
@@ -1 +1 @@
-c4559af2366c764c6c42a3fdd40d60d3  ebtables-v2.0.6.tar.gz
+e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:04:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 11:04:01 -0500
Subject: rpms/ebtables/devel .cvsignore, 1.2, 1.3 ebtables.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601101604.k0AG4YTW020473@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20412/devel

Modified Files:
	.cvsignore ebtables.spec sources 
Log Message:

v2.0.8-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jul 2005 16:03:23 -0000	1.2
+++ .cvsignore	10 Jan 2006 16:04:01 -0000	1.3
@@ -1 +1,2 @@
 ebtables-v2.0.6.tar.gz
+ebtables-v2.0.8-rc1.tar.gz


Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ebtables.spec	4 Jul 2005 17:09:46 -0000	1.4
+++ ebtables.spec	10 Jan 2006 16:04:01 -0000	1.5
@@ -1,14 +1,14 @@
+%define prever	rc1
+
 Name:		ebtables
-Version:	2.0.6
-Release:	7%{?dist}
+Version:	2.0.8
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
 URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz
+Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-%{prever}.tar.gz
 Source1:	ebtables.sysv
-Patch0:		ebtables-2.0.6-gcc34.patch
-Patch1:		ebtables-2.0.6-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq:		/sbin/chkconfig
 PreReq:		/sbin/service
@@ -25,9 +25,7 @@
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -n ebtables-v%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n ebtables-v%{version}-%{prever}
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -55,7 +53,7 @@
 fi
 
 %postun
-if [ $1 -ge 1 ]
+if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
 
@@ -71,6 +69,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc1
+- bump to 2.0.8-rc1
+
 * Mon Jul  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-7
 - buildsystem error requires artificial release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2005 16:03:23 -0000	1.2
+++ sources	10 Jan 2006 16:04:01 -0000	1.3
@@ -1 +1 @@
-c4559af2366c764c6c42a3fdd40d60d3  ebtables-v2.0.6.tar.gz
+e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:56:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 11:56:56 -0500
Subject: rpms/apcupsd/devel .cvsignore, 1.3, 1.4 apcupsd.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200601101657.k0AGvSgU020826@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20805

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
Update to 3.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 00:09:56 -0000	1.3
+++ .cvsignore	10 Jan 2006 16:56:55 -0000	1.4
@@ -1 +1 @@
-apcupsd-3.12.0.tar.gz
+apcupsd-3.12.1.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apcupsd.spec	5 Jan 2006 00:09:56 -0000	1.6
+++ apcupsd.spec	10 Jan 2006 16:56:55 -0000	1.7
@@ -1,5 +1,5 @@
 Name:         apcupsd
-Version:      3.12.0
+Version:      3.12.1
 Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.1-1
+- Update to 3.12.1
+
 * Wed Jan  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.0-1
 - Update to 3.12.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 00:09:56 -0000	1.3
+++ sources	10 Jan 2006 16:56:55 -0000	1.4
@@ -1 +1 @@
-7adb6274ede9dfaec7b6641105ae7a3a  apcupsd-3.12.0.tar.gz
+d2e710176430a28d624500e145d9ffe3  apcupsd-3.12.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:04:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 12:04:57 -0500
Subject: rpms/apcupsd/FC-4 .cvsignore, 1.2, 1.3 apcupsd.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601101705.k0AH5TTI022554@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22528

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
Update to 3.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 02:59:11 -0000	1.2
+++ .cvsignore	10 Jan 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-apcupsd-3.10.18.tar.gz
+apcupsd-3.12.1.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/apcupsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apcupsd.spec	4 Nov 2005 23:41:36 -0000	1.3
+++ apcupsd.spec	10 Jan 2006 17:04:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.10.18
-Release:      4%{?dist}
+Version:      3.12.1
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -43,7 +43,7 @@
 %prep
 %setup -q
 %patch -p1 -b .init
-dos2unix examples/*status
+dos2unix examples/*status examples/*.c
 
 
 %build
@@ -92,7 +92,7 @@
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
-chmod -x examples/*.conf
+chmod -x examples/*.conf examples/*.c
 rm examples/*.in
 
 
@@ -102,7 +102,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog doc/README.apcaccess doc/developers_manual examples ReleaseNotes
+%doc COPYING ChangeLog examples ReleaseNotes
 %dir %{_sysconfdir}/apcupsd
 %{_initrddir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
@@ -112,8 +112,8 @@
 %{_sysconfdir}/apcupsd/changeme
 %{_sysconfdir}/apcupsd/commfailure
 %{_sysconfdir}/apcupsd/commok
+%{_sysconfdir}/apcupsd/offbattery
 %{_sysconfdir}/apcupsd/onbattery
-%{_sysconfdir}/apcupsd/mainsback
 %{_sysconfdir}/apcupsd/masterconnect
 %{_sysconfdir}/apcupsd/mastertimeout
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.1-1
+- Update to 3.12.1
+
 * Fri Nov  4 2005 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-4
 - Add logrotate script for /var/log/apcupsd.events
 - Add apache configuration script and change cgi directory to


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 02:59:11 -0000	1.2
+++ sources	10 Jan 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-64104a1fface0253e77318ca84948bac  apcupsd-3.10.18.tar.gz
+d2e710176430a28d624500e145d9ffe3  apcupsd-3.12.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:55:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 12:55:13 -0500
Subject: rpms/perl-Class-Trigger/FC-3 perl-Class-Trigger.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101755.k0AHtjFp022841@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Trigger/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22786/FC-3

Modified Files:
	perl-Class-Trigger.spec sources 
Log Message:

0.10



Index: perl-Class-Trigger.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-3/perl-Class-Trigger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Trigger.spec	18 Aug 2005 03:10:55 -0000	1.1
+++ perl-Class-Trigger.spec	10 Jan 2006 17:55:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Trigger
-Version:        0.09
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Mixin to add / call inheritable triggers
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
+- bump to 0.10
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.09-3
 - fix missing BR: perl(Class::Data::Inheritable)
 - use %{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:10:55 -0000	1.2
+++ sources	10 Jan 2006 17:55:12 -0000	1.3
@@ -1 +1 @@
-7f7ce8d219003dcf64258d5da78d2d47  Class-Trigger-0.09.tar.gz
+5fbf56437f75b8f51debfa241c808846  Class-Trigger-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:55:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 12:55:19 -0500
Subject: rpms/perl-Class-Trigger/FC-4 perl-Class-Trigger.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101755.k0AHtpBd022845@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Trigger/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22786/FC-4

Modified Files:
	perl-Class-Trigger.spec sources 
Log Message:

0.10



Index: perl-Class-Trigger.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-4/perl-Class-Trigger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Trigger.spec	18 Aug 2005 03:10:55 -0000	1.1
+++ perl-Class-Trigger.spec	10 Jan 2006 17:55:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Trigger
-Version:        0.09
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Mixin to add / call inheritable triggers
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
+- bump to 0.10
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.09-3
 - fix missing BR: perl(Class::Data::Inheritable)
 - use %{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:10:55 -0000	1.2
+++ sources	10 Jan 2006 17:55:18 -0000	1.3
@@ -1 +1 @@
-7f7ce8d219003dcf64258d5da78d2d47  Class-Trigger-0.09.tar.gz
+5fbf56437f75b8f51debfa241c808846  Class-Trigger-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:55:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 12:55:24 -0500
Subject: rpms/perl-Class-Trigger/devel .cvsignore, 1.2,
	1.3 perl-Class-Trigger.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601101755.k0AHtvTf022850@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Trigger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22786/devel

Modified Files:
	.cvsignore perl-Class-Trigger.spec sources 
Log Message:

0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 03:10:55 -0000	1.2
+++ .cvsignore	10 Jan 2006 17:55:24 -0000	1.3
@@ -1 +1,2 @@
 Class-Trigger-0.09.tar.gz
+Class-Trigger-0.10.tar.gz


Index: perl-Class-Trigger.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/perl-Class-Trigger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Trigger.spec	18 Aug 2005 03:10:55 -0000	1.1
+++ perl-Class-Trigger.spec	10 Jan 2006 17:55:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Trigger
-Version:        0.09
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Mixin to add / call inheritable triggers
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
+- bump to 0.10
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.09-3
 - fix missing BR: perl(Class::Data::Inheritable)
 - use %{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:10:55 -0000	1.2
+++ sources	10 Jan 2006 17:55:24 -0000	1.3
@@ -1 +1 @@
-7f7ce8d219003dcf64258d5da78d2d47  Class-Trigger-0.09.tar.gz
+5fbf56437f75b8f51debfa241c808846  Class-Trigger-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:00:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:00:35 -0500
Subject: rpms/perl-Class-DBI-Pager/FC-3 perl-Class-DBI-Pager.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101801.k0AI18En024673@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22992/FC-3

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

0.07



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/perl-Class-DBI-Pager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Pager.spec	8 Sep 2005 15:09:28 -0000	1.1
+++ perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Mon Sep  5 2005 Paul Howarth <paul at city-fan.org> 0.06-3
 - remove redundant BR: perl
 - add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:09:28 -0000	1.2
+++ sources	10 Jan 2006 18:00:35 -0000	1.3
@@ -1 +1 @@
-358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz
+611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:00:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:00:41 -0500
Subject: rpms/perl-Class-DBI-Pager/FC-4 perl-Class-DBI-Pager.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101801.k0AI1Dm7024675@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22992/FC-4

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

0.07



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/perl-Class-DBI-Pager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Pager.spec	8 Sep 2005 15:09:28 -0000	1.1
+++ perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Mon Sep  5 2005 Paul Howarth <paul at city-fan.org> 0.06-3
 - remove redundant BR: perl
 - add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:09:28 -0000	1.2
+++ sources	10 Jan 2006 18:00:41 -0000	1.3
@@ -1 +1 @@
-358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz
+611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:00:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:00:47 -0500
Subject: rpms/perl-Class-DBI-Pager/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Pager.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601101801.k0AI1JJs024682@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22992/devel

Modified Files:
	.cvsignore perl-Class-DBI-Pager.spec sources 
Log Message:

0.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:09:28 -0000	1.2
+++ .cvsignore	10 Jan 2006 18:00:47 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Pager-0.06.tar.gz
+Class-DBI-Pager-0.07.tar.gz


Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/perl-Class-DBI-Pager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Pager.spec	8 Sep 2005 15:09:28 -0000	1.1
+++ perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Mon Sep  5 2005 Paul Howarth <paul at city-fan.org> 0.06-3
 - remove redundant BR: perl
 - add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:09:28 -0000	1.2
+++ sources	10 Jan 2006 18:00:47 -0000	1.3
@@ -1 +1 @@
-358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz
+611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:15:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:15:21 -0500
Subject: rpms/perl-Spreadsheet-WriteExcel/FC-3
	perl-Spreadsheet-WriteExcel.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601101815.k0AIFsuE024924@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/FC-3

Modified Files:
	perl-Spreadsheet-WriteExcel.spec sources 
Log Message:

2.15



Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Spreadsheet-WriteExcel.spec	11 May 2005 15:20:02 -0000	1.7
+++ perl-Spreadsheet-WriteExcel.spec	10 Jan 2006 18:15:08 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			perl-Spreadsheet-WriteExcel
-Version:		2.14
+Version:		2.15
 Release:		1%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.15-1
+- bump to 2.15
+
 * Wed May 11 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.14-1
 - Update
 - Add a complete URL for Source0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2005 13:34:16 -0000	1.3
+++ sources	10 Jan 2006 18:15:08 -0000	1.4
@@ -1 +1 @@
-9b4b058b3b79d33c073b0ec025a509cc  Spreadsheet-WriteExcel-2.13.tar.gz
+abcb3c39fc48febbbc2a3094bb2933c9  Spreadsheet-WriteExcel-2.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:15:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:15:27 -0500
Subject: rpms/perl-Spreadsheet-WriteExcel/FC-4
	perl-Spreadsheet-WriteExcel.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200601101816.k0AIG0fr024928@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/FC-4

Modified Files:
	perl-Spreadsheet-WriteExcel.spec sources 
Log Message:

2.15



Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Spreadsheet-WriteExcel.spec	11 May 2005 15:11:05 -0000	1.7
+++ perl-Spreadsheet-WriteExcel.spec	10 Jan 2006 18:15:27 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			perl-Spreadsheet-WriteExcel
-Version:		2.14
+Version:		2.15
 Release:		1%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.15-1
+- bump to 2.15
+
 * Wed May 11 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.14-1
 - Update
 - Add a complete URL for Source0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 May 2005 15:11:05 -0000	1.4
+++ sources	10 Jan 2006 18:15:27 -0000	1.5
@@ -1 +1 @@
-2a2ff55a0b8a41bdfd0f8adf9925394a  Spreadsheet-WriteExcel-2.14.tar.gz
+abcb3c39fc48febbbc2a3094bb2933c9  Spreadsheet-WriteExcel-2.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:15:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:15:34 -0500
Subject: rpms/perl-Spreadsheet-WriteExcel/devel .cvsignore, 1.4,
	1.5 perl-Spreadsheet-WriteExcel.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200601101816.k0AIG6Uj024933@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/devel

Modified Files:
	.cvsignore perl-Spreadsheet-WriteExcel.spec sources 
Log Message:

2.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2005 15:11:05 -0000	1.4
+++ .cvsignore	10 Jan 2006 18:15:33 -0000	1.5
@@ -1 +1,2 @@
 Spreadsheet-WriteExcel-2.14.tar.gz
+Spreadsheet-WriteExcel-2.15.tar.gz


Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Spreadsheet-WriteExcel.spec	11 May 2005 15:11:05 -0000	1.7
+++ perl-Spreadsheet-WriteExcel.spec	10 Jan 2006 18:15:33 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			perl-Spreadsheet-WriteExcel
-Version:		2.14
+Version:		2.15
 Release:		1%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.15-1
+- bump to 2.15
+
 * Wed May 11 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.14-1
 - Update
 - Add a complete URL for Source0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 May 2005 15:11:05 -0000	1.4
+++ sources	10 Jan 2006 18:15:33 -0000	1.5
@@ -1 +1 @@
-2a2ff55a0b8a41bdfd0f8adf9925394a  Spreadsheet-WriteExcel-2.14.tar.gz
+abcb3c39fc48febbbc2a3094bb2933c9  Spreadsheet-WriteExcel-2.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:17:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:17:51 -0500
Subject: rpms/perl-version - New directory
Message-ID: <200601101817.k0AIHrju025111@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25103/perl-version

Log Message:
Directory /cvs/extras/rpms/perl-version added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 18:17:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:17:57 -0500
Subject: rpms/perl-version/devel - New directory
Message-ID: <200601101817.k0AIHxYF025126@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25103/perl-version/devel

Log Message:
Directory /cvs/extras/rpms/perl-version/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:12 -0500
Subject: rpms/perl-version Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601101818.k0AIIEo6025160@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-version


--- NEW FILE Makefile ---
# Top level Makefile for module perl-version
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:18 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:18 -0500
Subject: rpms/perl-version/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601101818.k0AIIKpl025180@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-version


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:44 -0500
Subject: rpms/perl-version import.log,1.1,1.2
Message-ID: <200601101819.k0AIJHbS025268@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25218

Modified Files:
	import.log 
Log Message:
auto-import perl-version-0.51-3 on branch devel from perl-version-0.51-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-version/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Jan 2006 18:18:12 -0000	1.1
+++ import.log	10 Jan 2006 18:18:44 -0000	1.2
@@ -0,0 +1 @@
+perl-version-0_51-3:HEAD:perl-version-0.51-3.src.rpm:1136917108



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:50 -0500
Subject: rpms/perl-version/devel perl-version.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601101819.k0AIJNLb025272@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25218/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-version.spec 
Log Message:
auto-import perl-version-0.51-3 on branch devel from perl-version-0.51-3.src.rpm


--- NEW FILE perl-version.spec ---
Name:           perl-version
Version:        0.51
Release:        3%{?dist}
Summary:        Perl extension for Version Objects
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/version
Source0:        http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	perl(Module::Build) >= 0.2611
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}

%prep
%setup -q -n version-%{version}
sed -i "s|#!perl|#!%{__perl}|" lib/version.pm lib/version/vxs.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
chmod u+x blib/lib/version.pm blib/lib/version/vxs.pm
make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%doc %{perl_vendorarch}/version.pod
%{perl_vendorarch}/auto/version/
%{perl_vendorarch}/version/
%{perl_vendorarch}/version.pm
%{_mandir}/man3/*.3*


%changelog
* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.51-3
- one sed line only, not global, using __perl

* Sun Jan  8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.51-2
- clean up scripty bits of some .pm files

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.51-1
- bump to 0.51
- pod file is doc

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.50-2
- don't pass optflags twice
- remove .bs files

* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.50-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-version/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Jan 2006 18:18:18 -0000	1.1
+++ .cvsignore	10 Jan 2006 18:18:50 -0000	1.2
@@ -0,0 +1 @@
+version-0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-version/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Jan 2006 18:18:18 -0000	1.1
+++ sources	10 Jan 2006 18:18:50 -0000	1.2
@@ -0,0 +1 @@
+76e97f1d2d19f93fa28179fdc7704d95  version-0.51.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:54 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:54 -0500
Subject: owners owners.list,1.520,1.521
Message-ID: <200601101819.k0AIJQl2025301@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25216

Modified Files:
	owners.list 
Log Message:

perl-version



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- owners.list	10 Jan 2006 08:18:57 -0000	1.520
+++ owners.list	10 Jan 2006 18:18:53 -0000	1.521
@@ -950,6 +950,7 @@
 Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Statgrab|Perl extension for collecting information about the machine|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-version|Perl extension for Version Objects|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:26 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:26 -0500
Subject: rpms/trac - New directory
Message-ID: <200601101953.k0AJrS8f027788@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27778/trac

Log Message:
Directory /cvs/extras/rpms/trac added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:32 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:32 -0500
Subject: rpms/trac/devel - New directory
Message-ID: <200601101953.k0AJrYgu027803@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27778/trac/devel

Log Message:
Directory /cvs/extras/rpms/trac/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:53 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:53 -0500
Subject: rpms/trac Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601101953.k0AJrtX3027839@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27826

Added Files:
	Makefile import.log 
Log Message:
Setup of module trac


--- NEW FILE Makefile ---
# Top level Makefile for module trac
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:59 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:59 -0500
Subject: rpms/trac/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601101954.k0AJs1Oo027859@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27826/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module trac


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 10 19:54:46 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:54:46 -0500
Subject: rpms/trac import.log,1.1,1.2
Message-ID: <200601101955.k0AJtJKE027933@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27898

Modified Files:
	import.log 
Log Message:
auto-import trac-0.9.3-2 on branch devel from trac-0.9.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/trac/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Jan 2006 19:53:53 -0000	1.1
+++ import.log	10 Jan 2006 19:54:46 -0000	1.2
@@ -0,0 +1 @@
+trac-0_9_3-2:HEAD:trac-0.9.3-2.src.rpm:1136922876



From fedora-extras-commits at redhat.com  Tue Jan 10 19:54:52 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:54:52 -0500
Subject: rpms/trac/devel trac.conf, NONE, 1.1 trac.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601101955.k0AJtPpS027937@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27898/devel

Modified Files:
	.cvsignore sources 
Added Files:
	trac.conf trac.spec 
Log Message:
auto-import trac-0.9.3-2 on branch devel from trac-0.9.3-2.src.rpm


--- NEW FILE trac.conf ---
# Replace all occurrences of /path/to/trac_env with your trac root below
# and uncomment the respective SetEnv and PythonOption directives.
<Location /cgi-bin/trac.cgi>
    #SetEnv TRAC_ENV /path/to/trac_env
<IfModule mod_python.c>
    SetHandler mod_python
    PythonHandler trac.web.modpython_frontend
    #PythonOption TracEnv /path/to/trac_env
</IfModule>
</Location>


--- NEW FILE trac.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           trac
Version:        0.9.3
Release:        2%{?dist}
Summary:        Enhanced wiki and issue tracking system

Group:          Applications/Internet
License:        BSD
URL:            http://trac.edgewall.com/
Source0:        http://ftp.edgewall.com/pub/trac/%{name}-%{version}.tar.gz
Source1:        trac.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  sed >= 3.95
Requires:       python-clearsilver >= 0.9.3
Requires:       subversion >= 1.1
Requires:       httpd
Requires:       python-sqlite >= 1.0

%description
Trac is an integrated system for managing software projects, an
enhanced wiki, a flexible web-based issue tracker, and an interface to
the Subversion revision control system.  At the core of Trac lies an
integrated wiki and issue/bug database. Using wiki markup, all objects
managed by Trac can directly link to other issues/bug reports, code
changesets, documentation and files.  Around the core lies other
modules, providing additional features and tools to make software
development more streamlined and effective.

%prep
%setup -q
chmod -x contrib/*
sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
chmod -x htdocs/js/wikitoolbar.js
rm trac/test.py scripts/tracd.1

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT

# --skip-build causes bad stuff in siteconfig.py as of 0.8.4
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.cgi \
  $RPM_BUILD_ROOT%{_var}/www/cgi-bin
rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin

install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
rm $RPM_BUILD_ROOT%{_bindir}/tracd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/
%{_bindir}/trac-admin
%{_bindir}/tracdb2env
%dir %{python_sitelib}/trac/
%{python_sitelib}/trac/*.py
%{python_sitelib}/trac/*.pyc
%ghost %{python_sitelib}/trac/*.pyo
%dir %{python_sitelib}/trac/mimeview/
%{python_sitelib}/trac/mimeview/*.py
%{python_sitelib}/trac/mimeview/*.pyc
%ghost %{python_sitelib}/trac/mimeview/*.pyo
%dir %{python_sitelib}/trac/scripts/
%{python_sitelib}/trac/scripts/*.py
%{python_sitelib}/trac/scripts/*.pyc
%ghost %{python_sitelib}/trac/scripts/*.pyo
%dir %{python_sitelib}/trac/ticket/
%{python_sitelib}/trac/ticket/*.py
%{python_sitelib}/trac/ticket/*.pyc
%ghost %{python_sitelib}/trac/ticket/*.pyo
%dir %{python_sitelib}/trac/upgrades/
%{python_sitelib}/trac/upgrades/*.py
%{python_sitelib}/trac/upgrades/*.pyc
%ghost %{python_sitelib}/trac/upgrades/*.pyo
%dir %{python_sitelib}/trac/versioncontrol/
%{python_sitelib}/trac/versioncontrol/*.py
%{python_sitelib}/trac/versioncontrol/*.pyc
%ghost %{python_sitelib}/trac/versioncontrol/*.pyo
%dir %{python_sitelib}/trac/versioncontrol/web_ui/
%{python_sitelib}/trac/versioncontrol/web_ui/*.py
%{python_sitelib}/trac/versioncontrol/web_ui/*.pyc
%ghost %{python_sitelib}/trac/versioncontrol/web_ui/*.pyo
%dir %{python_sitelib}/trac/web/
%{python_sitelib}/trac/web/*.py
%{python_sitelib}/trac/web/*.pyc
%ghost %{python_sitelib}/trac/web/*.pyo
%dir %{python_sitelib}/trac/wiki/
%{python_sitelib}/trac/wiki/*.py
%{python_sitelib}/trac/wiki/*.pyc
%ghost %{python_sitelib}/trac/wiki/*.pyo
%config(noreplace) /etc/httpd/conf.d/trac.conf
%{_datadir}/trac/
%{_var}/www/cgi-bin/trac.cgi
%{_mandir}/man1/trac-admin.1*
%{_mandir}/man1/tracdb2env.1*

%changelog
* Tue Jan 10 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-2
- removed trac.fcgi (bugzilla #174546, comment #11)
- applied patch (bugzilla #174546, attachment id=123008)

* Mon Jan  9 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-1
- 0.9.3
- removed tracd (bugzilla #174546, comment #6)
- added trac.conf for httpd
- removed %%{python_sitelib}/trac/test.py
- removed comments

* Tue Dec  6 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.2-2
- added /etc/init.d/tracd
- added /etc/sysconfig/tracd

* Tue Dec  6 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.2-1
- 0.9.2
- fixes SQL Injection Vulnerability in ticket search module.
- fixes broken ticket email notifications.

* Sat Dec  3 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.1-1
- 0.9.1
- fixes SQL Injection Vulnerability

* Tue Nov 29 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9-1
- Rebuild for Fedora Extras

* Tue Nov  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-1
- 0.9.

* Mon Jun 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.4-0.1
- 0.8.4.
- Move tracd to %%{_sbindir} and man page to section 8.

* Thu Jun 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-0.1
- 0.8.3.

* Wed Jun  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.2-0.1
- 0.8.2.

* Sun May 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2
- Rebuild for FC4.

* Fri Apr  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Jan 2006 19:53:59 -0000	1.1
+++ .cvsignore	10 Jan 2006 19:54:52 -0000	1.2
@@ -0,0 +1 @@
+trac-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Jan 2006 19:53:59 -0000	1.1
+++ sources	10 Jan 2006 19:54:52 -0000	1.2
@@ -0,0 +1 @@
+fce39070081f259020b4d60f044d9082  trac-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 19:59:11 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:59:11 -0500
Subject: owners owners.list,1.521,1.522
Message-ID: <200601101959.k0AJxjcV027992@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27975

Modified Files:
	owners.list 
Log Message:
added Trac, an integrated system for managing software projects



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- owners.list	10 Jan 2006 18:18:53 -0000	1.521
+++ owners.list	10 Jan 2006 19:59:11 -0000	1.522
@@ -1230,6 +1230,7 @@
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info



From fedora-extras-commits at redhat.com  Tue Jan 10 21:14:22 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 16:14:22 -0500
Subject: rpms/perl-Module-Build/FC-4 .cvsignore, 1.7,
	1.8 perl-Module-Build.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200601102114.k0ALEsL8031766@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Build/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31745

Modified Files:
	.cvsignore perl-Module-Build.spec sources 
Log Message:
Update to 0.2611.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Apr 2005 12:31:28 -0000	1.7
+++ .cvsignore	10 Jan 2006 21:14:21 -0000	1.8
@@ -1 +1 @@
-Module-Build-0.2610.tar.gz
+Module-Build-0.2611.tar.gz


Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/perl-Module-Build.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Module-Build.spec	7 May 2005 19:06:22 -0000	1.11
+++ perl-Module-Build.spec	10 Jan 2006 21:14:21 -0000	1.12
@@ -1,57 +1,62 @@
 Name:           perl-Module-Build
-Version:        0.2610
-Release:        3
+Version:        0.2611
+Release:        2%{?dist}
 Summary:        Perl module for building and installing Perl modules
-
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Module-Build/
 Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
 Requires:       perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Perl module for building and installing Perl modules, a replacement to
 ExtUtils::MakeMaker.
 
-
 %prep
 %setup -q -n Module-Build-%{version}
 
-
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
 
-%check || :
-./Build test
+chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
+perldoc -t perlgpl > COPYING
+perldoc -t perlartistic > Artistic
+
+%check
+./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README COPYING Artistic
 %{_bindir}/config_data
 %{perl_vendorlib}/Module
 %{_mandir}/man1/config_data.1*
 %{_mandir}/man3/Module::Build*.3*
 
-
 %changelog
+* Mon Sep 05 2005 Steven Pritchard <steve at kspei.com> - 0.2611-2
+- Minor spec cleanup.
+- Add COPYING and Artistic.
+
+* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> - 0.2611-1
+- Update to 0.2611.
+
 * Sat May  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2610-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Apr 2005 12:31:28 -0000	1.7
+++ sources	10 Jan 2006 21:14:21 -0000	1.8
@@ -1 +1 @@
-a21addf2dbd1725b6b035fbfe65cb30f  Module-Build-0.2610.tar.gz
+d0fa9a7917ed43d1c1f8b707e86b6061  Module-Build-0.2611.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 21:26:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 16:26:54 -0500
Subject: rpms/perl-Module-Build/FC-3 .cvsignore, 1.7,
	1.8 perl-Module-Build.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200601102127.k0ALRRVU031877@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Build/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856

Modified Files:
	.cvsignore perl-Module-Build.spec sources 
Log Message:
Update to 0.2611.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Apr 2005 12:31:28 -0000	1.7
+++ .cvsignore	10 Jan 2006 21:26:54 -0000	1.8
@@ -1 +1 @@
-Module-Build-0.2610.tar.gz
+Module-Build-0.2611.tar.gz


Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-3/perl-Module-Build.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Build.spec	16 Apr 2005 12:31:28 -0000	1.8
+++ perl-Module-Build.spec	10 Jan 2006 21:26:54 -0000	1.9
@@ -1,62 +1,71 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Module-Build
-Version:        0.2610
-Release:        1
-Epoch:          0
+Version:        0.2611
+Release:        2%{?dist}
 Summary:        Perl module for building and installing Perl modules
-
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Module-Build/
 Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
 Requires:       perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Perl module for building and installing Perl modules, a replacement to
 ExtUtils::MakeMaker.
 
-
 %prep
 %setup -q -n Module-Build-%{version}
 
-
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
 
-%check || :
-./Build test
+chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
+perldoc -t perlgpl > COPYING
+perldoc -t perlartistic > Artistic
+
+%check
+./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README COPYING Artistic
 %{_bindir}/config_data
 %{perl_vendorlib}/Module
 %{_mandir}/man1/config_data.1*
 %{_mandir}/man3/Module::Build*.3*
 
-
 %changelog
-* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2610-1
+* Mon Sep 05 2005 Steven Pritchard <steve at kspei.com> - 0.2611-2
+- Minor spec cleanup.
+- Add COPYING and Artistic.
+
+* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> - 0.2611-1
+- Update to 0.2611.
+
+* Sat May  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2610-3
+- Rebuild.
+
+* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2610-2
 - 0.2610.
+- Trust that %%{perl_vendorlib} is defined.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
 
 * Thu Jan 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2608-1
 - Update to 0.2608, Test::Harness kludge no longer needed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Apr 2005 12:31:28 -0000	1.7
+++ sources	10 Jan 2006 21:26:54 -0000	1.8
@@ -1 +1 @@
-a21addf2dbd1725b6b035fbfe65cb30f  Module-Build-0.2610.tar.gz
+d0fa9a7917ed43d1c1f8b707e86b6061  Module-Build-0.2611.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 22:20:43 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 17:20:43 -0500
Subject: owners owners.list,1.522,1.523
Message-ID: <200601102221.k0AMLG2u001318@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1301/owners

Modified Files:
	owners.list 
Log Message:
updating email for Chris Wright for git-core, cogito, asciidoc



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- owners.list	10 Jan 2006 19:59:11 -0000	1.522
+++ owners.list	10 Jan 2006 22:20:42 -0000	1.523
@@ -44,7 +44,7 @@
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org|
+Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -111,7 +111,7 @@
 Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org|
+Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -280,7 +280,7 @@
 Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu||extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|git-core|A distributed SCM|chrisw at osdl.org|extras-qa at fedoraproject.org|
+Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 10 22:27:32 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Jan 2006 17:27:32 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.7,1.8
Message-ID: <200601102228.k0AMS4FL001804@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1417

Modified Files:
	gobby.spec 
Log Message:
rebuild


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gobby.spec	9 Jan 2006 00:07:55 -0000	1.7
+++ gobby.spec	10 Jan 2006 22:27:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Rebuild
+
 * Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 



From fedora-extras-commits at redhat.com  Tue Jan 10 22:41:42 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 17:41:42 -0500
Subject: rpms/python-matplotlib/devel .cvsignore, 1.6,
	1.7 python-matplotlib.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200601102242.k0AMgF0d001912@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1884

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Log Message:
Update to 0.86



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Nov 2005 17:25:38 -0000	1.6
+++ .cvsignore	10 Jan 2006 22:41:42 -0000	1.7
@@ -1 +1 @@
-matplotlib-0.85.tar.gz
+matplotlib-0.86.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-matplotlib.spec	23 Dec 2005 00:03:38 -0000	1.12
+++ python-matplotlib.spec	10 Jan 2006 22:41:42 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.85
-Release:        2%{?dist}
+Version:        0.86
+Release:        1%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -24,6 +24,7 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
+chmod -x images/*.svg
 
 %build
 %{__python} setup.py build
@@ -32,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
-chmod -x $RPM_BUILD_ROOT%{_datadir}/matplotlib/*.svg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,9 +45,11 @@
 %doc NUMARRAY_ISSUES PKG-INFO TODO
 %{python_sitearch}/matplotlib/
 %{python_sitearch}/pylab.py*
-%{_datadir}/matplotlib/
 
 %changelog
+* Tue Jan 10 2006 Orion Poplawski <orion at cora.nwra.com> 0.86-1
+- Update to 0.86
+
 * Thu Dec 22 2005 Orion Poplawski <orion at cora.nwra.com> 0.85-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Nov 2005 17:25:38 -0000	1.6
+++ sources	10 Jan 2006 22:41:42 -0000	1.7
@@ -1 +1 @@
-4890ef6bd7a1a83acf579d4cbb6d237c  matplotlib-0.85.tar.gz
+4770cbcddabcbab72d48fbb237ed5d8c  matplotlib-0.86.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 22:48:37 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 17:48:37 -0500
Subject: rpms/python-matplotlib/FC-4 .cvsignore, 1.6,
	1.7 python-matplotlib.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200601102249.k0AMn9dA002004@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1978

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Log Message:
Update to 0.86



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Nov 2005 18:21:46 -0000	1.6
+++ .cvsignore	10 Jan 2006 22:48:37 -0000	1.7
@@ -1 +1 @@
-matplotlib-0.85.tar.gz
+matplotlib-0.86.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/python-matplotlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-matplotlib.spec	20 Nov 2005 18:21:46 -0000	1.11
+++ python-matplotlib.spec	10 Jan 2006 22:48:37 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.85
+Version:        0.86
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -24,6 +24,7 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
+chmod -x images/*.svg
 
 %build
 %{__python} setup.py build
@@ -32,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
-chmod -x $RPM_BUILD_ROOT%{_datadir}/matplotlib/*.svg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,9 +45,11 @@
 %doc NUMARRAY_ISSUES PKG-INFO TODO
 %{python_sitearch}/matplotlib/
 %{python_sitearch}/pylab.py*
-%{_datadir}/matplotlib/
 
 %changelog
+* Tue Jan 10 2006 Orion Poplawski <orion at cora.nwra.com> 0.86-1
+- Update to 0.86
+
 * Sun Nov 20 2005 Orion Poplawski <orion at cora.nwra.com> 0.85-1
 - New upstream version 0.85
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Nov 2005 18:21:46 -0000	1.6
+++ sources	10 Jan 2006 22:48:37 -0000	1.7
@@ -1 +1 @@
-4890ef6bd7a1a83acf579d4cbb6d237c  matplotlib-0.85.tar.gz
+4770cbcddabcbab72d48fbb237ed5d8c  matplotlib-0.86.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 23:42:15 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 18:42:15 -0500
Subject: rpms/git-core/devel git.spec, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 git-core.spec, 1.12, NONE
Message-ID: <200601102342.k0ANglkA003967@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3931

Modified Files:
	.cvsignore sources 
Added Files:
	git.spec 
Removed Files:
	git-core.spec 
Log Message:
Update git 1.1.0



--- NEW FILE git.spec ---
# Pass --without docs to rpmbuild if you don't want the documentation
# Pass --with email to rpmbuild if you want git-email (more perl dependencies)
Name: 		git
Version: 	1.1.0
Release: 	1%{?dist}
Summary:  	Git core and tools
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/git/
Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk

%description
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

This is a dummy package which brings in all subpackages.

%package core
Summary:	Core git tools
Group:		Development/Tools
Requires:	zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
%description core
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

These are the core tools with minimal dependencies.

%package svn
Summary:        Git tools for importing Subversion repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, subversion
%description svn
Git tools for importing Subversion repositories.

%package cvs
Summary:        Git tools for importing CVS repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, cvs, cvsps
%description cvs
Git tools for importing CVS repositories.

%package arch
Summary:        Git tools for importing Arch repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tla
%description arch
Git tools for importing Arch repositories.

%if %{?_with_email:1}0
%package email
Summary:        Git tools for sending email
Group:          Development/Tools
Requires:	git-core = %{version}-%{release} 
%description email
Git tools for sending email.
%endif

%package -n gitk
Summary:        Git revision tree visualiser ('gitk')
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tk >= 8.4
%description -n gitk
Git revision tree visualiser ('gitk')

%prep
%setup -q

%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} all %{!?_without_docs: doc}

%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} mandir=%{_mandir} \
     install %{!?_without_docs: install-doc}

(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
# These are no files in the root package

%files svn
%defattr(-,root,root)
%{_bindir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }

%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }

%files arch
%defattr(-,root,root)
%doc Documentation/*arch*.txt
%{_bindir}/*arch*
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
%{!?_without_docs: %doc Documentation/*arch*.html }

%if %{?_with_email:1}0
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{_bindir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%endif

%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/*gitk*
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }

%files core -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }

%changelog
* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
- Update to latest git-1.1.0 (drop git-email for now)
- Now creates multiple packages:
-	 git-core, git-svn, git-cvs, git-arch, gitk

* Mon Nov 14 2005 H. Peter Anvin <hpa at zytor.com> 0.99.9j-1
- Change subpackage names to git-<name> instead of git-core-<name>
- Create empty root package which brings in all subpackages
- Rename git-tk -> gitk

* Thu Nov 10 2005 Chris Wright <chrisw at osdl.org> 0.99.9g-1
- zlib dependency fix
- Minor cleanups from split
- Move arch import to separate package as well

* Tue Sep 27 2005 Jim Radford <radford at blackbean.org>
- Move programs with non-standard dependencies (svn, cvs, email)
  into separate packages

* Tue Sep 27 2005 H. Peter Anvin <hpa at zytor.com>
- parallelize build
- COPTS -> CFLAGS

* Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.99.6-1
- update to 0.99.6

* Fri Sep 16 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Linus noticed that less is required, added to the dependencies

* Sun Sep 11 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Updated dependencies
- Don't assume manpages are gzipped

* Thu Aug 18 2005 Chris Wright <chrisw at osdl.org> 0.99.4-4
- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
- use RPM_OPT_FLAGS in spec file, drop patch0

* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.99.4-3
- use dist tag to differentiate between branches
- use rpm optflags by default (patch0)
- own %{_datadir}/git-core/

* Mon Aug 15 2005 Chris Wright <chrisw at osdl.org>
- update spec file to fix Buildroot, Requires, and drop Vendor

* Sun Aug 07 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Redid the description
- Cut overlong make line, loosened changelog a bit
- I think Junio (or perhaps OSDL?) should be vendor...

* Thu Jul 14 2005 Eric Biederman <ebiederm at xmission.com>
- Add the man pages, and the --without docs build option

* Wed Jul 7 2005 Chris Wright <chris at osdl.org>
- initial git spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Oct 2005 06:17:33 -0000	1.12
+++ .cvsignore	10 Jan 2006 23:42:14 -0000	1.13
@@ -1 +1 @@
-git-core-0.99.9a.tar.gz
+git-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2005 06:17:33 -0000	1.12
+++ sources	10 Jan 2006 23:42:14 -0000	1.13
@@ -1 +1 @@
-c7e8d98eb5b260c9d4d0d4fcad64a92f  git-core-0.99.9a.tar.gz
+8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz


--- git-core.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 10 23:44:40 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 18:44:40 -0500
Subject: rpms/git-core/FC-4 git.spec, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 git-core.spec, 1.11, NONE
Message-ID: <200601102345.k0ANjCHe004054@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4032

Modified Files:
	.cvsignore sources 
Added Files:
	git.spec 
Removed Files:
	git-core.spec 
Log Message:
Update git to 1.1.0



--- NEW FILE git.spec ---
# Pass --without docs to rpmbuild if you don't want the documentation
# Pass --with email to rpmbuild if you want git-email (more perl dependencies)
Name: 		git
Version: 	1.1.0
Release: 	1%{?dist}
Summary:  	Git core and tools
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/git/
Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk

%description
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

This is a dummy package which brings in all subpackages.

%package core
Summary:	Core git tools
Group:		Development/Tools
Requires:	zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
%description core
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

These are the core tools with minimal dependencies.

%package svn
Summary:        Git tools for importing Subversion repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, subversion
%description svn
Git tools for importing Subversion repositories.

%package cvs
Summary:        Git tools for importing CVS repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, cvs, cvsps
%description cvs
Git tools for importing CVS repositories.

%package arch
Summary:        Git tools for importing Arch repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tla
%description arch
Git tools for importing Arch repositories.

%if %{?_with_email:1}0
%package email
Summary:        Git tools for sending email
Group:          Development/Tools
Requires:	git-core = %{version}-%{release} 
%description email
Git tools for sending email.
%endif

%package -n gitk
Summary:        Git revision tree visualiser ('gitk')
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tk >= 8.4
%description -n gitk
Git revision tree visualiser ('gitk')

%prep
%setup -q

%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} all %{!?_without_docs: doc}

%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} mandir=%{_mandir} \
     install %{!?_without_docs: install-doc}

(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
# These are no files in the root package

%files svn
%defattr(-,root,root)
%{_bindir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }

%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }

%files arch
%defattr(-,root,root)
%doc Documentation/*arch*.txt
%{_bindir}/*arch*
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
%{!?_without_docs: %doc Documentation/*arch*.html }

%if %{?_with_email:1}0
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{_bindir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%endif

%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/*gitk*
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }

%files core -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }

%changelog
* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
- Update to latest git-1.1.0 (drop git-email for now)
- Now creates multiple packages:
-	 git-core, git-svn, git-cvs, git-arch, gitk

* Mon Nov 14 2005 H. Peter Anvin <hpa at zytor.com> 0.99.9j-1
- Change subpackage names to git-<name> instead of git-core-<name>
- Create empty root package which brings in all subpackages
- Rename git-tk -> gitk

* Thu Nov 10 2005 Chris Wright <chrisw at osdl.org> 0.99.9g-1
- zlib dependency fix
- Minor cleanups from split
- Move arch import to separate package as well

* Tue Sep 27 2005 Jim Radford <radford at blackbean.org>
- Move programs with non-standard dependencies (svn, cvs, email)
  into separate packages

* Tue Sep 27 2005 H. Peter Anvin <hpa at zytor.com>
- parallelize build
- COPTS -> CFLAGS

* Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.99.6-1
- update to 0.99.6

* Fri Sep 16 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Linus noticed that less is required, added to the dependencies

* Sun Sep 11 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Updated dependencies
- Don't assume manpages are gzipped

* Thu Aug 18 2005 Chris Wright <chrisw at osdl.org> 0.99.4-4
- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
- use RPM_OPT_FLAGS in spec file, drop patch0

* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.99.4-3
- use dist tag to differentiate between branches
- use rpm optflags by default (patch0)
- own %{_datadir}/git-core/

* Mon Aug 15 2005 Chris Wright <chrisw at osdl.org>
- update spec file to fix Buildroot, Requires, and drop Vendor

* Sun Aug 07 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Redid the description
- Cut overlong make line, loosened changelog a bit
- I think Junio (or perhaps OSDL?) should be vendor...

* Thu Jul 14 2005 Eric Biederman <ebiederm at xmission.com>
- Add the man pages, and the --without docs build option

* Wed Jul 7 2005 Chris Wright <chris at osdl.org>
- initial git spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Oct 2005 06:16:10 -0000	1.12
+++ .cvsignore	10 Jan 2006 23:44:39 -0000	1.13
@@ -1 +1 @@
-git-core-0.99.9a.tar.gz
+git-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2005 06:16:10 -0000	1.12
+++ sources	10 Jan 2006 23:44:39 -0000	1.13
@@ -1 +1 @@
-c7e8d98eb5b260c9d4d0d4fcad64a92f  git-core-0.99.9a.tar.gz
+8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz


--- git-core.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 10 23:46:19 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 18:46:19 -0500
Subject: rpms/git-core/FC-3 git.spec, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 git-core.spec, 1.11, NONE
Message-ID: <200601102346.k0ANkpBt004134@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4114

Modified Files:
	.cvsignore sources 
Added Files:
	git.spec 
Removed Files:
	git-core.spec 
Log Message:
Update git to 1.1.0



--- NEW FILE git.spec ---
# Pass --without docs to rpmbuild if you don't want the documentation
# Pass --with email to rpmbuild if you want git-email (more perl dependencies)
Name: 		git
Version: 	1.1.0
Release: 	1%{?dist}
Summary:  	Git core and tools
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/git/
Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk

%description
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

This is a dummy package which brings in all subpackages.

%package core
Summary:	Core git tools
Group:		Development/Tools
Requires:	zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
%description core
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

These are the core tools with minimal dependencies.

%package svn
Summary:        Git tools for importing Subversion repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, subversion
%description svn
Git tools for importing Subversion repositories.

%package cvs
Summary:        Git tools for importing CVS repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, cvs, cvsps
%description cvs
Git tools for importing CVS repositories.

%package arch
Summary:        Git tools for importing Arch repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tla
%description arch
Git tools for importing Arch repositories.

%if %{?_with_email:1}0
%package email
Summary:        Git tools for sending email
Group:          Development/Tools
Requires:	git-core = %{version}-%{release} 
%description email
Git tools for sending email.
%endif

%package -n gitk
Summary:        Git revision tree visualiser ('gitk')
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tk >= 8.4
%description -n gitk
Git revision tree visualiser ('gitk')

%prep
%setup -q

%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} all %{!?_without_docs: doc}

%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} mandir=%{_mandir} \
     install %{!?_without_docs: install-doc}

(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
# These are no files in the root package

%files svn
%defattr(-,root,root)
%{_bindir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }

%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }

%files arch
%defattr(-,root,root)
%doc Documentation/*arch*.txt
%{_bindir}/*arch*
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
%{!?_without_docs: %doc Documentation/*arch*.html }

%if %{?_with_email:1}0
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{_bindir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%endif

%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/*gitk*
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }

%files core -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }

%changelog
* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
- Update to latest git-1.1.0 (drop git-email for now)
- Now creates multiple packages:
-	 git-core, git-svn, git-cvs, git-arch, gitk

* Mon Nov 14 2005 H. Peter Anvin <hpa at zytor.com> 0.99.9j-1
- Change subpackage names to git-<name> instead of git-core-<name>
- Create empty root package which brings in all subpackages
- Rename git-tk -> gitk

* Thu Nov 10 2005 Chris Wright <chrisw at osdl.org> 0.99.9g-1
- zlib dependency fix
- Minor cleanups from split
- Move arch import to separate package as well

* Tue Sep 27 2005 Jim Radford <radford at blackbean.org>
- Move programs with non-standard dependencies (svn, cvs, email)
  into separate packages

* Tue Sep 27 2005 H. Peter Anvin <hpa at zytor.com>
- parallelize build
- COPTS -> CFLAGS

* Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.99.6-1
- update to 0.99.6

* Fri Sep 16 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Linus noticed that less is required, added to the dependencies

* Sun Sep 11 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Updated dependencies
- Don't assume manpages are gzipped

* Thu Aug 18 2005 Chris Wright <chrisw at osdl.org> 0.99.4-4
- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
- use RPM_OPT_FLAGS in spec file, drop patch0

* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.99.4-3
- use dist tag to differentiate between branches
- use rpm optflags by default (patch0)
- own %{_datadir}/git-core/

* Mon Aug 15 2005 Chris Wright <chrisw at osdl.org>
- update spec file to fix Buildroot, Requires, and drop Vendor

* Sun Aug 07 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Redid the description
- Cut overlong make line, loosened changelog a bit
- I think Junio (or perhaps OSDL?) should be vendor...

* Thu Jul 14 2005 Eric Biederman <ebiederm at xmission.com>
- Add the man pages, and the --without docs build option

* Wed Jul 7 2005 Chris Wright <chris at osdl.org>
- initial git spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Oct 2005 06:14:32 -0000	1.12
+++ .cvsignore	10 Jan 2006 23:46:18 -0000	1.13
@@ -1 +1 @@
-git-core-0.99.9a.tar.gz
+git-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2005 06:14:32 -0000	1.12
+++ sources	10 Jan 2006 23:46:18 -0000	1.13
@@ -1 +1 @@
-c7e8d98eb5b260c9d4d0d4fcad64a92f  git-core-0.99.9a.tar.gz
+8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz


--- git-core.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Jan 11 01:00:29 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 20:00:29 -0500
Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.2, 1.3 perl-HTML-Mason.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601110101.k0B111V5007072@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6238

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Log Message:
Update to 1.32.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2005 02:09:55 -0000	1.2
+++ .cvsignore	11 Jan 2006 01:00:28 -0000	1.3
@@ -1 +1 @@
-HTML-Mason-1.3101.tar.gz
+HTML-Mason-1.32.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-HTML-Mason.spec	16 Sep 2005 20:17:49 -0000	1.2
+++ perl-HTML-Mason.spec	11 Jan 2006 01:00:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Mason
-Version:        1.3101
-Release:        3%{?dist}
+Version:        1.32
+Release:        1%{?dist}
 Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -80,6 +80,9 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 1.32-1
+- Update to 1.32
+
 * Thu Sep 15 2005 Steven Pritchard <steve at kspei.com> 1.3101-3
 - Filter bogus provides/requires introduced by eg/ and samples/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2005 02:09:55 -0000	1.2
+++ sources	11 Jan 2006 01:00:28 -0000	1.3
@@ -1 +1 @@
-4904681296efeb9c58bf0d9926d37407  HTML-Mason-1.3101.tar.gz
+b0abfdd869d828a0ebbf2f64cfb9d094  HTML-Mason-1.32.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:19:53 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:19:53 -0500
Subject: rpms/cogito/devel .cvsignore, 1.4, 1.5 cogito.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200601110120.k0B1KPnn008089@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8066

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2005 01:36:52 -0000	1.4
+++ .cvsignore	11 Jan 2006 01:19:52 -0000	1.5
@@ -1 +1 @@
-cogito-0.15.1.tar.gz
+cogito-0.16.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cogito.spec	11 Oct 2005 01:36:52 -0000	1.5
+++ cogito.spec	11 Jan 2006 01:19:52 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.15.1
+Version: 	0.16.2
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,8 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 0.99.7
+Requires: 	git-core >= 0.99.9
+BuildRequires: 	asciidoc
 BuildArch:	noarch
 
 %description
@@ -21,11 +22,13 @@
 
 %build
 
-make
+make all doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito mandir=%{_mandir} \
+	install install-doc
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/doc/cogito/txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,9 +38,19 @@
 %{_bindir}/*
 %dir %{_libdir}/cogito
 %{_libdir}/cogito/*
-%doc README COPYING Documentation/*
+%{_mandir}/man*/*
+%doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
+- 0.16.2
+
+* Tue Nov 1 2005 Pavel Roskin <proski at gnu.org> 0.15.1-1
+- generate and include manuals
+
+* Tue Oct 11 2005 Chris Wright <chrisw at osdl.org> 0.15.1-1
+- use %dist
+
 * Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.14.1-2
 - fix _libdir breakage on 64-bit, the irony...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Oct 2005 01:36:52 -0000	1.4
+++ sources	11 Jan 2006 01:19:52 -0000	1.5
@@ -1 +1 @@
-a0aa1db2e90b991d52e848be0926a74c  cogito-0.15.1.tar.gz
+94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:23:15 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:23:15 -0500
Subject: rpms/cogito/FC-4 .cvsignore, 1.4, 1.5 cogito.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601110123.k0B1NlNF008188@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8159

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2005 01:38:02 -0000	1.4
+++ .cvsignore	11 Jan 2006 01:23:14 -0000	1.5
@@ -1 +1 @@
-cogito-0.15.1.tar.gz
+cogito-0.16.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cogito.spec	11 Oct 2005 01:38:02 -0000	1.4
+++ cogito.spec	11 Jan 2006 01:23:14 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.15.1
+Version: 	0.16.2
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,8 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 0.99.7
+Requires: 	git-core >= 0.99.9
+BuildRequires: 	asciidoc
 BuildArch:	noarch
 
 %description
@@ -21,11 +22,13 @@
 
 %build
 
-make
+make all doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito mandir=%{_mandir} \
+	install install-doc
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/doc/cogito/txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,9 +38,19 @@
 %{_bindir}/*
 %dir %{_libdir}/cogito
 %{_libdir}/cogito/*
-%doc README COPYING Documentation/*
+%{_mandir}/man*/*
+%doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
+- 0.16.2
+
+* Tue Nov 1 2005 Pavel Roskin <proski at gnu.org> 0.15.1-1
+- generate and include manuals
+
+* Tue Oct 11 2005 Chris Wright <chrisw at osdl.org> 0.15.1-1
+- use %dist
+
 * Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.14.1-2
 - fix _libdir breakage on 64-bit, the irony...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Oct 2005 01:38:02 -0000	1.4
+++ sources	11 Jan 2006 01:23:14 -0000	1.5
@@ -1 +1 @@
-a0aa1db2e90b991d52e848be0926a74c  cogito-0.15.1.tar.gz
+94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:25:44 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:25:44 -0500
Subject: rpms/cogito/FC-3 .cvsignore, 1.4, 1.5 cogito.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601110126.k0B1QG6O008274@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8251

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2005 01:40:21 -0000	1.4
+++ .cvsignore	11 Jan 2006 01:25:44 -0000	1.5
@@ -1 +1 @@
-cogito-0.15.1.tar.gz
+cogito-0.16.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cogito.spec	11 Oct 2005 01:40:21 -0000	1.4
+++ cogito.spec	11 Jan 2006 01:25:44 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.15.1
+Version: 	0.16.2
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,8 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 0.99.7
+Requires: 	git-core >= 0.99.9
+BuildRequires: 	asciidoc
 BuildArch:	noarch
 
 %description
@@ -21,11 +22,13 @@
 
 %build
 
-make
+make all doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito mandir=%{_mandir} \
+	install install-doc
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/doc/cogito/txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,9 +38,19 @@
 %{_bindir}/*
 %dir %{_libdir}/cogito
 %{_libdir}/cogito/*
-%doc README COPYING Documentation/*
+%{_mandir}/man*/*
+%doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
+- 0.16.2
+
+* Tue Nov 1 2005 Pavel Roskin <proski at gnu.org> 0.15.1-1
+- generate and include manuals
+
+* Tue Oct 11 2005 Chris Wright <chrisw at osdl.org> 0.15.1-1
+- use %dist
+
 * Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.14.1-2
 - fix _libdir breakage on 64-bit, the irony...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Oct 2005 01:40:21 -0000	1.4
+++ sources	11 Jan 2006 01:25:44 -0000	1.5
@@ -1 +1 @@
-a0aa1db2e90b991d52e848be0926a74c  cogito-0.15.1.tar.gz
+94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:43:39 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:43:39 -0500
Subject: rpms/cogito/FC-3 cogito.spec,1.5,1.6
Message-ID: <200601110144.k0B1iBGS008434@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8413

Modified Files:
	cogito.spec 
Log Message:
Add xlmto build dependency



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cogito.spec	11 Jan 2006 01:25:44 -0000	1.5
+++ cogito.spec	11 Jan 2006 01:43:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.16.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -8,7 +8,7 @@
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: 	git-core >= 0.99.9
-BuildRequires: 	asciidoc
+BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
 %description
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
+- add xmlto to BuildRequires
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
 - 0.16.2
 



From fedora-extras-commits at redhat.com  Wed Jan 11 01:51:12 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:51:12 -0500
Subject: rpms/cogito/FC-4 cogito.spec,1.5,1.6
Message-ID: <200601110151.k0B1pirl008532@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8511

Modified Files:
	cogito.spec 
Log Message:
Add xlmto build dependency



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cogito.spec	11 Jan 2006 01:23:14 -0000	1.5
+++ cogito.spec	11 Jan 2006 01:51:12 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.16.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -8,7 +8,7 @@
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: 	git-core >= 0.99.9
-BuildRequires: 	asciidoc
+BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
 %description
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
+- add xmlto to BuildRequires
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
 - 0.16.2
 



From fedora-extras-commits at redhat.com  Wed Jan 11 01:52:43 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:52:43 -0500
Subject: rpms/cogito/devel cogito.spec,1.6,1.7
Message-ID: <200601110153.k0B1rFp9008621@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8600

Modified Files:
	cogito.spec 
Log Message:
Add xlmto build dependency



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cogito.spec	11 Jan 2006 01:19:52 -0000	1.6
+++ cogito.spec	11 Jan 2006 01:52:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.16.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -8,7 +8,7 @@
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: 	git-core >= 0.99.9
-BuildRequires: 	asciidoc
+BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
 %description
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
+- add xmlto to BuildRequires
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
 - 0.16.2
 



From fedora-extras-commits at redhat.com  Wed Jan 11 02:26:50 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 21:26:50 -0500
Subject: rpms/perl-Exception-Class/devel .cvsignore, 1.2,
	1.3 perl-Exception-Class.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601110227.k0B2RMli010640@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Exception-Class/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10619

Modified Files:
	.cvsignore perl-Exception-Class.spec sources 
Log Message:
Update to 1.22.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2005 22:51:45 -0000	1.2
+++ .cvsignore	11 Jan 2006 02:26:49 -0000	1.3
@@ -1 +1 @@
-Exception-Class-1.21.tar.gz
+Exception-Class-1.22.tar.gz


Index: perl-Exception-Class.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Exception-Class.spec	6 Sep 2005 00:33:52 -0000	1.3
+++ perl-Exception-Class.spec	11 Jan 2006 02:26:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Exception-Class
-Version:        1.21
-Release:        3%{?dist}
+Version:        1.22
+Release:        1%{?dist}
 Summary:        Exception::Class Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 1.22-1
+- Update to 1.22
+
 * Mon Sep 05 2005 Steven Pritchard <steve at kspei.com> 1.21-3
 - Remove explicit core module dependencies
 - Add COPYING and Artistic


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2005 22:51:45 -0000	1.2
+++ sources	11 Jan 2006 02:26:49 -0000	1.3
@@ -1 +1 @@
-3268817e7fa4367209f666bd8e33037c  Exception-Class-1.21.tar.gz
+ad8bb64e8473ba5817a2b329ec7dde42  Exception-Class-1.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 02:47:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 21:47:43 -0500
Subject: rpms/perl-DateTime/devel .cvsignore, 1.2, 1.3 perl-DateTime.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601110248.k0B2mFs9010734@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10713

Modified Files:
	.cvsignore perl-DateTime.spec sources 
Log Message:
Update DateTime to 0.30.
Update DateTime::TimeZone to 0.40.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2005 20:15:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 02:47:43 -0000	1.3
@@ -1,3 +1,3 @@
-DateTime-0.2901.tar.gz
+DateTime-0.30.tar.gz
 DateTime-Locale-0.22.tar.gz
-DateTime-TimeZone-0.37.tar.gz
+DateTime-TimeZone-0.40.tar.gz


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/perl-DateTime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DateTime.spec	16 Sep 2005 20:15:06 -0000	1.1
+++ perl-DateTime.spec	11 Jan 2006 02:47:43 -0000	1.2
@@ -1,14 +1,14 @@
-%define DTTimeZone_version 0.37
+%define DTTimeZone_version 0.40
 %define DTLocale_version 0.22
 
 Name:           perl-DateTime
-Version:        0.2901
-Release:        2%{?dist}
+Version:        0.30
+Release:        1%{?dist}
 Summary:        DateTime Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DateTime/
-Source0:        http://www.cpan.org/modules/by-module/DateTime/DateTime-0.2901.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/DateTime/DateTime-%{version}.tar.gz
 Source1:        http://www.cpan.org/modules/by-module/DateTime/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz
 Source2:        http://www.cpan.org/modules/by-module/DateTime/DateTime-Locale-%{DTLocale_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -125,6 +125,10 @@
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 0.30-1
+- Update DateTime to 0.30
+- Update DateTime::TimeZone to 0.40
+
 * Fri Sep 16 2005 Paul Howarth <paul at city-fan.org> 0.2901-2
 - Unpack each tarball only once
 - Use Module::Build's build script where available


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2005 20:15:06 -0000	1.2
+++ sources	11 Jan 2006 02:47:43 -0000	1.3
@@ -1,3 +1,3 @@
-f96816e634700ae3c8bd849f97856861  DateTime-0.2901.tar.gz
+18cf4a7cece737e0a153c6585320730f  DateTime-0.30.tar.gz
 bcf9fa78efa8d00fad1293b9d860ce75  DateTime-Locale-0.22.tar.gz
-1adf3f14eda8faccaf5564437eadcfd5  DateTime-TimeZone-0.37.tar.gz
+63aac436ede010ebcb472f3b41215ed0  DateTime-TimeZone-0.40.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 02:57:48 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 21:57:48 -0500
Subject: rpms/perl-BerkeleyDB/devel .cvsignore, 1.2, 1.3 perl-BerkeleyDB.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200601110258.k0B2wKm0010836@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10815

Modified Files:
	.cvsignore perl-BerkeleyDB.spec sources 
Log Message:
Update to 0.27.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Aug 2005 23:43:35 -0000	1.2
+++ .cvsignore	11 Jan 2006 02:57:47 -0000	1.3
@@ -1 +1 @@
-BerkeleyDB-0.26.tar.gz
+BerkeleyDB-0.27.tar.gz


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-BerkeleyDB.spec	12 Oct 2005 16:18:47 -0000	1.5
+++ perl-BerkeleyDB.spec	11 Jan 2006 02:57:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-BerkeleyDB
-Version:        0.26
-Release:        6%{?dist}
+Version:        0.27
+Release:        1%{?dist}
 Summary:        BerkeleyDB Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 0.27-1
+- Update to 0.27
+
 * Wed Oct 12 2005 Steven Pritchard <steve at kspei.com> 0.26-6
 - Another rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Aug 2005 23:43:35 -0000	1.2
+++ sources	11 Jan 2006 02:57:47 -0000	1.3
@@ -1 +1 @@
-6e9882f4e4bac48b24079d082af30e6c  BerkeleyDB-0.26.tar.gz
+43aa72c0c6941af0d656d749ad543e96  BerkeleyDB-0.27.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 05:59:22 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 11 Jan 2006 00:59:22 -0500
Subject: rpms/git-core/devel .cvsignore, 1.13, 1.14 git.spec, 1.1,
	1.2 sources, 1.13, 1.14
Message-ID: <200601110559.k0B5xtRs016688@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16667

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update git to 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Jan 2006 23:42:14 -0000	1.13
+++ .cvsignore	11 Jan 2006 05:59:22 -0000	1.14
@@ -1 +1 @@
-git-1.1.0.tar.gz
+git-1.1.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.spec	10 Jan 2006 23:42:14 -0000	1.1
+++ git.spec	11 Jan 2006 05:59:22 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.0
+Version: 	1.1.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
+- git-1.1.1
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Jan 2006 23:42:14 -0000	1.13
+++ sources	11 Jan 2006 05:59:22 -0000	1.14
@@ -1 +1 @@
-8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz
+f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 06:01:34 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 11 Jan 2006 01:01:34 -0500
Subject: rpms/git-core/FC-4 .cvsignore, 1.13, 1.14 git.spec, 1.1, 1.2 sources,
	1.13, 1.14
Message-ID: <200601110602.k0B626Up018378@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18348

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Jan 2006 23:44:39 -0000	1.13
+++ .cvsignore	11 Jan 2006 06:01:32 -0000	1.14
@@ -1 +1 @@
-git-1.1.0.tar.gz
+git-1.1.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.spec	10 Jan 2006 23:44:39 -0000	1.1
+++ git.spec	11 Jan 2006 06:01:32 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.0
+Version: 	1.1.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
+- git-1.1.1
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Jan 2006 23:44:39 -0000	1.13
+++ sources	11 Jan 2006 06:01:32 -0000	1.14
@@ -1 +1 @@
-8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz
+f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 06:05:47 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 11 Jan 2006 01:05:47 -0500
Subject: rpms/git-core/FC-3 .cvsignore, 1.13, 1.14 git.spec, 1.1, 1.2 sources,
	1.13, 1.14
Message-ID: <200601110606.k0B66KBR018510@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Jan 2006 23:46:18 -0000	1.13
+++ .cvsignore	11 Jan 2006 06:05:47 -0000	1.14
@@ -1 +1 @@
-git-1.1.0.tar.gz
+git-1.1.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.spec	10 Jan 2006 23:46:18 -0000	1.1
+++ git.spec	11 Jan 2006 06:05:47 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.0
+Version: 	1.1.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
+- git-1.1.1
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Jan 2006 23:46:18 -0000	1.13
+++ sources	11 Jan 2006 06:05:47 -0000	1.14
@@ -1 +1 @@
-8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz
+f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 06:13:52 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 11 Jan 2006 01:13:52 -0500
Subject: rpms/paps/devel .cvsignore, 1.5, 1.6 paps.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200601110614.k0B6EOtl018641@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18616

Modified Files:
	.cvsignore paps.spec sources 
Log Message:
* Wed Jan 11 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.3-1
- New upstream release.
- paps-0.6.2-fix-bufferoverflow.patch: removed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 09:39:00 -0000	1.5
+++ .cvsignore	11 Jan 2006 06:13:52 -0000	1.6
@@ -5,3 +5,4 @@
 paps-0.5.tgz
 paps-0.6.1.tar.gz
 paps-0.6.2.tar.gz
+paps-0.6.3.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- paps.spec	21 Dec 2005 09:39:00 -0000	1.4
+++ paps.spec	11 Jan 2006 06:13:52 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		paps
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?dist}
 
 License:	LGPL
@@ -8,7 +8,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
 Patch0:		paps-0.6.1-makefile.patch
-Patch1:		paps-0.6.2-fix-bufferoverflow.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -19,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .overflow
 aclocal
 automake
 autoconf
@@ -46,6 +44,10 @@
 
 
 %changelog
+* Wed Jan 11 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.3-1
+- New upstream release.
+- paps-0.6.2-fix-bufferoverflow.patch: removed.
+
 * Wed Dec 21 2005 Akira TAGOH <tagoh at redhat.com> - 0.6.2-1
 - New upstream release.
   - the bitmap font is now ignored. (#176206)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 09:39:00 -0000	1.5
+++ sources	11 Jan 2006 06:13:52 -0000	1.6
@@ -1 +1 @@
-06268e6796e3869275ddeec42d9cfd53  paps-0.6.2.tar.gz
+6f36fd52b6254c99ac2710527ef413d6  paps-0.6.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:25:45 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:25:45 -0500
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.2,
	1.3 perl-File-Remove.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601111426.k0BEQIFP001826@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1805

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 14:25:45 -0000	1.3
@@ -1 +1 @@
-File-Remove-0.30.tar.gz
+File-Remove-0.31.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
+++ perl-File-Remove.spec	11 Jan 2006 14:25:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -37,11 +37,14 @@
 %files
 %defattr(-,root,root,-)
 # For license text(s), see the perl package.
-%doc Changes README
+%doc CHANGES README
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Corsepius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Tue Sep 13 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.30-2
 - Change %%summary according to Ville's preference.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:44:06 -0000	1.2
+++ sources	11 Jan 2006 14:25:45 -0000	1.3
@@ -1 +1 @@
-3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz
+8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:27:51 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:27:51 -0500
Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.2,
	1.3 perl-File-Remove.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601111428.k0BESQ8b001904@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 14:27:51 -0000	1.3
@@ -1 +1 @@
-File-Remove-0.30.tar.gz
+File-Remove-0.31.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
+++ perl-File-Remove.spec	11 Jan 2006 14:27:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -37,11 +37,14 @@
 %files
 %defattr(-,root,root,-)
 # For license text(s), see the perl package.
-%doc Changes README
+%doc CHANGES README
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Corsepius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Tue Sep 13 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.30-2
 - Change %%summary according to Ville's preference.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:44:06 -0000	1.2
+++ sources	11 Jan 2006 14:27:51 -0000	1.3
@@ -1 +1 @@
-3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz
+8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:29:08 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:29:08 -0500
Subject: rpms/perl-File-Remove/FC-3 .cvsignore, 1.2,
	1.3 perl-File-Remove.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601111429.k0BETe0j001986@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1965

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 14:29:08 -0000	1.3
@@ -1 +1 @@
-File-Remove-0.30.tar.gz
+File-Remove-0.31.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-3/perl-File-Remove.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
+++ perl-File-Remove.spec	11 Jan 2006 14:29:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -37,11 +37,14 @@
 %files
 %defattr(-,root,root,-)
 # For license text(s), see the perl package.
-%doc Changes README
+%doc CHANGES README
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Corsepius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Tue Sep 13 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.30-2
 - Change %%summary according to Ville's preference.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:44:06 -0000	1.2
+++ sources	11 Jan 2006 14:29:08 -0000	1.3
@@ -1 +1 @@
-3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz
+8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:36:42 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:36:42 -0500
Subject: rpms/perl-Params-Util/FC-3 .cvsignore, 1.5,
	1.6 perl-Params-Util.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200601111437.k0BEbEn5002171@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/FC-3

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:33:14 -0000	1.5
+++ .cvsignore	11 Jan 2006 14:36:42 -0000	1.6
@@ -1 +1 @@
-Params-Util-0.08.tar.gz
+Params-Util-0.09.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/perl-Params-Util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Params-Util.spec	21 Dec 2005 08:33:14 -0000	1.4
+++ perl-Params-Util.spec	11 Jan 2006 14:36:42 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+- Upstream update.
+
 * Wed Dec 21 2005 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:33:14 -0000	1.5
+++ sources	11 Jan 2006 14:36:42 -0000	1.6
@@ -1 +1 @@
-f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz
+5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:36:48 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:36:48 -0500
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.5,
	1.6 perl-Params-Util.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200601111437.k0BEbKDl002176@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/FC-4

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:31:26 -0000	1.5
+++ .cvsignore	11 Jan 2006 14:36:48 -0000	1.6
@@ -1 +1 @@
-Params-Util-0.08.tar.gz
+Params-Util-0.09.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Params-Util.spec	21 Dec 2005 08:31:26 -0000	1.4
+++ perl-Params-Util.spec	11 Jan 2006 14:36:48 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+- Upstream update.
+
 * Wed Dec 21 2005 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:31:26 -0000	1.5
+++ sources	11 Jan 2006 14:36:48 -0000	1.6
@@ -1 +1 @@
-f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz
+5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:36:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:36:54 -0500
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.5,
	1.6 perl-Params-Util.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200601111437.k0BEbQQ3002184@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/devel

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:30:03 -0000	1.5
+++ .cvsignore	11 Jan 2006 14:36:54 -0000	1.6
@@ -1 +1 @@
-Params-Util-0.08.tar.gz
+Params-Util-0.09.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Params-Util.spec	21 Dec 2005 08:30:03 -0000	1.4
+++ perl-Params-Util.spec	11 Jan 2006 14:36:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+- Upstream update.
+
 * Wed Dec 21 2005 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:30:03 -0000	1.5
+++ sources	11 Jan 2006 14:36:54 -0000	1.6
@@ -1 +1 @@
-f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz
+5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:56:40 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:56:40 -0500
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.4,
	1.5 perl-DBIx-SearchBuilder.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200601111457.k0BEvCtg002427@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2402

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Dec 2005 14:16:43 -0000	1.4
+++ .cvsignore	11 Jan 2006 14:56:40 -0000	1.5
@@ -1,3 +1 @@
-DBIx-SearchBuilder-1.27.tar.gz
-DBIx-SearchBuilder-1.33.tar.gz
-DBIx-SearchBuilder-1.36.tar.gz
+DBIx-SearchBuilder-1.38.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-SearchBuilder.spec	14 Nov 2005 06:48:44 -0000	1.5
+++ perl-DBIx-SearchBuilder.spec	11 Jan 2006 14:56:40 -0000	1.6
@@ -6,7 +6,7 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.33
+Version: 	1.38
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
@@ -17,26 +17,22 @@
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
-BuildRequires: 	perl(Want)
-BuildRequires: 	perl(Cache::Simple::TimedExpiry) >= 0.21
-BuildRequires: 	perl(Class::ReturnValue) >= 0.4
-BuildRequires: 	perl(DBD::SQLite)
+BuildRequires:	perl(Want)
+BuildRequires:	perl(Cache::Simple::TimedExpiry) >= 0.21
+BuildRequires:	perl(Class::ReturnValue) >= 0.4
+BuildRequires:	perl(DBD::SQLite)
+BuildRequires:	perl(DBI)
+BuildRequires:	perl(ExtUtils::AutoInstall) >= 0.49
+BuildRequires:	perl(Test::More) >= 0.52
+BuildRequires:	perl(Class::Accessor)
 
 # Improved tests:
 BuildRequires:	perl(Test::Pod)
 
-%if "%version" > "1.27"
-BuildRequires: 	perl(ExtUtils::AutoInstall) >= 0.49
-BuildRequires:	perl(Test::More) >= 0.52
-BuildRequires:	perl(Class::Accessor)
 # Optional features
 BuildRequires:	perl(DBIx::DBSchema)
 BuildRequires:	perl(capitalization) >= 0.03
-%endif
-%if "%version" > "1.33"
-# Missing in Fedora
-BuildRequires: 	perl(Clone)
-%endif
+BuildRequires:	perl(Clone)
 
 %description
 This module provides an object-oriented mechanism for retrieving and
@@ -48,13 +44,7 @@
 find -name '*.pm' -exec chmod -x {} \;
 
 %build
-%if "%version" > "1.27"
-# --skipdeps causes ExtUtils::AutoInstall not to try auto-installing 
-# missing optional features
-%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
-%else
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-%endif
 make %{?_smp_mflags}
 
 %install
@@ -74,9 +64,7 @@
 %defattr(-,root,root,-)
 # 
 %doc Changes
-%if "%{version}" > "1.27"
 %doc README ROADMAP
-%endif
 %{perl_vendorlib}/DBIx
 %{_mandir}/man3/*
 %exclude %{perl_vendorlib}/DBIx/SearchBuilder/Handle/Oracle*
@@ -98,6 +86,10 @@
 %endif
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-1
+- Upstream update.
+- Spec cleanup.
+
 * Mon Nov 14 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.33-1
 - Upstream update to 1.33.
 
@@ -108,12 +100,6 @@
 - BR: perl(DBIx::DBSchema) and perl(capitalization) for 1.33
   (Now in FE >= 5).
 
-* Tue Oct 11 2005 Ralf Corsepius <rc040203 at freenet.de>
-- Preps for update to 1.33.
-
-* Tue Oct 11 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.27-3
-- Spec file cleanup.
-
 * Mon Oct 10 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.27-2
 - chmod -x *.pm.
 - BR: perl(Test::Pod).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Dec 2005 14:16:43 -0000	1.4
+++ sources	11 Jan 2006 14:56:40 -0000	1.5
@@ -1,3 +1 @@
-b3bc442e5e447e8a02417c417cff7371  DBIx-SearchBuilder-1.27.tar.gz
-f9a11fe46b311d783a53d3c04a3d9246  DBIx-SearchBuilder-1.33.tar.gz
-bef0e6a1affb4ad79bcf52205ca793a3  DBIx-SearchBuilder-1.36.tar.gz
+409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 15:04:25 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 10:04:25 -0500
Subject: rpms/perl-DBIx-SearchBuilder/devel perl-DBIx-SearchBuilder.spec, 1.6,
	1.7
Message-ID: <200601111504.k0BF4vTl004194@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4177

Modified Files:
	perl-DBIx-SearchBuilder.spec 
Log Message:
Re-add --skipdeps


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-DBIx-SearchBuilder.spec	11 Jan 2006 14:56:40 -0000	1.6
+++ perl-DBIx-SearchBuilder.spec	11 Jan 2006 15:04:24 -0000	1.7
@@ -44,7 +44,10 @@
 find -name '*.pm' -exec chmod -x {} \;
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+# --skipdeps causes ExtUtils::AutoInstall not to try auto-installing 
+# missing optional features
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
+
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Wed Jan 11 15:06:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 11 Jan 2006 10:06:58 -0500
Subject: rpms/python-feedparser/FC-4 .cvsignore, 1.2,
	1.3 python-feedparser.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601111507.k0BF7Ub9004320@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4251/FC-4

Modified Files:
	.cvsignore python-feedparser.spec sources 
Log Message:
Version 4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2006 05:19:24 -0000	1.2
+++ .cvsignore	11 Jan 2006 15:06:57 -0000	1.3
@@ -1 +1 @@
-feedparser-4.0.2.zip
+feedparser-4.1.zip


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/FC-4/python-feedparser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-feedparser.spec	7 Jan 2006 05:19:24 -0000	1.1
+++ python-feedparser.spec	11 Jan 2006 15:06:57 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-feedparser
-Version:        4.0.2
-Release:        2%{?dist}
+Version:        4.1
+Release:        1%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -34,7 +34,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-cp -a docs html
+mv docs html
 chmod 0644 LICENSE README
  
 %clean
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 11 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-1
+- Version 4.1
+
 * Sat Jan 07 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-2
 - Set sane permissions on doc files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2006 05:19:24 -0000	1.2
+++ sources	11 Jan 2006 15:06:57 -0000	1.3
@@ -1 +1 @@
-85cc43faf40f8aefdb5885bdabc1a94c  feedparser-4.0.2.zip
+7ab1140c1e29d4cd52ab20fa7b1f8640  feedparser-4.1.zip



From fedora-extras-commits at redhat.com  Wed Jan 11 15:07:10 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 11 Jan 2006 10:07:10 -0500
Subject: rpms/python-feedparser/devel .cvsignore, 1.2,
	1.3 python-feedparser.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601111507.k0BF7hDE004336@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4251/devel

Modified Files:
	.cvsignore python-feedparser.spec sources 
Log Message:
Version 4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2006 05:19:24 -0000	1.2
+++ .cvsignore	11 Jan 2006 15:07:10 -0000	1.3
@@ -1 +1 @@
-feedparser-4.0.2.zip
+feedparser-4.1.zip


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/python-feedparser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-feedparser.spec	7 Jan 2006 05:19:24 -0000	1.1
+++ python-feedparser.spec	11 Jan 2006 15:07:10 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-feedparser
-Version:        4.0.2
-Release:        2%{?dist}
+Version:        4.1
+Release:        1%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -34,7 +34,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-cp -a docs html
+mv docs html
 chmod 0644 LICENSE README
  
 %clean
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 11 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-1
+- Version 4.1
+
 * Sat Jan 07 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-2
 - Set sane permissions on doc files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2006 05:19:24 -0000	1.2
+++ sources	11 Jan 2006 15:07:10 -0000	1.3
@@ -1 +1 @@
-85cc43faf40f8aefdb5885bdabc1a94c  feedparser-4.0.2.zip
+7ab1140c1e29d4cd52ab20fa7b1f8640  feedparser-4.1.zip



From fedora-extras-commits at redhat.com  Wed Jan 11 15:07:16 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 11 Jan 2006 10:07:16 -0500
Subject: rpms/awstats/FC-4 awstats.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <200601111507.k0BF7mWq004344@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4285/FC-4

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.5 final


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- awstats.spec	22 Aug 2005 10:18:16 -0000	1.8
+++ awstats.spec	11 Jan 2006 15:07:15 -0000	1.9
@@ -1,12 +1,12 @@
 Name:       awstats
 Version:    6.5
-Release:    0.1.050822%{?dist}
+Release:    1%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-#Source0:    http://dl.sf.net/awstats/awstats-6.5.tgz
-Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -151,6 +151,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Wed Jan 11 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
+- version 6.5 final
+
 * Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
 - version 6.5 (beta), fixes CAN-2005-1527
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Aug 2005 10:18:16 -0000	1.7
+++ sources	11 Jan 2006 15:07:15 -0000	1.8
@@ -1 +1 @@
-a990f9dcdf26e585a326b316a79e5436  awstats-6.5.tar.gz
+aef00b2ff5c5413bd2a868299cabd69a  awstats-6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 15:07:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 11 Jan 2006 10:07:29 -0500
Subject: rpms/awstats/devel awstats.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <200601111508.k0BF870T004350@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4285/devel

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.5 final


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- awstats.spec	22 Aug 2005 10:18:17 -0000	1.8
+++ awstats.spec	11 Jan 2006 15:07:29 -0000	1.9
@@ -1,12 +1,12 @@
 Name:       awstats
 Version:    6.5
-Release:    0.1.050822%{?dist}
+Release:    1%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-#Source0:    http://dl.sf.net/awstats/awstats-6.5.tgz
-Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -151,6 +151,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Wed Jan 11 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
+- version 6.5 final
+
 * Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
 - version 6.5 (beta), fixes CAN-2005-1527
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Aug 2005 10:18:17 -0000	1.7
+++ sources	11 Jan 2006 15:07:29 -0000	1.8
@@ -1 +1 @@
-a990f9dcdf26e585a326b316a79e5436  awstats-6.5.tar.gz
+aef00b2ff5c5413bd2a868299cabd69a  awstats-6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 16:06:27 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 11 Jan 2006 11:06:27 -0500
Subject: rpms/python-psyco/FC-3 python-psyco.spec,1.5,1.6
Message-ID: <200601111607.k0BG7TSw006641@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6586/FC-3

Modified Files:
	python-psyco.spec 
Log Message:
Add a description.  Can't believe I didn't have one before.



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/FC-3/python-psyco.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-psyco.spec	2 Nov 2005 18:34:12 -0000	1.5
+++ python-psyco.spec	11 Jan 2006 16:06:26 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -19,6 +19,13 @@
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
+Psyco is a kind of just-in-time (JIT) compiler, a little bit like what exists
+for other languages, that emit machine code on the fly instead of interpreting
+your Python program step by step. The difference with the traditional approach
+to JIT compilers is that Psyco writes several version of the same blocks
+(a block is a bit of a function), which are optimized by being specialized to
+some kinds of variables (a "kind" can mean a type, but it is more general). The
+result is that your unmodified Python programs run faster.
 
 
 %prep
@@ -48,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Wed Jan 11 2006 Shahms E. King <shahms at shahms.com> 1.5-3
+- Add a description and rebuild.  Ooops.
+
 * Wed Nov 02 2005 Shahms E. King <shahms at shahms.com> 1.5-2
 - Don't package INSTALL.txt which no longer exists
 



From fedora-extras-commits at redhat.com  Wed Jan 11 16:06:56 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 11 Jan 2006 11:06:56 -0500
Subject: rpms/python-psyco/FC-4 python-psyco.spec,1.6,1.7
Message-ID: <200601111607.k0BG7Tot006640@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6586/FC-4

Modified Files:
	python-psyco.spec 
Log Message:
Add a description.  Can't believe I didn't have one before.



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/FC-4/python-psyco.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-psyco.spec	2 Nov 2005 18:34:17 -0000	1.6
+++ python-psyco.spec	11 Jan 2006 16:06:56 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -19,6 +19,13 @@
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
+Psyco is a kind of just-in-time (JIT) compiler, a little bit like what exists
+for other languages, that emit machine code on the fly instead of interpreting
+your Python program step by step. The difference with the traditional approach
+to JIT compilers is that Psyco writes several version of the same blocks
+(a block is a bit of a function), which are optimized by being specialized to
+some kinds of variables (a "kind" can mean a type, but it is more general). The
+result is that your unmodified Python programs run faster.
 
 
 %prep
@@ -48,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Wed Jan 11 2006 Shahms E. King <shahms at shahms.com> 1.5-3
+- Add a description and rebuild.  Ooops.
+
 * Wed Nov 02 2005 Shahms E. King <shahms at shahms.com> 1.5-2
 - Don't package INSTALL.txt which no longer exists
 



From fedora-extras-commits at redhat.com  Wed Jan 11 16:07:04 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 11 Jan 2006 11:07:04 -0500
Subject: rpms/python-psyco/devel python-psyco.spec,1.6,1.7
Message-ID: <200601111607.k0BG7tjL006646@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6586/devel

Modified Files:
	python-psyco.spec 
Log Message:
Add a description.  Can't believe I didn't have one before.



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/devel/python-psyco.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-psyco.spec	2 Nov 2005 18:34:22 -0000	1.6
+++ python-psyco.spec	11 Jan 2006 16:07:03 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -19,6 +19,13 @@
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
+Psyco is a kind of just-in-time (JIT) compiler, a little bit like what exists
+for other languages, that emit machine code on the fly instead of interpreting
+your Python program step by step. The difference with the traditional approach
+to JIT compilers is that Psyco writes several version of the same blocks
+(a block is a bit of a function), which are optimized by being specialized to
+some kinds of variables (a "kind" can mean a type, but it is more general). The
+result is that your unmodified Python programs run faster.
 
 
 %prep
@@ -48,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Wed Jan 11 2006 Shahms E. King <shahms at shahms.com> 1.5-3
+- Add a description and rebuild.  Ooops.
+
 * Wed Nov 02 2005 Shahms E. King <shahms at shahms.com> 1.5-2
 - Don't package INSTALL.txt which no longer exists
 



From fedora-extras-commits at redhat.com  Wed Jan 11 18:37:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Jan 2006 13:37:34 -0500
Subject: rpms/digikamimageplugins/FC-3 .cvsignore, 1.2,
	1.3 digikamimageplugins.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <200601111838.k0BIc60i010551@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10526

Modified Files:
	.cvsignore digikamimageplugins.spec sources 
Log Message:
* Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.0-1
- 0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Oct 2005 20:21:44 -0000	1.2
+++ .cvsignore	11 Jan 2006 18:37:33 -0000	1.3
@@ -1 +1 @@
-digikamimageplugins-0.7.4.tar.bz2
+digikamimageplugins-0.8.0.tar.bz2


Index: digikamimageplugins.spec
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-3/digikamimageplugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- digikamimageplugins.spec	10 Nov 2005 18:51:10 -0000	1.8
+++ digikamimageplugins.spec	11 Jan 2006 18:37:33 -0000	1.9
@@ -1,13 +1,13 @@
 
 Name:    digikamimageplugins
 Summary: Plugins for Digikam
-Version: 0.7.4
-Release: 10%{?dist}
+Version: 0.8.0
+Release: 1%{?dist} 
 
 License: GPL
 Group:   Applications/Multimedia
 URL:     http://extragear.kde.org/apps/digikamimageplugins/ 
-Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-0.7.4.tar.bz2	
+Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-%{version}.tar.bz2	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: digikamplugins < %{version}
@@ -17,7 +17,7 @@
 BuildRequires: kdelibs-devel >= 6:3.4
 BuildRequires: digikam-devel = %{version}
 
-Requires: digikam = %{version}
+Requires: digikam >= %{version}
 Requires: ImageMagick 
 
 
@@ -102,7 +102,6 @@
 done
 fi
 
-
 cat *.lang > %{name}.list
 
 
@@ -130,9 +129,17 @@
 
 
 %changelog
-* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-10
+* Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.0-1
+- 0.8.0
+
+* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.0-0.1.rc
+- 0.8.0-rc
+
+* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-11 
 - abs->relative symlinks
 - simplify configure
+
+* Fri Nov 04 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-10 
 - Req/BR: digikam = %%version
 
 * Fri Oct 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Oct 2005 20:21:44 -0000	1.2
+++ sources	11 Jan 2006 18:37:33 -0000	1.3
@@ -1 +1 @@
-5ea3c0dd6e6f1eb99211e75d0bf17d3d  digikamimageplugins-0.7.4.tar.bz2
+6670e0411dbf71ec9faeee087fc4f79a  digikamimageplugins-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 11 18:57:41 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 11 Jan 2006 13:57:41 -0500
Subject: fedora-release fedora-release.spec,1.15,1.16
Message-ID: <200601111857.k0BIvfqg010860@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10842

Modified Files:
	fedora-release.spec 
Log Message:
bump to 4.91


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fedora-release.spec	21 Nov 2005 02:59:35 -0000	1.15
+++ fedora-release.spec	11 Jan 2006 18:57:33 -0000	1.16
@@ -1,4 +1,4 @@
-%define release_version 4.90
+%define release_version 4.91
 %define release_name Pre-FC5
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide



From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:13 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:13 -0500
Subject: rpms/xmldiff - New directory
Message-ID: <200601112256.k0BMuFkm018511@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18503/xmldiff

Log Message:
Directory /cvs/extras/rpms/xmldiff added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:19 -0500
Subject: rpms/xmldiff/devel - New directory
Message-ID: <200601112256.k0BMuLdN018526@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18503/xmldiff/devel

Log Message:
Directory /cvs/extras/rpms/xmldiff/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:34 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:34 -0500
Subject: rpms/xmldiff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601112256.k0BMua4F018560@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18548

Added Files:
	Makefile import.log 
Log Message:
Setup of module xmldiff


--- NEW FILE Makefile ---
# Top level Makefile for module xmldiff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:40 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:40 -0500
Subject: rpms/xmldiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601112256.k0BMugf2018580@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18548/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmldiff


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 11 22:57:12 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:57:12 -0500
Subject: rpms/xmldiff import.log,1.1,1.2
Message-ID: <200601112257.k0BMvjg1018688@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18625

Modified Files:
	import.log 
Log Message:
auto-import xmldiff-0.6.7-5 on branch devel from xmldiff-0.6.7-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jan 2006 22:56:34 -0000	1.1
+++ import.log	11 Jan 2006 22:57:12 -0000	1.2
@@ -0,0 +1 @@
+xmldiff-0_6_7-5:HEAD:xmldiff-0.6.7-5.src.rpm:1137020208



From fedora-extras-commits at redhat.com  Wed Jan 11 22:57:18 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:57:18 -0500
Subject: rpms/xmldiff/devel GPL, NONE, 1.1 xmldiff-0.6.7-xsldata.patch, NONE,
	1.1 xmldiff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601112257.k0BMvpaJ018700@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18625/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GPL xmldiff-0.6.7-xsldata.patch xmldiff.spec 
Log Message:
auto-import xmldiff-0.6.7-5 on branch devel from xmldiff-0.6.7-5.src.rpm


--- NEW FILE GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                          675 Mass Ave, Cambridge, MA 02139, 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

	Appendix: 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) 19yy  <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., 675 Mass Ave, Cambridge, MA 02139, 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) 19yy 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.

xmldiff-0.6.7-xsldata.patch:

--- NEW FILE xmldiff-0.6.7-xsldata.patch ---
diff -uNr xmldiff-0.6.7-original/__pkginfo__.py xmldiff-0.6.7/__pkginfo__.py
--- xmldiff-0.6.7-original/__pkginfo__.py	2005-05-03 11:42:29.000000000 -0400
+++ xmldiff-0.6.7/__pkginfo__.py	2006-01-10 21:21:30.000000000 -0500
@@ -54,7 +54,7 @@
 except:
     pass
 
-data_files = [("share/sgml/stylesheet/xmldiff",
+data_files = [("share/xml/xmldiff",
                ['xsl/docbook_rev.xsl', 'xsl/xmlrev.xslt'])
               ]
 
diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev
--- xmldiff-0.6.7-original/bin/xmlrev	2005-05-03 11:42:29.000000000 -0400
+++ xmldiff-0.6.7/bin/xmlrev	2006-01-10 21:21:30.000000000 -0500
@@ -107,7 +107,7 @@
     echo "      show difference between revisions as xupdate"
 }
 
-ML_DIR=/usr/share/sgml/stylesheet/xmldiff
+ML_DIR=/usr/share/xml/xmldiff
 
 case "$1" in
     --help)


--- NEW FILE xmldiff.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           xmldiff
Version:        0.6.7
Release:        5%{?dist}
Summary:        Tree to tree correction between XML documents

Group:          Applications/Text
License:        GPL
URL:            http://www.logilab.org/projects/xmldiff
Source0:        ftp://ftp.logilab.org/pub/xmldiff/%{name}-%{version}.tar.gz
# No license in original tarball, but referenced in docs
Source1:	GPL
Patch0:		xmldiff-0.6.7-xsldata.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python
BuildRequires:  python-devel
BuildRequires:	python-logilab-common
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires:   docbook-style-xsl
Requires:   /usr/bin/sgmlnorm
Requires:   /usr/bin/xsltproc


%description
The xmldiff utility extracts differences between two XML files. It
returns a set of primitives to apply on source tree to obtain the
destination tree.  The implementation is based on _Change detection in
hierarchically structured information_, by S. Chawathe, A. Rajaraman,
H. Garcia-Molina and J. Widom (Stanford University, 1996).


%prep
%setup -q
%patch0 -p1
for i in man/*.1 __pkginfo__.py doc/*.txt
do
	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
done
install -pm 644 %{SOURCE1} COPYING


%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
# strip tests
rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/xmldiff/test
mkdir -p ${RPM_BUILD_ROOT}{%{_mandir}/man1,%{_docdir}/%{name}-%{version}}
install -m 644 man/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
# quiet rpmlint
chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/xmldiff/main.py


%check
cd test
PYTHONPATH=$(ls -1d ${PWD}/../build/lib.*) %{__python} runtests.py

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README README.xmlrev doc/*.html doc/*.txt
%dir %{_datadir}/xml/xmldiff
%dir %{python_sitearch}/xmldiff
%{_bindir}/xmldiff
%{_bindir}/xmlrev
%{python_sitearch}/xmldiff/*.py
%{python_sitearch}/xmldiff/*.pyc
%{python_sitearch}/xmldiff/*.so
%{_datadir}/xml/xmldiff/*
%{_mandir}/man1/*
%ghost %{python_sitearch}/xmldiff/*.pyo


%changelog
* Wed Jan 11 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
- xmlrev: use proper XSL location

* Tue Jan 10 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-4
- Convert additional files to UTF-8
- Include documentation properly
- Reseat XSL files

* Sun Jan  8 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-3
- Convert manpages in %%prep
- Enable tests in %%check
- Make BuildRequires more robust

* Fri Jan  6 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-2
- Fix Requires
- Drop test suite due to external dependencies
- convert man pages to UTF-8

* Thu Jan  5 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-1
- Initial RPM version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2006 22:56:40 -0000	1.1
+++ .cvsignore	11 Jan 2006 22:57:18 -0000	1.2
@@ -0,0 +1 @@
+xmldiff-0.6.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2006 22:56:40 -0000	1.1
+++ sources	11 Jan 2006 22:57:18 -0000	1.2
@@ -0,0 +1 @@
+07b97c97a0b83d605f37c712400e24ff  xmldiff-0.6.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 22:57:30 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:57:30 -0500
Subject: owners owners.list,1.523,1.524
Message-ID: <200601112258.k0BMw2WM018708@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18669

Modified Files:
	owners.list 
Log Message:
Added xmldiff (#177083)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- owners.list	10 Jan 2006 22:20:42 -0000	1.523
+++ owners.list	11 Jan 2006 22:57:30 -0000	1.524
@@ -1330,6 +1330,7 @@
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|xmldiff|Tree to tree correction between XML documents|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 01:13:00 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 11 Jan 2006 20:13:00 -0500
Subject: rpms/gparted/devel .cvsignore, 1.2, 1.3 gparted.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601120113.k0C1DWLZ024475@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24450

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
 New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2005 22:41:08 -0000	1.2
+++ .cvsignore	12 Jan 2006 01:12:59 -0000	1.3
@@ -1 +1 @@
-gparted-0.0.9.tar.bz2
+gparted-0.1.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gparted.spec	28 Nov 2005 15:41:48 -0000	1.2
+++ gparted.spec	12 Jan 2006 01:12:59 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.0.9
-Release: 3%{?dist}
+Version: 0.1
+Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Jan 11 2006 Deji Akingunola <dakingun at gmail.com> - 0.1-1
+- New release
+
 * Fri Nov 25 2005 Deji Akingunola <dakingun at gmail.com> - 0.0.9-3
 - Use correct source url
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2005 22:41:08 -0000	1.2
+++ sources	12 Jan 2006 01:12:59 -0000	1.3
@@ -1 +1 @@
-0f36fc93e1908418be0b99c5db7ac184  gparted-0.0.9.tar.bz2
+f0e212b8f03918b320ca6b4ad86d4afb  gparted-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 01:17:47 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:17:47 -0500
Subject: rpms/tclxml/devel tclxml.patch,1.1,1.2
Message-ID: <200601120118.k0C1IK3J024596@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24576

Modified Files:
	tclxml.patch 
Log Message:
Fix quoting bug that only appears with bash >= 3.1.  Adjust some *Config.sh values.



tclxml.patch:

Index: tclxml.patch
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclxml.patch	5 Dec 2005 17:56:35 -0000	1.1
+++ tclxml.patch	12 Jan 2006 01:17:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur --exclude '*.swp' tclxml-3.1/configure tclxml-3.1.new/configure
 --- tclxml-3.1/configure	2005-11-03 22:26:33.000000000 -0800
-+++ tclxml-3.1.new/configure	2005-11-26 23:47:56.000000000 -0800
++++ tclxml-3.1.new/configure	2006-01-11 16:59:27.000000000 -0800
 @@ -1530,7 +1530,8 @@
  
  	    # check in a few common install locations
@@ -11,9 +11,18 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3771,7 +3772,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 diff -Naur --exclude '*.swp' tclxml-3.1/expat/configure tclxml-3.1.new/expat/configure
 --- tclxml-3.1/expat/configure	2004-08-14 00:41:11.000000000 -0700
-+++ tclxml-3.1.new/expat/configure	2005-11-26 23:50:36.000000000 -0800
++++ tclxml-3.1.new/expat/configure	2006-01-11 17:07:15.000000000 -0800
 @@ -1532,7 +1532,8 @@
  
  	    # check in a few common install locations
@@ -24,6 +33,15 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3860,7 +3861,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 diff -Naur --exclude '*.swp' tclxml-3.1/expat/Makefile.in tclxml-3.1.new/expat/Makefile.in
 --- tclxml-3.1/expat/Makefile.in	2002-10-09 14:17:21.000000000 -0700
 +++ tclxml-3.1.new/expat/Makefile.in	2005-11-27 12:46:23.000000000 -0800
@@ -37,7 +55,7 @@
  	-I$(srcdir)/xmlwf
 diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure tclxml-3.1.new/libxml2/configure
 --- tclxml-3.1/libxml2/configure	2005-11-03 22:26:52.000000000 -0800
-+++ tclxml-3.1.new/libxml2/configure	2005-11-26 23:55:32.000000000 -0800
++++ tclxml-3.1.new/libxml2/configure	2006-01-11 17:07:25.000000000 -0800
 @@ -1540,7 +1540,8 @@
  
  	    # check in a few common install locations
@@ -48,6 +66,15 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3912,7 +3913,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 @@ -5468,7 +5469,9 @@
  for d in                \
      $with_xml2lib       \
@@ -58,9 +85,21 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
+@@ -5603,9 +5606,9 @@
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
+ else
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
+ fi
+ tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
+ tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
 diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in
 --- tclxml-3.1/libxml2/configure.in	2004-08-14 00:41:11.000000000 -0700
-+++ tclxml-3.1.new/libxml2/configure.in	2005-11-26 23:54:28.000000000 -0800
++++ tclxml-3.1.new/libxml2/configure.in	2005-12-17 20:53:20.000000000 -0800
 @@ -247,7 +247,9 @@
  for d in                \
      $with_xml2lib       \
@@ -71,6 +110,76 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
+@@ -347,9 +349,9 @@
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
+ else
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
+ fi
+ tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
+ tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
+diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/Makefile.in tclxml-3.1.new/libxml2/Makefile.in
+--- tclxml-3.1/libxml2/Makefile.in	2003-12-03 12:06:35.000000000 -0800
++++ tclxml-3.1.new/libxml2/Makefile.in	2005-12-17 19:58:39.000000000 -0800
+@@ -232,6 +232,8 @@
+ 	    echo "Installing $$i" ; \
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/tclxml-libxml2 ; \
+ 	done;
++	@mkdir -p $(DESTDIR)$(pkglibdir)
++	$(INSTALL_DATA) tcllibxml2Config.sh $(DESTDIR)$(libdir)
+ 	@echo "libraries done"
+ 
+ #========================================================================
+diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/tcllibxml2Config.sh.in tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in
+--- tclxml-3.1/libxml2/tcllibxml2Config.sh.in	2003-12-03 12:06:35.000000000 -0800
++++ tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in	2005-12-17 20:25:15.000000000 -0800
+@@ -18,34 +18,34 @@
+ tclxml_libxml2_RELEASE_LEVEL='@PATCHLEVEL@'
+ 
+ # The name of the TclXML/libxml2 library (may be either a .a file or a shared library):
+-tclxml_libxml2_LIB_FILE=@tcldomxml_LIB_FILE@
++tclxml_libxml2_LIB_FILE=@tcllibxml2_LIB_FILE@
+ 
+ # String to pass to linker to pick up the tcldomxml library from its
+ # build directory.
+-tclxml_libxml2_BUILD_LIB_SPEC='@tclxml_libxml2_BUILD_LIB_SPEC@'
++tclxml_libxml2_BUILD_LIB_SPEC='@tcllibxml2_BUILD_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 library from its
+ # installed directory.
+-tclxml_libxml2_LIB_SPEC='@tclxml_libxml2_LIB_SPEC@'
++tclxml_libxml2_LIB_SPEC='@tcllibxml2_LIB_SPEC@'
+ 
+ # The name of the TclXML/libxml2 stub library (a .a file):
+-tclxml_libxml2_STUB_LIB_FILE=@tclxml_libxml2_stub_LIB_FILE@
++tclxml_libxml2_STUB_LIB_FILE=@tcllibxml2_stub_LIB_FILE@
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # build directory.
+-tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tclxml_libxml2_BUILD_STUB_LIB_SPEC@'
++tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tcllibxml2_BUILD_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # installed directory.
+-tclxml_libxml2_STUB_LIB_SPEC='@tclxml_libxml2_STUB_LIB_SPEC@'
++tclxml_libxml2_STUB_LIB_SPEC='@tcllibxml2_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # build directory.
+-tclxml_libxml2_BUILD_STUB_LIB_PATH='@tclxml_libxml2_BUILD_STUB_LIB_PATH@'
++tclxml_libxml2_BUILD_STUB_LIB_PATH='@tcllibxml2_BUILD_STUB_LIB_PATH@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # installed directory.
+-tclxml_libxml2_STUB_LIB_PATH='@tclxml_libxml2_STUB_LIB_PATH@'
++tclxml_libxml2_STUB_LIB_PATH='@tcllibxml2_STUB_LIB_PATH@'
+ 
+ # Location of the top-level source directories from which TclXML/libxml2
+ # was built.  This is the directory that contains generic, unix, etc.
 diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4
 --- tclxml-3.1/tclconfig/tcl.m4	2003-12-03 12:06:35.000000000 -0800
 +++ tclxml-3.1.new/tclconfig/tcl.m4	2005-11-27 11:58:42.000000000 -0800



From fedora-extras-commits at redhat.com  Thu Jan 12 01:20:15 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:20:15 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.2,1.3
Message-ID: <200601120120.k0C1Kmn9024695@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24675

Modified Files:
	tclxml.spec 
Log Message:
Bump release for new patch.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclxml.spec	9 Jan 2006 02:59:50 -0000	1.2
+++ tclxml.spec	12 Jan 2006 01:20:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/



From fedora-extras-commits at redhat.com  Thu Jan 12 01:23:24 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:23:24 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.3,1.4
Message-ID: <200601120123.k0C1NuOa024827@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808

Modified Files:
	tclxml.spec 
Log Message:
Bump release number to fix tag problem.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclxml.spec	12 Jan 2006 01:20:15 -0000	1.3
+++ tclxml.spec	12 Jan 2006 01:23:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/



From fedora-extras-commits at redhat.com  Thu Jan 12 01:28:34 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:28:34 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.4,1.5
Message-ID: <200601120129.k0C1T7VF024917@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24896

Modified Files:
	tclxml.spec 
Log Message:
Added missing ChangeLog entries.  Doh!




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tclxml.spec	12 Jan 2006 01:23:24 -0000	1.4
+++ tclxml.spec	12 Jan 2006 01:28:34 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -122,6 +122,12 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-5
+- Added missing ChangeLog entries.
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-4
+- Retag to fix tag problem.
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-3
+- Updated patch to fix quoting bug with bash >= 3.1
 * Sun Jan 8 2006 Wart <wart at kobold.org> - 3.1-2
 - Package now owns the directories that it creates.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.1-1



From fedora-extras-commits at redhat.com  Thu Jan 12 01:43:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:43:48 -0500
Subject: rpms/tclxml/devel tclxml.patch,1.2,1.3 tclxml.spec,1.5,1.6
Message-ID: <200601120144.k0C1iLQe025007@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24985

Modified Files:
	tclxml.patch tclxml.spec 
Log Message:
Remove broken parts of patch
Clean up build root before installing.



tclxml.patch:

Index: tclxml.patch
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclxml.patch	12 Jan 2006 01:17:47 -0000	1.2
+++ tclxml.patch	12 Jan 2006 01:43:48 -0000	1.3
@@ -85,18 +85,6 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
-@@ -5603,9 +5606,9 @@
- # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
- else
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
- fi
- tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
- tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
 diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in
 --- tclxml-3.1/libxml2/configure.in	2004-08-14 00:41:11.000000000 -0700
 +++ tclxml-3.1.new/libxml2/configure.in	2005-12-17 20:53:20.000000000 -0800
@@ -110,76 +98,6 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
-@@ -347,9 +349,9 @@
- # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
- else
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
- fi
- tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
- tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
-diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/Makefile.in tclxml-3.1.new/libxml2/Makefile.in
---- tclxml-3.1/libxml2/Makefile.in	2003-12-03 12:06:35.000000000 -0800
-+++ tclxml-3.1.new/libxml2/Makefile.in	2005-12-17 19:58:39.000000000 -0800
-@@ -232,6 +232,8 @@
- 	    echo "Installing $$i" ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/tclxml-libxml2 ; \
- 	done;
-+	@mkdir -p $(DESTDIR)$(pkglibdir)
-+	$(INSTALL_DATA) tcllibxml2Config.sh $(DESTDIR)$(libdir)
- 	@echo "libraries done"
- 
- #========================================================================
-diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/tcllibxml2Config.sh.in tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in
---- tclxml-3.1/libxml2/tcllibxml2Config.sh.in	2003-12-03 12:06:35.000000000 -0800
-+++ tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in	2005-12-17 20:25:15.000000000 -0800
-@@ -18,34 +18,34 @@
- tclxml_libxml2_RELEASE_LEVEL='@PATCHLEVEL@'
- 
- # The name of the TclXML/libxml2 library (may be either a .a file or a shared library):
--tclxml_libxml2_LIB_FILE=@tcldomxml_LIB_FILE@
-+tclxml_libxml2_LIB_FILE=@tcllibxml2_LIB_FILE@
- 
- # String to pass to linker to pick up the tcldomxml library from its
- # build directory.
--tclxml_libxml2_BUILD_LIB_SPEC='@tclxml_libxml2_BUILD_LIB_SPEC@'
-+tclxml_libxml2_BUILD_LIB_SPEC='@tcllibxml2_BUILD_LIB_SPEC@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 library from its
- # installed directory.
--tclxml_libxml2_LIB_SPEC='@tclxml_libxml2_LIB_SPEC@'
-+tclxml_libxml2_LIB_SPEC='@tcllibxml2_LIB_SPEC@'
- 
- # The name of the TclXML/libxml2 stub library (a .a file):
--tclxml_libxml2_STUB_LIB_FILE=@tclxml_libxml2_stub_LIB_FILE@
-+tclxml_libxml2_STUB_LIB_FILE=@tcllibxml2_stub_LIB_FILE@
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # build directory.
--tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tclxml_libxml2_BUILD_STUB_LIB_SPEC@'
-+tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tcllibxml2_BUILD_STUB_LIB_SPEC@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # installed directory.
--tclxml_libxml2_STUB_LIB_SPEC='@tclxml_libxml2_STUB_LIB_SPEC@'
-+tclxml_libxml2_STUB_LIB_SPEC='@tcllibxml2_STUB_LIB_SPEC@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # build directory.
--tclxml_libxml2_BUILD_STUB_LIB_PATH='@tclxml_libxml2_BUILD_STUB_LIB_PATH@'
-+tclxml_libxml2_BUILD_STUB_LIB_PATH='@tcllibxml2_BUILD_STUB_LIB_PATH@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # installed directory.
--tclxml_libxml2_STUB_LIB_PATH='@tclxml_libxml2_STUB_LIB_PATH@'
-+tclxml_libxml2_STUB_LIB_PATH='@tcllibxml2_STUB_LIB_PATH@'
- 
- # Location of the top-level source directories from which TclXML/libxml2
- # was built.  This is the directory that contains generic, unix, etc.
 diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4
 --- tclxml-3.1/tclconfig/tcl.m4	2003-12-03 12:06:35.000000000 -0800
 +++ tclxml-3.1.new/tclconfig/tcl.m4	2005-11-27 11:58:42.000000000 -0800


Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclxml.spec	12 Jan 2006 01:28:34 -0000	1.5
+++ tclxml.spec	12 Jan 2006 01:43:48 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -83,6 +83,7 @@
 make %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 cd expat
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -122,6 +123,9 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-6
+- Remove broken parts of patch
+- Clean up build root before installing.
 * Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-5
 - Added missing ChangeLog entries.
 * Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-4



From fedora-extras-commits at redhat.com  Thu Jan 12 04:21:44 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 23:21:44 -0500
Subject: rpms/tcldom/devel tcldom.patch,1.1,1.2 tcldom.spec,1.1,1.2
Message-ID: <200601120422.k0C4MG6F030548@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30498

Modified Files:
	tcldom.patch tcldom.spec 
Log Message:
Fix quoting bug that is exposed by bash >= 3.1



tcldom.patch:

Index: tcldom.patch
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/tcldom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcldom.patch	15 Dec 2005 04:58:00 -0000	1.1
+++ tcldom.patch	12 Jan 2006 04:21:43 -0000	1.2
@@ -29,7 +29,7 @@
  namespace eval xmlswitch {
 diff -Naur --exclude '*.swp' tcldom-3.1/src/configure tcldom-3.1.new/src/configure
 --- tcldom-3.1/src/configure	2003-04-04 14:07:50.000000000 -0800
-+++ tcldom-3.1.new/src/configure	2005-11-27 13:50:34.000000000 -0800
++++ tcldom-3.1.new/src/configure	2006-01-11 20:13:39.000000000 -0800
 @@ -1898,10 +1898,12 @@
  
  	    # check in a few common install locations
@@ -44,9 +44,18 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
+@@ -2249,7 +2251,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure tcldom-3.1.new/src-libxml2/configure
 --- tcldom-3.1/src-libxml2/configure	2005-11-03 22:36:59.000000000 -0800
-+++ tcldom-3.1.new/src-libxml2/configure	2005-11-27 13:40:37.000000000 -0800
++++ tcldom-3.1.new/src-libxml2/configure	2006-01-11 20:14:10.000000000 -0800
 @@ -1539,10 +1539,12 @@
  
  	    # check in a few common install locations
@@ -61,6 +70,15 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
+@@ -3780,7 +3782,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 @@ -5330,9 +5332,11 @@
  
  LIBXML2_LIBDIR=""
@@ -90,7 +108,7 @@
      if test -f "$d/libxml2.so" ; then
 diff -Naur --exclude '*.swp' tcldom-3.1/tclconfig/tcl.m4 tcldom-3.1.new/tclconfig/tcl.m4
 --- tcldom-3.1/tclconfig/tcl.m4	2003-12-03 12:18:44.000000000 -0800
-+++ tcldom-3.1.new/tclconfig/tcl.m4	2005-11-27 13:37:00.000000000 -0800
++++ tcldom-3.1.new/tclconfig/tcl.m4	2006-01-11 20:13:52.000000000 -0800
 @@ -73,10 +73,12 @@
  
  	    # check in a few common install locations
@@ -105,3 +123,12 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
+@@ -759,7 +761,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`


Index: tcldom.spec
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/tcldom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcldom.spec	15 Dec 2005 04:58:00 -0000	1.1
+++ tcldom.spec	12 Jan 2006 04:21:43 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language
 Name: tcldom
 Version: 3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -78,6 +78,8 @@
 %{_libdir}/%{name}_libxml2%{version}/*.a
 
 %changelog
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-3
+- Fix quoting bug that is exposed by bash >= 3.1
 * Tue Dec 13 2005 Wart <wart at kobold.org> - 3.1-2
 - Update patch to fix version numbers that weren't updated upstream
 * Sun Nov 27 2005 Wart <wart at kobold.org> - 3.1-1



From fedora-extras-commits at redhat.com  Thu Jan 12 06:17:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 12 Jan 2006 01:17:02 -0500
Subject: rpms/rekall/FC-3 rekall-2.4.0-64bitfix.patch, NONE,
	1.1 rekall-2.4.0-gcc4.patch, NONE,
	1.1 rekall-2.4.0-noldconfig.patch, NONE,
	1.1 rekall-2.4.0-qtfix.patch, NONE, 1.1 rekall.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200601120617.k0C6HYlR002022@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931/FC-3

Modified Files:
	rekall.spec sources 
Added Files:
	rekall-2.4.0-64bitfix.patch rekall-2.4.0-gcc4.patch 
	rekall-2.4.0-noldconfig.patch rekall-2.4.0-qtfix.patch 
Log Message:

Painful bump to 2.4.0. Like giving birth to a whale.


rekall-2.4.0-64bitfix.patch:

--- NEW FILE rekall-2.4.0-64bitfix.patch ---
--- rekall-2.2.3/libs/el32/hash.cpp.BAD	2005-09-22 13:34:45.000000000 -0500
+++ rekall-2.2.3/libs/el32/hash.cpp	2005-09-22 13:34:53.000000000 -0500
@@ -141,7 +141,7 @@
 			/* otherwise use just the tag (pretty useless	*/
 			/* but so what, not a common case).		*/
 			if ((key.tag->flags & TF_SHARED) == 0)
-				hval	= (int)key.val.shared ;
+				hval	= (long)key.val.shared ;
 			else	hval	= key.tag->tag ;
 			break	;
 	}
--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD	2005-09-22 14:29:36.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_parse.cpp	2005-09-22 14:29:52.000000000 -0500
@@ -971,7 +971,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 
 		sep	= true	;
@@ -1025,7 +1025,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 	}
 
@@ -1043,7 +1043,7 @@
 				receiver,
 				SLOT (newNode(int)),
 				0,
-				(int)exItem
+				(long)exItem
 			)	;
 		)
 
--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD	2005-09-22 15:53:11.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_link.cpp	2005-09-22 15:53:53.000000000 -0500
@@ -849,21 +849,21 @@
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecTable
+		(long)&nodeSpecTable
 	)	;
 	lp->insertItem
 	(	TR("Query link"),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecQuery
+		(long)&nodeSpecQuery
 	)	;
 	lp->insertItem
 	(	TR("SQL link"  ),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecSQL
+		(long)&nodeSpecSQL
 	) 	;
 
 	popup->insertItem (TR("New &Link"), lp) ;
--- rekall-2.4.0/libs/kbase/kb_overridedlg.cpp.BAD	2006-01-10 10:37:02.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_overridedlg.cpp	2006-01-10 10:37:22.000000000 -0600
@@ -360,7 +360,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvOverride->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/libs/kbase/kb_configdlg.cpp.BAD	2006-01-10 10:37:46.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_configdlg.cpp	2006-01-10 10:37:59.000000000 -0600
@@ -312,7 +312,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/script/python/tkc_pydebugbase.cpp.BAD	2006-01-10 10:38:42.000000000 -0600
+++ rekall-2.4.0/script/python/tkc_pydebugbase.cpp	2006-01-10 10:39:07.000000000 -0600
@@ -553,7 +553,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if (findTracePoint (pyObj, lineNo) == 0)
 		{
-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
 			enable	() ;
 		}
@@ -576,7 +576,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
 		{
-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.remove (tp) ;
 			delete	tp ;
 			disable	() ;

rekall-2.4.0-gcc4.patch:

--- NEW FILE rekall-2.4.0-gcc4.patch ---
--- rekall-2.4.0/support/xbase/ntx.h.BAD	2006-01-10 11:27:56.000000000 -0600
+++ rekall-2.4.0/support/xbase/ntx.h	2006-01-10 11:28:06.000000000 -0600
@@ -218,7 +218,7 @@
    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
    xbShort  KeyExists( xbDouble );
 
-   xbShort xbNtx::AllocKeyBufs(void);
+   xbShort AllocKeyBufs(void);
 
    virtual void GetExpression(char *buf, int len);
 };

rekall-2.4.0-noldconfig.patch:

--- NEW FILE rekall-2.4.0-noldconfig.patch ---
--- rekall-2.4.0/scons/Makefile.BAD	2006-01-10 15:25:03.000000000 -0600
+++ rekall-2.4.0/scons/Makefile	2006-01-10 15:25:13.000000000 -0600
@@ -3,11 +3,9 @@
 
 install:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 inst:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 clean:
 		PYTHONPATH=scons/ scons -Q --clean

rekall-2.4.0-qtfix.patch:

--- NEW FILE rekall-2.4.0-qtfix.patch ---
--- rekall-2.4.0/parts/report/kb_reportviewer.h.BAD	2006-01-10 14:14:14.000000000 -0600
+++ rekall-2.4.0/parts/report/kb_reportviewer.h	2006-01-10 14:14:28.000000000 -0600
@@ -15,6 +15,7 @@
 
 #include	<qscrollview.h>
 #include	<qguardedptr.h>
+#include	<qcombobox.h>
 
 #include 	"kb_classes.h"
 #include	"kb_viewer.h"


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rekall.spec	6 Oct 2005 17:09:50 -0000	1.7
+++ rekall.spec	12 Jan 2006 06:17:01 -0000	1.8
@@ -1,20 +1,24 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.2.4
-Release:	8%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
-Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
-Patch0:		rekall-2.2.3-py24.patch
-Patch1:		rekall-2.2.3-norpath3.patch
-Patch2:		rekall-2.2.3-64bitfix.patch
+Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tar.gz
+Patch1:		rekall-2.4.0-64bitfix.patch
+Patch2:		rekall-2.4.0-gcc4.patch
+Patch3:		rekall-2.4.0-qtfix.patch
+Patch4:		rekall-2.4.0-noldconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
+BuildRequires:	python-devel, mysql-devel, postgresql-devel
 BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
+BuildRequires:  scons
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-devel = %{version}-%{release}
+Obsoletes:	rekall-devel
 
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
@@ -33,14 +37,6 @@
 This package contains a set of common libraries that both rekall and 
 rekall-runtime require to function.
 
-%package devel
-Summary: Rekall development libraries and headers
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Headers and libraries for compiling programs that use Rekall.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -101,40 +97,34 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
 export KDEDIR=%{_prefix}
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
+echo "prefix=%{_prefix}" >> scons/settings.qt3
+cp scons/settings.qt3 settings
+cp scons/Makefile .
 
-%configure				\
-	--with-qlib-loader		\
-	--with-gui=kde			\
-	--disable-rpath			\
-	--enable-docs=yes		\
-	--enable-odbc=yes		\
-	--enable-iodbc=yes		\
-	--enable-runtime=yes		\
-	--enable-debug=yes		\
-	--with-qt-dir=%{_libdir}/qt-3.3	\
-%ifarch x86_64 ia64 sparc64 ppc64 
-	--enable-libsuffix=64		\
-%endif
-	--with-sgml-prefix=%{_prefix}
-
-make %{?_smp_mflags}
+make config
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Normally, we'd nuke the .la files, but rekall actually seems to want them...
-# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
+install -m0644 kbase/rekallrt.desktop $RPM_BUILD_ROOT%{_datadir}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -155,13 +145,15 @@
   $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
 
 # No need to have this file twice.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE
-
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
 cd $RPM_BUILD_ROOT%{_datadir}
-ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
-cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
+cp apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_bindir}/rekallqt rekall
+ln -s %{_bindir}/rekallqtManual rekallManual
+ln -s %{_bindir}/rekallqtrt rekallrt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,136 +198,120 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root, 0755)
 %doc LICENSE
-%{_libdir}/libel_*.so.*
-%{_libdir}/libel_*.la
-%{_libdir}/libkbase.so.*
-%{_libdir}/libkbase.la
-%{_libdir}/libkbase_*.so.*
-%exclude %{_libdir}/libkbase_common.so.*
-%exclude %{_libdir}/libkbase_kde.so.*
-%exclude %{_libdir}/libkbase_tkwidgets.so.*
-%{_libdir}/libkbase_*.la
-%{_libdir}/librekall.so.*
-%{_libdir}/librekall.la
+%{_libdir}/librekallqt.so
 %{_bindir}/rekall
+%{_bindir}/rekallqt
 %{_datadir}/pixmaps/rekall.png
-%dir %{_datadir}/apps/rekall
-%{_datadir}/apps/rekall/dict/*
-%{_datadir}/apps/rekall/help/*
-%{_datadir}/apps/rekall/highlight/*
-%{_datadir}/apps/rekall/icons/*
-%{_datadir}/apps/rekall/keymap
-%{_datadir}/apps/rekall/pics/*
-%{_datadir}/apps/rekall/rekall.png
-%{_datadir}/apps/rekall/rekallui.*
-%{_datadir}/apps/rekall/services/kdeparts.lst
-%{_datadir}/apps/rekall/services/rekall_component.desktop
-%{_datadir}/apps/rekall/services/rekall_copier.desktop
-%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
-%{_datadir}/apps/rekall/services/rekall_dummy.desktop
-%{_datadir}/apps/rekall/services/rekall_editor.desktop
-%{_datadir}/apps/rekall/services/rekall_form.desktop
-%{_datadir}/apps/rekall/services/rekall_macro.desktop
-%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
-%{_datadir}/apps/rekall/services/rekall_query.desktop
-%{_datadir}/apps/rekall/services/rekall_report.desktop
-%{_datadir}/apps/rekall/services/rekall_table.desktop
-%{_datadir}/apps/rekall/wizards/*
+%dir %{_datadir}/apps/rekallqt
+%{_datadir}/apps/rekallqt/dict/
+%{_datadir}/apps/rekallqt/gui/
+%{_datadir}/apps/rekallqt/help/
+%{_datadir}/apps/rekallqt/highlights/
+%{_datadir}/apps/rekallqt/icons/
+%{_datadir}/apps/rekallqt/keymap*
+%{_datadir}/apps/rekallqt/pics/
+%{_datadir}/apps/rekallqt/rekall.png
+%{_datadir}/apps/rekallqt/rekall_lite.png
+%{_datadir}/apps/rekallqt/services/rekall_component.desktop
+%{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
+%{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
+%{_datadir}/apps/rekallqt/services/rekall_editor.desktop
+%{_datadir}/apps/rekallqt/services/rekall_form.desktop
+%{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_query.desktop
+%{_datadir}/apps/rekallqt/services/rekall_report.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs_client.desktop
+%{_datadir}/apps/rekallqt/services/rekall_table.desktop
+%{_datadir}/apps/rekallqt/script/
+%{_datadir}/apps/rekallqt/stock/
+%{_datadir}/apps/rekallqt/test/
+%{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
-%{_libdir}/libkbase_componentview.so
-%{_libdir}/libkbase_copierview.so
-%{_libdir}/libkbase_editor.so
-%{_libdir}/libkbase_formview.so
-%{_libdir}/libkbase_macroview.so
-%{_libdir}/libkbase_queryview.so
-%{_libdir}/libkbase_reportview.so
-%{_libdir}/libkbase_tableview.so
+%{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_componentview.so
+%{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_xbase.so
+%{_libdir}/librekallqt_editor.so
+%{_libdir}/librekallqt_el32.so
+%{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_macroview.so
+%{_libdir}/librekallqt_queryview.so
+%{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_xbase.so
+%{_libdir}/librekallqt_support_xbsql.so
+%{_libdir}/librekallqt_wizard.so
 
 %files common
 %defattr(-, root, root, 0755)
-%{_libdir}/libkbase_common.so.*
-%{_libdir}/libkbase_kde.so.*
-%{_libdir}/libkbase_tkwidgets.so.*
-
-%files devel
-%defattr(-, root, root, 0755)
-%{_includedir}/*
-%{_libdir}/libel_compile.so
-%{_libdir}/libel_interp.so
-%{_libdir}/libkbase.so
-%{_libdir}/libkbase_app.so
-%{_libdir}/libkbase_common.so
-%{_libdir}/libkbase_driver_xbase.so
-%{_libdir}/libkbase_driver_xbase.la
-%{_libdir}/libkbase_kde.so
-%{_libdir}/libkbase_plugin_kde.so
-%{_libdir}/libkbase_tkwidgets.so
-%{_libdir}/libkbase_wizard.so
-%{_libdir}/librekall.so
+%{_libdir}/librekallqt_common.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
+%{_libdir}/librekallqt_script_kjs.so
 
 %files docs
 %defattr(-, root, root, 0755)
-%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
+%doc AUTHORS README.FIRST Release.Notes
+%{_bindir}/rekallManual
+%{_bindir}/rekallqtManual
 %{_docdir}/%{name}-%{version}/*
+%{_datadir}/apps/rekallqt/manual/
 
 %files extra
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
-%{_libdir}/libkbase_plugin_extra.so
-%{_libdir}/libkbase_plugin_extra.la
+%{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
+%{_libdir}/librekallqt_plugin_extra.so
 
 %files mysql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
-%{_libdir}/libkbase_driver_mysql.so
-%{_libdir}/libkbase_driver_mysql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
+%{_libdir}/librekallqt_driver_mysql.so
 
 %files postgresql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
-%{_libdir}/libkbase_driver_pgsql.so
-%{_libdir}/libkbase_driver_pgsql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
+%{_libdir}/librekallqt_driver_pgsql.so
 
 %files python
 %defattr(-, root, root, 0755)
-%dir %{_datadir}/apps/rekall/stock/component/py
-%{_datadir}/apps/rekall/stock/component/py/*
-%dir %{_datadir}/apps/rekall/script/py
-%{_datadir}/apps/rekall/script/py/*
-%{_datadir}/apps/rekall/services/rekall_script_py.desktop
-%{_libdir}/libkbase_script_py.so
-%{_libdir}/libkbase_script_pysys.so
+%dir %{_datadir}/apps/rekallqt/stock/component/py
+%{_datadir}/apps/rekallqt/stock/component/py/*
+%dir %{_datadir}/apps/rekallqt/script/py
+%{_datadir}/apps/rekallqt/script/py/*
+%{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
+%{_libdir}/librekallqt_script_py.so
 
 %files runtime
 %defattr(-, root, root, 0755)
 %{_bindir}/rekallrt
-%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
-%{_datadir}/apps/rekall/services/rekallrt_form.desktop
-%{_datadir}/apps/rekall/services/rekallrt_query.desktop
-%{_datadir}/apps/rekall/services/rekallrt_report.desktop
-%{_datadir}/apps/rekall/services/rekallrt_table.desktop
-%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
-%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
-%{_datadir}/apps/rekallrt
+%{_bindir}/rekallqtrt
+%{_datadir}/apps/rekallqt/services/rekallrt_form.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_query.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_report.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_table.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_plugin_extra.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_script_py.desktop
+%{_datadir}/apps/rekallqtrt
 %{_datadir}/applications/fedora-rekallrt.desktop
 %{_datadir}/pixmaps/rekallrt.png
-%{_libdir}/libkbasert_plugin_extra.so
-%{_libdir}/libkbasert_script_py.so
-%{_libdir}/libkbasert_script_pysys.so
-%{_libdir}/libkbasert.so*
-%{_libdir}/libkbasert_app.so*
-%{_libdir}/libkbasert_formview.so
-%{_libdir}/libkbasert_queryview.so
-%{_libdir}/libkbasert_reportview.so
-%{_libdir}/libkbasert_tableview.so
-%{_libdir}/libkbasert*.la
-%{_libdir}/librekallrt.so*
-%{_libdir}/librekallrt.la
+%{_libdir}/librekallqtrt_plugin_extra.so
+%{_libdir}/librekallqtrt_script_py.so
+%{_libdir}/librekallqtrt.so*
+%{_libdir}/librekallqtrt_app.so*
+%{_libdir}/librekallqtrt_formview.so
+%{_libdir}/librekallqtrt_queryview.so
+%{_libdir}/librekallqtrt_reportview.so
+%{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump to 2.4.0
+
 * Thu Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
 - FC-3 is held together with duct-tape
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2005 18:46:14 -0000	1.3
+++ sources	12 Jan 2006 06:17:01 -0000	1.4
@@ -1 +1 @@
-437b45a98884cd9e192ff8c0a5a7e286  rekall-2.2.4-2.tar.gz
+0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 06:17:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 12 Jan 2006 01:17:08 -0500
Subject: rpms/rekall/FC-4 rekall-2.4.0-64bitfix.patch, NONE,
	1.1 rekall-2.4.0-gcc4.patch, NONE,
	1.1 rekall-2.4.0-noldconfig.patch, NONE,
	1.1 rekall-2.4.0-qtfix.patch, NONE, 1.1 rekall.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200601120617.k0C6HeDZ002026@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931/FC-4

Modified Files:
	rekall.spec sources 
Added Files:
	rekall-2.4.0-64bitfix.patch rekall-2.4.0-gcc4.patch 
	rekall-2.4.0-noldconfig.patch rekall-2.4.0-qtfix.patch 
Log Message:

Painful bump to 2.4.0. Like giving birth to a whale.


rekall-2.4.0-64bitfix.patch:

--- NEW FILE rekall-2.4.0-64bitfix.patch ---
--- rekall-2.2.3/libs/el32/hash.cpp.BAD	2005-09-22 13:34:45.000000000 -0500
+++ rekall-2.2.3/libs/el32/hash.cpp	2005-09-22 13:34:53.000000000 -0500
@@ -141,7 +141,7 @@
 			/* otherwise use just the tag (pretty useless	*/
 			/* but so what, not a common case).		*/
 			if ((key.tag->flags & TF_SHARED) == 0)
-				hval	= (int)key.val.shared ;
+				hval	= (long)key.val.shared ;
 			else	hval	= key.tag->tag ;
 			break	;
 	}
--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD	2005-09-22 14:29:36.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_parse.cpp	2005-09-22 14:29:52.000000000 -0500
@@ -971,7 +971,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 
 		sep	= true	;
@@ -1025,7 +1025,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 	}
 
@@ -1043,7 +1043,7 @@
 				receiver,
 				SLOT (newNode(int)),
 				0,
-				(int)exItem
+				(long)exItem
 			)	;
 		)
 
--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD	2005-09-22 15:53:11.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_link.cpp	2005-09-22 15:53:53.000000000 -0500
@@ -849,21 +849,21 @@
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecTable
+		(long)&nodeSpecTable
 	)	;
 	lp->insertItem
 	(	TR("Query link"),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecQuery
+		(long)&nodeSpecQuery
 	)	;
 	lp->insertItem
 	(	TR("SQL link"  ),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecSQL
+		(long)&nodeSpecSQL
 	) 	;
 
 	popup->insertItem (TR("New &Link"), lp) ;
--- rekall-2.4.0/libs/kbase/kb_overridedlg.cpp.BAD	2006-01-10 10:37:02.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_overridedlg.cpp	2006-01-10 10:37:22.000000000 -0600
@@ -360,7 +360,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvOverride->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/libs/kbase/kb_configdlg.cpp.BAD	2006-01-10 10:37:46.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_configdlg.cpp	2006-01-10 10:37:59.000000000 -0600
@@ -312,7 +312,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/script/python/tkc_pydebugbase.cpp.BAD	2006-01-10 10:38:42.000000000 -0600
+++ rekall-2.4.0/script/python/tkc_pydebugbase.cpp	2006-01-10 10:39:07.000000000 -0600
@@ -553,7 +553,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if (findTracePoint (pyObj, lineNo) == 0)
 		{
-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
 			enable	() ;
 		}
@@ -576,7 +576,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
 		{
-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.remove (tp) ;
 			delete	tp ;
 			disable	() ;

rekall-2.4.0-gcc4.patch:

--- NEW FILE rekall-2.4.0-gcc4.patch ---
--- rekall-2.4.0/support/xbase/ntx.h.BAD	2006-01-10 11:27:56.000000000 -0600
+++ rekall-2.4.0/support/xbase/ntx.h	2006-01-10 11:28:06.000000000 -0600
@@ -218,7 +218,7 @@
    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
    xbShort  KeyExists( xbDouble );
 
-   xbShort xbNtx::AllocKeyBufs(void);
+   xbShort AllocKeyBufs(void);
 
    virtual void GetExpression(char *buf, int len);
 };

rekall-2.4.0-noldconfig.patch:

--- NEW FILE rekall-2.4.0-noldconfig.patch ---
--- rekall-2.4.0/scons/Makefile.BAD	2006-01-10 15:25:03.000000000 -0600
+++ rekall-2.4.0/scons/Makefile	2006-01-10 15:25:13.000000000 -0600
@@ -3,11 +3,9 @@
 
 install:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 inst:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 clean:
 		PYTHONPATH=scons/ scons -Q --clean

rekall-2.4.0-qtfix.patch:

--- NEW FILE rekall-2.4.0-qtfix.patch ---
--- rekall-2.4.0/parts/report/kb_reportviewer.h.BAD	2006-01-10 14:14:14.000000000 -0600
+++ rekall-2.4.0/parts/report/kb_reportviewer.h	2006-01-10 14:14:28.000000000 -0600
@@ -15,6 +15,7 @@
 
 #include	<qscrollview.h>
 #include	<qguardedptr.h>
+#include	<qcombobox.h>
 
 #include 	"kb_classes.h"
 #include	"kb_viewer.h"


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rekall.spec	6 Oct 2005 17:09:51 -0000	1.7
+++ rekall.spec	12 Jan 2006 06:17:07 -0000	1.8
@@ -1,20 +1,24 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.2.4
-Release:	8%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
-Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
-Patch0:		rekall-2.2.3-py24.patch
-Patch1:		rekall-2.2.3-norpath3.patch
-Patch2:		rekall-2.2.3-64bitfix.patch
+Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tar.gz
+Patch1:		rekall-2.4.0-64bitfix.patch
+Patch2:		rekall-2.4.0-gcc4.patch
+Patch3:		rekall-2.4.0-qtfix.patch
+Patch4:		rekall-2.4.0-noldconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
+BuildRequires:	python-devel, mysql-devel, postgresql-devel
 BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
+BuildRequires:  scons
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-devel = %{version}-%{release}
+Obsoletes:	rekall-devel
 
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
@@ -33,14 +37,6 @@
 This package contains a set of common libraries that both rekall and 
 rekall-runtime require to function.
 
-%package devel
-Summary: Rekall development libraries and headers
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Headers and libraries for compiling programs that use Rekall.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -101,40 +97,34 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
 export KDEDIR=%{_prefix}
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
+echo "prefix=%{_prefix}" >> scons/settings.qt3
+cp scons/settings.qt3 settings
+cp scons/Makefile .
 
-%configure				\
-	--with-qlib-loader		\
-	--with-gui=kde			\
-	--disable-rpath			\
-	--enable-docs=yes		\
-	--enable-odbc=yes		\
-	--enable-iodbc=yes		\
-	--enable-runtime=yes		\
-	--enable-debug=yes		\
-	--with-qt-dir=%{_libdir}/qt-3.3	\
-%ifarch x86_64 ia64 sparc64 ppc64 
-	--enable-libsuffix=64		\
-%endif
-	--with-sgml-prefix=%{_prefix}
-
-make %{?_smp_mflags}
+make config
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Normally, we'd nuke the .la files, but rekall actually seems to want them...
-# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
+install -m0644 kbase/rekallrt.desktop $RPM_BUILD_ROOT%{_datadir}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -155,13 +145,15 @@
   $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
 
 # No need to have this file twice.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE
-
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
 cd $RPM_BUILD_ROOT%{_datadir}
-ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
-cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
+cp apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_bindir}/rekallqt rekall
+ln -s %{_bindir}/rekallqtManual rekallManual
+ln -s %{_bindir}/rekallqtrt rekallrt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,136 +198,120 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root, 0755)
 %doc LICENSE
-%{_libdir}/libel_*.so.*
-%{_libdir}/libel_*.la
-%{_libdir}/libkbase.so.*
-%{_libdir}/libkbase.la
-%{_libdir}/libkbase_*.so.*
-%exclude %{_libdir}/libkbase_common.so.*
-%exclude %{_libdir}/libkbase_kde.so.*
-%exclude %{_libdir}/libkbase_tkwidgets.so.*
-%{_libdir}/libkbase_*.la
-%{_libdir}/librekall.so.*
-%{_libdir}/librekall.la
+%{_libdir}/librekallqt.so
 %{_bindir}/rekall
+%{_bindir}/rekallqt
 %{_datadir}/pixmaps/rekall.png
-%dir %{_datadir}/apps/rekall
-%{_datadir}/apps/rekall/dict/*
-%{_datadir}/apps/rekall/help/*
-%{_datadir}/apps/rekall/highlight/*
-%{_datadir}/apps/rekall/icons/*
-%{_datadir}/apps/rekall/keymap
-%{_datadir}/apps/rekall/pics/*
-%{_datadir}/apps/rekall/rekall.png
-%{_datadir}/apps/rekall/rekallui.*
-%{_datadir}/apps/rekall/services/kdeparts.lst
-%{_datadir}/apps/rekall/services/rekall_component.desktop
-%{_datadir}/apps/rekall/services/rekall_copier.desktop
-%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
-%{_datadir}/apps/rekall/services/rekall_dummy.desktop
-%{_datadir}/apps/rekall/services/rekall_editor.desktop
-%{_datadir}/apps/rekall/services/rekall_form.desktop
-%{_datadir}/apps/rekall/services/rekall_macro.desktop
-%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
-%{_datadir}/apps/rekall/services/rekall_query.desktop
-%{_datadir}/apps/rekall/services/rekall_report.desktop
-%{_datadir}/apps/rekall/services/rekall_table.desktop
-%{_datadir}/apps/rekall/wizards/*
+%dir %{_datadir}/apps/rekallqt
+%{_datadir}/apps/rekallqt/dict/
+%{_datadir}/apps/rekallqt/gui/
+%{_datadir}/apps/rekallqt/help/
+%{_datadir}/apps/rekallqt/highlights/
+%{_datadir}/apps/rekallqt/icons/
+%{_datadir}/apps/rekallqt/keymap*
+%{_datadir}/apps/rekallqt/pics/
+%{_datadir}/apps/rekallqt/rekall.png
+%{_datadir}/apps/rekallqt/rekall_lite.png
+%{_datadir}/apps/rekallqt/services/rekall_component.desktop
+%{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
+%{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
+%{_datadir}/apps/rekallqt/services/rekall_editor.desktop
+%{_datadir}/apps/rekallqt/services/rekall_form.desktop
+%{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_query.desktop
+%{_datadir}/apps/rekallqt/services/rekall_report.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs_client.desktop
+%{_datadir}/apps/rekallqt/services/rekall_table.desktop
+%{_datadir}/apps/rekallqt/script/
+%{_datadir}/apps/rekallqt/stock/
+%{_datadir}/apps/rekallqt/test/
+%{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
-%{_libdir}/libkbase_componentview.so
-%{_libdir}/libkbase_copierview.so
-%{_libdir}/libkbase_editor.so
-%{_libdir}/libkbase_formview.so
-%{_libdir}/libkbase_macroview.so
-%{_libdir}/libkbase_queryview.so
-%{_libdir}/libkbase_reportview.so
-%{_libdir}/libkbase_tableview.so
+%{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_componentview.so
+%{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_xbase.so
+%{_libdir}/librekallqt_editor.so
+%{_libdir}/librekallqt_el32.so
+%{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_macroview.so
+%{_libdir}/librekallqt_queryview.so
+%{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_xbase.so
+%{_libdir}/librekallqt_support_xbsql.so
+%{_libdir}/librekallqt_wizard.so
 
 %files common
 %defattr(-, root, root, 0755)
-%{_libdir}/libkbase_common.so.*
-%{_libdir}/libkbase_kde.so.*
-%{_libdir}/libkbase_tkwidgets.so.*
-
-%files devel
-%defattr(-, root, root, 0755)
-%{_includedir}/*
-%{_libdir}/libel_compile.so
-%{_libdir}/libel_interp.so
-%{_libdir}/libkbase.so
-%{_libdir}/libkbase_app.so
-%{_libdir}/libkbase_common.so
-%{_libdir}/libkbase_driver_xbase.so
-%{_libdir}/libkbase_driver_xbase.la
-%{_libdir}/libkbase_kde.so
-%{_libdir}/libkbase_plugin_kde.so
-%{_libdir}/libkbase_tkwidgets.so
-%{_libdir}/libkbase_wizard.so
-%{_libdir}/librekall.so
+%{_libdir}/librekallqt_common.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
+%{_libdir}/librekallqt_script_kjs.so
 
 %files docs
 %defattr(-, root, root, 0755)
-%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
+%doc AUTHORS README.FIRST Release.Notes
+%{_bindir}/rekallManual
+%{_bindir}/rekallqtManual
 %{_docdir}/%{name}-%{version}/*
+%{_datadir}/apps/rekallqt/manual/
 
 %files extra
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
-%{_libdir}/libkbase_plugin_extra.so
-%{_libdir}/libkbase_plugin_extra.la
+%{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
+%{_libdir}/librekallqt_plugin_extra.so
 
 %files mysql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
-%{_libdir}/libkbase_driver_mysql.so
-%{_libdir}/libkbase_driver_mysql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
+%{_libdir}/librekallqt_driver_mysql.so
 
 %files postgresql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
-%{_libdir}/libkbase_driver_pgsql.so
-%{_libdir}/libkbase_driver_pgsql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
+%{_libdir}/librekallqt_driver_pgsql.so
 
 %files python
 %defattr(-, root, root, 0755)
-%dir %{_datadir}/apps/rekall/stock/component/py
-%{_datadir}/apps/rekall/stock/component/py/*
-%dir %{_datadir}/apps/rekall/script/py
-%{_datadir}/apps/rekall/script/py/*
-%{_datadir}/apps/rekall/services/rekall_script_py.desktop
-%{_libdir}/libkbase_script_py.so
-%{_libdir}/libkbase_script_pysys.so
+%dir %{_datadir}/apps/rekallqt/stock/component/py
+%{_datadir}/apps/rekallqt/stock/component/py/*
+%dir %{_datadir}/apps/rekallqt/script/py
+%{_datadir}/apps/rekallqt/script/py/*
+%{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
+%{_libdir}/librekallqt_script_py.so
 
 %files runtime
 %defattr(-, root, root, 0755)
 %{_bindir}/rekallrt
-%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
-%{_datadir}/apps/rekall/services/rekallrt_form.desktop
-%{_datadir}/apps/rekall/services/rekallrt_query.desktop
-%{_datadir}/apps/rekall/services/rekallrt_report.desktop
-%{_datadir}/apps/rekall/services/rekallrt_table.desktop
-%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
-%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
-%{_datadir}/apps/rekallrt
+%{_bindir}/rekallqtrt
+%{_datadir}/apps/rekallqt/services/rekallrt_form.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_query.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_report.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_table.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_plugin_extra.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_script_py.desktop
+%{_datadir}/apps/rekallqtrt
 %{_datadir}/applications/fedora-rekallrt.desktop
 %{_datadir}/pixmaps/rekallrt.png
-%{_libdir}/libkbasert_plugin_extra.so
-%{_libdir}/libkbasert_script_py.so
-%{_libdir}/libkbasert_script_pysys.so
-%{_libdir}/libkbasert.so*
-%{_libdir}/libkbasert_app.so*
-%{_libdir}/libkbasert_formview.so
-%{_libdir}/libkbasert_queryview.so
-%{_libdir}/libkbasert_reportview.so
-%{_libdir}/libkbasert_tableview.so
-%{_libdir}/libkbasert*.la
-%{_libdir}/librekallrt.so*
-%{_libdir}/librekallrt.la
+%{_libdir}/librekallqtrt_plugin_extra.so
+%{_libdir}/librekallqtrt_script_py.so
+%{_libdir}/librekallqtrt.so*
+%{_libdir}/librekallqtrt_app.so*
+%{_libdir}/librekallqtrt_formview.so
+%{_libdir}/librekallqtrt_queryview.so
+%{_libdir}/librekallqtrt_reportview.so
+%{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump to 2.4.0
+
 * Thu Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
 - FC-3 is held together with duct-tape
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2005 18:46:15 -0000	1.3
+++ sources	12 Jan 2006 06:17:07 -0000	1.4
@@ -1 +1 @@
-437b45a98884cd9e192ff8c0a5a7e286  rekall-2.2.4-2.tar.gz
+0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 06:17:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 12 Jan 2006 01:17:14 -0500
Subject: rpms/rekall/devel rekall-2.4.0-64bitfix.patch, NONE,
	1.1 rekall-2.4.0-gcc4.patch, NONE,
	1.1 rekall-2.4.0-noldconfig.patch, NONE,
	1.1 rekall-2.4.0-qtfix.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rekall.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601120617.k0C6Hk0l002031@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931/devel

Modified Files:
	.cvsignore rekall.spec sources 
Added Files:
	rekall-2.4.0-64bitfix.patch rekall-2.4.0-gcc4.patch 
	rekall-2.4.0-noldconfig.patch rekall-2.4.0-qtfix.patch 
Log Message:

Painful bump to 2.4.0. Like giving birth to a whale.


rekall-2.4.0-64bitfix.patch:

--- NEW FILE rekall-2.4.0-64bitfix.patch ---
--- rekall-2.2.3/libs/el32/hash.cpp.BAD	2005-09-22 13:34:45.000000000 -0500
+++ rekall-2.2.3/libs/el32/hash.cpp	2005-09-22 13:34:53.000000000 -0500
@@ -141,7 +141,7 @@
 			/* otherwise use just the tag (pretty useless	*/
 			/* but so what, not a common case).		*/
 			if ((key.tag->flags & TF_SHARED) == 0)
-				hval	= (int)key.val.shared ;
+				hval	= (long)key.val.shared ;
 			else	hval	= key.tag->tag ;
 			break	;
 	}
--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD	2005-09-22 14:29:36.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_parse.cpp	2005-09-22 14:29:52.000000000 -0500
@@ -971,7 +971,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 
 		sep	= true	;
@@ -1025,7 +1025,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 	}
 
@@ -1043,7 +1043,7 @@
 				receiver,
 				SLOT (newNode(int)),
 				0,
-				(int)exItem
+				(long)exItem
 			)	;
 		)
 
--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD	2005-09-22 15:53:11.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_link.cpp	2005-09-22 15:53:53.000000000 -0500
@@ -849,21 +849,21 @@
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecTable
+		(long)&nodeSpecTable
 	)	;
 	lp->insertItem
 	(	TR("Query link"),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecQuery
+		(long)&nodeSpecQuery
 	)	;
 	lp->insertItem
 	(	TR("SQL link"  ),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecSQL
+		(long)&nodeSpecSQL
 	) 	;
 
 	popup->insertItem (TR("New &Link"), lp) ;
--- rekall-2.4.0/libs/kbase/kb_overridedlg.cpp.BAD	2006-01-10 10:37:02.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_overridedlg.cpp	2006-01-10 10:37:22.000000000 -0600
@@ -360,7 +360,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvOverride->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/libs/kbase/kb_configdlg.cpp.BAD	2006-01-10 10:37:46.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_configdlg.cpp	2006-01-10 10:37:59.000000000 -0600
@@ -312,7 +312,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/script/python/tkc_pydebugbase.cpp.BAD	2006-01-10 10:38:42.000000000 -0600
+++ rekall-2.4.0/script/python/tkc_pydebugbase.cpp	2006-01-10 10:39:07.000000000 -0600
@@ -553,7 +553,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if (findTracePoint (pyObj, lineNo) == 0)
 		{
-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
 			enable	() ;
 		}
@@ -576,7 +576,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
 		{
-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.remove (tp) ;
 			delete	tp ;
 			disable	() ;

rekall-2.4.0-gcc4.patch:

--- NEW FILE rekall-2.4.0-gcc4.patch ---
--- rekall-2.4.0/support/xbase/ntx.h.BAD	2006-01-10 11:27:56.000000000 -0600
+++ rekall-2.4.0/support/xbase/ntx.h	2006-01-10 11:28:06.000000000 -0600
@@ -218,7 +218,7 @@
    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
    xbShort  KeyExists( xbDouble );
 
-   xbShort xbNtx::AllocKeyBufs(void);
+   xbShort AllocKeyBufs(void);
 
    virtual void GetExpression(char *buf, int len);
 };

rekall-2.4.0-noldconfig.patch:

--- NEW FILE rekall-2.4.0-noldconfig.patch ---
--- rekall-2.4.0/scons/Makefile.BAD	2006-01-10 15:25:03.000000000 -0600
+++ rekall-2.4.0/scons/Makefile	2006-01-10 15:25:13.000000000 -0600
@@ -3,11 +3,9 @@
 
 install:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 inst:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 clean:
 		PYTHONPATH=scons/ scons -Q --clean

rekall-2.4.0-qtfix.patch:

--- NEW FILE rekall-2.4.0-qtfix.patch ---
--- rekall-2.4.0/parts/report/kb_reportviewer.h.BAD	2006-01-10 14:14:14.000000000 -0600
+++ rekall-2.4.0/parts/report/kb_reportviewer.h	2006-01-10 14:14:28.000000000 -0600
@@ -15,6 +15,7 @@
 
 #include	<qscrollview.h>
 #include	<qguardedptr.h>
+#include	<qcombobox.h>
 
 #include 	"kb_classes.h"
 #include	"kb_viewer.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Sep 2005 18:46:20 -0000	1.3
+++ .cvsignore	12 Jan 2006 06:17:13 -0000	1.4
@@ -1,2 +1,3 @@
 rekall-2.2.3-2.tar.gz
 rekall-2.2.4-2.tar.gz
+rekall-2.4.0.tar.gz


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rekall.spec	6 Oct 2005 17:09:52 -0000	1.7
+++ rekall.spec	12 Jan 2006 06:17:13 -0000	1.8
@@ -1,20 +1,24 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.2.4
-Release:	8%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
-Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
-Patch0:		rekall-2.2.3-py24.patch
-Patch1:		rekall-2.2.3-norpath3.patch
-Patch2:		rekall-2.2.3-64bitfix.patch
+Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tar.gz
+Patch1:		rekall-2.4.0-64bitfix.patch
+Patch2:		rekall-2.4.0-gcc4.patch
+Patch3:		rekall-2.4.0-qtfix.patch
+Patch4:		rekall-2.4.0-noldconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
+BuildRequires:	python-devel, mysql-devel, postgresql-devel
 BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
+BuildRequires:  scons
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-devel = %{version}-%{release}
+Obsoletes:	rekall-devel
 
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
@@ -33,14 +37,6 @@
 This package contains a set of common libraries that both rekall and 
 rekall-runtime require to function.
 
-%package devel
-Summary: Rekall development libraries and headers
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Headers and libraries for compiling programs that use Rekall.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -101,40 +97,34 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
 export KDEDIR=%{_prefix}
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
+echo "prefix=%{_prefix}" >> scons/settings.qt3
+cp scons/settings.qt3 settings
+cp scons/Makefile .
 
-%configure				\
-	--with-qlib-loader		\
-	--with-gui=kde			\
-	--disable-rpath			\
-	--enable-docs=yes		\
-	--enable-odbc=yes		\
-	--enable-iodbc=yes		\
-	--enable-runtime=yes		\
-	--enable-debug=yes		\
-	--with-qt-dir=%{_libdir}/qt-3.3	\
-%ifarch x86_64 ia64 sparc64 ppc64 
-	--enable-libsuffix=64		\
-%endif
-	--with-sgml-prefix=%{_prefix}
-
-make %{?_smp_mflags}
+make config
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Normally, we'd nuke the .la files, but rekall actually seems to want them...
-# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
+install -m0644 kbase/rekallrt.desktop $RPM_BUILD_ROOT%{_datadir}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -155,13 +145,15 @@
   $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
 
 # No need to have this file twice.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE
-
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
 cd $RPM_BUILD_ROOT%{_datadir}
-ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
-cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
+cp apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_bindir}/rekallqt rekall
+ln -s %{_bindir}/rekallqtManual rekallManual
+ln -s %{_bindir}/rekallqtrt rekallrt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,136 +198,120 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root, 0755)
 %doc LICENSE
-%{_libdir}/libel_*.so.*
-%{_libdir}/libel_*.la
-%{_libdir}/libkbase.so.*
-%{_libdir}/libkbase.la
-%{_libdir}/libkbase_*.so.*
-%exclude %{_libdir}/libkbase_common.so.*
-%exclude %{_libdir}/libkbase_kde.so.*
-%exclude %{_libdir}/libkbase_tkwidgets.so.*
-%{_libdir}/libkbase_*.la
-%{_libdir}/librekall.so.*
-%{_libdir}/librekall.la
+%{_libdir}/librekallqt.so
 %{_bindir}/rekall
+%{_bindir}/rekallqt
 %{_datadir}/pixmaps/rekall.png
-%dir %{_datadir}/apps/rekall
-%{_datadir}/apps/rekall/dict/*
-%{_datadir}/apps/rekall/help/*
-%{_datadir}/apps/rekall/highlight/*
-%{_datadir}/apps/rekall/icons/*
-%{_datadir}/apps/rekall/keymap
-%{_datadir}/apps/rekall/pics/*
-%{_datadir}/apps/rekall/rekall.png
-%{_datadir}/apps/rekall/rekallui.*
-%{_datadir}/apps/rekall/services/kdeparts.lst
-%{_datadir}/apps/rekall/services/rekall_component.desktop
-%{_datadir}/apps/rekall/services/rekall_copier.desktop
-%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
-%{_datadir}/apps/rekall/services/rekall_dummy.desktop
-%{_datadir}/apps/rekall/services/rekall_editor.desktop
-%{_datadir}/apps/rekall/services/rekall_form.desktop
-%{_datadir}/apps/rekall/services/rekall_macro.desktop
-%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
-%{_datadir}/apps/rekall/services/rekall_query.desktop
-%{_datadir}/apps/rekall/services/rekall_report.desktop
-%{_datadir}/apps/rekall/services/rekall_table.desktop
-%{_datadir}/apps/rekall/wizards/*
+%dir %{_datadir}/apps/rekallqt
+%{_datadir}/apps/rekallqt/dict/
+%{_datadir}/apps/rekallqt/gui/
+%{_datadir}/apps/rekallqt/help/
+%{_datadir}/apps/rekallqt/highlights/
+%{_datadir}/apps/rekallqt/icons/
+%{_datadir}/apps/rekallqt/keymap*
+%{_datadir}/apps/rekallqt/pics/
+%{_datadir}/apps/rekallqt/rekall.png
+%{_datadir}/apps/rekallqt/rekall_lite.png
+%{_datadir}/apps/rekallqt/services/rekall_component.desktop
+%{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
+%{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
+%{_datadir}/apps/rekallqt/services/rekall_editor.desktop
+%{_datadir}/apps/rekallqt/services/rekall_form.desktop
+%{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_query.desktop
+%{_datadir}/apps/rekallqt/services/rekall_report.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs_client.desktop
+%{_datadir}/apps/rekallqt/services/rekall_table.desktop
+%{_datadir}/apps/rekallqt/script/
+%{_datadir}/apps/rekallqt/stock/
+%{_datadir}/apps/rekallqt/test/
+%{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
-%{_libdir}/libkbase_componentview.so
-%{_libdir}/libkbase_copierview.so
-%{_libdir}/libkbase_editor.so
-%{_libdir}/libkbase_formview.so
-%{_libdir}/libkbase_macroview.so
-%{_libdir}/libkbase_queryview.so
-%{_libdir}/libkbase_reportview.so
-%{_libdir}/libkbase_tableview.so
+%{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_componentview.so
+%{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_xbase.so
+%{_libdir}/librekallqt_editor.so
+%{_libdir}/librekallqt_el32.so
+%{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_macroview.so
+%{_libdir}/librekallqt_queryview.so
+%{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_xbase.so
+%{_libdir}/librekallqt_support_xbsql.so
+%{_libdir}/librekallqt_wizard.so
 
 %files common
 %defattr(-, root, root, 0755)
-%{_libdir}/libkbase_common.so.*
-%{_libdir}/libkbase_kde.so.*
-%{_libdir}/libkbase_tkwidgets.so.*
-
-%files devel
-%defattr(-, root, root, 0755)
-%{_includedir}/*
-%{_libdir}/libel_compile.so
-%{_libdir}/libel_interp.so
-%{_libdir}/libkbase.so
-%{_libdir}/libkbase_app.so
-%{_libdir}/libkbase_common.so
-%{_libdir}/libkbase_driver_xbase.so
-%{_libdir}/libkbase_driver_xbase.la
-%{_libdir}/libkbase_kde.so
-%{_libdir}/libkbase_plugin_kde.so
-%{_libdir}/libkbase_tkwidgets.so
-%{_libdir}/libkbase_wizard.so
-%{_libdir}/librekall.so
+%{_libdir}/librekallqt_common.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
+%{_libdir}/librekallqt_script_kjs.so
 
 %files docs
 %defattr(-, root, root, 0755)
-%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
+%doc AUTHORS README.FIRST Release.Notes
+%{_bindir}/rekallManual
+%{_bindir}/rekallqtManual
 %{_docdir}/%{name}-%{version}/*
+%{_datadir}/apps/rekallqt/manual/
 
 %files extra
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
-%{_libdir}/libkbase_plugin_extra.so
-%{_libdir}/libkbase_plugin_extra.la
+%{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
+%{_libdir}/librekallqt_plugin_extra.so
 
 %files mysql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
-%{_libdir}/libkbase_driver_mysql.so
-%{_libdir}/libkbase_driver_mysql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
+%{_libdir}/librekallqt_driver_mysql.so
 
 %files postgresql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
-%{_libdir}/libkbase_driver_pgsql.so
-%{_libdir}/libkbase_driver_pgsql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
+%{_libdir}/librekallqt_driver_pgsql.so
 
 %files python
 %defattr(-, root, root, 0755)
-%dir %{_datadir}/apps/rekall/stock/component/py
-%{_datadir}/apps/rekall/stock/component/py/*
-%dir %{_datadir}/apps/rekall/script/py
-%{_datadir}/apps/rekall/script/py/*
-%{_datadir}/apps/rekall/services/rekall_script_py.desktop
-%{_libdir}/libkbase_script_py.so
-%{_libdir}/libkbase_script_pysys.so
+%dir %{_datadir}/apps/rekallqt/stock/component/py
+%{_datadir}/apps/rekallqt/stock/component/py/*
+%dir %{_datadir}/apps/rekallqt/script/py
+%{_datadir}/apps/rekallqt/script/py/*
+%{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
+%{_libdir}/librekallqt_script_py.so
 
 %files runtime
 %defattr(-, root, root, 0755)
 %{_bindir}/rekallrt
-%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
-%{_datadir}/apps/rekall/services/rekallrt_form.desktop
-%{_datadir}/apps/rekall/services/rekallrt_query.desktop
-%{_datadir}/apps/rekall/services/rekallrt_report.desktop
-%{_datadir}/apps/rekall/services/rekallrt_table.desktop
-%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
-%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
-%{_datadir}/apps/rekallrt
+%{_bindir}/rekallqtrt
+%{_datadir}/apps/rekallqt/services/rekallrt_form.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_query.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_report.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_table.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_plugin_extra.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_script_py.desktop
+%{_datadir}/apps/rekallqtrt
 %{_datadir}/applications/fedora-rekallrt.desktop
 %{_datadir}/pixmaps/rekallrt.png
-%{_libdir}/libkbasert_plugin_extra.so
-%{_libdir}/libkbasert_script_py.so
-%{_libdir}/libkbasert_script_pysys.so
-%{_libdir}/libkbasert.so*
-%{_libdir}/libkbasert_app.so*
-%{_libdir}/libkbasert_formview.so
-%{_libdir}/libkbasert_queryview.so
-%{_libdir}/libkbasert_reportview.so
-%{_libdir}/libkbasert_tableview.so
-%{_libdir}/libkbasert*.la
-%{_libdir}/librekallrt.so*
-%{_libdir}/librekallrt.la
+%{_libdir}/librekallqtrt_plugin_extra.so
+%{_libdir}/librekallqtrt_script_py.so
+%{_libdir}/librekallqtrt.so*
+%{_libdir}/librekallqtrt_app.so*
+%{_libdir}/librekallqtrt_formview.so
+%{_libdir}/librekallqtrt_queryview.so
+%{_libdir}/librekallqtrt_reportview.so
+%{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump to 2.4.0
+
 * Thu Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
 - FC-3 is held together with duct-tape
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2005 18:46:20 -0000	1.3
+++ sources	12 Jan 2006 06:17:13 -0000	1.4
@@ -1 +1 @@
-437b45a98884cd9e192ff8c0a5a7e286  rekall-2.2.4-2.tar.gz
+0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 07:59:33 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 02:59:33 -0500
Subject: rpms/kbibtex - New directory
Message-ID: <200601120759.k0C7xaYR004155@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4147/kbibtex

Log Message:
Directory /cvs/extras/rpms/kbibtex added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 07:59:39 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 02:59:39 -0500
Subject: rpms/kbibtex/devel - New directory
Message-ID: <200601120759.k0C7xfDx004170@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4147/kbibtex/devel

Log Message:
Directory /cvs/extras/rpms/kbibtex/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 08:00:12 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:00:12 -0500
Subject: rpms/kbibtex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601120800.k0C80Ehv004212@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4200

Added Files:
	Makefile import.log 
Log Message:
Setup of module kbibtex


--- NEW FILE Makefile ---
# Top level Makefile for module kbibtex
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 12 08:00:18 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:00:18 -0500
Subject: rpms/kbibtex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601120800.k0C80Knc004232@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4200/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kbibtex


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 12 08:02:56 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:02:56 -0500
Subject: rpms/kbibtex import.log,1.1,1.2
Message-ID: <200601120804.k0C84Nem005950@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5912

Modified Files:
	import.log 
Log Message:
auto-import kbibtex-0.1.3-3 on branch devel from kbibtex-0.1.3-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jan 2006 08:00:11 -0000	1.1
+++ import.log	12 Jan 2006 08:02:55 -0000	1.2
@@ -0,0 +1 @@
+kbibtex-0_1_3-3:HEAD:kbibtex-0.1.3-3.src.rpm:1137052951



From fedora-extras-commits at redhat.com  Thu Jan 12 08:03:21 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:03:21 -0500
Subject: rpms/kbibtex/devel kbibtex-qualifier.patch, NONE, 1.1 kbibtex.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601120804.k0C84NcF005951@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5912/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kbibtex-qualifier.patch kbibtex.spec 
Log Message:
auto-import kbibtex-0.1.3-3 on branch devel from kbibtex-0.1.3-3.src.rpm

kbibtex-qualifier.patch:

--- NEW FILE kbibtex-qualifier.patch ---
--- kbibtex-0.1.3/src/kbibtexlistview.h	2005-11-29 13:43:15.000000000 +0100
+++ kbibtex-0.1.3/src/kbibtexlistview.h.qualifier	2005-12-23 11:39:35.000000000 +0100
@@ -62,7 +62,7 @@
     //     BibTeX::BibTeXFile *selectedElements();
 
     void enabledActions();
-    bool KBibTeXListView::acceptDrag( QDropEvent *event ) const;
+    bool acceptDrag( QDropEvent *event ) const;
 
 public slots:
     void filterText( const QString&text );


--- NEW FILE kbibtex.spec ---
Name:		kbibtex
Version:	0.1.3
Release:	3%{?dist}
Summary:	A BibTeX editor for KDE  

Group:		Applications/Editors
License:	GPL
URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
Patch:		kbibtex-qualifier.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
#Requires:       
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils

%description
KBibTeX is a BibTeX editor for KDE

%prep
%setup -q
%patch -p1 -b .qualifier


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure --disable-rpath --disable-debug
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#
# Replace original .desktop files with proper ones
#
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
	--delete-original	\
	${RPM_BUILD_ROOT}%{_datadir}/services/kbibtex_part.desktop

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
	--delete-original \
	${RPM_BUILD_ROOT}%{_datadir}/applnk/Office/kbibtex.desktop

#
# Install the icons into the hicolor folder
#
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/128x128/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/128x128/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/128x128/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/16x16/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/16x16/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/16x16/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/22x22/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/22x22/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/22x22/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/32x32/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/32x32/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/48x48/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/48x48/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/64x64/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/64x64/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/64x64/apps/kbibtex.png

%post
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%postun
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO

%{_bindir}/kbibtex

%{_libdir}/kde3/libkbibtexpart.la
%{_libdir}/kde3/libkbibtexpart.so

%{_datadir}/apps/kbibtexpart/ 
%{_datadir}/apps/kbibtex/ 
%{_docdir}/HTML/en/kbibtex/ 
%{_datadir}/icons/hicolor/128x128/apps/kbibtex.png
%{_datadir}/icons/hicolor/16x16/apps/kbibtex.png
%{_datadir}/icons/hicolor/22x22/apps/kbibtex.png
%{_datadir}/icons/hicolor/32x32/apps/kbibtex.png
%{_datadir}/icons/hicolor/48x48/apps/kbibtex.png
%{_datadir}/icons/hicolor/64x64/apps/kbibtex.png

%{_mandir}/man1/kbibtex.1.gz

%{_datadir}/applications/fedora-kbibtex.desktop
%{_datadir}/applications/fedora-kbibtex_part.desktop

%changelog
* Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
- Patch to resolve an error when this package is compiled with gcc 4.1.0

* Tue Dec 13 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-2
- BUG 17556 - package review: fixed all problems

* Mon Dec 12 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-1
- Version 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2006 08:00:18 -0000	1.1
+++ .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
@@ -0,0 +1 @@
+kbibtex-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2006 08:00:18 -0000	1.1
+++ sources	12 Jan 2006 08:03:21 -0000	1.2
@@ -0,0 +1 @@
+ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 08:21:57 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:21:57 -0500
Subject: owners owners.list,1.524,1.525
Message-ID: <200601120822.k0C8MTpo006058@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5994/owners

Modified Files:
	owners.list 
Log Message:
Added ownership for kbibtex



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- owners.list	11 Jan 2006 22:57:30 -0000	1.524
+++ owners.list	12 Jan 2006 08:21:57 -0000	1.525
@@ -440,6 +440,7 @@
 Fedora Extras|kasablanca|Graphical FTP client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|
 Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 09:37:05 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:37:05 -0500
Subject: rpms/licq - New directory
Message-ID: <200601120937.k0C9b7aT008541@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8533/licq

Log Message:
Directory /cvs/extras/rpms/licq added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 09:37:11 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:37:11 -0500
Subject: rpms/licq/devel - New directory
Message-ID: <200601120937.k0C9bDAn008556@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8533/licq/devel

Log Message:
Directory /cvs/extras/rpms/licq/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 09:38:38 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:38:38 -0500
Subject: rpms/licq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601120938.k0C9cew0008590@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8578

Added Files:
	Makefile import.log 
Log Message:
Setup of module licq


--- NEW FILE Makefile ---
# Top level Makefile for module licq
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 12 09:38:44 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:38:44 -0500
Subject: rpms/licq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601120938.k0C9ckgY008610@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8578/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module licq


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 12 09:39:34 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:39:34 -0500
Subject: rpms/licq import.log,1.1,1.2
Message-ID: <200601120940.k0C9e6wt008684@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644

Modified Files:
	import.log 
Log Message:
auto-import licq-1.3.2-1 on branch devel from licq-1.3.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/licq/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jan 2006 09:38:38 -0000	1.1
+++ import.log	12 Jan 2006 09:39:34 -0000	1.2
@@ -0,0 +1 @@
+licq-1_3_2-1:HEAD:licq-1.3.2-1.src.rpm:1137080345



From fedora-extras-commits at redhat.com  Thu Jan 12 09:39:40 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:39:40 -0500
Subject: rpms/licq/devel licq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601120940.k0C9eCGm008688@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	licq.spec 
Log Message:
auto-import licq-1.3.2-1 on branch devel from licq-1.3.2-1.src.rpm


--- NEW FILE licq.spec ---
Name: licq
Version: 1.3.2
Release: 1
License: GPL
Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
URL: http://www.licq.org/
Summary: Licq - A graphical ICQ Client for Linux
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel
BuildRequires: gpgme-devel libgpg-error-devel 
BuildRequires: openssl-devel
BuildRequires: desktop-file-utils

%package kde
Summary: Licq plugin for KDE
Group: Applications/Internet
Requires: %name = %version-%release
BuildRequires: kdelibs-devel

%package osd
Summary: OSD (On Screen Display) plugin for Licq
Group: Applications/Internet
Requires: %name = %version-%release
BuildRequires: xosd-devel

%description
Licq is a ICQ Client for the common ICQ network. It provides a graphical
user interface based on QT and is enhanceable with many powerful plugins.
For more information visit Licq's Homepage http://www.licq.org

%description kde
This is the KDE based GUI plugin for Licq.
To run this plugin, you will have to
issue the command "licq -p kde-gui"

%description osd
This is a small plugin, which uses libxosd2 to
display new arriving messages as OSD (On Screen Display)
text on your desktop.

%prep
%setup -q
#remove cvs 
rm -rf `find . -name CVS`

%configure --enable-gpgme --enable-openssl
cd plugins
cp -r qt-gui kde-gui
cd kde-gui
%configure --with-kde
cd ../qt-gui
%configure
cd ../osd
%configure

%build
export OPT="$RPM_OPT_FLAGS"
make
cd plugins/kde-gui
make
cd ../qt-gui
make
#create Qt qm files
cd po
lrelease *.ts
cd ../../osd
make

%install
rm -rf $RPM_BUILD_ROOT
export DESTDIR="$RPM_BUILD_ROOT"
make install
cd plugins/qt-gui
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        share/licq.desktop
make install
%find_lang licq
cd ../kde-gui
make install
cd ../osd
make install
%find_lang licq_osd_plugin

#remove devel 
rm $RPM_BUILD_ROOT/%{_includedir}/licq/*
rm $RPM_BUILD_ROOT/%{_libdir}/licq/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%files -f plugins/qt-gui/licq.lang
%defattr(-,root,root)
%{_bindir}/licq
%{_bindir}/viewurl-lynx.sh
%{_bindir}/viewurl-mozilla.sh
%{_bindir}/viewurl-ncftp.sh
%{_bindir}/viewurl-netscape.sh
%{_bindir}/viewurl-opera.sh
%{_bindir}/viewurl-w3m.sh
%dir %{_libdir}/licq
%{_libdir}/licq/licq_qt-gui.so
%{_datadir}/licq
%lang(bg) %{_datadir}/licq/qt-gui/locale/bg_BG.qm
%lang(cs) %{_datadir}/licq/qt-gui/locale/cs_CZ.qm
%lang(cs) %{_datadir}/licq/qt-gui/locale/cs.qm
%lang(de) %{_datadir}/licq/qt-gui/locale/de.qm
%lang(es) %{_datadir}/licq/qt-gui/locale/es.qm
%lang(fi) %{_datadir}/licq/qt-gui/locale/fi.qm
%lang(fr) %{_datadir}/licq/qt-gui/locale/fr.qm
%lang(hu) %{_datadir}/licq/qt-gui/locale/hu_HU.qm
%lang(it) %{_datadir}/licq/qt-gui/locale/it.qm
%lang(ja) %{_datadir}/licq/qt-gui/locale/ja_JP.eucJP.qm
%lang(pl) %{_datadir}/licq/qt-gui/locale/pl.qm
%lang(pt) %{_datadir}/licq/qt-gui/locale/pt_BR.qm
%lang(pt) %{_datadir}/licq/qt-gui/locale/pt.qm
%lang(ru) %{_datadir}/licq/qt-gui/locale/ru.qm
%lang(sr) %{_datadir}/licq/qt-gui/locale/sr.qm
%lang(sv) %{_datadir}/licq/qt-gui/locale/sv.qm
%lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
%lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
%{_datadir}/applications/fedora-licq.desktop
%doc doc/ upgrade/ ChangeLog README* LICENSE

%files kde
%defattr(-,root,root)
%{_libdir}/licq/licq_kde-gui.so
%doc plugins/kde-gui/README.KDE

%files osd -f plugins/osd/licq_osd_plugin.lang
%defattr(-,root,root)
%{_libdir}/licq/licq_osd.so
%doc plugins/osd*/{AUTHORS,TODO,README,changelog}

%changelog
* Wed Nov 23 2005 Peter Vrabec <pvrabec at redhat.com> 1.3.2-1
- initial package 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2006 09:38:44 -0000	1.1
+++ .cvsignore	12 Jan 2006 09:39:40 -0000	1.2
@@ -0,0 +1 @@
+licq-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2006 09:38:44 -0000	1.1
+++ sources	12 Jan 2006 09:39:40 -0000	1.2
@@ -0,0 +1 @@
+0471bb8fed91eefb23dfe153c9a4a806  licq-1.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 10:00:03 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 05:00:03 -0500
Subject: owners owners.list,1.525,1.526
Message-ID: <200601121000.k0CA0Z4A008792@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8766

Modified Files:
	owners.list 
Log Message:
add licq



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- owners.list	12 Jan 2006 08:21:57 -0000	1.525
+++ owners.list	12 Jan 2006 10:00:02 -0000	1.526
@@ -1363,3 +1363,5 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
+



From fedora-extras-commits at redhat.com  Thu Jan 12 10:56:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 12 Jan 2006 05:56:33 -0500
Subject: fedora-security/audit fc4,1.125,1.126 fc5,1.35,1.36
Message-ID: <200601121056.k0CAuXp2010671@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10651

Modified Files:
	fc4 fc5 
Log Message:
Deal with poppler and kernel issues



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fc4	10 Jan 2006 15:35:28 -0000	1.125
+++ fc4	12 Jan 2006 10:56:26 -0000	1.126
@@ -1,11 +1,14 @@
-Up to date CVE as of CVE email 20060108
-Up to date FC4 as of 20060108
+Up to date CVE as of CVE email 20060111
+Up to date FC4 as of 20060111
 
 ** are items that need attention
 
 CVE-2006-0097 ignore (php) Windows only
+CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2006-0035 VULNERABLE (kernel)
+CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 verson (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
@@ -50,24 +53,24 @@
 CVE-2005-3631 version (udev)
 CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3628 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3627 backport (cups) [since FEDORA-2006-010]
-CVE-2005-3627 VULNERABLE (poppler) bz#176873
-CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
+CVE-2005-3626 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3626 backport (cups) [since FEDORA-2006-010]
-CVE-2005-3626 VULNERABLE (poppler) bz#176873
-CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
+CVE-2005-3625 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3625 backport (cups) [since FEDORA-2006-010]
-CVE-2005-3625 VULNERABLE (poppler) bz#176873
-CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
+CVE-2005-3624 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3624 VULNERABLE (poppler) bz#176873
+CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3624 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3623 backport (kernel, fixed 2.6.14.5) [since FEDORA-2006-013]
 CVE-2005-3582 version (ImageMagick) gentoo only
@@ -107,17 +110,17 @@
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3193 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3192 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3191 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fc5	10 Jan 2006 15:35:28 -0000	1.35
+++ fc5	12 Jan 2006 10:56:26 -0000	1.36
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060104
+Up to date CVE as of CVE email 20060111
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -13,8 +13,11 @@
 ** are items that need attention
 
 CVE-2006-0097 ignore (php) Windows only
+CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2006-0035 VULNERABLE (kernel)
+CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 VULNERABLE (kernel, fixed 2.6.15)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
@@ -58,26 +61,26 @@
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3628 VULNERABLE (xpdf)
-CVE-2005-3628 VULNERABLE (poppler)
+CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3628 VULNERABLE (kdegraphics)
 CVE-2005-3628 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (xpdf)
-CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3627 VULNERABLE (kdegraphics)
 CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (xpdf)
-CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3626 VULNERABLE (kdegraphics)
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (xpdf)
-CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3625 VULNERABLE (kdegraphics)
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3624 VULNERABLE (xpdf)
-CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3624 VULNERABLE (kdegraphics)
 CVE-2005-3624 VULNERABLE (cups)
 CVE-2005-3623 VULNERABLE (kernel, fixed 2.6.14.5)
@@ -117,15 +120,15 @@
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
 CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3192 VULNERABLE (kdegraphics)
 CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3186 backport (gdk-pixbuf)



From fedora-extras-commits at redhat.com  Thu Jan 12 11:46:27 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 12 Jan 2006 06:46:27 -0500
Subject: rpms/grace/FC-3 grace.spec,1.1,1.2
Message-ID: <200601121146.k0CBkxcf012455@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12438

Modified Files:
	grace.spec 
Log Message:
fix summary, fortran compiler and do not set env. variable


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/grace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grace.spec	9 Jan 2006 16:15:12 -0000	1.1
+++ grace.spec	12 Jan 2006 11:46:26 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           grace
 Version:        5.1.18
-Release:        7%{?dist}
-Summary:        Numerical Data Processing and Visualization Tool (grace)
+Release:        8%{?dist}
+Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
 # Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
@@ -9,8 +9,8 @@
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Source3:        %{name}.sh
-Source4:        %{name}.csh
+#Source3:        %{name}.sh
+#Source4:        %{name}.csh
 Source5:	cephes-license.email
 Source6:	LICENSE.cephes
 Patch:          %{name}-gracerc-no_auxiliary.diff
@@ -19,7 +19,7 @@
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel
-BuildRequires:  openmotif-devel, gcc-gfortran
+BuildRequires:  openmotif-devel, gcc-g77
 BuildRequires:  desktop-file-utils, font-utils
 Requires:	nedit
 Requires(post): chkfontpath
@@ -57,7 +57,6 @@
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
     --with-x \
-    --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
     --with-extra-ldpath=%{_libdir}/netcdf-3
     
@@ -78,8 +77,9 @@
     %{buildroot}%{_datadir}/pixmaps         \
     %{buildroot}%{_datadir}/applications    \
     %{buildroot}%{_mandir}/man1             \
-    %{buildroot}%{_sysconfdir}/profile.d    \
     %{buildroot}%{_sysconfdir}/%{name}
+#    %{buildroot}%{_sysconfdir}/profile.d    \
+
 ##
 # Let's have some sanity
 #
@@ -121,8 +121,8 @@
 ##
 # Profile scripts
 #
-install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
-install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
+#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
 
 
 %clean
@@ -142,7 +142,7 @@
 %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
-%{_sysconfdir}/profile.d/*
+#%{_sysconfdir}/profile.d/*
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -163,6 +163,11 @@
 
 
 %changelog
+* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.18-8
+- remove name from Summary
+- disable setting environment variable GRACE_HOME
+- use g77 as the fortran compiler
+
 * Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
 - put config files in /etc
 - licence is GPL and not BSD/GPL, as it is not dual licensed



From fedora-extras-commits at redhat.com  Thu Jan 12 12:30:59 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 12 Jan 2006 07:30:59 -0500
Subject: rpms/grace/FC-3 .cvsignore, 1.2, 1.3 grace.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601121231.k0CCVVbc014342@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14321

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
+++ .cvsignore	12 Jan 2006 12:30:59 -0000	1.3
@@ -1 +1 @@
-grace-5.1.18.tar.gz
+grace-5.1.19.tar.gz


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/grace.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grace.spec	12 Jan 2006 11:46:26 -0000	1.2
+++ grace.spec	12 Jan 2006 12:30:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           grace
-Version:        5.1.18
-Release:        8%{?dist}
+Version:        5.1.19
+Release:        1%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
+- new upstream version
+
 * Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.18-8
 - remove name from Summary
 - disable setting environment variable GRACE_HOME


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2006 16:15:12 -0000	1.2
+++ sources	12 Jan 2006 12:30:59 -0000	1.3
@@ -1 +1 @@
-9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz
+0745c262ba4d0d1d82fee5972065aefc  grace-5.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 12:38:15 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 12 Jan 2006 07:38:15 -0500
Subject: rpms/grace/FC-4 .cvsignore, 1.2, 1.3 grace.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601121238.k0CCclYJ014400@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14379

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
- new upstream version
- remove name from Summary
- disable setting environment variable GRACE_HOME



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
+++ .cvsignore	12 Jan 2006 12:38:15 -0000	1.3
@@ -1 +1 @@
-grace-5.1.18.tar.gz
+grace-5.1.19.tar.gz


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/grace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grace.spec	9 Jan 2006 16:15:12 -0000	1.1
+++ grace.spec	12 Jan 2006 12:38:15 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           grace
-Version:        5.1.18
-Release:        7%{?dist}
-Summary:        Numerical Data Processing and Visualization Tool (grace)
+Version:        5.1.19
+Release:        1%{?dist}
+Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
 # Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
@@ -9,8 +9,8 @@
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Source3:        %{name}.sh
-Source4:        %{name}.csh
+#Source3:        %{name}.sh
+#Source4:        %{name}.csh
 Source5:	cephes-license.email
 Source6:	LICENSE.cephes
 Patch:          %{name}-gracerc-no_auxiliary.diff
@@ -78,8 +78,9 @@
     %{buildroot}%{_datadir}/pixmaps         \
     %{buildroot}%{_datadir}/applications    \
     %{buildroot}%{_mandir}/man1             \
-    %{buildroot}%{_sysconfdir}/profile.d    \
     %{buildroot}%{_sysconfdir}/%{name}
+#    %{buildroot}%{_sysconfdir}/profile.d    \
+
 ##
 # Let's have some sanity
 #
@@ -121,8 +122,8 @@
 ##
 # Profile scripts
 #
-install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
-install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
+#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
 
 
 %clean
@@ -142,7 +143,7 @@
 %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
-%{_sysconfdir}/profile.d/*
+#%{_sysconfdir}/profile.d/*
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -163,6 +164,11 @@
 
 
 %changelog
+* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
+- new upstream version
+- remove name from Summary
+- disable setting environment variable GRACE_HOME
+
 * Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
 - put config files in /etc
 - licence is GPL and not BSD/GPL, as it is not dual licensed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2006 16:15:12 -0000	1.2
+++ sources	12 Jan 2006 12:38:15 -0000	1.3
@@ -1 +1 @@
-9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz
+0745c262ba4d0d1d82fee5972065aefc  grace-5.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 13:27:51 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 12 Jan 2006 08:27:51 -0500
Subject: owners owners.list,1.526,1.527
Message-ID: <200601121328.k0CDSOWK016390@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16371

Modified Files:
	owners.list 
Log Message:
Deji Akingunola takes over babobab from me; he maintains several other Extras Packages already


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- owners.list	12 Jan 2006 10:00:02 -0000	1.526
+++ owners.list	12 Jan 2006 13:27:51 -0000	1.527
@@ -56,7 +56,7 @@
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
-Fedora Extras|baobab|Graphical tool to analyse directory trees|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|basket|Notes taker for KDE|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 15:10:16 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 10:10:16 -0500
Subject: rpms/licq/devel licq-1.3.2-gcc-4_1-patch, NONE, 1.1 licq.spec, 1.1,
	1.2
Message-ID: <200601121510.k0CFAnEs020105@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087

Modified Files:
	licq.spec 
Added Files:
	licq-1.3.2-gcc-4_1-patch 
Log Message:
compile with gcc-4.1.0



--- NEW FILE licq-1.3.2-gcc-4_1-patch ---
--- licq-1.3.2/src/icqd.cpp.gcc-4_1	2005-09-09 18:16:24.000000000 +0200
+++ licq-1.3.2/src/icqd.cpp	2006-01-12 15:12:06.000000000 +0100
@@ -39,6 +39,7 @@
 #include "licq_packets.h"
 #include "licq_plugind.h"
 #include "licq_gpg.h"    // ##
+#include "licq_threads.h"
 #include "licq.h"
 #include "support.h"
 
--- licq-1.3.2/src/icqd-srv.cpp.gcc-4_1	2005-10-20 13:18:25.000000000 +0200
+++ licq-1.3.2/src/icqd-srv.cpp	2006-01-12 15:13:03.000000000 +0100
@@ -26,6 +26,7 @@
 #include "time-fix.h"
 
 #include "licq_icqd.h"
+#include "licq_threads.h"
 #include "licq_translate.h"
 #include "licq_packets.h"
 #include "licq_socket.h"
--- licq-1.3.2/include/licq_buffer.h.gcc-4_1	2006-01-12 15:07:18.000000000 +0100
+++ licq-1.3.2/include/licq_buffer.h	2006-01-12 15:07:45.000000000 +0100
@@ -62,7 +62,7 @@
 
    char *Pack(CBuffer *);
    char *Pack(const char *data, int size);
-   char *CBuffer::PackLNTS(const char *);
+   char *PackLNTS(const char *);
    char *PackString(const char *data, unsigned short max = 0);
    char *PackUnsignedShort(unsigned short data);
    char *PackUnsignedLong(unsigned long data);
--- licq-1.3.2/include/licq_threads.h.gcc-4_1	2006-01-12 15:09:47.000000000 +0100
+++ licq-1.3.2/include/licq_threads.h	2006-01-12 15:09:17.000000000 +0100
@@ -0,0 +1,14 @@
+
+#ifndef THREADS_H
+#define THREADS_H
+
+void *MonitorSockets_tep(void *p);
+void *Ping_tep(void *p);
+void *ProcessRunningEvent_Server_tep(void *p);
+void *ProcessRunningEvent_Client_tep(void *p);
+void *UpdateUsers_tep(void *p);
+void *Shutdown_tep(void *p);
+void *ReverseConnectToUser_tep(void *v);
+
+#endif
+


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- licq.spec	12 Jan 2006 09:39:40 -0000	1.1
+++ licq.spec	12 Jan 2006 15:10:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 1
+Release: 2
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -11,6 +11,7 @@
 BuildRequires: gpgme-devel libgpg-error-devel 
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
+Patch1: licq-1.3.2-gcc-4_1-patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -41,9 +42,11 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b gcc-4_1
 #remove cvs 
 rm -rf `find . -name CVS`
 
+%build
 %configure --enable-gpgme --enable-openssl
 cd plugins
 cp -r qt-gui kde-gui
@@ -54,8 +57,8 @@
 cd ../osd
 %configure
 
-%build
 export OPT="$RPM_OPT_FLAGS"
+cd ../..
 make
 cd plugins/kde-gui
 make
@@ -135,6 +138,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-2
+- compile with gcc-4.1.0
+
 * Wed Nov 23 2005 Peter Vrabec <pvrabec at redhat.com> 1.3.2-1
 - initial package 
 



From fedora-extras-commits at redhat.com  Thu Jan 12 15:34:54 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 12 Jan 2006 10:34:54 -0500
Subject: rpms/ipython/FC-3 .cvsignore, 1.4, 1.5 ipython.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200601121535.k0CFZQ4L020389@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331/FC-3

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to new upstream version 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 16:40:21 -0000	1.4
+++ .cvsignore	12 Jan 2006 15:34:54 -0000	1.5
@@ -1 +1 @@
-ipython-0.6.15.tar.gz
+ipython-0.7.0.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ipython.spec	13 Jun 2005 16:40:21 -0000	1.4
+++ ipython.spec	12 Jan 2006 15:34:54 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.6.15
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
+- Update to new upstream 0.7.0
+
 * Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> 0.6.15-1
 - Add dist tag
 - Update to new upstream (0.6.15)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2005 16:40:21 -0000	1.5
+++ sources	12 Jan 2006 15:34:54 -0000	1.6
@@ -1 +1 @@
-3b777c86f6afba52343ac9ec3ec3eef7  ipython-0.6.15.tar.gz
+3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 15:35:00 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 12 Jan 2006 10:35:00 -0500
Subject: rpms/ipython/FC-4 .cvsignore, 1.5, 1.6 ipython.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601121535.k0CFZW5R020394@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331/FC-4

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to new upstream version 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2005 16:40:03 -0000	1.5
+++ .cvsignore	12 Jan 2006 15:35:00 -0000	1.6
@@ -1 +1 @@
-ipython-0.6.15.tar.gz
+ipython-0.7.0.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/ipython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ipython.spec	13 Jun 2005 16:40:03 -0000	1.6
+++ ipython.spec	12 Jan 2006 15:35:00 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.6.15
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
+- Update to new upstream 0.7.0
+
 * Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> 0.6.15-1
 - Add dist tag
 - Update to new upstream (0.6.15)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2005 16:40:03 -0000	1.5
+++ sources	12 Jan 2006 15:35:00 -0000	1.6
@@ -1 +1 @@
-3b777c86f6afba52343ac9ec3ec3eef7  ipython-0.6.15.tar.gz
+3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 15:35:17 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 12 Jan 2006 10:35:17 -0500
Subject: rpms/ipython/devel .cvsignore, 1.5, 1.6 ipython.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601121535.k0CFZnm1020401@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331/devel

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to new upstream version 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2005 16:39:20 -0000	1.5
+++ .cvsignore	12 Jan 2006 15:35:16 -0000	1.6
@@ -1 +1 @@
-ipython-0.6.15.tar.gz
+ipython-0.7.0.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ipython.spec	13 Jun 2005 16:39:20 -0000	1.6
+++ ipython.spec	12 Jan 2006 15:35:16 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.6.15
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
+- Update to new upstream 0.7.0
+
 * Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> 0.6.15-1
 - Add dist tag
 - Update to new upstream (0.6.15)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2005 16:39:20 -0000	1.5
+++ sources	12 Jan 2006 15:35:16 -0000	1.6
@@ -1 +1 @@
-3b777c86f6afba52343ac9ec3ec3eef7  ipython-0.6.15.tar.gz
+3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 15:39:28 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 10:39:28 -0500
Subject: rpms/licq/devel licq.spec,1.2,1.3
Message-ID: <200601121540.k0CFe13a020563@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540

Modified Files:
	licq.spec 
Log Message:
remove devel stuff with rm -rf



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- licq.spec	12 Jan 2006 15:10:14 -0000	1.2
+++ licq.spec	12 Jan 2006 15:39:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 2
+Release: 3
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -88,8 +88,8 @@
 %find_lang licq_osd_plugin
 
 #remove devel 
-rm $RPM_BUILD_ROOT/%{_includedir}/licq/*
-rm $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +138,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-3
+- remove devel stuff with rm -rf
+
 * Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-2
 - compile with gcc-4.1.0
 



From fedora-extras-commits at redhat.com  Thu Jan 12 15:53:42 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 12 Jan 2006 10:53:42 -0500
Subject: rpms/xmldiff/FC-4 xmldiff.spec,1.1,1.2
Message-ID: <200601121554.k0CFsF8K020758@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20726/FC-4

Modified Files:
	xmldiff.spec 
Log Message:
Fix spec file, missed a line in bug comments


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmldiff.spec	11 Jan 2006 22:57:18 -0000	1.1
+++ xmldiff.spec	12 Jan 2006 15:53:42 -0000	1.2
@@ -19,6 +19,7 @@
 BuildRequires:	python-logilab-common
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   docbook-style-xsl
+Requires:   file
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
@@ -81,7 +82,8 @@
 
 
 %changelog
-* Wed Jan 11 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+* Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+- Add Requires: file
 - xmlrev: use proper XSL location
 
 * Tue Jan 10 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-4



From fedora-extras-commits at redhat.com  Thu Jan 12 15:53:48 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 12 Jan 2006 10:53:48 -0500
Subject: rpms/xmldiff/devel xmldiff.spec,1.1,1.2
Message-ID: <200601121554.k0CFsLH1020761@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20726/devel

Modified Files:
	xmldiff.spec 
Log Message:
Fix spec file, missed a line in bug comments


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmldiff.spec	11 Jan 2006 22:57:18 -0000	1.1
+++ xmldiff.spec	12 Jan 2006 15:53:48 -0000	1.2
@@ -19,6 +19,7 @@
 BuildRequires:	python-logilab-common
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   docbook-style-xsl
+Requires:   file
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
@@ -81,7 +82,8 @@
 
 
 %changelog
-* Wed Jan 11 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+* Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+- Add Requires: file
 - xmlrev: use proper XSL location
 
 * Tue Jan 10 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-4



From fedora-extras-commits at redhat.com  Thu Jan 12 16:25:01 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:25:01 -0500
Subject: rpms/gazpacho/FC-4 .cvsignore, 1.8, 1.9 gazpacho.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <200601121625.k0CGPXdA022693@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22655/FC-4

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Jan 2006 19:00:40 -0000	1.8
+++ .cvsignore	12 Jan 2006 16:24:57 -0000	1.9
@@ -1,2 +1 @@
-gazpacho-0.6.3.tar.bz2
-gazpacho-0.6.1-nox.patch
+gazpacho-0.6.4.tar.bz2


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/gazpacho.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gazpacho.spec	5 Jan 2006 19:00:40 -0000	1.14
+++ gazpacho.spec	12 Jan 2006 16:24:57 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.3
+Version:        0.6.4
 Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.4-1
+- Version 0.6.4
+
 * Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
 - Version 0.6.3
 - .nox patch no longer needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jan 2006 19:00:40 -0000	1.8
+++ sources	12 Jan 2006 16:24:59 -0000	1.9
@@ -1 +1 @@
-12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2
+2c7f482ead7f7fb304d92262f686a124  gazpacho-0.6.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 16:25:07 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:25:07 -0500
Subject: rpms/gazpacho/devel .cvsignore, 1.9, 1.10 gazpacho.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200601121625.k0CGPdXV022698@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22655/devel

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 19:00:46 -0000	1.9
+++ .cvsignore	12 Jan 2006 16:25:06 -0000	1.10
@@ -1,2 +1 @@
-gazpacho-0.6.3.tar.bz2
-gazpacho-0.6.1-nox.patch
+gazpacho-0.6.4.tar.bz2


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gazpacho.spec	5 Jan 2006 19:00:46 -0000	1.15
+++ gazpacho.spec	12 Jan 2006 16:25:07 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.3
+Version:        0.6.4
 Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.4-1
+- Version 0.6.4
+
 * Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
 - Version 0.6.3
 - .nox patch no longer needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 19:00:46 -0000	1.9
+++ sources	12 Jan 2006 16:25:07 -0000	1.10
@@ -1 +1 @@
-12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2
+2c7f482ead7f7fb304d92262f686a124  gazpacho-0.6.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 16:44:22 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 12 Jan 2006 11:44:22 -0500
Subject: fedora-security/audit fc4,1.126,1.127 fc5,1.36,1.37
Message-ID: <200601121644.k0CGiM10022863@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22843

Modified Files:
	fc4 fc5 
Log Message:
kernel issues and tetex



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fc4	12 Jan 2006 10:56:26 -0000	1.126
+++ fc4	12 Jan 2006 16:44:15 -0000	1.127
@@ -7,6 +7,8 @@
 CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
+CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
 CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
@@ -57,18 +59,22 @@
 CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3627 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3627 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3627 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3626 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3626 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3626 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3625 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3625 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3625 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3624 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3624 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3624 backport (cups) [since FEDORA-2006-010]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fc5	12 Jan 2006 10:56:26 -0000	1.36
+++ fc5	12 Jan 2006 16:44:15 -0000	1.37
@@ -16,6 +16,8 @@
 CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
+CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
 CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
@@ -61,25 +63,27 @@
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3628 VULNERABLE (xpdf)
+CVE-2005-3628 VULNERABLE (tetex)
 CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3628 VULNERABLE (kdegraphics)
 CVE-2005-3628 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 VULNERABLE (tetex)
 CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3627 VULNERABLE (kdegraphics)
 CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 VULNERABLE (tetex)
 CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3626 VULNERABLE (kdegraphics)
 CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 VULNERABLE (tetex)
 CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3625 VULNERABLE (kdegraphics)
 CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 VULNERABLE (tetex)
 CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3624 VULNERABLE (kdegraphics)
 CVE-2005-3624 VULNERABLE (cups)



From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:01 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:01 -0500
Subject: rpms/mysql-administrator - New directory
Message-ID: <200601121647.k0CGl3XA022926@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22918/mysql-administrator

Log Message:
Directory /cvs/extras/rpms/mysql-administrator added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:06 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:06 -0500
Subject: rpms/mysql-administrator/devel - New directory
Message-ID: <200601121647.k0CGl9Kh022941@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22918/mysql-administrator/devel

Log Message:
Directory /cvs/extras/rpms/mysql-administrator/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:24 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:24 -0500
Subject: rpms/mysql-administrator/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601121647.k0CGlQ5L022995@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22963/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mysql-administrator


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:18 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:18 -0500
Subject: rpms/mysql-administrator Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601121647.k0CGlKAv022975@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22963

Added Files:
	Makefile import.log 
Log Message:
Setup of module mysql-administrator


--- NEW FILE Makefile ---
# Top level Makefile for module mysql-administrator
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 12 16:51:23 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:51:23 -0500
Subject: rpms/mysql-administrator import.log,1.1,1.2
Message-ID: <200601121651.k0CGptWV023106@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23054

Modified Files:
	import.log 
Log Message:
auto-import mysql-administrator-1.1.5-3 on branch devel from mysql-administrator-1.1.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jan 2006 16:47:18 -0000	1.1
+++ import.log	12 Jan 2006 16:51:23 -0000	1.2
@@ -0,0 +1 @@
+mysql-administrator-1_1_5-3:HEAD:mysql-administrator-1.1.5-3.src.rpm:1137084685



From fedora-extras-commits at redhat.com  Thu Jan 12 16:51:29 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:51:29 -0500
Subject: rpms/mysql-administrator/devel
	mysql-administrator-1.1.5-gcc41.patch, 
	NONE, 1.1 mysql-administrator-1.1.5-shellbang.patch, NONE,
	1.1 mysql-administrator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601121652.k0CGq1iH023110@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23054/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mysql-administrator-1.1.5-gcc41.patch 
	mysql-administrator-1.1.5-shellbang.patch 
	mysql-administrator.spec 
Log Message:
auto-import mysql-administrator-1.1.5-3 on branch devel from mysql-administrator-1.1.5-3.src.rpm

mysql-administrator-1.1.5-gcc41.patch:

--- NEW FILE mysql-administrator-1.1.5-gcc41.patch ---
diff -Nur mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MACatalogsPanel.cc mysql-administrator-1.1.5/mysql-administrator/source/linux/MACatalogsPanel.cc
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MACatalogsPanel.cc	2005-12-06 22:08:02.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/MACatalogsPanel.cc	2006-01-07 23:43:32.000000000 -0600
@@ -67,7 +67,7 @@
     }
     
   protected:    
-    void CellRendererProgress::render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
+    void render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
                                               Gtk::Widget& widget,
                                               const Gdk::Rectangle& bg_area,
                                               const Gdk::Rectangle& cell_area,
diff -Nur mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MDataInterface.h mysql-administrator-1.1.5/mysql-administrator/source/linux/MDataInterface.h
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MDataInterface.h	2005-10-07 09:53:54.000000000 -0500
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/MDataInterface.h	2006-01-07 23:26:39.000000000 -0600
@@ -84,7 +84,7 @@
 
     MYX_SCHEMA_TABLE_STATUS *get_schema_table_status(const Glib::ustring &catalog_name,
                                                      const Glib::ustring &schema_name);
-    MYX_SCHEMA_ENTITY_STATUS *MDataInterface::get_schema_entity_status(
+    MYX_SCHEMA_ENTITY_STATUS *get_schema_entity_status(
                                                 const Glib::ustring &catalog_name,
                                                 const Glib::ustring &schema_name);
 
diff -Nur mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MCrontab.h mysql-administrator-1.1.5/mysql-gui-common/source/linux/MCrontab.h
--- mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MCrontab.h	2005-03-13 07:16:59.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-gui-common/source/linux/MCrontab.h	2006-01-07 23:21:17.000000000 -0600
@@ -41,7 +41,7 @@
   public:
     bool find_entry_by_comment(const std::string &comment, Entry &entry);
 
-    bool MCrontab::remove_entry_with_comment(const std::string &comment,
+    bool remove_entry_with_comment(const std::string &comment,
                                              const std::string &command="");
     
     void add_entry(Entry &entry, const std::string &comment);
diff -Nur mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MGPreferences.h mysql-administrator-1.1.5/mysql-gui-common/source/linux/MGPreferences.h
--- mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MGPreferences.h	2005-03-13 07:16:59.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-gui-common/source/linux/MGPreferences.h	2006-01-07 23:09:05.000000000 -0600
@@ -40,7 +40,7 @@
     virtual MYX_APPLICATION_OPTIONS *prepare_options()= 0;
 
     const char *find_value(MYX_OPTION_GROUP *group, const char *name);
-    std::list<const char *>MGOptions::find_values(MYX_OPTION_GROUP *group, const char *name);
+    std::list<const char *>find_values(MYX_OPTION_GROUP *group, const char *name);
 
     void add_group(MYX_APPLICATION_OPTIONS *options, const char *name,
                    const std::list<ValuePair> &values);

mysql-administrator-1.1.5-shellbang.patch:

--- NEW FILE mysql-administrator-1.1.5-shellbang.patch ---
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/mysql-administrator	2005-06-01 08:34:16.000000000 -0500
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/mysql-administrator	2006-01-11 16:55:53.000000000 -0600
@@ -1,3 +1,4 @@
+#!/bin/sh
 PRG="$0"
                                                                                                     
 # need this for relative symlinks


--- NEW FILE mysql-administrator.spec ---
Name:           mysql-administrator
Version:        1.1.5
Release:        3%{?dist}
Summary:        GUI to manage mysql Databases

Group:          Applications/Databases
License:        GPL
URL:            http://www.mysql.com/products/tools/administrator/index.html
Source0:        http://dev.mysql.com/get/Downloads/MySQLAdministrationSuite/mysql-administrator-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		mysql-administrator-1.1.5-gcc41.patch
Patch1:		mysql-administrator-1.1.5-shellbang.patch

BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils
Requires:       mysql >= 4.0, gtkmm24, mysql-gui-common

%description
MySQL Administrator enables developers and DBAs to easily perform 
all the command line operations visually including configuring servers,
administering users, and dynamically monitoring database health. Other 
common administrative tasks such as monitoring replication status, 
backup and restore, and viewing logs can also be performed through the 
MySQL Administrator graphical console.

%package     -n mysql-gui-common
Summary:        Common libraries and data shared among the MySQL GUI Suites
Group:          System Environment/Libraries

%description -n mysql-gui-common
This package contains several common libraries and data shared among the MySQL
GUI Suites in all platforms.



%prep
%setup -q
%if "%{?fedora}" > "4"
%patch0 -p1 -b .gcc41
%endif
%patch1 -p1 -b .shellbang

%build
pushd  mysql-gui-common
%configure
make %{?_smp_mflags}
popd


pushd mysql-administrator
%configure
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd mysql-gui-common
chmod 644 COPYING README
make install DESTDIR=$RPM_BUILD_ROOT
popd

pushd mysql-administrator
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
sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
sed -i 's/\r//' mysql-administrator/COPYING mysql-gui-common/COPYING mysql-gui-common/README

desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category SystemSetup \
  --add-category Application \
  --add-category X-Fedora \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop

%find_lang mysql-gui-common


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc mysql-administrator/COPYING 
%{_bindir}/mabackup
%{_bindir}/mysql-administrator
%{_bindir}/mysql-administrator-bin
%{_datadir}/applications/fedora-MySQLAdministrator.desktop
%{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
%dir %{_datadir}/mysql-gui/administrator
%{_datadir}/mysql-gui/administrator/*


%files -n mysql-gui-common -f mysql-gui-common.lang
%defattr(-,root,root,-)
%doc mysql-gui-common/COPYING mysql-gui-common/README
%dir %{_datadir}/mysql-gui
%{_datadir}/mysql-gui/common

%changelog
* Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-3
- apply gcc4.1 patch only on fc5 
* Wed Jan 11 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-2
- fix lang files and trailing /
* Sat Jan 07 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-1
- update to 1.1.5
* Fri Oct 28 2005 Dennis Gilmore <dennis at ausil.us> - 1.1.4-1
- update to 1.1.4  update build requires to gtkmm24-devel
* Wed Sep 28 2005 Dennis Gilmore <dennis at ausil.us> - 1.1.2-1
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2006 16:47:24 -0000	1.1
+++ .cvsignore	12 Jan 2006 16:51:29 -0000	1.2
@@ -0,0 +1 @@
+mysql-administrator-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2006 16:47:24 -0000	1.1
+++ sources	12 Jan 2006 16:51:29 -0000	1.2
@@ -0,0 +1 @@
+f50a3505d50e024e8a775c2cd4a2ecf6  mysql-administrator-1.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:52:29 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:52:29 -0500
Subject: rpms/pylint/FC-4 .cvsignore, 1.4, 1.5 pylint.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601121653.k0CGr2Zt023195@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pylint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23155/FC-4

Modified Files:
	.cvsignore pylint.spec sources 
Log Message:
Version 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pylint/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Nov 2005 01:51:38 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:52:29 -0000	1.5
@@ -1 +1 @@
-pylint-0.8.1.tar.gz
+pylint-0.9.0.tar.gz


Index: pylint.spec
===================================================================
RCS file: /cvs/extras/rpms/pylint/FC-4/pylint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pylint.spec	14 Nov 2005 01:51:38 -0000	1.4
+++ pylint.spec	12 Jan 2006 16:52:29 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pylint
-Version:        0.8.1
+Version:        0.9.0
 Release:        1%{?dist}
 Summary:        Analyzes Python code looking for bugs and signs of poor quality
 
@@ -59,7 +59,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/*.txt README ChangeLog TODO examples elisp
+%doc doc/*.txt README ChangeLog TODO examples elisp COPYING
 %dir %{_python_sitelib}/pylint
 %dir %{_python_sitelib}/pylint/checkers
 %dir %{_python_sitelib}/pylint/reporters
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.9.0-1
+- Version 0.9.0
+- Add COPYING to docs
+
 * Sun Nov 13 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.8.1-1
 - Version 0.8.1
 - Add dependency on python-astng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pylint/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2005 01:51:38 -0000	1.4
+++ sources	12 Jan 2006 16:52:29 -0000	1.5
@@ -1 +1 @@
-f04addb7496a2a3e26675d36026718d7  pylint-0.8.1.tar.gz
+c7d69b110be9e64bb4f3f9b7dcbbf98c  pylint-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:52:35 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:52:35 -0500
Subject: rpms/pylint/devel .cvsignore, 1.4, 1.5 pylint.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601121653.k0CGr7Di023202@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pylint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23155/devel

Modified Files:
	.cvsignore pylint.spec sources 
Log Message:
Version 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Nov 2005 01:54:19 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:52:35 -0000	1.5
@@ -1 +1 @@
-pylint-0.8.1.tar.gz
+pylint-0.9.0.tar.gz


Index: pylint.spec
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pylint.spec	14 Nov 2005 01:54:19 -0000	1.4
+++ pylint.spec	12 Jan 2006 16:52:35 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pylint
-Version:        0.8.1
+Version:        0.9.0
 Release:        1%{?dist}
 Summary:        Analyzes Python code looking for bugs and signs of poor quality
 
@@ -59,7 +59,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/*.txt README ChangeLog TODO examples elisp
+%doc doc/*.txt README ChangeLog TODO examples elisp COPYING
 %dir %{_python_sitelib}/pylint
 %dir %{_python_sitelib}/pylint/checkers
 %dir %{_python_sitelib}/pylint/reporters
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.9.0-1
+- Version 0.9.0
+- Add COPYING to docs
+
 * Sun Nov 13 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.8.1-1
 - Version 0.8.1
 - Add dependency on python-astng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2005 01:54:19 -0000	1.4
+++ sources	12 Jan 2006 16:52:35 -0000	1.5
@@ -1 +1 @@
-f04addb7496a2a3e26675d36026718d7  pylint-0.8.1.tar.gz
+c7d69b110be9e64bb4f3f9b7dcbbf98c  pylint-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:53:35 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:53:35 -0500
Subject: rpms/python-logilab-common/FC-4 .cvsignore, 1.4,
	1.5 python-logilab-common.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200601121654.k0CGs7hm023262@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-common/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23224/FC-4

Modified Files:
	.cvsignore python-logilab-common.spec sources 
Log Message:
Version 0.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 15:08:07 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:53:34 -0000	1.5
@@ -1 +1 @@
-common-0.12.0.tar.gz
+common-0.13.0.tar.gz


Index: python-logilab-common.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/python-logilab-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-logilab-common.spec	17 Nov 2005 15:08:08 -0000	1.3
+++ python-logilab-common.spec	12 Jan 2006 16:53:34 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-common
-Version:        0.12.0
+Version:        0.13.0
 Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
 
@@ -44,7 +44,6 @@
 %doc doc/* README ChangeLog
 %dir %{_python_sitelib}/logilab
 %dir %{_python_sitelib}/logilab/common
-%dir %{_python_sitelib}/logilab/common/astng
 %dir %{_python_sitelib}/logilab/common/ureports
 %{_python_sitelib}/logilab/*.py
 %{_python_sitelib}/logilab/common/*.py
@@ -56,6 +55,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.0-1
+- Version 0.13.0
+- astng no longer part of the package
+
 * Thu Nov 17 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.12.0-1
 - Version 0.12.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 15:08:08 -0000	1.4
+++ sources	12 Jan 2006 16:53:34 -0000	1.5
@@ -1 +1 @@
-97d263de68c2ee73cc123969a91f6e7e  common-0.12.0.tar.gz
+9b6500c2a23660edfabe65bf73137a51  common-0.13.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:53:41 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:53:41 -0500
Subject: rpms/python-logilab-common/devel .cvsignore, 1.4,
	1.5 python-logilab-common.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200601121654.k0CGsDD0023267@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23224/devel

Modified Files:
	.cvsignore python-logilab-common.spec sources 
Log Message:
Version 0.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 15:09:29 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:53:40 -0000	1.5
@@ -1 +1 @@
-common-0.12.0.tar.gz
+common-0.13.0.tar.gz


Index: python-logilab-common.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-logilab-common.spec	17 Nov 2005 15:09:29 -0000	1.3
+++ python-logilab-common.spec	12 Jan 2006 16:53:40 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-common
-Version:        0.12.0
+Version:        0.13.0
 Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
 
@@ -44,7 +44,6 @@
 %doc doc/* README ChangeLog
 %dir %{_python_sitelib}/logilab
 %dir %{_python_sitelib}/logilab/common
-%dir %{_python_sitelib}/logilab/common/astng
 %dir %{_python_sitelib}/logilab/common/ureports
 %{_python_sitelib}/logilab/*.py
 %{_python_sitelib}/logilab/common/*.py
@@ -56,6 +55,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.0-1
+- Version 0.13.0
+- astng no longer part of the package
+
 * Thu Nov 17 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.12.0-1
 - Version 0.12.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 15:09:29 -0000	1.4
+++ sources	12 Jan 2006 16:53:40 -0000	1.5
@@ -1 +1 @@
-97d263de68c2ee73cc123969a91f6e7e  common-0.12.0.tar.gz
+9b6500c2a23660edfabe65bf73137a51  common-0.13.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:55:35 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:55:35 -0500
Subject: rpms/python-astng/FC-4 .cvsignore, 1.3, 1.4 python-astng.spec, 1.4, 
	1.5 sources, 1.3, 1.4
Message-ID: <200601121656.k0CGu893023316@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-astng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278/FC-4

Modified Files:
	.cvsignore python-astng.spec sources 
Log Message:
Version 0.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-astng/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Nov 2005 20:53:43 -0000	1.3
+++ .cvsignore	12 Jan 2006 16:55:35 -0000	1.4
@@ -1,2 +1 @@
-astng-0.13.1.tar.gz
-astng-0.13.1-modname.patch
+astng-0.14.0.tar.gz


Index: python-astng.spec
===================================================================
RCS file: /cvs/extras/rpms/python-astng/FC-4/python-astng.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-astng.spec	16 Nov 2005 20:53:43 -0000	1.4
+++ python-astng.spec	12 Jan 2006 16:55:35 -0000	1.5
@@ -1,17 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-astng
-Version:        0.13.1
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        Python Abstract Syntax Tree New Generation
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.logilab.org/projects/astng/
 Source0:        ftp://ftp.logilab.org/pub/astng/astng-%{version}.tar.gz
-                # This should be upstream in the CVS version,
-                # but without this fix pylint is pretty much unusable.
-Patch0:         astng-0.13.1-modname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,7 +25,6 @@
 
 %prep
 %setup -q -n astng-%{version}
-%patch0 -p0
 
 
 %build
@@ -57,6 +53,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.14.0-1
+- Version 0.14.0
+- Drop the modname patch
+
 * Tue Nov 15 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.1-2
 - Patch for the modname traceback
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-astng/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2005 20:53:43 -0000	1.3
+++ sources	12 Jan 2006 16:55:35 -0000	1.4
@@ -1,2 +1 @@
-57b899fb6caf7b88f33161b89ee1e6fa  astng-0.13.1.tar.gz
-ab22a610844f1c4a72ebb2c7d96ec15d  astng-0.13.1-modname.patch
+29fa137d44eeed6a69e2e3feb07cff0a  astng-0.14.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:55:41 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:55:41 -0500
Subject: rpms/python-astng/devel .cvsignore, 1.3, 1.4 python-astng.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601121656.k0CGuEqk023321@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-astng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278/devel

Modified Files:
	.cvsignore python-astng.spec sources 
Log Message:
Version 0.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-astng/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Nov 2005 20:51:24 -0000	1.3
+++ .cvsignore	12 Jan 2006 16:55:41 -0000	1.4
@@ -1,2 +1 @@
-astng-0.13.1.tar.gz
-astng-0.13.1-modname.patch
+astng-0.14.0.tar.gz


Index: python-astng.spec
===================================================================
RCS file: /cvs/extras/rpms/python-astng/devel/python-astng.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-astng.spec	16 Nov 2005 20:51:24 -0000	1.4
+++ python-astng.spec	12 Jan 2006 16:55:41 -0000	1.5
@@ -1,17 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-astng
-Version:        0.13.1
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        Python Abstract Syntax Tree New Generation
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.logilab.org/projects/astng/
 Source0:        ftp://ftp.logilab.org/pub/astng/astng-%{version}.tar.gz
-                # This should be upstream in the CVS version,
-                # but without this fix pylint is pretty much unusable.
-Patch0:         astng-0.13.1-modname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,7 +25,6 @@
 
 %prep
 %setup -q -n astng-%{version}
-%patch0 -p0
 
 
 %build
@@ -57,6 +53,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.14.0-1
+- Version 0.14.0
+- Drop the modname patch
+
 * Tue Nov 15 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.1-2
 - Patch for the modname traceback
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-astng/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2005 20:51:24 -0000	1.3
+++ sources	12 Jan 2006 16:55:41 -0000	1.4
@@ -1,2 +1 @@
-57b899fb6caf7b88f33161b89ee1e6fa  astng-0.13.1.tar.gz
-ab22a610844f1c4a72ebb2c7d96ec15d  astng-0.13.1-modname.patch
+29fa137d44eeed6a69e2e3feb07cff0a  astng-0.14.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 17:11:30 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 12:11:30 -0500
Subject: owners owners.list,1.527,1.528
Message-ID: <200601121712.k0CHC23h025301@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25255

Modified Files:
	owners.list 
Log Message:
added mysql-administrator



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- owners.list	12 Jan 2006 13:27:51 -0000	1.527
+++ owners.list	12 Jan 2006 17:11:29 -0000	1.528
@@ -631,6 +631,7 @@
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 17:36:55 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 12 Jan 2006 12:36:55 -0500
Subject: rpms/baobab/devel .cvsignore, 1.7, 1.8 baobab.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200601121737.k0CHbScE025804@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25725

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
- Take over packaging from Thorsten Leemhuis
- Update to 2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 15:29:45 -0000	1.7
+++ .cvsignore	12 Jan 2006 17:36:55 -0000	1.8
@@ -1 +1 @@
-baobab-2.3.0.tar.gz
+baobab-2.3.1.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- baobab.spec	6 Jan 2006 15:36:09 -0000	1.10
+++ baobab.spec	12 Jan 2006 17:36:55 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.3.0
-Release:        2%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -56,6 +56,10 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
+- Take over packaging from Thorsten Leemhuis
+- Update to 2.3.1
+
 * Fri Jan 06 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 15:29:45 -0000	1.7
+++ sources	12 Jan 2006 17:36:55 -0000	1.8
@@ -1 +1 @@
-b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz
+474f95940d90474b2bc15fa989f17393  baobab-2.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 17:39:44 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 12 Jan 2006 12:39:44 -0500
Subject: rpms/baobab/FC-4 .cvsignore, 1.7, 1.8 baobab.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200601121740.k0CHeGCm025890@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/baobab/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25864

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
- Take over packaging from Thorsten Leemhuis
- Update to 2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 15:29:39 -0000	1.7
+++ .cvsignore	12 Jan 2006 17:39:44 -0000	1.8
@@ -1 +1 @@
-baobab-2.3.0.tar.gz
+baobab-2.3.1.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- baobab.spec	1 Jan 2006 15:29:39 -0000	1.7
+++ baobab.spec	12 Jan 2006 17:39:44 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.3.0
+Version:        2.3.1
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -57,6 +57,10 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
+- Take over packaging from Thorsten Leemhuis
+- Update to 2.3.1
+
 * Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
 - Update to 2.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 15:29:39 -0000	1.7
+++ sources	12 Jan 2006 17:39:44 -0000	1.8
@@ -1 +1 @@
-b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz
+474f95940d90474b2bc15fa989f17393  baobab-2.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 18:10:23 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 12 Jan 2006 13:10:23 -0500
Subject: rpms/shorewall/devel .cvsignore, 1.10, 1.11 shorewall.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200601121810.k0CIAtQW027746@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27725

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Jan 2006 19:23:54 -0000	1.10
+++ .cvsignore	12 Jan 2006 18:10:23 -0000	1.11
@@ -1 +1 @@
-shorewall-3.0.3.tar.bz2
+shorewall-3.0.4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- shorewall.spec	3 Jan 2006 19:23:54 -0000	1.16
+++ shorewall.spec	12 Jan 2006 18:10:23 -0000	1.17
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -68,6 +68,7 @@
 %{_datadir}/shorewall/macro.*
 %{_datadir}/shorewall/rfc1918
 %{_datadir}/shorewall/version
+%{_datadir}/shorewall/Limit
 
 %attr(0754,root,root) %{_datadir}/shorewall/firewall
 %attr(0754,root,root) %{_datadir}/shorewall/functions
@@ -79,6 +80,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Thu Jan 12 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.4-1
+- Update to upstream 3.0.4
+
 * Tue Jan 03 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.3-1
 - Update to upstream 3.0.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Jan 2006 19:23:54 -0000	1.10
+++ sources	12 Jan 2006 18:10:23 -0000	1.11
@@ -1 +1 @@
-2f1ef054cf1c6dbfe0e15d982f90fe11  shorewall-3.0.3.tar.bz2
+2745e8e5c2143c3d9f5836b964c67721  shorewall-3.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 19:03:57 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 12 Jan 2006 14:03:57 -0500
Subject: rpms/psi/devel .cvsignore, 1.6, 1.7 psi.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <200601121904.k0CJ4Yuw029732@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29694/devel

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
- version 0.10 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Dec 2005 23:23:56 -0000	1.6
+++ .cvsignore	12 Jan 2006 19:03:55 -0000	1.7
@@ -1,5 +1,5 @@
+psi-0.10.tar.bz2
 emoticons-0.9.3.tar.gz
-psi-0.10-test3.tar.bz2
-psi-lang-packs-0.9.3.tar.gz
-rostericons-0.9.3.tar.gz
 systemicons-0.9.3.tar.gz
+rostericons-0.9.3.tar.gz
+psi-lang-packs-0.9.3.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- psi.spec	4 Dec 2005 23:23:56 -0000	1.13
+++ psi.spec	12 Jan 2006 19:03:56 -0000	1.14
@@ -3,13 +3,13 @@
 
 Name:       psi
 Version:    0.10
-Release:    0.2.test3%{?dist}
+Release:    1%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
 #Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
-Source0:    http://dl.sf.net/psi/psi-0.10-test3.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-0.10.tar.bz2
 Source2:    psi-uicwrapper.sh
 Patch1:     psi-0.9.2-strip.patch
 #Patch2:     psi-0.9.2-mach-build.patch
@@ -72,7 +72,7 @@
 
 
 %prep
-%setup -q -n psi-%{version}-test3
+%setup -q
 # (ugly) hack to enable debuginfo subrpm
 %patch1 -p1 -b .strip
 # needed to build with mach
@@ -89,7 +89,7 @@
 ./configure                        \
         --prefix=%{_prefix}        \
         --bindir=%{_bindir}        \
-        --libdir=%{_datadir}/%name \
+        --datadir=%{_datadir}      \
         --qtdir=$QTDIR
 
 # Fix build for FC1
@@ -165,6 +165,12 @@
 
 
 %changelog
+* Thu Jan 12 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-1
+- version 0.10 final
+
+* Tue Jan 03 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.3.test4
+- version 0.10 test4
+
 * Thu Nov 03 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test3
 - version 0.10 test3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Dec 2005 23:23:56 -0000	1.7
+++ sources	12 Jan 2006 19:03:56 -0000	1.8
@@ -1,5 +1,5 @@
+f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
 0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
-6de947394d0e6a34dbf73694476ab129  psi-0.10-test3.tar.bz2
-57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz
-79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
+79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
+57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 19:03:33 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 12 Jan 2006 14:03:33 -0500
Subject: rpms/psi/FC-4 .cvsignore, 1.5, 1.6 psi.spec, 1.12, 1.13 sources, 1.6,
	1.7
Message-ID: <200601121904.k0CJ4fPS029735@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29694/FC-4

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
- version 0.10 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Jan 2005 21:11:58 -0000	1.5
+++ .cvsignore	12 Jan 2006 19:03:32 -0000	1.6
@@ -1,19 +1,5 @@
-psi_ca.qm.bz2
-psi_cs.qm.bz2
-psi_el.qm.bz2
-psi_es.qm.bz2
-psi_it.qm.bz2
-psi_mk.qm.bz2
-psi_se.qm.bz2
-psi-0.9.3.tar.bz2
-psi_de.qm.bz2
-psi_ee.qm.bz2
-psi_et.qm.bz2
-psi_fi.qm.bz2
-psi_fr.qm.bz2
-psi_nl.qm.bz2
-psi_pl.qm.bz2
-psi_ru.qm.bz2
-psi_sk.qm.bz2
-psi_sw.qm.bz2
-psi_zh.qm.bz2
+psi-0.10.tar.bz2
+emoticons-0.9.3.tar.gz
+systemicons-0.9.3.tar.gz
+rostericons-0.9.3.tar.gz
+psi-lang-packs-0.9.3.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/psi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- psi.spec	1 Jun 2005 09:16:06 -0000	1.12
+++ psi.spec	12 Jan 2006 19:03:32 -0000	1.13
@@ -2,22 +2,21 @@
 %{!?_without_kde:%define with_kde 1}
 
 Name:       psi
-Version:    0.9.3
-Release:    4%{?dist}
-Summary:    Jabber client using Qt 3
+Version:    0.10
+Release:    1%{?dist}
+Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
-Source0:    http://dl.sf.net/psi/psi-0.9.3.tar.bz2
+#Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-0.10.tar.bz2
 Source2:    psi-uicwrapper.sh
 Patch1:     psi-0.9.2-strip.patch
-Patch2:     psi-0.9.2-mach-build.patch
-Patch3:     psi-0.9.3-gcc4.patch
+#Patch2:     psi-0.9.2-mach-build.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel >= 1:3.1.1
-BuildRequires:  XFree86-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  qca-devel
@@ -29,49 +28,13 @@
 Requires:    gnupg
 
 # Language packs
-Source50:    psi_pl.qm.bz2
-#Source51:    psi_sr.qm.bz2
-Source52:    psi_fr.qm.bz2
-#Source53:    psi_eo.qm.bz2
-#Source54:    psi_sr at Latn.qm.bz2
-Source55:    psi_fi.qm.bz2
-Source56:    psi_cs.qm.bz2
-Source57:    psi_ru.qm.bz2
-Source58:    psi_de.qm.bz2
-Source59:    psi_es.qm.bz2
-Source60:    psi_mk.qm.bz2
-Source61:    psi_nl.qm.bz2
-Source62:    psi_sk.qm.bz2
-Source63:    psi_el.qm.bz2
-Source64:    psi_it.qm.bz2
-Source65:    psi_se.qm.bz2
-Source66:    psi_ca.qm.bz2
-Source67:    psi_zh.qm.bz2
-Source68:    psi_sw.qm.bz2
-Source69:    psi_ee.qm.bz2
-Source70:    psi_et.qm.bz2
-
-# Emoticonsets
-Source100:   Chibi.jisp
-Source101:   KMess-Cartoon-1.0.jisp
-Source102:   shinyicons.jisp
-Source103:   yahoo_messenger.jisp
-Source104:   kreativ_squareheads.jisp
-Source105:   tlen.pl-3.73.jisp
-Source106:   apple_ichat-1.0.jisp
-Source107:   trill-extra-symbols.jisp
-Source108:   trill-extra-smileys.jisp
-Source109:   Ninja.jisp
-Source110:   webmessenger.jisp
-
-# Rostericonsets
-Source130:   weather.jisp
-Source131:   icqG.jisp
-Source132:   gaduGaduG.jisp
-Source133:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp
+Source10:   psi-lang-packs-0.9.3.tar.gz
+
+# Iconsets
+Source11:   emoticons-0.9.3.tar.gz
+Source12:   rostericons-0.9.3.tar.gz
+Source13:   systemicons-0.9.3.tar.gz
 
-# System iconsets
-Source160:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp
 
 
 %description
@@ -113,8 +76,7 @@
 # (ugly) hack to enable debuginfo subrpm
 %patch1 -p1 -b .strip
 # needed to build with mach
-%patch2 -p1 -b .mach-build
-%patch3 -p1 -b .gcc4
+#%patch2 -p1 -b .mach-build
 
 
 %build
@@ -127,16 +89,15 @@
 ./configure                        \
         --prefix=%{_prefix}        \
         --bindir=%{_bindir}        \
-        --libdir=%{_datadir}/%name \
+        --datadir=%{_datadir}      \
         --qtdir=$QTDIR
 
 # Fix build for FC1
-make qmake
-install -m 755 %{SOURCE2} src/uic-wrapper
-sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
+#make qmake
+#install -m 755 %{SOURCE2} src/uic-wrapper
+#sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
 
 make %{?_smp_mflags}
-#lrelease psi.pro
 
 
 %install
@@ -144,78 +105,52 @@
 
 export INSTALL_ROOT=$RPM_BUILD_ROOT
 make install
-#rm -f $RPM_BUILD_ROOT%{_datadir}/%name/{README,COPYING}
 cp -p libpsi/iconset/ICONSET-HOWTO $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/
 
 # Install language packs
-%__bzip2 -dck %{SOURCE50} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_pl.qm
-#%__bzip2 -dck %{SOURCE51} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr.qm
-%__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm
-#%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm
-#%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm
-%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm
-%__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm
-%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm
-%__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm
-%__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm
-%__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm
-%__bzip2 -dck %{SOURCE61} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_nl.qm
-%__bzip2 -dck %{SOURCE62} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sk.qm
-%__bzip2 -dck %{SOURCE63} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_el.qm
-%__bzip2 -dck %{SOURCE64} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_it.qm
-%__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm
-%__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm
-%__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm
-%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm
+tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
 
 ## Install iconsets
-install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE101} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE102} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE103} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE105} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE106} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE107} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE108} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE109} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-
-install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
+tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
-install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
 # Menu
-perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
+#perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
 desktop-file-install --vendor fedora \
-                     --dir $RPM_BUILD_ROOT%{_datadir}/applications\
-                     --add-category Application\
-                     --add-category X-Fedora\
-                     --add-category Network\
-                     --delete-original\
-                     $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
-
-# icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png
+       --dir $RPM_BUILD_ROOT%{_datadir}/applications\
+       --add-category Application\
+       --add-category X-Fedora\
+       --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
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(0644,root,root,0755)
+# Needed by psi for the help dialog
 #%doc README COPYING libpsi/iconset/ICONSET-HOWTO
 %attr(0755,root,root) %{_bindir}/psi
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
-%{_datadir}/pixmaps/%name.png
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
@@ -230,6 +165,24 @@
 
 
 %changelog
+* Thu Jan 12 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-1
+- version 0.10 final
+
+* Tue Jan 03 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.3.test4
+- version 0.10 test4
+
+* Thu Nov 03 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test3
+- version 0.10 test3
+
+* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test2
+- version 0.10 test2
+- drop patch 3 (applied upstream)
+- drop icon symlink (useless)
+
+* Thu Aug 25 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.1.test1
+- version 0.10 test1
+- spec cleanups
+
 * Wed Jun  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-4
 - patch it for 64-bit/GCC 4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jan 2005 05:27:23 -0000	1.6
+++ sources	12 Jan 2006 19:03:32 -0000	1.7
@@ -1,35 +1,5 @@
-1689645b1e2bf181c6fc2d68f070cf0d  psi_ca.qm.bz2
-69f88fc4768d963bed4cd3ebfbb75a28  psi_cs.qm.bz2
-da61ff1ec70cf90357d78f6c81d0ad86  psi_el.qm.bz2
-c831c0924c363e8bac42aab577f6982d  psi_es.qm.bz2
-022996fd1f35f26a777f07d667071421  psi_it.qm.bz2
-3e1ac01eaf5451f1b1d0968b2f911983  psi_mk.qm.bz2
-8cc619e6752d6c4db5093eca5d458f0a  psi_se.qm.bz2
-d20f3bb530235a246bc2d92308089744  psi-0.9.3.tar.bz2
-52611e036dd0b7cb2ecadcf16eeb9632  psi_de.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_ee.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_et.qm.bz2
-74053f86b57bd74be4b2866dd02b730d  psi_fi.qm.bz2
-dd8f83f3c3fc1c20d094f6570acaad4b  psi_fr.qm.bz2
-a0cc2e82074a2be17c5ad0004747ac43  psi_nl.qm.bz2
-d3418d4383e47f37f7fedbbc9591db6c  psi_pl.qm.bz2
-5e701ee8f56b01c65f3097f5ba13f63c  psi_ru.qm.bz2
-784e291e51e4746b602e182ab9ec3ac2  psi_sk.qm.bz2
-a5570c823cfbe33ee602110b89cf4e16  psi_sw.qm.bz2
-38629928c813dc54fc04b38de5e6dcee  psi_zh.qm.bz2
-259f0351152852d8091b092440557bab  apple_ichat-1.0.jisp
-6d98db4a5fab3c5909a422d983ed336f  Chibi.jisp
-14f8bdbea1873b2972d56726c4c011cf  crystal_roster.jisp
-ee56b25a85ec3ddef64339e177f7028d  crystal_system.jisp
-a4aada51bbf57c17c2bfda5ba52717ec  gaduGaduG.jisp
-9d8b4be36909c235657d61698846aee1  icqG.jisp
-459d5feae7cf05210f10ffd8df9ac93f  KMess-Cartoon-1.0.jisp
-f1760382d3aea32199aeb7303493a9ea  kreativ_squareheads.jisp
-cbe6f581bf32a2cb56e8bf5871db639d  Ninja.jisp
-9ec2c600f390dc725e4793383ff50ec2  shinyicons.jisp
-099c70f9ca25623c89e3ba5b44af2e6d  tlen.pl-3.73.jisp
-6a3065d33b072e15decbfb3673028df6  trill-extra-smileys.jisp
-b743f3f65dfe526b6d730044031d5c78  trill-extra-symbols.jisp
-be98902383c572fd3cd6876a6940a73e  weather.jisp
-0a2ce25ab4506d563bf65da372c9f8f4  webmessenger.jisp
-747a785fdaae8dc5a5ee78a3253035ab  yahoo_messenger.jisp
+f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
+0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
+a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
+79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
+57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 21:39:17 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 12 Jan 2006 16:39:17 -0500
Subject: extras-buildsys/server ArchJob.py,1.22,1.23
Message-ID: <200601122139.k0CLdHIE001347@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1326/server

Modified Files:
	ArchJob.py 
Log Message:
Ignore transient errors when trying to kill a job


Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ArchJob.py	26 Nov 2005 06:10:22 -0000	1.22
+++ ArchJob.py	12 Jan 2006 21:39:08 -0000	1.23
@@ -294,7 +294,10 @@
         user_requested = self._die_user_requested
         self._die_lock.release()
         if should_die:
-            self._server.die(self.jobid)
+            try:
+                self._server.die(self.jobid)
+            except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error):
+                pass
             if self._status == 'repo_wait':
                 self._repo.cancel_unlock_request(self)
             self._set_status('done')



From fedora-extras-commits at redhat.com  Fri Jan 13 00:14:53 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:14:53 -0500
Subject: rpms/z88dk - New directory
Message-ID: <200601130014.k0D0EtM0006987@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979/z88dk

Log Message:
Directory /cvs/extras/rpms/z88dk added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:15:00 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:15:00 -0500
Subject: rpms/z88dk/devel - New directory
Message-ID: <200601130015.k0D0FJ64007007@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979/z88dk/devel

Log Message:
Directory /cvs/extras/rpms/z88dk/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:15:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:15:56 -0500
Subject: rpms/z88dk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130015.k0D0FwFb007041@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7029

Added Files:
	Makefile import.log 
Log Message:
Setup of module z88dk


--- NEW FILE Makefile ---
# Top level Makefile for module z88dk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:16:02 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:16:02 -0500
Subject: rpms/z88dk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601130016.k0D0G4A6007061@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7029/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module z88dk


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:19:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:19:34 -0500
Subject: rpms/z88dk/devel z88dk.spec, NONE, 1.1 z88make.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601130020.k0D0K85M007153@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7109/devel

Modified Files:
	.cvsignore sources 
Added Files:
	z88dk.spec z88make.patch 
Log Message:
auto-import z88dk-1.6-7 on branch devel from z88dk-1.6-7.src.rpm


--- NEW FILE z88dk.spec ---
Summary: A Z80 cross compiler
Name: z88dk
Version: 1.6
Release: 7%{?dist}
License: Artistic
Group: Development/Tools
Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
Patch: z88make.patch
URL: http://z88dk.sourceforge.net/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
z88dk is a Z80 cross compiler capable of generating binary files for a variety
of Z80 based machines (such as the ZX81, Spectrum and Jupiter Ace).

%prep
%setup -q -n z88dk
%patch0 -p0 -b Makefile
/usr/bin/find . -depth -name CVS -type d -exec %{__rm} -rf {} \;
%{__mkdir} bin
# Separate manpages from other docs and fix their permissions
%{__mv} doc/netman .
%{__chmod} 644 netman/man3z/*
# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk
%{__sed} -i -e 's@[$][(]prefix[)]/lib/z88dk@$(datadir)/z88dk at g' \
	    -e 's@[$][{]prefix[}][$]/lib/z88dk@%{_datadir}/z88dk at g' Makefile
# Fix files with wrong line endings and bad permissions
/usr/bin/find doc examples src -type f -exec %{__sed} -i -e 's/\r*$//' {} \;
/usr/bin/find doc examples src -type f -exec %{__chmod} 644 {} \;

%build
export Z80_OZFILES=%{_builddir}/z88dk/lib/
export ZCCCFG=%{_builddir}/z88dk/lib/config/
export PATH=%{_builddir}/z88dk/bin:$PATH
export CC=gcc
export CFLAGS="%{optflags}"
ExcludeArch=x86_64
# Note: do not use %{?_smp_mflags} with make because the Makefiles don't support parallel builds
%{__make} clean
%{__make} -e
%{__make} -e libs

%install
export Z80_OZFILES=%{_datadir}/z88dk-%{version}/lib/
export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/
%{__rm} -rf %{buildroot}
%{makeinstall} install-libs
%{__mkdir_p} %{buildroot}%{_mandir}/man3z
%{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc doc/*.html doc/*.gif doc/copt.man
%doc doc/compile.txt doc/cpc.txt doc/embedded.txt doc/error.txt doc/farmods.txt
%doc doc/fileio.txt doc/lib3d.txt doc/options.txt doc/packages.txt
%doc doc/platforms.txt doc/retarget.txt doc/stdio.txt doc/ti.txt doc/z80asm.txt
%doc doc/zxscrdrv.txt
%doc EXTENSIONS LICENSE www
# Examples might be worth putting in subpackage
%doc examples
%{_bindir}/appmake
%{_bindir}/copt
%{_bindir}/sccz80
%{_bindir}/z80asm
%{_bindir}/zcc
%{_bindir}/zcpp
%{_datadir}/z88dk/
%{_mandir}/man3z/

%changelog
* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.6-7
- Add ExcludeArch for x86_64 machines

* Mon Oct 17 2005 Paul Howarth <paul at city-fan.org> - 1.6-6
- Use full URL for upstream tarball location
- Don't use macros in build-time command paths (see #170506 for discussion)
- Tarball expands to directory z88dk, not z88dk-%%{version}

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-5
- Modified the spec file to fix the rpmlint problems

* Wed Sep 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-4
- Add diff for makefile and patch aspect to spec
- rebuilt

* Wed Sep 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-3
- Fixed the spec file as it was constantly looking to /var/tmp!
- Fixed the source to point to /usr/share/z88dk for configs
- Removed `pwd` as it was causing problems

* Tue Sep 13 2005 Paul Howarth <paul at city-fan.org> - 1.6-2
- Use macros consistently
- Clean out buildroot in %%install rather than %%prep
- Include additional docs
- Tidy summary and description
- Honor %%{optflags}
- Remove CVS cruft
- Separate manpages from rest of docs
- Put target libraries, include files etc. under %%{_datadir}, not /usr/lib
- No scriptlets needed
- Fix file permissions and line endings
- Remove vendor and packager tags
- Use "Artistic" in license tag

* Tue Sep 13 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk>
- Fixes to spec file

* Mon Sep 12 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk>
- initial import and rpm builds

z88make.patch:

--- NEW FILE z88make.patch ---
--- Makefile	2004-10-08 10:47:51.000000000 +0100
+++ z88dk-1.6/Makefile	2005-09-14 17:00:23.000000000 +0100
@@ -7,7 +7,7 @@
 
 # ---> Configurable parameters are below his point
 
-prefix = /usr/local
+prefix = /usr
 
 # The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg
 DEFAULT = z88
@@ -50,7 +50,7 @@
 
 
 setup:
-	echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h
+	echo '#define PREFIX "${prefix}$"/share/z88dk"' > src/config.h
 	echo '#define UNIX 1' >> src/config.h
 
 appmake:
@@ -86,29 +86,28 @@
 	cd libsrc ; $(MAKE) install
 
 install-libs:
-	mkdir -p $(prefix)/lib/z88dk/lib/clibs
-	cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/
-	find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
+	mkdir -p $(prefix)/share/z88dk/lib/clibs
+	cp -R lib/clibs/* $(prefix)/share/z88dk/lib/clibs/
+	find $(prefix)/share/z88dk/lib/clibs -type f | xargs chmod 644
 
 
 install:
 	mkdir -p -m 755 $(prefix)/bin $(prefix)/lib 
-	mkdir -p -m 755 $(prefix)/lib/z88dk  $(prefix)/lib/z88dk/lib
-	mkdir -p -m 755 $(prefix)/lib/z88dk/lib/clibs  $(prefix)/lib/z88dk/lib/config
+	mkdir -p -m 755 $(prefix)/share/z88dk  $(prefix)/share/z88dk/lib
+	mkdir -p -m 755 $(prefix)/share/z88dk/lib/clibs  $(prefix)/share/z88dk/lib/config
 	cd src/appmake ; $(MAKE) PREFIX=$(prefix) install
 	cd src/copt ; $(MAKE) PREFIX=$(prefix) install
 	cd src/cpp ; $(MAKE) PREFIX=$(prefix) install
 	cd src/sccz80 ; $(MAKE) PREFIX=$(prefix) install
 	cd src/z80asm ; $(MAKE) PREFIX=$(prefix) install
 	cd src/zcc ; $(MAKE) PREFIX=$(prefix) install
-	./config.sh $(prefix)/lib/z88dk/ $(DEFAULT)
-	cp -R -p include $(prefix)/lib/z88dk
-	cp -R -p lib $(prefix)/lib/z88dk
-	find $(prefix)/lib/z88dk/include -name '*.h' | xargs chmod 644
-	find $(prefix)/lib/z88dk/include -type d | xargs chmod 755
-	find $(prefix)/lib/z88dk/lib -type f | xargs chmod 644
-	find $(prefix)/lib/z88dk/lib -type d | xargs chmod 755
-
+	./config.sh /usr/share/z88dk/ $(DEFAULT)
+	cp -R -p include $(prefix)/share/z88dk
+	cp -R -p lib $(prefix)/share/z88dk
+	find $(prefix)/share/z88dk/lib -type f | xargs chmod 644
+	find $(prefix)/share/z88dk/lib -type d | xargs chmod 755
+	find $(prefix)/share/z88dk/include -name '*.h' | xargs chmod 644
+	find $(prefix)/share/z88dk/include -type d | xargs chmod 755
 
 
 clean: clean-bins


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 00:16:02 -0000	1.1
+++ .cvsignore	13 Jan 2006 00:19:34 -0000	1.2
@@ -0,0 +1 @@
+z88dk-src-1.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 00:16:02 -0000	1.1
+++ sources	13 Jan 2006 00:19:34 -0000	1.2
@@ -0,0 +1 @@
+5fd75dea26da3c3d863b9e15f6524af9  z88dk-src-1.6.tgz



From fedora-extras-commits at redhat.com  Fri Jan 13 00:19:17 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:19:17 -0500
Subject: rpms/z88dk import.log,1.1,1.2
Message-ID: <200601130020.k0D0K8U3007155@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7109

Modified Files:
	import.log 
Log Message:
auto-import z88dk-1.6-7 on branch devel from z88dk-1.6-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/z88dk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 00:15:56 -0000	1.1
+++ import.log	13 Jan 2006 00:19:16 -0000	1.2
@@ -0,0 +1 @@
+z88dk-1_6-7:HEAD:z88dk-1.6-7.src.rpm:1137111538



From fedora-extras-commits at redhat.com  Fri Jan 13 00:49:44 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:49:44 -0500
Subject: rpms/fuse import.log,1.2,1.3
Message-ID: <200601130050.k0D0oG3T007473@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7434

Modified Files:
	import.log 
Log Message:
auto-import fuse-0.7.0-5 on branch devel from fuse-0.7.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Nov 2005 19:29:30 -0000	1.2
+++ import.log	13 Jan 2006 00:49:44 -0000	1.3
@@ -1 +1,2 @@
 fuse-2_4_2-1:HEAD:fuse-2.4.2-1.src.rpm:1132774168
+fuse-0_7_0-5:HEAD:fuse-0.7.0-5.src.rpm:1137113371



From fedora-extras-commits at redhat.com  Fri Jan 13 00:49:50 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:49:50 -0500
Subject: rpms/fuse/devel README.z88sdk, NONE, 1.1 fuse-emulator-0.7.0.spec, 
	NONE, 1.1 fuse-sound.patch, NONE, 1.1 fuse.png, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 fuse-README.fedora,
	1.1, NONE fuse-makedev.d-fuse, 1.1, NONE fuse-mount.fuse.patch,
	1.1, NONE fuse-udev.nodes, 1.1, NONE fuse-udev_rules.patch, 1.1,
	NONE fuse.spec, 1.2, NONE
Message-ID: <200601130050.k0D0oMQN007477@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.z88sdk fuse-emulator-0.7.0.spec fuse-sound.patch 
	fuse.png 
Removed Files:
	fuse-README.fedora fuse-makedev.d-fuse fuse-mount.fuse.patch 
	fuse-udev.nodes fuse-udev_rules.patch fuse.spec 
Log Message:
auto-import fuse-0.7.0-5 on branch devel from fuse-0.7.0-5.src.rpm


--- NEW FILE README.z88sdk ---
HOW TO USE THE Z88SDK WITH FUSE
-------------------------------

Using the Z88 SDK with fuse is a very simple operation. Grab a copy of the rpm, install and write your code, as you would, in C.

Next, compile and target the ZX Spectrum

zcc +zx <your-source>.c -o <output-name>.bin -lndos

Assuming all is well, your code will be generated. THIS IS NOT AN EXECUTABLE!

Load up Fuse. Click on File, move to "Open Binary Data". The usual filer window opens. Select the file you've just compiled and click "Open". The filer closes and you're presented with another window asking for a start address. You can enter any number from about 25000. For this explaination, I would use 32768. Click OK. Your .bin file is now in memory.

To run the code, press the following keys

T, ctrl + shift (the cursor turns to a white on black E), L 32768 return.

On screen you will see the words RANDOMISE USR 32768 before you press return. When you press return, the code will be executed.

That's about it!


--- NEW FILE fuse-emulator-0.7.0.spec ---
%define packagename fuse-emulator

Summary: The Free UNIX Spectrum Emulator
Name: fuse
Version: 0.7.0
Release: 5%{?dist}
License: GPL
Group: Applications/Emulators
Source: http://kent.dl.sourceforge.net/sourceforge/fuse-emulator/%{name}-%{version}.tar.gz
Source1: fuse.png
Source2: README.z88sdk
Patch: fuse-sound.patch
URL: http://fuse-emulator.sourceforge.net/
BuildRoot: %{_tmppath}/%{packagename}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdsk-devel
BuildRequires: lib765-devel
BuildRequires: gtk2-devel
BuildRequires: libxml2-devel
BuildRequires: libpng-devel
BuildRequires: libspectrum-devel
BuildRequires: bison
BuildRequires: flex

# The SRPM created from this spec file deliberately does not include the 
# ROMS required to run the emulator. For the location of the ROMS, see
# the ROMS readme file.

%description
Fuse is a spectrum emulator which emulates multiple models, including the 16K,
48K, 128K, +2, +2A, +3 and various clones.

%prep
rm -rf ${RPM_BUILD_ROOT}
%setup -q
%patch -p1 -b sound.c

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fuse
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps

install -m0644 man/fuse.1 ${RPM_BUILD_ROOT}%{_mandir}/man1

install -c fuse ${RPM_BUILD_ROOT}%{_bindir}/fuse
cp lib/*.z80 ${RPM_BUILD_ROOT}%{_datadir}/fuse/
cp lib/*.bmp ${RPM_BUILD_ROOT}%{_datadir}/fuse/
cp lib/*.scr ${RPM_BUILD_ROOT}%{_datadir}/fuse/
install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png 
cp %{SOURCE2} README.z88sdk

%clean
rm -rf ${RPM_BUILD_ROOT}

%post

%postun

%files
%defattr(-,root,root)
%{_mandir}/man1/fuse.1.gz
%{_bindir}/fuse
%{_datadir}/fuse/
%{_datadir}/pixmaps/%{name}.png
%doc AUTHORS ChangeLog COPYING README THANKS ROMS README.z88sdk

%changelog
* Wed Oct 26 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-5
- Altered package name to fuse-emulator (macro)
- Removed BR: zlib-devel and BR: glibc-devel and both Requires
- Included comment regarding the SRPM not containing the ROMS
- Added README.z88sdk file to the archive
- Made the source of the tarball a valid one!
- Removed a comma from after xml2-devel

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-4
- Minor alteration to spec file (Build require=perl gone)
- Addition of sound.c patch file

* Fri Sep 02 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-3.fc
- Removal of ROMS and addition to documentation of where to get ROMS

* Mon Aug 29 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-2.fc
- Fixes to both the source and spec for FC

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 0.7.0-2.iss
- Rebuild for newer version of lib765 (0.3.3)

* Mon Jul 16 2004 Ian Chapman <packages at amiga-hardware.com> - 0.7.0-1.iss
- Updated to version 0.7.0
- Updated for Fedora Core 2
- Added a graphic for the menu icon

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 0.6.1.1-2
- Minor fixes to changelog
- Improved use of macros
- Removed most explicit library dependancies
- Added menu icon

* Sun Nov 30 2003 Ian Chapman <packages at amiga-hardware.com> - 0.6.1.1-1
- Initial Release

fuse-sound.patch:

--- NEW FILE fuse-sound.patch ---
--- sound.c	2005-10-17 23:20:45.000000000 +0100
+++ fuse-0.7.0/sound.c	2005-08-20 23:46:32.000000000 +0100
@@ -58,8 +58,8 @@
 int sound_stereo_ay_abc=0;	/* (AY stereo) true for ABC stereo, else ACB */
 int sound_stereo_ay_narrow=0;	/* (AY stereo) true for narrow AY st. sep. */
 
-static int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
-static int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
+int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
+int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
 
 
 /* assume all three tone channels together match the beeper volume (ish).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Nov 2005 19:29:35 -0000	1.2
+++ .cvsignore	13 Jan 2006 00:49:50 -0000	1.3
@@ -1 +1 @@
-fuse-2.4.2.tar.gz
+fuse-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Nov 2005 19:29:35 -0000	1.2
+++ sources	13 Jan 2006 00:49:50 -0000	1.3
@@ -1 +1 @@
-6e3d9a580c45ddf4a06558c135c158c2  fuse-2.4.2.tar.gz
+ebb124e808e6467630efaae01fe03b64  fuse-0.7.0.tar.gz


--- fuse-README.fedora DELETED ---


--- fuse-makedev.d-fuse DELETED ---


--- fuse-mount.fuse.patch DELETED ---


--- fuse-udev.nodes DELETED ---


--- fuse-udev_rules.patch DELETED ---


--- fuse.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:10 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:10 -0500
Subject: rpms/lib765 - New directory
Message-ID: <200601130057.k0D0vCAH007632@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7624/lib765

Log Message:
Directory /cvs/extras/rpms/lib765 added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:16 -0500
Subject: rpms/lib765/devel - New directory
Message-ID: <200601130057.k0D0vIPH007647@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7624/lib765/devel

Log Message:
Directory /cvs/extras/rpms/lib765/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:45 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:45 -0500
Subject: rpms/lib765 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130057.k0D0vmCQ007681@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7669

Added Files:
	Makefile import.log 
Log Message:
Setup of module lib765


--- NEW FILE Makefile ---
# Top level Makefile for module lib765
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:51 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:51 -0500
Subject: rpms/lib765/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601130057.k0D0vtdN007703@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7669/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lib765


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:58:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:58:43 -0500
Subject: rpms/lib765 import.log,1.1,1.2
Message-ID: <200601130059.k0D0xFGi007771@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7737

Modified Files:
	import.log 
Log Message:
auto-import lib765-0.3.3-3 on branch devel from lib765-0.3.3-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lib765/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 00:57:45 -0000	1.1
+++ import.log	13 Jan 2006 00:58:43 -0000	1.2
@@ -0,0 +1 @@
+lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910



From fedora-extras-commits at redhat.com  Fri Jan 13 00:58:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:58:49 -0500
Subject: rpms/lib765/devel lib765.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601130059.k0D0xL8b007775@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7737/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lib765.spec 
Log Message:
auto-import lib765-0.3.3-3 on branch devel from lib765-0.3.3-3.src.rpm


--- NEW FILE lib765.spec ---
Summary: A library for emulating the uPD765a floppy controller
Name: lib765
Version: 0.3.3
Release: 3%{?dist}
License: LGPL
Group: System Environment/Libraries
Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz
URL: http://www.seasip.demon.co.uk/Unix/LibDsk/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdsk-devel

%description
A library for emulating the uPD765a floppy controller as found on the Spectrum
+3, Amstrad CPC and PCW.

%package devel
Summary: Development files for lib765.
Group: Development/Libraries
Requires: libdsk-devel

%description devel
Development files for lib765.

%prep
%setup -q

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%{_libdir}/lib765.so.*
%doc doc/765.txt doc/COPYING.LIB ChangeLog

%files devel
%defattr(-,root,root)
%{_libdir}/lib765.so
%{_includedir}/765.h
%exclude %{_libdir}/lib765.la

%changelog
* Mon Nov 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.3-3
- now uses %{?_smp_mflags} during the make process

* Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.3-2
- renamed spec file

* Fri Nov 11 2005 Paul Howarth <paul at city-fan.org> - 0.3.3-2
- Removed vendor and packager tags
- Use FE standard buildroot
- Unpack tarball quietly
- Remove BuildRoot in %%install rather than %%prep
- Use DESTDIR with make instead of %%makeinstall
- Don't build static lubs
- Add libdsk-devel dep for -devel subpackage

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.3.3-1.2
- Many alterations to bring the spec into line with the rules
- removed *.la files, changes to rpm name and changed to %configure

* Mon Jul 11 2005 Paul Johnson <paul at all-the-johnsons.co.uk> - 0.3.3-1.1.FC4
- Changed version for FC4

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 0.3.3-1.iss
- Changelog was duplicated in spec file, fixed.
- Updated to version 0.3.3

* Mon Jul 16 2004 Ian Chapman <packages at amiga-hardware.com> - 0.3.1.1-3.iss
- Updated to Fedora Core 2

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 0.3.1.1-2
- Minor changes to changelog
- Moved a file from the main package to the devel package
- Improved use of macros

* Sat Dec 01 2003 Ian Chapman <packages at amiga-hardware.com> - 0.3.1.1-1
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 00:57:51 -0000	1.1
+++ .cvsignore	13 Jan 2006 00:58:49 -0000	1.2
@@ -0,0 +1 @@
+lib765-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 00:57:51 -0000	1.1
+++ sources	13 Jan 2006 00:58:49 -0000	1.2
@@ -0,0 +1 @@
+831929572120af53781322e0456c708b  lib765-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 01:03:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:03:41 -0500
Subject: rpms/libdsk - New directory
Message-ID: <200601130103.k0D13hvx009582@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9574/libdsk

Log Message:
Directory /cvs/extras/rpms/libdsk added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:03:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:03:47 -0500
Subject: rpms/libdsk/devel - New directory
Message-ID: <200601130103.k0D13om6009597@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9574/libdsk/devel

Log Message:
Directory /cvs/extras/rpms/libdsk/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:05:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:05:19 -0500
Subject: rpms/libdsk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601130105.k0D15L9F009649@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9619/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libdsk


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:05:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:05:01 -0500
Subject: rpms/libdsk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130105.k0D15HLs009632@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9619

Added Files:
	Makefile import.log 
Log Message:
Setup of module libdsk


--- NEW FILE Makefile ---
# Top level Makefile for module libdsk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:08:46 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:08:46 -0500
Subject: rpms/libdsk/devel libdsk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601130109.k0D19Kcj009720@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9685/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libdsk.spec 
Log Message:
auto-import libdsk-1.1.6-1 on branch devel from libdsk-1.1.6-1.src.rpm


--- NEW FILE libdsk.spec ---
Summary: Library for accessing disk images
Name: libdsk
Version: 1.1.6
Release: 1%{?dist}
License: GPL
Group: System Environment/Libraries
Source: http://www.seasip.demon.co.uk/Unix/LibDsk/libdsk-%{version}.tar.gz
URL: http://www.seasip.demon.co.uk/Unix/LibDsk/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel, bzip2-devel

%description
A library for accessing disk images, particularly for use with emulators.

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

%description devel
Development files for libdsk.

%package tools
Summary: Tools for use with libdsk
Group: Applications/System
Requires: libdsk = %{version}

%description tools
Tools for use with libdsk.

%prep
%setup -q

# Fix dodgy permissions on files that end up in debuginfo package
/usr/bin/find . -name '*.[ch]' | /usr/bin/xargs %{__chmod} 644

# Fix wrong line endings on files that end up in debuginfo package
%{__perl} -pi -e 's/\r*$//' lib/drivers.h

%build
%configure --disable-rpath --disable-static

# Is this actually needed?
#{__perl} -pi -e "s,hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=\" -D__LIBTOOL_IS_A_FOOL__ \",g" libtool

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%{_libdir}/libdsk.so.*
%doc README doc/COPYING ChangeLog TODO doc/*.html doc/libdsk.{pdf,txt}

%files tools
%{_bindir}/dskform
%{_bindir}/dskid
%{_bindir}/dsktrans
%{_bindir}/md3serial
%{_bindir}/dskdump
%{_bindir}/dskscan
%{_mandir}/man1/dskdump.1*
%{_mandir}/man1/dskscan.1*
%{_mandir}/man1/dskform.1*
%{_mandir}/man1/dskid.1*
%{_mandir}/man1/dsktrans.1*
%{_mandir}/man5/libdskrc.5*
%{_mandir}/man1/md3serial.1*

%files devel
%defattr(-,root,root)
%{_libdir}/libdsk.so
%{_includedir}/libdsk.h
%exclude %{_libdir}/libdsk.la

%changelog
* Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.6.1
- Removed packager
- Altered BR to remove requirement for sed
- Fixed BuildRoot to honour FC rules
- Altered licence to GPL
- Altered numbering scheme for version
- Renamed spec file
- Added in new binaries and man files for dskdump and dskscan
- Bumped to upstream version 1.1.6
- A couple of fiddly fixes suggested by Paul Howard

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.4-1.2
- Alterations to Requires: and name

* Mon Jul 11 2005 Paul Johnson <paul at all-the-johnsons.co.uk> - 1.1.4-1.1.FC4
- Changed version for FC4

* Mon May 22 2005 Ian Chapman <packages at amiga-hardware.com> - 1.1.4-1.iss
- Updated to version 1.1.4

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 1.1.3-1.iss
- Changelog duplicated in spec file, fixed.
- Updated to version 1.1.3
- Removed some install commands, no longer needed with this version

* Mon Jul 16 2004 Ian Chapman <packages at amiga-hardware.com> - 1.1.1-1.iss
- Updated to version to 1.1.1
- Updated for use with Fedora Core 2
- Split the tools from the main libdsk RPM

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 1.1.0-2
- Minor fixes to changelog
- Changed copyright to distributable
- Moved a file from the main package to the devel package

* Sat Dec 01 2003 Ian Chapman <packages at amiga-hardware.com> - 1.1.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 01:05:18 -0000	1.1
+++ .cvsignore	13 Jan 2006 01:08:43 -0000	1.2
@@ -0,0 +1 @@
+libdsk-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 01:05:18 -0000	1.1
+++ sources	13 Jan 2006 01:08:43 -0000	1.2
@@ -0,0 +1 @@
+8abf60a90ab13c7f9f57d4a94dcd2166  libdsk-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 01:08:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:08:19 -0500
Subject: rpms/libdsk import.log,1.1,1.2
Message-ID: <200601130109.k0D19Lfc009723@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9685

Modified Files:
	import.log 
Log Message:
auto-import libdsk-1.1.6-1 on branch devel from libdsk-1.1.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libdsk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 01:05:00 -0000	1.1
+++ import.log	13 Jan 2006 01:08:19 -0000	1.2
@@ -0,0 +1 @@
+libdsk-1_1_6-1:HEAD:libdsk-1.1.6-1.src.rpm:1137114439



From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:18 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:18 -0500
Subject: rpms/libspectrum - New directory
Message-ID: <200601130150.k0D1oKVh009981@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9973/libspectrum

Log Message:
Directory /cvs/extras/rpms/libspectrum added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:24 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:24 -0500
Subject: rpms/libspectrum/devel - New directory
Message-ID: <200601130150.k0D1oQCq009996@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9973/libspectrum/devel

Log Message:
Directory /cvs/extras/rpms/libspectrum/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:51 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:51 -0500
Subject: rpms/libspectrum Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130150.k0D1ortl010030@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10018

Added Files:
	Makefile import.log 
Log Message:
Setup of module libspectrum


--- NEW FILE Makefile ---
# Top level Makefile for module libspectrum
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:57 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:57 -0500
Subject: rpms/libspectrum/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601130150.k0D1oxMF010050@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10018/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libspectrum


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:52:00 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:52:00 -0500
Subject: rpms/libspectrum import.log,1.1,1.2
Message-ID: <200601130152.k0D1qWQE010149@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10112

Modified Files:
	import.log 
Log Message:
auto-import libspectrum-0.2.2-4 on branch devel from libspectrum-0.2.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libspectrum/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 01:50:51 -0000	1.1
+++ import.log	13 Jan 2006 01:52:00 -0000	1.2
@@ -0,0 +1 @@
+libspectrum-0_2_2-4:HEAD:libspectrum-0.2.2-4.src.rpm:1137117100



From fedora-extras-commits at redhat.com  Fri Jan 13 01:52:06 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:52:06 -0500
Subject: rpms/libspectrum/devel libspectrum.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200601130152.k0D1qcQ9010153@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10112/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libspectrum.spec 
Log Message:
auto-import libspectrum-0.2.2-4 on branch devel from libspectrum-0.2.2-4.src.rpm


--- NEW FILE libspectrum.spec ---
Summary:	A library for reading spectrum emulator file formats
Name:		libspectrum
License:	GPL
Version:	0.2.2
Release:	4%{?dist}
Group:		System Environment/Libraries
URL:		http://fuse-emulator.sourceforge.net/libspectrum.php
Source:		http://dl.sf.net/fuse-emulator/libspectrum-%{version}.tar.gz
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: 	zlib-devel, bzip2-devel, libgcrypt-devel, glib2-devel

%description
A library for reading various spectrum emulator file formats.

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

%description devel
Development files for libspectrum.

%prep
%setup -q

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%{_libdir}/libspectrum.so.*
%doc doc/libspectrum.txt README ChangeLog THANKS AUTHORS COPYING TODO

%files devel
%defattr(-,root,root)
%exclude %{_libdir}/libspectrum.la
%{_libdir}/libspectrum.so
%{_includedir}/libspectrum.h
%{_mandir}/man3/libspectrum.3*

%changelog
* Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.2.2-4
- Renamed spec file

* Fri Nov 11 2005 Paul Howarth <paul at city-fan.org> 0.2.2-3
- Remove Packager: tag
- Use full URL for source
- Use standard Fedora Extras buildroot
- Add buildreqs bzip2-devel, libgcrypt-devel, glib2-devel
- Add libgcrypt-devel req for -devel subpackage
- Unpack tarball quietly
- Don't build or include static library
- Use DESTDIR with make instead of %%makeinstall
- Honour %%{?_smp_mflags}
- Move manpage to -devel subpackage

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0-2.2-2.3
- Multiple fixes to the spec file to bring it into line with FC rules

* Mon Jul 11 2005 Paul Johnson <paul at all-the-johnsons.co.uk> - 0.2.2-2.iss
- Rebuild for Fedora Core 4
- Slight alteration to SPEC file for it to work with the Fedora RPM tools

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 0.2.2-2.iss
- Change log duplicated in spec file, fixed.

* Mon Jul 19 2004 Ian Chapman <packages at amiga-hardware.com> - 0.2.2-1.iss
- Upgraded to version 0.2.2
- RPM built for Fedora Core 2

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 0.2.0.1-2
- Minor changes to changelog
- Improved use of macros
- Moved appropriate files to devel package

* Sat Dec 01 2003 Ian Chapman <packages at amiga-hardware.com> - 0.2.0.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libspectrum/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 01:50:57 -0000	1.1
+++ .cvsignore	13 Jan 2006 01:52:06 -0000	1.2
@@ -0,0 +1 @@
+libspectrum-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libspectrum/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 01:50:57 -0000	1.1
+++ sources	13 Jan 2006 01:52:06 -0000	1.2
@@ -0,0 +1 @@
+30b0e5082b3b9d9f6fc430fd8912c0bd  libspectrum-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 01:57:27 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:57:27 -0500
Subject: rpms/fuse-utils - New directory
Message-ID: <200601130157.k0D1vTWD010332@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324/fuse-utils

Log Message:
Directory /cvs/extras/rpms/fuse-utils added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:57:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:57:33 -0500
Subject: rpms/fuse-utils/devel - New directory
Message-ID: <200601130157.k0D1vZRD010347@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324/fuse-utils/devel

Log Message:
Directory /cvs/extras/rpms/fuse-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:58:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:58:34 -0500
Subject: rpms/fuse-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130158.k0D1waXT010381@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10369

Added Files:
	Makefile import.log 
Log Message:
Setup of module fuse-utils


--- NEW FILE Makefile ---
# Top level Makefile for module fuse-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:58:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:58:40 -0500
Subject: rpms/fuse-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601130158.k0D1wgIi010401@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10369/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fuse-utils


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:59:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:59:31 -0500
Subject: rpms/fuse-utils import.log,1.1,1.2
Message-ID: <200601130200.k0D203c3010486@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10438

Modified Files:
	import.log 
Log Message:
auto-import fuse-utils-0.7.0-1 on branch devel from fuse-utils-0.7.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 01:58:34 -0000	1.1
+++ import.log	13 Jan 2006 01:59:30 -0000	1.2
@@ -0,0 +1 @@
+fuse-utils-0_7_0-1:HEAD:fuse-utils-0.7.0-1.src.rpm:1137117558



From fedora-extras-commits at redhat.com  Fri Jan 13 01:59:36 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:59:36 -0500
Subject: rpms/fuse-utils/devel fuse-utils-0.7.0.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601130200.k0D209nA010494@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10438/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fuse-utils-0.7.0.spec 
Log Message:
auto-import fuse-utils-0.7.0-1 on branch devel from fuse-utils-0.7.0-1.src.rpm


--- NEW FILE fuse-utils-0.7.0.spec ---
Summary: The Free UNIX Spectrum Emulator
Name: fuse-utils
Version: 0.7.0
Release: 1%{?dist}
License: GPL
Group: Applications/Emulators
Source: %{name}-%{version}.tar.gz
URL: ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/unix/fuse-utils-0.7.0.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libspectrum-devel,

%description
Fuse-utils are a collection of utilities for the Fuse ZX-Spectrum emulator

%prep
rm -rf ${RPM_BUILD_ROOT}
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1

install -m0644 createhdf ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 listbasic ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 rzxcheck ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 rzxdump ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 rzxtool ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 scl2trd ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 snap2tzx ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 snapconv ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 tapeconv ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 tzxlist ${RPM_BUILD_ROOT}%{_bindir}/
cp  man/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root)
%{_mandir}/man1/createhdf.1.gz
%{_mandir}/man1/fuse-utils.1.gz
%{_mandir}/man1/listbasic.1.gz
%{_mandir}/man1/rzxcheck.1.gz
%{_mandir}/man1/rzxdump.1.gz
%{_mandir}/man1/rzxtool.1.gz
%{_mandir}/man1/scl2trd.1.gz
%{_mandir}/man1/snap2tzx.1.gz
%{_mandir}/man1/snapconv.1.gz
%{_mandir}/man1/tapeconv.1.gz
%{_mandir}/man1/tzxlist.1.gz
%{_bindir}/
%doc AUTHORS COPYING README 

%changelog
* Thu Sep 1 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-1.fc
- Initial build for FC



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 01:58:40 -0000	1.1
+++ .cvsignore	13 Jan 2006 01:59:36 -0000	1.2
@@ -0,0 +1 @@
+fuse-utils-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 01:58:40 -0000	1.1
+++ sources	13 Jan 2006 01:59:36 -0000	1.2
@@ -0,0 +1 @@
+9689134b4be1e4ff0b077f407ec76da9  fuse-utils-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 07:01:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 13 Jan 2006 02:01:00 -0500
Subject: rpms/perl-Config-General/devel .cvsignore, 1.4,
	1.5 perl-Config-General.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200601130701.k0D71gBQ021260@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Config-General/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19604

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Thu Jan 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.31-1
- 2.31.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2005 18:03:33 -0000	1.4
+++ .cvsignore	13 Jan 2006 07:00:58 -0000	1.5
@@ -1 +1 @@
-Config-General-2.30.tar.gz
+Config-General-2.31.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Config-General.spec	16 Sep 2005 18:03:34 -0000	1.8
+++ perl-Config-General.spec	13 Jan 2006 07:00:58 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Config-General
-Version:        2.30
+Version:        2.31
 Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
@@ -63,6 +63,9 @@
 
 
 %changelog
+* 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
 - 2.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2005 18:03:34 -0000	1.4
+++ sources	13 Jan 2006 07:00:58 -0000	1.5
@@ -1 +1 @@
-289037b40ef5a78bd59f894bcc1d4f51  Config-General-2.30.tar.gz
+5d51723f6fb36cf943934b80c261d680  Config-General-2.31.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 16:58:27 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Fri, 13 Jan 2006 11:58:27 -0500
Subject: rpms/denyhosts/devel denyhosts-1.1.4-config.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 denyhosts.spec, 1.18, 1.19 sources,
	1.13, 1.14 denyhosts-1.1.3-config.patch, 1.1, NONE
Message-ID: <200601131658.k0DGwxxh007115@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7039

Modified Files:
	.cvsignore denyhosts.spec sources 
Added Files:
	denyhosts-1.1.4-config.patch 
Removed Files:
	denyhosts-1.1.3-config.patch 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
- Update to 1.1.4.


denyhosts-1.1.4-config.patch:

--- NEW FILE denyhosts-1.1.4-config.patch ---
--- denyhosts.cfg-dist.orig	2005-12-16 16:45:05.000000000 -0600
+++ denyhosts.cfg-dist	2006-01-13 10:56:34.762167881 -0600
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
 #######################################################################
 
 
@@ -115,7 +120,7 @@
 # Note: it is recommended that you use an absolute pathname
 # for this value (eg. /home/foo/denyhosts/data)
 #
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 
@@ -178,7 +183,7 @@
 # match your email address.  If you do not want to receive these reports
 # leave this field blank (or run with the --noemail option)
 #
-ADMIN_EMAIL = 
+ADMIN_EMAIL = root
 #
 #######################################################################
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Nov 2005 17:21:48 -0000	1.13
+++ .cvsignore	13 Jan 2006 16:58:26 -0000	1.14
@@ -1 +1 @@
-DenyHosts-1.1.3.tar.gz
+DenyHosts-1.1.4.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- denyhosts.spec	20 Nov 2005 17:21:49 -0000	1.18
+++ denyhosts.spec	13 Jan 2006 16:58:26 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           denyhosts
-Version:        1.1.3
+Version:        1.1.4
 release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
@@ -13,7 +13,7 @@
 Source4:	denyhosts.sysconfig
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
-Patch0:		denyhosts-1.1.3-config.patch
+Patch0:		denyhosts-1.1.4-config.patch
 Patch1:		denyhosts-0.9.8-setup.patch
 Patch2:		denyhosts-1.0.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -125,6 +125,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
+- Update to 1.1.4.
+
 * Fri Nov 18 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.3-1
 - Update to 1.1.3
 - Update README.fedora to document what the package currently does.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	20 Nov 2005 17:21:49 -0000	1.13
+++ sources	13 Jan 2006 16:58:26 -0000	1.14
@@ -1 +1 @@
-bacc9e55a17572b832a19035129f7c12  DenyHosts-1.1.3.tar.gz
+f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz


--- denyhosts-1.1.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 13 17:26:13 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Fri, 13 Jan 2006 12:26:13 -0500
Subject: rpms/grace/devel .cvsignore, 1.2, 1.3 grace.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200601131726.k0DHQj7Z009194@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9173

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
* Fri Jan 13 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
- new upstream version
- remove name from Summary
- disable setting environment variable GRACE_HOME
- replace x11-xorg-devel by libXpm-devel in BuildRequires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
+++ .cvsignore	13 Jan 2006 17:26:12 -0000	1.3
@@ -1 +1 @@
-grace-5.1.18.tar.gz
+grace-5.1.19.tar.gz


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grace.spec	9 Jan 2006 16:15:12 -0000	1.1
+++ grace.spec	13 Jan 2006 17:26:12 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           grace
-Version:        5.1.18
-Release:        7%{?dist}
-Summary:        Numerical Data Processing and Visualization Tool (grace)
+Version:        5.1.19
+Release:        1%{?dist}
+Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
 # Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
@@ -9,8 +9,8 @@
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Source3:        %{name}.sh
-Source4:        %{name}.csh
+#Source3:        %{name}.sh
+#Source4:        %{name}.csh
 Source5:	cephes-license.email
 Source6:	LICENSE.cephes
 Patch:          %{name}-gracerc-no_auxiliary.diff
@@ -18,7 +18,7 @@
 Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
-BuildRequires:  zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel
+BuildRequires:  zlib-devel, libXpm-devel, fftw-devel, t1lib-devel
 BuildRequires:  openmotif-devel, gcc-gfortran
 BuildRequires:  desktop-file-utils, font-utils
 Requires:	nedit
@@ -78,8 +78,9 @@
     %{buildroot}%{_datadir}/pixmaps         \
     %{buildroot}%{_datadir}/applications    \
     %{buildroot}%{_mandir}/man1             \
-    %{buildroot}%{_sysconfdir}/profile.d    \
     %{buildroot}%{_sysconfdir}/%{name}
+#    %{buildroot}%{_sysconfdir}/profile.d    \
+
 ##
 # Let's have some sanity
 #
@@ -121,8 +122,8 @@
 ##
 # Profile scripts
 #
-install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
-install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
+#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
 
 
 %clean
@@ -142,7 +143,7 @@
 %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
-%{_sysconfdir}/profile.d/*
+#%{_sysconfdir}/profile.d/*
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -163,6 +164,12 @@
 
 
 %changelog
+* Fri Jan 13 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
+- new upstream version
+- remove name from Summary
+- disable setting environment variable GRACE_HOME
+- replace x11-xorg-devel by libXpm-devel in BuildRequires
+
 * Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
 - put config files in /etc
 - licence is GPL and not BSD/GPL, as it is not dual licensed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2006 16:15:12 -0000	1.2
+++ sources	13 Jan 2006 17:26:12 -0000	1.3
@@ -1 +1 @@
-9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz
+0745c262ba4d0d1d82fee5972065aefc  grace-5.1.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 20:46:10 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:46:10 -0500
Subject: rpms/gaim-meanwhile/FC-4 g-mw-empty-message-crash.patch, NONE,
	1.1 g-mw-empty-title-crash.patch, NONE, 1.1 gaim-meanwhile.spec,
	1.9, 1.10
Message-ID: <200601132046.k0DKkhKj014970@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14938

Modified Files:
	gaim-meanwhile.spec 
Added Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Fix two crashes

g-mw-empty-message-crash.patch:

--- NEW FILE g-mw-empty-message-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(text, -1);
+  esc = g_markup_escape_text(text? text: "", -1);
   serv_got_chat_in(gc, CONF_TO_ID(conf), who->user_id, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -3013,7 +3013,7 @@ static void mw_place_message(struct mwPl
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(msg, -1);
+  esc = g_markup_escape_text(msg? msg: "", -1);
   serv_got_chat_in(gc, PLACE_TO_ID(place), who->user, 0, esc, time(NULL));
   g_free(esc);
 }

g-mw-empty-title-crash.patch:

--- NEW FILE g-mw-empty-title-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
 	     NSTR(c_inviter), NSTR(c_name),
 	     NSTR(c_topic), NSTR(c_invitation));
 
+  if(! c_topic) c_topic = "(no title)";
+  if(! c_invitation) c_invitation = "(no message)";
   serv_got_chat_invite(gc, c_topic, c_inviter, c_invitation, ht);
 }
 
@@ -1828,6 +1830,7 @@ static void mw_conf_opened(struct mwConf
   GaimConversation *g_conf;
 
   const char *n = mwConference_getName(conf);
+  const char *t = mwConference_getTitle(conf);
 
   DEBUG_INFO("conf %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
@@ -1837,8 +1840,8 @@ static void mw_conf_opened(struct mwConf
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf),
-				mwConference_getTitle(conf));
+  if(! t) t = "(no title)";
+  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf), t);
 
   mwConference_setClientData(conf, GAIM_CONV_CHAT(g_conf), NULL);
 
@@ -2811,6 +2814,8 @@ static void mw_place_invite(struct mwCon
   g_hash_table_insert(ht, CHAT_KEY_INVITE, g_strdup(message));
   g_hash_table_insert(ht, CHAT_KEY_IS_PLACE, g_strdup("")); /* ugh */
 
+  if(! title) title = "(no title)";
+  if(! message) message = "(no message)";
   serv_got_chat_invite(pd->gc, title, idb->user, message, ht);
 
   mwConversation_close(conv, ERR_SUCCESS);
@@ -2882,6 +2887,7 @@ static void mw_place_opened(struct mwPla
   GList *members, *l;
 
   const char *n = mwPlace_getName(place);
+  const char *t = mwPlace_getTitle(place);
 
   srvc = mwPlace_getService(place);
   session = mwService_getSession(MW_SERVICE(srvc));
@@ -2893,8 +2899,8 @@ static void mw_place_opened(struct mwPla
   DEBUG_INFO("place %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
 
-  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place),
-			       mwPlace_getTitle(place));
+  if(! t) t = "(no title)";
+  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place), t);
 
   mwPlace_setClientData(place, gconf, NULL);
 


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gaim-meanwhile.spec	3 Jan 2006 18:07:29 -0000	1.9
+++ gaim-meanwhile.spec	13 Jan 2006 20:46:10 -0000	1.10
@@ -7,18 +7,22 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
+Patch0:         g-mw-empty-title-crash.patch
+Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -39,6 +43,10 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix crash with empty chat title
+- Fix crash with empty message in group chat
+
 * Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Fri Jan 13 20:50:09 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:50:09 -0500
Subject: rpms/gaim-meanwhile/devel g-mw-empty-message-crash.patch, NONE,
	1.1 g-mw-empty-title-crash.patch, NONE, 1.1 gaim-meanwhile.spec,
	1.9, 1.10
Message-ID: <200601132050.k0DKofOr015042@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15019

Modified Files:
	gaim-meanwhile.spec 
Added Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Fix two crashes

g-mw-empty-message-crash.patch:

--- NEW FILE g-mw-empty-message-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(text, -1);
+  esc = g_markup_escape_text(text? text: "", -1);
   serv_got_chat_in(gc, CONF_TO_ID(conf), who->user_id, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -3013,7 +3013,7 @@ static void mw_place_message(struct mwPl
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(msg, -1);
+  esc = g_markup_escape_text(msg? msg: "", -1);
   serv_got_chat_in(gc, PLACE_TO_ID(place), who->user, 0, esc, time(NULL));
   g_free(esc);
 }

g-mw-empty-title-crash.patch:

--- NEW FILE g-mw-empty-title-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
 	     NSTR(c_inviter), NSTR(c_name),
 	     NSTR(c_topic), NSTR(c_invitation));
 
+  if(! c_topic) c_topic = "(no title)";
+  if(! c_invitation) c_invitation = "(no message)";
   serv_got_chat_invite(gc, c_topic, c_inviter, c_invitation, ht);
 }
 
@@ -1828,6 +1830,7 @@ static void mw_conf_opened(struct mwConf
   GaimConversation *g_conf;
 
   const char *n = mwConference_getName(conf);
+  const char *t = mwConference_getTitle(conf);
 
   DEBUG_INFO("conf %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
@@ -1837,8 +1840,8 @@ static void mw_conf_opened(struct mwConf
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf),
-				mwConference_getTitle(conf));
+  if(! t) t = "(no title)";
+  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf), t);
 
   mwConference_setClientData(conf, GAIM_CONV_CHAT(g_conf), NULL);
 
@@ -2811,6 +2814,8 @@ static void mw_place_invite(struct mwCon
   g_hash_table_insert(ht, CHAT_KEY_INVITE, g_strdup(message));
   g_hash_table_insert(ht, CHAT_KEY_IS_PLACE, g_strdup("")); /* ugh */
 
+  if(! title) title = "(no title)";
+  if(! message) message = "(no message)";
   serv_got_chat_invite(pd->gc, title, idb->user, message, ht);
 
   mwConversation_close(conv, ERR_SUCCESS);
@@ -2882,6 +2887,7 @@ static void mw_place_opened(struct mwPla
   GList *members, *l;
 
   const char *n = mwPlace_getName(place);
+  const char *t = mwPlace_getTitle(place);
 
   srvc = mwPlace_getService(place);
   session = mwService_getSession(MW_SERVICE(srvc));
@@ -2893,8 +2899,8 @@ static void mw_place_opened(struct mwPla
   DEBUG_INFO("place %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
 
-  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place),
-			       mwPlace_getTitle(place));
+  if(! t) t = "(no title)";
+  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place), t);
 
   mwPlace_setClientData(place, gconf, NULL);
 


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gaim-meanwhile.spec	3 Jan 2006 18:07:49 -0000	1.9
+++ gaim-meanwhile.spec	13 Jan 2006 20:50:09 -0000	1.10
@@ -7,18 +7,22 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
+Patch0:         g-mw-empty-title-crash.patch
+Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -39,6 +43,10 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix crash with empty chat title
+- Fix crash with empty message in group chat
+
 * Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Fri Jan 13 20:57:30 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:57:30 -0500
Subject: rpms/gaim-meanwhile/FC-4 g-mw-empty-message-crash.patch, 1.1,
	1.2 g-mw-empty-title-crash.patch, 1.1, 1.2 gaim-meanwhile.spec,
	1.10, 1.11
Message-ID: <200601132058.k0DKw3Hm015151@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15124

Modified Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
	gaim-meanwhile.spec 
Log Message:
Fix patches

g-mw-empty-message-crash.patch:

Index: g-mw-empty-message-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/g-mw-empty-message-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-message-crash.patch	13 Jan 2006 20:46:10 -0000	1.1
+++ g-mw-empty-message-crash.patch	13 Jan 2006 20:57:30 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
    pd = mwSession_getClientData(session);
    gc = pd->gc;

g-mw-empty-title-crash.patch:

Index: g-mw-empty-title-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/g-mw-empty-title-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-title-crash.patch	13 Jan 2006 20:46:10 -0000	1.1
+++ g-mw-empty-title-crash.patch	13 Jan 2006 20:57:30 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
  	     NSTR(c_inviter), NSTR(c_name),
  	     NSTR(c_topic), NSTR(c_invitation));


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gaim-meanwhile.spec	13 Jan 2006 20:46:10 -0000	1.10
+++ gaim-meanwhile.spec	13 Jan 2006 20:57:30 -0000	1.11
@@ -7,7 +7,7 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 %changelog
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix patches to have the correct strip level.  Gah.
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
 - Fix crash with empty chat title
 - Fix crash with empty message in group chat
 



From fedora-extras-commits at redhat.com  Fri Jan 13 20:58:26 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:58:26 -0500
Subject: rpms/gaim-meanwhile/devel g-mw-empty-message-crash.patch, 1.1,
	1.2 g-mw-empty-title-crash.patch, 1.1, 1.2 gaim-meanwhile.spec,
	1.10, 1.11
Message-ID: <200601132058.k0DKwwcG015189@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15157

Modified Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
	gaim-meanwhile.spec 
Log Message:
Fix patches

g-mw-empty-message-crash.patch:

Index: g-mw-empty-message-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/g-mw-empty-message-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-message-crash.patch	13 Jan 2006 20:50:09 -0000	1.1
+++ g-mw-empty-message-crash.patch	13 Jan 2006 20:58:25 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
    pd = mwSession_getClientData(session);
    gc = pd->gc;

g-mw-empty-title-crash.patch:

Index: g-mw-empty-title-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/g-mw-empty-title-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-title-crash.patch	13 Jan 2006 20:50:09 -0000	1.1
+++ g-mw-empty-title-crash.patch	13 Jan 2006 20:58:25 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
  	     NSTR(c_inviter), NSTR(c_name),
  	     NSTR(c_topic), NSTR(c_invitation));


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gaim-meanwhile.spec	13 Jan 2006 20:50:09 -0000	1.10
+++ gaim-meanwhile.spec	13 Jan 2006 20:58:25 -0000	1.11
@@ -7,7 +7,7 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 %changelog
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix patches to have the correct strip level.  Gah.
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
 - Fix crash with empty chat title
 - Fix crash with empty message in group chat
 



From fedora-extras-commits at redhat.com  Fri Jan 13 23:44:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 13 Jan 2006 18:44:00 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.9, 1.10 rxvt-unicode.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200601132344.k0DNiW4t021182@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 09:03:11 -0000	1.9
+++ .cvsignore	13 Jan 2006 23:43:59 -0000	1.10
@@ -1 +1 @@
-rxvt-unicode-6.3.tar.bz2
+rxvt-unicode-7.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rxvt-unicode.spec	5 Jan 2006 09:03:11 -0000	1.11
+++ rxvt-unicode.spec	13 Jan 2006 23:43:59 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.3
+Version:        7.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.0-1
+- version upgrade
+
 * Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 09:03:11 -0000	1.9
+++ sources	13 Jan 2006 23:43:59 -0000	1.10
@@ -1 +1 @@
-411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2
+4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 13 23:44:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 13 Jan 2006 18:44:06 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.9, 1.10 rxvt-unicode.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200601132344.k0DNicAC021187@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 09:03:19 -0000	1.9
+++ .cvsignore	13 Jan 2006 23:44:05 -0000	1.10
@@ -1 +1 @@
-rxvt-unicode-6.3.tar.bz2
+rxvt-unicode-7.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rxvt-unicode.spec	5 Jan 2006 09:03:19 -0000	1.11
+++ rxvt-unicode.spec	13 Jan 2006 23:44:05 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.3
+Version:        7.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.0-1
+- version upgrade
+
 * Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 09:03:19 -0000	1.9
+++ sources	13 Jan 2006 23:44:05 -0000	1.10
@@ -1 +1 @@
-411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2
+4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 13 23:44:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 13 Jan 2006 18:44:12 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.9, 1.10 rxvt-unicode.spec,
	1.14, 1.15 sources, 1.9, 1.10
Message-ID: <200601132344.k0DNiiv9021192@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 09:03:42 -0000	1.9
+++ .cvsignore	13 Jan 2006 23:44:11 -0000	1.10
@@ -1 +1 @@
-rxvt-unicode-6.3.tar.bz2
+rxvt-unicode-7.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rxvt-unicode.spec	5 Jan 2006 09:03:42 -0000	1.14
+++ rxvt-unicode.spec	13 Jan 2006 23:44:11 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.3
+Version:        7.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.0-1
+- version upgrade
+
 * Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 09:03:42 -0000	1.9
+++ sources	13 Jan 2006 23:44:11 -0000	1.10
@@ -1 +1 @@
-411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2
+4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 00:31:04 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 13 Jan 2006 19:31:04 -0500
Subject: rpms/repoview/devel .cvsignore, 1.4, 1.5 repoview.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200601140031.k0E0VMKR023202@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23164/devel

Modified Files:
	.cvsignore repoview.spec sources 
Log Message:
Version 0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Oct 2005 18:22:15 -0000	1.4
+++ .cvsignore	14 Jan 2006 00:31:04 -0000	1.5
@@ -1 +1 @@
-repoview-0.4.1.tar.gz
+repoview-0.5.tar.gz


Index: repoview.spec
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/repoview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repoview.spec	9 Oct 2005 18:22:15 -0000	1.4
+++ repoview.spec	14 Jan 2006 00:31:04 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           repoview
-Version:        0.4.1
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Creates a set of static HTML pages in a yum repository
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jan 13 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.5-1
+- Version 0.5
+
 * Sun Oct 09 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 0.4.1-1
 - Version 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Oct 2005 18:22:15 -0000	1.4
+++ sources	14 Jan 2006 00:31:04 -0000	1.5
@@ -1 +1 @@
-c72b8c46579b49679dd751f7bc174a75  repoview-0.4.1.tar.gz
+d113c06a124029660c7436cc06563482  repoview-0.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 00:30:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 13 Jan 2006 19:30:58 -0500
Subject: rpms/repoview/FC-4 .cvsignore, 1.4, 1.5 repoview.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200601140031.k0E0VVTH023207@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23164/FC-4

Modified Files:
	.cvsignore repoview.spec sources 
Log Message:
Version 0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Oct 2005 18:13:55 -0000	1.4
+++ .cvsignore	14 Jan 2006 00:30:57 -0000	1.5
@@ -1 +1 @@
-repoview-0.4.1.tar.gz
+repoview-0.5.tar.gz


Index: repoview.spec
===================================================================
RCS file: /cvs/extras/rpms/repoview/FC-4/repoview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repoview.spec	9 Oct 2005 18:13:55 -0000	1.4
+++ repoview.spec	14 Jan 2006 00:30:57 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           repoview
-Version:        0.4.1
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Creates a set of static HTML pages in a yum repository
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jan 13 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.5-1
+- Version 0.5
+
 * Sun Oct 09 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 0.4.1-1
 - Version 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Oct 2005 18:13:55 -0000	1.4
+++ sources	14 Jan 2006 00:30:57 -0000	1.5
@@ -1 +1 @@
-c72b8c46579b49679dd751f7bc174a75  repoview-0.4.1.tar.gz
+d113c06a124029660c7436cc06563482  repoview-0.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:27:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:27:12 -0500
Subject: rpms/perl-Module-Refresh/FC-3 .cvsignore, 1.3,
	1.4 perl-Module-Refresh.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601140327.k0E3RirJ028882@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827/FC-3

Modified Files:
	.cvsignore perl-Module-Refresh.spec sources 
Log Message:
upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2005 13:07:19 -0000	1.3
+++ .cvsignore	14 Jan 2006 03:27:11 -0000	1.4
@@ -1 +1 @@
-Module-Refresh-0.08.tar.gz
+Module-Refresh-0.09.tar.gz


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/perl-Module-Refresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Refresh.spec	2 Nov 2005 13:07:19 -0000	1.2
+++ perl-Module-Refresh.spec	14 Jan 2006 03:27:11 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Module-Refresh
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Refresh %INC files when updated on disk
 License: 	GPL or Artistic
@@ -44,11 +44,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
-* Sat Aug 27 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-2
-- Spec cleanup.
-
-* Thu Aug 11 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-1
-- FE submission.
+* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2005 13:07:19 -0000	1.3
+++ sources	14 Jan 2006 03:27:11 -0000	1.4
@@ -1 +1 @@
-32303a4ba13a84fba61caaa706e7014a  Module-Refresh-0.08.tar.gz
+f6168601b3be9cf59c0ed1698df954a6  Module-Refresh-0.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:27:18 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:27:18 -0500
Subject: rpms/perl-Module-Refresh/FC-4 .cvsignore, 1.3,
	1.4 perl-Module-Refresh.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601140327.k0E3Ros1028887@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827/FC-4

Modified Files:
	.cvsignore perl-Module-Refresh.spec sources 
Log Message:
upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2005 13:08:05 -0000	1.3
+++ .cvsignore	14 Jan 2006 03:27:18 -0000	1.4
@@ -1 +1 @@
-Module-Refresh-0.08.tar.gz
+Module-Refresh-0.09.tar.gz


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/perl-Module-Refresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Refresh.spec	2 Nov 2005 13:08:05 -0000	1.2
+++ perl-Module-Refresh.spec	14 Jan 2006 03:27:18 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Module-Refresh
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Refresh %INC files when updated on disk
 License: 	GPL or Artistic
@@ -44,11 +44,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
-* Sat Aug 27 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-2
-- Spec cleanup.
-
-* Thu Aug 11 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-1
-- FE submission.
+* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2005 13:08:05 -0000	1.3
+++ sources	14 Jan 2006 03:27:18 -0000	1.4
@@ -1 +1 @@
-32303a4ba13a84fba61caaa706e7014a  Module-Refresh-0.08.tar.gz
+f6168601b3be9cf59c0ed1698df954a6  Module-Refresh-0.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:27:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:27:24 -0500
Subject: rpms/perl-Module-Refresh/devel .cvsignore, 1.3,
	1.4 perl-Module-Refresh.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601140327.k0E3RuMJ028892@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827/devel

Modified Files:
	.cvsignore perl-Module-Refresh.spec sources 
Log Message:
upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2005 13:08:16 -0000	1.3
+++ .cvsignore	14 Jan 2006 03:27:24 -0000	1.4
@@ -1 +1 @@
-Module-Refresh-0.08.tar.gz
+Module-Refresh-0.09.tar.gz


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Refresh.spec	2 Nov 2005 13:08:16 -0000	1.2
+++ perl-Module-Refresh.spec	14 Jan 2006 03:27:24 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Module-Refresh
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Refresh %INC files when updated on disk
 License: 	GPL or Artistic
@@ -44,11 +44,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
-* Sat Aug 27 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-2
-- Spec cleanup.
-
-* Thu Aug 11 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-1
-- FE submission.
+* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2005 13:08:16 -0000	1.3
+++ sources	14 Jan 2006 03:27:24 -0000	1.4
@@ -1 +1 @@
-32303a4ba13a84fba61caaa706e7014a  Module-Refresh-0.08.tar.gz
+f6168601b3be9cf59c0ed1698df954a6  Module-Refresh-0.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:46:55 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:46:55 -0500
Subject: rpms/perl-Module-Refresh/devel perl-Module-Refresh.spec,1.3,1.4
Message-ID: <200601140347.k0E3lRKA029082@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29035/devel

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
I love changelogs ;)


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Refresh.spec	14 Jan 2006 03:27:24 -0000	1.3
+++ perl-Module-Refresh.spec	14 Jan 2006 03:46:55 -0000	1.4
@@ -44,7 +44,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
 * Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1



From fedora-extras-commits at redhat.com  Sat Jan 14 03:47:01 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:47:01 -0500
Subject: rpms/perl-Module-Refresh/FC-3 perl-Module-Refresh.spec,1.3,1.4
Message-ID: <200601140347.k0E3lXM8029085@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29035/FC-3

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
I love changelogs ;)


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/perl-Module-Refresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Refresh.spec	14 Jan 2006 03:27:11 -0000	1.3
+++ perl-Module-Refresh.spec	14 Jan 2006 03:47:01 -0000	1.4
@@ -44,7 +44,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
 * Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1



From fedora-extras-commits at redhat.com  Sat Jan 14 03:47:07 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:47:07 -0500
Subject: rpms/perl-Module-Refresh/FC-4 perl-Module-Refresh.spec,1.3,1.4
Message-ID: <200601140347.k0E3ld4F029088@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29035/FC-4

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
I love changelogs ;)


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/perl-Module-Refresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Refresh.spec	14 Jan 2006 03:27:18 -0000	1.3
+++ perl-Module-Refresh.spec	14 Jan 2006 03:47:07 -0000	1.4
@@ -44,7 +44,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
 * Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1



From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:02 -0500
Subject: rpms/wine-docs - New directory
Message-ID: <200601140816.k0E8G4BD006240@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6228/wine-docs

Log Message:
Directory /cvs/extras/rpms/wine-docs added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:08 -0500
Subject: rpms/wine-docs/devel - New directory
Message-ID: <200601140816.k0E8GAQr006262@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6228/wine-docs/devel

Log Message:
Directory /cvs/extras/rpms/wine-docs/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:28 -0500
Subject: rpms/wine-docs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601140816.k0E8GU0L006321@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6305

Added Files:
	Makefile import.log 
Log Message:
Setup of module wine-docs


--- NEW FILE Makefile ---
# Top level Makefile for module wine-docs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:34 -0500
Subject: rpms/wine-docs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601140816.k0E8GaC5006349@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6305/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wine-docs


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 08:17:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:17:21 -0500
Subject: rpms/wine-docs import.log,1.1,1.2
Message-ID: <200601140817.k0E8Hs1w006528@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6442

Modified Files:
	import.log 
Log Message:
auto-import wine-docs-0.9.5-2 on branch devel from wine-docs-0.9.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 08:16:28 -0000	1.1
+++ import.log	14 Jan 2006 08:17:21 -0000	1.2
@@ -0,0 +1 @@
+wine-docs-0_9_5-2:HEAD:wine-docs-0.9.5-2.src.rpm:1137226632



From fedora-extras-commits at redhat.com  Sat Jan 14 08:17:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:17:27 -0500
Subject: rpms/wine-docs/devel wine-docs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601140817.k0E8HxqV006539@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6442/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wine-docs.spec 
Log Message:
auto-import wine-docs-0.9.5-2 on branch devel from wine-docs-0.9.5-2.src.rpm


--- NEW FILE wine-docs.spec ---
Name:           wine-docs
Version:        0.9.5
Release:        2
Summary:        Documentation for wine

Group:          Documentation
License:        LGPL
URL:            http://www.winehq.org
Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  docbook-utils-pdf
BuildRequires:  openjade

%description
This package is Wine's documentation repository. It consists of 
various guides and their translations.

%prep
%setup -q


%build
./configure
make


%install
rm -rf $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB

%changelog
* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.5-2
- fix license field
- include license as doc

* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.5-1
- version upgrade

* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.4-1
- version upgrade

* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.3-1
- version upgrade

* Tue Nov 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.2-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 08:16:33 -0000	1.1
+++ .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
@@ -0,0 +1 @@
+wine-docs-0.9.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 08:16:33 -0000	1.1
+++ sources	14 Jan 2006 08:17:27 -0000	1.2
@@ -0,0 +1 @@
+0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 08:25:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:25:18 -0500
Subject: rpms/wine-docs/devel wine-docs.spec,1.1,1.2
Message-ID: <200601140825.k0E8Po8p007263@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7187

Modified Files:
	wine-docs.spec 
Log Message:
- add dist



Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-docs.spec	14 Jan 2006 08:17:27 -0000	1.1
+++ wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wine-docs
 Version:        0.9.5
-Release:        2
+Release:        3%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
@@ -38,6 +38,10 @@
 
 %changelog
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-3
+- add dist
+
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix license field
 - include license as doc



From fedora-extras-commits at redhat.com  Sat Jan 14 08:43:14 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:43:14 -0500
Subject: owners owners.list,1.528,1.529
Message-ID: <200601140843.k0E8hl1L008804@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8721

Modified Files:
	owners.list 
Log Message:
- add wine-docs



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- owners.list	12 Jan 2006 17:11:29 -0000	1.528
+++ owners.list	14 Jan 2006 08:43:14 -0000	1.529
@@ -1271,6 +1271,7 @@
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wmacpi|Dockapp for laptop acpi/apm information|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 13:59:43 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sat, 14 Jan 2006 08:59:43 -0500
Subject: rpms/gstreamer-python/FC-4 .cvsignore, 1.3,
	1.4 gstreamer-python.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200601141400.k0EE0FqP018866@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer-python/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18832

Modified Files:
	.cvsignore gstreamer-python.spec sources 
Log Message:
updating to new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Feb 2005 18:47:33 -0000	1.3
+++ .cvsignore	14 Jan 2006 13:59:42 -0000	1.4
@@ -1 +1 @@
-gst-python-0.8.1.tar.bz2
+gst-python-0.8.3.tar.bz2


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/gstreamer-python.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gstreamer-python.spec	19 May 2005 15:46:32 -0000	1.8
+++ gstreamer-python.spec	14 Jan 2006 13:59:42 -0000	1.9
@@ -3,8 +3,8 @@
 %define         gstreamer       gstreamer
 
 Name:           %{gstreamer}-python
-Version:        0.8.1
-Release:        6
+Version:        0.8.3
+Release:        1
 Summary:        Python bindings for GStreamer.
 
 Group:          Development/Languages
@@ -15,8 +15,8 @@
 
 Requires:       python >= 2
 Requires:       pygtk2 >= 2.4.0
-Requires:       %{gstreamer} >= %{_gst_minver}
-Requires:       %{gstreamer}-plugins >= %{_gstp_minver}
+Requires:       %{gstreamer} >= %{gst_minver}
+Requires:       %{gstreamer}-plugins >= %{gstp_minver}
 
 BuildRequires:  python >= 2
 BuildRequires:  python-devel >= 2
@@ -25,8 +25,8 @@
 # xwindowlistener needs X11 headers
 BuildRequires:  XFree86-devel
 
-BuildRequires:  %{gstreamer}-devel >= %{_gst_minver}
-BuildRequires:  %{gstreamer}-plugins-devel >= %{_gstp_minver}
+BuildRequires:  %{gstreamer}-devel >= %{gst_minver}
+BuildRequires:  %{gstreamer}-plugins-devel >= %{gstp_minver}
 
 # sigh, libtool
 BuildRequires:  gcc-c++
@@ -53,11 +53,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-# The __init__.py* files go into lib instead of lib64, so fix that
-if [ "%{_lib}" != "lib" ]; then
-    %{__mv} %{buildroot}%{_prefix}/lib/python?.?/site-packages/gst/__init__.* \
-            %{buildroot}%{_libdir}/python?.?/site-packages/gst/
-fi
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
@@ -76,6 +71,11 @@
 %{_libdir}/pkgconfig/gst-python-0.8.pc
 
 %changelog
+* Sat Jan 14 2006 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.3-1
+- fix requires and buildrequires which were using an underscore
+- update to 0.8.3 version
+- remove the lib64 hack, should be fixed upstream now
+
 * Thu May 19 2005 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.1-6
 - disable docs build - they're already in the tarball
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Feb 2005 18:47:33 -0000	1.3
+++ sources	14 Jan 2006 13:59:42 -0000	1.4
@@ -1 +1 @@
-4a7e23b885c6ec8a7d300714f2106ba2  gst-python-0.8.1.tar.bz2
+f33f6b95d3911e7ad355199abea8d0ff  gst-python-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 14:17:52 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sat, 14 Jan 2006 09:17:52 -0500
Subject: rpms/abiword/devel abiword.spec,1.27,1.28
Message-ID: <200601141418.k0EEIOHv020620@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20603

Modified Files:
	abiword.spec 
Log Message:
Remove redundant requires




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- abiword.spec	5 Jan 2006 15:00:16 -0000	1.27
+++ abiword.spec	14 Jan 2006 14:17:51 -0000	1.28
@@ -3,17 +3,12 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
 Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2
 Source11: abiword.mime
-Requires: libwmf >= 0.2.8.3
-Requires: libxml2 >= 2.6.8
-Requires: aiksaurus-gtk >= 1.2.1
-Requires: libgnomedb >= 1.0.4
-Requires: enchant
 Requires: mathml-fonts
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -141,6 +136,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sat Jan 14 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-3.fc5
+- Remove redundant requires - bug 177305
+
 * Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc5
 - Bump release, forgot to add desktop patch
 



From fedora-extras-commits at redhat.com  Sat Jan 14 17:44:11 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sat, 14 Jan 2006 12:44:11 -0500
Subject: rpms/denyhosts/FC-4 denyhosts-1.1.4-config.patch, NONE,
	1.1 denyhosts.spec, 1.6, 1.7 sources, 1.7,
	1.8 denyhosts-1.1.3-config.patch, 1.1, NONE
Message-ID: <200601141744.k0EHihQV026382@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26360

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-1.1.4-config.patch 
Removed Files:
	denyhosts-1.1.3-config.patch 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
- Clean up %post script; just call condrestart and don't bother with
  the call to --upgrade099.

* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
- Update to 1.1.4.


denyhosts-1.1.4-config.patch:

--- NEW FILE denyhosts-1.1.4-config.patch ---
--- denyhosts.cfg-dist.orig	2005-12-16 16:45:05.000000000 -0600
+++ denyhosts.cfg-dist	2006-01-13 10:56:34.762167881 -0600
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
 #######################################################################
 
 
@@ -115,7 +120,7 @@
 # Note: it is recommended that you use an absolute pathname
 # for this value (eg. /home/foo/denyhosts/data)
 #
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 
@@ -178,7 +183,7 @@
 # match your email address.  If you do not want to receive these reports
 # leave this field blank (or run with the --noemail option)
 #
-ADMIN_EMAIL = 
+ADMIN_EMAIL = root
 #
 #######################################################################
 


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- denyhosts.spec	21 Nov 2005 23:23:12 -0000	1.6
+++ denyhosts.spec	14 Jan 2006 17:44:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        1.1.3
-release:	1%{?dist}
+Version:        1.1.4
+release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -13,7 +13,7 @@
 Source4:	denyhosts.sysconfig
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
-Patch0:		denyhosts-1.1.3-config.patch
+Patch0:		denyhosts-1.1.4-config.patch
 Patch1:		denyhosts-0.9.8-setup.patch
 Patch2:		denyhosts-1.0.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,13 +82,7 @@
 # sure that all of the hosts.deny entries were created by denyhosts
 %post
 /sbin/chkconfig --add denyhosts
-
-RUNNING=`/sbin/service denyhosts status | grep "is running"`
-/sbin/service denyhosts stop > /dev/null 2>&1 || :
-%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || :
-if [ -n "$RUNNING" ]; then
-  /sbin/service denyhosts start > /dev/null 2>&1
-fi
+/sbin/service denyhosts condrestart
 exit 0
 
 
@@ -125,6 +119,13 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
+- Clean up %post script; just call condrestart and don't bother with
+  the call to --upgrade099.
+
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
+- Update to 1.1.4.
+
 * Fri Nov 18 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.3-1
 - Update to 1.1.3
 - Update README.fedora to document what the package currently does.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2005 23:23:12 -0000	1.7
+++ sources	14 Jan 2006 17:44:10 -0000	1.8
@@ -1 +1 @@
-bacc9e55a17572b832a19035129f7c12  DenyHosts-1.1.3.tar.gz
+f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz


--- denyhosts-1.1.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 14 17:47:12 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sat, 14 Jan 2006 12:47:12 -0500
Subject: rpms/denyhosts/FC-3 denyhosts-1.1.4-config.patch, NONE,
	1.1 denyhosts.spec, 1.6, 1.7 sources, 1.7,
	1.8 denyhosts-1.1.3-config.patch, 1.1, NONE
Message-ID: <200601141747.k0EHljOf026465@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26443

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-1.1.4-config.patch 
Removed Files:
	denyhosts-1.1.3-config.patch 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
- Clean up %post script; just call condrestart and don't bother with
  the call to --upgrade099.

* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
- Update to 1.1.4.


denyhosts-1.1.4-config.patch:

--- NEW FILE denyhosts-1.1.4-config.patch ---
--- denyhosts.cfg-dist.orig	2005-12-16 16:45:05.000000000 -0600
+++ denyhosts.cfg-dist	2006-01-13 10:56:34.762167881 -0600
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
 #######################################################################
 
 
@@ -115,7 +120,7 @@
 # Note: it is recommended that you use an absolute pathname
 # for this value (eg. /home/foo/denyhosts/data)
 #
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 
@@ -178,7 +183,7 @@
 # match your email address.  If you do not want to receive these reports
 # leave this field blank (or run with the --noemail option)
 #
-ADMIN_EMAIL = 
+ADMIN_EMAIL = root
 #
 #######################################################################
 


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- denyhosts.spec	21 Nov 2005 23:21:10 -0000	1.6
+++ denyhosts.spec	14 Jan 2006 17:47:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        1.1.3
-release:	1%{?dist}
+Version:        1.1.4
+release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -13,7 +13,7 @@
 Source4:	denyhosts.sysconfig
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
-Patch0:		denyhosts-1.1.3-config.patch
+Patch0:		denyhosts-1.1.4-config.patch
 Patch1:		denyhosts-0.9.8-setup.patch
 Patch2:		denyhosts-1.0.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,13 +82,7 @@
 # sure that all of the hosts.deny entries were created by denyhosts
 %post
 /sbin/chkconfig --add denyhosts
-
-RUNNING=`/sbin/service denyhosts status | grep "is running"`
-/sbin/service denyhosts stop > /dev/null 2>&1 || :
-%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || :
-if [ -n "$RUNNING" ]; then
-  /sbin/service denyhosts start > /dev/null 2>&1
-fi
+/sbin/service denyhosts condrestart
 exit 0
 
 
@@ -125,6 +119,13 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
+- Clean up %post script; just call condrestart and don't bother with
+  the call to --upgrade099.
+
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
+- Update to 1.1.4.
+
 * Fri Nov 18 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.3-1
 - Update to 1.1.3
 - Update README.fedora to document what the package currently does.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2005 23:21:10 -0000	1.7
+++ sources	14 Jan 2006 17:47:12 -0000	1.8
@@ -1 +1 @@
-bacc9e55a17572b832a19035129f7c12  DenyHosts-1.1.3.tar.gz
+f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz


--- denyhosts-1.1.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 14 17:49:50 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sat, 14 Jan 2006 12:49:50 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.19,1.20
Message-ID: <200601141750.k0EHoNc1026531@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26514

Modified Files:
	denyhosts.spec 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
- Clean up %post script; just call condrestart and don't bother with
  the call to --upgrade099.



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- denyhosts.spec	13 Jan 2006 16:58:26 -0000	1.19
+++ denyhosts.spec	14 Jan 2006 17:49:50 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	1%{?dist}
+release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -82,13 +82,7 @@
 # sure that all of the hosts.deny entries were created by denyhosts
 %post
 /sbin/chkconfig --add denyhosts
-
-RUNNING=`/sbin/service denyhosts status | grep "is running"`
-/sbin/service denyhosts stop > /dev/null 2>&1 || :
-%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || :
-if [ -n "$RUNNING" ]; then
-  /sbin/service denyhosts start > /dev/null 2>&1
-fi
+/sbin/service denyhosts condrestart
 exit 0
 
 
@@ -125,6 +119,10 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
+- Clean up %post script; just call condrestart and don't bother with
+  the call to --upgrade099.
+
 * Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
 - Update to 1.1.4.
 



From fedora-extras-commits at redhat.com  Sat Jan 14 18:05:33 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:05:33 -0500
Subject: rpms/python-sqlite2 - New directory
Message-ID: <200601141805.k0EI5ZTA028326@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318/python-sqlite2

Log Message:
Directory /cvs/extras/rpms/python-sqlite2 added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 18:05:57 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:05:57 -0500
Subject: rpms/python-sqlite2/devel - New directory
Message-ID: <200601141805.k0EI5xLf028341@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318/python-sqlite2/devel

Log Message:
Directory /cvs/extras/rpms/python-sqlite2/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 18:07:46 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:07:46 -0500
Subject: rpms/python-sqlite2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601141807.k0EI7m3c028393@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28363/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-sqlite2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 18:07:27 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:07:27 -0500
Subject: rpms/python-sqlite2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601141807.k0EI7TGO028375@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28363

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-sqlite2


--- NEW FILE Makefile ---
# Top level Makefile for module python-sqlite2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 18:10:10 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:10:10 -0500
Subject: rpms/python-sqlite2/devel python-sqlite2.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601141810.k0EIAgEW028467@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28430/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-sqlite2.spec 
Log Message:
auto-import python-sqlite2-2.0.5-2 on branch devel from python-sqlite2-2.0.5-2.src.rpm


--- NEW FILE python-sqlite2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-sqlite2
Version:        2.0.5
Release:        2%{?dist}
Summary:        DB-API 2.0 interface for SQLite 3.x

Group:          Development/Languages
License:        zlib/libpng
URL:            http://pysqlite.org/
Source0:        http://initd.org/pub/software/pysqlite/releases/2.0/%{version}/pysqlite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  dos2unix
BuildRequires:  python-devel
BuildRequires:  sqlite-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
pysqlite is an interface to the SQLite 3.x embedded relational database
engine. It is almost fully compliant with the Python database API version
2.0 also exposes the unique features of SQLite.


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


%build
CFLAGS="%{optflags}" %{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
%{__rm} documentation/install-source.{html,txt}
%{__rm} documentation/usage-guide.txt
dos2unix documentation/{silvercity.css,code/*}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE documentation/*
%{_bindir}/test-pysqlite
%dir %{python_sitearch}/pysqlite2
%{python_sitearch}/pysqlite2/__init__.py
%{python_sitearch}/pysqlite2/__init__.pyc
%{python_sitearch}/pysqlite2/dbapi2.py
%{python_sitearch}/pysqlite2/dbapi2.pyc
%{python_sitearch}/pysqlite2/_sqlite.so
%dir %{python_sitearch}/pysqlite2/test
%{python_sitearch}/pysqlite2/test/dbapi.py
%{python_sitearch}/pysqlite2/test/dbapi.pyc
%{python_sitearch}/pysqlite2/test/factory.py
%{python_sitearch}/pysqlite2/test/factory.pyc
%{python_sitearch}/pysqlite2/test/__init__.py
%{python_sitearch}/pysqlite2/test/__init__.pyc
%{python_sitearch}/pysqlite2/test/transactions.py
%{python_sitearch}/pysqlite2/test/transactions.pyc
%{python_sitearch}/pysqlite2/test/types.py
%{python_sitearch}/pysqlite2/test/types.pyc
%{python_sitearch}/pysqlite2/test/userfunctions.py
%{python_sitearch}/pysqlite2/test/userfunctions.pyc
%ghost %{python_sitearch}/pysqlite2/__init__.pyo
%ghost %{python_sitearch}/pysqlite2/dbapi2.pyo
%ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo
%ghost %{python_sitearch}/pysqlite2/test/factory.pyo
%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
%ghost %{python_sitearch}/pysqlite2/test/transactions.pyo
%ghost %{python_sitearch}/pysqlite2/test/types.pyo
%ghost %{python_sitearch}/pysqlite2/test/userfunctions.pyo


%changelog
* Sat Jan 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.0.5-2
- Fix missing BR: sqlite-devel (Chris Chabot, #176653)

* Wed Dec 28 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.0.5-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 18:07:46 -0000	1.1
+++ .cvsignore	14 Jan 2006 18:10:09 -0000	1.2
@@ -0,0 +1 @@
+pysqlite-2.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 18:07:46 -0000	1.1
+++ sources	14 Jan 2006 18:10:09 -0000	1.2
@@ -0,0 +1 @@
+574bbb4f7b3a077506689cbab0d9bf7f  pysqlite-2.0.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 18:09:52 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:09:52 -0500
Subject: rpms/python-sqlite2 import.log,1.1,1.2
Message-ID: <200601141811.k0EIB0fr028470@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28430

Modified Files:
	import.log 
Log Message:
auto-import python-sqlite2-2.0.5-2 on branch devel from python-sqlite2-2.0.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 18:07:26 -0000	1.1
+++ import.log	14 Jan 2006 18:09:52 -0000	1.2
@@ -0,0 +1 @@
+python-sqlite2-2_0_5-2:HEAD:python-sqlite2-2.0.5-2.src.rpm:1137262264



From fedora-extras-commits at redhat.com  Sat Jan 14 18:19:55 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:19:55 -0500
Subject: owners owners.list,1.529,1.530
Message-ID: <200601141820.k0EIKRPe028604@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28585

Modified Files:
	owners.list 
Log Message:
Added python-sqlite2



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- owners.list	14 Jan 2006 08:43:14 -0000	1.529
+++ owners.list	14 Jan 2006 18:19:54 -0000	1.530
@@ -1050,6 +1050,7 @@
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-sqlite2|DB-API 2.0 interface for SQLite 3.x|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 19:08:36 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:08:36 -0500
Subject: owners owners.list,1.530,1.531
Message-ID: <200601141909.k0EJ9YHj030496@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30477

Modified Files:
	owners.list 
Log Message:
Added libtorrent entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- owners.list	14 Jan 2006 18:19:54 -0000	1.530
+++ owners.list	14 Jan 2006 19:08:36 -0000	1.531
@@ -558,6 +558,7 @@
 Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtorrent|BitTorrent library with a focus on high performance & good code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libtunepimp|A library for creating MusicBrainz enabled tagging applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 19:11:49 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:11:49 -0500
Subject: rpms/libtorrent - New directory
Message-ID: <200601141911.k0EJBpuY030556@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30548/libtorrent

Log Message:
Directory /cvs/extras/rpms/libtorrent added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 19:11:55 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:11:55 -0500
Subject: rpms/libtorrent/devel - New directory
Message-ID: <200601141911.k0EJBvh9030571@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30548/libtorrent/devel

Log Message:
Directory /cvs/extras/rpms/libtorrent/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 19:13:20 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:13:20 -0500
Subject: rpms/libtorrent Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601141913.k0EJDcjx030608@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30593

Added Files:
	Makefile import.log 
Log Message:
Setup of module libtorrent


--- NEW FILE Makefile ---
# Top level Makefile for module libtorrent
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 19:13:54 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:13:54 -0500
Subject: rpms/libtorrent/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601141913.k0EJDus4030641@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30593/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtorrent


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 19:15:06 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:15:06 -0500
Subject: rpms/libtorrent import.log,1.1,1.2
Message-ID: <200601141915.k0EJFc7l030733@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699

Modified Files:
	import.log 
Log Message:
auto-import libtorrent-0.8.2-2 on branch devel from libtorrent-0.8.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 19:13:03 -0000	1.1
+++ import.log	14 Jan 2006 19:15:05 -0000	1.2
@@ -0,0 +1 @@
+libtorrent-0_8_2-2:HEAD:libtorrent-0.8.2-2.src.rpm:1137266104



From fedora-extras-commits at redhat.com  Sat Jan 14 19:15:12 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:15:12 -0500
Subject: rpms/libtorrent/devel libtorrent.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601141915.k0EJFk4r030737@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libtorrent.spec 
Log Message:
auto-import libtorrent-0.8.2-2 on branch devel from libtorrent-0.8.2-2.src.rpm


--- NEW FILE libtorrent.spec ---
Name:          libtorrent
License:       GPL
Group:         System Environment/Libraries
Version:       0.8.2
Release:       2%{?dist}
Summary:       BitTorrent library with a focus on high performance & good code
URL:           http://libtorrent.rakshasa.no/
Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig, openssl-devel, libsigc++20-devel

%description
LibTorrent is a BitTorrent library written in C++ for *nix, with a focus 
on high performance and good code. The library differentiates itself 
from other implementations by transfering directly from file pages to 
the network stack. On high-bandwidth connections it is able to seed at 
3 times the speed of the official client.

%package devel
Summary: Libtorrent development environment
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Header and library definition files for developing applications                                               
with the libtorrent libraries.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README NEWS TODO
%{_libdir}/libtorrent.so.*

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

%changelog
* Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.8.2-2
- Improved general summary & devel package description 
- Simplified devel package includedir files section
- Removed openssl as requires, its implied by .so dependency
- Correct devel package Group

* Wed Jan 11 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.8.2-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 19:13:38 -0000	1.1
+++ .cvsignore	14 Jan 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+libtorrent-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 19:13:38 -0000	1.1
+++ sources	14 Jan 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+c1f7bf1b34cbfca252becf9ff734d112  libtorrent-0.8.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 19:34:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 14 Jan 2006 14:34:32 -0500
Subject: rpms/lirc/devel .cvsignore, 1.8, 1.9 lirc.spec, 1.12, 1.13 sources, 
	1.8, 1.9
Message-ID: <200601141935.k0EJZ5ZX031245@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31224

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
- 0.8.0pre4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Jan 2006 18:42:40 -0000	1.8
+++ .cvsignore	14 Jan 2006 19:34:32 -0000	1.9
@@ -1 +1 @@
-lirc-0.8.0pre3.tar.bz2
+lirc-0.8.0pre4.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lirc.spec	1 Jan 2006 18:42:40 -0000	1.12
+++ lirc.spec	14 Jan 2006 19:34:32 -0000	1.13
@@ -10,14 +10,14 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre3%{?dist}
+Release:        0.2.pre4%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre3.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre4.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre3
+%setup -q -n %{name}-%{version}pre4
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
+- 0.8.0pre4.
+
 * Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
 - 0.8.0pre3.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Jan 2006 18:42:40 -0000	1.8
+++ sources	14 Jan 2006 19:34:32 -0000	1.9
@@ -1 +1 @@
-c20cf756b0b5cad96437bc25e81b166a  lirc-0.8.0pre3.tar.bz2
+8e69494b32a14d7513499bd7d4a350d2  lirc-0.8.0pre4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:14 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:14 -0500
Subject: rpms/rtorrent - New directory
Message-ID: <200601142128.k0ELSGKw002608@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2600/rtorrent

Log Message:
Directory /cvs/extras/rpms/rtorrent added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:20 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:20 -0500
Subject: rpms/rtorrent/devel - New directory
Message-ID: <200601142128.k0ELSMxN002623@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2600/rtorrent/devel

Log Message:
Directory /cvs/extras/rpms/rtorrent/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:48 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:48 -0500
Subject: rpms/rtorrent Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601142128.k0ELSpVE002659@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2647

Added Files:
	Makefile import.log 
Log Message:
Setup of module rtorrent


--- NEW FILE Makefile ---
# Top level Makefile for module rtorrent
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:55 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:55 -0500
Subject: rpms/rtorrent/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601142128.k0ELSvXc002679@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2647/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rtorrent


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 21:29:59 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:29:59 -0500
Subject: rpms/rtorrent import.log,1.1,1.2
Message-ID: <200601142130.k0ELUWeV002773@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2720

Modified Files:
	import.log 
Log Message:
auto-import rtorrent-0.4.2-2 on branch devel from rtorrent-0.4.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 21:28:48 -0000	1.1
+++ import.log	14 Jan 2006 21:29:59 -0000	1.2
@@ -0,0 +1 @@
+rtorrent-0_4_2-2:HEAD:rtorrent-0.4.2-2.src.rpm:1137274197



From fedora-extras-commits at redhat.com  Sat Jan 14 21:30:05 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:30:05 -0500
Subject: owners owners.list,1.531,1.532
Message-ID: <200601142130.k0ELUbLY002776@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2733

Modified Files:
	owners.list 
Log Message:
Added rtorrent


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- owners.list	14 Jan 2006 19:08:36 -0000	1.531
+++ owners.list	14 Jan 2006 21:30:04 -0000	1.532
@@ -1104,6 +1104,7 @@
 Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
@@ -1368,4 +1369,3 @@
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
-



From fedora-extras-commits at redhat.com  Sat Jan 14 21:30:06 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:30:06 -0500
Subject: rpms/rtorrent/devel rtorrent.rc.example, NONE, 1.1 rtorrent.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601142130.k0ELUcjC002780@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2720/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rtorrent.rc.example rtorrent.spec 
Log Message:
auto-import rtorrent-0.4.2-2 on branch devel from rtorrent-0.4.2-2.src.rpm


--- NEW FILE rtorrent.rc.example ---
# This is an example resource file for rTorrent. Copy to
# ~/.rtorrent.rc and enable/modify the options as needed. Remember to
# uncomment the options you wish to enable.

# Maximum and minimum number of peers to connect to per torrent.
#min_peers = 40
#max_peers = 100

# Maximum number of simultanious uploads per torrent.
#max_uploads = 15

# Global upload and download rate in KiB. "0" for unlimited.
#download_rate = 0
#upload_rate = 0

# Default directory to save the downloaded torrents.
#directory = ./

# Default session directory. Make sure you don't run multiple instance
# of rtorrent using the same session directory. Perhaps using a
# relative path?
#session = ./session

# Watch a directory for new torrents, and stop those that have been
# deleted.
#schedule = watch_directory,5,5,load_start=./watch/*.torrent
#schedule = untied_directory,5,5,stop_untied=

# The ip address reported to the tracker.
#ip = rakshasa

# The ip address the listening socket and outgoing connections is
# bound to.
#bind = rakshasa

# Port range to use for listening.
#port_range = 6890-6999

# Start opening ports at a random position within the port range.
#port_random = no

# Check hash for finished torrents. Might be usefull until the bug is
# fixed that causes lack of diskspace not to be properly reported.
#check_hash = no

# Set whetever the client should try to connect to UDP trackers.
#use_udp_trackers = yes

# Alternative calls to bind and ip that should handle dynamic ip's.
#schedule = ip_tick,0,1800,ip=rakshasa
#schedule = bind_tick,0,1800,bind=rakshasa

#
# Do not modify the following parameters unless you know what you're doing.
#

# Hash read-ahead controls how many MB to request the kernel to read
# ahead. If the value is too low the disk may not be fully utilized,
# while if too high the kernel might not be able to keep the read
# pages in memory thus end up trashing.
#hash_read_ahead = 10

# Interval between attempts to check the hash, in milliseconds.
#hash_interval = 100

# Number of attempts to check the hash while using the mincore status,
# before forcing. Overworked systems might need lower values to get a
# decent hash checking rate.
#hash_max_tries = 10

# Max number of files to keep open simultaniously.
#max_open_files = 128

# Number of sockets to simultaneously keep open.
#max_open_sockets = <no default>


# Example of scheduling commands: Switch between two ip's every 5
# seconds.
#schedule = "ip_tick1,5,10,ip=torretta"
#schedule = "ip_tick2,10,10,ip=lampedusa"

# Remove a scheduled event.
#schedule_remove = "ip_tick1"


--- NEW FILE rtorrent.spec ---
Name:          rtorrent
License:       GPL
Group:         Applications/Internet
Version:       0.4.2
Release:       2%{?dist}
Summary:       BitTorrent client based on libtorrent 
URL:           http://rtorrent.rakshasa.no/
Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
Source1:       rtorrent.rc.example
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.8.2, curl-devel

%description
A BitTorrent client using libtorrent, which on high-bandwidth connections is 
able to seed at 3 times the speed of the official client. Using
ncurses its ideal for use with screen or dtach. It supports 
saving of sessions and allows the user to add and remove torrents and scanning
of directories for torrent files to seed and/or download.

%prep
%setup -q

%build
install -m 644 %{SOURCE1} .
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

%clean
rm -rf $RPM_BUILD_ROOT
		  
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README TODO rtorrent.rc.example 
%{_bindir}/rtorrent
%{_mandir}/man1/rtorrent*

%changelog
* Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-2
- Improved summary & description
- Removed explicit requires, leaving to rpm
- Changed mode of rtorrent.rc.example to 644

* Wed Jan 11 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 21:28:54 -0000	1.1
+++ .cvsignore	14 Jan 2006 21:30:05 -0000	1.2
@@ -0,0 +1 @@
+rtorrent-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 21:28:54 -0000	1.1
+++ sources	14 Jan 2006 21:30:05 -0000	1.2
@@ -0,0 +1 @@
+2e6cc9fe0008da3ff4e3462e59386064  rtorrent-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 21:42:00 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:42:00 -0500
Subject: rpms/rtorrent/devel rtorrent.spec,1.1,1.2
Message-ID: <200601142142.k0ELgXEi002994@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2977

Modified Files:
	rtorrent.spec 
Log Message:
fixed ncurses requirement booboo


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rtorrent.spec	14 Jan 2006 21:30:05 -0000	1.1
+++ rtorrent.spec	14 Jan 2006 21:42:00 -0000	1.2
@@ -2,13 +2,13 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.4.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.8.2, curl-devel
+BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.8.2, curl-devel, ncurses-devel
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -39,6 +39,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-3
+- Added ncurses-devel to buildrequirements
+
 * Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-2
 - Improved summary & description
 - Removed explicit requires, leaving to rpm



From fedora-extras-commits at redhat.com  Sat Jan 14 22:10:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Jan 2006 17:10:20 -0500
Subject: owners owners.list,1.532,1.533
Message-ID: <200601142211.k0EMBA20004821@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4804

Modified Files:
	owners.list 
Log Message:
Taking over perl-YAML.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- owners.list	14 Jan 2006 21:30:04 -0000	1.532
+++ owners.list	14 Jan 2006 22:10:20 -0000	1.533
@@ -965,7 +965,7 @@
 Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 22:16:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Jan 2006 17:16:05 -0500
Subject: rpms/celestia/devel celestia.spec,1.10,1.11
Message-ID: <200601142216.k0EMGcRp004999@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4982

Modified Files:
	celestia.spec 
Log Message:
BR xorg-x11-proto-devel and libXt-devel.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- celestia.spec	26 Dec 2005 22:50:48 -0000	1.10
+++ celestia.spec	14 Jan 2006 22:16:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
@@ -18,6 +18,8 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libGL-devel
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  libXt-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Steven Pritchard <steve at kspei.com> 1.4.0-2
+- Add BR: xorg-x11-proto-devel, libXt-devel
+
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0
 - Remove celestia-1.3.2-compile.patch (seems to be applied upstream)



From fedora-extras-commits at redhat.com  Sat Jan 14 22:20:51 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 17:20:51 -0500
Subject: rpms/geos/devel geos.spec,1.1,1.2
Message-ID: <200601142221.k0EMLNYf005033@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5016

Modified Files:
	geos.spec 
Log Message:
Added patch for gcc4




Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geos.spec	7 Jan 2006 18:00:46 -0000	1.1
+++ geos.spec	14 Jan 2006 22:20:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name: geos
 Version: 2.2.1
-Release: 1
+Release: 2%{?dist}
 Summary: GEOS is a C++ port of the Java Topology Suite
 
 Group: Applications/Engineering
@@ -8,6 +8,7 @@
 URL: http://geos.refractions.net
 Source0: http://geos.refractions.net/%{name}-%{version}.tar.bz2
 Patch0: geos-config.in.patch
+Patch1: geos-2.2.1-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen
 
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .buildroot 
+%patch1 -p1
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -71,6 +73,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.2.1-2
+- Add gcc4 patch
+
 * Sat Dec 31 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-1
 - Updated to address review comments in bug 17039
 



From fedora-extras-commits at redhat.com  Sat Jan 14 22:23:47 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 17:23:47 -0500
Subject: rpms/geos/devel geos-2.2.1-gcc4.patch,NONE,1.1
Message-ID: <200601142223.k0EMNnSo005080@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5065

Added Files:
	geos-2.2.1-gcc4.patch 
Log Message:
Added patch file



geos-2.2.1-gcc4.patch:

--- NEW FILE geos-2.2.1-gcc4.patch ---
--- source/headers/geos/geom.h~	2005-11-29 09:52:21.000000000 -0800
+++ source/headers/geos/geom.h	2006-01-13 21:37:04.000000000 -0800
@@ -358,52 +358,52 @@
 	//double distance(Coordinate& p);
 	static Coordinate nullCoord;
 
-	void Coordinate::setNull() {
+	void setNull() {
 		x=DoubleNotANumber;
 		y=DoubleNotANumber;
 		z=DoubleNotANumber;
 	}
 
-	static Coordinate& Coordinate::getNull() {
+	static Coordinate& getNull() {
 		return nullCoord;
 	}
 
-	Coordinate::Coordinate() {
+	Coordinate() {
 		x=0.0;
 		y=0.0;
 		z=DoubleNotANumber;
 	}
 
-	Coordinate::Coordinate(double xNew, double yNew, double zNew) {
+	Coordinate(double xNew, double yNew, double zNew) {
 		x=xNew;
 		y=yNew;
 		z=zNew;
 	}
 
 #ifndef PROFILE_COORDINATE_COPIES
-	Coordinate::Coordinate(const Coordinate& c){
+	Coordinate(const Coordinate& c){
 		x=c.x;
 		y=c.y;
 		z=c.z;
 	}
 #else
-	Coordinate::Coordinate(const Coordinate& c);
+	Coordinate(const Coordinate& c);
 	Coordinate &operator=(const Coordinate &c);
 #endif
 
-	Coordinate::Coordinate(double xNew, double yNew){
+	Coordinate(double xNew, double yNew){
 		x=xNew;
 		y=yNew;
 		z=DoubleNotANumber;
 	}
 
-	void Coordinate::setCoordinate(const Coordinate& other) {
+	void setCoordinate(const Coordinate& other) {
 		x = other.x;
 		y = other.y;
 		z = other.z;
 	}
 
-	bool Coordinate::equals2D(const Coordinate& other) const {
+	bool equals2D(const Coordinate& other) const {
 		if (x != other.x) {
 		return false;
 		}
@@ -413,7 +413,7 @@
 		return true;
 	}
 
-	int Coordinate::compareTo(const Coordinate& other) const {
+	int compareTo(const Coordinate& other) const {
 		if (x < other.x) {
 		return -1;
 		}
@@ -429,22 +429,22 @@
 		return 0;
 	}
 
-	bool Coordinate::equals3D(const Coordinate& other) const {
+	bool equals3D(const Coordinate& other) const {
 		return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z)));
 	}
 
-	void Coordinate::makePrecise(const PrecisionModel *precisionModel) {
+	void makePrecise(const PrecisionModel *precisionModel) {
 		x = precisionModel->makePrecise(x);
 		y = precisionModel->makePrecise(y);
 	}
 
-	double Coordinate::distance(const Coordinate& p) const {
+	double distance(const Coordinate& p) const {
 		double dx = x - p.x;
 		double dy = y - p.y;
 		return sqrt(dx * dx + dy * dy);
 	}
 
-	int Coordinate::hashCode() {
+	int hashCode() {
 		//Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
 		int result = 17;
 		result = 37 * result + hashCode(x);
@@ -456,7 +456,7 @@
 	* Returns a hash code for a double value, using the algorithm from
 	* Joshua Bloch's book <i>Effective Java</i>
 	*/
-	static int Coordinate::hashCode(double x) {
+	static int hashCode(double x) {
 		int64 f = (int64)(x);
 		return (int)(f^(f>>32));
 	}



From fedora-extras-commits at redhat.com  Sat Jan 14 23:02:33 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 18:02:33 -0500
Subject: rpms/geos/devel geos-2.2.1-gcc4.patch,1.1,1.2
Message-ID: <200601142303.k0EN36pB006941@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6921

Modified Files:
	geos-2.2.1-gcc4.patch 
Log Message:
Updated patch file with correct path to source file



geos-2.2.1-gcc4.patch:

Index: geos-2.2.1-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos-2.2.1-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geos-2.2.1-gcc4.patch	14 Jan 2006 22:23:47 -0000	1.1
+++ geos-2.2.1-gcc4.patch	14 Jan 2006 23:02:32 -0000	1.2
@@ -1,5 +1,5 @@
---- source/headers/geos/geom.h~	2005-11-29 09:52:21.000000000 -0800
-+++ source/headers/geos/geom.h	2006-01-13 21:37:04.000000000 -0800
+--- geos-2.2.1.orig/source/headers/geos/geom.h	2006-01-14 14:40:33.000000000 -0800
++++ geos-2.2.1/source/headers/geos/geom.h	2006-01-14 14:41:12.000000000 -0800
 @@ -358,52 +358,52 @@
  	//double distance(Coordinate& p);
  	static Coordinate nullCoord;



From fedora-extras-commits at redhat.com  Sat Jan 14 23:11:09 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 18:11:09 -0500
Subject: rpms/geos/devel geos.spec,1.2,1.3
Message-ID: <200601142311.k0ENBiAf007029@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7009

Modified Files:
	geos.spec 
Log Message:
Updated to rev 3 due to patch file change



Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geos.spec	14 Jan 2006 22:20:51 -0000	1.2
+++ geos.spec	14 Jan 2006 23:11:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name: geos
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: GEOS is a C++ port of the Java Topology Suite
 
 Group: Applications/Engineering
@@ -73,6 +73,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Jan 14 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-3
+- Updated gcc4 patch
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.2.1-2
 - Add gcc4 patch
 



From fedora-extras-commits at redhat.com  Sat Jan 14 23:14:25 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 18:14:25 -0500
Subject: rpms/geos/devel geos.spec,1.3,1.4
Message-ID: <200601142314.k0ENEvaD007094@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070

Modified Files:
	geos.spec 
Log Message:
Corrected wrong year in changelog



Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geos.spec	14 Jan 2006 23:11:09 -0000	1.3
+++ geos.spec	14 Jan 2006 23:14:24 -0000	1.4
@@ -73,7 +73,7 @@
 %exclude %{_libdir}/*.la
 
 %changelog
-* Sat Jan 14 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-3
+* Sat Jan 14 2006 Shawn McCann <smccann at canasoft.ca> - 2.2.1-3
 - Updated gcc4 patch
 
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.2.1-2



From fedora-extras-commits at redhat.com  Sun Jan 15 06:24:52 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 01:24:52 -0500
Subject: rpms/perl-DBIx-SearchBuilder/FC-4
	DBIx-SearchBuilder-1.38-fc4-hacks.diff, NONE, 1.1 .cvsignore,
	1.2, 1.3 perl-DBIx-SearchBuilder.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601150625.k0F6PS9s021830@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21806

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Added Files:
	DBIx-SearchBuilder-1.38-fc4-hacks.diff 
Log Message:
tmp

DBIx-SearchBuilder-1.38-fc4-hacks.diff:

--- NEW FILE DBIx-SearchBuilder-1.38-fc4-hacks.diff ---
diff -uNr DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Module.pm DBIx-SearchBuilder-1.38/inc/Test/Builder/Module.pm
--- DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Module.pm	1970-01-01 01:00:00.000000000 +0100
+++ DBIx-SearchBuilder-1.38/inc/Test/Builder/Module.pm	2005-10-08 08:56:17.000000000 +0200
@@ -0,0 +1,182 @@
+package Test::Builder::Module;
+
+use Test::Builder;
+
+require Exporter;
+ at ISA = qw(Exporter);
+
+$VERSION = '0.03';
+
+use strict;
+
+# 5.004's Exporter doesn't have export_to_level.
+my $_export_to_level = sub {
+      my $pkg = shift;
+      my $level = shift;
+      (undef) = shift;                  # redundant arg
+      my $callpkg = caller($level);
+      $pkg->export($callpkg, @_);
+};
+
+
+=head1 NAME
+
+Test::Builder::Module - Base class for test modules
+
+=head1 SYNOPSIS
+
+  # Emulates Test::Simple
+  package Your::Module;
+
+  my $CLASS = __PACKAGE__;
+
+  use base 'Test::Builder::Module';
+  @EXPORT = qw(ok);
+
+  sub ok ($;$) {
+      my $tb = $CLASS->builder;
+      return $tb->ok(@_);
+  }
+  
+  1;
+
+
+=head1 DESCRIPTION
+
+This is a superclass for Test::Builder-based modules.  It provides a
+handful of common functionality and a method of getting at the underlying
+Test::Builder object.
+
+
+=head2 Importing
+
+Test::Builder::Module is a subclass of Exporter which means your
+module is also a subclass of Exporter.  @EXPORT, @EXPORT_OK, etc...
+all act normally.
+
+A few methods are provided to do the C<use Your::Module tests => 23> part
+for you.
+
+=head3 import
+
+Test::Builder::Module provides an import() method which acts in the
+same basic way as Test::More's, setting the plan and controling
+exporting of functions and variables.  This allows your module to set
+the plan independent of Test::More.
+
+All arguments passed to import() are passed onto 
+C<< Your::Module->builder->plan() >> with the exception of 
+C<import =>[qw(things to import)]>.
+
+    use Your::Module import => [qw(this that)], tests => 23;
+
+says to import the functions this() and that() as well as set the plan
+to be 23 tests.
+
+import() also sets the exported_to() attribute of your builder to be
+the caller of the import() function.
+
+Additional behaviors can be added to your import() method by overriding
+import_extra().
+
+=cut
+
+sub import {
+    my($class) = shift;
+
+    my $test = $class->builder;
+
+    my $caller = caller;
+
+    $test->exported_to($caller);
+
+    $class->import_extra(\@_);
+    my(@imports) = $class->_strip_imports(\@_);
+
+    $test->plan(@_);
+
+    $class->$_export_to_level(1, $class, @imports);
+}
+
+
+sub _strip_imports {
+    my $class = shift;
+    my $list  = shift;
+
+    my @imports = ();
+    my @other   = ();
+    my $idx = 0;
+    while( $idx <= $#{$list} ) {
+        my $item = $list->[$idx];
+
+        if( defined $item and $item eq 'import' ) {
+            push @imports, @{$list->[$idx+1]};
+            $idx++;
+        }
+        else {
+            push @other, $item;
+        }
+
+        $idx++;
+    }
+
+    @$list = @other;
+
+    return @imports;
+}
+
+
+=head3 import_extra
+
+    Your::Module->import_extra(\@import_args);
+
+import_extra() is called by import().  It provides an opportunity for you
+to add behaviors to your module based on its import list.
+
+Any extra arguments which shouldn't be passed on to plan() should be 
+stripped off by this method.
+
+See Test::More for an example of its use.
+
+B<NOTE> This mechanism is I<VERY ALPHA AND LIKELY TO CHANGE> as it
+feels like a bit of an ugly hack in its current form.
+
+=cut
+
+sub import_extra {}
+
+
+=head2 Builder
+
+Test::Builder::Module provides some methods of getting at the underlying
+Test::Builder object.
+
+=head3 builder
+
+  my $builder = Your::Class->builder;
+
+This method returns the Test::Builder object associated with Your::Class.
+It is not a constructor so you can call it as often as you like.
+
+This is the preferred way to get the Test::Builder object.  You should
+I<not> get it via C<< Test::Builder->new >> as was previously
+recommended.
+
+The object returned by builder() may change at runtime so you should
+call builder() inside each function rather than store it in a global.
+
+  sub ok {
+      my $builder = Your::Class->builder;
+
+      return $builder->ok(@_);
+  }
+
+
+=cut
+
+sub builder {
+    return Test::Builder->new;
+}
+
+
+1;
diff -uNr DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Tester/Color.pm DBIx-SearchBuilder-1.38/inc/Test/Builder/Tester/Color.pm
--- DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Tester/Color.pm	1970-01-01 01:00:00.000000000 +0100
+++ DBIx-SearchBuilder-1.38/inc/Test/Builder/Tester/Color.pm	2005-10-08 08:56:17.000000000 +0200
@@ -0,0 +1,50 @@
+package Test::Builder::Tester::Color;
+
+use strict;
+
+require Test::Builder::Tester;
+
+=head1 NAME
+
+Test::Builder::Tester::Color - turn on colour in Test::Builder::Tester
[...4012 lines suppressed...]
+
+This is an extremely simple, extremely basic module for writing tests
+suitable for CPAN modules and other pursuits.  If you wish to do more
+complicated testing, use the Test::More module (a drop-in replacement
+for this one).
+
+The basic unit of Perl testing is the ok.  For each thing you want to
+test your program will print out an "ok" or "not ok" to indicate pass
+or fail.  You do this with the ok() function (see below).
+
+The only other constraint is you must pre-declare how many tests you
+plan to run.  This is in case something goes horribly wrong during the
+test and your test program aborts, or skips a test or whatever.  You
+do this like so:
+
+    use Test::Simple tests => 23;
+
+You must have a plan.
+
+
+=over 4
+
+=item B<ok>
+
+  ok( $foo eq $bar, $name );
+  ok( $foo eq $bar );
+
+ok() is given an expression (in this case C<$foo eq $bar>).  If it's
+true, the test passed.  If it's false, it didn't.  That's about it.
+
+ok() prints out either "ok" or "not ok" along with a test number (it
+keeps track of that for you).
+
+  # This produces "ok 1 - Hell not yet frozen over" (or not ok)
+  ok( get_temperature($hell) > 0, 'Hell not yet frozen over' );
+
+If you provide a $name, that will be printed along with the "ok/not
+ok" to make it easier to find your test when if fails (just search for
+the name).  It also makes it easier for the next guy to understand
+what your test is for.  It's highly recommended you use test names.
+
+All tests are run in scalar context.  So this:
+
+    ok( @stuff, 'I have some stuff' );
+
+will do what you mean (fail if stuff is empty)
+
+=cut
+
+sub ok ($;$) {
+    $CLASS->builder->ok(@_);
+}
+
+
+=back
+
+Test::Simple will start by printing number of tests run in the form
+"1..M" (so "1..5" means you're going to run 5 tests).  This strange
+format lets Test::Harness know how many tests you plan on running in
+case something goes horribly wrong.
+
+If all your tests passed, Test::Simple will exit with zero (which is
+normal).  If anything failed it will exit with how many failed.  If
+you run less (or more) tests than you planned, the missing (or extras)
+will be considered failures.  If no tests were ever run Test::Simple
+will throw a warning and exit with 255.  If the test died, even after
+having successfully completed all its tests, it will still be
+considered a failure and will exit with 255.
+
+So the exit codes are...
+
+    0                   all tests successful
+    255                 test died or all passed but wrong # of tests run
+    any other number    how many failed (including missing or extras)
+
+If you fail more than 254 tests, it will be reported as 254.
+
+This module is by no means trying to be a complete testing system.
+It's just to get you started.  Once you're off the ground its
+recommended you look at L<Test::More>.
+
+
+=head1 EXAMPLE
+
+Here's an example of a simple .t file for the fictional Film module.
+
+    use Test::Simple tests => 5;
+
+    use Film;  # What you're testing.
+
+    my $btaste = Film->new({ Title    => 'Bad Taste',
+                             Director => 'Peter Jackson',
+                             Rating   => 'R',
+                             NumExplodingSheep => 1
+                           });
+    ok( defined($btaste) && ref $btaste eq 'Film,     'new() works' );
+
+    ok( $btaste->Title      eq 'Bad Taste',     'Title() get'    );
+    ok( $btaste->Director   eq 'Peter Jackson', 'Director() get' );
+    ok( $btaste->Rating     eq 'R',             'Rating() get'   );
+    ok( $btaste->NumExplodingSheep == 1,        'NumExplodingSheep() get' );
+
+It will produce output like this:
+
+    1..5
+    ok 1 - new() works
+    ok 2 - Title() get
+    ok 3 - Director() get
+    not ok 4 - Rating() get
+    #   Failed test 'Rating() get'
+    #   in t/film.t at line 14.
+    ok 5 - NumExplodingSheep() get
+    # Looks like you failed 1 tests of 5
+
+Indicating the Film::Rating() method is broken.
+
+
+=head1 CAVEATS
+
+Test::Simple will only report a maximum of 254 failures in its exit
+code.  If this is a problem, you probably have a huge test script.
+Split it into multiple files.  (Otherwise blame the Unix folks for
+using an unsigned short integer as the exit status).
+
+Because VMS's exit codes are much, much different than the rest of the
+universe, and perl does horrible mangling to them that gets in my way,
+it works like this on VMS.
+
+    0     SS$_NORMAL        all tests successful
+    4     SS$_ABORT         something went wrong
+
+Unfortunately, I can't differentiate any further.
+
+
+=head1 NOTES
+
+Test::Simple is B<explicitly> tested all the way back to perl 5.004.
+
+Test::Simple is thread-safe in perl 5.8.0 and up.
+
+=head1 HISTORY
+
+This module was conceived while talking with Tony Bowden in his
+kitchen one night about the problems I was having writing some really
+complicated feature into the new Testing module.  He observed that the
+main problem is not dealing with these edge cases but that people hate
+to write tests B<at all>.  What was needed was a dead simple module
+that took all the hard work out of testing and was really, really easy
+to learn.  Paul Johnson simultaneously had this idea (unfortunately,
+he wasn't in Tony's kitchen).  This is it.
+
+
+=head1 SEE ALSO
+
+=over 4
+
+=item L<Test::More>
+
+More testing functions!  Once you outgrow Test::Simple, look at
+Test::More.  Test::Simple is 100% forward compatible with Test::More
+(i.e. you can just use Test::More instead of Test::Simple in your
+programs and things will still work).
+
+=item L<Test>
+
+The original Perl testing module.
+
+=item L<Test::Unit>
+
+Elaborate unit testing.
+
+=item L<Test::Inline>, L<SelfTest>
+
+Embed tests in your code!
+
+=item L<Test::Harness>
+
+Interprets the output of your test program.
+
+=back
+
+
+=head1 AUTHORS
+
+Idea by Tony Bowden and Paul Johnson, code by Michael G Schwern
+E<lt>schwern at pobox.comE<gt>, wardrobe by Calvin Klein.
+
+
+=head1 COPYRIGHT
+
+Copyright 2001, 2002, 2004 by Michael G Schwern E<lt>schwern at pobox.comE<gt>.
+
+This program is free software; you can redistribute it and/or 
+modify it under the same terms as Perl itself.
+
+See F<http://www.perl.com/perl/misc/Artistic.html>
+
+=cut
+
+1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Oct 2005 01:42:57 -0000	1.2
+++ .cvsignore	15 Jan 2006 06:24:51 -0000	1.3
@@ -1 +1 @@
-DBIx-SearchBuilder-1.27.tar.gz
+DBIx-SearchBuilder-1.38.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-DBIx-SearchBuilder.spec	11 Oct 2005 01:58:08 -0000	1.2
+++ perl-DBIx-SearchBuilder.spec	15 Jan 2006 06:24:51 -0000	1.3
@@ -6,29 +6,36 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.27
-Release: 	3%{?dist}
+Version: 	1.38
+Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/DBIx-SearchBuilder/
 Source0: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/DBIx-SearchBuilder-%{version}.tar.gz
+# A private copy of Test::Simple to work around PR #166475. 
+Patch0:         DBIx-SearchBuilder-1.38-fc4-hacks.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
-BuildRequires: 	perl(Want)
-BuildRequires: 	perl(Cache::Simple::TimedExpiry) >= 0.21
-BuildRequires: 	perl(Class::ReturnValue) >= 0.4
-BuildRequires: 	perl(DBD::SQLite)
+BuildRequires:	perl(Want)
+BuildRequires:	perl(Cache::Simple::TimedExpiry) >= 0.21
+BuildRequires:	perl(Class::ReturnValue) >= 0.4
+BuildRequires:	perl(DBD::SQLite)
+BuildRequires:	perl(DBI)
+BuildRequires:	perl(ExtUtils::AutoInstall) >= 0.49
+# PR #166475
+BuildConflicts: perl(Test::More) >= 0.52
+BuildRequires:	perl(Class::Accessor)
 
 # Improved tests:
 BuildRequires:	perl(Test::Pod)
 
-%if "%version" > "1.27"
-BuildRequires: 	perl(ExtUtils::AutoInstall) >= 0.49
-BuildRequires:	perl(Test::More) >= 0.52
-%endif
+# Optional features
+BuildRequires:	perl(DBIx::DBSchema)
+BuildRequires:	perl(capitalization) >= 0.03
+BuildRequires:	perl(Clone)
 
 %description
 This module provides an object-oriented mechanism for retrieving and
@@ -39,8 +46,13 @@
 chmod -x Changes
 find -name '*.pm' -exec chmod -x {} \;
 
+%patch0 -p1
+
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+# --skipdeps causes ExtUtils::AutoInstall not to try auto-installing 
+# missing optional features
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
+
 make %{?_smp_mflags}
 
 %install
@@ -60,9 +72,7 @@
 %defattr(-,root,root,-)
 # 
 %doc Changes
-%if "%{version}" > "1.27"
 %doc README ROADMAP
-%endif
 %{perl_vendorlib}/DBIx
 %{_mandir}/man3/*
 %exclude %{perl_vendorlib}/DBIx/SearchBuilder/Handle/Oracle*
@@ -84,6 +94,10 @@
 %endif
 
 %changelog
+* Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-1
+- Update to 1.38.
+- Add a private copy of Test-Simple-0.62 to work around PR #166475.
+
 * Tue Oct 11 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.27-3
 - Spec file cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Oct 2005 01:42:58 -0000	1.2
+++ sources	15 Jan 2006 06:24:51 -0000	1.3
@@ -1 +1 @@
-b3bc442e5e447e8a02417c417cff7371  DBIx-SearchBuilder-1.27.tar.gz
+409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 15 06:37:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 01:37:24 -0500
Subject: rpms/rt3/devel .cvsignore,1.2,1.3 rt3.spec,1.6,1.7 sources,1.2,1.3
Message-ID: <200601150637.k0F6buT9021918@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21897

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Oct 2005 01:46:42 -0000	1.2
+++ .cvsignore	15 Jan 2006 06:37:23 -0000	1.3
@@ -1 +1 @@
-rt-3.4.4.tar.gz
+rt-3.4.5.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rt3.spec	7 Dec 2005 12:36:19 -0000	1.6
+++ rt3.spec	15 Jan 2006 06:37:23 -0000	1.7
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,8 +12,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.4.4
-Release:	11%{?dist}
+Version:	3.4.5
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -235,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.5-1
+- Upstream update.
+
 * Wed Dec 07 2005 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.4-11
 - Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Oct 2005 01:46:42 -0000	1.2
+++ sources	15 Jan 2006 06:37:23 -0000	1.3
@@ -1 +1 @@
-769d77eea39006be643cbd2db4820ba3  rt-3.4.4.tar.gz
+16c8007cba54669e6c9de95cfc680b2a  rt-3.4.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 15 10:13:23 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 15 Jan 2006 05:13:23 -0500
Subject: rpms/fuse/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 fuse-emulator-0.7.0.spec, 1.1, NONE
Message-ID: <200601151013.k0FADtBb000805@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv786

Modified Files:
	.cvsignore sources 
Removed Files:
	fuse-emulator-0.7.0.spec 
Log Message:
revert back to fuse (the filesystem) 2.4.2-2 ; pfj overwrote is accidentally


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2006 00:49:50 -0000	1.3
+++ .cvsignore	15 Jan 2006 10:13:21 -0000	1.4
@@ -1 +1 @@
-fuse-0.7.0.tar.gz
+fuse-2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2006 00:49:50 -0000	1.3
+++ sources	15 Jan 2006 10:13:22 -0000	1.4
@@ -1 +1 @@
-ebb124e808e6467630efaae01fe03b64  fuse-0.7.0.tar.gz
+6e3d9a580c45ddf4a06558c135c158c2  fuse-2.4.2.tar.gz


--- fuse-emulator-0.7.0.spec DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:16:27 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 15 Jan 2006 05:16:27 -0500
Subject: rpms/fuse/devel fuse-README.fedora, 1.2, 1.3 fuse-makedev.d-fuse,
	1.2, 1.3 fuse-mount.fuse.patch, 1.2, 1.3 fuse-udev.nodes, 1.2,
	1.3 fuse-udev_rules.patch, 1.2, 1.3 fuse.spec, 1.3,
	1.4 README.z88sdk, 1.1, NONE fuse-sound.patch, 1.1,
	NONE fuse.png, 1.1, NONE
Message-ID: <200601151016.k0FAGxWL000899@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv866

Added Files:
	fuse-README.fedora fuse-makedev.d-fuse fuse-mount.fuse.patch 
	fuse-udev.nodes fuse-udev_rules.patch fuse.spec 
Removed Files:
	README.z88sdk fuse-sound.patch fuse.png 
Log Message:
revert back to fuse (the filesystem) 2.4.2-2 ; pfj overwrote is accidentally (second part)


Index: fuse-README.fedora
===================================================================
RCS file: fuse-README.fedora
diff -N fuse-README.fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-README.fedora	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1,17 @@
+This fuse package for security reasons only allows members of the group "fuse"
+to (u)mount fuse filesystems. If you for example want to allow the user "foo" 
+to mount fuse filesystems you have to add him to the fuse group by running
+
+# /usr/sbin/usermod -a -G fuse foo
+
+Or use tools like "system-config-users" to add user "foo" to the fuse group.
+
+Note that the user has to re-login after he was added to the group.
+
+
+If you don't want to add all users to the fuse group you can also run
+
+# chmod 4755 /usr/bin/fusermount
+
+to allow everyone to mount fuse filesystems. You have to re-run that command
+after each fuse update.


Index: fuse-makedev.d-fuse
===================================================================
RCS file: fuse-makedev.d-fuse
diff -N fuse-makedev.d-fuse
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1 @@
+c 660 root     fuse      10 229  1   1 fuse

fuse-mount.fuse.patch:

Index: fuse-mount.fuse.patch
===================================================================
RCS file: fuse-mount.fuse.patch
diff -N fuse-mount.fuse.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-mount.fuse.patch	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1,23 @@
+diff -u util.org/mount.fuse util/mount.fuse
+--- util.org/mount.fuse	2005-11-02 20:52:12.000000000 +0100
++++ util/mount.fuse	2005-11-02 20:59:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ # Thanks to Miklos Szeredi <miklos at szeredi.hu>
+ # to kick me to the right way
+ #
++export PATH
+ 
+ VERSION="0.0.1"
+ PRGNAME=`basename $0`
+@@ -40,9 +41,9 @@
+ shift
+ shift
+ 
+-OPTIONS="$@"
++# If there is a better regex that can remove all user from a sting like "-o user,rw,noexec,user,nosuid,nodev,user" tell me, thx
++OPTIONS="`echo $@ | sed 's|,user$|| ; s| user,| | ; s|,user,|,|'`"
+ 
+-export PATH
+ ${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS}
+ 
+ 


Index: fuse-udev.nodes
===================================================================
RCS file: fuse-udev.nodes
diff -N fuse-udev.nodes
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-udev.nodes	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1 @@
+fuse

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: fuse-udev_rules.patch
diff -N fuse-udev_rules.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-udev_rules.patch	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1,6 @@
+diff -u util.org/udev.rules util/udev.rules
+--- util.org/udev.rules	2005-11-03 19:38:05.000000000 +0100
++++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
+@@ -1 +1 @@
+-KERNEL="fuse", NAME="%k", MODE="0666"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: fuse.spec
diff -N fuse.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse.spec	15 Jan 2006 10:16:27 -0000	1.4
@@ -0,0 +1,140 @@
+Name:           fuse
+Version:        2.4.2
+Release:        2%{?dist}
+Summary:        File System in Userspace (FUSE) utilities
+
+Group:          System Environment/Base
+License:        GPL
+URL:            http://fuse.sf.net
+Source0:        http://dl.sourceforge.net/sourceforge/fuse/fuse-2.4.2.tar.gz
+Source1:	fuse-udev.nodes
+Source2:	fuse-makedev.d-fuse
+Source3:	fuse-README.fedora
+
+Patch0:		fuse-mount.fuse.patch
+Patch1:		fuse-udev_rules.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	kernel >= 2.6.14
+Requires(pre):	  %{_sbindir}/groupadd
+Requires(post):   /sbin/MAKEDEV
+Requires(postun): %{_sbindir}/groupdel
+
+%description
+With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains the FUSE userspace tools to 
+mount a FUSE filesystem.
+
+Note: For security reasons only members of the group "fuse" are allowed to
+(u)mount fuse filesystems. You can find more details on this issue in
+%{_docdir}/%{name}-%{version}/README.fedora
+
+
+%package libs
+Summary:        File System in Userspace (FUSE) libraries
+Group:          System Environment/Libraries
+License:        LGPL
+
+%description libs
+Devel With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains the FUSE libraries. 
+
+
+%package devel
+Summary:        File System in Userspace (FUSE) devel files
+Group:          Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+License:        LGPL
+
+%description devel
+With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains development files (headers, 
+pgk-config) to develop FUSE based applications/filesystems.
+
+
+%prep
+%setup -q
+#disable device creation during build/install
+sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
+%patch0 -b .patch0
+%patch1 -b .patch1
+cp %{SOURCE3} README.fedora
+
+%build
+%configure \
+ --disable-static \
+ --disable-kernel-module 
+make %{?_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 {} ';'
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
+# change from 4755 to 0755 to allow stripping -- fixed later in files
+chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre 
+if [ $1 -eq 1 ]; then
+     %{_sbindir}/groupadd -r fuse &>/dev/null || :
+fi
+
+%post
+/sbin/MAKEDEV fuse
+
+%postun 
+if [ $1 = 0 ]; then
+ %{_sbindir}/groupdel fuse || :
+fi
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files
+%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
+/sbin/mount.fuse
+%attr(4754,root,fuse) %{_bindir}/fusermount
+%{_sysconfdir}/makedev.d/z-fuse
+%{_sysconfdir}/udev/rules.d/40-fuse.rules
+%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+
+%files libs
+%doc COPYING.LIB
+%{_libdir}/libfuse.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libfuse.so
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/fuse.h
+%{_includedir}/fuse
+
+%changelog
+* Wed Nov 23 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.2-1
+- Use dist
+
+* Wed Nov 23 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.2-1
+- Update to 2.4.2 (solves CVE-2005-3531)
+- Update README.fedora
+
+* Sat Nov 12 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-3
+- Add README.fedora
+- Add hint to README.fedora and that you have to be member of the group "fuse"
+  in the description
+- Use groupadd instead of fedora-groupadd
+
+* Fri Nov 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-2
+- Rename packages a bit
+- use makedev.d/40-fuse.nodes
+- fix /sbin/mount.fuse
+- Use a fuse group to restict access to fuse-filesystems
+
+* Fri Oct 28 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-1
+- Initial RPM release.


--- README.z88sdk DELETED ---


--- fuse-sound.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:07 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:07 -0500
Subject: rpms/wavpack - New directory
Message-ID: <200601151050.k0FAo93k001044@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1036/wavpack

Log Message:
Directory /cvs/extras/rpms/wavpack added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:13 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:13 -0500
Subject: rpms/wavpack/devel - New directory
Message-ID: <200601151050.k0FAoFCE001059@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1036/wavpack/devel

Log Message:
Directory /cvs/extras/rpms/wavpack/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:40 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:40 -0500
Subject: rpms/wavpack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601151050.k0FAogpk001093@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1081

Added Files:
	Makefile import.log 
Log Message:
Setup of module wavpack


--- NEW FILE Makefile ---
# Top level Makefile for module wavpack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:46 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:46 -0500
Subject: rpms/wavpack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601151050.k0FAom0B001113@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1081/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wavpack


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:51:55 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:51:55 -0500
Subject: rpms/wavpack import.log,1.1,1.2
Message-ID: <200601151052.k0FAqSKa001220@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1183

Modified Files:
	import.log 
Log Message:
auto-import wavpack-4.31-1 on branch devel from wavpack-4.31-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wavpack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Jan 2006 10:50:40 -0000	1.1
+++ import.log	15 Jan 2006 10:51:55 -0000	1.2
@@ -0,0 +1 @@
+wavpack-4_31-1:HEAD:wavpack-4.31-1.src.rpm:1137322302



From fedora-extras-commits at redhat.com  Sun Jan 15 10:52:01 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:52:01 -0500
Subject: rpms/wavpack/devel wavpack-wavpack_pc_in.patch, NONE,
	1.1 wavpack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601151052.k0FAqYtq001224@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1183/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wavpack-wavpack_pc_in.patch wavpack.spec 
Log Message:
auto-import wavpack-4.31-1 on branch devel from wavpack-4.31-1.src.rpm

wavpack-wavpack_pc_in.patch:

--- NEW FILE wavpack-wavpack_pc_in.patch ---
--- wavpack.pc.in	2005-03-20 10:09:14.000000000 +0300
+++ wavpack.pc.in	2006-01-07 17:49:56.000000000 +0300
@@ -1,5 +1,5 @@
 prefix=@prefix@
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: wavpack
@@ -7,5 +7,5 @@
 Version: @PACKAGE_VERSION@
 Requires:
 Conflicts:
-Libs: -L${libdir} -lwavpack @ICONV@
-Cflags: -I${includedir} -DPACK -DUNPACK -DUSE_FSTREAMS -DTAGS -DSEEKING -DVER3
+Libs: -lwavpack @ICONV@
+Cflags: -DPACK -DUNPACK -DUSE_FSTREAMS -DTAGS -DSEEKING -DVER3


--- NEW FILE wavpack.spec ---
Name: 		wavpack
Summary: 	A completely open audiocodec
Version: 	4.31
Release: 	1%{?dist}
License: 	BSD
Group: 		Applications/Multimedia
Url: 		http://www.wavpack.com/
Source: 	http://www.wavpack.com/%{name}-%{version}.tar.bz2
Patch0:		wavpack-wavpack_pc_in.patch
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
WavPack is a completely open audio compression format providing lossless, 
high-quality lossy, and a unique hybrid compression mode. Although the 
technology is loosely based on previous versions of WavPack, the new 
version 4 format has been designed from the ground up to offer unparalleled 
performance and functionality.

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

%description devel
Files needed for developing apps using wavpack

%prep
%setup -q
%patch0 -p0

%build
%configure --disable-static 
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__rm} -f %{buildroot}/%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/libwavpack.so.*
%doc license.txt 

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/libwavpack.so
%doc ChangeLog format.txt README

%changelog
* Sat Jan 07 2006 Peter Lemenkov <lemenkov at newmail.ru> 4.31-1
- Fixed several issues with wavpack.pc.in
- Cosmetic fixes.
- Version 4.31

* Sun Nov 13 2005 Peter Lemenkov <lemenkov at newmail.ru> 4.3-1
- Initial build for FC-Extras
- Version 4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wavpack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2006 10:50:46 -0000	1.1
+++ .cvsignore	15 Jan 2006 10:52:01 -0000	1.2
@@ -0,0 +1 @@
+wavpack-4.31.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wavpack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2006 10:50:46 -0000	1.1
+++ sources	15 Jan 2006 10:52:01 -0000	1.2
@@ -0,0 +1 @@
+9d0edccd1556feebb3355f61828ea85f  wavpack-4.31.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 15 10:57:14 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:57:14 -0500
Subject: owners owners.list,1.533,1.534
Message-ID: <200601151057.k0FAvkli001297@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280

Modified Files:
	owners.list 
Log Message:

Added wavpack package




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- owners.list	14 Jan 2006 22:10:20 -0000	1.533
+++ owners.list	15 Jan 2006 10:57:13 -0000	1.534
@@ -1269,6 +1269,7 @@
 Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wavpack|A completely open audiocodec|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 15 11:33:23 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Jan 2006 06:33:23 -0500
Subject: rpms/meld/FC-4 .cvsignore, 1.6, 1.7 meld.spec, 1.11, 1.12 sources,
	1.6, 1.7 meld-1.0.0-fedora-162403.patch, 1.1,
	NONE meld-1.0.0-po_fr.patch, 1.1, NONE
Message-ID: <200601151133.k0FBXtOB003381@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3359

Modified Files:
	.cvsignore meld.spec sources 
Removed Files:
	meld-1.0.0-fedora-162403.patch meld-1.0.0-po_fr.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Aug 2005 12:55:39 -0000	1.6
+++ .cvsignore	15 Jan 2006 11:33:23 -0000	1.7
@@ -1 +1 @@
-meld-1.0.0.tar.bz2
+meld-1.1.2.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- meld.spec	20 Aug 2005 12:55:39 -0000	1.11
+++ meld.spec	15 Jan 2006 11:33:23 -0000	1.12
@@ -1,15 +1,13 @@
 Name:             meld
-Version:          1.0.0
-Release:          0.1%{?dist}
+Version:          1.1.2
+Release:          1%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
-Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
+Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
-Patch1:           meld-1.0.0-po_fr.patch
-Patch2:           meld-1.0.0-fedora-162403.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -38,8 +36,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
-%patch1 -p1 -b .po_fr
-%patch2 -p1 -b .fedora-162403
 
 
 %build
@@ -86,9 +82,8 @@
 
 
 %changelog
-* Sat Aug 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-0.1
-- Work around missing gnome-python2-gnomeprint dependency in
-  gnome-python2-gtksourceview package for FC4 and FC3 (#162403).
+* Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
+- Update to 1.1.2.
 
 * Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
 - Update to 1.0.0.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Aug 2005 12:55:39 -0000	1.6
+++ sources	15 Jan 2006 11:33:23 -0000	1.7
@@ -1 +1 @@
-ccde817f0396d39e9e40f31a3a7611f6  meld-1.0.0.tar.bz2
+a00473f852c32db0bcd48c84b0f27869  meld-1.1.2.tar.bz2


--- meld-1.0.0-fedora-162403.patch DELETED ---


--- meld-1.0.0-po_fr.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 11:48:19 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Jan 2006 06:48:19 -0500
Subject: rpms/meld/FC-4 meld.spec,1.12,1.13
Message-ID: <200601151148.k0FBmpgS003482@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3461

Modified Files:
	meld.spec 
Log Message:



Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- meld.spec	15 Jan 2006 11:33:23 -0000	1.12
+++ meld.spec	15 Jan 2006 11:48:19 -0000	1.13
@@ -20,6 +20,9 @@
 Requires:         pygtk2 >= 1.99.15
 Requires:         pygtk2-libglade
 
+# Ugly work-around for a packaging bug in Fedora Core 4 (#162403).
+Requires: gnome-python2-gtksourceview, gnome-python2-gnomeprint
+
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -82,6 +85,10 @@
 
 
 %changelog
+* Sun Jan 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
+- Add an ugly work-around for a packaging bug in Fedora Core 4 (#162403).
+- Deliberately not bumping release.
+
 * Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
 - Update to 1.1.2.
 



From fedora-extras-commits at redhat.com  Sun Jan 15 12:01:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Jan 2006 07:01:41 -0500
Subject: rpms/meld/FC-4 meld-1.0.0-fedora-162403.patch, 1.2, 1.3 meld.spec, 
	1.13, 1.14
Message-ID: <200601151202.k0FC2Eop005357@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5325

Modified Files:
	meld.spec 
Added Files:
	meld-1.0.0-fedora-162403.patch 
Log Message:
bring back the patch that works around #162403

meld-1.0.0-fedora-162403.patch:

Index: meld-1.0.0-fedora-162403.patch
===================================================================
RCS file: meld-1.0.0-fedora-162403.patch
diff -N meld-1.0.0-fedora-162403.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ meld-1.0.0-fedora-162403.patch	15 Jan 2006 12:01:41 -0000	1.3
@@ -0,0 +1,66 @@
+diff -Nur meld-1.0.0-orig/filediff.py meld-1.0.0/filediff.py
+--- meld-1.0.0-orig/filediff.py	2005-06-23 20:41:08.000000000 +0200
++++ meld-1.0.0/filediff.py	2005-08-20 14:48:24.000000000 +0200
+@@ -38,13 +38,22 @@
+ 
+ sourceview_available = 0
+ 
+-for sourceview in "gtksourceview sourceview".split():
+-    try:
+-        gsv = __import__(sourceview)
+-        sourceview_available = 1
+-        break
+-    except ImportError:
+-        pass
++# Work around missing strict dependency in gnome-python2-gtksourceview.
++gnomeprint_available = 0
++try:
++	__import__("gnomeprint")
++	gnomeprint_available = 1
++except ImportError:
++	pass
++
++if gnomeprint_available == 1:
++	for sourceview in "gtksourceview sourceview".split():
++		try:
++			gsv = __import__(sourceview)
++			sourceview_available = 1
++			break
++		except ImportError:
++			pass
+ 
+ if sourceview_available:
+     def set_highlighting_enabled(buf, fname, enabled):
+diff -Nur meld-1.0.0-orig/meldapp.py meld-1.0.0/meldapp.py
+--- meld-1.0.0-orig/meldapp.py	2005-07-01 20:32:08.000000000 +0200
++++ meld-1.0.0/meldapp.py	2005-08-20 14:46:21.000000000 +0200
+@@ -37,13 +37,22 @@
+ # optional
+ sourceview_available = 0
+ 
+-for sourceview in "gtksourceview sourceview".split():
+-    try:
+-        __import__(sourceview)
+-        sourceview_available = 1
+-        break
+-    except ImportError:
+-        pass
++# Work around missing strict dependency in gnome-python2-gtksourceview.
++gnomeprint_available = 0
++try:
++	__import__("gnomeprint")
++	gnomeprint_available = 1
++except ImportError:
++	pass
++
++if gnomeprint_available == 1:
++	for sourceview in "gtksourceview sourceview".split():
++		try:
++			__import__(sourceview)
++			sourceview_available = 1
++			break
++		except ImportError:
++			pass
+ 
+ version = "1.0.0"
+ 


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- meld.spec	15 Jan 2006 11:48:19 -0000	1.13
+++ meld.spec	15 Jan 2006 12:01:41 -0000	1.14
@@ -8,6 +8,7 @@
 URL:              http://meld.sourceforge.net/
 Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
+Patch1:           meld-1.0.0-fedora-162403.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -20,9 +21,6 @@
 Requires:         pygtk2 >= 1.99.15
 Requires:         pygtk2-libglade
 
-# Ugly work-around for a packaging bug in Fedora Core 4 (#162403).
-Requires: gnome-python2-gtksourceview, gnome-python2-gnomeprint
-
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -39,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
+%patch1 -p1 -b .fedora-162403
 
 
 %build
@@ -86,12 +85,16 @@
 
 %changelog
 * Sun Jan 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
-- Add an ugly work-around for a packaging bug in Fedora Core 4 (#162403).
+- Bring back the patch from 1.0.0-0.1 (for #162403 in FC <= 4).
 - Deliberately not bumping release.
 
 * Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
 - Update to 1.1.2.
 
+* Sat Aug 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-0.1
+- Work around missing gnome-python2-gnomeprint dependency in
+  gnome-python2-gtksourceview package for FC4 and FC3 (#162403).
+
 * Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
 - Update to 1.0.0.
 - Include fix for upstream bug #309408.



From fedora-extras-commits at redhat.com  Sun Jan 15 12:25:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Jan 2006 07:25:19 -0500
Subject: rpms/perl-Net-SSLeay/devel .cvsignore, 1.2, 1.3 perl-Net-SSLeay.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200601151225.k0FCPpeT005563@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-SSLeay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5540

Modified Files:
	.cvsignore perl-Net-SSLeay.spec sources 
Log Message:
* Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.30-1
- 1.30.
- Optionally run the test suite during build with "--with tests".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Dec 2004 17:25:07 -0000	1.2
+++ .cvsignore	15 Jan 2006 12:25:16 -0000	1.3
@@ -1 +1 @@
-Net_SSLeay.pm-1.26.tar.gz
+Net_SSLeay.pm-1.30.tar.gz


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-SSLeay.spec	9 Nov 2005 21:28:33 -0000	1.5
+++ perl-Net-SSLeay.spec	15 Jan 2006 12:25:16 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           perl-Net-SSLeay
-Version:        1.26
-Release:        3%{?dist}
+Version:        1.30
+Release:        1%{?dist}
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries
 License:        BSDish
 URL:            http://search.cpan.org/dist/Net_SSLeay.pm/
-Source0:        http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Net_SSLeay.pm-%{version}.tar.gz
 Patch0:         %{name}-test14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,7 +27,7 @@
 %setup -q -n Net_SSLeay.pm-%{version}
 %patch0 -p0
 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle
-chmod 644 examples/*
+chmod -c 644 examples/*
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl
 iconv -f iso-8859-1 -t utf-8 SSLeay.pm > SSLeay.pm.utf8
 mv SSLeay.pm.utf8 SSLeay.pm
@@ -49,7 +49,7 @@
 
 
 %check
-# make test # spawns servers, contacts external sites...
+%{?_with_tests:make test} # spawns servers, contacts external sites...
 
 
 %clean
@@ -65,6 +65,10 @@
 
 
 %changelog
+* Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.30-1
+- 1.30.
+- Optionally run the test suite during build with "--with tests".
+
 * Wed Nov  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.26-3
 - Rebuild for new OpenSSL.
 - Cosmetic cleanups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Dec 2004 17:25:07 -0000	1.2
+++ sources	15 Jan 2006 12:25:19 -0000	1.3
@@ -1 +1 @@
-6b7b044f553d089a1bce9fa0ef4c6615  Net_SSLeay.pm-1.26.tar.gz
+b0cd6c1681bbc0695d81be5cd852d1d0  Net_SSLeay.pm-1.30.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 15 14:23:44 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sun, 15 Jan 2006 09:23:44 -0500
Subject: rpms/digikam/devel digikam.spec,1.15,1.16
Message-ID: <200601151424.k0FEOLUM009687@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9670

Modified Files:
	digikam.spec 
Log Message:
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
- Add --disable-dependency-tracking & --enable-final



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- digikam.spec	14 Dec 2005 00:47:43 -0000	1.15
+++ digikam.spec	15 Jan 2006 14:23:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -42,12 +42,14 @@
 %patch0 -p1
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -118,6 +120,10 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-dependency-tracking & --enable-final
+
 * Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-11
 - Add libart_lgpl-devel and gamin-devel to BR
 



From fedora-extras-commits at redhat.com  Sun Jan 15 14:38:16 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sun, 15 Jan 2006 09:38:16 -0500
Subject: rpms/krusader/devel krusader.spec,1.7,1.8
Message-ID: <200601151438.k0FEcnUX009814@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9794

Modified Files:
	krusader.spec 
Log Message:
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
- Add --disable-debug --disable-dependency-tracking & --enable-final



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- krusader.spec	13 Dec 2005 23:47:57 -0000	1.7
+++ krusader.spec	15 Jan 2006 14:38:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -40,12 +40,14 @@
 %patch2 -p1
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
-	--disable-rpath
-
+	--disable-rpath \
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -96,13 +98,17 @@
 %{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/apps/krusader/
 %{_datadir}/config/kio_isorc
-%{_datadir}/doc/HTML/en/*
+%{_datadir}/doc/HTML/en/krusader/
 %{_datadir}/icons/hicolor/*/apps/*
 %{_mandir}/man1/krusader.1*
 %{_datadir}/services/iso.protocol
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 1.60.1-4
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-debug --disable-dependency-tracking & --enable-final
+
 * Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 1.60.1-3
 - Add to BR libacl-devel
 



From fedora-extras-commits at redhat.com  Sun Jan 15 16:11:54 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sun, 15 Jan 2006 11:11:54 -0500
Subject: rpms/gajim/devel gajim-0.9.1.modularX.patch, NONE, 1.1 .cvsignore,
	1.4, 
	1.5 gajim.spec, 1.6, 1.7 sources, 1.4, 1.5 gajim-0.8.aplay.patch,
	1.1, NONE
Message-ID: <200601151612.k0FGCRcm013792@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13758

Modified Files:
	.cvsignore gajim.spec sources 
Added Files:
	gajim-0.9.1.modularX.patch 
Removed Files:
	gajim-0.8.aplay.patch 
Log Message:
- update to 0.9.1 (Eric Tanguy, #176614)
- drop aplay.patch
- fix compilation with modular X.Org X11R7


gajim-0.9.1.modularX.patch:

--- NEW FILE gajim-0.9.1.modularX.patch ---
diff -Nurp gajim-0.9.orig/src/common/Makefile gajim-0.9/src/common/Makefile
--- gajim-0.9.orig/src/common/Makefile	2005-12-23 14:20:58.000000000 +0100
+++ gajim-0.9/src/common/Makefile	2005-12-26 18:11:32.000000000 +0100
@@ -1,12 +1,12 @@
 # Set the C flags to include the GTK+ and Python libraries
 PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I.
-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I.
+LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver`
 
 all: idle.so
 
 idle.so:
-	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@ -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext
+	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@
 
 clean:
 	rm -f *.so


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Sep 2005 20:38:00 -0000	1.4
+++ .cvsignore	15 Jan 2006 16:11:52 -0000	1.5
@@ -1 +1 @@
-gajim-0.8.2.tar.bz2
+gajim-0.9.1.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gajim.spec	6 Sep 2005 20:38:00 -0000	1.6
+++ gajim.spec	15 Jan 2006 16:11:52 -0000	1.7
@@ -2,7 +2,7 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8.2
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
@@ -10,12 +10,14 @@
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.8.aplay.patch
+Patch0:         gajim-0.9.1.modularX.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel
+BuildRequires:  intltool
+BuildRequires:  libXScrnSaver-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pygtk2-devel
 BuildRequires:  python-devel
@@ -28,8 +30,10 @@
 %endif
 
 Requires:       dbus-python
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-sqlite2
 
 %description
 Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
@@ -41,12 +45,16 @@
 %setup -q
 %patch0 -p1
 
+sed -i -e 's/install\: all/install\:/' Makefile
+# gajim wants to handle executables; why?
+sed -i -e '/MimeType/d' gajim.desktop.in
 
 %build
 make \
 %if ! %{use_internal_modules}
 	translation \
 	idle \
+	gajim.desktop \
 %endif
 	CC="%{__cc}" \
 	LIBDIR="/%{_lib}" \
@@ -80,14 +88,21 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS Changelog
-%{_bindir}/*
+%{_bindir}/gajim
+%{_bindir}/gajim-remote
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
 %{_datadir}/pixmaps/gajim*
-%{_mandir}/man1/gajim*
+%{_mandir}/man1/gajim.1*
+%{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Sun Jan 15 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-1
+- update to 0.9.1 (Eric Tanguy, #176614)
+- drop aplay.patch
+- fix compilation with modular X.Org X11R7
+
 * Tue Sep  6 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.8.2-1
 - new version 0.8.2
 - remove patches .cflags, .po, .x86_64, .remote (pushed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Sep 2005 20:38:00 -0000	1.4
+++ sources	15 Jan 2006 16:11:53 -0000	1.5
@@ -1 +1 @@
-14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2
+ca82dfb7ab5c51984357ea7bab0e99af  gajim-0.9.1.tar.bz2


--- gajim-0.8.aplay.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 18:40:10 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 15 Jan 2006 13:40:10 -0500
Subject: rpms/qof/FC-4 qof-0.6.1-build.patch, NONE,
	1.1 qof-dependencies.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 qof.spec, 1.9, 1.10 sources, 1.2,
	1.3 qof-libxml-dependency.patch, 1.1,
	NONE qof-linker-dependency.patch, 1.1, NONE
Message-ID: <200601151840.k0FIehwU018155@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Removed Files:
	qof-libxml-dependency.patch qof-linker-dependency.patch 
Log Message:
* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
- Upgrade to 0.6.1.
- Drop patches integrated upstream.
- Remove static libs.
- Patch to add dependencies to the pkgconfig file and linked to the library.
- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
  used.  Also fix the make targets to build tests separately from the library.
- Enable %check as it works with the previous patch.
  
* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
- Upgrade to 0.6.0.
- Drop patches integrated upstream.
- Small patches for x86_64 and gcc4.
- Patch to work around upstream thinko regarding how gmodule works.


qof-0.6.1-build.patch:

--- NEW FILE qof-0.6.1-build.patch ---
Index: qof-0.6.1/qof/test/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.am
+++ qof-0.6.1/qof/test/Makefile.am
@@ -21,7 +21,6 @@ LDADD = \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
    ${LIBGDA_LIBS} \
-   -lltdl \
    -lm
 else
 LDADD = \
@@ -31,7 +30,6 @@ LDADD = \
    ${GLIB_LIBS} \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
-   -lltdl \
    -lm
 endif
 
@@ -60,7 +58,7 @@ test_querynew_SOURCES = \
   test-stuff.c \
   test-querynew.c
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
   test-book-merge \
   test-date \
   test-guid \
Index: qof-0.6.1/qof/test/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.in
+++ qof-0.6.1/qof/test/Makefile.in
@@ -36,9 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-book-merge$(EXEEXT) test-date$(EXEEXT) \
-	test-guid$(EXEEXT) test-numeric$(EXEEXT) test-object$(EXEEXT) \
-	test-querynew$(EXEEXT)
+noinst_PROGRAMS =
 subdir = qof/test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -356,7 +354,6 @@ INCLUDES = \
 @USE_LIBGDA_FALSE@   ${GLIB_LIBS} \
 @USE_LIBGDA_FALSE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_FALSE@   ${GOBJECT_LIBS} \
- at USE_LIBGDA_FALSE@   -lltdl \
 @USE_LIBGDA_FALSE@   -lm
 
 @USE_LIBGDA_TRUE at LDADD = \
@@ -366,7 +363,6 @@ INCLUDES = \
 @USE_LIBGDA_TRUE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_TRUE@   ${GOBJECT_LIBS} \
 @USE_LIBGDA_TRUE@   ${LIBGDA_LIBS} \
- at USE_LIBGDA_TRUE@   -lltdl \
 @USE_LIBGDA_TRUE@   -lm
 
 test_book_merge_SOURCES = \

qof-dependencies.patch:

--- NEW FILE qof-dependencies.patch ---
Index: qof-0.6.1/configure.in
===================================================================
--- qof-0.6.1.orig/configure.in
+++ qof-0.6.1/configure.in
@@ -127,20 +127,23 @@ if test "x$LIBGDA_LIBS" = x; then
   AC_MSG_RESULT([No, GDA not found; will build using internal SQL library.])
 	LIBQOFSQL_LIBRARY_VERSION=1:1:0
 	ADD_PKG_LIB="-lqofsql"
+	GDA_PKG_LIB=""
 	AC_SUBST(LIBQOFSQL_LIBRARY_VERSION)
 else
     GDA_VERSION=`$PKG_CONFIG --modversion libgda`
     AC_MSG_RESULT([yes, using GDA: ${GDA_VERSION}])
     AC_DEFINE(HAVE_GDA,,[We have found GDA])
-	ADD_PKG_LIB="-lgda-2"
+    ADD_PKG_LIB=""
+    GDA_PKG_LIB="libgda"
     HAVE_GDA="use_gda"
-	AC_SUBST(GDA_VERSION)
+    AC_SUBST(GDA_VERSION)
 fi
 
 AM_CONDITIONAL(USE_LIBGDA, [ test x"$HAVE_GDA" != x])
 AM_CONDITIONAL(USE_LIBGDA, [ test "$HAVE_GDA" = "use_gda"])
 AC_SUBST(USE_LIBGDA)
 AC_SUBST(ADD_PKG_LIB)
+AC_SUBST(GDA_PKG_LIB)
 
 dnl **************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics.
Index: qof-0.6.1/qof-1.pc.in
===================================================================
--- qof-0.6.1.orig/qof-1.pc.in
+++ qof-0.6.1/qof-1.pc.in
@@ -8,7 +8,7 @@ added_libs=@ADD_PKG_LIB@
 
 Name: QOF
 Description: QOF Query Object Framework Library.
-Requires: glib-2.0 libxml-2.0 >= 2-2.5.10
+Requires: glib-2.0 libxml-2.0 >= 2-2.5.10 gobject-2.0 gmodule-2.0 @GDA_PKG_LIB@
 Version: @VERSION@
-Libs: -L${libdir} -lqof ${added_libs}
+Libs: -L${libdir} -lqof -lm ${added_libs}
 Cflags: -I${includedir}/qof
Index: qof-0.6.1/qof/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/Makefile.am
+++ qof-0.6.1/qof/Makefile.am
@@ -96,10 +96,12 @@ INCLUDES = \
   -DDATADIR=\""$(datadir)"\"
 endif
 
-LDADD = \
+libqof_la_LIBADD = \
   ${LIBGDA_LIBS} \
   ${GMODULE_LIBS} \
-  ${GLIB_LIBS}
+  ${GOBJECT_LIBS} \
+  ${GLIB_LIBS} \
+  -lm
 
 EXTRA_DIST = \
   qofla-dir.h.in \
Index: qof-0.6.1/qof/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/Makefile.in
+++ qof-0.6.1/qof/Makefile.in
@@ -61,7 +61,11 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libqof_la_LIBADD =
+libqof_la_LIBADD = ${LIBGDA_LIBS} \
+		   ${GMODULE_LIBS} \
+		   ${GOBJECT_LIBS} \
+		   ${GLIB_LIBS} \
+		   -lm
 am_libqof_la_OBJECTS = gnc-date.lo gnc-engine-util.lo gnc-numeric.lo \
 	gnc-event.lo qoflog.lo guid.lo kvp_frame.lo kvp-util.lo md5.lo \
 	qofbackend.lo qofclass.lo qofchoice.lo qofgobj.lo qofid.lo \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:59 -0000	1.2
+++ .cvsignore	15 Jan 2006 18:40:10 -0000	1.3
@@ -1 +1 @@
-qof-0.5.0.tar.gz
+qof-0.6.1.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/qof.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qof.spec	23 Mar 2005 13:06:11 -0000	1.9
+++ qof.spec	15 Jan 2006 18:40:10 -0000	1.10
@@ -1,27 +1,24 @@
 Name:           qof
-Version:        0.5.0
-Release:        5
-Summary:        QOF provides a query engine library for C objects
+Version:        0.6.1
+Release:        1%{?dist}
+Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Adds libxml-2.0 as a dependent library to the pkg-config entry.
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/qof-libxml-dependency.patch
-# Adds libxml2 and glib to the library link so rpm can auto-detect depends.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/qof-linker-dependency.patch
+Patch0:		qof-0.6.1-build.patch
+Patch1:		qof-dependencies.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
+BuildRequires: libgda-devel
 BuildRequires: intltool
-# These are needed to compile the example programs.  I don't want the compiled
-# programs anyway so when we disable that we can get rid of these two.
-BuildRequires: libtool-ltdl-devel
-BuildRequires: gtk2-devel
-# Patch1 changes a Makefile.am so we have to regenerate the build files.
-BuildRequires: libtool
+# qof doesn't ship with pre-built documentation
+BuildRequires: doxygen
+# Patch1 modifies configure.in so we have to use autoconf
+BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -35,12 +32,26 @@
 query engine can be backed by an actual database, so that instances
 of local objects can act as a 'cache' to a much larger SQL database.
 
+%package	docs
+Summary:	API documentation for libqof
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+%description	docs
+QOF - The Query Object Framework is a C library that provides a query engine
+to C applications.  This allows SQL-like queries to be performes on a
+collection of C/C++ objects (which act like SQL tables).
+
+This package contains API documentation for programming against libqof.
+Install this package if you need information on writing a program that uses
+libqof.
+
 %package        devel
 Summary:        Development tools for programs which will use the qof library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
 Requires:       glib2-devel
+Requires:	libgda-devel
 Requires:       pkgconfig
 
 %description    devel
@@ -48,25 +59,25 @@
 to C applications.  This allows SQL-like queries to be performes on a
 collection of C/C++ objects (which act like SQL tables).
 
-This package contains the header files, static libraries, examples, and
-documentation to develop programs that will use the qof library.  You should
+This package contains the header files and  static libraries to develop
+programs that will use the qof library.  You should
 install this package if you need to develop programs which will use the qof
 library functions.  You'll also need to install the qof package.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-# The build architecture in the 0.5.0 release is somewhat broken.  Upstream
-# cvs has moved files from src/ to qof/ to address this.  This symlink
-# simulates that until a fixed version is released.
-ln -sf src qof
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf --force --install
-%configure
+autoconf --force
+%configure --disable-static
 make
 
+# qof doesn't build the documentation unless you build the doc target.
+# The doc target isn't written correctly either.
+cd doc; make doc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,16 +87,12 @@
 
 # Get documentation ready to ship
 mv doc/html .
-cd examples
-make clean
-rm -rf .deps .cvsignore
-cd gobject
-rm -rf .deps .cvsignore
+rm html/installdox
 
-%check || :
-#make test
-#make check
+%find_lang %{name}
 
+%check || :
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,20 +101,43 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_libdir}/*.so.*
+%{_datadir}/xml/qof/
 
 %files devel
 %defattr(-,root,root,0755)
-%doc html examples
+%doc ChangeLog
 %{_includedir}/qof
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files docs
+%defattr(-,root,root,-)
+%doc html
+
 %changelog
+* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
+- Upgrade to 0.6.1.
+- Drop patches integrated upstream.
+- Remove static libs.
+- Patch to add dependencies to the pkgconfig file and linked to the library.
+- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
+  used.  Also fix the make targets to build tests separately from the library.
+- Enable %%check as it works with the previous patch.
+  
+* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
+- Upgrade to 0.6.0.
+- Drop patches integrated upstream.
+- Small patches for x86_64 and gcc4.
+- Patch to work around upstream thinko regarding how gmodule works.
+
+* Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-6
+- Add dist tag.
+- Rebuild for devel (FC5).
+
 * Wed Mar 23 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-5
 - ltdl-devel package is libtool-ltdl-devel.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:59 -0000	1.2
+++ sources	15 Jan 2006 18:40:10 -0000	1.3
@@ -1 +1 @@
-a4937d0ad42d3b776b58bb7ee2505823  qof-0.5.0.tar.gz
+2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz


--- qof-libxml-dependency.patch DELETED ---


--- qof-linker-dependency.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 18:50:01 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 15 Jan 2006 13:50:01 -0500
Subject: rpms/qof/devel qof-0.6.1-build.patch, NONE,
	1.1 qof-dependencies.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 qof.spec, 1.10, 1.11 sources, 1.2,
	1.3 qof-libxml-dependency.patch, 1.1,
	NONE qof-linker-dependency.patch, 1.1, NONE
Message-ID: <200601151850.k0FIoYEg018254@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18227

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Removed Files:
	qof-libxml-dependency.patch qof-linker-dependency.patch 
Log Message:
* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
- Upgrade to 0.6.1.
- Drop patches integrated upstream.
- Remove static libs.
- Patch to add dependencies to the pkgconfig file and linked to the library.
- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
  used.  Also fix the make targets to build tests separately from the library.
- Enable %check as it works with the previous patch.
  
* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
- Upgrade to 0.6.0.
- Drop patches integrated upstream.
- Small patches for x86_64 and gcc4.
- Patch to work around upstream thinko regarding how gmodule works.


qof-0.6.1-build.patch:

--- NEW FILE qof-0.6.1-build.patch ---
Index: qof-0.6.1/qof/test/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.am
+++ qof-0.6.1/qof/test/Makefile.am
@@ -21,7 +21,6 @@ LDADD = \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
    ${LIBGDA_LIBS} \
-   -lltdl \
    -lm
 else
 LDADD = \
@@ -31,7 +30,6 @@ LDADD = \
    ${GLIB_LIBS} \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
-   -lltdl \
    -lm
 endif
 
@@ -60,7 +58,7 @@ test_querynew_SOURCES = \
   test-stuff.c \
   test-querynew.c
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
   test-book-merge \
   test-date \
   test-guid \
Index: qof-0.6.1/qof/test/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.in
+++ qof-0.6.1/qof/test/Makefile.in
@@ -36,9 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-book-merge$(EXEEXT) test-date$(EXEEXT) \
-	test-guid$(EXEEXT) test-numeric$(EXEEXT) test-object$(EXEEXT) \
-	test-querynew$(EXEEXT)
+noinst_PROGRAMS =
 subdir = qof/test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -356,7 +354,6 @@ INCLUDES = \
 @USE_LIBGDA_FALSE@   ${GLIB_LIBS} \
 @USE_LIBGDA_FALSE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_FALSE@   ${GOBJECT_LIBS} \
- at USE_LIBGDA_FALSE@   -lltdl \
 @USE_LIBGDA_FALSE@   -lm
 
 @USE_LIBGDA_TRUE at LDADD = \
@@ -366,7 +363,6 @@ INCLUDES = \
 @USE_LIBGDA_TRUE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_TRUE@   ${GOBJECT_LIBS} \
 @USE_LIBGDA_TRUE@   ${LIBGDA_LIBS} \
- at USE_LIBGDA_TRUE@   -lltdl \
 @USE_LIBGDA_TRUE@   -lm
 
 test_book_merge_SOURCES = \

qof-dependencies.patch:

--- NEW FILE qof-dependencies.patch ---
Index: qof-0.6.1/configure.in
===================================================================
--- qof-0.6.1.orig/configure.in
+++ qof-0.6.1/configure.in
@@ -127,20 +127,23 @@ if test "x$LIBGDA_LIBS" = x; then
   AC_MSG_RESULT([No, GDA not found; will build using internal SQL library.])
 	LIBQOFSQL_LIBRARY_VERSION=1:1:0
 	ADD_PKG_LIB="-lqofsql"
+	GDA_PKG_LIB=""
 	AC_SUBST(LIBQOFSQL_LIBRARY_VERSION)
 else
     GDA_VERSION=`$PKG_CONFIG --modversion libgda`
     AC_MSG_RESULT([yes, using GDA: ${GDA_VERSION}])
     AC_DEFINE(HAVE_GDA,,[We have found GDA])
-	ADD_PKG_LIB="-lgda-2"
+    ADD_PKG_LIB=""
+    GDA_PKG_LIB="libgda"
     HAVE_GDA="use_gda"
-	AC_SUBST(GDA_VERSION)
+    AC_SUBST(GDA_VERSION)
 fi
 
 AM_CONDITIONAL(USE_LIBGDA, [ test x"$HAVE_GDA" != x])
 AM_CONDITIONAL(USE_LIBGDA, [ test "$HAVE_GDA" = "use_gda"])
 AC_SUBST(USE_LIBGDA)
 AC_SUBST(ADD_PKG_LIB)
+AC_SUBST(GDA_PKG_LIB)
 
 dnl **************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics.
Index: qof-0.6.1/qof-1.pc.in
===================================================================
--- qof-0.6.1.orig/qof-1.pc.in
+++ qof-0.6.1/qof-1.pc.in
@@ -8,7 +8,7 @@ added_libs=@ADD_PKG_LIB@
 
 Name: QOF
 Description: QOF Query Object Framework Library.
-Requires: glib-2.0 libxml-2.0 >= 2-2.5.10
+Requires: glib-2.0 libxml-2.0 >= 2-2.5.10 gobject-2.0 gmodule-2.0 @GDA_PKG_LIB@
 Version: @VERSION@
-Libs: -L${libdir} -lqof ${added_libs}
+Libs: -L${libdir} -lqof -lm ${added_libs}
 Cflags: -I${includedir}/qof
Index: qof-0.6.1/qof/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/Makefile.am
+++ qof-0.6.1/qof/Makefile.am
@@ -96,10 +96,12 @@ INCLUDES = \
   -DDATADIR=\""$(datadir)"\"
 endif
 
-LDADD = \
+libqof_la_LIBADD = \
   ${LIBGDA_LIBS} \
   ${GMODULE_LIBS} \
-  ${GLIB_LIBS}
+  ${GOBJECT_LIBS} \
+  ${GLIB_LIBS} \
+  -lm
 
 EXTRA_DIST = \
   qofla-dir.h.in \
Index: qof-0.6.1/qof/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/Makefile.in
+++ qof-0.6.1/qof/Makefile.in
@@ -61,7 +61,11 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libqof_la_LIBADD =
+libqof_la_LIBADD = ${LIBGDA_LIBS} \
+		   ${GMODULE_LIBS} \
+		   ${GOBJECT_LIBS} \
+		   ${GLIB_LIBS} \
+		   -lm
 am_libqof_la_OBJECTS = gnc-date.lo gnc-engine-util.lo gnc-numeric.lo \
 	gnc-event.lo qoflog.lo guid.lo kvp_frame.lo kvp-util.lo md5.lo \
 	qofbackend.lo qofclass.lo qofchoice.lo qofgobj.lo qofid.lo \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:59 -0000	1.2
+++ .cvsignore	15 Jan 2006 18:50:01 -0000	1.3
@@ -1 +1 @@
-qof-0.5.0.tar.gz
+qof-0.6.1.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qof.spec	17 Aug 2005 17:22:15 -0000	1.10
+++ qof.spec	15 Jan 2006 18:50:01 -0000	1.11
@@ -1,27 +1,24 @@
 Name:           qof
-Version:        0.5.0
-Release:        6%{?dist}
-Summary:        QOF provides a query engine library for C objects
+Version:        0.6.1
+Release:        1%{?dist}
+Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Adds libxml-2.0 as a dependent library to the pkg-config entry.
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/qof-libxml-dependency.patch
-# Adds libxml2 and glib to the library link so rpm can auto-detect depends.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/qof-linker-dependency.patch
+Patch0:		qof-0.6.1-build.patch
+Patch1:		qof-dependencies.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
+BuildRequires: libgda-devel
 BuildRequires: intltool
-# These are needed to compile the example programs.  I don't want the compiled
-# programs anyway so when we disable that we can get rid of these two.
-BuildRequires: libtool-ltdl-devel
-BuildRequires: gtk2-devel
-# Patch1 changes a Makefile.am so we have to regenerate the build files.
-BuildRequires: libtool
+# qof doesn't ship with pre-built documentation
+BuildRequires: doxygen
+# Patch1 modifies configure.in so we have to use autoconf
+BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -35,12 +32,26 @@
 query engine can be backed by an actual database, so that instances
 of local objects can act as a 'cache' to a much larger SQL database.
 
+%package	docs
+Summary:	API documentation for libqof
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+%description	docs
+QOF - The Query Object Framework is a C library that provides a query engine
+to C applications.  This allows SQL-like queries to be performes on a
+collection of C/C++ objects (which act like SQL tables).
+
+This package contains API documentation for programming against libqof.
+Install this package if you need information on writing a program that uses
+libqof.
+
 %package        devel
 Summary:        Development tools for programs which will use the qof library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
 Requires:       glib2-devel
+Requires:	libgda-devel
 Requires:       pkgconfig
 
 %description    devel
@@ -48,25 +59,25 @@
 to C applications.  This allows SQL-like queries to be performes on a
 collection of C/C++ objects (which act like SQL tables).
 
-This package contains the header files, static libraries, examples, and
-documentation to develop programs that will use the qof library.  You should
+This package contains the header files and  static libraries to develop
+programs that will use the qof library.  You should
 install this package if you need to develop programs which will use the qof
 library functions.  You'll also need to install the qof package.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-# The build architecture in the 0.5.0 release is somewhat broken.  Upstream
-# cvs has moved files from src/ to qof/ to address this.  This symlink
-# simulates that until a fixed version is released.
-ln -sf src qof
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf --force --install
-%configure
+autoconf --force
+%configure --disable-static
 make
 
+# qof doesn't build the documentation unless you build the doc target.
+# The doc target isn't written correctly either.
+cd doc; make doc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,16 +87,12 @@
 
 # Get documentation ready to ship
 mv doc/html .
-cd examples
-make clean
-rm -rf .deps .cvsignore
-cd gobject
-rm -rf .deps .cvsignore
+rm html/installdox
 
-%check || :
-#make test
-#make check
+%find_lang %{name}
 
+%check || :
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,20 +101,39 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_libdir}/*.so.*
+%{_datadir}/xml/qof/
 
 %files devel
 %defattr(-,root,root,0755)
-%doc html examples
+%doc ChangeLog
 %{_includedir}/qof
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files docs
+%defattr(-,root,root,-)
+%doc html
+
 %changelog
+* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
+- Upgrade to 0.6.1.
+- Drop patches integrated upstream.
+- Remove static libs.
+- Patch to add dependencies to the pkgconfig file and linked to the library.
+- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
+  used.  Also fix the make targets to build tests separately from the library.
+- Enable %%check as it works with the previous patch.
+  
+* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
+- Upgrade to 0.6.0.
+- Drop patches integrated upstream.
+- Small patches for x86_64 and gcc4.
+- Patch to work around upstream thinko regarding how gmodule works.
+
 * Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-6
 - Add dist tag.
 - Rebuild for devel (FC5).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:59 -0000	1.2
+++ sources	15 Jan 2006 18:50:01 -0000	1.3
@@ -1 +1 @@
-a4937d0ad42d3b776b58bb7ee2505823  qof-0.5.0.tar.gz
+2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz


--- qof-libxml-dependency.patch DELETED ---


--- qof-linker-dependency.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 19:28:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 15 Jan 2006 14:28:19 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tkcvs.spec, 
	1.10, 1.11
Message-ID: <200601151928.k0FJSp8O020228@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/FC-3

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:48:21 -0000	1.5
+++ .cvsignore	15 Jan 2006 19:28:18 -0000	1.6
@@ -1 +1 @@
-tkcvs_8_0.tar.gz
+tkcvs_8_0_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 22:48:21 -0000	1.5
+++ sources	15 Jan 2006 19:28:18 -0000	1.6
@@ -1 +1 @@
-6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz
+cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tkcvs.spec	2 Jan 2006 22:48:21 -0000	1.10
+++ tkcvs.spec	15 Jan 2006 19:28:18 -0000	1.11
@@ -1,13 +1,13 @@
 Name:		tkcvs
-Version:	8.0
-Release:	2%{?dist}
+Version:	8.0.1
+Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0
+%setup -q -n tkcvs_8_0_1
 
 
 %build
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
+- new version 8.0.1
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
 - new version 8.0
 



From fedora-extras-commits at redhat.com  Sun Jan 15 19:28:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 15 Jan 2006 14:28:24 -0500
Subject: rpms/tkcvs/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tkcvs.spec, 
	1.13, 1.14
Message-ID: <200601151928.k0FJSv6Q020233@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/FC-4

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Jan 2006 22:48:27 -0000	1.6
+++ .cvsignore	15 Jan 2006 19:28:24 -0000	1.7
@@ -1 +1 @@
-tkcvs_8_0.tar.gz
+tkcvs_8_0_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2006 22:48:27 -0000	1.6
+++ sources	15 Jan 2006 19:28:24 -0000	1.7
@@ -1 +1 @@
-6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz
+cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tkcvs.spec	2 Jan 2006 22:48:27 -0000	1.13
+++ tkcvs.spec	15 Jan 2006 19:28:24 -0000	1.14
@@ -1,13 +1,13 @@
 Name:		tkcvs
-Version:	8.0
-Release:	2%{?dist}
+Version:	8.0.1
+Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0
+%setup -q -n tkcvs_8_0_1
 
 
 %build
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
+- new version 8.0.1
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
 - new version 8.0
 



From fedora-extras-commits at redhat.com  Sun Jan 15 19:28:30 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 15 Jan 2006 14:28:30 -0500
Subject: rpms/tkcvs/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tkcvs.spec, 
	1.13, 1.14
Message-ID: <200601151929.k0FJT3T4020242@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/devel

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Jan 2006 22:48:33 -0000	1.6
+++ .cvsignore	15 Jan 2006 19:28:30 -0000	1.7
@@ -1 +1 @@
-tkcvs_8_0.tar.gz
+tkcvs_8_0_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2006 22:48:33 -0000	1.6
+++ sources	15 Jan 2006 19:28:30 -0000	1.7
@@ -1 +1 @@
-6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz
+cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tkcvs.spec	2 Jan 2006 22:48:33 -0000	1.13
+++ tkcvs.spec	15 Jan 2006 19:28:30 -0000	1.14
@@ -1,13 +1,13 @@
 Name:		tkcvs
-Version:	8.0
-Release:	2%{?dist}
+Version:	8.0.1
+Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -33,13 +33,14 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0
+%setup -q -n tkcvs_8_0_1
 
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
 perl -pi -e 's|\[file join \$TclRoot tkcvs bitmaps\]|\[file join \$TCDIR bitmaps\]|' tkcvs/tkcvs.tcl
 
+
 %install
 install -d ${RPM_BUILD_ROOT}%{_datadir}
 install -d ${RPM_BUILD_ROOT}%{_bindir}
@@ -53,9 +54,11 @@
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
@@ -63,7 +66,11 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
+- new version 8.0.1
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
 - new version 8.0
 



From fedora-extras-commits at redhat.com  Sun Jan 15 19:29:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 15 Jan 2006 14:29:03 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.9,1.10
Message-ID: <200601151929.k0FJTaEn020308@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20247

Modified Files:
	gnome-blog.spec 
Log Message:
* Sun Jan 15 2006 Brian Pepple <bdpepple at ameritech.net> - 0.8-10
- Bump for FC5 rebuild.
- Added some macros.



Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-blog.spec	22 May 2005 14:10:11 -0000	1.9
+++ gnome-blog.spec	15 Jan 2006 19:29:03 -0000	1.10
@@ -4,15 +4,15 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://www.gnome.org/~seth/gnome-blog/		
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.8/gnome-blog-0.8.tar.gz
-Patch1:		gnome-blog_makefile.patch
-Patch2:		gnome-blog-poster.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
+Patch1:		%{name}_makefile.patch
+Patch2:		%{name}-poster.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -55,14 +55,14 @@
 
 # gnome-blog makefile installs this, but we have to add some extra stuff for
 # fedora compliance
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnome-blog.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora			\
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
   --add-category=X-Fedora --add-category=Network	\
   %{name}.desktop
 
 # This is a program file and doesn't need to be placed in the library path
-rm -f $RPM_BUILD_ROOT/%{python_sitelib}/gnomeblog/gnome-blog-poster
+rm -f $RPM_BUILD_ROOT/%{python_sitelib}/gnomeblog/%{name}-poster
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,6 +93,10 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Brian Pepple <bdpepple at ameritech.net> - 0.8-10
+- Bump for FC5 rebuild.
+- Added some macros.
+
 * Sun May 22 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-9
 - Bump release > than FC3 version.
 - Add requires for gnome-python2-gtkspell.



From fedora-extras-commits at redhat.com  Mon Jan 16 01:35:32 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 15 Jan 2006 20:35:32 -0500
Subject: rpms/tclhttpd/devel tclhttpd.spec, 1.1, 1.2 tclhttpd_fedora.1.patch,
	1.1, 1.2
Message-ID: <200601160136.k0G1a5Mo032314@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32292

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Use ghosted files for runtime state files.
Update patch to remove build dependency on autoconf.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd.spec	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd.spec	16 Jan 2006 01:35:32 -0000	1.2
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch0:		tclhttpd_fedora.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: tcl-devel autoconf
+BuildRequires: tcl-devel
 Requires: tcl tclx tcllib fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -26,8 +26,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch -p1
-# Needed to pick up the changes to tcl.m4 in the patch.
-autoreconf
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -76,6 +74,11 @@
 rm $RPM_BUILD_ROOT/%{contentdir}/htdocs/cgi-bin/env
 mv $RPM_BUILD_ROOT/%{_prefix}/bin/httpd.tcl $RPM_BUILD_ROOT/%{_prefix}/bin/tclhttpd
 
+# Creating ghosted files
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lock/subsys
+touch $RPM_BUILD_ROOT/%{_var}/lock/subsys/tclhttpd
+touch $RPM_BUILD_ROOT/%{_var}/run/tclhttpd/tclhttpd.pid
+
 # Fix some file permissions.
 find $RPM_BUILD_ROOT/%{contentdir}/htdocs -type f -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT/%{contentdir}/custom -type f -exec chmod a-x {} \;
@@ -94,15 +97,12 @@
 if [ "$1" = "0" ]; then
     /sbin/service tclhttpd stop > /dev/null 2>&1
     /sbin/chkconfig --del tclhttpd
-    rm -f %_var/run/tclhttpd/tclhttpd.pid
-    rm -f %_var/lock/subsys/tclhttpd
 fi
 
 %postun
 
 if [ "$1" = "0" ]; then
     /usr/sbin/fedora-userdel tclhttpd
-    rm -rf %_var/log/tclhttpd
 elif [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
@@ -118,14 +118,19 @@
 %config(noreplace) %attr(-,tclhttpd,tclhttpd) %{_sysconfdir}/%{name}
 %{_mandir}/man1/*
 %config(noreplace) %contentdir
-%attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
+%dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
 %{_libdir}/crypt1.0
 %{_libdir}/limit1.0
 %doc src/README
+%ghost %{_var}/lock/subsys/tclhttpd
+%ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
+- Use ghosted files for runtime state files.
+- Update patch to remove build dependency on autoconf.
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd_fedora.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd_fedora.1.patch	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd_fedora.1.patch	16 Jan 2006 01:35:32 -0000	1.2
@@ -273,6 +273,19 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` ; do
  		    if test -f "$i/tkConfig.sh" ; then
+diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/configure tclhttpd3.5.1.new/configure
+--- tclhttpd3.5.1/configure	2004-05-28 14:00:58.000000000 -0700
++++ tclhttpd3.5.1.new/configure	2006-01-15 17:27:29.000000000 -0800
+@@ -1222,7 +1222,8 @@
+ 
+ 	    # check in a few common install locations
+ 	    if test x"${ac_cv_c_tclconfig}" = x ; then
+-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
++		for i in `ls -d ${libdir} 2>/dev/null` \
++		        `ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` ; do
+ 		    if test -f "$i/tclConfig.sh" ; then
 diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/lib/utils.tcl tclhttpd3.5.1.new/lib/utils.tcl
 --- tclhttpd3.5.1/lib/utils.tcl	2004-05-26 18:25:19.000000000 -0700
 +++ tclhttpd3.5.1.new/lib/utils.tcl	2004-10-30 16:37:33.000000000 -0700



From fedora-extras-commits at redhat.com  Mon Jan 16 01:48:32 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 15 Jan 2006 20:48:32 -0500
Subject: rpms/tclhttpd/FC-3 tclhttpd.spec, 1.1, 1.2 tclhttpd_fedora.1.patch, 
	1.1, 1.2
Message-ID: <200601160149.k0G1n4gj032400@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32362/FC-3

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Use ghosted files for runtime state files.
Update patch to remove build dependency on autoconf.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd.spec	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd.spec	16 Jan 2006 01:48:31 -0000	1.2
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch0:		tclhttpd_fedora.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: tcl-devel autoconf
+BuildRequires: tcl-devel
 Requires: tcl tclx tcllib fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -26,8 +26,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch -p1
-# Needed to pick up the changes to tcl.m4 in the patch.
-autoreconf
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -76,6 +74,11 @@
 rm $RPM_BUILD_ROOT/%{contentdir}/htdocs/cgi-bin/env
 mv $RPM_BUILD_ROOT/%{_prefix}/bin/httpd.tcl $RPM_BUILD_ROOT/%{_prefix}/bin/tclhttpd
 
+# Creating ghosted files
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lock/subsys
+touch $RPM_BUILD_ROOT/%{_var}/lock/subsys/tclhttpd
+touch $RPM_BUILD_ROOT/%{_var}/run/tclhttpd/tclhttpd.pid
+
 # Fix some file permissions.
 find $RPM_BUILD_ROOT/%{contentdir}/htdocs -type f -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT/%{contentdir}/custom -type f -exec chmod a-x {} \;
@@ -94,15 +97,12 @@
 if [ "$1" = "0" ]; then
     /sbin/service tclhttpd stop > /dev/null 2>&1
     /sbin/chkconfig --del tclhttpd
-    rm -f %_var/run/tclhttpd/tclhttpd.pid
-    rm -f %_var/lock/subsys/tclhttpd
 fi
 
 %postun
 
 if [ "$1" = "0" ]; then
     /usr/sbin/fedora-userdel tclhttpd
-    rm -rf %_var/log/tclhttpd
 elif [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
@@ -118,14 +118,19 @@
 %config(noreplace) %attr(-,tclhttpd,tclhttpd) %{_sysconfdir}/%{name}
 %{_mandir}/man1/*
 %config(noreplace) %contentdir
-%attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
+%dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
 %{_libdir}/crypt1.0
 %{_libdir}/limit1.0
 %doc src/README
+%ghost %{_var}/lock/subsys/tclhttpd
+%ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
+- Use ghosted files for runtime state files.
+- Update patch to remove build dependency on autoconf.
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd_fedora.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd_fedora.1.patch	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd_fedora.1.patch	16 Jan 2006 01:48:31 -0000	1.2
@@ -273,6 +273,19 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` ; do
  		    if test -f "$i/tkConfig.sh" ; then
+diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/configure tclhttpd3.5.1.new/configure
+--- tclhttpd3.5.1/configure	2004-05-28 14:00:58.000000000 -0700
++++ tclhttpd3.5.1.new/configure	2006-01-15 17:27:29.000000000 -0800
+@@ -1222,7 +1222,8 @@
+ 
+ 	    # check in a few common install locations
+ 	    if test x"${ac_cv_c_tclconfig}" = x ; then
+-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
++		for i in `ls -d ${libdir} 2>/dev/null` \
++		        `ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` ; do
+ 		    if test -f "$i/tclConfig.sh" ; then
 diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/lib/utils.tcl tclhttpd3.5.1.new/lib/utils.tcl
 --- tclhttpd3.5.1/lib/utils.tcl	2004-05-26 18:25:19.000000000 -0700
 +++ tclhttpd3.5.1.new/lib/utils.tcl	2004-10-30 16:37:33.000000000 -0700



From fedora-extras-commits at redhat.com  Mon Jan 16 01:48:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 15 Jan 2006 20:48:38 -0500
Subject: rpms/tclhttpd/FC-4 tclhttpd.spec, 1.1, 1.2 tclhttpd_fedora.1.patch, 
	1.1, 1.2
Message-ID: <200601160149.k0G1nAYN032407@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32362/FC-4

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Use ghosted files for runtime state files.
Update patch to remove build dependency on autoconf.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd.spec	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd.spec	16 Jan 2006 01:48:37 -0000	1.2
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch0:		tclhttpd_fedora.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: tcl-devel autoconf
+BuildRequires: tcl-devel
 Requires: tcl tclx tcllib fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -26,8 +26,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch -p1
-# Needed to pick up the changes to tcl.m4 in the patch.
-autoreconf
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -76,6 +74,11 @@
 rm $RPM_BUILD_ROOT/%{contentdir}/htdocs/cgi-bin/env
 mv $RPM_BUILD_ROOT/%{_prefix}/bin/httpd.tcl $RPM_BUILD_ROOT/%{_prefix}/bin/tclhttpd
 
+# Creating ghosted files
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lock/subsys
+touch $RPM_BUILD_ROOT/%{_var}/lock/subsys/tclhttpd
+touch $RPM_BUILD_ROOT/%{_var}/run/tclhttpd/tclhttpd.pid
+
 # Fix some file permissions.
 find $RPM_BUILD_ROOT/%{contentdir}/htdocs -type f -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT/%{contentdir}/custom -type f -exec chmod a-x {} \;
@@ -94,15 +97,12 @@
 if [ "$1" = "0" ]; then
     /sbin/service tclhttpd stop > /dev/null 2>&1
     /sbin/chkconfig --del tclhttpd
-    rm -f %_var/run/tclhttpd/tclhttpd.pid
-    rm -f %_var/lock/subsys/tclhttpd
 fi
 
 %postun
 
 if [ "$1" = "0" ]; then
     /usr/sbin/fedora-userdel tclhttpd
-    rm -rf %_var/log/tclhttpd
 elif [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
@@ -118,14 +118,19 @@
 %config(noreplace) %attr(-,tclhttpd,tclhttpd) %{_sysconfdir}/%{name}
 %{_mandir}/man1/*
 %config(noreplace) %contentdir
-%attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
+%dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
 %{_libdir}/crypt1.0
 %{_libdir}/limit1.0
 %doc src/README
+%ghost %{_var}/lock/subsys/tclhttpd
+%ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
+- Use ghosted files for runtime state files.
+- Update patch to remove build dependency on autoconf.
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd_fedora.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd_fedora.1.patch	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd_fedora.1.patch	16 Jan 2006 01:48:37 -0000	1.2
@@ -273,6 +273,19 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` ; do
  		    if test -f "$i/tkConfig.sh" ; then
+diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/configure tclhttpd3.5.1.new/configure
+--- tclhttpd3.5.1/configure	2004-05-28 14:00:58.000000000 -0700
++++ tclhttpd3.5.1.new/configure	2006-01-15 17:27:29.000000000 -0800
+@@ -1222,7 +1222,8 @@
+ 
+ 	    # check in a few common install locations
+ 	    if test x"${ac_cv_c_tclconfig}" = x ; then
+-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
++		for i in `ls -d ${libdir} 2>/dev/null` \
++		        `ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` ; do
+ 		    if test -f "$i/tclConfig.sh" ; then
 diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/lib/utils.tcl tclhttpd3.5.1.new/lib/utils.tcl
 --- tclhttpd3.5.1/lib/utils.tcl	2004-05-26 18:25:19.000000000 -0700
 +++ tclhttpd3.5.1.new/lib/utils.tcl	2004-10-30 16:37:33.000000000 -0700



From fedora-extras-commits at redhat.com  Mon Jan 16 03:16:56 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 15 Jan 2006 22:16:56 -0500
Subject: rpms/gnotime/FC-4 gnotime-qof-0.6.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 gnotime.spec, 1.9, 1.10 sources, 1.2,
	1.3 gnotime-desktop.patch, 1.1,
	NONE gnotime-gtkhtml3.6-qof.patch, 1.1,
	NONE gnotime-help-error.patch, 1.1, NONE gnotime-help.patch, 1.1,
	NONE gnotime-idle.patch, 1.1, NONE gnotime-popup-menus.patch,
	1.1, NONE gnotime-qof-include.patch, 1.1,
	NONE gnotime-separate-timeouts.patch, 1.1,
	NONE gnotime-wordwrap.patch, 1.1, NONE gtt_restartwin.png, 1.1,
	NONE gtt_startprojwin.png, 1.1, NONE
Message-ID: <200601160317.k0G3HSuO003738@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnotime/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3714

Modified Files:
	.cvsignore gnotime.spec sources 
Added Files:
	gnotime-qof-0.6.patch 
Removed Files:
	gnotime-desktop.patch gnotime-gtkhtml3.6-qof.patch 
	gnotime-help-error.patch gnotime-help.patch gnotime-idle.patch 
	gnotime-popup-menus.patch gnotime-qof-include.patch 
	gnotime-separate-timeouts.patch gnotime-wordwrap.patch 
	gtt_restartwin.png gtt_startprojwin.png 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
- Rebuild against new qof-0.6.1.
- Remove previous patches (merged upstream).
- Patch to fix the build for the qof-0.6 series.


gnotime-qof-0.6.patch:

--- NEW FILE gnotime-qof-0.6.patch ---
Index: gnotime-2.2.2/configure.in
===================================================================
--- gnotime-2.2.2.orig/configure.in
+++ gnotime-2.2.2/configure.in
@@ -52,7 +52,6 @@ LIBXML2_REQUIRED=2.0.0
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
 dnl Doesn't compile w/ qof-0.5.0
 LIBQOF_REQUIRED_MIN=0.6.0
-LIBQOF_REQUIRED_MAX=0.6.0
 
 
 dnl *******************************
@@ -169,7 +168,7 @@ AC_HELP_STRING([--with-system-qof],
 
 [
 if test x$withval = "xyes"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic.
@@ -180,8 +179,8 @@ else
 fi
 ],
 [
-if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2004 17:34:07 -0000	1.2
+++ .cvsignore	16 Jan 2006 03:16:54 -0000	1.3
@@ -1 +1 @@
-gnotime-2.2.1.tar.gz
+gnotime-2.2.2.tar.gz


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-4/gnotime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnotime.spec	4 May 2005 00:07:12 -0000	1.9
+++ gnotime.spec	16 Jan 2006 03:16:54 -0000	1.10
@@ -1,36 +1,13 @@
 Name:           gnotime
-Version:        2.2.1
-Release:        8
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://gttr.sourceforge.net/
 Source0:        http://dl.sf.net/gttr/%{name}-%{version}.tar.gz
-# Images to go with the help files.
-Source1:        http://www.tiki-lounge.com/~toshio/fedora/gtt_restartwin.png
-Source2:        http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
-# Simple patch to make the .desktop more complete
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
-# Combined patch allowing builds with gtkhtml3.0 or 3.1 and
-# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.6-qof.patch
-# Fixes includes of qof headers in source files.
-Patch2:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
-# Fixes the idle timer for kernel 2.6.
-Patch3:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-idle.patch
-# Fixes problems with calls to gnome_help
-Patch4:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help.patch
-# Fixes problems with popup menus failing to pass data arguments to callbacks
-Patch5:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-popup-menus.patch
-# Fixes problem with gnome_help being invoked when the toplevel is unknown
-Patch6:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help-error.patch
-# Add wordwrapping to textviews
-Patch7:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
-# Adapt a patch from the gnotime issue tracker to separate the idle timeout
-# from the no project running timeout.
-Patch8:		http://www.tiki-lounge.com/~toshio/fedora/gnotime-separate-timeouts.patch
-
+Patch0:		gnotime-qof-0.6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
@@ -38,10 +15,11 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  qof-devel >= 0.5.0
-BuildRequires:  qof-devel < 0.6.0
-# Because we modify configure.in, we need to BR the auto* tools.
-BuildRequires:  libtool
+BuildRequires:  qof-devel >= 0.6.0
+# Patch0 modifies configure.in so we need autoconf
+BuildRequires: autoconf
+# To get rid of rpath, we need to use a fedora libtool
+BuildRequires: libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -61,30 +39,18 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
-
-cp $RPM_SOURCE_DIR/gtt_restartwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-cp $RPM_SOURCE_DIR/gtt_startprojwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-
-# Copy the images to the correct position
+%patch0 -p1
 
 %build
-autoreconf --install --force
-%GNUconfigure
-make
+autoconf
+%configure
+# Fix hardcoded rpath by using Fedora libtool
+make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Gnotime puts it's locale translations into gnotime-2.0.mo but it's gnome
@@ -110,9 +76,6 @@
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
-  # If applicable:
-  # gconftool-2 --makefile-uninstall-rule \
-  #  %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :
   killall -HUP gconfd-2 || :
   unset GCONF_CONFIG_SOURCE
 fi
@@ -148,6 +111,28 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
+- Rebuild against new qof-0.6.1.
+- Patch to fix the build for the qof-0.6 series.
+
+* Fri Sep 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-0
+- Update to 2.2.2.
+- Remove all patches as they've been merged upstream.
+- Build with internal qof as gnotime now depends on 0.6.0 which has not yet
+  been released.  Only build for devel/testing until we can use a released
+  version of qof.
+
+* Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-11
+- Fix the patch level on the new gtkhtml3 patch.
+
+* Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-10
+- Fix build for gtkhtml3-3.7.
+- Fix gtkhtml test to fail if gtkhtml3 is not installed.
+  
+* Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-9
+- Add dist tag.
+- Rebuild for devel.
+ 
 * Mon May 2 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-8
 - Add a patch adapted from the gnotime tracker.  Original patch by
   goedson-users.sf.net.  SF Tracker: 1171394.  This allows separate setting


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2004 17:34:07 -0000	1.2
+++ sources	16 Jan 2006 03:16:54 -0000	1.3
@@ -1 +1 @@
-e2aad191b62b41da7f2176a028f1aaf9  gnotime-2.2.1.tar.gz
+8c05509f57a278de03a97fae110de3f5  gnotime-2.2.2.tar.gz


--- gnotime-desktop.patch DELETED ---


--- gnotime-gtkhtml3.6-qof.patch DELETED ---


--- gnotime-help-error.patch DELETED ---


--- gnotime-help.patch DELETED ---


--- gnotime-idle.patch DELETED ---


--- gnotime-popup-menus.patch DELETED ---


--- gnotime-qof-include.patch DELETED ---


--- gnotime-separate-timeouts.patch DELETED ---


--- gnotime-wordwrap.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 03:49:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 22:49:24 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon.spec,1.2,1.3
Message-ID: <200601160349.k0G3nu2O003847@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3830

Modified Files:
	SIMVoleon.spec 
Log Message:
Spec cleanup.


Index: SIMVoleon.spec
===================================================================
RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SIMVoleon.spec	27 May 2005 05:04:40 -0000	1.2
+++ SIMVoleon.spec	16 Jan 2006 03:49:24 -0000	1.3
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,7 +13,7 @@
 Summary: Volume rendering library for Coin
 Name: SIMVoleon
 Version: %{rpmvers}
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -94,28 +94,15 @@
 %doc %{coin_htmldir}/*
 
 %changelog
+* Mon Jan 15  2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.0.1-2
+- Rebuild.
+- Spec cleanup.
+
 * Sat May 21  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-1
 - FE submission candidate.
 
-* Sat May 21  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0.pm.3
-- Add x86_64 fixes.
-
-* Sat Mar 26  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0.pm.2
-- Provide SimVoleon and SimVoleon-devel.
-- Fix Copyright notice.
-
-* Fri Mar 25  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0.pm.1
-- Let *-devel Obsolete SimVoleon-devel.
-
-* Wed Mar 16  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0
-- Upstream update for FC3.
-- Drop Epoch.
-
 * Mon Oct 11  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.0.0-0.fdr.1
 - Upstream update.
 
 * Tue Jul 27  2004 Ralf Corsepius <ralf at links2linux.de> - 0:1.0.0-0.fdr.1
 - Initial Fedora RPM.
-
-* Tue Jul 27  2004 Ralf Corsepius <ralf at links2linux.de> - 0:1.0.0-0.fdr.1
-- Initial Fedora RPM.



From fedora-extras-commits at redhat.com  Mon Jan 16 04:48:34 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 23:48:34 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.24,1.25
Message-ID: <200601160449.k0G4n60f005894@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5877

Modified Files:
	Coin2.spec 
Log Message:
Add R: freetype-devel to devel package.


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Coin2.spec	22 Dec 2005 11:41:43 -0000	1.24
+++ Coin2.spec	16 Jan 2006 04:48:34 -0000	1.25
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -48,6 +48,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel bzip2-devel
+Requires: freetype-devel
 Requires: libGLU-devel
 
 %description devel
@@ -115,6 +116,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Mon Jan 16 2006 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-7
+- Add R: freetype-devel to devel package.
+
 * Thu Dec 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-6
 - Remove hacks to mesa/X11 packaging bugs now reported to be fixed.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 05:03:53 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:03:53 -0500
Subject: rpms/git-core/devel .cvsignore, 1.14, 1.15 git.spec, 1.2,
	1.3 sources, 1.14, 1.15
Message-ID: <200601160504.k0G54Pc5007714@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7693

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Jan 2006 05:59:22 -0000	1.14
+++ .cvsignore	16 Jan 2006 05:03:53 -0000	1.15
@@ -1 +1 @@
-git-1.1.1.tar.gz
+git-1.1.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git.spec	11 Jan 2006 05:59:22 -0000	1.2
+++ git.spec	16 Jan 2006 05:03:53 -0000	1.3
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.1
+Version: 	1.1.2
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
+- git-1.1.2
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
 - git-1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Jan 2006 05:59:22 -0000	1.14
+++ sources	16 Jan 2006 05:03:53 -0000	1.15
@@ -1 +1 @@
-f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz
+b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:07:14 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:07:14 -0500
Subject: rpms/git-core/FC-4 .cvsignore, 1.14, 1.15 git.spec, 1.2, 1.3 sources,
	1.14, 1.15
Message-ID: <200601160507.k0G57l0r007806@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7785

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Jan 2006 06:01:32 -0000	1.14
+++ .cvsignore	16 Jan 2006 05:07:14 -0000	1.15
@@ -1 +1 @@
-git-1.1.1.tar.gz
+git-1.1.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git.spec	11 Jan 2006 06:01:32 -0000	1.2
+++ git.spec	16 Jan 2006 05:07:14 -0000	1.3
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.1
+Version: 	1.1.2
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
+- git-1.1.2
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
 - git-1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Jan 2006 06:01:32 -0000	1.14
+++ sources	16 Jan 2006 05:07:14 -0000	1.15
@@ -1 +1 @@
-f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz
+b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:09:22 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:09:22 -0500
Subject: rpms/git-core/FC-3 .cvsignore, 1.14, 1.15 git.spec, 1.2, 1.3 sources,
	1.14, 1.15
Message-ID: <200601160509.k0G59tdW007885@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7861

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Jan 2006 06:05:47 -0000	1.14
+++ .cvsignore	16 Jan 2006 05:09:22 -0000	1.15
@@ -1 +1 @@
-git-1.1.1.tar.gz
+git-1.1.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git.spec	11 Jan 2006 06:05:47 -0000	1.2
+++ git.spec	16 Jan 2006 05:09:22 -0000	1.3
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.1
+Version: 	1.1.2
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
+- git-1.1.2
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
 - git-1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Jan 2006 06:05:47 -0000	1.14
+++ sources	16 Jan 2006 05:09:22 -0000	1.15
@@ -1 +1 @@
-f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz
+b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:28:17 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:28:17 -0500
Subject: rpms/cogito/devel .cvsignore, 1.5, 1.6 cogito.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200601160528.k0G5So16008040@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 01:19:52 -0000	1.5
+++ .cvsignore	16 Jan 2006 05:28:15 -0000	1.6
@@ -1 +1 @@
-cogito-0.16.2.tar.gz
+cogito-0.16.3.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cogito.spec	11 Jan 2006 01:52:42 -0000	1.7
+++ cogito.spec	16 Jan 2006 05:28:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.16.2
-Release: 	2%{?dist}
+Version: 	0.16.3
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 0.16.3-1
+- 0.16.3
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
 - add xmlto to BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 01:19:52 -0000	1.5
+++ sources	16 Jan 2006 05:28:15 -0000	1.6
@@ -1 +1 @@
-94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz
+e4773a360087b8c012519fba9a7b5205  cogito-0.16.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:30:16 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:30:16 -0500
Subject: rpms/cogito/FC-4 .cvsignore, 1.5, 1.6 cogito.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200601160530.k0G5Unf8008126@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8101

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 01:23:14 -0000	1.5
+++ .cvsignore	16 Jan 2006 05:30:16 -0000	1.6
@@ -1 +1 @@
-cogito-0.16.2.tar.gz
+cogito-0.16.3.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cogito.spec	11 Jan 2006 01:51:12 -0000	1.6
+++ cogito.spec	16 Jan 2006 05:30:16 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.16.2
-Release: 	2%{?dist}
+Version: 	0.16.3
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 0.16.3-1
+- 0.16.3
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
 - add xmlto to BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 01:23:14 -0000	1.5
+++ sources	16 Jan 2006 05:30:16 -0000	1.6
@@ -1 +1 @@
-94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz
+e4773a360087b8c012519fba9a7b5205  cogito-0.16.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:32:38 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:32:38 -0500
Subject: rpms/cogito/FC-3 .cvsignore, 1.5, 1.6 cogito.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200601160533.k0G5XANr008205@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8183

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 01:25:44 -0000	1.5
+++ .cvsignore	16 Jan 2006 05:32:37 -0000	1.6
@@ -1 +1 @@
-cogito-0.16.2.tar.gz
+cogito-0.16.3.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cogito.spec	11 Jan 2006 01:43:39 -0000	1.6
+++ cogito.spec	16 Jan 2006 05:32:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.16.2
-Release: 	2%{?dist}
+Version: 	0.16.3
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 0.16.3-1
+- 0.16.3
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
 - add xmlto to BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 01:25:44 -0000	1.5
+++ sources	16 Jan 2006 05:32:37 -0000	1.6
@@ -1 +1 @@
-94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz
+e4773a360087b8c012519fba9a7b5205  cogito-0.16.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:52:28 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 00:52:28 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.25,1.26
Message-ID: <200601160553.k0G5r1Ye008379@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8362

Modified Files:
	Coin2.spec 
Log Message:
Add R: fontconfig-devel to devel.


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Coin2.spec	16 Jan 2006 04:48:34 -0000	1.25
+++ Coin2.spec	16 Jan 2006 05:52:28 -0000	1.26
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -48,6 +48,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel bzip2-devel
+Requires: fontconfig-devel
 Requires: freetype-devel
 Requires: libGLU-devel
 
@@ -116,6 +117,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Mon Jan 16 2006 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-8
+- Add R: fontconfig-devel to devel package.
+
 * Mon Jan 16 2006 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-7
 - Add R: freetype-devel to devel package.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 06:31:27 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 01:31:27 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon-2.0.1-gcc4.1.diff,NONE,1.1
Message-ID: <200601160631.k0G6VTLm010266@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254

Added Files:
	SIMVoleon-2.0.1-gcc4.1.diff 
Log Message:
New.

SIMVoleon-2.0.1-gcc4.1.diff:

--- NEW FILE SIMVoleon-2.0.1-gcc4.1.diff ---
--- SIMVoleon-2.0.1.orig/lib/VolumeViz/misc/CvrCLUT.h	2004-12-20 15:54:48.000000000 +0100
+++ SIMVoleon-2.0.1/lib/VolumeViz/misc/CvrCLUT.h	2006-01-16 07:27:49.000000000 +0100
@@ -72,7 +72,7 @@
   void regenerateGLColorData(void);
 
   struct GLContextStorage {
-    GLContextStorage::GLContextStorage(uint32_t id)
+    GLContextStorage(uint32_t id)
     {
       this->texture1Dclut = 0;
       this->ctxid = id;
@@ -83,7 +83,7 @@
   };
   SbList<struct GLContextStorage *> contextlist;
   struct GlobalGLContextStorage {
-    GlobalGLContextStorage::GlobalGLContextStorage(void)
+    GlobalGLContextStorage(void)
     {
       this->fragmentprogramid[0] = this->fragmentprogramid[1] = 0;
     }



From fedora-extras-commits at redhat.com  Mon Jan 16 06:31:59 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:31:59 -0500
Subject: rpms/dejavu-fonts import.log,1.22,1.23
Message-ID: <200601160632.k0G6WWBW010320@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10283

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-1.fc5 on branch devel from dejavu-fonts-2.2-1.fc5.src.rpm
2.2 + fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- import.log	28 Dec 2005 20:45:48 -0000	1.22
+++ import.log	16 Jan 2006 06:31:59 -0000	1.23
@@ -19,3 +19,4 @@
 dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501
 dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614
 dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732
+dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042



From fedora-extras-commits at redhat.com  Mon Jan 16 06:32:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:32:05 -0500
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200601160632.k0G6WbvQ010325@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10283/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-1.fc5 on branch devel from dejavu-fonts-2.2-1.fc5.src.rpm
2.2 + fontconfig changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:42:02 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:32:05 -0000	1.8
@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	28 Dec 2005 20:42:02 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 06:32:05 -0000	1.8
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.1
+Version:   2.2
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -11,6 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Conflicts: fontconfig < 2.3.93
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -30,11 +31,6 @@
 install -d -m 0755 %{buildroot}%{fontdir}
 install -m 0644 *.ttf  %{buildroot}%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not 
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-1
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-2
-
 %clean
 /bin/rm -rf %{buildroot}
 
@@ -59,10 +55,11 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:42:02 -0000	1.7
+++ sources	16 Jan 2006 06:32:05 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 06:33:16 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 01:33:16 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon.spec,1.3,1.4
Message-ID: <200601160633.k0G6Xn3K010348@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10331

Modified Files:
	SIMVoleon.spec 
Log Message:
Add gcc4.1 patch.


Index: SIMVoleon.spec
===================================================================
RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SIMVoleon.spec	16 Jan 2006 03:49:24 -0000	1.3
+++ SIMVoleon.spec	16 Jan 2006 06:33:16 -0000	1.4
@@ -26,6 +26,7 @@
 Patch0: SIMVoleon-2.0.1-doxyfixes.diff
 Patch1: SIMVoleon-2.0.1-simacros.diff.bz2
 Patch2: SIMVoleon-2.0.1-libtool.diff.bz2
+Patch3: SIMVoleon-2.0.1-gcc4.1.diff
 
 BuildRequires: Coin2-devel
 BuildRequires: doxygen
@@ -53,6 +54,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 chmod +x cfg/doxy4win.pl
 
@@ -94,8 +96,9 @@
 %doc %{coin_htmldir}/*
 
 %changelog
-* Mon Jan 15  2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.0.1-2
+* Mon Jan 16  2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.0.1-2
 - Rebuild.
+- Add gcc4.1 patch.
 - Spec cleanup.
 
 * Sat May 21  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-1



From fedora-extras-commits at redhat.com  Mon Jan 16 06:35:33 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:35:33 -0500
Subject: rpms/dejavu-fonts import.log,1.23,1.24
Message-ID: <200601160636.k0G6a5b5010475@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10414

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-1.fc4 on branch FC-4 from dejavu-fonts-2.2-1.fc4.src.rpm
2.2 + fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- import.log	16 Jan 2006 06:31:59 -0000	1.23
+++ import.log	16 Jan 2006 06:35:32 -0000	1.24
@@ -20,3 +20,4 @@
 dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614
 dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732
 dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042
+dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322



From fedora-extras-commits at redhat.com  Mon Jan 16 06:35:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:35:38 -0500
Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.6, 
	1.7 sources, 1.7, 1.8
Message-ID: <200601160636.k0G6aB6s010480@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10414/FC-4

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-1.fc4 on branch FC-4 from dejavu-fonts-2.2-1.fc4.src.rpm
2.2 + fontconfig changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:43:55 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:35:38 -0000	1.8
@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejavu-fonts.spec	28 Dec 2005 20:43:55 -0000	1.6
+++ dejavu-fonts.spec	16 Jan 2006 06:35:38 -0000	1.7
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.1
+Version:   2.2
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -11,6 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Conflicts: fontconfig > = 2.3.93
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -63,6 +64,10 @@
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+- Conflict on newer fontconfig (yes you have to use the FC5 rpm with this one)
+
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:43:55 -0000	1.7
+++ sources	16 Jan 2006 06:35:38 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 06:44:28 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 01:44:28 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon-2.0.1-gcc4.1.diff,1.1,1.2
Message-ID: <200601160645.k0G6j0JS010546@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521

Modified Files:
	SIMVoleon-2.0.1-gcc4.1.diff 
Log Message:
Add lib/VolumeViz/render/common/CvrTextureObject.h

SIMVoleon-2.0.1-gcc4.1.diff:

Index: SIMVoleon-2.0.1-gcc4.1.diff
===================================================================
RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon-2.0.1-gcc4.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SIMVoleon-2.0.1-gcc4.1.diff	16 Jan 2006 06:31:27 -0000	1.1
+++ SIMVoleon-2.0.1-gcc4.1.diff	16 Jan 2006 06:44:27 -0000	1.2
@@ -18,3 +18,14 @@
      {
        this->fragmentprogramid[0] = this->fragmentprogramid[1] = 0;
      }
+--- SIMVoleon-2.0.1.orig/lib/VolumeViz/render/common/CvrTextureObject.h	2004-12-20 15:54:48.000000000 +0100
++++ SIMVoleon-2.0.1/lib/VolumeViz/render/common/CvrTextureObject.h	2006-01-16 07:43:01.000000000 +0100
+@@ -106,7 +106,7 @@
+ 
+   static CvrTextureObject * findInstanceMatch(const SoType t,
+                                               const struct CvrTextureObject::EqualityComparison & cmp);
+-  unsigned long CvrTextureObject::hashKey(void) const;
++  unsigned long hashKey(void) const;
+   static unsigned long hashKey(const struct CvrTextureObject::EqualityComparison & cmp);
+ };
+ 



From fedora-extras-commits at redhat.com  Mon Jan 16 06:47:49 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:47:49 -0500
Subject: rpms/dejavu-fonts import.log,1.24,1.25
Message-ID: <200601160648.k0G6mLjO010638@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10604

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-1.fc3 on branch FC-3 from dejavu-fonts-2.2-1.fc3.src.rpm
2.2 + fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- import.log	16 Jan 2006 06:35:32 -0000	1.24
+++ import.log	16 Jan 2006 06:47:49 -0000	1.25
@@ -21,3 +21,4 @@
 dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732
 dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042
 dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322
+dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980



From fedora-extras-commits at redhat.com  Mon Jan 16 06:47:55 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:47:55 -0500
Subject: rpms/dejavu-fonts/FC-3 .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.6, 
	1.7 sources, 1.7, 1.8
Message-ID: <200601160648.k0G6mRNc010643@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10604/FC-3

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-1.fc3 on branch FC-3 from dejavu-fonts-2.2-1.fc3.src.rpm
2.2 + fontconfig changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:45:53 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:47:54 -0000	1.8
@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejavu-fonts.spec	28 Dec 2005 20:45:53 -0000	1.6
+++ dejavu-fonts.spec	16 Jan 2006 06:47:54 -0000	1.7
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.1
+Version:   2.2
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -33,7 +33,6 @@
 # "touch" all files we've got flagged as %ghost  but which are not 
 # present in the RPM_BUILD_ROOT when RPM looks for files
 /bin/touch %{buildroot}%{fontdir}/fonts.cache-1
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-2
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -60,9 +59,14 @@
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+- should conflict with the fontconfig version where fonts.cache-2 was 
+  introduces, but this is FC-3 and I don't care
+- probably last FC-3 package
+
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:45:53 -0000	1.7
+++ sources	16 Jan 2006 06:47:54 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 08:27:05 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 16 Jan 2006 03:27:05 -0500
Subject: rpms/showimg/FC-4 .cvsignore, 1.2, 1.3 showimg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601160827.k0G8RbDs014586@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14548/FC-4

Modified Files:
	.cvsignore showimg.spec sources 
Log Message:
- version 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2005 23:49:56 -0000	1.2
+++ .cvsignore	16 Jan 2006 08:27:04 -0000	1.3
@@ -1 +1 @@
-showimg-0.9.4-1.tar.bz2
+showimg-0.9.5.tar.bz2


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
+++ showimg.spec	16 Jan 2006 08:27:04 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           showimg
-Version:        0.9.4.1
-Release:        4%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.jalix.org/projects/showimg
-Source0:        http://www.jalix.org/projects/showimg/download/0.9.4-1/showimg-0.9.4-1.tar.bz2
+Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -14,6 +14,7 @@
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  libkipi-devel, libkexif-devel, libexif-devel
+BuildRequires:  mysql-devel, postgresql-devel, libpqxx-devel
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -25,8 +26,28 @@
 numerous image formats.
 
 
+%package mysql
+Summary:        MySQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description mysql
+This is the plugin to use MySQL as the backend for Showimg's image
+database
+
+
+%package pgsql
+Summary:        PostgreSQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description pgsql
+This is the plugin to use PostgreSQL as the backend for Showimg's image
+database
+
+
 %prep
-%setup -q -n %{name}-0.9.4-1
+%setup -q
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
 
@@ -34,6 +55,11 @@
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-rpath \
            --disable-debug \
+           --enable-libkipi \
+           --enable-mysql \
+           --enable-pgsql \
+           --with-kexif \
+           --with-showimgdb
 #           --enable-final \
 
 make %{?_smp_mflags}
@@ -66,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc showimg/AUTHORS showimg/COPYING showimg/ChangeLog showimg/NEWS showimg/README
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/%{name}
@@ -75,14 +101,28 @@
 %{_datadir}/apps/showimgpart/showimgpart.rc
 %{_datadir}/services/showimgpart.desktop
 %{_datadir}/icons/*/*/apps/*
-%{_mandir}/man1/*
 %{_datadir}/doc/HTML/*/%{name}
 %{_datadir}/mimelnk/image/*.desktop
 %{_libdir}/kde3/libshowimgpart.*
 %{_libdir}/libshowimgcore.*
+%{_libdir}/kde3/showimg_kexidb_sqlite*driver.*
+%{_libdir}/libshowimgkexi*
+%{_datadir}/services/showimg_kexidb_sqlite*driver.desktop
+%{_datadir}/servicetypes/showimg_kexidb_driver.desktop
+
+%files mysql
+%{_libdir}/kde3/showimg_kexidb_mysqldriver.*
+%{_datadir}/services/showimg_kexidb_mysqldriver.desktop
+
+%files pgsql
+%{_libdir}/kde3/showimg_kexidb_pqxxsqldriver.*
+%{_datadir}/services/showimg_kexidb_pqxxsqldriver.desktop
 
 
 %changelog
+* Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
+- version 0.9.5
+
 * Sun Jul 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0.9.4.1-4
 - rebuild for libexif
 - use dist tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jan 2005 23:49:56 -0000	1.2
+++ sources	16 Jan 2006 08:27:04 -0000	1.3
@@ -1 +1 @@
-d6cebe9a627aaa4f0ec57e95f403d5fa  showimg-0.9.4-1.tar.bz2
+281c5f5e65ca14c69810d2099c43a4b8  showimg-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 16 08:27:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 16 Jan 2006 03:27:11 -0500
Subject: rpms/showimg/devel .cvsignore, 1.2, 1.3 showimg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601160827.k0G8RhKg014591@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14548/devel

Modified Files:
	.cvsignore showimg.spec sources 
Log Message:
- version 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2005 23:49:56 -0000	1.2
+++ .cvsignore	16 Jan 2006 08:27:10 -0000	1.3
@@ -1 +1 @@
-showimg-0.9.4-1.tar.bz2
+showimg-0.9.5.tar.bz2


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
+++ showimg.spec	16 Jan 2006 08:27:10 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           showimg
-Version:        0.9.4.1
-Release:        4%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.jalix.org/projects/showimg
-Source0:        http://www.jalix.org/projects/showimg/download/0.9.4-1/showimg-0.9.4-1.tar.bz2
+Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -14,6 +14,7 @@
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  libkipi-devel, libkexif-devel, libexif-devel
+BuildRequires:  mysql-devel, postgresql-devel, libpqxx-devel
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -25,8 +26,28 @@
 numerous image formats.
 
 
+%package mysql
+Summary:        MySQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description mysql
+This is the plugin to use MySQL as the backend for Showimg's image
+database
+
+
+%package pgsql
+Summary:        PostgreSQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description pgsql
+This is the plugin to use PostgreSQL as the backend for Showimg's image
+database
+
+
 %prep
-%setup -q -n %{name}-0.9.4-1
+%setup -q
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
 
@@ -34,6 +55,11 @@
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-rpath \
            --disable-debug \
+           --enable-libkipi \
+           --enable-mysql \
+           --enable-pgsql \
+           --with-kexif \
+           --with-showimgdb
 #           --enable-final \
 
 make %{?_smp_mflags}
@@ -66,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc showimg/AUTHORS showimg/COPYING showimg/ChangeLog showimg/NEWS showimg/README
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/%{name}
@@ -75,14 +101,28 @@
 %{_datadir}/apps/showimgpart/showimgpart.rc
 %{_datadir}/services/showimgpart.desktop
 %{_datadir}/icons/*/*/apps/*
-%{_mandir}/man1/*
 %{_datadir}/doc/HTML/*/%{name}
 %{_datadir}/mimelnk/image/*.desktop
 %{_libdir}/kde3/libshowimgpart.*
 %{_libdir}/libshowimgcore.*
+%{_libdir}/kde3/showimg_kexidb_sqlite*driver.*
+%{_libdir}/libshowimgkexi*
+%{_datadir}/services/showimg_kexidb_sqlite*driver.desktop
+%{_datadir}/servicetypes/showimg_kexidb_driver.desktop
+
+%files mysql
+%{_libdir}/kde3/showimg_kexidb_mysqldriver.*
+%{_datadir}/services/showimg_kexidb_mysqldriver.desktop
+
+%files pgsql
+%{_libdir}/kde3/showimg_kexidb_pqxxsqldriver.*
+%{_datadir}/services/showimg_kexidb_pqxxsqldriver.desktop
 
 
 %changelog
+* Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
+- version 0.9.5
+
 * Sun Jul 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0.9.4.1-4
 - rebuild for libexif
 - use dist tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jan 2005 23:49:56 -0000	1.2
+++ sources	16 Jan 2006 08:27:10 -0000	1.3
@@ -1 +1 @@
-d6cebe9a627aaa4f0ec57e95f403d5fa  showimg-0.9.4-1.tar.bz2
+281c5f5e65ca14c69810d2099c43a4b8  showimg-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 16 09:29:40 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 04:29:40 -0500
Subject: rpms/perl-HTML-Tree/devel .cvsignore, 1.2, 1.3 perl-HTML-Tree.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601160930.k0G9UCG3017152@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-HTML-Tree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17129

Modified Files:
	.cvsignore perl-HTML-Tree.spec sources 
Log Message:
- Spec cleanup.
- Filter Provides: perl(main).
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Feb 2005 19:36:38 -0000	1.2
+++ .cvsignore	16 Jan 2006 09:29:39 -0000	1.3
@@ -1 +1 @@
-HTML-Tree-3.18.tar.gz
+HTML-Tree-3.1901.tar.gz


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTML-Tree.spec	6 Apr 2005 22:12:45 -0000	1.3
+++ perl-HTML-Tree.spec	16 Jan 2006 09:29:39 -0000	1.4
@@ -1,19 +1,19 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-HTML-Tree
-Version:        3.18
-Release:        3
+Version:        3.1901
+Release:        1%{?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/S/SB/SBURKE/HTML-Tree-3.18.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1 perl(HTML::Parser)
+BuildRequires:  perl(HTML::Parser) >= 2.19
+BuildRequires:  perl(HTML::Tagset) >= 3.02
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -28,6 +28,14 @@
 %setup -q -n HTML-Tree-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(main)$/d'
+EOF
+%define __perl_provides %{_builddir}/HTML-Tree-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -42,7 +50,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +66,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-1
+- Spec cleanup.
+- Filter Provides: perl(main).
+- Upstream update.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Feb 2005 19:36:38 -0000	1.2
+++ sources	16 Jan 2006 09:29:39 -0000	1.3
@@ -1 +1 @@
-6a9e4e565648c9772e7d8ec6d4392497  HTML-Tree-3.18.tar.gz
+9b41dfed97605891829746433e6d2d7b  HTML-Tree-3.1901.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 09:40:22 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 04:40:22 -0500
Subject: rpms/perl-HTML-Tree/devel perl-HTML-Tree.spec,1.4,1.5
Message-ID: <200601160940.k0G9esfP017236@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-HTML-Tree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
- BR: perl(Test::Pod).




Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Tree.spec	16 Jan 2006 09:29:39 -0000	1.4
+++ perl-HTML-Tree.spec	16 Jan 2006 09:40:22 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Tree
 Version:        3.1901
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        HTML tree handling modules for Perl
 
@@ -14,6 +14,9 @@
 BuildRequires:  perl(HTML::Parser) >= 2.19
 BuildRequires:  perl(HTML::Tagset) >= 3.02
 
+# For improved tests
+BuildRequires:	perl(Test::Pod) >= 1.00
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -66,6 +69,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-2
+- BR: perl(Test::Pod).
+
 * Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-1
 - Spec cleanup.
 - Filter Provides: perl(main).



From fedora-extras-commits at redhat.com  Mon Jan 16 09:52:25 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 04:52:25 -0500
Subject: rpms/perl-HTML-Tree/FC-4 .cvsignore, 1.2, 1.3 perl-HTML-Tree.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601160952.k0G9qwrX017373@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-HTML-Tree/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17352

Modified Files:
	.cvsignore perl-HTML-Tree.spec sources 
Log Message:
Backport from devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Feb 2005 19:36:38 -0000	1.2
+++ .cvsignore	16 Jan 2006 09:52:25 -0000	1.3
@@ -1 +1 @@
-HTML-Tree-3.18.tar.gz
+HTML-Tree-3.1901.tar.gz


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-4/perl-HTML-Tree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTML-Tree.spec	6 Apr 2005 22:12:45 -0000	1.3
+++ perl-HTML-Tree.spec	16 Jan 2006 09:52:25 -0000	1.4
@@ -1,19 +1,22 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-HTML-Tree
-Version:        3.18
-Release:        3
+Version:        3.1901
+Release:        2%{?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/S/SB/SBURKE/HTML-Tree-3.18.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1 perl(HTML::Parser)
+BuildRequires:  perl(HTML::Parser) >= 2.19
+BuildRequires:  perl(HTML::Tagset) >= 3.02
+
+# For improved tests
+BuildRequires:	perl(Test::Pod) >= 1.00
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -28,6 +31,14 @@
 %setup -q -n HTML-Tree-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(main)$/d'
+EOF
+%define __perl_provides %{_builddir}/HTML-Tree-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -42,7 +53,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +69,14 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-2
+- BR: perl(Test::Pod).
+
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-1
+- Spec cleanup.
+- Filter Provides: perl(main).
+- Upstream update.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Feb 2005 19:36:38 -0000	1.2
+++ sources	16 Jan 2006 09:52:25 -0000	1.3
@@ -1 +1 @@
-6a9e4e565648c9772e7d8ec6d4392497  HTML-Tree-3.18.tar.gz
+9b41dfed97605891829746433e6d2d7b  HTML-Tree-3.1901.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 10:19:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Jan 2006 05:19:03 -0500
Subject: rpms/lighttpd/devel .cvsignore, 1.12, 1.13 lighttpd.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <200601161019.k0GAJcjC019192@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19167

Modified Files:
	.cvsignore lighttpd.spec sources 
Log Message:
Update to 1.4.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Nov 2005 14:54:32 -0000	1.12
+++ .cvsignore	16 Jan 2006 10:18:56 -0000	1.13
@@ -1 +1 @@
-lighttpd-1.4.8.tar.gz
+lighttpd-1.4.9.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lighttpd.spec	23 Nov 2005 14:54:32 -0000	1.17
+++ lighttpd.spec	16 Jan 2006 10:18:56 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.8
+Version: 1.4.9
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-1
+- Update to 1.4.9.
+
 * Wed Nov 23 2005 Matthias Saou <http://freshrpms.net/> 1.4.8-1
 - Update to 1.4.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Nov 2005 14:54:32 -0000	1.12
+++ sources	16 Jan 2006 10:18:56 -0000	1.13
@@ -1 +1 @@
-7d7790ef95ff5755f73bfcda4f13696d  lighttpd-1.4.8.tar.gz
+20a171774a0615069de3704db52483aa  lighttpd-1.4.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 11:17:22 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Mon, 16 Jan 2006 06:17:22 -0500
Subject: rpms/licq/devel licq-1.3.2-libdir.patch,NONE,1.1 licq.spec,1.3,1.4
Message-ID: <200601161117.k0GBHsbw021255@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21229

Modified Files:
	licq.spec 
Added Files:
	licq-1.3.2-libdir.patch 
Log Message:
compile on x86-64


licq-1.3.2-libdir.patch:

--- NEW FILE licq-1.3.2-libdir.patch ---
--- licq-1.3.2/plugins/osd/src/Makefile.am.libdir	2006-01-13 15:06:36.000000000 +0100
+++ licq-1.3.2/plugins/osd/src/Makefile.am	2006-01-13 15:06:51.000000000 +0100
@@ -1,4 +1,4 @@
-libdir=$(prefix)/lib/licq
+#libdir=$(prefix)/lib/licq
 localedir=$(datadir)/locale
 
 AM_CXXFLAGS =  -I$(LICQ_INCLUDES) -I.. @LIBXOSD_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
--- licq-1.3.2/plugins/qt-gui/src/Makefile.am.libdir	2006-01-13 15:07:26.000000000 +0100
+++ licq-1.3.2/plugins/qt-gui/src/Makefile.am	2006-01-13 15:07:34.000000000 +0100
@@ -1,7 +1,7 @@
 EXTRA_DIST = xpm
 
 #hack, FIXME this in a clean manner
-libdir=$(prefix)/lib/licq
+#libdir=$(prefix)/lib/licq
 licq_incdir = $(LICQ_INCLUDES)
 
 AM_CPPFLAGS = -D_REENTRANT \


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- licq.spec	12 Jan 2006 15:39:28 -0000	1.3
+++ licq.spec	16 Jan 2006 11:17:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 3
+Release: 4
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -12,6 +12,7 @@
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
 Patch1: licq-1.3.2-gcc-4_1-patch
+Patch2: licq-1.3.2-libdir.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -42,33 +43,40 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b gcc-4_1
-#remove cvs 
+%patch1 -p1 -b .gcc-4_1
+%patch2 -p1 -b .libdir
+
+#remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
-%configure --enable-gpgme --enable-openssl
-cd plugins
-cp -r qt-gui kde-gui
-cd kde-gui
-%configure --with-kde
-cd ../qt-gui
 %configure
-cd ../osd
-%configure
-
-export OPT="$RPM_OPT_FLAGS"
-cd ../..
-make
-cd plugins/kde-gui
 make
+cd plugins
+  cp -r qt-gui kde-gui
+  cd kde-gui
+  aclocal
+  automake
+  perl am_edit {src/,share/,po/}Makefile.in
+  autoconf
+  export KDEDIR=/usr/%_lib
+  %configure --with-kde --libdir=%{_libdir}/licq
+  make
 cd ../qt-gui
-make
-#create Qt qm files
-cd po
-lrelease *.ts
+  aclocal
+  automake
+  perl am_edit {src/,share/,po/}Makefile.in
+  autoconf
+  %configure --libdir=%{_libdir}/licq
+  make
+  #create Qt qm files
+  cd po
+  lrelease *.ts
 cd ../../osd
-make
+  rm -rf autom4te.cache
+  ./build
+  %configure --libdir=%{_libdir}/licq
+  make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,6 +98,8 @@
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
+#remove licq.desktop installed by makefile
+rm -f $RPM_BUILD_ROOT/%{_libdir}/share/applnk/Internet/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +148,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Mon Jan 16 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-4
+- compile on x86-64
+
 * Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-3
 - remove devel stuff with rm -rf
 



From fedora-extras-commits at redhat.com  Mon Jan 16 11:42:26 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 06:42:26 -0500
Subject: rpms/krusader/devel krusader.spec,1.8,1.9
Message-ID: <200601161142.k0GBgwha021370@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21353

Modified Files:
	krusader.spec 
Log Message:
- Remove --disable-dependency-tracking



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- krusader.spec	15 Jan 2006 14:38:16 -0000	1.8
+++ krusader.spec	16 Jan 2006 11:42:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -46,7 +46,6 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
 	--enable-final
 make %{?_smp_mflags}
 
@@ -105,6 +104,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 1.60.1-5
+- Remove --disable-dependency-tracking
+
 * Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 1.60.1-4
 - Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
 - Add --disable-debug --disable-dependency-tracking & --enable-final



From fedora-extras-commits at redhat.com  Mon Jan 16 11:55:59 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 06:55:59 -0500
Subject: rpms/krusader/devel krusader.spec,1.9,1.10
Message-ID: <200601161156.k0GBuWRG021493@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21476

Modified Files:
	krusader.spec 
Log Message:
- Remove --enable-final



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krusader.spec	16 Jan 2006 11:42:26 -0000	1.9
+++ krusader.spec	16 Jan 2006 11:55:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -45,8 +45,7 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug \
-	--enable-final
+	--disable-debug
 make %{?_smp_mflags}
 
 %install
@@ -104,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 1.60.1-6
+- Remove --enable-final
+
 * Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 1.60.1-5
 - Remove --disable-dependency-tracking
 



From fedora-extras-commits at redhat.com  Mon Jan 16 12:13:57 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 07:13:57 -0500
Subject: rpms/digikam/devel digikam.spec,1.16,1.17
Message-ID: <200601161214.k0GCEX0l023303@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23279

Modified Files:
	digikam.spec 
Log Message:
- Remove --enable-final (caused compilation errors)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- digikam.spec	15 Jan 2006 14:23:43 -0000	1.16
+++ digikam.spec	16 Jan 2006 12:13:56 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -48,8 +48,7 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -120,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
+- Remove --enable-final (caused compilation errors)
+
 * Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
 - Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
 - Add --disable-dependency-tracking & --enable-final



From fedora-extras-commits at redhat.com  Mon Jan 16 12:34:38 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 07:34:38 -0500
Subject: rpms/digikam/devel digikam.spec,1.17,1.18
Message-ID: <200601161235.k0GCZA8w023443@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23426

Modified Files:
	digikam.spec 
Log Message:
- Remove --disable-dependency-tracking



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- digikam.spec	16 Jan 2006 12:13:56 -0000	1.17
+++ digikam.spec	16 Jan 2006 12:34:37 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -47,8 +47,7 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug \
-	--disable-dependency-tracking
+	--disable-debug
 make %{?_smp_mflags}
 
 %install
@@ -119,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
+- Remove --disable-dependency-tracking
+
 * Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
 - Remove --enable-final (caused compilation errors)
 



From fedora-extras-commits at redhat.com  Mon Jan 16 13:13:04 2006
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Mon, 16 Jan 2006 08:13:04 -0500
Subject: rpms/splint/devel splint.spec,1.3,1.4
Message-ID: <200601161313.k0GDDaeM025270@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/extras/rpms/splint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25253

Modified Files:
	splint.spec 
Log Message:
rebuild


Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- splint.spec	28 Jul 2005 19:13:20 -0000	1.3
+++ splint.spec	16 Jan 2006 13:13:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Sun Jan 15 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-11
+- Rebuild for FC5
+
 * Thu Jul 28 2005 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-10
 - Turn off parallel builds
 



From fedora-extras-commits at redhat.com  Mon Jan 16 13:14:38 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 16 Jan 2006 08:14:38 -0500
Subject: fedora-security/audit fc5,1.37,1.38
Message-ID: <200601161314.k0GDEcI0025352@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25314

Modified Files:
	fc5 
Log Message:
Bring fc5 file up to date with test2 (partial description of method
attached).  For future reference, this took 9 hours in total.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fc5	12 Jan 2006 16:44:15 -0000	1.37
+++ fc5	16 Jan 2006 13:14:31 -0000	1.38
@@ -1,110 +1,117 @@
-Up to date CVE as of CVE email 20060111
-Up to date FC5 as of FC5-Test1-RC
+Up to date CVE as of CVE email 20060115
+Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
 (iiimf, libungif, slocate)
 2. Verified all marked as 'version', inc tricky packages like openssl 
 and httpd
-3. Looked at those marked backport where we ship a newer version, manually
-looked at rest marked backport
+3. Looked at those markedbackport where we ship a newer version, manually
+looked at rest marked  backport
 4. Looked at CVE for any new packages added to FC5
 5. Filed tracking bugs for vulnerable issues
+6. Looked at extra packages in test2 which have had security issues
+(mono, nss, php-pear)
+7. Double check vulnerables and file fc5test2 bugs
 
 ** are items that need attention
 
+CVE-2006-0208 ** php
+CVE-2006-0207 ** php
+CVE-2006-0200 ** php (5.1.0, 5.1.1 only)
+CVE-2006-0197 ** xorg-x11
+CVE-2006-0144 ** php-pear
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root
-CVE-2006-0095 VULNERABLE (kernel)
+CVE-2006-0095 VULNERABLE (kernel) bz#177916
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
-CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
-CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
-CVE-2006-0035 VULNERABLE (kernel)
-CVE-2005-4639 VULNERABLE (kernel)
-CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
-CVE-2005-4618 VULNERABLE (kernel, fixed 2.6.15)
-CVE-2005-4605 VULNERABLE (kernel) bz#176814
-CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2005-4639 version (kernel, fixed 2.6.15)
+CVE-2005-4635 version (kernel, fixed 2.6.15)
+CVE-2005-4618 version (kernel, fixed 2.6.15)
+CVE-2005-4605 version (kernel, fixed 2.6.15)
+CVE-2005-4585 version (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only
-CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
-CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
+CVE-2005-4348 version (fetchmail, fixed 6.3.1)
+CVE-2005-4268 backport (cpio) also blocked by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
-CVE-2005-4153 VULNERABLE (mailman)
+CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch
 CVE-2005-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
 CVE-2005-4130 ** (HelixPlayer) no information available
 CVE-2005-4126 ** (HelixPlayer) no information available
-CVE-2005-4077 VULNERABLE (curl)
-CVE-2005-3964 VULNERABLE (openmotif)
-CVE-2005-3962 VULNERABLE (perl)
-CVE-2005-3912 ** (perl)
+CVE-2005-4077 version (curl, fixed 7.15.1)
+CVE-2005-3964 VULNERABLE (openmotif) bz#177915
+CVE-2005-3962 backport (perl) perl-5.8.7-CVE-2005-3962-bz174684.patch
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
-CVE-2005-3883 VULNERABLE (php)
+CVE-2005-3883 version (php, fixed 5.1.1 at least)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
-CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
+CVE-2005-3857 version (kernel, fixed 2.6.15)
 CVE-2005-3848 version (kernel, fixed 2.6.13)
 CVE-2005-3847 version (kernel, fixed 2.6.12.6)
-CVE-2005-3810 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
-CVE-2005-3809 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
-CVE-2005-3808 VULNERABLE (kernel)
-CVE-2005-3807 backport (kernel) patch-2.6.15-rc1-git3
+CVE-2005-3810 version (kernel, fixed 2.6.15)
+CVE-2005-3809 version (kernel, fixed 2.6.15)
+CVE-2005-3808 version (kernel, fixed 2.6.15)
+CVE-2005-3807 version (kernel, fixed 2.6.15)
 CVE-2005-3806 version (kernel, fixed 2.6.14)
 CVE-2005-3805 version (kernel, fixed 2.6.14)
-CVE-2005-3784 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
-CVE-2005-3783 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
+CVE-2005-3784 version (kernel, fixed 2.6.15)
+CVE-2005-3783 version (kernel, fixed 2.6.15)
 CVE-2005-3753 version (kernel, fixed 2.6.14) also not a vuln
 CVE-2005-3745 ignore (struts, fixed 1.2.8) but not through tomcat
-CVE-2005-3732 VULNERABLE (ipsec-tools, fixed 0.6.3) BZ#174165
-CVE-2005-3675 VULNERABLE (kernel) optack
-CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
+CVE-2005-3732 version (ipsec-tools, fixed 0.6.3)
+CVE-2005-3675 VULNERABLE (kernel) optack, no upstream fix
+CVE-2005-3671 version (openswan, fixed 2.4.4)
 CVE-2005-3662 version (netpbm)
-CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
-CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3656 version (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3651 version (ethereal, fixed 0.10.14)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
-CVE-2005-3628 VULNERABLE (xpdf)
-CVE-2005-3628 VULNERABLE (tetex)
-CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3628 VULNERABLE (kdegraphics)
-CVE-2005-3628 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (xpdf)
-CVE-2005-3627 VULNERABLE (tetex)
-CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3627 VULNERABLE (kdegraphics)
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (xpdf)
-CVE-2005-3626 VULNERABLE (tetex)
-CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3626 VULNERABLE (kdegraphics)
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (xpdf)
-CVE-2005-3625 VULNERABLE (tetex)
-CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3625 VULNERABLE (kdegraphics)
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3624 VULNERABLE (xpdf)
-CVE-2005-3624 VULNERABLE (tetex)
-CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3624 VULNERABLE (kdegraphics)
-CVE-2005-3624 VULNERABLE (cups)
-CVE-2005-3623 VULNERABLE (kernel, fixed 2.6.14.5)
+CVE-2005-3628 VULNERABLE (xpdf) bz#177911
+CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3628 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3627 VULNERABLE (xpdf) bz#177911
+CVE-2005-3627 VULNERABLE (tetex) bz#177912
+CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3627 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3626 VULNERABLE (xpdf) bz#177911
+CVE-2005-3626 VULNERABLE (tetex) bz#177912
+CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3626 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3625 VULNERABLE (xpdf) bz#177911
+CVE-2005-3625 VULNERABLE (tetex) bz#177912
+CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3625 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3624 VULNERABLE (xpdf) bz#177911
+CVE-2005-3624 VULNERABLE (tetex) bz#177912
+CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3624 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3623 version (kernel, fixed 2.6.14.5)
 CVE-2005-3582 version (ImageMagick) gentoo only
-CVE-2005-3573 VULNERABLE (mailman) not fixed 2.1.6 BZ#174166
+CVE-2005-3573 VULNERABLE (mailman, not fixed 2.1.6) bz#174166
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least)
 CVE-2005-3402 ignore (thunderbird) mozilla say by design
 CVE-2005-3392 version (php, not 5.0)
 CVE-2005-3391 version (php, not 5.0)
-CVE-2005-3390 VULNERABLE (php) BZ#174167
-CVE-2005-3389 VULNERABLE (php) BZ#174168
-CVE-2005-3388 VULNERABLE (php) BZ#174169
+CVE-2005-3390 VULNERABLE (php) bz#174167
+CVE-2005-3389 version (php, fixed 5.1.1)
+CVE-2005-3388 version (php, fixed 5.1.1)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
+CVE-2005-3357 VULNERABLE (httpd, affects 2.2.0) bz#177914
 CVE-2005-3353 version (php, not 5.0)
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1) bz#177913
 CVE-2005-3351 version (spamassassin, fixed 3.1.0)
 CVE-2005-3322 version (squid) not upstream, SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
-CVE-2005-3313 backport (ethereal, fixed after 0.10.13)
+CVE-2005-3313 version (ethereal, fixed after 0.10.13)
 CVE-2005-3276 version (kernel, fixed 2.6.12.4)
 CVE-2005-3275 version (kernel, fixed 2.6.13)
 CVE-2005-3274 version (kernel, fixed 2.6.13)
@@ -112,7 +119,7 @@
 CVE-2005-3272 version (kernel, fixed 2.6.13)
 CVE-2005-3271 version (kernel, fixed 2.6.9)
 CVE-2005-3258 version (squid, fixed 2.5STABLE12)
-CVE-2005-3257 backport (kernel, fixed 2.6.15-rc1) patch-2.6.15-rc1.bz2
+CVE-2005-3257 version (kernel, fixed 2.6.15)
 CVE-2005-3249 version (ethereal, fixed 0.10.13)
 CVE-2005-3248 version (ethereal, fixed 0.10.13)
 CVE-2005-3247 version (ethereal, fixed 0.10.13)
@@ -122,18 +129,21 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13)
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
-CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3193 VULNERABLE (kdegraphics)
-CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3192 VULNERABLE (kdegraphics)
-CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3193 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3192 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3191 VULNERABLE (kdegraphics) bz#177908
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
@@ -160,12 +170,12 @@
 CVE-2005-3011 backport (texinfo)
 CVE-2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts
 CVE-2005-2978 version (netpbm, fixed 10.25)
-CVE-2005-2977 backport (pam)
+CVE-2005-2977 version (pam, fixed 0.99.2.1 at least)
 CVE-2005-2976 backport (gdk-pixbuf)
 CVE-2005-2975 version (gtk2, fixed 2.8.7)
 CVE-2005-2975 backport (gdk-pixbuf)
 CVE-2005-2973 version (kernel, fixed 2.6.14 at least)
-CVE-2005-2970 VULNERABLE (httpd, fixed 2.0.55) BZ#174170
+CVE-2005-2970 version (httpd, fixed 2.0.55)
 CVE-2005-2969 version (openssl, fixed 0.9.8a)
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h)
 CVE-2005-2968 version (thunderbird)
@@ -173,7 +183,7 @@
 CVE-2005-2968 version (firefox)
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 version (openssl, fixed 0.9.8)
-CVE-2005-2933 VULNERABLE (libc-client) BZ#174171
+CVE-2005-2933 version (libc-client, fixed 2004g at least)
 CVE-2005-2929 backport (lynx)
 CVE-2005-2917 version (squid, fixed 2.5.STABLE11)
 CVE-2005-2876 version (util-linux, fixed 2.13-pre3)
@@ -190,9 +200,9 @@
 CVE-2005-2797 version (openssh, fixed 4.2)
 CVE-2005-2796 version (squid, fixed 2.5.STABLE11)
 CVE-2005-2794 version (squid, fixed 2.5.STABLE11)
-CVE-2005-2728 backport (httpd, fixed 2.0.55) 
+CVE-2005-2728 version (httpd, fixed 2.0.55) 
 CVE-2005-2710 version (HelixPlayer, fixed 1.0.6)
-CVE-2005-2709 VULNERABLE (kernel, fixed 2.6.14.3)
+CVE-2005-2709 version (kernel, fixed 2.6.14.3)
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird)
 CVE-2005-2707 version (mozilla, fixed 1.7.12)
@@ -214,7 +224,7 @@
 CVE-2005-2702 version (firefox, fixed 1.0.7)
 CVE-2005-2701 version (mozilla, fixed 1.7.12)
 CVE-2005-2701 version (firefox, fixed 1.0.7)
-CVE-2005-2700 backport (httpd, fixed 2.0.55) 
+CVE-2005-2700 version (httpd, fixed 2.0.55) 
 CVE-2005-2693 backport (cvs) cvs-1.11.19-tmp.patch
 CVE-2005-2672 backport (lm_sensors)
 CVE-2005-2666 version (openssh, fixed 4.0p1)
@@ -244,8 +254,8 @@
 CVE-2005-2491 ignore (php) php uses system pcre
 CVE-2005-2491 ignore (httpd) httpd uses system pcre
 CVE-2005-2490 version (kernel, fixed 2.6.13.1)
-CVE-2005-2475 backport (unzip)
-CVE-2005-2471 backport (netpbm, fixed 10.31 at least) netpbm-10.28-CAN-2005-2471.patch
+CVE-2005-2475 backport (unzip) unzip-5.52-toctou.patch
+CVE-2005-2471 verison (netpbm, fixed 10.31)
 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible
 CVE-2005-2458 version (kernel, fixed 2.6.12.5)
 CVE-2005-2457 version (kernel, fixed 2.6.12.5)
@@ -310,7 +320,7 @@
 CVE-2005-2096 version (rpm, fixed 4.4.2)
 CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
 CVE-2005-2095 version (squirrelmail, fixed 1.4.5)
-CVE-2005-2088 backport (httpd, fixed 2.0.55)
+CVE-2005-2088 version (httpd, fixed 2.0.55)
 CVE-2005-2069 version (nss_ldap, fixed pam_ldap:180)
 CVE-2005-2069 backport (openldap) openldap-2.2.13-tls-fix-connection-test.patch
 CVE-2005-2023 version (gnupg, fixed 1.9.15)
@@ -342,9 +352,9 @@
 CVE-2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
 CVE-2005-1740 version (net-snmp, fixed 5.2.2.rc5 at least)
 CVE-2005-1739 version (ImageMagick, fixed 6.2.2.3)
-CVE-2005-1705 backport (gdb)
+CVE-2005-1705 backport (gdb) gdb-6.3-security-errata-20050610.patch
 CVE-2005-1704 version (binutils, fixed 2.16.91.0.3 at least)
-CVE-2005-1704 backport (gdb)
+CVE-2005-1704 backport (gdb) gdb-6.3-security-errata-20050610.patch
 CVE-2005-1689 version (krb5, fixed 1.4.2)
 CVE-2005-1686 ignore (gedit) not a vulnerability
 CVE-2005-1636 version (mysql, fixed 4.1.12)
@@ -388,7 +398,7 @@
 CVE-2005-1277 ignore (dupe)
 CVE-2005-1275 version (ImageMagick, fixed 6.2.2)
 CVE-2005-1269 version (gaim, fixed 1.3.1)
-CVE-2005-1268 backport (httpd, fixed 2.0.55)
+CVE-2005-1268 version (httpd, fixed 2.0.55)
 CVE-2005-1267 version (tcpdump, fixed 3.9.4 at least)
 CVE-2005-1266 version (spamassassin, fixed 3.0.4)
 CVE-2005-1265 version (kernel)
@@ -459,7 +469,7 @@
 CVE-2005-0760 version (ImageMagick, fixed 6.0)
 CVE-2005-0759 version (ImageMagick, fixed 6.0)
 CVE-2005-0758 version (gzip, fixed 1.3.5)
-CVE-2005-0758 VULNERABLE (bzip2) BZ#174172
+CVE-2005-0758 backport (bzip2)
 CVE-2005-0757 version (kernel, not 2.6)
 CVE-2005-0756 version (kernel, fixed 2.6.12)
 CVE-2005-0755 version (HelixPlayer, fixed 10.0.4)
@@ -482,6 +492,7 @@
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10)
 CVE-2005-0605 version (libXpm, fixed 3.5.4 at least) 
+CVE-2005-0605 backport (openmotif)
 CVE-2005-0602 ignore (unzip, fixed 5.52) this is really expected behaviour
 CVE-2005-0596 version (php, fixed 5.0)
 CVE-2005-0593 version (mozilla)
@@ -515,6 +526,7 @@
 CVE-2005-0527 version (firefox, fixed 1.0.1)
 CVE-2005-0525 version (php, fixed 5.0.4)
 CVE-2005-0524 version (php, fixed 5.0.4)
+CVE-2005-0509 version (mono, not after 1.0.5)
 CVE-2005-0504 version (kernel, not 2.6) doesn't build in 2.6
 CVE-2005-0490 version (curl, fixed 7.13.1)
 CVE-2005-0488 backport (telnet)
@@ -631,7 +643,7 @@
 CVE-2005-0078 version (kde, fixed 3.0.5)
 CVE-2005-0077 version (perl-DBI, fixed 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
-CVE-2005-0069 VULNERABLE (vim) fc4 fixes vim-6.3-tmpfile.patch BZ#174173
+CVE-2005-0069 backport (vim) vim-6.4-tmpfile.patch
 CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kpdf, not 3.4)
@@ -737,7 +749,7 @@
 CVE-2004-1189 version (krb5, fixed 1.4)
 CVE-2004-1186 backport (enscript)
 CVE-2004-1185 backport (enscript)
-CVE-2004-1184 backport (enscript)
+CVE-2004-1184 version (enscript, fixed 1.6.4 at least)
 CVE-2004-1183 version (libtiff, fixed 3.7.2)
 CVE-2004-1180 version (rwho, fixed 0.17)
 CVE-2004-1177 version (mailman, fixed 2.1.6)
@@ -799,7 +811,7 @@
 CVE-2004-1004 version (mc, fixed 4.6.0)
 CVE-2004-1002 ignore (ppp) not a security issue
 CVE-2004-0996 backport (cscope) not fixed in 15.5
-CVE-2004-0990 VULNERABLE (gd)
+CVE-2004-0990 version (gd, fixed 2.0.33 at least)
 CVE-2004-0989 version (libxml2, fixed 2.6.15)
 CVE-2004-0986 version (iptables, fixed 1.2.12)
 CVE-2004-0983 version (ruby, fixed 1.8.2)
@@ -814,7 +826,7 @@
 CVE-2004-0970 version (gzip)
 CVE-2004-0969 version (groff, fixed 1.18.1.1)
 CVE-2004-0968 version (glibc, fixed 2.3.5 at least)
-CVE-2004-0967 backport (ghostscript) ghostscript-scripts.patch
+CVE-2004-0967 version (ghostscript, fixed 8.15.1)
 CVE-2004-0966 version (gettext, fixed 0.14.3 at least)
 CVE-2004-0961 version (freeradius, fixed 1.0.1)
 CVE-2004-0960 version (freeradius, fixed 1.0.1)
@@ -824,7 +836,7 @@
 CVE-2004-0956 version (mysql, fixed 4.0.20)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream fc4bz#175414
+CVE-2004-0941 VULNERABLE (gd) bz#177907
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)
@@ -832,6 +844,7 @@
 CVE-2004-0923 version (cups, fixed 1.2.22)
 CVE-2004-0918 version (squid, fixed 2.4.STABLE7)
 CVE-2004-0914 version (xorg-x11, fixed after 6.8.1)
+CVE-2004-0914 backport (openmotif)
 CVE-2004-0909 version (thunderbird)
 CVE-2004-0909 version (mozilla)
 CVE-2004-0909 version (firefox)
@@ -869,6 +882,7 @@
 CVE-2004-0832 version (squid, fixed 2.5.STABLE7)
 CVE-2004-0829 version (samba, fixed 2.2.11)
 CVE-2004-0827 version (ImageMagick, fixed 6.0.6.2)
+CVE-2004-0826 ** NSS
 CVE-2004-0823 version (openldap, fixed after 2.1.19)
 CVE-2004-0817 version (imlib, fixed 2.1.20 at least)
 CVE-2004-0816 version (kernel, fixed 2.6.8)
@@ -1098,8 +1112,8 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1265 VULNERABLE (mozilla)
-CVE-2003-1265 VULNERABLE (firefox)
+CVE-2003-1265 VULNERABLE (mozilla) not fixed upstream
+CVE-2003-1265 VULNERABLE (firefox) not fixed upstream
 CVE-2003-1232 version (emacs, fixed 21.3)
 CVE-2003-1201 version (openldap, not 2.2)
 CVE-2003-1161 version (kernel, not released version)
@@ -1235,7 +1249,7 @@
 CVE-2003-0357 version (ethereal, fixed after 0.9.11)
 CVE-2003-0356 version (ethereal, fixed after 0.9.11)
 CVE-2003-0354 version (ghostscript, fixed 7.07)
-CVE-2003-0328 backport (epic, changelog)
+CVE-2003-0328 version (epic, fixed epic4-2.2 at least)
 CVE-2003-0300 ignore (sylpheed) only a crasher
 CVE-2003-0299 ignmore (mutt) only a crasher
 CVE-2003-0298 version (mozilla, fixed after 1.4a)
@@ -1326,7 +1340,7 @@
 
 CVE-2002-2204 ignore (rpm) by design
 CVE-2002-2196 version (samba, fixed 2.2.5)
-CVE-2002-2185 VULNERABLE (kernel)
+CVE-2002-2185 version (kernel, fixed 2.6.15)
 CVE-2002-2103 version (apache, not 2.0)
 CVE-2002-1963 version (kernel, not 2.6)
 CVE-2002-1976 ignore (ifconfig) "use ip"



From fedora-extras-commits at redhat.com  Mon Jan 16 13:15:27 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 16 Jan 2006 08:15:27 -0500
Subject: fedora-security/audit fc4,1.127,1.128
Message-ID: <200601161315.k0GDFTOm025394@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25376

Modified Files:
	fc4 
Log Message:
New things came up over the weekend but not investigated yet



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- fc4	12 Jan 2006 16:44:15 -0000	1.127
+++ fc4	16 Jan 2006 13:15:18 -0000	1.128
@@ -1,8 +1,12 @@
-Up to date CVE as of CVE email 20060111
-Up to date FC4 as of 20060111
+Up to date CVE as of CVE email 20060115
+Up to date FC4 as of 20060115
 
 ** are items that need attention
 
+CVE-2006-0208 ** php
+CVE-2006-0207 ** php
+CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
+CVE-2006-0197 ** xorg-x11
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Mon Jan 16 13:15:54 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 16 Jan 2006 08:15:54 -0500
Subject: rpms/ppracer/devel ppracer-0.3.1-c++.patch, NONE, 1.1 ppracer.spec, 
	1.12, 1.13
Message-ID: <200601161316.k0GDGR4M025444@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25424

Modified Files:
	ppracer.spec 
Added Files:
	ppracer-0.3.1-c++.patch 
Log Message:
fix build requirements, C++ member declaration (#177901)


ppracer-0.3.1-c++.patch:

--- NEW FILE ppracer-0.3.1-c++.patch ---
--- ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h.c++	2005-02-18 11:16:04.000000000 +0100
+++ ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h	2006-01-16 14:03:41.000000000 +0100
@@ -52,7 +52,7 @@
          * Reset the currently active texture to zero to get into a known state before
          * drawing a string. This is to get round possible threading issues.
          */
-        static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+        static void ResetActiveTexture(){ activeTextureID = 0;}
         
     private:
         /**


Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ppracer.spec	16 Mar 2005 12:27:22 -0000	1.12
+++ ppracer.spec	16 Jan 2006 13:15:54 -0000	1.13
@@ -1,12 +1,13 @@
 %define desktop_file_utils_version 0.2.90
 %define desktop_vendor fedora
 
-#define srcextraversion -2
+# Use --without modular_x to rebuild without modular X deps
+%define _modular_x 0%{!?_without_modular_x:1}
 
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 4
+Release: 5
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -17,14 +18,27 @@
 
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
+Patch2: ppracer-0.3.1-c++.patch
 
+%if %_modular_x
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXi-devel
+BuildRequires: libXext-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXt-devel
+%else
 BuildRequires: xorg-x11-devel
+%endif
+BuildRequires: libGL-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
 BuildRequires: tcl-devel >= 8.4.9
 BuildRequires: autoconf
 BuildRequires: freetype-devel
 BuildRequires: libpng-devel
+BuildRequires: zlib-devel
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -40,6 +54,7 @@
 %setup -q
 %patch0 -p1 -b .ia64
 %patch1 -p1 -b .lib64
+%patch2 -p1 -b .c++
 
 %build
 autoconf
@@ -69,6 +84,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Mon Jan 16 2006 Nils Philippsen <nphilipp at redhat.com>
+- fix build requirements, C++ member declaration (#177901)
+
 * Wed Mar 16 2005 Nils Philippsen <nphilipp at redhat.com>
 - look in .../lib64 as well for tclConfig.sh
 



From fedora-extras-commits at redhat.com  Mon Jan 16 13:40:30 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 16 Jan 2006 08:40:30 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.13,1.14
Message-ID: <200601161341.k0GDf2CQ025519@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25502

Modified Files:
	ppracer.spec 
Log Message:
add libGLU-devel to build requirements



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ppracer.spec	16 Jan 2006 13:15:54 -0000	1.13
+++ ppracer.spec	16 Jan 2006 13:40:29 -0000	1.14
@@ -32,6 +32,7 @@
 BuildRequires: xorg-x11-devel
 %endif
 BuildRequires: libGL-devel
+BuildRequires: libGLU-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
 BuildRequires: tcl-devel >= 8.4.9



From fedora-extras-commits at redhat.com  Mon Jan 16 15:18:33 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 16 Jan 2006 10:18:33 -0500
Subject: rpms/gmime/devel Makefile, 1.2, NONE gmime.spec, 1.6, NONE sources, 
	1.3, NONE
Message-ID: <200601161518.k0GFIZpD029257@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gmime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29248

Removed Files:
	Makefile gmime.spec sources 
Log Message:
gmime now in rawhide


--- Makefile DELETED ---


--- gmime.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 15:54:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 10:54:52 -0500
Subject: rpms/Glide3/devel Glide3-warn.patch,NONE,1.1 Glide3.spec,1.12,1.13
Message-ID: <200601161555.k0GFtPdm029542@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29522

Modified Files:
	Glide3.spec 
Added Files:
	Glide3-warn.patch 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-2
- Add modular Xorg BuildReqs
- Add a patch which fixes gcc4.1 warnings


Glide3-warn.patch:

--- NEW FILE Glide3-warn.patch ---
diff -ur Glide3.orig/cvg/glide3/src/fxgasm.c Glide3/cvg/glide3/src/fxgasm.c
--- Glide3.orig/cvg/glide3/src/fxgasm.c	2005-08-08 14:27:26.000000000 +0200
+++ Glide3/cvg/glide3/src/fxgasm.c	2006-01-16 16:43:14.000000000 +0100
@@ -210,8 +210,8 @@
     OFFSET (gr, pool.f1,    "pool_f1");
     OFFSET (gr, pool.f255,  "pool_f255");
 
-    OFFSET (gr, pool.ftemp1, "pool_fTemp1");
-    OFFSET (gr, pool.ftemp2, "pool_fTemp2");
+    OFFSET (gr, pool.temp1.f, "pool_fTemp1");
+    OFFSET (gr, pool.temp2.f, "pool_fTemp2");
 
     SIZEOF (gr,"GlideRoot");
     NEWLINE;
Only in Glide3/cvg/glide3/src: fxgasm.c.warn
diff -ur Glide3.orig/cvg/glide3/src/fxglide.h Glide3/cvg/glide3/src/fxglide.h
--- Glide3.orig/cvg/glide3/src/fxglide.h	2005-08-13 23:06:56.000000000 +0200
+++ Glide3/cvg/glide3/src/fxglide.h	2006-01-16 16:43:14.000000000 +0100
@@ -1370,7 +1370,9 @@
     float  fHalf;
     float  f1;
     float  f255;
-    float  ftemp1, ftemp2;       /* temps to convert floats to ints */
+    /* temps to convert floats to ints */
+    union { float f; FxI32 i; FxU32 u; } temp1;
+    union { float f; FxI32 i; FxU32 u; } temp2;
     float  fIntTruncBias;
 
 #if GLIDE_PACKED_RGB
@@ -2702,10 +2704,10 @@
  */
 #if GLIDE_PACKED_RGB
 #define RGBA_COMP(__fpVal, __fpBias, __fpShift, __fpMask) \
-((_GlideRoot.pool.ftemp1 = (float)((float)(__fpVal) + (float)(__fpBias))), \
+((_GlideRoot.pool.temp1.f = (float)((float)(__fpVal) + (float)(__fpBias))), \
  GR_ASSERT((__fpVal) >= 0.0f), \
  GR_ASSERT((__fpVal) < 256.0f), \
- (((*(const FxU32*)&_GlideRoot.pool.ftemp1) & (__fpMask)) << (__fpShift)))
+ ((_GlideRoot.pool.temp1.u & (__fpMask)) << (__fpShift)))
                                                   
 #define RGBA_COMP_CLAMP(__fpVal, __compToken) \
    RGBA_COMP(__fpVal, kPackBias##__compToken, kPackShift##__compToken, kPackMask##__compToken)
Only in Glide3/cvg/glide3/src: fxglide.h.warn
diff -ur Glide3.orig/cvg/glide3/src/gaa.c Glide3/cvg/glide3/src/gaa.c
--- Glide3.orig/cvg/glide3/src/gaa.c	2005-08-13 23:06:57.000000000 +0200
+++ Glide3/cvg/glide3/src/gaa.c	2006-01-16 16:43:14.000000000 +0100
@@ -273,34 +273,30 @@
 
   GR_BEGIN_NOFIFOCHECK(FN_NAME, 91);
 
-#define  DX _GlideRoot.pool.ftemp1
-#define ADY _GlideRoot.pool.ftemp2
+#define  DX _GlideRoot.pool.temp1
+#define ADY _GlideRoot.pool.temp2
 
   GR_FLUSH_STATE();
 
   {
-    FxI32 i, j;
-    FxU32 dataElem;
-    FxU32 vSize;
+    int i;
+    FxU32 vSize, dataElem;
     
     /*
     ** compute absolute deltas and draw from low Y to high Y
     */
-    ADY = FARRAY(b, 4) - FARRAY(a, 4);
-    i = *(int *)&ADY;
-    if (i < 0) {
+    ADY.f = FARRAY(b, 4) - FARRAY(a, 4);
+    if (ADY.i < 0) {
       const void *tv;
       tv = a; a = b; b = tv;
-      i ^= 0x80000000;            /* ady = -ady; */
-      /* (*(long *)&ADY) = i; */
+      ADY.i ^= 0x80000000;            /* ady = -ady; */
     }
     
-    DX = FARRAY(b, 0) - FARRAY(a, 0);
-    j = *(int *)&DX;
-    j &= 0x7fffffffL;            /* abs(adx) */
+    DX.f = FARRAY(b, 0) - FARRAY(a, 0);
+    DX.i &= 0x7fffffff;            /* abs(adx) */
     
     /* check for zero-length lines */
-    if ((j >= i) && (j == 0))
+    if ((DX.i >= ADY.i) && (DX.i == 0))
       return;
     
     vSize = gc->state.vData.vSize + 8;
@@ -308,7 +304,7 @@
     TRI_STRIP_BEGIN(kSetupCullDisable | kSetupStrip, 4, vSize, 
                     SSTCP_PKT3_BDDDDD | (1<<15));
     /* x major */
-    if (j >= i) {
+    if (DX.i >= ADY.i) {
       TRI_SETF(FARRAY(b, 0));
       dataElem = 0;
       TRI_SETF(FARRAY(b, 4) - _GlideRoot.pool.fHalf);
@@ -1391,35 +1387,31 @@
         dyBC = fb[yindex] - fc[yindex];
         
         /* Stash the area in the float pool for easy access */
-        _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+        _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
         
 #define FloatVal(__f) (((__f) < 786432.875) ? (__f) : ((__f) - 786432.875))
-        {
-          const FxI32 j = *(FxI32*)&_GlideRoot.pool.ftemp1;
-          
-          /* Zero-area triangles are BAD!! */
-          if ((j & 0x7FFFFFFF) == 0) {
-            GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
-                      FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
-                      FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
-                      FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
-                      _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
+        /* Zero-area triangles are BAD!! */
+        if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
 
-            goto done;
-          }
+          goto done;
+        }
+    
+        /* Backface culling, use sign bit as test */
+        if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
+            ((_GlideRoot.pool.temp1.i ^ (culltest << 31)) >= 0)) {
+      
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
       
-          /* Backface culling, use sign bit as test */
-          if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
-              ((j ^ (culltest << 31)) >= 0)) {
-        
-            GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
-                      FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
-                      FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
-                      FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
-                      _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
-        
-            goto done;
-          }
+          goto done;
         }
       }
     } /* end culling test */
@@ -1718,35 +1710,31 @@
         dyBC = fb[yindex] - fc[yindex];
         
         /* Stash the area in the float pool for easy access */
-        _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+        _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
         
 #define FloatVal(__f) (((__f) < 786432.875) ? (__f) : ((__f) - 786432.875))
-        {
-          const FxI32 j = *(FxI32*)&_GlideRoot.pool.ftemp1;
-          
-          /* Zero-area triangles are BAD!! */
-          if ((j & 0x7FFFFFFF) == 0) {
-            GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
-                      FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
-                      FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
-                      FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
-                      _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
+        /* Zero-area triangles are BAD!! */
+        if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
 
-            goto done;
-          }
+          goto done;
+        }
+    
+        /* Backface culling, use sign bit as test */
+        if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
+            ((_GlideRoot.pool.temp1.i ^ (culltest << 31)) >= 0)) {
+      
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
       
-          /* Backface culling, use sign bit as test */
[...1688 lines suppressed...]
Only in Glide3/sst1/glide3/src: gstrip.c.warn
diff -ur Glide3.orig/sst1/glide3/src/gxdraw.c Glide3/sst1/glide3/src/gxdraw.c
--- Glide3.orig/sst1/glide3/src/gxdraw.c	2005-06-09 20:32:35.000000000 +0200
+++ Glide3/sst1/glide3/src/gxdraw.c	2006-01-16 16:43:14.000000000 +0100
@@ -159,7 +159,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float ooa, dxAB, dxBC, dyAB, dyBC;
-  int i,j,culltest;
+  int i,culltest;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -239,16 +239,15 @@
   dyBC = snap_yb - snap_yc;
   
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.1 = dxAB * dyBC - dxBC * dyAB;
   
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0)
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0)
     return 0;
   
   /* Backface culling, use sign bit as test */
   if (gc->state.cull_mode != GR_CULL_DISABLE) {
-    if ((j ^ (culltest<<31)) >= 0) {
+    if ((_GlideRoot.pool.temp1.i ^ (culltest<<31)) >= 0) {
       return -1;
     }
   }
@@ -291,7 +290,7 @@
   SET_GW_CMD(    fifoPtr, 0, gc->hwDep.sst96Dep.gwCommand );
   SET_GW_HEADER( fifoPtr, 1, gc->hwDep.sst96Dep.gwHeaders[0] );
 
-  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.ftemp1;
+  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.temp1.f;
   /* GMT: note that we spread out our PCI writes */
   /* write out X & Y for vertex A */
   FSET_GW_ENTRY( fifoPtr, 2, snap_xa );
@@ -353,7 +352,7 @@
 
   /* write triangle command */
 triangle_command:
-  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.ftemp1 );
+  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.temp1.f );
   fifoPtr+=1;
   
   if (((FxU32)fifoPtr) & 0x7) {
@@ -433,7 +432,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float ooa, dxAB, dxBC, dyAB, dyBC;
-  int i,j,culltest;
+  int i,culltest;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -517,16 +516,15 @@
   dyBC = snap_yb - snap_yc;
   
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
   
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0)
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0)
     return 0;
   
   /* Backface culling, use sign bit as test */
   if (gc->state.cull_mode != GR_CULL_DISABLE) {
-    if ((j ^ (culltest<<31)) >= 0) {
+    if ((_GlideRoot.pool.temp1.i ^ (culltest<<31)) >= 0) {
       return -1;
     }
   }
@@ -535,7 +533,7 @@
 
   GR_SET_EXPECTED_SIZE(_GlideRoot.curTriSize);
   
-  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.ftemp1;
+  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.temp1.f;
   /* GMT: note that we spread out our PCI writes */
   /* write out X & Y for vertex A */
   GR_SETF( hw->FvA.x, snap_xa );
@@ -608,7 +606,7 @@
   }
 
   /* Draw the triangle by writing the area to the triangleCMD register */
-  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.ftemp1 ) );
+  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.temp1.f ) );
   _GlideRoot.stats.trisDrawn++;
 
   GR_CHECK_SIZE();
@@ -639,7 +637,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float dxAB, dxBC, dyAB, dyBC;
-  int i,j;
+  int i;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -713,12 +711,11 @@
   dyBC = snap_yb - snap_yc;
 
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
   _GlideRoot.stats.trisProcessed++;
 
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0) {
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
     return 0;
   }
 
@@ -795,7 +792,7 @@
   }
 
 triangle_command:
-  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.ftemp1 );
+  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.temp1.f );
   fifoPtr += 1;
 
   if (((FxU32)fifoPtr) & 0x7) {
@@ -862,7 +859,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float dxAB, dxBC, dyAB, dyBC;
-  int i,j;
+  int i;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -950,12 +947,11 @@
    GR_SETF( hw->FvB.y, snap_yb );
 
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
   _GlideRoot.stats.trisProcessed++;
 
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0) {
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
     GR_CHECK_SIZE_SLOPPY();
     return 0;
   }
@@ -995,7 +991,7 @@
   }
 
   /* Draw the triangle by writing the area to the triangleCMD register */
-  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.ftemp1 ) );
+  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.temp1.f ) );
   _GlideRoot.stats.trisDrawn++;
 
   GR_CHECK_SIZE();
Only in Glide3/sst1/glide3/src: gxdraw.c.warn
diff -ur Glide3.orig/sst1/incsrc/sst.h Glide3/sst1/incsrc/sst.h
--- Glide3.orig/sst1/incsrc/sst.h	2004-03-02 08:56:00.000000000 +0100
+++ Glide3/sst1/incsrc/sst.h	2006-01-16 16:43:14.000000000 +0100
@@ -1049,7 +1049,14 @@
 #define GET16(s) s
 #define SET(d,s) d = s
 #define SET16(d,s) d = s
-#define SETF(d,s) (*(float *)&(d)) = s
+#define SETF(d,s) *((float *)((void *)(&(d)))) = s
+/*
+do { \
+  union { float f; FxU32 u; } uni; \
+  uni.f = s; \
+  d = uni.u; \
+} while(0)
+*/
 
 // SET macros for FBI
 #define SET_FBI(d,s)    SET (*(&(d)+0x100),s)
Only in Glide3/sst1/incsrc: sst.h.warn
diff -ur Glide3.orig/sst1/init/initvg/sst1init.h Glide3/sst1/init/initvg/sst1init.h
--- Glide3.orig/sst1/init/initvg/sst1init.h	2005-05-25 10:53:23.000000000 +0200
+++ Glide3/sst1/init/initvg/sst1init.h	2006-01-16 16:49:31.000000000 +0100
@@ -105,8 +105,8 @@
 #define IGET(A)    A
 #define ISET(A,D)  A = (D)
 #else
-#define IGET(A)    sst1InitRead32((FxU32 *) &(A))
-#define ISET(A,D)  sst1InitWrite32((FxU32 *) &(A), D)  
+#define IGET(A)    sst1InitRead32((FxU32 *)(void *)&(A))
+#define ISET(A,D)  sst1InitWrite32((FxU32 *)(void *)&(A), D)  
 #endif
 
 /*
Only in Glide3/sst1/init/initvg: sst1init.h~


Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Glide3.spec	15 Aug 2005 13:13:56 -0000	1.12
+++ Glide3.spec	16 Jan 2006 15:54:52 -0000	1.13
@@ -1,6 +1,6 @@
 Name:    Glide3
 Version: 20050815
-Release: 1
+Release: 2
 Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
 # Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
 ExclusiveArch: %{ix86} alpha ia64 x86_64
@@ -17,8 +17,11 @@
 #   tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/
 Source0: %{name}-%{version}.tar.bz2
 Source1: glidelink.c
+Patch0: Glide3-warn.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel
+BuildRequires: libX11-devel xorg-x11-proto-devel 
+# Add these to try the experimental DGA support and add DGA=1 to %{glide_flags}
+# BuildRequires: libXxf86dga-devel libXxf86vm-devel
 %ifarch %{ix86}
 BuildRequires: nasm
 %endif
@@ -43,6 +46,7 @@
 
 %prep
 %setup -q -n Glide3
+%patch0 -p1 -z .warn
 
 
 %build
@@ -127,6 +131,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-2
+- Add modular Xorg BuildReqs
+- Add a patch which fixes gcc4.1 warnings
+
 * Mon Aug 15 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-1
 - Add -soname to linkerflags, so that we report the correct soname,
   otherwise rpm can't properly resolve dependencies because of the



From fedora-extras-commits at redhat.com  Mon Jan 16 16:05:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Jan 2006 11:05:34 -0500
Subject: rpms/gkrellmms/devel gkrellmms.spec,1.7,1.8
Message-ID: <200601161606.k0GG6xxP031309@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31289

Modified Files:
	gkrellmms.spec 
Log Message:
* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-4
- Add macros.
- Use standard buildroot.
- Add dist tag.
- Drop requires since they are pulled in from BR.



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gkrellmms.spec	9 May 2005 00:46:39 -0000	1.7
+++ gkrellmms.spec	16 Jan 2006 16:05:33 -0000	1.8
@@ -2,20 +2,19 @@
 
 Name:           gkrellmms
 Version:        2.1.22
-Release:        3
-
+Release:        4%{?dist}
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
 License:        GPL
-URL:            http://gkrellm.luon.net/gkrellmms.phtml
-Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.22.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL:            http://gkrellm.luon.net/%{name}.phtml
+Source0:        http://gkrellm.luon.net/files/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 
 BuildRequires:  gtk+-devel >= 1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1.2.8
 BuildRequires:  gkrellm-devel, gettext
 
-Requires:       gkrellm >= 2.0, xmms >= 1.2.8
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -51,6 +50,12 @@
 
 
 %changelog
+* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-4
+- Add macros.
+- Use standard buildroot.
+- Add dist tag.
+- Drop requires since they are pulled in from BR.
+
 * Sun May  8 2005 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-3
 - Rebuilt.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 17:00:53 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 16 Jan 2006 12:00:53 -0500
Subject: devel/gmime .cvsignore,1.3,NONE
Message-ID: <200601161700.k0GH0tsE031750@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/devel/gmime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/devel/gmime

Removed Files:
	.cvsignore 
Log Message:
completely remove gmime devel branch


--- .cvsignore DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 17:03:26 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 12:03:26 -0500
Subject: rpms/rt3/FC-4 .cvsignore,1.2,1.3 rt3.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200601161704.k0GH4Kwp000982@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/rt3/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv961

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Oct 2005 01:46:42 -0000	1.2
+++ .cvsignore	16 Jan 2006 17:03:26 -0000	1.3
@@ -1 +1 @@
-rt-3.4.4.tar.gz
+rt-3.4.5.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/rt3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rt3.spec	7 Dec 2005 12:57:42 -0000	1.4
+++ rt3.spec	16 Jan 2006 17:03:26 -0000	1.5
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,8 +12,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.4.4
-Release:	11%{?dist}
+Version:	3.4.5
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -235,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.5-1
+- Upstream update.
+
 * Wed Dec 07 2005 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.4-11
 - Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Oct 2005 01:46:42 -0000	1.2
+++ sources	16 Jan 2006 17:03:26 -0000	1.3
@@ -1 +1 @@
-769d77eea39006be643cbd2db4820ba3  rt-3.4.4.tar.gz
+16c8007cba54669e6c9de95cfc680b2a  rt-3.4.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 17:32:54 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 12:32:54 -0500
Subject: owners owners.list,1.534,1.535
Message-ID: <200601161733.k0GHXQnC001251@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1222

Modified Files:
	owners.list 
Log Message:
taking on the orphaned packages autotrace, gtranslator, t1lib, t1utils, and ttf2pt1.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- owners.list	15 Jan 2006 10:57:13 -0000	1.534
+++ owners.list	16 Jan 2006 17:32:53 -0000	1.535
@@ -52,7 +52,7 @@
 Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -365,7 +365,7 @@
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -1189,8 +1189,8 @@
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|ankit644 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
-Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
+Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1238,7 +1238,7 @@
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 16 18:04:21 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 13:04:21 -0500
Subject: rpms/autotrace/FC-4 autotrace.spec,1.8,1.9
Message-ID: <200601161804.k0GI4r2C003058@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3037

Modified Files:
	autotrace.spec 
Log Message:
- add %%{?dist} tag
- add a BuildRequire on bzip2-devel
- add ldconfig to %%post and %%postun




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/FC-4/autotrace.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- autotrace.spec	26 May 2005 18:31:51 -0000	1.8
+++ autotrace.spec	16 Jan 2006 18:04:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release: 7
+Release:        8%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -16,6 +16,7 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  bzip2-devel
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
@@ -60,6 +61,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO
@@ -79,6 +86,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
+- add %%{?dist} tag
+- add a BuildRequire on bzip2-devel
+- add ldconfig to %%post and %%postun
+
 * Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.31.1-7
 - and more buildrequires
 



From fedora-extras-commits at redhat.com  Mon Jan 16 18:20:15 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 13:20:15 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.8,1.9
Message-ID: <200601161820.k0GIKmdH003273@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3235

Modified Files:
	autotrace.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
- add %{?dist} tag
- add a BuildRequire on bzip2-devel
- add ldconfig to %post and %postun




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- autotrace.spec	26 May 2005 18:31:51 -0000	1.8
+++ autotrace.spec	16 Jan 2006 18:20:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release: 7
+Release:        8%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -16,6 +16,7 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  bzip2-devel
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
@@ -60,6 +61,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO
@@ -79,6 +86,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
+- add %%{?dist} tag
+- add a BuildRequire on bzip2-devel
+- add ldconfig to %%post and %%postun
+
 * Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.31.1-7
 - and more buildrequires
 



From fedora-extras-commits at redhat.com  Mon Jan 16 18:22:37 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 16 Jan 2006 13:22:37 -0500
Subject: fedora-security/audit fc4,1.128,1.129 fc5,1.38,1.39
Message-ID: <200601161822.k0GIMbsM003371@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3333

Modified Files:
	fc4 fc5 
Log Message:
Note an openoffice.org issue that doesn't affet FC[45].



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- fc4	16 Jan 2006 13:15:18 -0000	1.128
+++ fc4	16 Jan 2006 18:22:30 -0000	1.129
@@ -15,6 +15,7 @@
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
 CVE-2005-4639 VULNERABLE (kernel)
+CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 verson (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- fc5	16 Jan 2006 13:14:31 -0000	1.38
+++ fc5	16 Jan 2006 18:22:30 -0000	1.39
@@ -28,6 +28,7 @@
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2005-4639 version (kernel, fixed 2.6.15)
+CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 version (kernel, fixed 2.6.15)
 CVE-2005-4618 version (kernel, fixed 2.6.15)
 CVE-2005-4605 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Mon Jan 16 18:39:06 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:39:06 -0500
Subject: rpms/dejavu-fonts import.log,1.25,1.26
Message-ID: <200601161839.k0GIdd4q003595@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3563

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-2.fc5 on branch devel from dejavu-fonts-2.2-2.fc5.src.rpm
version bump to follow FC4


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- import.log	16 Jan 2006 06:47:49 -0000	1.25
+++ import.log	16 Jan 2006 18:39:06 -0000	1.26
@@ -22,3 +22,4 @@
 dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042
 dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322
 dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980
+dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706



From fedora-extras-commits at redhat.com  Mon Jan 16 18:39:12 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:39:12 -0500
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.8,1.9
Message-ID: <200601161839.k0GIdjSR003598@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3563/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-2.fc5 on branch devel from dejavu-fonts-2.2-2.fc5.src.rpm
version bump to follow FC4


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dejavu-fonts.spec	16 Jan 2006 06:32:05 -0000	1.8
+++ dejavu-fonts.spec	16 Jan 2006 18:39:12 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -57,6 +57,9 @@
 %{fontdir}/*.ttf
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
+- bump release to ensure graceful FC4 -> FC5 update
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2
 



From fedora-extras-commits at redhat.com  Mon Jan 16 18:46:04 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:46:04 -0500
Subject: rpms/dejavu-fonts/FC-4 dejavu-fonts.spec,1.7,1.8
Message-ID: <200601161846.k0GIkbM5003652@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3626/FC-4

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-2.fc4 on branch FC-4 from dejavu-fonts-2.2-2.fc4.src.rpm
fontconfig changes


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	16 Jan 2006 06:35:38 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 18:46:04 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,7 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Conflicts: fontconfig > = 2.3.93
+Conflicts: fontconfig > = 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -34,7 +34,6 @@
 # "touch" all files we've got flagged as %ghost  but which are not 
 # present in the RPM_BUILD_ROOT when RPM looks for files
 /bin/touch %{buildroot}%{fontdir}/fonts.cache-1
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-2
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -61,9 +60,11 @@
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
+- Seems FC-4 and FC-3 have the same needs after all
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2
 - Conflict on newer fontconfig (yes you have to use the FC5 rpm with this one)



From fedora-extras-commits at redhat.com  Mon Jan 16 18:48:00 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:48:00 -0500
Subject: rpms/dejavu-fonts import.log,1.26,1.27
Message-ID: <200601161848.k0GImW09003774@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3724

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-2.fc3 on branch FC-3 from dejavu-fonts-2.2-2.fc3.src.rpm
fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- import.log	16 Jan 2006 18:39:06 -0000	1.26
+++ import.log	16 Jan 2006 18:48:00 -0000	1.27
@@ -23,3 +23,4 @@
 dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322
 dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980
 dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706
+dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269



From fedora-extras-commits at redhat.com  Mon Jan 16 18:48:06 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:48:06 -0500
Subject: rpms/dejavu-fonts/FC-3 dejavu-fonts.spec,1.7,1.8
Message-ID: <200601161848.k0GImcKq003782@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3724/FC-3

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-2.fc3 on branch FC-3 from dejavu-fonts-2.2-2.fc3.src.rpm
fontconfig changes


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	16 Jan 2006 06:47:54 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 18:48:05 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,6 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Conflicts: fontconfig > = 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -61,11 +62,12 @@
 %ghost %{fontdir}/fonts.cache-1
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
+- Seems FC-4 and FC-3 have the same needs after all
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2
-- should conflict with the fontconfig version where fonts.cache-2 was 
-  introduces, but this is FC-3 and I don't care
-- probably last FC-3 package
+- Conflict on newer fontconfig (yes you have to use the FC5 rpm with this one)
 
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1



From fedora-extras-commits at redhat.com  Mon Jan 16 18:54:48 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 13:54:48 -0500
Subject: rpms/t1utils/FC-4 t1utils.spec,1.8,1.9
Message-ID: <200601161855.k0GItKXR003956@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3925

Modified Files:
	t1utils.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
- add %{?dist} tag
- correct License




Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/FC-4/t1utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- t1utils.spec	22 May 2005 23:44:46 -0000	1.8
+++ t1utils.spec	16 Jan 2006 18:54:48 -0000	1.9
@@ -1,11 +1,11 @@
 Name:		t1utils
 Version:	1.32
-Release: 3
+Release:        4%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
 Group:		Applications/Publishing
-License:	Freely modifiable and distributable
+License:	Distributable
 URL:		http://www.lcdf.org/~eddietwo/type/
 Source0:	http://www.lcdf.org/~eddietwo/type/t1utils-1.32.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
+- add %%{?dist} tag
+- correct License
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.32-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Jan 16 19:13:23 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:13:23 -0500
Subject: rpms/trac/FC-4 trac.spec,1.1,1.2
Message-ID: <200601161913.k0GJDtVE005999@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982

Modified Files:
	trac.spec 
Log Message:
re-added tracd and trac.fcgi by user request


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.spec	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.spec	16 Jan 2006 19:13:23 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -34,7 +34,8 @@
 chmod -x contrib/*
 sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
 chmod -x htdocs/js/wikitoolbar.js
-rm trac/test.py scripts/tracd.1
+sed -i -e 's/tracd 1/tracd 8/' scripts/tracd.1
+rm trac/test.py
 
 %build
 %{__python} setup.py build
@@ -46,12 +47,15 @@
 %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.cgi \
+mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.*cgi \
   $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin
 
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
-rm $RPM_BUILD_ROOT%{_bindir}/tracd
+install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd}
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man8
+mv $RPM_BUILD_ROOT%{_mandir}/{man1/tracd.1,man8/tracd.8}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,7 @@
 %doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/
 %{_bindir}/trac-admin
 %{_bindir}/tracdb2env
+%{_sbindir}/tracd
 %dir %{python_sitelib}/trac/
 %{python_sitelib}/trac/*.py
 %{python_sitelib}/trac/*.pyc
@@ -100,10 +105,15 @@
 %config(noreplace) /etc/httpd/conf.d/trac.conf
 %{_datadir}/trac/
 %{_var}/www/cgi-bin/trac.cgi
+%{_var}/www/cgi-bin/trac.fcgi
 %{_mandir}/man1/trac-admin.1*
 %{_mandir}/man1/tracdb2env.1*
+%{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
+- re-added tracd and trac.fcgi by user request.
+
 * Tue Jan 10 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-2
 - removed trac.fcgi (bugzilla #174546, comment #11)
 - applied patch (bugzilla #174546, attachment id=123008)



From fedora-extras-commits at redhat.com  Mon Jan 16 19:20:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Jan 2006 14:20:09 -0500
Subject: owners owners.list,1.535,1.536
Message-ID: <200601161920.k0GJKfC3006059@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6042

Modified Files:
	owners.list 
Log Message:
perl-HTML-Tree, perl-Pod-POM -> spot (thanks!)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- owners.list	16 Jan 2006 17:32:53 -0000	1.535
+++ owners.list	16 Jan 2006 19:20:08 -0000	1.536
@@ -824,7 +824,7 @@
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -887,7 +887,7 @@
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan 16 19:46:57 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:46:57 -0500
Subject: rpms/trac/devel trac.spec,1.1,1.2
Message-ID: <200601161947.k0GJlTYr006344@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6327

Modified Files:
	trac.spec 
Log Message:
re-added tracd and trac.fcgi by user request


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.spec	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.spec	16 Jan 2006 19:46:57 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -34,7 +34,8 @@
 chmod -x contrib/*
 sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
 chmod -x htdocs/js/wikitoolbar.js
-rm trac/test.py scripts/tracd.1
+sed -i -e 's/tracd 1/tracd 8/' scripts/tracd.1
+rm trac/test.py
 
 %build
 %{__python} setup.py build
@@ -46,12 +47,15 @@
 %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.cgi \
+mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.*cgi \
   $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin
 
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
-rm $RPM_BUILD_ROOT%{_bindir}/tracd
+install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd}
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man8
+mv $RPM_BUILD_ROOT%{_mandir}/{man1/tracd.1,man8/tracd.8}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,7 @@
 %doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/
 %{_bindir}/trac-admin
 %{_bindir}/tracdb2env
+%{_sbindir}/tracd
 %dir %{python_sitelib}/trac/
 %{python_sitelib}/trac/*.py
 %{python_sitelib}/trac/*.pyc
@@ -100,10 +105,15 @@
 %config(noreplace) /etc/httpd/conf.d/trac.conf
 %{_datadir}/trac/
 %{_var}/www/cgi-bin/trac.cgi
+%{_var}/www/cgi-bin/trac.fcgi
 %{_mandir}/man1/trac-admin.1*
 %{_mandir}/man1/tracdb2env.1*
+%{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
+- re-added tracd and trac.fcgi by user request.
+
 * Tue Jan 10 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-2
 - removed trac.fcgi (bugzilla #174546, comment #11)
 - applied patch (bugzilla #174546, attachment id=123008)



From fedora-extras-commits at redhat.com  Mon Jan 16 19:57:01 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:57:01 -0500
Subject: rpms/trac/FC-4 trac.spec,1.2,1.3
Message-ID: <200601161957.k0GJvYVF006433@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6416

Modified Files:
	trac.spec 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac.spec	16 Jan 2006 19:13:23 -0000	1.2
+++ trac.spec	16 Jan 2006 19:57:01 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-4
+- updated trac.conf to allow for trac.*cgi 
+
 * Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
 - re-added tracd and trac.fcgi by user request.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 19:57:43 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:57:43 -0500
Subject: rpms/trac/FC-4 trac.conf,1.1,1.2
Message-ID: <200601161958.k0GJwFQQ006456@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6439

Modified Files:
	trac.conf 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.conf
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.conf	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.conf	16 Jan 2006 19:57:43 -0000	1.2
@@ -1,10 +1,12 @@
-# Replace all occurrences of /path/to/trac_env with your trac root below
+# Replace all occurrences of /srv/trac with your trac root below
 # and uncomment the respective SetEnv and PythonOption directives.
-<Location /cgi-bin/trac.cgi>
-    #SetEnv TRAC_ENV /path/to/trac_env
+<LocationMatch /cgi-bin/trac\.f?cgi>
+    #SetEnv TRAC_ENV /srv/trac
+</LocationMatch>
 <IfModule mod_python.c>
+<Location /cgi-bin/trac.cgi>
     SetHandler mod_python
     PythonHandler trac.web.modpython_frontend
-    #PythonOption TracEnv /path/to/trac_env
-</IfModule>
+    #PythonOption TracEnv /srv/trac
 </Location>
+</IfModule>



From fedora-extras-commits at redhat.com  Mon Jan 16 19:58:22 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:58:22 -0500
Subject: rpms/trac/devel trac.spec,1.2,1.3
Message-ID: <200601161958.k0GJwsIi006479@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6462

Modified Files:
	trac.spec 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac.spec	16 Jan 2006 19:46:57 -0000	1.2
+++ trac.spec	16 Jan 2006 19:58:22 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-4
+- updated trac.conf to allow for trac.*cgi 
+
 * Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
 - re-added tracd and trac.fcgi by user request.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 19:59:18 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:59:18 -0500
Subject: rpms/trac/devel trac.conf,1.1,1.2
Message-ID: <200601161959.k0GJxoPR006506@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6487

Modified Files:
	trac.conf 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.conf
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.conf	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.conf	16 Jan 2006 19:59:17 -0000	1.2
@@ -1,10 +1,12 @@
-# Replace all occurrences of /path/to/trac_env with your trac root below
+# Replace all occurrences of /srv/trac with your trac root below
 # and uncomment the respective SetEnv and PythonOption directives.
-<Location /cgi-bin/trac.cgi>
-    #SetEnv TRAC_ENV /path/to/trac_env
+<LocationMatch /cgi-bin/trac\.f?cgi>
+    #SetEnv TRAC_ENV /srv/trac
+</LocationMatch>
 <IfModule mod_python.c>
+<Location /cgi-bin/trac.cgi>
     SetHandler mod_python
     PythonHandler trac.web.modpython_frontend
-    #PythonOption TracEnv /path/to/trac_env
-</IfModule>
+    #PythonOption TracEnv /srv/trac
 </Location>
+</IfModule>



From fedora-extras-commits at redhat.com  Mon Jan 16 20:39:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 15:39:33 -0500
Subject: rpms/Glide3/devel Glide3-warn.patch,1.1,1.2
Message-ID: <200601162040.k0GKe6PC008632@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8603

Modified Files:
	Glide3-warn.patch 
Log Message:
Fix non-asm compile in Glide3-warn.patch

Glide3-warn.patch:

Index: Glide3-warn.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3-warn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-warn.patch	16 Jan 2006 15:54:52 -0000	1.1
+++ Glide3-warn.patch	16 Jan 2006 20:39:33 -0000	1.2
@@ -393,9 +393,46 @@
              DA_SETF(fbx);
              DA_SETF(fby - _GlideRoot.pool.fHalf);
              DA_VP_SETFS(b,oowb);
-Only in Glide3/cvg/glide3/src: gdraw.c.warn
-Only in Glide3: debugfiles.list
-Only in Glide3: debugsources.list
+--- Glide3/cvg/glide3/src/gxdraw.c~	2006-01-16 21:33:38.000000000 +0100
++++ Glide3/cvg/glide3/src/gxdraw.c	2006-01-16 21:33:38.000000000 +0100
+@@ -213,31 +213,31 @@
+     dyBC = fb[yindex] - fc[yindex];
+     
+     /* Stash the area in the float pool for easy access */
+-    _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
++    _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
+     
+ #define FloatVal(__f) (((__f) < 786432.875) ? (__f) : ((__f) - 786432.875))
+     {
+-      const FxI32 j = *(FxI32*)&_GlideRoot.pool.ftemp1;
+       const FxU32 culltest = (gc->state.cull_mode << 31UL);
+       
+       /* Zero-area triangles are BAD!! */
+-      if ((j & 0x7FFFFFFF) == 0) {
++      if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
+         GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                   FloatVal(fa[0]), FloatVal(fa[1]), 
+                   FloatVal(fb[0]), FloatVal(fb[1]), 
+                   FloatVal(fc[0]), FloatVal(fc[1]), 
+-                  _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
++                  _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
+         
+         return 0;
+       }
+       
+       /* Backface culling, use sign bit as test */
+-      if ((gc->state.cull_mode != GR_CULL_DISABLE) && (((FxI32)(j ^ culltest)) >= 0)) {
++      if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
++          (((FxI32)(_GlideRoot.pool.temp1.i ^ culltest)) >= 0)) {
+         GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                   FloatVal(fa[0]), FloatVal(fa[1]), 
+                   FloatVal(fb[0]), FloatVal(fb[1]), 
+                   FloatVal(fc[0]), FloatVal(fc[1]), 
+-                  _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
++                  _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
+         
+         return -1;
+       }
 diff -ur Glide3.orig/h3/glide3/src/fxcmd.h Glide3/h3/glide3/src/fxcmd.h
 --- Glide3.orig/h3/glide3/src/fxcmd.h	2005-06-09 20:32:28.000000000 +0200
 +++ Glide3/h3/glide3/src/fxcmd.h	2006-01-16 16:43:14.000000000 +0100



From fedora-extras-commits at redhat.com  Mon Jan 16 20:43:26 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 15:43:26 -0500
Subject: rpms/dejavu-fonts import.log,1.27,1.28
Message-ID: <200601162043.k0GKhx9v008785@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8747

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-3.fc5 on branch devel from dejavu-fonts-2.2-3.fc5.src.rpm
stupid version bumping


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- import.log	16 Jan 2006 18:48:00 -0000	1.27
+++ import.log	16 Jan 2006 20:43:26 -0000	1.28
@@ -24,3 +24,4 @@
 dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980
 dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706
 dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269
+dejavu-fonts-2_2-3_fc5:HEAD:dejavu-fonts-2.2-3.fc5.src.rpm:1137444196



From fedora-extras-commits at redhat.com  Mon Jan 16 20:43:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 15:43:32 -0500
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.9,1.10
Message-ID: <200601162044.k0GKi58v008788@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8747/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-3.fc5 on branch devel from dejavu-fonts-2.2-3.fc5.src.rpm
stupid version bumping


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dejavu-fonts.spec	16 Jan 2006 18:39:12 -0000	1.9
+++ dejavu-fonts.spec	16 Jan 2006 20:43:32 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -59,6 +59,7 @@
 %changelog
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
 - bump release to ensure graceful FC4 -> FC5 update
+- bump again because of bas CVS tag
 
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2



From fedora-extras-commits at redhat.com  Mon Jan 16 20:47:22 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Jan 2006 15:47:22 -0500
Subject: rpms/perl-MIME-tools/devel .cvsignore, 1.4, 1.5 perl-MIME-tools.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200601162047.k0GKltEU008879@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8843

Modified Files:
	.cvsignore perl-MIME-tools.spec sources 
Log Message:
* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
- 5.419.
- Don't provide perl(main).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Oct 2005 19:20:30 -0000	1.4
+++ .cvsignore	16 Jan 2006 20:47:22 -0000	1.5
@@ -1 +1 @@
-MIME-tools-5.418.tar.gz
+MIME-tools-5.419.tar.gz


Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-MIME-tools.spec	4 Oct 2005 16:37:00 -0000	1.11
+++ perl-MIME-tools.spec	16 Jan 2006 20:47:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-MIME-tools
-Version:        5.418
-Release:        2%{?dist}
+Version:        5.419
+Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
 
 Group:          Development/Libraries
@@ -26,6 +26,13 @@
 %prep
 %setup -q -n MIME-tools-%{version}
 chmod 644 examples/* # avoid dependencies
+f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* | grep -v '^perl(main)$'
+EOF
+%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
 
 
 %build
@@ -43,8 +50,7 @@
 
 
 %check
-if %{__perl} -MMIME::QuotedPrint \
-  -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
   make test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
@@ -64,6 +70,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
+- 5.419.
+- Don't provide perl(main).
+
 * Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
 - License is same as perl (GPL or Artistic), not just Artistic
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Oct 2005 19:20:30 -0000	1.4
+++ sources	16 Jan 2006 20:47:22 -0000	1.5
@@ -1 +1 @@
-39bfa5efc92ef6838a932ee9fc0d437d  MIME-tools-5.418.tar.gz
+1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 20:50:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Jan 2006 15:50:23 -0500
Subject: rpms/perl-MIME-tools/FC-4 .cvsignore, 1.3, 1.4 perl-MIME-tools.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601162050.k0GKot7V008924@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8901

Modified Files:
	.cvsignore perl-MIME-tools.spec sources 
Log Message:
* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
- 5.419.
- Don't provide perl(main).

* Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
- License is same as perl (GPL or Artistic), not just Artistic

* Mon Oct  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.418-1
- 5.418.
- Cosmetic specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jan 2005 11:53:15 -0000	1.3
+++ .cvsignore	16 Jan 2006 20:50:23 -0000	1.4
@@ -1 +1 @@
-MIME-tools-5.417.tar.gz
+MIME-tools-5.419.tar.gz


Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/perl-MIME-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MIME-tools.spec	6 Apr 2005 22:13:06 -0000	1.9
+++ perl-MIME-tools.spec	16 Jan 2006 20:50:23 -0000	1.10
@@ -1,20 +1,19 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-MIME-tools
-Version:        5.417
-Release:        2
-
+Version:        5.419
+Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
 
 Group:          Development/Libraries
-License:        Artistic
+License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:     http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.417.tar.gz
+Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy) perl(MIME::Base64) >= 2.20 perl-MailTools
-BuildRequires:  perl >= 1:5.6.1 perl(MIME::QuotedPrint)
+BuildRequires:  perl(IO::Stringy)
+BuildRequires:  perl(MIME::Base64) >= 2.20
+BuildRequires:  perl-MailTools
+BuildRequires:  perl(MIME::QuotedPrint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -27,6 +26,13 @@
 %prep
 %setup -q -n MIME-tools-%{version}
 chmod 644 examples/* # avoid dependencies
+f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* | grep -v '^perl(main)$'
+EOF
+%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
 
 
 %build
@@ -43,9 +49,8 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
-if %{__perl} -MMIME::QuotedPrint \
-  -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then
+%check
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
   make test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
@@ -59,13 +64,24 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples
-%{perl_vendorlib}/MIME
+%doc ChangeLog COPYING README README-OR-DIE examples/
+%{perl_vendorlib}/MIME/
 %{_mandir}/man3/MIME::*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
+- 5.419.
+- Don't provide perl(main).
+
+* Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
+- License is same as perl (GPL or Artistic), not just Artistic
+
+* Mon Oct  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.418-1
+- 5.418.
+- Cosmetic specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.417-2
 - rebuilt
 
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.417-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2005 11:53:15 -0000	1.3
+++ sources	16 Jan 2006 20:50:23 -0000	1.4
@@ -1 +1 @@
-a92299db8729f0f7886ada6e3539b265  MIME-tools-5.417.tar.gz
+1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:19:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:19:38 -0500
Subject: rpms/Glide3-libGL - New directory
Message-ID: <200601162119.k0GLJeTw011008@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11000/Glide3-libGL

Log Message:
Directory /cvs/extras/rpms/Glide3-libGL added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 16 21:19:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:19:44 -0500
Subject: rpms/Glide3-libGL/devel - New directory
Message-ID: <200601162119.k0GLJkdT011023@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11000/Glide3-libGL/devel

Log Message:
Directory /cvs/extras/rpms/Glide3-libGL/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 16 21:20:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:20:29 -0500
Subject: rpms/Glide3-libGL Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601162120.k0GLKVAo011064@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11052

Added Files:
	Makefile import.log 
Log Message:
Setup of module Glide3-libGL


--- NEW FILE Makefile ---
# Top level Makefile for module Glide3-libGL
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 16 21:20:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:20:34 -0500
Subject: rpms/Glide3-libGL/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601162120.k0GLKadZ011084@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11052/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Glide3-libGL


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 16 21:22:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:22:25 -0500
Subject: rpms/Glide3-libGL import.log,1.1,1.2
Message-ID: <200601162122.k0GLMv43011207@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11162

Modified Files:
	import.log 
Log Message:
auto-import Glide3-libGL-6.2.1-3 on branch devel from Glide3-libGL-6.2.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2006 21:20:28 -0000	1.1
+++ import.log	16 Jan 2006 21:22:24 -0000	1.2
@@ -0,0 +1 @@
+Glide3-libGL-6_2_1-3:HEAD:Glide3-libGL-6.2.1-3.src.rpm:1137447237



From fedora-extras-commits at redhat.com  Mon Jan 16 21:22:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:22:31 -0500
Subject: rpms/Glide3-libGL/devel Glide3-libGL-README, NONE,
	1.1 Glide3-libGL.sh, 
	NONE, 1.1 Glide3-libGL.spec, NONE, 1.1 Mesa-6.2.1-64bit.patch,
	NONE, 1.1 Mesa-6.2.1-antialias.patch, NONE,
	1.1 Mesa-6.2.1-config.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601162123.k0GLN3Na011211@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11162/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Glide3-libGL-README Glide3-libGL.sh Glide3-libGL.spec 
	Mesa-6.2.1-64bit.patch Mesa-6.2.1-antialias.patch 
	Mesa-6.2.1-config.patch 
Log Message:
auto-import Glide3-libGL-6.2.1-3 on branch devel from Glide3-libGL-6.2.1-3.src.rpm


--- NEW FILE Glide3-libGL-README ---
Glide3-libGL provides a version of Mesa compiled to render 3D graphics
through Glide3, thus allowing hardware accelerated OpenGL on 3Dfx's 3D only
Voodoo 1 & 2 cards. Even with Glide3-libGL installed OpenGL programs will
normally still use the regular (possibly unaccelerated) videocard.

To use Glide3-libGL to run an OpenGL application on your 3Dfx Voodoo 1 or 2
start your application with the Glide3-libGL wrapper:
Glide3-libGL <appname> [args]

For example if you want to run ppracer without any args use:
Glide3-libGL ppracer


--- NEW FILE Glide3-libGL.sh ---
#!/bin/bash
# Script to run a program using the Glide3 for V1 / V2 version of Mesa

if [ $# -lt 1 ]; then
  echo "`basename $0`, run a program using the Glide3 version of Mesa"
  echo "Usage:"
  echo "`basename $0` <program> [args]"
  exit 1
fi

if [ -f /lib64/libc.so.6 ]; then
  LIB=lib64
else
  LIB=lib
fi

export MESA_GLX_FX=f
export LD_LIBRARY_PATH=/usr/$LIB/Glide3-libGL

exec "$@"


--- NEW FILE Glide3-libGL.spec ---
Name:           Glide3-libGL
Version:        6.2.1
Release:        3
Summary:        Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards
Group:          System Environment/Libraries
License:        MIT/X11
URL:            http://www.mesa3d.org/
Source0:        http://dl.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
Source1:        Glide3-libGL.sh
Source2:        Glide3-libGL-README
Patch0:         Mesa-6.2.1-config.patch
Patch1:         Mesa-6.2.1-64bit.patch
Patch2:         Mesa-6.2.1-antialias.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel libXext-devel libXt-devel libXi-devel libXmu-devel
BuildRequires:  xorg-x11-proto-devel Glide3-devel
ExclusiveArch:  %{ix86} x86_64
 
%description
This version of the Mesa OpenGL library renders 3D graphics using Glide3
for 3Dfx Voodoo 1 & 2 cards, thus allowing hardware accelerated OpenGL on
these 3D only cards. To start an OpenGL application on your Voodoo instead of
on your regular videocard type: "Glide3-libGL <appname> [args]".

You do NOT need this package if you have a 3Dfx Voodoo 3 or 5, the regular
mesa-libGL package supports these full (2D and 3D) video-cards through DRI
(For these 3Dfx cards you do need the regular Glide3 package though).

The Mesa 3D graphics library is a powerful and generic toolset for
creating hardware assisted computer graphics. To the extent that Mesa
utilizes the OpenGL command syntax or state machine, it is being used
with authorization from Silicon Graphics, Inc.  


%prep
%setup -q -n Mesa-%{version}
%patch0 -p1 -b .config
%patch1 -p1 -b .64bit
%patch2 -p1 -b .antialias
install -p -m 644 %{SOURCE2} README.fedora

 
%build
%ifarch %{ix86}
  TARGET=linux-x86-glide
%else
  TARGET=linux-glide
%endif
make %{?_smp_mflags} LIB_DIR=\$\(TOP\)/%{_lib} ${TARGET}
 
 
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}/
mkdir -p $RPM_BUILD_ROOT%{_libdir}/Glide3-libGL/
install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/Glide3-libGL
cp -a %{_lib}/libGL.so* $RPM_BUILD_ROOT%{_libdir}/Glide3-libGL/

 
%clean
rm -rf $RPM_BUILD_ROOT
 
 
%files
%defattr(-,root,root,0755)
%doc README.fedora docs/license.html
%{_bindir}/Glide3-libGL
%{_libdir}/Glide3-libGL
 
 
%changelog
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-3
- Fixed up License.

* Sun Jan 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-2
- Recreated / redid patch0 and 1 as I lost them (stupid me).
- Added patch2 which adds proper support for anti-aliasing.
- Modified the BuildRequires and -config patch to work with modular-X.
- Changed name to Glide3-libGL, which IMHO really is the most correct name.

* Mon Aug 15 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-1
- Initial Fedora Extras package

Mesa-6.2.1-64bit.patch:

--- NEW FILE Mesa-6.2.1-64bit.patch ---
--- Mesa-6.2.1/include/GL/fxmesa.h.64bit	2004-02-10 08:46:07.000000000 +0100
+++ Mesa-6.2.1/include/GL/fxmesa.h	2006-01-15 09:48:06.000000000 +0100
@@ -66,11 +66,11 @@
 
 GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
 						  GrScreenRefresh_t,
-						  const GLint attribList[]);
+						  const long attribList[]);
 
 GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
 						      GLint width, GLint height,
-						      const GLint attribList[]);
+						      const long attribList[]);
 GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
 
 GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
--- Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c.64bit	2006-01-15 10:53:41.000000000 +0100
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c	2006-01-15 10:53:44.000000000 +0100
@@ -239,7 +239,7 @@
    tfxTexInfo *ti;
 
    if (TDFX_DEBUG & VERBOSE_DRIVER) {
-      fprintf(stderr, "fxDDTexBind(%d, %x)\n", tObj->Name, (GLuint)tObj->DriverData);
+      fprintf(stderr, "fxDDTexBind(%d, %lx)\n", tObj->Name, (unsigned long)tObj->DriverData);
    }
 
    if ((target != GL_TEXTURE_1D) && (target != GL_TEXTURE_2D))
@@ -295,8 +295,8 @@
    tfxTexInfo *ti;
 
    if (TDFX_DEBUG & VERBOSE_DRIVER) {
-      fprintf(stderr, "fxDDTexParam(%d, %x, %s, %s)\n",
-                      tObj->Name, (GLuint) tObj->DriverData,
+      fprintf(stderr, "fxDDTexParam(%d, %lx, %s, %s)\n",
+                      tObj->Name, (unsigned long) tObj->DriverData,
                       _mesa_lookup_enum_by_nr(pname),
                       _mesa_lookup_enum_by_nr(param));
    }
@@ -581,8 +581,8 @@
       /* per-texture palette */
       tfxTexInfo *ti;
       if (TDFX_DEBUG & VERBOSE_DRIVER) {
-	 fprintf(stderr, "fxDDTexPalette(%d, %x)\n",
-		 tObj->Name, (GLuint) tObj->DriverData);
+	 fprintf(stderr, "fxDDTexPalette(%d, %lx)\n",
+		 tObj->Name, (unsigned long) tObj->DriverData);
       }
       /* This might be a proxy texture. */
       if (!tObj->Palette.Table)
@@ -1801,7 +1801,7 @@
    for (i = 0; i < rows; i++) {
       MEMCPY(dest, data, srcRowStride);
       dest += destRowStride;
-      data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride);
+      data = (GLvoid *)((GLubyte*)data + srcRowStride);
    }
 
    /* [dBorca] Hack alert:
--- Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c.64bit	2004-09-24 16:31:55.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c	2006-01-15 09:48:06.000000000 +0100
@@ -267,7 +267,7 @@
 
 fxMesaContext GLAPIENTRY
 fxMesaCreateBestContext(GLuint win, GLint width, GLint height,
-			const GLint attribList[])
+			const long attribList[])
 {
  int res = fxBestResolution(width, height);
 
@@ -285,7 +285,7 @@
 fxMesaContext GLAPIENTRY
 fxMesaCreateContext(GLuint win,
 		    GrScreenResolution_t res,
-		    GrScreenRefresh_t ref, const GLint attribList[])
+		    GrScreenRefresh_t ref, const long attribList[])
 {
  fxMesaContext fxMesa = NULL;
  GLcontext *ctx = NULL, *shareCtx = NULL;
--- Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c.64bit	2004-04-30 11:44:22.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c	2006-01-15 09:48:06.000000000 +0100
@@ -1809,7 +1809,7 @@
    fxEnvVar = _mesa_getenv("MESA_GLX_FX");
    if (fxEnvVar) {
      if (fxEnvVar[0]!='d') {
-       int attribs[100];
+       long attribs[100];
        int numAttribs = 0;
        int hw;
        if (v->mesa_visual.depthBits > 0) {
@@ -1833,7 +1833,7 @@
        }
        if (1) {
          attribs[numAttribs++] = FXMESA_SHARE_CONTEXT;
-         attribs[numAttribs++] = (int) &(c->mesa);
+         attribs[numAttribs++] = (long) &(c->mesa);
        }
        attribs[numAttribs++] = FXMESA_NONE;
 
--- Mesa-6.2.1/src/mesa/main/texstore.c.64bit	2004-08-25 17:59:49.000000000 +0200
+++ Mesa-6.2.1/src/mesa/main/texstore.c	2006-01-15 09:48:06.000000000 +0100
@@ -1830,7 +1830,7 @@
    else {
       /* using a PBO */
       if ((const GLubyte *) pixels + imageSize >
-          (const GLubyte *) packing->BufferObj->Size) {
+          (const GLubyte *)(unsigned long) packing->BufferObj->Size) {
          /* out of bounds read! */
          return NULL;
       }
--- Mesa-6.2.1/src/mesa/main/bufferobj.c.64bit	2004-11-22 21:05:42.000000000 +0100
+++ Mesa-6.2.1/src/mesa/main/bufferobj.c	2006-01-15 09:48:06.000000000 +0100
@@ -412,11 +412,11 @@
                               format, type, depth-1, height-1, width);
 
 
-   if ((const GLubyte *) start > (const GLubyte *) pack->BufferObj->Size) {
+   if ((const GLubyte *) start > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
       /* This will catch negative values / wrap-around */
       return GL_FALSE;
    }
-   if ((const GLubyte *) end > (const GLubyte *) pack->BufferObj->Size) {
+   if ((const GLubyte *) end > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
       /* Image read goes beyond end of buffer */
       return GL_FALSE;
    }
--- Mesa-6.2.1/src/mesa/glapi/glapi.h.64bit	2004-12-08 16:07:30.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.h	2006-01-15 09:48:06.000000000 +0100
@@ -117,7 +117,7 @@
 _glapi_get_proc_offset(const char *funcName);
 
 
-extern const _glapi_proc
+extern _glapi_proc
 _glapi_get_proc_address(const char *funcName);
 
 
--- Mesa-6.2.1/src/mesa/glapi/glapi.c.64bit	2004-12-05 18:26:27.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.c	2006-01-15 09:48:06.000000000 +0100
@@ -532,7 +532,7 @@
  * Return pointer to the named static (built-in) function.
  * \return  NULL if function not found.
  */
-static const _glapi_proc
+static _glapi_proc
 get_static_proc_address(const char *funcName)
 {
    const glprocs_table_t * const f = find_entry( funcName );
@@ -837,7 +837,7 @@
  * in the name of static functions, try generating a new API entrypoint on
  * the fly with assembly language.
  */
-const _glapi_proc
+_glapi_proc
 _glapi_get_proc_address(const char *funcName)
 {
    GLuint i;

Mesa-6.2.1-antialias.patch:

--- NEW FILE Mesa-6.2.1-antialias.patch ---
--- Mesa-6.2.1/src/mesa/drivers/glide/fxsetup.c.antialias	2006-01-15 20:28:01.000000000 +0100
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxsetup.c	2006-01-15 20:38:46.000000000 +0100
@@ -2039,6 +2039,12 @@
 /****************************** DD Enable ******************************/
 /************************************************************************/
 
+/* from newer Glide3 fxglide.h, unfortunatly not in exported header files */
+#define GR_AA_ORDERED_OGL               0x00010000
+#define GR_AA_ORDERED_POINTS_OGL        GR_AA_ORDERED_OGL+1
+#define GR_AA_ORDERED_LINES_OGL         GR_AA_ORDERED_OGL+2
+#define GR_AA_ORDERED_TRIANGLES_OGL     GR_AA_ORDERED_OGL+3
+
 void
 fxDDEnable(GLcontext * ctx, GLenum cap, GLboolean state)
 {
@@ -2096,9 +2102,27 @@
       fxMesa->new_state |= FX_NEW_CULL;
       break;
    case GL_LINE_SMOOTH:
-   case GL_LINE_STIPPLE:
+      if (state)
+         grEnable(GR_AA_ORDERED_LINES_OGL);
+      else
+         grDisable(GR_AA_ORDERED_LINES_OGL);
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
    case GL_POINT_SMOOTH:
+      if (state)
+         grEnable(GR_AA_ORDERED_POINTS_OGL);
+      else
+         grDisable(GR_AA_ORDERED_POINTS_OGL);
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
    case GL_POLYGON_SMOOTH:
+      if (state)
+         grEnable(GR_AA_ORDERED_TRIANGLES_OGL);
+      else
+         grDisable(GR_AA_ORDERED_TRIANGLES_OGL);
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
+   case GL_LINE_STIPPLE:
    case GL_TEXTURE_1D:
    case GL_TEXTURE_2D:
       fxMesa->new_state |= FX_NEW_TEXTURING;

Mesa-6.2.1-config.patch:

--- NEW FILE Mesa-6.2.1-config.patch ---
--- Mesa-6.2.1/configs/linux-x86-glide.config	2004-09-13 23:04:20.000000000 +0200
+++ Mesa-6.2.1/configs/linux-x86-glide	2006-01-15 09:26:18.000000000 +0100
@@ -8,9 +8,9 @@
 CC = gcc
 CXX = g++
 
-CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DFX -I/usr/include/glide3
 
-CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 
 GLUT_CFLAGS = -fexceptions
 
@@ -18,7 +18,7 @@
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
--- Mesa-6.2.1/configs/default.config	2006-01-15 09:32:20.000000000 +0100
+++ Mesa-6.2.1/configs/default	2006-01-15 09:32:53.000000000 +0100
@@ -22,8 +22,8 @@
 
 # Misc tools and flags
 MKLIB_OPTIONS = 
-MKDEP = makedepend
-MKDEP_OPTIONS = -Y -fdepend
+MKDEP = gcc -M
+MKDEP_OPTIONS = -MF depend
 MAKE = make
 
 # Library names (base name)
--- Mesa-6.2.1/configs/linux-glide.config	2004-09-13 23:06:22.000000000 +0200
+++ Mesa-6.2.1/configs/linux-glide	2006-01-15 09:26:18.000000000 +0100
@@ -8,13 +8,13 @@
 CC = gcc
 CXX = g++
 
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DFX -I/usr/include/glide3
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Jan 2006 21:20:34 -0000	1.1
+++ .cvsignore	16 Jan 2006 21:22:30 -0000	1.2
@@ -0,0 +1 @@
+MesaLib-6.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Jan 2006 21:20:34 -0000	1.1
+++ sources	16 Jan 2006 21:22:30 -0000	1.2
@@ -0,0 +1 @@
+f43228cd2bf70f583ef3275c1c545421  MesaLib-6.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 16 21:23:16 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:23:16 -0500
Subject: rpms/fig2ps/devel .cvsignore, 1.2, 1.3 fig2ps.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601162123.k0GLNmXX011264@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fig2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11243

Modified Files:
	.cvsignore fig2ps.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2005 01:16:39 -0000	1.2
+++ .cvsignore	16 Jan 2006 21:23:15 -0000	1.3
@@ -1 +1 @@
-fig2ps_1.3.3.tar.gz
+fig2ps_1.3.5.tar.gz


Index: fig2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/devel/fig2ps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fig2ps.spec	21 Sep 2005 13:40:19 -0000	1.2
+++ fig2ps.spec	16 Jan 2006 21:23:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fig2ps
-Version:        1.3.3
-Release:        2
+Version:        1.3.5
+Release:        1
 Summary:        Utility for converting xfig pictures to PS/PDF
 
 Group:          Applications/Publishing
@@ -43,6 +43,9 @@
 %config(noreplace) /etc/fig2ps
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.5-1
+- New upstream release
+
 * Wed Sep 21 2005 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.3-2
 - fix make install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2005 01:16:39 -0000	1.2
+++ sources	16 Jan 2006 21:23:15 -0000	1.3
@@ -1 +1 @@
-24d2061f7491160e870beb6904672663  fig2ps_1.3.3.tar.gz
+e422a0587b0ca85a4fd8233bff7232ad  fig2ps_1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:26:20 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:26:20 -0500
Subject: rpms/fig2ps/FC-4 .cvsignore, 1.2, 1.3 fig2ps.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601162126.k0GLQqEj011342@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fig2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11321

Modified Files:
	.cvsignore fig2ps.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2005 01:16:39 -0000	1.2
+++ .cvsignore	16 Jan 2006 21:26:19 -0000	1.3
@@ -1 +1 @@
-fig2ps_1.3.3.tar.gz
+fig2ps_1.3.5.tar.gz


Index: fig2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-4/fig2ps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fig2ps.spec	21 Sep 2005 13:40:19 -0000	1.2
+++ fig2ps.spec	16 Jan 2006 21:26:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fig2ps
-Version:        1.3.3
-Release:        2
+Version:        1.3.5
+Release:        1
 Summary:        Utility for converting xfig pictures to PS/PDF
 
 Group:          Applications/Publishing
@@ -43,6 +43,9 @@
 %config(noreplace) /etc/fig2ps
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.5-1
+- New upstream release
+
 * Wed Sep 21 2005 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.3-2
 - fix make install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2005 01:16:39 -0000	1.2
+++ sources	16 Jan 2006 21:26:19 -0000	1.3
@@ -1 +1 @@
-24d2061f7491160e870beb6904672663  fig2ps_1.3.3.tar.gz
+e422a0587b0ca85a4fd8233bff7232ad  fig2ps_1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:27:54 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:27:54 -0500
Subject: rpms/fig2ps/FC-3 .cvsignore, 1.2, 1.3 fig2ps.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601162128.k0GLSQow011395@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fig2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11374

Modified Files:
	.cvsignore fig2ps.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2005 01:16:39 -0000	1.2
+++ .cvsignore	16 Jan 2006 21:27:53 -0000	1.3
@@ -1 +1 @@
-fig2ps_1.3.3.tar.gz
+fig2ps_1.3.5.tar.gz


Index: fig2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-3/fig2ps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fig2ps.spec	21 Sep 2005 13:40:19 -0000	1.2
+++ fig2ps.spec	16 Jan 2006 21:27:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fig2ps
-Version:        1.3.3
-Release:        2
+Version:        1.3.5
+Release:        1
 Summary:        Utility for converting xfig pictures to PS/PDF
 
 Group:          Applications/Publishing
@@ -43,6 +43,9 @@
 %config(noreplace) /etc/fig2ps
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.5-1
+- New upstream release
+
 * Wed Sep 21 2005 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.3-2
 - fix make install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2005 01:16:39 -0000	1.2
+++ sources	16 Jan 2006 21:27:53 -0000	1.3
@@ -1 +1 @@
-24d2061f7491160e870beb6904672663  fig2ps_1.3.3.tar.gz
+e422a0587b0ca85a4fd8233bff7232ad  fig2ps_1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:36:43 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:36:43 -0500
Subject: rpms/cln/devel .cvsignore, 1.3, 1.4 cln.spec, 1.14, 1.15 sources,
	1.3, 1.4 cln-1.1.9-string.patch, 1.1, NONE
Message-ID: <200601162137.k0GLbFFc011592@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11571

Modified Files:
	.cvsignore cln.spec sources 
Removed Files:
	cln-1.1.9-string.patch 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 22:00:25 -0000	1.3
+++ .cvsignore	16 Jan 2006 21:36:43 -0000	1.4
@@ -1 +1 @@
-cln-1.1.10.tar.bz2
+cln-1.1.11.tar.bz2


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cln.spec	31 Oct 2005 22:00:25 -0000	1.14
+++ cln.spec	16 Jan 2006 21:36:43 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           cln
-Version:        1.1.10
+Version:        1.1.11
 Release:        1%{?dist}
 Summary:        Class Library for Numbers
 
@@ -78,6 +78,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
+- New upstream release.
+
 * Mon Oct 31 2005 Quentin Spencer <qspencer at users.sf.net> 1.1.10-1
 - New upstream release, incorporating previous patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 22:00:25 -0000	1.3
+++ sources	16 Jan 2006 21:36:43 -0000	1.4
@@ -1 +1 @@
-f194811dadcd2b1dca5f78a62370eb56  cln-1.1.10.tar.bz2
+7313dc20608ddc5dcfdae4d2f9138762  cln-1.1.11.tar.bz2


--- cln-1.1.9-string.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 21:40:27 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:40:27 -0500
Subject: rpms/cln/devel cln.spec,1.15,1.16
Message-ID: <200601162140.k0GLexja011685@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11651

Modified Files:
	cln.spec 
Log Message:
Updated source URL.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cln.spec	16 Jan 2006 21:36:43 -0000	1.15
+++ cln.spec	16 Jan 2006 21:40:26 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           cln
 Version:        1.1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/CLN/
-Source0:        ftp://ftpthep.physik.uni-mainz.de/pub/gnu/%{name}-%{version}.tar.bz2
+Source0:        http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -78,6 +78,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-2
+- Update source URL.
+
 * Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 21:43:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:43:22 -0500
Subject: rpms/Glide3-libGL/devel Glide3-libGL.spec,1.1,1.2
Message-ID: <200601162143.k0GLhsAv011807@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11790

Modified Files:
	Glide3-libGL.spec 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-4
- Add libGL-devel to BR, to work around a bug in the Mesa makefiles
  where it tries to link against libGL before it has build it.



Index: Glide3-libGL.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/Glide3-libGL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-libGL.spec	16 Jan 2006 21:22:30 -0000	1.1
+++ Glide3-libGL.spec	16 Jan 2006 21:43:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Glide3-libGL
 Version:        6.2.1
-Release:        3
+Release:        4
 Summary:        Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards
 Group:          System Environment/Libraries
 License:        MIT/X11
@@ -13,7 +13,7 @@
 Patch2:         Mesa-6.2.1-antialias.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXext-devel libXt-devel libXi-devel libXmu-devel
-BuildRequires:  xorg-x11-proto-devel Glide3-devel
+BuildRequires:  xorg-x11-proto-devel Glide3-devel libGL-devel
 ExclusiveArch:  %{ix86} x86_64
  
 %description
@@ -69,6 +69,10 @@
  
  
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-4
+- Add libGL-devel to BR, to work around a bug in the Mesa makefiles
+  where it tries to link against libGL before it has build it.
+
 * Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-3
 - Fixed up License.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 21:51:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 16:51:38 -0500
Subject: rpms/freeze import.log,1.4,1.5
Message-ID: <200601162152.k0GLqBKv011964@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/freeze
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11918

Modified Files:
	import.log 
Log Message:
auto-import freeze-2.5.0-5.fc5 on branch devel from freeze-2.5.0-5.fc5.src.rpm
builds with gcc 4.1 -> what's more to ask ? (ok kill some warnings someday)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freeze/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:20:41 -0000	1.4
+++ import.log	16 Jan 2006 21:51:38 -0000	1.5
@@ -1,3 +1,4 @@
 freeze-2_5_0-0_fdr_1_rh90:HEAD:freeze-2.5.0-0.fdr.1.rh90.src.rpm:1099887629
 freeze-2_5_0-0_fdr_1_1:HEAD:freeze-2.5.0-0.fdr.1.1.src.rpm:1099887635
 freeze-2_5_0-0_fdr_1_2:HEAD:freeze-2.5.0-0.fdr.1.2.src.rpm:1099887641
+freeze-2_5_0-5_fc5:HEAD:freeze-2.5.0-5.fc5.src.rpm:1137448288



From fedora-extras-commits at redhat.com  Mon Jan 16 21:51:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 16:51:44 -0500
Subject: rpms/freeze/devel freeze.spec,1.7,1.8
Message-ID: <200601162152.k0GLqGlF011967@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/freeze/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11918/devel

Modified Files:
	freeze.spec 
Log Message:
auto-import freeze-2.5.0-5.fc5 on branch devel from freeze-2.5.0-5.fc5.src.rpm
builds with gcc 4.1 -> what's more to ask ? (ok kill some warnings someday)


Index: freeze.spec
===================================================================
RCS file: /cvs/extras/rpms/freeze/devel/freeze.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freeze.spec	23 Jul 2005 18:27:16 -0000	1.7
+++ freeze.spec	16 Jan 2006 21:51:44 -0000	1.8
@@ -1,10 +1,11 @@
 Name:    freeze
 Version: 2.5.0
-Release: 4
+Release: 5%{?dist}
 Summary: freeze/melt/fcat compression utilities
 
 Group:     Applications/Archiving
 License:   Distributable
+# No one agrees on the canonical download site, everyone uses the same version
 Source:    http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
 Patch0:    freeze-2.5.patch
 Patch1:    freeze-2.5.0-printf.patch
@@ -51,6 +52,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Jan 26 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.5.0-5
+- rebuild with gcc 4.1
+
 * Sat Jul 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.5.0-4
 - Fix bad printf string (#149613).
 - Fix default cnf file location in readme and man page.



From fedora-extras-commits at redhat.com  Mon Jan 16 22:03:37 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 16 Jan 2006 17:03:37 -0500
Subject: rpms/mysql-administrator/devel mysql-administrator.spec,1.1,1.2
Message-ID: <200601162204.k0GM490d013876@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13853

Modified Files:
	mysql-administrator.spec 
Log Message:
updated to 1.1.6



Index: mysql-administrator.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/mysql-administrator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-administrator.spec	12 Jan 2006 16:51:29 -0000	1.1
+++ mysql-administrator.spec	16 Jan 2006 22:03:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mysql-administrator
-Version:        1.1.5
-Release:        3%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        GUI to manage mysql Databases
 
 Group:          Applications/Databases
@@ -10,10 +10,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		mysql-administrator-1.1.5-gcc41.patch
 Patch1:		mysql-administrator-1.1.5-shellbang.patch
+#Patch2 from bugzilla https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177849
+Patch2:		mysql-administrator-gsprintf.patch
 
 BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
 BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils
-Requires:       mysql >= 4.0, gtkmm24, mysql-gui-common
+Requires:       mysql >= 4.0, mysql-gui-common
 
 %description
 MySQL Administrator enables developers and DBAs to easily perform 
@@ -24,14 +26,12 @@
 MySQL Administrator graphical console.
 
 %package     -n mysql-gui-common
-Summary:        Common libraries and data shared among the MySQL GUI Suites
+Summary:        Common data shared among the MySQL GUI Suites
 Group:          System Environment/Libraries
 
 %description -n mysql-gui-common
-This package contains several common libraries and data shared among the MySQL
-GUI Suites in all platforms.
-
-
+This package contains  glade files images and translations used by mysql tools
+at runtime
 
 %prep
 %setup -q
@@ -39,6 +39,7 @@
 %patch0 -p1 -b .gcc41
 %endif
 %patch1 -p1 -b .shellbang
+%patch2 -p0 -b .gsprintf
 
 %build
 pushd  mysql-gui-common
@@ -46,7 +47,6 @@
 make %{?_smp_mflags}
 popd
 
-
 pushd mysql-administrator
 %configure
 make %{?_smp_mflags}
@@ -64,6 +64,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
+cp -r mysql-administrator/doc/* $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
 # 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
 sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
@@ -71,20 +73,21 @@
 
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category SystemSetup \
+  --add-category System \
   --add-category Application \
   --add-category X-Fedora \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
 
 %find_lang mysql-gui-common
+%find_lang mysql-administrator
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f mysql-administrator.lang
 %defattr(-,root,root,-)
 %doc mysql-administrator/COPYING 
 %{_bindir}/mabackup
@@ -94,15 +97,21 @@
 %{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
 %dir %{_datadir}/mysql-gui/administrator
 %{_datadir}/mysql-gui/administrator/*
+%{_datadir}/mysql-gui/doc/*
 
 
 %files -n mysql-gui-common -f mysql-gui-common.lang
 %defattr(-,root,root,-)
 %doc mysql-gui-common/COPYING mysql-gui-common/README
 %dir %{_datadir}/mysql-gui
+%dir %{_datadir}/mysql-gui/doc
 %{_datadir}/mysql-gui/common
 
 %changelog
+* Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.6-1
+- update to 1.1.6 make mysql-gui-common description more appropriate
+- Fix Help,  apply patch for backup failure bugzilla #177849
+- add new lang files
 * Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-3
 - apply gcc4.1 patch only on fc5 
 * Wed Jan 11 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-2



From fedora-extras-commits at redhat.com  Mon Jan 16 22:04:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 17:04:11 -0500
Subject: rpms/libgda/devel libgda-1.9.100-sharp.patch, NONE, 1.1 libgda.spec,
	1.7, 1.8
Message-ID: <200601162204.k0GM4ihE013903@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13880

Modified Files:
	libgda.spec 
Added Files:
	libgda-1.9.100-sharp.patch 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
- Add BuildRequires for building libgda-sharp


libgda-1.9.100-sharp.patch:

--- NEW FILE libgda-1.9.100-sharp.patch ---
--- libgda-1.9.100/gda-sharp/gda-sharp.dll.config.in.sharp	2006-01-16 22:59:40.000000000 +0100
+++ libgda-1.9.100/gda-sharp/gda-sharp.dll.config.in	2006-01-16 23:00:11.000000000 +0100
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gda-3" target="libgda-2 at LIB_PREFIX@.1 at LIB_SUFFIX@"/>
+  <dllmap dll="gda-3" target="libgda-3 at LIB_PREFIX@.3 at LIB_SUFFIX@"/>
 </configuration>


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgda.spec	28 Nov 2005 16:07:38 -0000	1.7
+++ libgda.spec	16 Jan 2006 22:04:11 -0000	1.8
@@ -35,7 +35,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          1.9.100
-Release: 	  1
+Release: 	  2
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -43,19 +43,10 @@
 License:          LGPL
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    pkgconfig >= 0.8
-Requires:         glib2 >= 2.0.0
-Requires:         libxml2
-Requires:         libxslt >= 1.0.9
-Requires:	  ncurses
 BuildRequires:    glib2-devel >= 2.0.0
-BuildRequires:    libxml2-devel
 BuildRequires:    libxslt-devel >= 1.0.9
-BuildRequires:    ncurses-devel
-BuildRequires:    scrollkeeper
-BuildRequires:    groff
-BuildRequires:    readline-devel
-BuildRequires:    db4-devel
-BuildRequires:    gtk-doc
+BuildRequires:    libxml2-devel ncurses-devel scrollkeeper groff readline-devel
+BuildRequires:    db4-devel gtk-doc mono-devel gtk-sharp2 gtk-sharp2-gapi
 
 %if %{FREETDS}
 BuildRequires:    freetds-devel
@@ -82,6 +73,7 @@
 %endif
 
 Patch0: libgda-1.9.100-configure.patch
+Patch1: libgda-1.9.100-sharp.patch
 
 %description
 libgda is a library that eases the task of writing
@@ -89,18 +81,27 @@
 
 
 %package devel
-Summary:          Development libraries and header files for libgda.
+Summary:          Development libraries and header files for libgda
 Group:            Development/Libraries
 Requires:         glib2-devel >= 2.0.0
-Requires:         libxml2-devel
 Requires:         libxslt-devel >= 1.0.9
-Requires:         db4-devel
+Requires:         db4-devel libxml2-devel
 Requires:	  %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
+
+%package sharp
+Summary:          Mono bindings for libgda
+Group:            System Environment/Libraries
+
+%description sharp
+This package contains the dll files needed to run (and compile) Mono
+applications which use libgda.
+
+
 %if %{FREETDS}
 %package freetds
 Summary:	libgda FreeTDS Provider
@@ -194,6 +195,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .configure
+%patch1 -p1 -b .sharp
 
 %build
 aclocal
@@ -253,7 +255,7 @@
 CONFIG="$CONFIG --without-ldap"
 %endif
 
-%configure $CONFIG --disable-gtk-doc
+%configure $CONFIG
 make
 
 %install
@@ -302,7 +304,12 @@
 %{_includedir}/*
 %{_libdir}/*.a
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/libgda-2.0.pc
+
+%files sharp
+%defattr(-,root,root)
+%{_libdir}/libgda
+%{_libdir}/pkgconfig/gda-sharp-2.0.pc
 
 %if %{FREETDS}
 %files freetds
@@ -360,6 +367,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
+- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
+- Add BuildRequires for building libgda-sharp
+
 * Sun Nov 27 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-1
 - New upstream version
 - Drop 4 intergrated patches



From fedora-extras-commits at redhat.com  Mon Jan 16 22:19:06 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 17:19:06 -0500
Subject: rpms/cln/FC-4 .cvsignore, 1.3, 1.4 cln.spec, 1.10, 1.11 sources, 1.3,
	1.4 cln-1.1.9-string.patch, 1.1, NONE
Message-ID: <200601162219.k0GMJdSD014080@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14059

Modified Files:
	.cvsignore cln.spec sources 
Removed Files:
	cln-1.1.9-string.patch 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 21:59:26 -0000	1.3
+++ .cvsignore	16 Jan 2006 22:19:06 -0000	1.4
@@ -1 +1 @@
-cln-1.1.10.tar.bz2
+cln-1.1.11.tar.bz2


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cln.spec	31 Oct 2005 21:59:26 -0000	1.10
+++ cln.spec	16 Jan 2006 22:19:06 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           cln
-Version:        1.1.10
+Version:        1.1.11
 Release:        1%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/CLN/
-Source0:        ftp://ftpthep.physik.uni-mainz.de/pub/gnu/%{name}-%{version}.tar.bz2
+Source0:        http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -78,6 +78,10 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
+- New upstream release.
+- Updated source URL.
+
 * Mon Oct 31 2005 Quentin Spencer <qspencer at users.sf.net> 1.1.10-1
 - New upstream release, which incorporates previous patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 21:59:26 -0000	1.3
+++ sources	16 Jan 2006 22:19:06 -0000	1.4
@@ -1 +1 @@
-f194811dadcd2b1dca5f78a62370eb56  cln-1.1.10.tar.bz2
+7313dc20608ddc5dcfdae4d2f9138762  cln-1.1.11.tar.bz2


--- cln-1.1.9-string.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 22:27:00 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 16 Jan 2006 17:27:00 -0500
Subject: rpms/mysql-administrator/devel mysql-administrator-gsprintf.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601162227.k0GMRX87014198@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14166

Modified Files:
	.cvsignore sources 
Added Files:
	mysql-administrator-gsprintf.patch 
Log Message:
patch for backups


mysql-administrator-gsprintf.patch:

--- NEW FILE mysql-administrator-gsprintf.patch ---
--- mysql-administrator/library/source/myx_backup.c.orig	2005-10-25 23:08:07.000000000 +0200
+++ mysql-administrator/library/source/myx_backup.c	2005-12-17 16:13:37.000000000 +0100
@@ -771,15 +772,15 @@
       int mode_entry_count = 0;
       if (status->options & MYX_B_ANSI_QUOTES)
       {
+	strcat(sql_mode_cmd, "ANSI_QUOTES");
         mode_entry_count++;
-        g_sprintf(sql_mode_cmd, "%sANSI_QUOTES", sql_mode_cmd);
       };
       if (status->options & MYX_B_COMPATIBILITY_MODE)
       {
-        g_sprintf(sql_mode_cmd, "%s%sMYSQL323", sql_mode_cmd, (mode_entry_count > 0) ? "," : "");
+	strcat(sql_mode_cmd, (mode_entry_count > 0 ? ",MYSQL323" : "MYSQL323"));
         mode_entry_count++;
       };
-      g_sprintf(sql_mode_cmd, "%s' */", sql_mode_cmd);
+      strcat(sql_mode_cmd, "' */");
 
       if (write_sql_file_header(status, error))
         return -1;
@@ -2448,10 +2450,10 @@
   SAFE_IO(fprintf(status->sql_file, "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n"));
 
   if (status->options & MYX_B_ANSI_QUOTES)
-    g_sprintf(Buffer, "%s,ANSI_QUOTES", Buffer);
+	strcat(Buffer, ",ANSI_QUOTES");
   if (status->options & MYX_B_COMPATIBILITY_MODE)
-    g_sprintf(Buffer, "%s,MYSQL323", Buffer);
-  g_sprintf(Buffer, "%s' */;\n\n\n", Buffer);
+	strcat(Buffer, ",MYSQL323");
+  strcat(Buffer, "' */;\n\n\n");
   SAFE_IO(fprintf(status->sql_file, Buffer));
 
   return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 16:51:29 -0000	1.2
+++ .cvsignore	16 Jan 2006 22:27:00 -0000	1.3
@@ -1 +1 @@
-mysql-administrator-1.1.5.tar.gz
+mysql-administrator-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 16:51:29 -0000	1.2
+++ sources	16 Jan 2006 22:27:00 -0000	1.3
@@ -1 +1 @@
-f50a3505d50e024e8a775c2cd4a2ecf6  mysql-administrator-1.1.5.tar.gz
+77c1c5a7b6f750b84873799bc9694ea5  mysql-administrator-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 22:30:51 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 16 Jan 2006 17:30:51 -0500
Subject: rpms/mysql-administrator/FC-4 mysql-administrator-gsprintf.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 mysql-administrator.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601162231.k0GMVNgP014294@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14267

Modified Files:
	.cvsignore mysql-administrator.spec sources 
Added Files:
	mysql-administrator-gsprintf.patch 
Log Message:
add patch and update to 1.1.6


mysql-administrator-gsprintf.patch:

--- NEW FILE mysql-administrator-gsprintf.patch ---
--- mysql-administrator/library/source/myx_backup.c.orig	2005-10-25 23:08:07.000000000 +0200
+++ mysql-administrator/library/source/myx_backup.c	2005-12-17 16:13:37.000000000 +0100
@@ -771,15 +772,15 @@
       int mode_entry_count = 0;
       if (status->options & MYX_B_ANSI_QUOTES)
       {
+	strcat(sql_mode_cmd, "ANSI_QUOTES");
         mode_entry_count++;
-        g_sprintf(sql_mode_cmd, "%sANSI_QUOTES", sql_mode_cmd);
       };
       if (status->options & MYX_B_COMPATIBILITY_MODE)
       {
-        g_sprintf(sql_mode_cmd, "%s%sMYSQL323", sql_mode_cmd, (mode_entry_count > 0) ? "," : "");
+	strcat(sql_mode_cmd, (mode_entry_count > 0 ? ",MYSQL323" : "MYSQL323"));
         mode_entry_count++;
       };
-      g_sprintf(sql_mode_cmd, "%s' */", sql_mode_cmd);
+      strcat(sql_mode_cmd, "' */");
 
       if (write_sql_file_header(status, error))
         return -1;
@@ -2448,10 +2450,10 @@
   SAFE_IO(fprintf(status->sql_file, "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n"));
 
   if (status->options & MYX_B_ANSI_QUOTES)
-    g_sprintf(Buffer, "%s,ANSI_QUOTES", Buffer);
+	strcat(Buffer, ",ANSI_QUOTES");
   if (status->options & MYX_B_COMPATIBILITY_MODE)
-    g_sprintf(Buffer, "%s,MYSQL323", Buffer);
-  g_sprintf(Buffer, "%s' */;\n\n\n", Buffer);
+	strcat(Buffer, ",MYSQL323");
+  strcat(Buffer, "' */;\n\n\n");
   SAFE_IO(fprintf(status->sql_file, Buffer));
 
   return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 16:51:29 -0000	1.2
+++ .cvsignore	16 Jan 2006 22:30:50 -0000	1.3
@@ -1 +1 @@
-mysql-administrator-1.1.5.tar.gz
+mysql-administrator-1.1.6.tar.gz


Index: mysql-administrator.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/mysql-administrator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-administrator.spec	12 Jan 2006 16:51:29 -0000	1.1
+++ mysql-administrator.spec	16 Jan 2006 22:30:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mysql-administrator
-Version:        1.1.5
-Release:        3%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        GUI to manage mysql Databases
 
 Group:          Applications/Databases
@@ -10,10 +10,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		mysql-administrator-1.1.5-gcc41.patch
 Patch1:		mysql-administrator-1.1.5-shellbang.patch
+#Patch2 from bugzilla https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177849
+Patch2:		mysql-administrator-gsprintf.patch
 
 BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
 BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils
-Requires:       mysql >= 4.0, gtkmm24, mysql-gui-common
+Requires:       mysql >= 4.0, mysql-gui-common
 
 %description
 MySQL Administrator enables developers and DBAs to easily perform 
@@ -24,14 +26,12 @@
 MySQL Administrator graphical console.
 
 %package     -n mysql-gui-common
-Summary:        Common libraries and data shared among the MySQL GUI Suites
+Summary:        Common data shared among the MySQL GUI Suites
 Group:          System Environment/Libraries
 
 %description -n mysql-gui-common
-This package contains several common libraries and data shared among the MySQL
-GUI Suites in all platforms.
-
-
+This package contains  glade files images and translations used by mysql tools
+at runtime
 
 %prep
 %setup -q
@@ -39,6 +39,7 @@
 %patch0 -p1 -b .gcc41
 %endif
 %patch1 -p1 -b .shellbang
+%patch2 -p0 -b .gsprintf
 
 %build
 pushd  mysql-gui-common
@@ -46,7 +47,6 @@
 make %{?_smp_mflags}
 popd
 
-
 pushd mysql-administrator
 %configure
 make %{?_smp_mflags}
@@ -64,6 +64,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
+cp -r mysql-administrator/doc/* $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
 # 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
 sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
@@ -71,20 +73,21 @@
 
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category SystemSetup \
+  --add-category System \
   --add-category Application \
   --add-category X-Fedora \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
 
 %find_lang mysql-gui-common
+%find_lang mysql-administrator
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f mysql-administrator.lang
 %defattr(-,root,root,-)
 %doc mysql-administrator/COPYING 
 %{_bindir}/mabackup
@@ -94,15 +97,21 @@
 %{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
 %dir %{_datadir}/mysql-gui/administrator
 %{_datadir}/mysql-gui/administrator/*
+%{_datadir}/mysql-gui/doc/*
 
 
 %files -n mysql-gui-common -f mysql-gui-common.lang
 %defattr(-,root,root,-)
 %doc mysql-gui-common/COPYING mysql-gui-common/README
 %dir %{_datadir}/mysql-gui
+%dir %{_datadir}/mysql-gui/doc
 %{_datadir}/mysql-gui/common
 
 %changelog
+* Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.6-1
+- update to 1.1.6 make mysql-gui-common description more appropriate
+- Fix Help,  apply patch for backup failure bugzilla #177849
+- add new lang files
 * Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-3
 - apply gcc4.1 patch only on fc5 
 * Wed Jan 11 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 16:51:29 -0000	1.2
+++ sources	16 Jan 2006 22:30:50 -0000	1.3
@@ -1 +1 @@
-f50a3505d50e024e8a775c2cd4a2ecf6  mysql-administrator-1.1.5.tar.gz
+77c1c5a7b6f750b84873799bc9694ea5  mysql-administrator-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 22:35:39 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:35:39 -0500
Subject: rpms/nomarch import.log,1.4,1.5
Message-ID: <200601162236.k0GMaBUP014396@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/nomarch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14364

Modified Files:
	import.log 
Log Message:
auto-import nomarch-1.3-4.fc5 on branch devel from nomarch-1.3-4.fc5.src.rpm
same old version builds with gcc 4.1 without a single warning -> now that's clean code


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nomarch/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:55:37 -0000	1.4
+++ import.log	16 Jan 2006 22:35:39 -0000	1.5
@@ -1,3 +1,4 @@
 nomarch-1_3-0_fdr_1_rh90:HEAD:nomarch-1.3-0.fdr.1.rh90.src.rpm:1099889715
 nomarch-1_3-0_fdr_1_1:HEAD:nomarch-1.3-0.fdr.1.1.src.rpm:1099889721
 nomarch-1_3-0_fdr_1_2:HEAD:nomarch-1.3-0.fdr.1.2.src.rpm:1099889737
+nomarch-1_3-4_fc5:HEAD:nomarch-1.3-4.fc5.src.rpm:1137450929



From fedora-extras-commits at redhat.com  Mon Jan 16 22:35:45 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:35:45 -0500
Subject: rpms/nomarch/devel nomarch.spec,1.7,1.8
Message-ID: <200601162236.k0GMaHlX014399@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/nomarch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14364/devel

Modified Files:
	nomarch.spec 
Log Message:
auto-import nomarch-1.3-4.fc5 on branch devel from nomarch-1.3-4.fc5.src.rpm
same old version builds with gcc 4.1 without a single warning -> now that's clean code


Index: nomarch.spec
===================================================================
RCS file: /cvs/extras/rpms/nomarch/devel/nomarch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nomarch.spec	22 May 2005 23:39:29 -0000	1.7
+++ nomarch.spec	16 Jan 2006 22:35:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      nomarch
 Version:   1.3
-Release: 3
+Release:   4%{?dist}
 
 Summary:   GPLed Arc de-archiver
 
@@ -38,6 +38,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 1.3-4
+- me is gcc4.1-proof
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Jan 16 22:42:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 17:42:29 -0500
Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-sharp.patch, NONE,
	1.1 libgnomedb.spec, 1.9, 1.10
Message-ID: <200601162243.k0GMh2YI014478@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14458

Modified Files:
	libgnomedb.spec 
Added Files:
	libgnomedb-1.9.100-sharp.patch 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
- Add BuildRequires for building libgda-sharp


libgnomedb-1.9.100-sharp.patch:

--- NEW FILE libgnomedb-1.9.100-sharp.patch ---
--- libgnomedb-1.9.100/Makefile.am.sharp	2006-01-16 23:33:46.000000000 +0100
+++ libgnomedb-1.9.100/Makefile.am	2006-01-16 23:35:47.000000000 +0100
@@ -13,9 +13,9 @@
 endif
 
 if BUILD_GNOMEDB_SHARP
-GNOME_DIRECTORY=gnomedb-sharp
+GNOMEDB_SHARP_DIRECTORY=gnomedb-sharp
 else
-GNOME_DIRECTORY=
+GNOMEDB_SHARP_DIRECTORY=
 endif
 
 if ENABLE_GTK_DOC
--- libgnomedb-1.9.100/Makefile.in.sharp	2006-01-16 23:33:41.000000000 +0100
+++ libgnomedb-1.9.100/Makefile.in	2006-01-16 23:36:40.000000000 +0100
@@ -286,8 +286,8 @@
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 @HAVE_LIBGLADE_FALSE at LIBGLADE_DIRECTORY = 
 @HAVE_LIBGLADE_TRUE at LIBGLADE_DIRECTORY = glade
- at BUILD_GNOMEDB_SHARP_FALSE@GNOME_DIRECTORY = 
- at BUILD_GNOMEDB_SHARP_TRUE@GNOME_DIRECTORY = gnomedb-sharp
+ at BUILD_GNOMEDB_SHARP_FALSE@GNOMEDB_SHARP_DIRECTORY = 
+ at BUILD_GNOMEDB_SHARP_TRUE@GNOMEDB_SHARP_DIRECTORY = gnomedb-sharp
 @BUILD_WITH_GNOME_FALSE at GNOME_DIRECTORY = 
 @BUILD_WITH_GNOME_TRUE at GNOME_DIRECTORY = control-center
 @ENABLE_GTK_DOC_FALSE at DOC_DIRECTORY = 
--- libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp.dll.config.in.sharp	2006-01-16 23:34:13.000000000 +0100
+++ libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp.dll.config.in	2006-01-16 23:35:04.000000000 +0100
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gnomedb-3" target="libgnomedb-2 at LIB_PREFIX@.1 at LIB_SUFFIX@"/>
+  <dllmap dll="gnomedb-3" target="libgnomedb-3 at LIB_PREFIX@.4 at LIB_SUFFIX@"/>
 </configuration>


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgnomedb.spec	30 Nov 2005 18:03:37 -0000	1.9
+++ libgnomedb.spec	16 Jan 2006 22:42:29 -0000	1.10
@@ -1,22 +1,22 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.9.100
-Release:         2
+Release:         3
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
 Group:           System Environment/Libraries
 License:         LGPL
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
-Requires:        gtk2 >= 1.3.6, libglade2, libgnomeui >= 1.103.0
-PreReq:          desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:   pkgconfig >= 0.8, libgnomeui-devel >= 1.103.0
 BuildRequires:   gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper
 BuildRequires:   desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:   libgda-devel >= 1:1.9.99
 BuildRequires:   gtk-doc, openssl-devel, gtksourceview-devel
+BuildRequires:   mono-devel gtk-sharp2 gtk-sharp2-gapi libgda-sharp
 
 Patch0: libgnomedb-1.2.0-desktop.patch
+Patch1: libgnomedb-1.9.100-sharp.patch
 
 %description
 libgnomedb is a library that eases the task of writing
@@ -36,14 +36,27 @@
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
+
+%package sharp
+Summary:          Mono bindings for libgnomedb
+Group:            System Environment/Libraries
+
+%description sharp
+This package contains the dll files needed to run (and compile) Mono
+applications which use libgnomedb.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop.patch
+%patch1 -p1 -b .sharp
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 %makeinstall LIBGNOMEDB_DTDDIR=%{buildroot}%{_datadir}/libgnomedb/dtd
@@ -53,6 +66,10 @@
   --vendor fedora --add-category X-Fedora --delete-original \
   %{buildroot}%{_datadir}/applications/database-properties.desktop
 
+# install gnomedb-api.xml
+install -m 644 gnomedb-sharp/gnomedb-api.xml \
+   %{buildroot}%{_libdir}/libgnomedb/gnomedb-api.xml
+
 # remove unpackaged files
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.a
@@ -60,6 +77,7 @@
 rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.a
 rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.la
 
+
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -68,17 +86,22 @@
 /usr/bin/gconftool-2 --makefile-install-rule $SCHEMA > /dev/null 2>&1
 done
 
+
 %postun -p /sbin/ldconfig
 
+
 %post devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+
 %postun devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files -f libgnomedb-3.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README NEWS
@@ -92,17 +115,29 @@
 %{_libdir}/libglade/2.0/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/libgnomedb-1.9
 %{_libdir}/*.a
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/libgnomedb-2.0.pc
 %{_datadir}/omf
 %{_datadir}/gtk-doc/html/libgnomedb
 
 
+%files sharp
+%defattr(-,root,root)
+%{_libdir}/libgnomedb/gnomedb-api.xml
+%{_libdir}/libgnomedb/gnomedb-sharp.dll*
+%{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
+
+
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
+- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
+- Add BuildRequires for building libgda-sharp
+
 * Wed Nov 30 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
 - Add BuildRequires for optional gtksourceview, unfortunatly the
   evolution-data-server in Fedora is too new for the evolution provider.



From fedora-extras-commits at redhat.com  Mon Jan 16 22:44:15 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:44:15 -0500
Subject: rpms/zoo import.log,1.4,1.5
Message-ID: <200601162244.k0GMimix014588@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/zoo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14542

Modified Files:
	import.log 
Log Message:
auto-import zoo-2.10-4.fc5 on branch devel from zoo-2.10-4.fc5.src.rpm
builds with gcc4.1, warnings all over the place :(


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zoo/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:36:53 -0000	1.4
+++ import.log	16 Jan 2006 22:44:15 -0000	1.5
@@ -1,3 +1,4 @@
 zoo-2_10-0_fdr_2_rh90:HEAD:zoo-2.10-0.fdr.2.rh90.src.rpm:1099892201
 zoo-2_10-0_fdr_2_1:HEAD:zoo-2.10-0.fdr.2.1.src.rpm:1099892207
 zoo-2_10-0_fdr_2_2:HEAD:zoo-2.10-0.fdr.2.2.src.rpm:1099892213
+zoo-2_10-4_fc5:HEAD:zoo-2.10-4.fc5.src.rpm:1137451445



From fedora-extras-commits at redhat.com  Mon Jan 16 22:44:21 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:44:21 -0500
Subject: rpms/zoo/devel zoo.spec,1.6,1.7
Message-ID: <200601162244.k0GMirTo014591@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/zoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14542/devel

Modified Files:
	zoo.spec 
Log Message:
auto-import zoo-2.10-4.fc5 on branch devel from zoo-2.10-4.fc5.src.rpm
builds with gcc4.1, warnings all over the place :(


Index: zoo.spec
===================================================================
RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zoo.spec	5 Apr 2005 11:09:28 -0000	1.6
+++ zoo.spec	16 Jan 2006 22:44:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      zoo
 Version:   2.10
-Release:   3
+Release:   4%{?dist}
 Summary:   File archiving utility with compression
 
 Group:     Applications/Archiving
@@ -43,6 +43,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Jun 16 2006  Mailhot <nicolas.mailhot at laposte.net> - 2.10-4
+- rebuild with gcc 4.1
+
 * Tue Apr 05 2005  Adrian Reber <adrian at lisas.de> - 2.10-3
 - fix gcc4 errors
 



From fedora-extras-commits at redhat.com  Mon Jan 16 22:54:18 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:54:18 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.5,1.6
Message-ID: <200601162254.k0GMsp43014780@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14746

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc5 on branch devel from perl-Convert-UUlib-1.06-1.fc5.src.rpm
1.06


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:59:20 -0000	1.5
+++ import.log	16 Jan 2006 22:54:18 -0000	1.6
@@ -2,3 +2,4 @@
 perl-Convert-UUlib-1_03-0_fdr_1_rh90:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.rh90.src.rpm:1099889945
 perl-Convert-UUlib-1_03-0_fdr_1_1:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.src.rpm:1099889951
 perl-Convert-UUlib-1_03-0_fdr_1_1_92:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.92.src.rpm:1099889960
+perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049



From fedora-extras-commits at redhat.com  Mon Jan 16 22:54:24 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:54:24 -0500
Subject: rpms/perl-Convert-UUlib/devel .cvsignore, 1.3,
	1.4 perl-Convert-UUlib.spec, 1.10, 1.11 sources, 1.3, 1.4
Message-ID: <200601162254.k0GMsvrt014785@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14746/devel

Modified Files:
	.cvsignore perl-Convert-UUlib.spec sources 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc5 on branch devel from perl-Convert-UUlib-1.06-1.fc5.src.rpm
1.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jun 2005 21:10:01 -0000	1.3
+++ .cvsignore	16 Jan 2006 22:54:24 -0000	1.4
@@ -1 +1 @@
-Convert-UUlib-1.051.tar.gz
+Convert-UUlib-1.06.tar.gz


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Convert-UUlib.spec	2 Jun 2005 21:40:56 -0000	1.10
+++ perl-Convert-UUlib.spec	16 Jan 2006 22:54:24 -0000	1.11
@@ -1,8 +1,8 @@
 %define rname Convert-UUlib
 
 Name:      perl-%{rname}
-Version:   1.051
-Release:   2%{?dist}
+Version:   1.06
+Release:   1%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
+- 1.06 (can't believe I'm still listed as this package owner)
+
 * Thu Jun  2 2005 Paul Howarth <paul at city-fan.org> 1.051-2%{?dist}
 - add dist tags for ease of syncing with FC-3 & FC-4
 - remove redundant perl buildreq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jun 2005 21:10:01 -0000	1.3
+++ sources	16 Jan 2006 22:54:24 -0000	1.4
@@ -1 +1 @@
-45a456bb8eb625b097f8a3dc15cc6a97  Convert-UUlib-1.051.tar.gz
+92514be4d146e8c4ea1941a7f7472dcb  Convert-UUlib-1.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 22:55:57 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:55:57 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.6,1.7
Message-ID: <200601162256.k0GMuT4h014880@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14846

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-1.fc4.src.rpm
1.06


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	16 Jan 2006 22:54:18 -0000	1.6
+++ import.log	16 Jan 2006 22:55:56 -0000	1.7
@@ -3,3 +3,4 @@
 perl-Convert-UUlib-1_03-0_fdr_1_1:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.src.rpm:1099889951
 perl-Convert-UUlib-1_03-0_fdr_1_1_92:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.92.src.rpm:1099889960
 perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049
+perl-Convert-UUlib-1_06-1_fc4:FC-4:perl-Convert-UUlib-1.06-1.fc4.src.rpm:1137452147



From fedora-extras-commits at redhat.com  Mon Jan 16 22:56:03 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:56:03 -0500
Subject: rpms/perl-Convert-UUlib/FC-4 .cvsignore, 1.3,
	1.4 perl-Convert-UUlib.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601162256.k0GMuZ6F014885@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14846/FC-4

Modified Files:
	.cvsignore perl-Convert-UUlib.spec sources 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-1.fc4.src.rpm
1.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jun 2005 21:45:38 -0000	1.3
+++ .cvsignore	16 Jan 2006 22:56:02 -0000	1.4
@@ -1 +1 @@
-Convert-UUlib-1.051.tar.gz
+Convert-UUlib-1.06.tar.gz


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/perl-Convert-UUlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Convert-UUlib.spec	2 Jun 2005 21:45:38 -0000	1.9
+++ perl-Convert-UUlib.spec	16 Jan 2006 22:56:02 -0000	1.10
@@ -1,8 +1,8 @@
 %define rname Convert-UUlib
 
 Name:      perl-%{rname}
-Version:   1.051
-Release:   2%{?dist}
+Version:   1.06
+Release:   1%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
+- 1.06 (can't believe I'm still listed as this package owner)
+
 * Thu Jun  2 2005 Paul Howarth <paul at city-fan.org> 1.051-2%{?dist}
 - add dist tags for ease of syncing with FC-3 & FC-4
 - remove redundant perl buildreq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jun 2005 21:45:38 -0000	1.3
+++ sources	16 Jan 2006 22:56:02 -0000	1.4
@@ -1 +1 @@
-45a456bb8eb625b097f8a3dc15cc6a97  Convert-UUlib-1.051.tar.gz
+92514be4d146e8c4ea1941a7f7472dcb  Convert-UUlib-1.06.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 00:36:05 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 16 Jan 2006 19:36:05 -0500
Subject: rpms/python-setuptools/FC-4 .cvsignore, 1.2,
	1.3 python-setuptools.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601170036.k0H0abTl018892@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18854/FC-4

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Dec 2005 05:12:31 -0000	1.2
+++ .cvsignore	17 Jan 2006 00:36:04 -0000	1.3
@@ -1 +1 @@
-setuptools-0.6a8.zip
+setuptools-0.6a9.zip


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/python-setuptools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-setuptools.spec	29 Dec 2005 05:12:31 -0000	1.1
+++ python-setuptools.spec	17 Jan 2006 00:36:04 -0000	1.2
@@ -3,7 +3,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-setuptools
-Version:        0.6a8
+Version:        0.6a9
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
@@ -33,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
-#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
 echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth
 
 %clean
@@ -47,5 +46,8 @@
 %{python_sitelib}/setuptools-%{version}-py%{pyver}.egg
 
 %changelog
+* Mon Jan 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a9-1
+- Upstream update
+
 * Sat Dec 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a8-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Dec 2005 05:12:31 -0000	1.2
+++ sources	17 Jan 2006 00:36:04 -0000	1.3
@@ -1 +1 @@
-3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip
+10bd22507d6115df6ba053228b648a0c  setuptools-0.6a9.zip



From fedora-extras-commits at redhat.com  Tue Jan 17 00:36:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 16 Jan 2006 19:36:11 -0500
Subject: rpms/python-setuptools/devel .cvsignore, 1.2,
	1.3 python-setuptools.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601170036.k0H0ah6f018897@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18854/devel

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Dec 2005 11:38:56 -0000	1.2
+++ .cvsignore	17 Jan 2006 00:36:11 -0000	1.3
@@ -1 +1 @@
-setuptools-0.6a8.zip
+setuptools-0.6a9.zip


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-setuptools.spec	27 Dec 2005 12:02:49 -0000	1.2
+++ python-setuptools.spec	17 Jan 2006 00:36:11 -0000	1.3
@@ -3,7 +3,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-setuptools
-Version:        0.6a8
+Version:        0.6a9
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
@@ -33,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
-#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
 echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth
 
 %clean
@@ -47,5 +46,8 @@
 %{python_sitelib}/setuptools-%{version}-py%{pyver}.egg
 
 %changelog
+* Mon Jan 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a9-1
+- Upstream update
+
 * Sat Dec 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a8-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2005 11:38:56 -0000	1.2
+++ sources	17 Jan 2006 00:36:11 -0000	1.3
@@ -1 +1 @@
-3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip
+10bd22507d6115df6ba053228b648a0c  setuptools-0.6a9.zip



From fedora-extras-commits at redhat.com  Tue Jan 17 00:40:51 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 16 Jan 2006 19:40:51 -0500
Subject: rpms/inkscape/devel inkscape-0.42-GC-check.patch, 1.2,
	1.3 inkscape.spec, 1.24, 1.25
Message-ID: <200601170041.k0H0fNbW018952@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18930

Modified Files:
	inkscape-0.42-GC-check.patch inkscape.spec 
Log Message:
Updated GC patch, bug 171791

inkscape-0.42-GC-check.patch:

Index: inkscape-0.42-GC-check.patch
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape-0.42-GC-check.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inkscape-0.42-GC-check.patch	18 Aug 2005 21:56:51 -0000	1.2
+++ inkscape-0.42-GC-check.patch	17 Jan 2006 00:40:50 -0000	1.3
@@ -1,39 +1,21 @@
 diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure
 --- inkscape-0.42-orig/configure	2005-07-25 07:25:35.000000000 +0200
 +++ inkscape-0.42/configure	2005-08-18 23:55:52.000000000 +0200
-@@ -22931,7 +22931,7 @@
- 		    # desired function name.  They're all in libgc.
- 		    # The "break" will exit from the top level
-                     # AC_CHECK_HEADERS.
--		    gc_libs=""
-+		    gc_libs="-lpthread -ldl"
- 		    echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5
- echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6
- if test "${ac_cv_lib_gc_GC_init+set}" = set; then
 @@ -23003,7 +23003,7 @@
    gc_ok=no
  fi
  
 -		    gc_libs="-lpthread"
-+		    gc_libs="-lpthread -ldl"
++		    gc_libs=""
  		    echo "$as_me:$LINENO: checking for GC_malloc in -lgc" >&5
  echo $ECHO_N "checking for GC_malloc in -lgc... $ECHO_C" >&6
  if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then
-@@ -23075,7 +23075,7 @@
-   gc_ok=no
- fi
- 
--		    gc_libs="$lt_cv_dlopen_libs"
-+		    gc_libs="-lpthread -ldl"
- 		    echo "$as_me:$LINENO: checking for GC_realloc in -lgc" >&5
- echo $ECHO_N "checking for GC_realloc in -lgc... $ECHO_C" >&6
- if test "${ac_cv_lib_gc_GC_realloc+set}" = set; then
 @@ -23147,7 +23147,7 @@
    gc_ok=no
  fi
  
 -		    gc_libs="-lpthread $lt_cv_dlopen_libs"
-+		    gc_libs="-lpthread -ldl"
++		    gc_libs="$lt_cv_dlopen_libs"
  		    echo "$as_me:$LINENO: checking for GC_free in -lgc" >&5
  echo $ECHO_N "checking for GC_free in -lgc... $ECHO_C" >&6
  if test "${ac_cv_lib_gc_GC_free+set}" = set; then


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- inkscape.spec	18 Dec 2005 03:00:15 -0000	1.24
+++ inkscape.spec	17 Jan 2006 00:40:50 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.43
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Denis Leroy <denis at poolshark.org> - 0.43-2
+- Updated GC patch, bug 171791
+
 * Sat Dec 17 2005 Denis Leroy <denis at poolshark.org> - 0.43-1
 - Update to 0.43
 - Added 2 patches to fix g++ 4.1 compilation issues



From fedora-extras-commits at redhat.com  Tue Jan 17 01:54:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Jan 2006 20:54:37 -0500
Subject: rpms/liferea/devel .cvsignore, 1.17, 1.18 liferea.spec, 1.26,
	1.27 sources, 1.18, 1.19
Message-ID: <200601170155.k0H1tAXS021032@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21011

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
- Update to 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Dec 2005 21:37:43 -0000	1.17
+++ .cvsignore	17 Jan 2006 01:54:37 -0000	1.18
@@ -1 +1 @@
-liferea-1.0.tar.gz
+liferea-1.0.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- liferea.spec	26 Dec 2005 15:53:05 -0000	1.26
+++ liferea.spec	17 Jan 2006 01:54:37 -0000	1.27
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.0.1
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
+- Update to 1.0.1.
+
 * Mon Dec 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.0-4
 - Dropp BR for libXdmcp-devel & libXau-devel, replace w/ libX11-devel (#176313).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	23 Dec 2005 21:37:44 -0000	1.18
+++ sources	17 Jan 2006 01:54:37 -0000	1.19
@@ -1 +1 @@
-ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz
+c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 03:19:24 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 16 Jan 2006 22:19:24 -0500
Subject: rpms/lcdf-typetools/devel lcdf-typetools.spec,1.4,1.5
Message-ID: <200601170319.k0H3JvQR025749@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/lcdf-typetools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25732

Modified Files:
	lcdf-typetools.spec 
Log Message:
bump release for rawhide rebuild



Index: lcdf-typetools.spec
===================================================================
RCS file: /cvs/extras/rpms/lcdf-typetools/devel/lcdf-typetools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lcdf-typetools.spec	20 Nov 2005 04:53:02 -0000	1.4
+++ lcdf-typetools.spec	17 Jan 2006 03:19:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lcdf-typetools
 Version:        2.36
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for manipulating Postscript fonts
 
 Group:          Applications/Publishing
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Michael A. Peters <mpeters at mac.com> - 2.36-2
+- rebuild in rawhide
+
 * Sat Nov 19 2005 Michael A. Peters <mpeters at mac.com> - 2.36-1
 - upstream update
 



From fedora-extras-commits at redhat.com  Tue Jan 17 03:29:41 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 16 Jan 2006 22:29:41 -0500
Subject: rpms/pan/devel pan.spec,1.5,1.6
Message-ID: <200601170330.k0H3UDdo025821@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25799

Modified Files:
	pan.spec 
Log Message:
devel branch rebuild



Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pan.spec	23 Sep 2005 05:33:40 -0000	1.5
+++ pan.spec	17 Jan 2006 03:29:41 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.14.2.91
-Release: 3.2%{?dist}
+Release: 3.3%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -83,6 +83,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Mon Jan 16 2006 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-3.3
+- Devel branch rebuild
+
 * Thu Sep 22 2005 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-3.2
 - forgot to commit patch to cvs in devel branch.
 



From fedora-extras-commits at redhat.com  Tue Jan 17 04:32:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:32:58 -0500
Subject: rpms/alsamixergui - New directory
Message-ID: <200601170433.k0H4X08X027696@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27688/alsamixergui

Log Message:
Directory /cvs/extras/rpms/alsamixergui added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:33:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:33:03 -0500
Subject: rpms/alsamixergui/devel - New directory
Message-ID: <200601170433.k0H4X6Gf027711@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27688/alsamixergui/devel

Log Message:
Directory /cvs/extras/rpms/alsamixergui/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:33:20 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:33:20 -0500
Subject: rpms/alsamixergui Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601170433.k0H4XMZ4027745@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27733

Added Files:
	Makefile import.log 
Log Message:
Setup of module alsamixergui


--- NEW FILE Makefile ---
# Top level Makefile for module alsamixergui
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:33:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:33:27 -0500
Subject: rpms/alsamixergui/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601170433.k0H4XTRP027765@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27733/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alsamixergui


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:36:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:36:31 -0500
Subject: rpms/alsamixergui import.log,1.1,1.2
Message-ID: <200601170437.k0H4b365027853@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814

Modified Files:
	import.log 
Log Message:
auto-import alsamixergui-0.9.0-0.2.rc1 on branch devel from alsamixergui-0.9.0-0.2.rc1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 04:33:20 -0000	1.1
+++ import.log	17 Jan 2006 04:36:30 -0000	1.2
@@ -0,0 +1 @@
+alsamixergui-0_9_0-0_2_rc1:HEAD:alsamixergui-0.9.0-0.2.rc1.src.rpm:1137472577



From fedora-extras-commits at redhat.com  Tue Jan 17 04:36:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:36:37 -0500
Subject: rpms/alsamixergui/devel alsamixergui-modernfix.patch, NONE,
	1.1 alsamixergui.desktop, NONE, 1.1 alsamixergui.png, NONE,
	1.1 alsamixergui.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601170437.k0H4b90K027857@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alsamixergui-modernfix.patch alsamixergui.desktop 
	alsamixergui.png alsamixergui.spec 
Log Message:
auto-import alsamixergui-0.9.0-0.2.rc1 on branch devel from alsamixergui-0.9.0-0.2.rc1.src.rpm

alsamixergui-modernfix.patch:

--- NEW FILE alsamixergui-modernfix.patch ---
--- alsamixergui-0.9.0rc1-2/configure.BAD	2006-01-16 12:28:52.000000000 -0600
+++ alsamixergui-0.9.0rc1-2/configure	2006-01-16 12:39:24.000000000 -0600
@@ -1476,17 +1476,17 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lfltk  $LIBS"
+LIBS="-lfltk -lstdc++ $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1482 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char numericsort();
+char fl_numericsort();
 
 int main() {
-numericsort()
+fl_numericsort()
 ; return 0; }
 EOF
 if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -1664,7 +1664,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lasound  $LIBS"
+LIBS="-lasound -lstdc++ $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1670 "configure"
 #include "confdefs.h"
--- alsamixergui-0.9.0rc1-2/src/alsamixer.cxx.BAD	2006-01-16 12:41:54.000000000 -0600
+++ alsamixergui-0.9.0rc1-2/src/alsamixer.cxx	2006-01-16 12:45:44.000000000 -0600
@@ -653,8 +653,8 @@
     if (vleft >= 0 && vright >= 0) {
       if (joined) {
 #ifdef ALSAMIXER_GUI
-	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; 
-	snd_mixer_selem_channel_id_t(int(chn)++))
+	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST;
+	snd_mixer_selem_channel_id_t(int(chn)+1))
 #else
 	for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
 #endif


--- NEW FILE alsamixergui.desktop ---
[Desktop Entry]
Name=ALSA Mixer
Comment=GUI version of alsamixer
Exec=alsamixergui
Icon=alsamixergui.png
Categories=Application;AudioVideo;X-Fedora;
Terminal=false
Type=Application
Encoding=UTF-8


--- NEW FILE alsamixergui.spec ---
Name:		alsamixergui
Summary: 	GUI mixer for ALSA sound devices
Version:	0.9.0
Release:	0.2.rc1%{?dist}
License:	BSD-ish
Group:		Applications/System
Source0:	ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/%{name}-%{version}rc1-2.tar.gz
Source1:	alsamixergui.desktop
Source2:	alsamixergui.png
URL:		ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fltk-devel, libstdc++-devel
BuildRequires:	alsa-lib-devel, desktop-file-utils
Patch0:		alsamixergui-modernfix.patch

%description
alsamixergui is a FLTK based frontend for alsamixer. It is written
directly on top of the alsamixer source, leaving the original source
intact, only adding a couple of ifdefs, and some calls to the gui
part, so it provides exactly the same functionality, but with a
graphical userinterface.

%prep
%setup -q -n %{name}-%{version}rc1-2
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor fedora                            \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS COPYING ChangeLog
%{_bindir}/alsamixergui
%{_datadir}/applications/fedora-alsamixergui.desktop
%{_datadir}/pixmaps/alsamixergui.png

%changelog
* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-0.2.rc1
- add desktop entry

* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-0.1.rc1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 04:33:26 -0000	1.1
+++ .cvsignore	17 Jan 2006 04:36:36 -0000	1.2
@@ -0,0 +1 @@
+alsamixergui-0.9.0rc1-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 04:33:26 -0000	1.1
+++ sources	17 Jan 2006 04:36:36 -0000	1.2
@@ -0,0 +1 @@
+24b74dda2cf77c313c6cba9b062c8feb  alsamixergui-0.9.0rc1-2.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 04:45:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:45:02 -0500
Subject: owners owners.list,1.536,1.537
Message-ID: <200601170445.k0H4jYc7028241@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28222

Modified Files:
	owners.list 
Log Message:

alsamixergui



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -r1.536 -r1.537
--- owners.list	16 Jan 2006 19:20:08 -0000	1.536
+++ owners.list	17 Jan 2006 04:45:02 -0000	1.537
@@ -28,6 +28,7 @@
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:17 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:17 -0500
Subject: rpms/xkeycaps - New directory
Message-ID: <200601170450.k0H4oJsC028303@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28295/xkeycaps

Log Message:
Directory /cvs/extras/rpms/xkeycaps added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:23 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:23 -0500
Subject: rpms/xkeycaps/devel - New directory
Message-ID: <200601170450.k0H4oPmb028318@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28295/xkeycaps/devel

Log Message:
Directory /cvs/extras/rpms/xkeycaps/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:37 -0500
Subject: rpms/xkeycaps Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601170450.k0H4od5J028352@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28340

Added Files:
	Makefile import.log 
Log Message:
Setup of module xkeycaps


--- NEW FILE Makefile ---
# Top level Makefile for module xkeycaps
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:43 -0500
Subject: rpms/xkeycaps/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601170450.k0H4ojeN028372@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28340/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xkeycaps


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:51:23 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:51:23 -0500
Subject: rpms/xkeycaps import.log,1.1,1.2
Message-ID: <200601170451.k0H4ptXV028452@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28416

Modified Files:
	import.log 
Log Message:
auto-import xkeycaps-2.46-2 on branch devel from xkeycaps-2.46-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 04:50:37 -0000	1.1
+++ import.log	17 Jan 2006 04:51:22 -0000	1.2
@@ -0,0 +1 @@
+xkeycaps-2_46-2:HEAD:xkeycaps-2.46-2.src.rpm:1137473464



From fedora-extras-commits at redhat.com  Tue Jan 17 04:51:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:51:29 -0500
Subject: rpms/xkeycaps/devel xkeycaps.desktop, NONE, 1.1 xkeycaps.png, NONE, 
	1.1 xkeycaps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601170452.k0H4q1S4028456@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28416/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xkeycaps.desktop xkeycaps.png xkeycaps.spec 
Log Message:
auto-import xkeycaps-2.46-2 on branch devel from xkeycaps-2.46-2.src.rpm


--- NEW FILE xkeycaps.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xkeycaps
GenericName=xkeycaps
Comment=Graphical front-end to xmodmap
Exec=xkeycaps
Icon=xkeycaps.png
StartupNotify=false
Terminal=false
Type=Application
Categories=X-Fedora;SystemSetup;Application;
Version=2.46


--- NEW FILE xkeycaps.spec ---
# FC-5 version

Name:		xkeycaps
Summary: 	Graphical front end to xmodmap
Version:	2.46
Release:	2%{?dist}
License:	BSD-ish
Group:		Applications/System
Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
Source1:	xkeycaps.desktop
Source2:	xkeycaps.png
URL:		http://www.jwz.org/xkeycaps/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
BuildRequires:	libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel
BuildRequires:	desktop-file-utils, libXext-devel
Requires:	xorg-x11-server-utils

%description
xkeycaps is a graphical front-end to xmodmap. It opens a window that 
looks like a keyboard; moving the mouse over a key shows what KeySyms 
and Modifier bits that key generates. Clicking on a key simulates 
KeyPress/KeyRelease events on the window of your choice. It is possible 
to change the KeySyms and Modifiers generated by a key through a 
mouse-based interface. This program can also write an input file for 
xmodmap to recreate your changes in future sessions.

%prep
%setup -q 

%build
xmkmf
make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m0644 xkeycaps.man $RPM_BUILD_ROOT%{_mandir}/man1
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README sgi-microsoft.txt
%{_bindir}/xkeycaps
%{_datadir}/applications/fedora-xkeycaps.desktop
%{_datadir}/pixmaps/xkeycaps.png
%{_mandir}/man1/*

%changelog
* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
- add missing BR
- fix missing desktop file

* Thu Dec 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 04:50:42 -0000	1.1
+++ .cvsignore	17 Jan 2006 04:51:28 -0000	1.2
@@ -0,0 +1 @@
+xkeycaps-2.46.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 04:50:42 -0000	1.1
+++ sources	17 Jan 2006 04:51:28 -0000	1.2
@@ -0,0 +1 @@
+6792f828db6538f44f7696a8783b44ac  xkeycaps-2.46.tar.Z



From fedora-extras-commits at redhat.com  Tue Jan 17 04:54:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:54:05 -0500
Subject: owners owners.list,1.537,1.538
Message-ID: <200601170454.k0H4scJm028655@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28638

Modified Files:
	owners.list 
Log Message:

xkeycaps



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -r1.537 -r1.538
--- owners.list	17 Jan 2006 04:45:02 -0000	1.537
+++ owners.list	17 Jan 2006 04:54:05 -0000	1.538
@@ -1336,6 +1336,7 @@
 Fedora Extras|xfprint|Print dialog and printer manager for Xfce 4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmldiff|Tree to tree correction between XML documents|stickster at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 04:59:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:59:26 -0500
Subject: rpms/xkeycaps/FC-3 xkeycaps.spec,1.1,1.2
Message-ID: <200601170459.k0H4xw6m028700@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668/FC-3

Modified Files:
	xkeycaps.spec 
Log Message:

xkeycaps FC-3/FC-4 changes



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.spec	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.spec	17 Jan 2006 04:59:25 -0000	1.2
@@ -1,4 +1,4 @@
-# FC-5 version
+# FC-3/FC-4 version
 
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
@@ -11,10 +11,8 @@
 Source2:	xkeycaps.png
 URL:		http://www.jwz.org/xkeycaps/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
-BuildRequires:	libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel
-BuildRequires:	desktop-file-utils, libXext-devel
-Requires:	xorg-x11-server-utils
+BuildRequires:	xorg-x11-devel, xorg-x11-deprecated-libs-devel
+BuildRequires:	desktop-file-utils
 
 %description
 xkeycaps is a graphical front-end to xmodmap. It opens a window that 
@@ -29,7 +27,7 @@
 %setup -q 
 
 %build
-xmkmf
+/usr/X11R6/bin/xmkmf
 make
 
 %install



From fedora-extras-commits at redhat.com  Tue Jan 17 04:59:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:59:32 -0500
Subject: rpms/xkeycaps/FC-4 xkeycaps.spec,1.1,1.2
Message-ID: <200601170500.k0H5041i028714@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668/FC-4

Modified Files:
	xkeycaps.spec 
Log Message:

xkeycaps FC-3/FC-4 changes



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.spec	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.spec	17 Jan 2006 04:59:31 -0000	1.2
@@ -1,4 +1,4 @@
-# FC-5 version
+# FC-3/FC-4 version
 
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
@@ -11,10 +11,8 @@
 Source2:	xkeycaps.png
 URL:		http://www.jwz.org/xkeycaps/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
-BuildRequires:	libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel
-BuildRequires:	desktop-file-utils, libXext-devel
-Requires:	xorg-x11-server-utils
+BuildRequires:	xorg-x11-devel, xorg-x11-deprecated-libs-devel
+BuildRequires:	desktop-file-utils
 
 %description
 xkeycaps is a graphical front-end to xmodmap. It opens a window that 
@@ -29,7 +27,7 @@
 %setup -q 
 
 %build
-xmkmf
+/usr/X11R6/bin/xmkmf
 make
 
 %install



From fedora-extras-commits at redhat.com  Tue Jan 17 05:14:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:14:46 -0500
Subject: rpms/xkeycaps/FC-3 xkeycaps.desktop,1.1,1.2 xkeycaps.spec,1.2,1.3
Message-ID: <200601170515.k0H5FIZU030608@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30568/FC-3

Modified Files:
	xkeycaps.desktop xkeycaps.spec 
Log Message:

FC-3/FC-4 fixes



Index: xkeycaps.desktop
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.desktop	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.desktop	17 Jan 2006 05:14:46 -0000	1.2
@@ -3,7 +3,7 @@
 Name=xkeycaps
 GenericName=xkeycaps
 Comment=Graphical front-end to xmodmap
-Exec=xkeycaps
+Exec=/usr/X11R6/bin/xkeycaps
 Icon=xkeycaps.png
 StartupNotify=false
 Terminal=false


Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xkeycaps.spec	17 Jan 2006 04:59:25 -0000	1.2
+++ xkeycaps.spec	17 Jan 2006 05:14:46 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD-ish
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
@@ -48,7 +48,7 @@
 %files
 %defattr(-,root,root)
 %doc README sgi-microsoft.txt
-%{_bindir}/xkeycaps
+/usr/X11R6/bin/xkeycaps
 %{_datadir}/applications/fedora-xkeycaps.desktop
 %{_datadir}/pixmaps/xkeycaps.png
 %{_mandir}/man1/*



From fedora-extras-commits at redhat.com  Tue Jan 17 05:14:52 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:14:52 -0500
Subject: rpms/xkeycaps/FC-4 xkeycaps.desktop,1.1,1.2 xkeycaps.spec,1.2,1.3
Message-ID: <200601170515.k0H5FOSn030612@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30568/FC-4

Modified Files:
	xkeycaps.desktop xkeycaps.spec 
Log Message:

FC-3/FC-4 fixes



Index: xkeycaps.desktop
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.desktop	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.desktop	17 Jan 2006 05:14:52 -0000	1.2
@@ -3,7 +3,7 @@
 Name=xkeycaps
 GenericName=xkeycaps
 Comment=Graphical front-end to xmodmap
-Exec=xkeycaps
+Exec=/usr/X11R6/bin/xkeycaps
 Icon=xkeycaps.png
 StartupNotify=false
 Terminal=false


Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xkeycaps.spec	17 Jan 2006 04:59:31 -0000	1.2
+++ xkeycaps.spec	17 Jan 2006 05:14:52 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD-ish
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
@@ -48,7 +48,7 @@
 %files
 %defattr(-,root,root)
 %doc README sgi-microsoft.txt
-%{_bindir}/xkeycaps
+/usr/X11R6/bin/xkeycaps
 %{_datadir}/applications/fedora-xkeycaps.desktop
 %{_datadir}/pixmaps/xkeycaps.png
 %{_mandir}/man1/*



From fedora-extras-commits at redhat.com  Tue Jan 17 05:17:18 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:17:18 -0500
Subject: rpms/xkeycaps/FC-3 xkeycaps.spec,1.3,1.4
Message-ID: <200601170517.k0H5HoHZ030673@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30626/FC-3

Modified Files:
	xkeycaps.spec 
Log Message:

Fix spec files



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xkeycaps.spec	17 Jan 2006 05:14:46 -0000	1.3
+++ xkeycaps.spec	17 Jan 2006 05:17:18 -0000	1.4
@@ -54,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-3
+- fix FC-3/FC-4
+
 * Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
 - add missing BR
 - fix missing desktop file



From fedora-extras-commits at redhat.com  Tue Jan 17 05:17:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:17:24 -0500
Subject: rpms/xkeycaps/FC-4 xkeycaps.spec,1.3,1.4
Message-ID: <200601170517.k0H5Hu0i030676@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30626/FC-4

Modified Files:
	xkeycaps.spec 
Log Message:

Fix spec files



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xkeycaps.spec	17 Jan 2006 05:14:52 -0000	1.3
+++ xkeycaps.spec	17 Jan 2006 05:17:24 -0000	1.4
@@ -54,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-3
+- fix FC-3/FC-4
+
 * Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
 - add missing BR
 - fix missing desktop file



From fedora-extras-commits at redhat.com  Tue Jan 17 05:17:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:17:30 -0500
Subject: rpms/xkeycaps/devel xkeycaps.spec,1.1,1.2
Message-ID: <200601170518.k0H5I2e9030679@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30626/devel

Modified Files:
	xkeycaps.spec 
Log Message:

Fix spec files



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/devel/xkeycaps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.spec	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.spec	17 Jan 2006 05:17:30 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD-ish
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
@@ -56,6 +56,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-3
+- fix FC-3/FC-4
+
 * Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
 - add missing BR
 - fix missing desktop file



From fedora-extras-commits at redhat.com  Tue Jan 17 05:32:57 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Jan 2006 00:32:57 -0500
Subject: rpms/liferea/FC-4 .cvsignore, 1.17, 1.18 liferea.spec, 1.22,
	1.23 sources, 1.18, 1.19
Message-ID: <200601170533.k0H5XTs5030848@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30827

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
- Update to 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Dec 2005 21:39:20 -0000	1.17
+++ .cvsignore	17 Jan 2006 05:32:57 -0000	1.18
@@ -1 +1 @@
-liferea-1.0.tar.gz
+liferea-1.0.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- liferea.spec	23 Dec 2005 21:39:20 -0000	1.22
+++ liferea.spec	17 Jan 2006 05:32:57 -0000	1.23
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
+- Update to 1.0.1.
+
 * Fri Dec 23 2005 Brian Pepple <bdpepple at ameritech.net> - 1.0-1
 - Update to 1.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	23 Dec 2005 21:39:20 -0000	1.18
+++ sources	17 Jan 2006 05:32:57 -0000	1.19
@@ -1 +1 @@
-ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz
+c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 07:12:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 02:12:14 -0500
Subject: owners owners.list,1.538,1.539
Message-ID: <200601170712.k0H7Cr8M002184@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2137

Modified Files:
	owners.list 
Log Message:
Orphan Compton's packages per his ack.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539
--- owners.list	17 Jan 2006 04:54:05 -0000	1.538
+++ owners.list	17 Jan 2006 07:12:10 -0000	1.539
@@ -32,13 +32,13 @@
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|anjuta|GNOME IDE for C and C++|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|anjuta|GNOME IDE for C and C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|antiword|MS Word to ASCII/Postscript converter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|apachetop|A top-like display of Apache logs|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|apcupsd|APC UPS Power Control Daemon for Linux|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|apel|A Portable Emacs Library|tagoh at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|apg|Automated Password Generator for random password generation|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|apg|Automated Password Generator for random password generation|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
@@ -70,10 +70,10 @@
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|blender|3D modeling, animation, rendering and post-production|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|blender|3D modeling, animation, rendering and post-production|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|bluefish|A GTK2 web development application for experienced users|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|bluefish|A GTK2 web development application for experienced users|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -103,7 +103,7 @@
 Fedora Extras|cfengine|GNU cfengine - a systems administration tool for networks|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cfitsio|Library for manipulating FITS data files|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|cgoban|X board for playing go|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
@@ -123,7 +123,7 @@
 Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
-Fedora Extras|conglomerate|Extensible XML Editor|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|conglomerate|Extensible XML Editor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -205,13 +205,13 @@
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|fftw|Fast Fourier Transform library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
@@ -249,7 +249,7 @@
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|galculator|GTK 2 based scientific calculator|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|galculator|GTK 2 based scientific calculator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -260,7 +260,7 @@
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -286,7 +286,7 @@
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
@@ -310,23 +310,23 @@
 Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-password-generator|Graphical secure password generator|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gobby|A free collaborative editor|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|goffice|Goffice support libraries|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|gonvert|Units conversion utility|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gonvert|Units conversion utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpa|Graphical user interface for GnuPG|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -368,7 +368,7 @@
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gurlchecker|A GNOME link validity checker|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gurlchecker|A GNOME link validity checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -475,7 +475,7 @@
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|lcms|Color Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -526,7 +526,7 @@
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
@@ -551,7 +551,7 @@
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++|Typesafe Signal Framework for C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -569,11 +569,11 @@
 Fedora Extras|libxfce4util|Utility library for the Xfce4 desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfcegui4|GTK widgets for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|icon at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|lincvs|Graphical CVS Client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -604,7 +604,7 @@
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
-Fedora Extras|meld|Visual diff and merge tool|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|meld|Visual diff and merge tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
@@ -625,7 +625,7 @@
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
@@ -680,7 +680,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|openal|Open Audio Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1130,9 +1130,9 @@
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|scribus|DeskTop Publishing app in QT|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scribus|DeskTop Publishing app in QT|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1145,14 +1145,14 @@
 Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|sirius|Othello for Gnome|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
-Fedora Extras|snort|An intrusion detection system|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|snort|An intrusion detection system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|
 Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|sodipodi|Vector-based drawing program|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|SoQt|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|soundconverter|A simple sound converter application for GNOME|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -1219,7 +1219,7 @@
 Fedora Extras|tetex-xcolor|Driver-independent color extensions for LaTeX and pdfLaTeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1237,7 +1237,7 @@
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
-Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|treecc|Tree Compiler Compiler|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 08:04:33 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 17 Jan 2006 03:04:33 -0500
Subject: owners owners.list,1.539,1.540
Message-ID: <200601170805.k0H855hv004205@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4186

Modified Files:
	owners.list 
Log Message:
Fix broken entries for gift*!


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -r1.539 -r1.540
--- owners.list	17 Jan 2006 07:12:10 -0000	1.539
+++ owners.list	17 Jan 2006 08:04:33 -0000	1.540
@@ -277,8 +277,8 @@
 Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gif2png|A GIF to PNG converter|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|gift|Daemon for communicating with filesharing protocols|rdieter at math.unl.edu||extras-qa at fedoraproject.org|
-Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu||extras-qa at fedoraproject.org|
+Fedora Extras|gift|Daemon for communicating with filesharing protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 08:19:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 17 Jan 2006 03:19:39 -0500
Subject: rpms/libgda/devel libgda.spec,1.8,1.9
Message-ID: <200601170820.k0H8KCL2004276@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4259

Modified Files:
	libgda.spec 
Log Message:
Make -sharp package Require the main package


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgda.spec	16 Jan 2006 22:04:11 -0000	1.8
+++ libgda.spec	17 Jan 2006 08:19:39 -0000	1.9
@@ -35,7 +35,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          1.9.100
-Release: 	  2
+Release: 	  3
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -96,6 +96,7 @@
 %package sharp
 Summary:          Mono bindings for libgda
 Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description sharp
 This package contains the dll files needed to run (and compile) Mono
@@ -367,6 +368,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
+- Make -sharp package Require the main package.
+
 * Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
 - Remove unneeded requires (.so reqs are automaticly picked up by rpm).
 - Add BuildRequires for building libgda-sharp



From fedora-extras-commits at redhat.com  Tue Jan 17 08:37:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 17 Jan 2006 03:37:18 -0500
Subject: rpms/libgnomedb/devel libgnomedb.spec,1.10,1.11
Message-ID: <200601170837.k0H8boDg004360@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4343

Modified Files:
	libgnomedb.spec 
Log Message:
* Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-4
- Put mono files only in sharp package and not in sharp and main package.
- Make -sharp package Require the main package.



Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgnomedb.spec	16 Jan 2006 22:42:29 -0000	1.10
+++ libgnomedb.spec	17 Jan 2006 08:37:17 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.9.100
-Release:         3
+Release:         4
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
@@ -38,8 +38,9 @@
 
 
 %package sharp
-Summary:          Mono bindings for libgnomedb
-Group:            System Environment/Libraries
+Summary:         Mono bindings for libgnomedb
+Group:           System Environment/Libraries
+Requires:        %{name} = %{epoch}:%{version}-%{release}
 
 %description sharp
 This package contains the dll files needed to run (and compile) Mono
@@ -111,7 +112,8 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/libgnomedb
 %{_libdir}/*.so.*
-%{_libdir}/libgnomedb
+%dir %{_libdir}/libgnomedb
+%{_libdir}/libgnomedb/plugins
 %{_libdir}/libglade/2.0/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
@@ -134,6 +136,10 @@
 
 
 %changelog
+* Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-4
+- Put mono files only in sharp package and not in sharp and main package.
+- Make -sharp package Require the main package.
+
 * Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
 - Remove unneeded requires (.so reqs are automaticly picked up by rpm).
 - Add BuildRequires for building libgda-sharp



From fedora-extras-commits at redhat.com  Tue Jan 17 08:54:10 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Tue, 17 Jan 2006 03:54:10 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.1,
	1.2
Message-ID: <200601170854.k0H8sh0Y004453@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4433

Modified Files:
	system-config-control.spec 
Log Message:
New release is out


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-control.spec	14 Nov 2005 11:44:48 -0000	1.1
+++ system-config-control.spec	17 Jan 2006 08:54:10 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base
@@ -47,6 +47,10 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
+- Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
+- Added icons in the tabs of the categories.
+
 * Fri Oct 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
 - cleanups for Fedora
 



From fedora-extras-commits at redhat.com  Tue Jan 17 08:56:40 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Tue, 17 Jan 2006 03:56:40 -0500
Subject: rpms/system-config-control/FC-4 system-config-control.spec,1.1,1.2
Message-ID: <200601170857.k0H8vCa4004486@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4469

Modified Files:
	system-config-control.spec 
Log Message:
New release is out


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/system-config-control.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-control.spec	14 Nov 2005 11:44:48 -0000	1.1
+++ system-config-control.spec	17 Jan 2006 08:56:40 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base
@@ -47,6 +47,10 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
+- Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
+- Added icons in the tabs of the categories.
+
 * Fri Oct 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
 - cleanups for Fedora
 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:12:26 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Tue, 17 Jan 2006 05:12:26 -0500
Subject: rpms/streamtuner/FC-3 streamtuner.spec,1.4,1.5
Message-ID: <200601171012.k0HACwL0008645@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8623

Modified Files:
	streamtuner.spec 
Log Message:
defaultconfig patch matches FC3, using xmms instead of beep-media-player, xmms added to dependencies, beep-media-player removed from dependencies


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- streamtuner.spec	7 Jan 2006 10:18:09 -0000	1.4
+++ streamtuner.spec	17 Jan 2006 10:12:25 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -11,7 +11,7 @@
 Patch3: %{name}-%{version}-pkgconfig.patch
 License: BSD
 Group: Applications/Internet
-Requires: python, pygtk2, htmlview, bmp, xterm
+Requires: python, pygtk2, htmlview, xmms, xterm
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
@@ -116,6 +116,10 @@
 
 
 %changelog
+* Tue Jan 17 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-10
+- defaultconfig patch matches FC3, using xmms instead of beep-media-player
+- xmms added to dependencies, beep-media-player removed from dependencies 
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
 - desktop-file-utils dependency removed from requires(post) and requires(postun)  
 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:14:17 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Tue, 17 Jan 2006 05:14:17 -0500
Subject: rpms/streamtuner/FC-3 streamtuner-0.99.99-defaultconfig.patch, 1.1, 
	1.2
Message-ID: <200601171014.k0HAEnrg008726@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8687

Modified Files:
	streamtuner-0.99.99-defaultconfig.patch 
Log Message:
matches FC3 now, using xmms instead of beep-media-player

streamtuner-0.99.99-defaultconfig.patch:

Index: streamtuner-0.99.99-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner-0.99.99-defaultconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-defaultconfig.patch	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner-0.99.99-defaultconfig.patch	17 Jan 2006 10:14:16 -0000	1.2
@@ -1,78 +1,45 @@
---- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
-+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
-@@ -1410,8 +1410,8 @@
+diff -Nur streamtuner-0.99.99_orig/src/plugins/live365/live365.c streamtuner-0.99.99/src/plugins/live365/live365.c
+--- streamtuner-0.99.99_orig/src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/live365/live365.c	2006-01-17 10:40:05.000000000 +0100
+@@ -1410,7 +1410,7 @@
    init_handler();
  
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
--  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
+   st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
  
    return TRUE;
- }
-
---- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
-+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
-@@ -1057,8 +1057,8 @@
- 
+diff -Nur streamtuner-0.99.99_orig/src/plugins/local/local.c streamtuner-0.99.99/src/plugins/local/local.c
+--- streamtuner-0.99.99_orig/src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/local/local.c	2006-01-17 10:40:39.000000000 +0100
+@@ -1058,7 +1058,7 @@
    init_handler();
  
--  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
+   st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
-
---- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
-+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
-@@ -959,9 +959,9 @@
- 
-   init_handler();
+diff -Nur streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2006-01-17 10:41:49.000000000 +0100
+@@ -961,7 +961,7 @@
    
--  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
+   st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
-
---- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
-+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
-@@ -957,7 +957,7 @@
-   init_handler();
- 
-   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
--  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
- 
-   return TRUE;
- }
-
---- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
-+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
-@@ -123,7 +123,7 @@
- {
-   actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
- 
--  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-   st_action_register("view-ghelp", _("Open a GNOME help document"), "yelp %q");
- }
- 
-
---- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
-+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
-@@ -390,9 +390,9 @@
- {
-   st_preselections_init_handler();
+diff -Nur streamtuner-0.99.99_orig/src/streamtuner/st-preselections.c streamtuner-0.99.99/src/streamtuner/st-preselections.c
+--- streamtuner-0.99.99_orig/src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
++++ streamtuner-0.99.99/src/streamtuner/st-preselections.c	2006-01-17 10:43:27.000000000 +0100
+@@ -392,7 +392,7 @@
    
--  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
+   st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");



From fedora-extras-commits at redhat.com  Tue Jan 17 10:14:21 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 17 Jan 2006 05:14:21 -0500
Subject: rpms/mail-notification/devel mail-notification.spec,1.13,1.14
Message-ID: <200601171014.k0HAErNg008729@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703

Modified Files:
	mail-notification.spec 
Log Message:
rebuild


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mail-notification.spec	10 Nov 2005 17:57:29 -0000	1.13
+++ mail-notification.spec	17 Jan 2006 10:14:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-8
+- rebuild
+
 * Thu Nov 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-7
 - rebuild against new openssl
 - use LDFLAGS and not CFLAGS for fixing #172010



From fedora-extras-commits at redhat.com  Tue Jan 17 10:20:00 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 05:20:00 -0500
Subject: rpms/t1utils/devel t1utils.spec,1.8,1.9
Message-ID: <200601171020.k0HAKWPI008881@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8862

Modified Files:
	t1utils.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
- add %{?dist} tag
- correct License




Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- t1utils.spec	22 May 2005 23:44:46 -0000	1.8
+++ t1utils.spec	17 Jan 2006 10:20:00 -0000	1.9
@@ -1,11 +1,11 @@
 Name:		t1utils
 Version:	1.32
-Release: 3
+Release:        4%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
 Group:		Applications/Publishing
-License:	Freely modifiable and distributable
+License:	Distributable
 URL:		http://www.lcdf.org/~eddietwo/type/
 Source0:	http://www.lcdf.org/~eddietwo/type/t1utils-1.32.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
+- add %%{?dist} tag
+- correct License
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.32-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:23:09 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Tue, 17 Jan 2006 05:23:09 -0500
Subject: rpms/streamtuner/FC-3 streamtuner.spec,1.5,1.6
Message-ID: <200601171023.k0HANfKs008959@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935

Modified Files:
	streamtuner.spec 
Log Message:
wrong patch option fixed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- streamtuner.spec	17 Jan 2006 10:12:25 -0000	1.5
+++ streamtuner.spec	17 Jan 2006 10:23:09 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -44,7 +44,7 @@
 %setup -q
 %patch0 -p0 -b .%{name}-%{version}-live365
 %patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
-%patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
+%patch2 -p1 -b .%{name}-%{version}-defaultconfig.patch
 %patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
 
 %build
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-11
+- wrong patch option fixed 
+
 * Tue Jan 17 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-10
 - defaultconfig patch matches FC3, using xmms instead of beep-media-player
 - xmms added to dependencies, beep-media-player removed from dependencies 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:29:14 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 05:29:14 -0500
Subject: rpms/t1utils/devel t1utils.spec,1.9,1.10
Message-ID: <200601171029.k0HATpMB009098@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9076

Modified Files:
	t1utils.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-5
- rebuild




Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- t1utils.spec	17 Jan 2006 10:20:00 -0000	1.9
+++ t1utils.spec	17 Jan 2006 10:29:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		t1utils
 Version:	1.32
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-5
+- rebuild
+
 * Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
 - add %%{?dist} tag
 - correct License



From fedora-extras-commits at redhat.com  Tue Jan 17 10:43:42 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 05:43:42 -0500
Subject: rpms/gtranslator/FC-4 gtranslator.spec,1.7,1.8
Message-ID: <200601171044.k0HAiELM009247@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gtranslator/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209

Modified Files:
	gtranslator.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
- Add %{?dist} tag
- Rebuild




Index: gtranslator.spec
===================================================================
RCS file: /cvs/extras/rpms/gtranslator/FC-4/gtranslator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtranslator.spec	13 May 2005 00:11:06 -0000	1.7
+++ gtranslator.spec	17 Jan 2006 10:43:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		gtranslator
 Version:	1.1.6
-Release:	1
+Release:	2%{?dist}
 
 Summary:	Gettext po file editor for GNOME
 
@@ -85,7 +85,11 @@
 
 
 %changelog
-* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org>
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
+- Add %{?dist} tag
+- Rebuild
+
+* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 1.1.6-1
 - Updated to 1.1.6
 - Remove build patch as it's no longer needed
 



From fedora-extras-commits at redhat.com  Tue Jan 17 11:27:22 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 06:27:22 -0500
Subject: rpms/gtranslator/devel gtranslator.spec,1.7,1.8
Message-ID: <200601171127.k0HBRsMI011234@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gtranslator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11216

Modified Files:
	gtranslator.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
- Add %{?dist} tag
- Rebuild




Index: gtranslator.spec
===================================================================
RCS file: /cvs/extras/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtranslator.spec	13 May 2005 00:11:06 -0000	1.7
+++ gtranslator.spec	17 Jan 2006 11:27:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		gtranslator
 Version:	1.1.6
-Release:	1
+Release:	2%{?dist}
 
 Summary:	Gettext po file editor for GNOME
 
@@ -85,7 +85,11 @@
 
 
 %changelog
-* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org>
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
+- Add %{?dist} tag
+- Rebuild
+
+* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 1.1.6-1
 - Updated to 1.1.6
 - Remove build patch as it's no longer needed
 



From fedora-extras-commits at redhat.com  Tue Jan 17 12:08:11 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 07:08:11 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.9,1.10
Message-ID: <200601171209.k0HC91wd013119@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13094

Modified Files:
	autotrace.spec 
Log Message:
* Tue Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
- remove BuildRequire on XFree86-devel




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- autotrace.spec	16 Jan 2006 18:20:15 -0000	1.9
+++ autotrace.spec	17 Jan 2006 12:08:11 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -10,7 +10,6 @@
 Source0:        http://dl.sf.net/autotrace/autotrace-0.31.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ImageMagick-devel
-BuildRequires:  XFree86-devel
 BuildRequires:  libpng-devel > 2:1.2
 BuildRequires:  libexif-devel
 BuildRequires:  libtiff-devel
@@ -86,6 +85,9 @@
 
 
 %changelog
+* Tue Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
+- remove BuildRequire on XFree86-devel
+
 * Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
 - add %%{?dist} tag
 - add a BuildRequire on bzip2-devel



From fedora-extras-commits at redhat.com  Tue Jan 17 12:26:49 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 07:26:49 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.10,1.11
Message-ID: <200601171227.k0HCRLZY013289@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13271

Modified Files:
	autotrace.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-10
- add BuildRequires on freetype-devel




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- autotrace.spec	17 Jan 2006 12:08:11 -0000	1.10
+++ autotrace.spec	17 Jan 2006 12:26:49 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -16,6 +16,7 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  bzip2-devel
+BuildRequires:  freetype-devel
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
@@ -85,12 +86,15 @@
 
 
 %changelog
-* Tue Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
-- remove BuildRequire on XFree86-devel
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-10
+- add BuildRequires on freetype-devel
+
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
+- remove BuildRequires on XFree86-devel
 
 * Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
 - add %%{?dist} tag
-- add a BuildRequire on bzip2-devel
+- add a BuildRequires on bzip2-devel
 - add ldconfig to %%post and %%postun
 
 * Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.31.1-7



From fedora-extras-commits at redhat.com  Tue Jan 17 13:16:00 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 17 Jan 2006 08:16:00 -0500
Subject: rpms/python-sqlite2/devel .cvsignore, 1.2, 1.3 python-sqlite2.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601171316.k0HDGW14015258@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15225

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 18:10:09 -0000	1.2
+++ .cvsignore	17 Jan 2006 13:15:59 -0000	1.3
@@ -1 +1 @@
-pysqlite-2.0.5.tar.gz
+pysqlite-2.1.0.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-sqlite2.spec	14 Jan 2006 18:10:09 -0000	1.1
+++ python-sqlite2.spec	17 Jan 2006 13:15:59 -0000	1.2
@@ -1,19 +1,19 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.0.5
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
 Group:          Development/Languages
 License:        zlib/libpng
 URL:            http://pysqlite.org/
-Source0:        http://initd.org/pub/software/pysqlite/releases/2.0/%{version}/pysqlite-%{version}.tar.gz
+Source0:        http://initd.org/pub/software/pysqlite/releases/2.1/%{version}/pysqlite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dos2unix
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 BuildRequires:  sqlite-devel
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -33,9 +33,13 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install -O1 \
+	--skip-build \
+	--old-and-unmanageable \
+	--root %{buildroot}
+
 %{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
-%{__rm} documentation/install-source.{html,txt}
+%{__rm} documentation/install-source*
 %{__rm} documentation/usage-guide.txt
 dos2unix documentation/{silvercity.css,code/*}
 
@@ -47,7 +51,7 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE documentation/*
-%{_bindir}/test-pysqlite
+%doc doc/pysqlite-introduction-slides/pysqlite-introduction.pdf
 %dir %{python_sitearch}/pysqlite2
 %{python_sitearch}/pysqlite2/__init__.py
 %{python_sitearch}/pysqlite2/__init__.pyc
@@ -78,6 +82,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.1.0-1
+- Update to 2.1.0
+
 * Sat Jan 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.0.5-2
 - Fix missing BR: sqlite-devel (Chris Chabot, #176653)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 18:10:09 -0000	1.2
+++ sources	17 Jan 2006 13:15:59 -0000	1.3
@@ -1 +1 @@
-574bbb4f7b3a077506689cbab0d9bf7f  pysqlite-2.0.5.tar.gz
+67530a31508f33d64e86b3e5071822d9  pysqlite-2.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 13:40:30 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 08:40:30 -0500
Subject: rpms/t1lib/FC-4 t1lib-5.1.0-destdir.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 t1lib.spec, 1.6, 1.7
Message-ID: <200601171341.k0HDf2Ea015461@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15430

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
- remove unneeded %%{_datadir}/t1lib contents
- cleanup

* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
- updated version
- remove Patch0 (in upstream), added Patch6
- Does not BuildRequire xfree/xorg devel
- no longer BuildRequire autoconf (Patch0 removed)



t1lib-5.1.0-destdir.patch:

--- NEW FILE t1lib-5.1.0-destdir.patch ---
diff -ur t1lib-5.1.0/type1afm/Makefile.in t1lib-5.1.0.new/type1afm/Makefile.in
--- t1lib-5.1.0/type1afm/Makefile.in	2004-12-12 18:45:12.000000000 -0800
+++ t1lib-5.1.0.new/type1afm/Makefile.in	2005-09-27 09:42:50.000000000 -0700
@@ -89,7 +89,7 @@
 install: dummy
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install \
-		$(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
+		$(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
 
 
 uninstall: dummy


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:23:56 -0000	1.2
+++ .cvsignore	17 Jan 2006 13:40:30 -0000	1.3
@@ -1 +1 @@
-t1lib-5.0.2.tar.gz
+t1lib-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:23:56 -0000	1.2
+++ sources	17 Jan 2006 13:40:30 -0000	1.3
@@ -1 +1 @@
-cc5d4130b25bb8a1c930488b78930e9b  t1lib-5.0.2.tar.gz
+a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/t1lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- t1lib.spec	22 May 2005 23:39:09 -0000	1.6
+++ t1lib.spec	17 Jan 2006 13:40:30 -0000	1.7
@@ -1,27 +1,21 @@
 Name:           t1lib
-Version:        5.0.2
-Release: 3
+Version:        5.1.0
+Release:        2%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
 License:        LGPL
 URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics
-Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.0.2.tar.gz
-# Based on patches in Mandrakes's t1lib-1.3.1-9mdk.src.rpm:
-Patch0:         t1lib-5.0.0-install.patch
+Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
 # From Debian's t1lib-5.0.0-4:
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
-Patch3:         t1lib-5.0.0-hintfix.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
 Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch6:         t1lib-5.1.0-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  XFree86-devel
-BuildRequires:  autoconf
-BuildRequires:  perl
-
 %description
 T1lib is a rasterizer library for Adobe Type 1 Fonts. It supports
 rotation and transformation, kerning underlining and antialiasing. It
@@ -42,18 +36,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .install
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
-perl -pi -e 's/^dbl$$//' configure.in
-autoconf
 %configure
 make %{?_smp_mflags} without_doc
-ln README.t1lib-5.0.2 README
+ln README.t1lib-%{version} README
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +62,11 @@
 install -p -m 755 debian/t1libconfig $RPM_BUILD_ROOT%{_sbindir}/
 
 touch FontDatabase
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/t1lib
 install -p -m 644 FontDatabase $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/
+touch $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/t1lib.config
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/t1lib
 
 
 %clean
@@ -94,18 +90,28 @@
 %config %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_mandir}/man[^3]/*
+%{_mandir}/man*/*
 %{_sbindir}/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/t1lib_doc.pdf
-%{_includedir}/*
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
+- remove unneeded %%{_datadir}/t1lib contents
+- cleanup
+
+* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
+- updated version
+- remove Patch0 (in upstream), added Patch6
+- Does not BuildRequire xfree/xorg devel
+- no longer BuildRequire autoconf (Patch0 removed)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.0.2-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 13:44:50 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 08:44:50 -0500
Subject: rpms/t1lib/FC-4 t1lib-5.0.0-hintfix.patch, 1.1,
	NONE t1lib-5.0.0-install.patch, 1.1, NONE
Message-ID: <200601171344.k0HDiq3w015520@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15511

Removed Files:
	t1lib-5.0.0-hintfix.patch t1lib-5.0.0-install.patch 
Log Message:
remove unneeded patches



--- t1lib-5.0.0-hintfix.patch DELETED ---


--- t1lib-5.0.0-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 13:55:40 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:55:40 -0500
Subject: rpms/itext - New directory
Message-ID: <200601171355.k0HDtgap015615@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607/itext

Log Message:
Directory /cvs/extras/rpms/itext added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 13:55:46 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:55:46 -0500
Subject: rpms/itext/devel - New directory
Message-ID: <200601171355.k0HDtm0B015630@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607/itext/devel

Log Message:
Directory /cvs/extras/rpms/itext/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 13:56:28 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:56:28 -0500
Subject: rpms/itext Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601171356.k0HDuUrJ015666@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15654

Added Files:
	Makefile import.log 
Log Message:
Setup of module itext


--- NEW FILE Makefile ---
# Top level Makefile for module itext
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 13:56:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:56:34 -0500
Subject: rpms/itext/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601171356.k0HDuaUg015686@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15654/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module itext


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 13:58:48 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:58:48 -0500
Subject: rpms/itext import.log,1.1,1.2
Message-ID: <200601171359.k0HDxKUa015780@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15739

Modified Files:
	import.log 
Log Message:
auto-import itext-1.3-1jpp_6 on branch devel from itext-1.3-1jpp_6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/itext/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 13:56:27 -0000	1.1
+++ import.log	17 Jan 2006 13:58:47 -0000	1.2
@@ -0,0 +1 @@
+itext-1_3-1jpp_6:HEAD:itext-1.3-1jpp_6.src.rpm:1137506319



From fedora-extras-commits at redhat.com  Tue Jan 17 13:58:54 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:58:54 -0500
Subject: rpms/itext/devel itext-1.3-manifest.mf, NONE,
	1.1 itext-escape-jpeg-java-trap.patch, NONE,
	1.1 itext-no-javadoc-web-links.patch, NONE, 1.1 itext.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601171359.k0HDxQCZ015784@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15739/devel

Modified Files:
	.cvsignore sources 
Added Files:
	itext-1.3-manifest.mf itext-escape-jpeg-java-trap.patch 
	itext-no-javadoc-web-links.patch itext.spec 
Log Message:
auto-import itext-1.3-1jpp_6 on branch devel from itext-1.3-1jpp_6.src.rpm


--- NEW FILE itext-1.3-manifest.mf ---
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.6.2
Main-Class: com.lowagie.tools.Toolbox


itext-escape-jpeg-java-trap.patch:

--- NEW FILE itext-escape-jpeg-java-trap.patch ---
--- src/com/lowagie/text/pdf/PdfGraphics2D.java~	2006-01-04 04:29:31.000000000 -0800
+++ src/com/lowagie/text/pdf/PdfGraphics2D.java	2006-01-04 04:29:42.000000000 -0800
@@ -170,12 +170,10 @@
      */
     PdfGraphics2D(PdfContentByte cb, float width, float height, FontMapper fontMapper, boolean onlyShapes, boolean convertImagesToJPEG, float quality) {
         super();
-        try {
-            Class.forName("com.sun.image.codec.jpeg.JPEGCodec");
-        }
-        catch (Throwable t) {
-            convertImagesToJPEG = false;
-        }
+
+	// Free Software implementations don't support JPEG encoding yet
+	convertImagesToJPEG = false;
+
         this.convertImagesToJPEG = convertImagesToJPEG;
         this.jpegQuality = quality;
         this.onlyShapes = onlyShapes;
@@ -1239,25 +1237,9 @@
         
         try {
             com.lowagie.text.Image image = null;
-            if(!convertImagesToJPEG){
-                image = com.lowagie.text.Image.getInstance(img, bgColor);
-            }
-            else{
-                BufferedImage scaled = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_RGB);
-                Graphics2D g3 = scaled.createGraphics();
-                g3.drawImage(img, 0, 0, img.getWidth(null), img.getHeight(null), null);
-                g3.dispose();
-                
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(baos);
-                com.sun.image.codec.jpeg.JPEGEncodeParam param = com.sun.image.codec.jpeg.JPEGCodec.getDefaultJPEGEncodeParam(scaled);
-                param.setQuality(jpegQuality, true);
-                encoder.encode(scaled, param);
-                scaled.flush();
-                scaled = null;
-                image = com.lowagie.text.Image.getInstance(baos.toByteArray());
-                
-            }
+
+	    image = com.lowagie.text.Image.getInstance(img, bgColor);
+
             if (mask!=null) {
                 com.lowagie.text.Image msk = com.lowagie.text.Image.getInstance(mask, null, true);
                 msk.makeMask();

itext-no-javadoc-web-links.patch:

--- NEW FILE itext-no-javadoc-web-links.patch ---
--- src/ant/site.xml~	2005-03-25 04:32:39.000000000 -0800
+++ src/ant/site.xml	2006-01-16 17:47:43.000000000 -0800
@@ -104,7 +104,6 @@
 			<packageset dir="${itext.src}" defaultexcludes="yes">
       			<include name="com/lowagie/**" />
 		    </packageset>
-            <link href="http://java.sun.com/j2se/1.3/docs/api/" />
         </javadoc>
     </target>
 


--- NEW FILE itext.spec ---
%define section free

Summary:        A Free Java-PDF library
Name:           itext
Version:        1.3
Release:        1jpp_6%{?dist}
License:        MPL/LGPL
URL:            http://www.lowagie.com/iText/
Group:          Development/Libraries
Source0:        itext-src-1.3.tar.gz
Source1:        itext-www-1.3.tar.gz
Source2:        itext-1.3-manifest.mf
Patch0:         itext-escape-jpeg-java-trap.patch
Patch1:         itext-no-javadoc-web-links.patch
BuildRequires:  jpackage-utils >= 0:1.6
BuildRequires:  ant, ant-trax, jaxp_transform_impl
BuildRequires:  dos2unix
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31

%description
iText is a library that allows you to generate 
PDF files on the fly. The iText classes are very 
useful for people who need to generate read-only, 
platform independent documents containing text, 
lists, tables and images. The library is especially 
useful in combination with Java(TM) technology-based 
Servlets: The look and feel of HTML is browser 
dependent; with iText and PDF you can control 
exactly how your servlet's output will look.


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

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

%package manual
Summary:        Documents for %{name}
Group:          Documentation

%description manual
A programming manual for the %{name} package.

%prep
%setup -c -T -n %{name}
mkdir -p src/META-INF
(cd src
gzip -dc %{SOURCE0} | tar xf -)
cp %{SOURCE2} src/META-INF/MANIFEST.MF
gzip -dc %{SOURCE1} | tar xf -
find . -name "*.jar" -exec rm {} \;
%patch0 -p0
%patch1 -p0

%build
pushd src
export OPT_JAR_LIST="ant/ant-trax jaxp_transform_impl"
ant jar javadoc tutorial lowagie.com
popd

%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p build/bin/iText.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

aot-compile-rpm

dos2unix build/lowagie/*.{txt,xml}
dos2unix build/lowagie/ant/*.xml
dos2unix build/lowagie/ant/.ant.properties

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# manual
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/lowagie/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/tutorial $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p %{_bindir}/rebuild-gcj-db

%postun -p %{_bindir}/rebuild-gcj-db

%files
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/MPL-1.1.txt
%doc %{_docdir}/%{name}-%{version}/lgpl.txt
%{_javadir}/*
%{_libdir}/gcj/*

%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/*

# -----------------------------------------------------------------------------

%changelog
* Mon Jan 17 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_6
- Remove epoch from changelog versions.

* Mon Jan 16 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_5
- Remove empty /usr/share/java/itext.
- Move manual and javadoc packages to Documentation group.
- Add itext-no-javadoc-web-links.patch.

* Mon Jan 16 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_4
- Fixed Group.
- Cleaned up changelog versions.
- Use dos2unix on doc files.
- Don't create unversioned javadoc link.

* Thu Jan 13 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_3
- Remove javadoc %postun, as that should get handled by the fact
  that the file is ghosted.
- Improve javadoc and manual subpackage descriptions.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_2
- Add ant-trax and jaxp_transform_impl dependencies.
- Set OPT_JAR_LIST.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_1
- Build native code.
- Add patch to remove proprietary jpeg encoding library usage.
- Fix BuildRequires.
- Tweak BuildRoot.

* Thu Aug 26 2005 Ralph Apel <r.apel at r-apel.de> - 1.3-1jpp
- Upgrade to 1.3
- Now one jar only

* Wed Aug 25 2004 Ralph Apel <r.apel at r-apel.de> - 1.02b-2jpp
- Build with ant-1.6.2
- Relax some versioned dependencies

* Fri Feb 27 2004 Ralph Apel <r.apel at r-apel.de> - 1.02b-1jpp
- First JPackage release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itext/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 13:56:33 -0000	1.1
+++ .cvsignore	17 Jan 2006 13:58:54 -0000	1.2
@@ -0,0 +1,2 @@
+itext-src-1.3.tar.gz
+itext-www-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itext/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 13:56:33 -0000	1.1
+++ sources	17 Jan 2006 13:58:54 -0000	1.2
@@ -0,0 +1,2 @@
+6d31b384060ae93c5691fc5b6c017b1e  itext-src-1.3.tar.gz
+710cc9ecfff65c95e2dd84dc3b03fa1d  itext-www-1.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 14:02:31 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:02:31 -0500
Subject: owners owners.list,1.540,1.541
Message-ID: <200601171403.k0HE34AI017564@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17522

Modified Files:
	owners.list 
Log Message:
Add itext



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -r1.540 -r1.541
--- owners.list	17 Jan 2006 08:04:33 -0000	1.540
+++ owners.list	17 Jan 2006 14:02:31 -0000	1.541
@@ -422,6 +422,7 @@
 Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 14:04:18 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:04:18 -0500
Subject: rpms/t1lib/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 t1lib.spec, 
	1.6, 1.7 t1lib-5.0.0-hintfix.patch, 1.1,
	NONE t1lib-5.0.0-install.patch, 1.1, NONE
Message-ID: <200601171404.k0HE4p3h017629@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17571

Modified Files:
	.cvsignore sources t1lib.spec 
Removed Files:
	t1lib-5.0.0-hintfix.patch t1lib-5.0.0-install.patch 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
- remove unneeded %%{_datadir}/t1lib contents
- cleanup

* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
- updated version
- remove Patch0 (in upstream), added Patch6
- Does not BuildRequire xfree/xorg devel
- no longer BuildRequire autoconf (Patch0 removed)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:23:56 -0000	1.2
+++ .cvsignore	17 Jan 2006 14:04:18 -0000	1.3
@@ -1 +1 @@
-t1lib-5.0.2.tar.gz
+t1lib-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:23:56 -0000	1.2
+++ sources	17 Jan 2006 14:04:18 -0000	1.3
@@ -1 +1 @@
-cc5d4130b25bb8a1c930488b78930e9b  t1lib-5.0.2.tar.gz
+a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- t1lib.spec	22 May 2005 23:39:09 -0000	1.6
+++ t1lib.spec	17 Jan 2006 14:04:18 -0000	1.7
@@ -1,27 +1,21 @@
 Name:           t1lib
-Version:        5.0.2
-Release: 3
+Version:        5.1.0
+Release:        2%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
 License:        LGPL
 URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics
-Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.0.2.tar.gz
-# Based on patches in Mandrakes's t1lib-1.3.1-9mdk.src.rpm:
-Patch0:         t1lib-5.0.0-install.patch
+Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
 # From Debian's t1lib-5.0.0-4:
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
-Patch3:         t1lib-5.0.0-hintfix.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
 Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch6:         t1lib-5.1.0-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  XFree86-devel
-BuildRequires:  autoconf
-BuildRequires:  perl
-
 %description
 T1lib is a rasterizer library for Adobe Type 1 Fonts. It supports
 rotation and transformation, kerning underlining and antialiasing. It
@@ -42,18 +36,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .install
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
-perl -pi -e 's/^dbl$$//' configure.in
-autoconf
 %configure
 make %{?_smp_mflags} without_doc
-ln README.t1lib-5.0.2 README
+ln README.t1lib-%{version} README
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +62,11 @@
 install -p -m 755 debian/t1libconfig $RPM_BUILD_ROOT%{_sbindir}/
 
 touch FontDatabase
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/t1lib
 install -p -m 644 FontDatabase $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/
+touch $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/t1lib.config
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/t1lib
 
 
 %clean
@@ -94,18 +90,28 @@
 %config %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_mandir}/man[^3]/*
+%{_mandir}/man*/*
 %{_sbindir}/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/t1lib_doc.pdf
-%{_includedir}/*
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
+- remove unneeded %%{_datadir}/t1lib contents
+- cleanup
+
+* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
+- updated version
+- remove Patch0 (in upstream), added Patch6
+- Does not BuildRequire xfree/xorg devel
+- no longer BuildRequire autoconf (Patch0 removed)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.0.2-3
 - rebuild on all arches
 


--- t1lib-5.0.0-hintfix.patch DELETED ---


--- t1lib-5.0.0-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 14:09:27 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:09:27 -0500
Subject: rpms/t1lib/devel t1lib-5.1.0-destdir.patch,NONE,1.1
Message-ID: <200601171409.k0HE9UKv017693@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17678

Added Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
added forgotten patch


t1lib-5.1.0-destdir.patch:

--- NEW FILE t1lib-5.1.0-destdir.patch ---
diff -ur t1lib-5.1.0/type1afm/Makefile.in t1lib-5.1.0.new/type1afm/Makefile.in
--- t1lib-5.1.0/type1afm/Makefile.in	2004-12-12 18:45:12.000000000 -0800
+++ t1lib-5.1.0.new/type1afm/Makefile.in	2005-09-27 09:42:50.000000000 -0700
@@ -89,7 +89,7 @@
 install: dummy
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install \
-		$(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
+		$(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
 
 
 uninstall: dummy



From fedora-extras-commits at redhat.com  Tue Jan 17 14:12:23 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:12:23 -0500
Subject: rpms/t1lib/devel t1lib.spec,1.7,1.8
Message-ID: <200601171413.k0HED8xw017811@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17758

Modified Files:
	t1lib.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
- rebuild




Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- t1lib.spec	17 Jan 2006 14:04:18 -0000	1.7
+++ t1lib.spec	17 Jan 2006 14:12:23 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
 - remove unneeded %%{_datadir}/t1lib contents
 - cleanup



From fedora-extras-commits at redhat.com  Tue Jan 17 14:13:40 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:13:40 -0500
Subject: rpms/rssowl - New directory
Message-ID: <200601171413.k0HEDg1Q017849@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17841/rssowl

Log Message:
Directory /cvs/extras/rpms/rssowl added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 14:13:46 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:13:46 -0500
Subject: rpms/rssowl/devel - New directory
Message-ID: <200601171413.k0HEDmxT017864@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17841/rssowl/devel

Log Message:
Directory /cvs/extras/rpms/rssowl/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 14:14:03 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:14:03 -0500
Subject: rpms/rssowl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601171414.k0HEE54l017898@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886

Added Files:
	Makefile import.log 
Log Message:
Setup of module rssowl


--- NEW FILE Makefile ---
# Top level Makefile for module rssowl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 14:14:09 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:14:09 -0500
Subject: rpms/rssowl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601171414.k0HEEBIE017918@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rssowl


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 14:15:56 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:15:56 -0500
Subject: rpms/rssowl import.log,1.1,1.2
Message-ID: <200601171416.k0HEGS3t018086@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18032

Modified Files:
	import.log 
Log Message:
auto-import rssowl-1.2-7 on branch devel from rssowl-1.2-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rssowl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 14:14:03 -0000	1.1
+++ import.log	17 Jan 2006 14:15:55 -0000	1.2
@@ -0,0 +1 @@
+rssowl-1_2-7:HEAD:rssowl-1.2-7.src.rpm:1137507346



From fedora-extras-commits at redhat.com  Tue Jan 17 14:16:02 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:16:02 -0500
Subject: rpms/rssowl/devel rssowl-JessieX509.patch, NONE,
	1.1 rssowl-browser.patch, NONE, 1.1 rssowl-build0.patch, NONE,
	1.1 rssowl-build1.patch, NONE, 1.1 rssowl-swt31.patch, NONE,
	1.1 rssowl-use-jce.patch, NONE, 1.1 rssowl.desktop, NONE,
	1.1 rssowl.script, NONE, 1.1 rssowl.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601171416.k0HEGY4N018090@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18032/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rssowl-JessieX509.patch rssowl-browser.patch 
	rssowl-build0.patch rssowl-build1.patch rssowl-swt31.patch 
	rssowl-use-jce.patch rssowl.desktop rssowl.script rssowl.spec 
Log Message:
auto-import rssowl-1.2-7 on branch devel from rssowl-1.2-7.src.rpm

rssowl-JessieX509.patch:

--- NEW FILE rssowl-JessieX509.patch ---
--- src/java/net/sourceforge/rssowl/dao/ssl/EasyX509TrustManager.java~	2005-11-06 08:06:57.000000000 -0800
+++ src/java/net/sourceforge/rssowl/dao/ssl/EasyX509TrustManager.java	2006-01-04 09:00:04.000000000 -0800
@@ -51,11 +51,11 @@
    */
   public EasyX509TrustManager(KeyStore keystore) throws NoSuchAlgorithmException, KeyStoreException {
     super();
-    TrustManagerFactory factory = TrustManagerFactory.getInstance("SunX509");
+    TrustManagerFactory factory = TrustManagerFactory.getInstance("JessieX509");
     factory.init(keystore);
     TrustManager[] trustmanagers = factory.getTrustManagers();
     if (trustmanagers.length == 0)
-      throw new NoSuchAlgorithmException("SunX509 trust manager not supported");
+      throw new NoSuchAlgorithmException("JessieX509 trust manager not supported");
 
     this.standardTrustManager = (X509TrustManager) trustmanagers[0];
   }

rssowl-browser.patch:

--- NEW FILE rssowl-browser.patch ---
--- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java~	2005-11-06 08:06:57.000000000 -0800
+++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java	2006-01-13 18:33:12.000000000 -0800
@@ -36,6 +36,9 @@
 import org.eclipse.swt.SWTError;
 import org.eclipse.swt.program.Program;
 
+import org.gnu.gconf.ConfClient;
+import org.gnu.gconf.ConfException;
+
 import java.io.IOException;
 
 /**
@@ -267,11 +270,28 @@
     /** Try Netscape as default browser */
     if (webBrowser == null) {
       try {
-        webBrowser = "netscape";
-        p = Runtime.getRuntime().exec(webBrowser + "  " + href);
-      } catch (IOException e) {
-        p = null;
-        webBrowser = "mozilla";
+	// This is kind of lame, but - oh well - it's slightly better than
+	// the original.
+	ConfClient client = ConfClient.getInstance();
+	webBrowser = client.getString ("/desktop/gnome/url-handlers/http/command");
+	if (webBrowser.startsWith("firefox"))
+	  webBrowser = "firefox";
+	else if (webBrowser.startsWith("mozilla"))
+	  webBrowser = "mozilla";
+	else if (webBrowser.startsWith("epiphany"))
+	  webBrowser = "epiphany";
+	if (webBrowser.startsWith("netscape"))
+	  webBrowser = "netscape";
+	else
+	  webBrowser = "firefox";
+      } catch (ConfException ce) {
+	try {
+	  webBrowser = "firefox";
+	  p = Runtime.getRuntime().exec(webBrowser + "  " + href);
+	} catch (IOException e) {
+	  p = null;
+	  webBrowser = "mozilla";
+	}
       }
     }
 

rssowl-build0.patch:

--- NEW FILE rssowl-build0.patch ---
--- src/build.xml~	2005-11-06 08:06:57.000000000 -0800
+++ src/build.xml	2006-01-04 05:46:08.000000000 -0800
@@ -127,12 +127,17 @@
 		for the special-chars of the translations.
     -->
     <target name="compile_linux" depends="init">
+        <path id="libs.classpath">
+           <fileset dir="${root}/lib" includes="**/*.jar" />
+        </path>
+
         <javac excludes="**/DevShop.java"
                encoding="utf8"
                destdir="${classes}/"
-               srcdir="${src}"
-               classpath="${libs}" />
+               srcdir="${src}">
+           <classpath refid="libs.classpath" />
+	</javac>
     </target>
 
     <!-- 

rssowl-build1.patch:

--- NEW FILE rssowl-build1.patch ---
--- src/build.xml~	2006-01-04 06:11:03.000000000 -0800
+++ src/build.xml	2006-01-04 06:12:24.000000000 -0800
@@ -201,18 +201,7 @@
 		Pack compiled RSSOwl into executable JAR file.
     -->
     <target name="jar_linux" depends="compile_linux">
-        <unjar src="${SWT}" dest="${classes}" />
-        <unjar src="${SWT-NL}" dest="${classes}" />
-        <unjar src="${JDOM}" dest="${classes}" />
-        <unjar src="${JFACE}" dest="${classes}" />
-        <unjar src="${FORMS}" dest="${classes}" />
-        <unjar src="${XERCES}" dest="${classes}" />
-        <unjar src="${ITEXT}" dest="${classes}" />
         <unjar src="${ITEXTASIAN}" dest="${classes}" />
-        <unjar src="${CODEC}" dest="${classes}" />
-        <unjar src="${HTTPCLIENT}" dest="${classes}" />
-        <unjar src="${LOGGING}" dest="${classes}" />
-        <unjar src="${BLOWFISH}" dest="${classes}" />
         <delete file="${classes}/META-INF/LICENSE.txt" />
         <delete file="${classes}/META-INF/info.xml" />
         <jar jarfile="${deploy}/rssowl.jar" basedir="${classes}">

rssowl-swt31.patch:

--- NEW FILE rssowl-swt31.patch ---
--- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java~	2006-01-04 05:58:01.000000000 -0800
+++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java	2005-06-14 14:15:46.000000000 -0700
@@ -26,7 +26,6 @@
 
 import net.sourceforge.rssowl.controller.NewsTable;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Table;
@@ -42,7 +41,7 @@
  * header is clicked and update it.
  * 
  * @author <a href="mailto:masterludo at gmx.net">Ludovic Kim-Xuan Galibert </a>
- * @version 1.2
+ * @version 1.1.3
  */
 public class SortingSelectionAdapter extends SelectionAdapter {
 
@@ -101,59 +100,67 @@
   }
 
   /**
-   * Sort the News using a Sorter that is identified by the given field value.
+   * Handle the sorting corresponding to the header clicked
    * 
-   * @param field The identifier of the Sorter to use.
-   * @return boolean TRUE if the sort was ascending, FALSE if descending.
+   * @param se the SelectionEvent
    */
-  public boolean sort(String field) {
+  public void widgetSelected(SelectionEvent se) {
+    widgetSelected((TableColumn) se.getSource());
+  }
+
+  /**
+   * Handle the sorting corresponding to the header clicked
+   * 
+   * @param tc The selected TableColumn
+   */
+  public void widgetSelected(TableColumn tc) {
     Comparator sorter = null;
     boolean ascending = true;
 
     /** Sort by news title */
-    if ("TABLE_HEADER_NEWSTITLE".equals(field)) {
+    if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) {
       ascending = this.titleAscending;
       this.titleAscending = !this.titleAscending;
       sorter = new TitleSorter();
     }
 
     /** Sort by publish date */
-    else if ("TABLE_HEADER_PUBDATE".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) {
       ascending = this.pudDateAscending;
       this.pudDateAscending = !this.pudDateAscending;
       sorter = new PubDateSorter(newsItems);
     }
 
     /** Sort by author */
-    else if ("TABLE_HEADER_AUTHOR".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) {
       ascending = this.authorAscending;
       this.authorAscending = !this.authorAscending;
       sorter = new AuthorSorter(newsItems);
     }
 
     /** Sort by category */
-    else if ("TABLE_HEADER_CATEGORY".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) {
       ascending = this.categoryAscending;
       this.categoryAscending = !this.categoryAscending;
       sorter = new CategorySorter(newsItems);
     }
 
     /** Sort by publisher */
-    else if ("TABLE_HEADER_PUBLISHER".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) {
       ascending = this.publisherAscending;
       this.publisherAscending = !this.publisherAscending;
       sorter = new PublisherSorter(newsItems);
     }
 
     /** Sort by news feed */
-    else if ("TABLE_HEADER_FEED".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_FEED")) {
       ascending = this.newsfeedAscending;
       this.newsfeedAscending = !this.newsfeedAscending;
       sorter = new NewsFeedSorter(newsItems);
     }
 
     /** Sort by news status */
-    else if ("TABLE_HEADER_STATUS".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_STATUS")) {
       ascending = this.statusAscending;
       this.statusAscending = !this.statusAscending;
       sorter = new StatusSorter(newsItems);
@@ -165,33 +172,11 @@
     else
       Collections.sort(newsItemOrder, sorter);
 
-    /** Reverse if not ascending order */
+    /** Reverse is not ascending order */
     if (!ascending)
       Collections.reverse(newsItemOrder);
 
-    return ascending;
-  }
-
-  /**
-   * Handle the sorting corresponding to the header clicked
-   * 
-   * @param se the SelectionEvent
-   */
-  public void widgetSelected(SelectionEvent se) {
-    widgetSelected((TableColumn) se.getSource());
-  }
-
-  /**
-   * Handle the sorting corresponding to the header clicked
-   * 
-   * @param tc The selected TableColumn
-   */
-  public void widgetSelected(TableColumn tc) {
-
-    /** Sort based on the given TableColumn */
-    boolean ascending = sort((String) tc.getData());
-
-    /** Remember the width values of the columns */
+    /** Remember the width values of the columns before sorting */
     int columnWidth[] = new int[table.getColumnCount()];
     for (int a = 0; a < table.getColumnCount(); a++)
       columnWidth[a] = table.getColumn(a).getWidth();
@@ -201,41 +186,6 @@
     if (table.getSelectionCount() > 0)
       selectedNews = table.getSelection()[0].getText(1);
 
-    /** Show a Sort Indicator inside the selected TableColumn */
-    if (!tc.getData().equals("TABLE_HEADER_STATUS")) {
-      table.setSortColumn(tc);
-
-      /** Reset Sort Direction */
-      if (table.getSortDirection() != SWT.NONE)
-        table.setSortDirection(SWT.NONE);
-
-      /** Apply the new direction */
-      table.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
-
-      /**
-       * The Indicator requires some space, so pack the TableColumn. In order to
-       * avoid flashing, first set the Table visible before packing the Column.
-       */
-      table.setVisible(false);
-      tc.pack();
-      table.setVisible(true);
-
-      /** Restore Focus if necessary */
-      if (!table.isFocusControl())
-        table.setFocus();
-
-      /** Grant the sorted Column its preferred Width */
-      int sortColumnIndex = table.indexOf(tc);
-      if (columnWidth[sortColumnIndex] < tc.getWidth())
-        columnWidth[sortColumnIndex] = tc.getWidth();
-    }
-
-    /** Do not show the Indicator in the first, narrow Column */
-    else if (table.getSortColumn() != null) {
-      table.setSortDirection(SWT.NONE);
-      table.setSortColumn(null);
-    }
-
     /** Remove All tableitems */
     table.removeAll();
 
--- src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java~	2006-01-04 06:01:14.000000000 -0800
+++ src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java	2005-07-15 16:44:50.000000000 -0700
@@ -54,7 +54,6 @@
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 
-import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Vector;
 
@@ -63,7 +62,7 @@
  * Table. A selection on a newstitle will open it inside the Newstext panel.
  * 
  * @author <a href="mailto:bpasero at rssowl.org">Benjamin Pasero </a>
- * @version 1.2
+ * @version 1.1.3
  */
 public class NewsfeedPanel {
   private int[] columnWidths;
@@ -150,15 +149,15 @@
       MenuItem generateRTF = new MenuItem(labelMenu, SWT.NONE);
       generateRTF.setText(GUI.i18n.getTranslation("MENU_GENERATE_RTF_SELECTION") + "...");
       generateRTF.setEnabled(false);
-    }
 
-    /** Not enabled */
-    MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE);
-    generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "...");
-    generateHTML.setEnabled(false);
+      /** Not enabled */
+      MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE);
+      generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "...");
+      generateHTML.setEnabled(false);
 
-    /** Separator */
-    new MenuItem(labelMenu, SWT.SEPARATOR);
+      /** Separator */
+      new MenuItem(labelMenu, SWT.SEPARATOR);
+    }
 
     /** Not enabled */
     MenuItem markUnreadItem = new MenuItem(labelMenu, SWT.NONE);
@@ -262,15 +261,9 @@
 
     /** Container for the left header */
     Composite infoViewFormHeaderLeft = new Composite(infoViewForm, SWT.NONE);
-    infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(2, 5, 0, 5, 6, false));
+    infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(1, 5, 0));
     infoViewFormHeaderLeft.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE));
 
-    /** Info Icon */
-    Label infoIcon = new Label(infoViewFormHeaderLeft, SWT.NONE);
-    infoIcon.setImage(PaintShop.iconInfo);
-    infoIcon.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE));
-    infoIcon.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, true));
-
     /** Info Label */
     Label infoLabel = new Label(infoViewFormHeaderLeft, SWT.WRAP);
     infoLabel.setFont(FontShop.textFont);
@@ -361,9 +354,17 @@
       /** Create the Table Columns */
       NewsTable.fillTableColumns(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
 
+      /** Fill table with news - Use the existing column widhts */
+      if (columnWidths != null && columnWidths.length == newsItemInfos.size())
+        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths);
+
+      /** Fill table with news - Pack the table columns */
+      else
+        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
+
       /** Auto-Sort table if the settings tell so */
       if (GlobalSettings.autoSortNews) {
-        ArrayList sortOrder = GlobalSettings.sortOrder;
+        java.util.ArrayList sortOrder = GlobalSettings.sortOrder;
         TableData tableData = (TableData) newsTable.getData();
 
         /** Go through sortOrder from beginning to end */
@@ -372,35 +373,12 @@
 
           /** Sort Column if sortOrderItem is available */
           if (tableData.hasColumnSorter(sortOrderItem)) {
-
-            /** Sort based on the given TableColumn */
-            boolean ascending = tableData.getColumnSorter(sortOrderItem).sort(sortOrderItem);
-
-            /** Show a Sort Indicator inside the selected TableColumn */
-            if (!"TABLE_HEADER_STATUS".equals(sortOrderItem)) {
-              newsTable.setSortColumn(tableData.getColumn(sortOrderItem));
-              newsTable.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
-            }
-
-            /** Do not show the Indicator in the first, narrow Column */
-            else if (newsTable.getSortColumn() != null) {
-              newsTable.setSortDirection(SWT.NONE);
-              newsTable.setSortColumn(null);
-            }
-
+            tableData.getColumnSorter(sortOrderItem).widgetSelected(tableData.getColumn(sortOrderItem));
             break;
           }
         }
       }
 
-      /** Fill table with news - Use the existing column widhts */
-      if (columnWidths != null && columnWidths.length == newsItemInfos.size())
-        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths);
-
-      /** Fill table with news - Pack the table columns */
-      else
-        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
-
       /** Restore last selected news if available */
       if (selectedNews != null) {
         for (int a = 0; a < newsTable.getItemCount(); a++)
@@ -411,7 +389,7 @@
       }
     }
 
-    /** No news are there to display */
+    /** No news are there to GUI.display */
     else {
 
       /** Save some data in TabItem */
--- src/java/net/sourceforge/rssowl/controller/NewsTable.java~	2005-11-06 08:06:57.000000000 -0800
+++ src/java/net/sourceforge/rssowl/controller/NewsTable.java	2006-01-04 06:08:15.000000000 -0800
@@ -266,7 +266,7 @@
         /** Status Column is not resizable and has a ToolTip */
         if (isStatus) {
           column.setResizable(false);
-          column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a]));
+          // column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a]));
         }
 
         /** Apply sorting selection adapter */

rssowl-use-jce.patch:

--- NEW FILE rssowl-use-jce.patch ---
--- src/java/net/sourceforge/rssowl/util/CryptoManager.java.sav	2006-01-04 05:29:01.000000000 -0800
+++ src/java/net/sourceforge/rssowl/util/CryptoManager.java	2006-01-04 05:31:00.000000000 -0800
@@ -24,7 +24,9 @@
 
 package net.sourceforge.rssowl.util;
 
-import net.sourceforge.blowfishj.BlowfishEasy;
+import javax.crypto.*;
+import javax.crypto.spec.*;
+
 import net.sourceforge.rssowl.controller.GUI;
 import net.sourceforge.rssowl.util.shop.StringShop;
 
@@ -41,7 +43,7 @@
  * 
  * @author <a href="mailto:bpasero at rssowl.org">Benjamin Pasero </a>
  * @version 1.2
- */
+*/
 public class CryptoManager {
 
   /** Unique key for the proxy domain (NTLM only) */
@@ -56,15 +58,28 @@
   /** An instance of the CryptoManager */
   private static CryptoManager instance;
 
-  private BlowfishEasy blowFish;
+  private Cipher bfe;
+  private Cipher bfd;
+
   private Hashtable crypta;
 
   /**
    * Called from the static factory Method
    */
   private CryptoManager() {
-    blowFish = new BlowfishEasy(new char[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 });
-    loadData();
+    try
+      {
+	  bfe = Cipher.getInstance("Blowfish/ECB/PKCS7");
+	  bfd = Cipher.getInstance("Blowfish/ECB/PKCS7");
+	  SecretKeySpec skeyspec = new SecretKeySpec (new byte[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 },
+						      "Blowfish");
+	  bfe.init(Cipher.ENCRYPT_MODE, skeyspec);
+	  bfd.init(Cipher.DECRYPT_MODE, skeyspec);
+	  loadData();
+      }
+    catch (Exception _)
+      {
+      }
   }
 
   /**
@@ -176,9 +191,12 @@
    */
   private void decryptData() {
     Enumeration keys = crypta.keys();
-    while (keys.hasMoreElements()) {
-      String key = (String) keys.nextElement();
-      crypta.put(key, blowFish.decryptString((String) crypta.get(key)));
+    try {
+	while (keys.hasMoreElements()) {
+	    String key = (String) keys.nextElement();
+	    crypta.put(key, new String (bfd.doFinal((byte[]) crypta.get(key))));
+	}
+    } catch (Exception _) {
     }
   }
 
@@ -187,9 +205,12 @@
    */
   private void encryptData() {
     Enumeration keys = crypta.keys();
-    while (keys.hasMoreElements()) {
-      String key = (String) keys.nextElement();
-      crypta.put(key, blowFish.encryptString((String) crypta.get(key)));
+    try {
+	while (keys.hasMoreElements()) {
+	    String key = (String) keys.nextElement();
+	    crypta.put(key, bfe.doFinal(((String) crypta.get(key)).getBytes()));
+	}
+    } catch (Exception _) {
     }
   }
 


--- NEW FILE rssowl.desktop ---
[Desktop Entry]
Encoding=UTF-8
BinaryPattern=rssowl;
Name=RSSOwl
Comment=RSSOwl - Free RSS / RDF / Atom Newsreader
MimeType=
Exec=rssowl
GenericName=RSS & RDF Newsreader
Icon=rssowl
TerminalOptions=
Path=
Type=Application
Terminal=0
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Network;X-SuSE-RSS-News



--- NEW FILE rssowl.script ---
#!/bin/sh
#
# startscript for rssowl
#

# This makes the embedded browser work.
if [ -z "$MOZILLA_FIVE_HOME" ]; then
  XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1)
  export MOZILLA_FIVE_HOME=$(dirname $XPCOM)
fi
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME

exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.1.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"


--- NEW FILE rssowl.spec ---
%define name    rssowl
%define version 1.2
%define release 7%{?dist}
%define jdk     java

Name:           %name
Summary:        An RSS, RDF and Atom Newsreader
Version:        %version
Release:        %release
License:        CPL
Group:          Applications/Internet
URL:            http://www.rssowl.org
Source0:        rssowl_1_2_src_clean.tar.gz
Source1:        %{name}.script
Source2:        %{name}.desktop
Patch0:         %{name}-use-jce.patch
Patch1:         %{name}-build0.patch
Patch2:         %{name}-swt31.patch
Patch3:         %{name}-build1.patch
Patch4:         %{name}-JessieX509.patch
Patch5:         %{name}-browser.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       jre >= 1.4.2-
BuildRequires:  java-sdk >= 1.4.2
BuildRequires:  ImageMagick
BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
BuildRequires:  libgconf-java
BuildRequires:  ant, jpackage-utils >= 1.5
BuildRequires:	dos2unix
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
Requires: 	itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
Requires:  	libgconf-java

%description
RSSOwl is a RSS / RDF / Atom Newsreader written in Java using SWT as
fast graphic library. Read News in a tabfolder, save favorites in
categories, Export to PDF / RTF / HTML / OPML, Import Feeds from OPML,
perform fulltext-search, use the integrated browser. Please contact
bpasero at rssowl.org if you have any questions or problems regarding
this version.

%description -l de
RSSOwl ist ein RSS / RDF / Atom Newsreader in Java mit SWT als
GUI-Bibliothek. Einige der Features sind Export von Nachrichten nach
PDF / RTF / HTML, Import / Export mit OPML, Volltextsuche und der
integrierte Browser. Bei Fragen oder Problemen mit dieser Version
bitte an bpasero at rssowl.org schreiben.

%prep
%setup -q -n %{name}_1_2_src_clean
%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
# This package doesn't contain any MPL licensed code.
rm doc/mpl-v11.txt

%build
build-jar-repository lib swt-gtk-3.1.1 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar lib
ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar lib
cd src
ant deploy_linux

%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install -m 644 rssowl.jar $RPM_BUILD_ROOT%{_javadir}/rssowl.jar

# FIXME:  do these really need to be converted?  Couldn't they be shipped as PNGs?
convert img/16x16.gif img/16x16.png
convert img/24x24.gif img/24x24.png
convert img/32x32.gif img/32x32.png
# FIXME:  this is ugly :)
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -m 644 img/32x32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/rssowl.png
install -m 644 img/16x16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/rssowl.png
install -m 644 img/24x24.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/rssowl.png
install -m 644 img/32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/rssowl.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications

mkdir -p $RPM_BUILD_ROOT/%{_bindir}
cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
sed --in-place "s:/usr/lib:%{_libdir}:" \
  $RPM_BUILD_ROOT%{_bindir}/%{name}
sed --in-place "s:/usr/share:%{_datadir}:" \
  $RPM_BUILD_ROOT%{_bindir}/%{name}
chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}

dos2unix doc/tutorial/en/*.html
dos2unix doc/tutorial/en/styles/*
dos2unix doc/*.{xml,html,txt,template}

aot-compile-rpm

%post -p %{_bindir}/rebuild-gcj-db

%postun -p %{_bindir}/rebuild-gcj-db

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%doc doc/*
%{_javadir}/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/icons/*
%{_bindir}/%{name}
%{_libdir}/gcj/%{name}

%changelog
* Mon Jan 16 2006 Anthony Green <green at redhat.com> 1.2-7
- Word-wrapped descriptions.
- Set Group to Applications/Internet.
- Cleaned up changelog changelog entries.
- Improved Summary.
- Converted text files to "unix" with dos2unix.
- Fixed documentation and jar file locations.
- Update rssowl accordingly.

* Mon Jan 16 2006 Anthony Green <green at redhat.com> 1.2-6
- Add Requires for libgconf-java (thanks Andrew Overholt!)

* Fri Jan 13 2006 Anthony Green <green at redhat.com> 1.2-5
- Remove debugging patches.
- Use java-gnome API to find preferred browser.

* Thu Jan  5 2006 Anthony Green <green at redhat.com> 1.2-4
- Remove MPL license text (this was for itext.jar, which is packaged
  separately now.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> 1.2-2
- Use JessieX509 instead of SunX509.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> 1.2-1
- Upgrade to RSSOwl 1.2.
- Many new related patches.
- Remove utf8 patch.
- Use clean sources (no precompiled .class files in jars)
- Build as native code.
- Merge overholt's spec file with Kay's.

* Wed Nov 09 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- change buildrequires to java-sdk >= 1.4.2 and change the startscript to rssowl.sh

* Wed Jul 27 2005 Andrew Overholt <overholt at redhat.com> 1.1.3-0.2
- Include rssowl.script and rssowl.desktop as separate files.
- Use Robin Green's work in /usr/bin/eclipse to make internal browser work.
- Add native compilation (but leave unused until we get all dependencies sorted
  out).

* Mon Jul 25 2005 Andrew Overholt <overholt at redhat.com> 1.1.3-0.1
- New upstream version.
- Update build patch and use new deploy task.

* Wed Jul 06 2005 Andrew Overholt <overholt at redhat.com> 1.1.2-0.2
- First go at some cleanups.
- Patch around a libgcj issue with "utf8" vs. "utf-8".

* Sun Jun 12 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- change the menu-category from usenet-news to rss-news
* Wed May 25 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- Little modifications at the startscript, rssowl accepts shell-arguments
* Sun Mar 22 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- Add "AutoReqProv: no" and change jdk-requirements
* Sun Mar 20 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- new jdk-requirements
* Wed Mar 07 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- change the menu-category of rssowl from network to news
* Wed Aug 18 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- swt*.jars are not required in the bin-rpm
* Wed Aug 18 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- libs will copied to the rssowl-dir now
* Tue Aug 10 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- some little changes
* Sat Aug 07 2004 Manfred Tremmel <Manfred.Tremmel at iiv.de>
- some rework
* Tue Aug 03 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- first release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 14:14:09 -0000	1.1
+++ .cvsignore	17 Jan 2006 14:16:01 -0000	1.2
@@ -0,0 +1 @@
+rssowl_1_2_src_clean.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 14:14:09 -0000	1.1
+++ sources	17 Jan 2006 14:16:01 -0000	1.2
@@ -0,0 +1 @@
+d440e36983de3dba0239b4f1020f0837  rssowl_1_2_src_clean.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 14:21:14 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:21:14 -0500
Subject: rpms/ttf2pt1/FC-4 ttf2pt1.spec,1.5,1.6
Message-ID: <200601171421.k0HELmjF018153@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18134

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
- add %{?dist} tag




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/FC-4/ttf2pt1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ttf2pt1.spec	22 May 2005 22:27:18 -0000	1.5
+++ ttf2pt1.spec	17 Jan 2006 14:21:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release: 4
+Release:        5%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
+- add %%{?dist} tag
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 3.4.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 14:23:17 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:23:17 -0500
Subject: owners owners.list,1.541,1.542
Message-ID: <200601171423.k0HENq6C018230@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18201

Modified Files:
	owners.list 
Log Message:
Add rssowl.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -r1.541 -r1.542
--- owners.list	17 Jan 2006 14:02:31 -0000	1.541
+++ owners.list	17 Jan 2006 14:23:16 -0000	1.542
@@ -1105,6 +1105,7 @@
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 14:31:49 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:31:49 -0500
Subject: rpms/ttf2pt1/devel ttf2pt1.spec,1.5,1.6
Message-ID: <200601171432.k0HEWLGn018312@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18295

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
- add %{?dist} tag




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/devel/ttf2pt1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ttf2pt1.spec	22 May 2005 22:27:18 -0000	1.5
+++ ttf2pt1.spec	17 Jan 2006 14:31:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release: 4
+Release:        5%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
+- add %%{?dist} tag
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 3.4.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:01:58 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:01:58 -0500
Subject: rpms/t1lib/devel t1lib.spec,1.8,1.9
Message-ID: <200601171502.k0HF2UgO020142@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20110

Modified Files:
	t1lib.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
- %ghost-ing config files, also making sure they're regenerated




Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- t1lib.spec	17 Jan 2006 14:12:23 -0000	1.8
+++ t1lib.spec	17 Jan 2006 15:01:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -75,9 +75,7 @@
 
 %post
 /sbin/ldconfig
-if [ "$1" = "1" ]; then
-  /usr/sbin/t1libconfig --force > /dev/null
-fi
+%{_sbindir}/t1libconfig --force > /dev/null
 
 %postun -p /sbin/ldconfig
 
@@ -86,8 +84,8 @@
 %defattr(-,root,root,-)
 %doc Changes LGPL LICENSE README
 %dir %{_sysconfdir}/t1lib
-%config %{_sysconfdir}/t1lib/t1lib.config
-%config %{_sysconfdir}/t1lib/FontDatabase
+%ghost %{_sysconfdir}/t1lib/t1lib.config
+%ghost %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_mandir}/man*/*
@@ -102,6 +100,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
+- %%ghost-ing config files, also making sure they're regenerated
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:06:06 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:06:06 -0500
Subject: rpms/t1lib/FC-4 t1lib.spec,1.7,1.8
Message-ID: <200601171506.k0HF6dho020241@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20219

Modified Files:
	t1lib.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
- %ghost-ing config files, also making sure they're regenerated




Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/t1lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- t1lib.spec	17 Jan 2006 13:40:30 -0000	1.7
+++ t1lib.spec	17 Jan 2006 15:06:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -75,9 +75,7 @@
 
 %post
 /sbin/ldconfig
-if [ "$1" = "1" ]; then
-  /usr/sbin/t1libconfig --force > /dev/null
-fi
+%{_sbindir}/t1libconfig --force > /dev/null
 
 %postun -p /sbin/ldconfig
 
@@ -86,8 +84,8 @@
 %defattr(-,root,root,-)
 %doc Changes LGPL LICENSE README
 %dir %{_sysconfdir}/t1lib
-%config %{_sysconfdir}/t1lib/t1lib.config
-%config %{_sysconfdir}/t1lib/FontDatabase
+%ghost %{_sysconfdir}/t1lib/t1lib.config
+%ghost %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_mandir}/man*/*
@@ -102,6 +100,12 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
+- %%ghost-ing config files, also making sure they're regenerated
+
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
 - remove unneeded %%{_datadir}/t1lib contents
 - cleanup



From fedora-extras-commits at redhat.com  Tue Jan 17 15:19:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Jan 2006 10:19:37 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.11, 
	1.12
Message-ID: <200601171520.k0HFKATC020496@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20442

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-4
- Rebuild for evolution-data-server dep.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- contact-lookup-applet.spec	17 Aug 2005 00:06:51 -0000	1.11
+++ contact-lookup-applet.spec	17 Jan 2006 15:19:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-4
+- Rebuild for evolution-data-server dep.
+
 * Tue Aug 16 2005 Brian Pepple <bdpepple at ameritech.net> - 0.13-3
 - Rebuild for cairo dep.
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:25:22 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Jan 2006 10:25:22 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.12, 
	1.13
Message-ID: <200601171525.k0HFPsXx020590@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20565

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-5
- Rebuild for evolution-data-server dep.
- Bump.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- contact-lookup-applet.spec	17 Jan 2006 15:19:37 -0000	1.12
+++ contact-lookup-applet.spec	17 Jan 2006 15:25:22 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,8 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
-* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-4
+* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-5
 - Rebuild for evolution-data-server dep.
+- Bump.
 
 * Tue Aug 16 2005 Brian Pepple <bdpepple at ameritech.net> - 0.13-3
 - Rebuild for cairo dep.



From fedora-extras-commits at redhat.com  Tue Jan 17 15:32:07 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:32:07 -0500
Subject: rpms/ttf2pt1/devel ttf2pt1.spec,1.6,1.7
Message-ID: <200601171532.k0HFWdqD020683@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20666

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
- rebuild




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/devel/ttf2pt1.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ttf2pt1.spec	17 Jan 2006 14:31:49 -0000	1.6
+++ ttf2pt1.spec	17 Jan 2006 15:32:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
 - add %%{?dist} tag
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:34:45 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:34:45 -0500
Subject: rpms/ttf2pt1/FC-4 ttf2pt1.spec,1.6,1.7
Message-ID: <200601171535.k0HFZH8R020769@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20712

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
- rebuild




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/FC-4/ttf2pt1.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ttf2pt1.spec	17 Jan 2006 14:21:14 -0000	1.6
+++ ttf2pt1.spec	17 Jan 2006 15:34:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
 - add %%{?dist} tag
 



From fedora-extras-commits at redhat.com  Tue Jan 17 16:12:13 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 17 Jan 2006 11:12:13 -0500
Subject: fedora-security/audit fc4,1.129,1.130 fc5,1.39,1.40
Message-ID: <200601171612.k0HGCDwE022680@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22653

Modified Files:
	fc4 fc5 
Log Message:
Deal with the latest batch of CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- fc4	16 Jan 2006 18:22:30 -0000	1.129
+++ fc4	17 Jan 2006 16:12:05 -0000	1.130
@@ -3,9 +3,9 @@
 
 ** are items that need attention
 
-CVE-2006-0208 ** php
-CVE-2006-0207 ** php
-CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
+CVE-2006-0208 VULNERALBE (php) bz#178036
+CVE-2006-0207 VULNERABLE (php) bz#178044
+CVE-2006-0200 version (aaph, 5.1.0 5.1.1 only)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- fc5	16 Jan 2006 18:22:30 -0000	1.39
+++ fc5	17 Jan 2006 16:12:05 -0000	1.40
@@ -15,9 +15,9 @@
 
 ** are items that need attention
 
-CVE-2006-0208 ** php
-CVE-2006-0207 ** php
-CVE-2006-0200 ** php (5.1.0, 5.1.1 only)
+CVE-2006-0208 version (php, fixed 5.1.2)
+CVE-2006-0207 version (php, fixed 5.1.2)
+CVE-2006-0200 version (php, fixed 5.1.2)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0144 ** php-pear
 CVE-2006-0097 ignore (php) Windows only



From fedora-extras-commits at redhat.com  Tue Jan 17 16:36:04 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 17 Jan 2006 11:36:04 -0500
Subject: rpms/digikam/devel digikam.spec,1.18,1.19
Message-ID: <200601171636.k0HGabMc022842@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22825

Modified Files:
	digikam.spec 
Log Message:
- Remove redundant BuildRequires (bug #178031)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- digikam.spec	16 Jan 2006 12:34:37 -0000	1.18
+++ digikam.spec	17 Jan 2006 16:36:04 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,8 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	libXt-devel libtiff-devel libidn-devel libacl-devel gettext
-BuildRequires:	libart_lgpl-devel gamin-devel
+BuildRequires:	gettext libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -47,7 +46,8 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -118,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
+- Remove redundant BuildRequires (bug #178031)
+
 * Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
 - Remove --disable-dependency-tracking
 



From fedora-extras-commits at redhat.com  Tue Jan 17 17:01:22 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue, 17 Jan 2006 12:01:22 -0500
Subject: common tobuild,1.2244,NONE
Message-ID: <200601171701.k0HH1OQo024626@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24617

Removed Files:
	tobuild 
Log Message:
Remove unused file


--- tobuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 17:11:37 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue, 17 Jan 2006 12:11:37 -0500
Subject: rpms/bmp/devel bmp.spec,1.10,1.11
Message-ID: <200601171712.k0HHCA69024771@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24717

Modified Files:
	bmp.spec 
Log Message:
test commit


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bmp.spec	27 Nov 2005 18:18:48 -0000	1.10
+++ bmp.spec	17 Jan 2006 17:11:17 -0000	1.11
@@ -105,7 +105,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications



From fedora-extras-commits at redhat.com  Tue Jan 17 17:11:17 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 17 Jan 2006 12:11:17 -0500
Subject: fedora-security/audit fc5,1.40,1.41
Message-ID: <200601171711.k0HHBHMe024724@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24687

Modified Files:
	fc5 
Log Message:
PHP has been upgraded in FC5T2.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- fc5	17 Jan 2006 16:12:05 -0000	1.40
+++ fc5	17 Jan 2006 17:11:08 -0000	1.41
@@ -15,9 +15,9 @@
 
 ** are items that need attention
 
-CVE-2006-0208 version (php, fixed 5.1.2)
-CVE-2006-0207 version (php, fixed 5.1.2)
-CVE-2006-0200 version (php, fixed 5.1.2)
+CVE-2006-0208 VULNERABLE (php)
+CVE-2006-0207 VULNERABLE (php)
+CVE-2006-0200 VULNERABLE (php)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0144 ** php-pear
 CVE-2006-0097 ignore (php) Windows only



From fedora-extras-commits at redhat.com  Tue Jan 17 17:37:43 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Tue, 17 Jan 2006 12:37:43 -0500
Subject: rpms/lzo/devel lzo.spec,1.8,1.9
Message-ID: <200601171738.k0HHcFSL025111@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/lzo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25087

Modified Files:
	lzo.spec 
Log Message:
lzo: rebuild for gcc 4.1


Index: lzo.spec
===================================================================
RCS file: /cvs/extras/rpms/lzo/devel/lzo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lzo.spec	22 May 2005 23:48:05 -0000	1.8
+++ lzo.spec	17 Jan 2006 17:37:43 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	Data compression library with very fast (de)compression
 Name:		lzo
 Version:	1.08
-Release: 4
+Release:	5%{?dist}
 
 License:	GPL
 Group:		System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_libdir}/liblzo.a
 
 %changelog
+* Tue Jan 17 2006 Dams <anvil[AT]livna.org> - 1.08-5.fc5
+- Bumped release for gcc 4.1 rebuild
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.08-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 17:49:46 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 12:49:46 -0500
Subject: rpms/gnotime/devel gnotime-qof-0.6.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gnotime.spec, 1.12, 1.13 sources, 1.2,
	1.3 gnotime-desktop.patch, 1.1,
	NONE gnotime-gtkhtml3.8-qof.patch, 1.1,
	NONE gnotime-help-error.patch, 1.1, NONE gnotime-help.patch, 1.1,
	NONE gnotime-idle.patch, 1.1, NONE gnotime-popup-menus.patch,
	1.1, NONE gnotime-qof-include.patch, 1.1,
	NONE gnotime-separate-timeouts.patch, 1.1,
	NONE gnotime-wordwrap.patch, 1.1, NONE gtt_restartwin.png, 1.1,
	NONE gtt_startprojwin.png, 1.1, NONE
Message-ID: <200601171750.k0HHoIam025443@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25405

Modified Files:
	.cvsignore gnotime.spec sources 
Added Files:
	gnotime-qof-0.6.patch 
Removed Files:
	gnotime-desktop.patch gnotime-gtkhtml3.8-qof.patch 
	gnotime-help-error.patch gnotime-help.patch gnotime-idle.patch 
	gnotime-popup-menus.patch gnotime-qof-include.patch 
	gnotime-separate-timeouts.patch gnotime-wordwrap.patch 
	gtt_restartwin.png gtt_startprojwin.png 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
- Rebuild against new qof-0.6.1.
- Patch to fix the build for the qof-0.6 series.


gnotime-qof-0.6.patch:

--- NEW FILE gnotime-qof-0.6.patch ---
Index: gnotime-2.2.2/configure.in
===================================================================
--- gnotime-2.2.2.orig/configure.in
+++ gnotime-2.2.2/configure.in
@@ -52,7 +52,6 @@ LIBXML2_REQUIRED=2.0.0
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
 dnl Doesn't compile w/ qof-0.5.0
 LIBQOF_REQUIRED_MIN=0.6.0
-LIBQOF_REQUIRED_MAX=0.6.0
 
 
 dnl *******************************
@@ -169,7 +168,7 @@ AC_HELP_STRING([--with-system-qof],
 
 [
 if test x$withval = "xyes"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic.
@@ -180,8 +179,8 @@ else
 fi
 ],
 [
-if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2004 17:34:07 -0000	1.2
+++ .cvsignore	17 Jan 2006 17:49:46 -0000	1.3
@@ -1 +1 @@
-gnotime-2.2.1.tar.gz
+gnotime-2.2.2.tar.gz


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnotime.spec	18 Aug 2005 17:28:27 -0000	1.12
+++ gnotime.spec	17 Jan 2006 17:49:46 -0000	1.13
@@ -1,36 +1,13 @@
 Name:           gnotime
-Version:        2.2.1
-Release:        11%{?dist}
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://gttr.sourceforge.net/
 Source0:        http://dl.sf.net/gttr/%{name}-%{version}.tar.gz
-# Images to go with the help files.
-Source1:        http://www.tiki-lounge.com/~toshio/fedora/gtt_restartwin.png
-Source2:        http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
-# Simple patch to make the .desktop more complete
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
-# Combined patch allowing builds with gtkhtml3.0 through 3.8 and
-# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.8-qof.patch
-# Fixes includes of qof headers in source files.
-Patch2:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
-# Fixes the idle timer for kernel 2.6.
-Patch3:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-idle.patch
-# Fixes problems with calls to gnome_help
-Patch4:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help.patch
-# Fixes problems with popup menus failing to pass data arguments to callbacks
-Patch5:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-popup-menus.patch
-# Fixes problem with gnome_help being invoked when the toplevel is unknown
-Patch6:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help-error.patch
-# Add wordwrapping to textviews
-Patch7:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
-# Adapt a patch from the gnotime issue tracker to separate the idle timeout
-# from the no project running timeout.
-Patch8:		http://www.tiki-lounge.com/~toshio/fedora/gnotime-separate-timeouts.patch
-
+Patch0:		gnotime-qof-0.6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
@@ -38,10 +15,11 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  qof-devel >= 0.5.0
-BuildRequires:  qof-devel < 0.6.0
-# Because we modify configure.in, we need to BR the auto* tools.
-BuildRequires:  libtool
+BuildRequires:  qof-devel >= 0.6.0
+# Patch0 modifies configure.in so we need autoconf
+BuildRequires: autoconf
+# To get rid of rpath, we need to use a fedora libtool
+BuildRequires: libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -61,30 +39,18 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
-
-cp $RPM_SOURCE_DIR/gtt_restartwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-cp $RPM_SOURCE_DIR/gtt_startprojwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-
-# Copy the images to the correct position
+%patch0 -p1
 
 %build
-autoreconf --install --force
-%GNUconfigure
-make
+autoconf
+%configure
+# Fix hardcoded rpath by using Fedora libtool
+make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Gnotime puts it's locale translations into gnotime-2.0.mo but it's gnome
@@ -110,9 +76,6 @@
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
-  # If applicable:
-  # gconftool-2 --makefile-uninstall-rule \
-  #  %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :
   killall -HUP gconfd-2 || :
   unset GCONF_CONFIG_SOURCE
 fi
@@ -148,6 +111,17 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
+- Rebuild against new qof-0.6.1.
+- Patch to fix the build for the qof-0.6 series.
+
+* Fri Sep 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-0
+- Update to 2.2.2.
+- Remove all patches as they've been merged upstream.
+- Build with internal qof as gnotime now depends on 0.6.0 which has not yet
+  been released.  Only build for devel/testing until we can use a released
+  version of qof.
+
 * Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-11
 - Fix the patch level on the new gtkhtml3 patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2004 17:34:07 -0000	1.2
+++ sources	17 Jan 2006 17:49:46 -0000	1.3
@@ -1 +1 @@
-e2aad191b62b41da7f2176a028f1aaf9  gnotime-2.2.1.tar.gz
+8c05509f57a278de03a97fae110de3f5  gnotime-2.2.2.tar.gz


--- gnotime-desktop.patch DELETED ---


--- gnotime-gtkhtml3.8-qof.patch DELETED ---


--- gnotime-help-error.patch DELETED ---


--- gnotime-help.patch DELETED ---


--- gnotime-idle.patch DELETED ---


--- gnotime-popup-menus.patch DELETED ---


--- gnotime-qof-include.patch DELETED ---


--- gnotime-separate-timeouts.patch DELETED ---


--- gnotime-wordwrap.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 17:54:10 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:54:10 -0500
Subject: rpms/cook/devel .cvsignore, 1.3, 1.4 cook.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200601171754.k0HHsgvo025601@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25570

Modified Files:
	.cvsignore cook.spec sources 
Log Message:
new version 2.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:14:48 -0000	1.3
+++ .cvsignore	17 Jan 2006 17:54:10 -0000	1.4
@@ -1 +1 @@
-cook-2.25.tar.gz
+cook-2.26.tar.gz


Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/cook.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cook.spec	25 May 2005 21:37:18 -0000	1.9
+++ cook.spec	17 Jan 2006 17:54:10 -0000	1.10
@@ -1,13 +1,13 @@
 Name:		cook
-Version:	2.25
-Release: 4
+Version:	2.26
+Release:	1%{?dist}
 
 Summary: 	File construction tool
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
-Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.25.tar.gz
+Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
 Patch0: cook-2.25-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	groff, bison, gettext, sharutils, m4
@@ -20,9 +20,11 @@
 creating any file, such as include files.  The cook program provides a
 mechanism to define these.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
+
 
 %build
 %configure
@@ -31,6 +33,7 @@
     gzip -c $f > $f.gz
 done
 
+
 %install
 rm -fr ${RPM_BUILD_ROOT}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -40,12 +43,15 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 rm -fr ${RPM_BUILD_ROOT}%{_datadir}/cook/en
 
+
 %check
 make sure
 
+
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr (-,root,root,-)
 %{_bindir}/*
@@ -55,7 +61,11 @@
 %doc lib/en/*.ps.gz
 %doc README LICENSE
 
+
 %changelog
+* Tue Jan 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.26-1
+- new version 2.26
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.25-4
 - fix build with gcc4 (mschwendt, #156203)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 13:14:48 -0000	1.3
+++ sources	17 Jan 2006 17:54:10 -0000	1.4
@@ -1 +1 @@
-fd116da31c59c04abe41519fc131b504  cook-2.25.tar.gz
+6cfae86ca89dcfcbd6483aa586a5ac72  cook-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 17:55:41 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:55:41 -0500
Subject: rpms/cook/devel cook.spec,1.10,1.11
Message-ID: <200601171756.k0HHuDiK025646@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25621

Modified Files:
	cook.spec 
Log Message:



Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/cook.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cook.spec	17 Jan 2006 17:54:10 -0000	1.10
+++ cook.spec	17 Jan 2006 17:55:41 -0000	1.11
@@ -8,7 +8,6 @@
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
 Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
-Patch0: cook-2.25-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	groff, bison, gettext, sharutils, m4
 Provides:	perl(host_lists.pl)
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .gcc4
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 17 17:58:48 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:58:48 -0500
Subject: rpms/cook/FC-3 .cvsignore, 1.3, 1.4 cook.spec, 1.5, 1.6 sources, 1.3,
	1.4
Message-ID: <200601171759.k0HHxKSG025769@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731/FC-3

Modified Files:
	.cvsignore cook.spec sources 
Log Message:
new version 2.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:14:48 -0000	1.3
+++ .cvsignore	17 Jan 2006 17:58:48 -0000	1.4
@@ -1 +1 @@
-cook-2.25.tar.gz
+cook-2.26.tar.gz


Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-3/cook.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cook.spec	12 Feb 2005 13:14:48 -0000	1.5
+++ cook.spec	17 Jan 2006 17:58:48 -0000	1.6
@@ -1,15 +1,15 @@
 Name:		cook
-Version:	2.25
-Release:	1
-Epoch:		0
-Summary: 	A file construction tool
+Version:	2.26
+Release:	1%{?dist}
+
+Summary: 	File construction tool
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
-Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.25.tar.gz
+Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  groff, bison, gettext, sharutils, m4
+BuildRequires:	groff, bison, gettext, sharutils, m4
 Provides:	perl(host_lists.pl)
 
 %description
@@ -54,6 +54,9 @@
 %doc README LICENSE
 
 %changelog
+* Tue Jan 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.26-1
+- new version 2.26
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:2.25-1
 - New Version 2.25
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 13:14:48 -0000	1.3
+++ sources	17 Jan 2006 17:58:48 -0000	1.4
@@ -1 +1 @@
-fd116da31c59c04abe41519fc131b504  cook-2.25.tar.gz
+6cfae86ca89dcfcbd6483aa586a5ac72  cook-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 17:58:54 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:58:54 -0500
Subject: rpms/cook/FC-4 .cvsignore, 1.3, 1.4 cook.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200601171759.k0HHxQrJ025774@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731/FC-4

Modified Files:
	.cvsignore cook.spec sources 
Log Message:
new version 2.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:14:48 -0000	1.3
+++ .cvsignore	17 Jan 2006 17:58:54 -0000	1.4
@@ -1 +1 @@
-cook-2.25.tar.gz
+cook-2.26.tar.gz


Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-4/cook.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cook.spec	25 May 2005 21:37:18 -0000	1.9
+++ cook.spec	17 Jan 2006 17:58:54 -0000	1.10
@@ -1,14 +1,13 @@
 Name:		cook
-Version:	2.25
-Release: 4
+Version:	2.26
+Release:	1%{?dist}
 
 Summary: 	File construction tool
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
-Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.25.tar.gz
-Patch0: cook-2.25-gcc4.patch
+Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	groff, bison, gettext, sharutils, m4
 Provides:	perl(host_lists.pl)
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
 
 %build
 %configure
@@ -56,6 +54,9 @@
 %doc README LICENSE
 
 %changelog
+* Tue Jan 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.26-1
+- new version 2.26
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.25-4
 - fix build with gcc4 (mschwendt, #156203)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 13:14:48 -0000	1.3
+++ sources	17 Jan 2006 17:58:54 -0000	1.4
@@ -1 +1 @@
-fd116da31c59c04abe41519fc131b504  cook-2.25.tar.gz
+6cfae86ca89dcfcbd6483aa586a5ac72  cook-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 18:07:27 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 17 Jan 2006 13:07:27 -0500
Subject: rpms/mail-notification/devel mail-notification-evolution.patch, 1.1,
	1.2 mail-notification.spec, 1.14, 1.15
Message-ID: <200601171808.k0HI8LOY027609@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27585

Modified Files:
	mail-notification-evolution.patch mail-notification.spec 
Log Message:
fixes for evolution >= 2.5

mail-notification-evolution.patch:

Index: mail-notification-evolution.patch
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-evolution.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mail-notification-evolution.patch	22 Sep 2005 17:27:33 -0000	1.1
+++ mail-notification-evolution.patch	17 Jan 2006 18:07:25 -0000	1.2
@@ -17,13 +17,13 @@
  elif test -n "$PKG_CONFIG"; then
 -	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
 -  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
-+		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
++		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null`
  	else
  		pkg_failed=yes
  	fi
@@ -33,13 +33,13 @@
  elif test -n "$PKG_CONFIG"; then
 -	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
 -  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
-+		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
++		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null`
  	else
  		pkg_failed=yes
  	fi
@@ -48,7 +48,7 @@
  
  if test $pkg_failed = yes; then
 -	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"`
-+	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.4 $evolution_plugin_min_version"`
++	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.6 $evolution_plugin_min_version"`
  	# Put the nasty error message in config.log where it belongs
  	echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5
  
@@ -57,7 +57,7 @@
  	echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
  echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
 -	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null`
-+	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.4 2>/dev/null`
++	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.6 2>/dev/null`
  	if test -n "$evolution_plugindir"; then
  		echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
  echo "${ECHO_T}$evolution_plugindir" >&6


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mail-notification.spec	17 Jan 2006 10:14:21 -0000	1.14
+++ mail-notification.spec	17 Jan 2006 18:07:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -25,7 +25,8 @@
 BuildRequires:  libgcrypt-devel >= 1.2.0
 BuildRequires:  libicu-devel >= 2.6
 BuildRequires:  gob2
-BuildRequires:  evolution-devel evolution-data-server-devel
+BuildRequires:  evolution-devel >= 2.5
+BuildRequires:  evolution-data-server-devel >= 1.5
 
 
 Requires(post):   GConf2
@@ -49,7 +50,7 @@
 
 %build
 export LDFLAGS="-Wl,--export-dynamic"
-%configure --disable-schemas-install  --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.4
+%configure --disable-schemas-install  --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.6
 make %{?_smp_mflags}
 
 
@@ -110,13 +111,16 @@
 %{_datadir}/applications/fedora-mail-notification.desktop
 %{_datadir}/applications/fedora-mail-notification-properties.desktop
 %{_datadir}/gnome/help/mail-notification/
-%{_libdir}/evolution/2.4/plugins/*
+%{_libdir}/evolution/2.6/plugins/*
 %dir %{_datadir}/omf/mail-notification/
 %{_datadir}/omf/mail-notification/mail-notification-C.omf
 %{_datadir}/pixmaps/mail-notification.png
 
 
 %changelog
+* Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-9
+- fixes for evolution >= 2.5
+
 * Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-8
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan 17 18:35:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 13:35:40 -0500
Subject: rpms/gkrellm-themes/devel .cvsignore, 1.2, 1.3 gkrellm-themes.spec, 
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200601171836.k0HIaDbG027807@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gkrellm-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786

Modified Files:
	.cvsignore gkrellm-themes.spec sources 
Log Message:
* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.9-3
- Switch to latest (2003-01-29) muhri.net tarball.
- Remove more backup etc junk from installed files.
- Convert specfile to UTF-8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:25:55 -0000	1.2
+++ .cvsignore	17 Jan 2006 18:35:40 -0000	1.3
@@ -1 +1 @@
-gkrellm-themes.tar.bz2
+GKrellM-Skins.tar.gz


Index: gkrellm-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm-themes.spec	6 Apr 2005 22:11:38 -0000	1.6
+++ gkrellm-themes.spec	17 Jan 2006 18:35:40 -0000	1.7
@@ -1,15 +1,14 @@
 Summary:        Some themes for the GNU Krell Monitor
 Name:           gkrellm-themes
 Version:        2.1.9
-Release:        2
+Release:        3
 
 License:        GPL
 Group:          Applications/System
-Source:         gkrellm-themes.tar.bz2
+Source:         http://muhri.net/gkrellm/GKrellM-Skins.tar.gz
 URL:            http://muhri.net/gkrellm/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       gkrellm >= 2.0.0
-BuildRequires:  /usr/bin/find
 BuildArch:      noarch
 
 %description
@@ -24,7 +23,9 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n GKrellM-skins
+# dedupe
+rm -f aliens.tgz cyrus.gkrellm.tar.gz glass.gkrellm.tar.gz IReX.tar.gz
 
 
 %build
@@ -33,10 +34,13 @@
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes
-cd %{buildroot}%{_datadir}/gkrellm2/themes
-find $RPM_BUILD_DIR/%{name} -name "*gz" -exec tar -xzvf {} \;
-find . -name ".xvpics" | xargs rm -rf
-find . -type d -name "CVS" | xargs rm -rf
+for file in *gz ; do
+    %{__tar} zxC %{buildroot}%{_datadir}/gkrellm2/themes -f $file \
+        --exclude CVS \
+        --exclude "*~" \
+        --exclude "*.swp" \
+        --exclude .xvpics
+done
 
 
 %clean
@@ -49,10 +53,15 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.9-3
+- Switch to latest (2003-01-29) muhri.net tarball.
+- Remove more backup etc junk from installed files.
+- Convert specfile to UTF-8.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.9-2
 - rebuilt
 
-* Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1
+* Tue Apr  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1
 - Don't install CVS dirs.
 - Use fixed defattrs.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:25:55 -0000	1.2
+++ sources	17 Jan 2006 18:35:40 -0000	1.3
@@ -1 +1 @@
-d374f2990e3ecaadbbd288dc40d4e6a1  gkrellm-themes.tar.bz2
+17c88c10cc320db2036720c90887690a  GKrellM-Skins.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 19:50:18 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 14:50:18 -0500
Subject: rpms/python-docutils/FC-4 .cvsignore, 1.3, 1.4 python-docutils.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601171950.k0HJooOw029910@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29880

Modified Files:
	.cvsignore python-docutils.spec sources 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
- Update to 0.4.
- Scripted the listing of files in the python module.
- Add a missingok requirement on python-imaging as docutils can make use of
  it when converting to formats that have images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jun 2005 23:04:22 -0000	1.3
+++ .cvsignore	17 Jan 2006 19:50:17 -0000	1.4
@@ -1 +1 @@
-docutils-0.3.9.tar.gz
+docutils-0.4.tar.gz


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-4/python-docutils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-docutils.spec	7 Jun 2005 23:04:22 -0000	1.4
+++ python-docutils.spec	17 Jan 2006 19:50:17 -0000	1.5
@@ -1,25 +1,23 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?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 srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.3.9
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
-License:        Public domain, BSD, PSF, GPL - see COPYING.txt
+License:        Public Domain, BSD, Python License, GPL - see COPYING.txt
 URL:            http://docutils.sourceforge.net
 Source0:	http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python-devel
+Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
-Requires:	python-abi = %{pyver}
 
 %description
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -35,15 +33,18 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 
+# Remove a shebang from one of the library files
+sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
+
 %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
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 	
-for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
+for file in %{buildroot}/%{_bindir}/*.py; do
 	mv $file `dirname $file`/`basename $file .py`
 done
 
@@ -55,7 +56,7 @@
 # it manually here.
 file=roman.py
 extradest=%{python_sitelib}
-fullextradest=$RPM_BUILD_ROOT/$extradest
+fullextradest=%{buildroot}/$extradest
 install -m 0644 extras/$file $fullextradest
 %{__python} -c "import py_compile; py_compile.compile(\
     '$fullextradest/$file', \
@@ -65,42 +66,34 @@
     '$fullextradest/$file', \
     '$fullextradest/$file' + 'o', \
     '$extradest/$file')"
+    
+echo '%defattr (0644,root,root,0755)' > pyfiles
+find %{buildroot}%{python_sitelib}/docutils -type d | \
+  sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -not -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):%ghost \1:' >> pyfiles
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f pyfiles
 %defattr(-,root,root,-)
-%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
+%doc BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
+%doc THANKS.txt licenses docs tools/editors
 %{_bindir}/*
-%dir %{python_sitelib}/docutils
-%dir %{python_sitelib}/docutils/languages
-%dir %{python_sitelib}/docutils/parsers
-%dir %{python_sitelib}/docutils/parsers/rst
-%dir %{python_sitelib}/docutils/parsers/rst/directives
-%dir %{python_sitelib}/docutils/parsers/rst/languages
-%dir %{python_sitelib}/docutils/readers
-%dir %{python_sitelib}/docutils/readers/python
-%dir %{python_sitelib}/docutils/transforms
-%dir %{python_sitelib}/docutils/writers
 %{python_sitelib}/roman.py
 %{python_sitelib}/roman.pyc
-%{python_sitelib}/docutils/*.py
-%{python_sitelib}/docutils/*.pyc
-%{python_sitelib}/docutils/*/*.py
-%{python_sitelib}/docutils/*/*.pyc
-%{python_sitelib}/docutils/*/*/*.py
-%{python_sitelib}/docutils/*/*/*.pyc
-%{python_sitelib}/docutils/*/*/*/*.py
-%{python_sitelib}/docutils/*/*/*/*.pyc
-
 %ghost %{python_sitelib}/roman.pyo
-%ghost %{python_sitelib}/docutils/*.pyo
-%ghost %{python_sitelib}/docutils/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
+- Update to 0.4.
+- Scripted the listing of files in the python module.
+- Add a missingok requirement on python-imaging as docutils can make use of
+  it when converting to formats that have images.
+  
 * Tue Jun 7 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.9-1
 - Update to version 0.3.9.
 - Use a dist tag as there aren't any differences between supported fc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jun 2005 23:04:22 -0000	1.3
+++ sources	17 Jan 2006 19:50:17 -0000	1.4
@@ -1 +1 @@
-3b6727e4f53e88ae7cea7c296694fc6c  docutils-0.3.9.tar.gz
+0fe7b42bb3c2aa3680fe30f9a5fbf712  docutils-0.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:00:45 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 17 Jan 2006 15:00:45 -0500
Subject: rpms/gfontview/devel gfontview.spec,1.1,1.2
Message-ID: <200601172001.k0HK1QXU031567@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gfontview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29990

Modified Files:
	gfontview.spec 
Log Message:
build against updated compiler/t1lib



Index: gfontview.spec
===================================================================
RCS file: /cvs/extras/rpms/gfontview/devel/gfontview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gfontview.spec	1 Oct 2005 08:44:51 -0000	1.1
+++ gfontview.spec	17 Jan 2006 20:00:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gfontview
 Version:        0.5.0
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        A font viewer for Type 1 and TrueType fonts
 
 Group:          User Interface/X
@@ -10,7 +10,7 @@
 Patch0:         gfontview-0.5.0-gcc4.patch
 Patch1:         gfontview-0.5.0-makefile.patch
 
-BuildRequires:  libungif-devel, gtk+-devel, t1lib-devel
+BuildRequires:  giflib-devel, gtk+-devel, t1lib-devel, freetype-devel
 BuildRequires:  desktop-file-utils, gettext
 # it needs to know the spooling system and thus needs /usr/bin/lpr
 BuildRequires:  cups
@@ -33,7 +33,6 @@
 %build
 %configure \
  --enable-gnome=no \
- --with-libungif \
  --with-fontdir=%{_datadir}/fonts
 make %{?_smp_mflags}
 
@@ -64,6 +63,11 @@
 %{_datadir}/gfontview
 
 %changelog
+* Tue Jan 17 2006 Michael A. Peters <mpeters at mac.com> 0.5.0-4.1
+- rebuild in devel branch against updated t1lib
+- add freetype-devel to BuildRequires
+- change from libungif to giflib
+
 * Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> 0.5.0-4
 - changed the name of patch0 to be more specific
 - replaced patch1 to include better gfontviewrc location



From fedora-extras-commits at redhat.com  Tue Jan 17 20:11:53 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 15:11:53 -0500
Subject: rpms/python-docutils/FC-3 .cvsignore, 1.3, 1.4 python-docutils.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601172012.k0HKCedg031786@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759

Modified Files:
	.cvsignore python-docutils.spec sources 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
- Update to 0.4.
- Scripted the listing of files in the python module.
- Add a missingok requirement on python-imaging as docutils can make use of
  it when converting to formats that have images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jun 2005 23:07:17 -0000	1.3
+++ .cvsignore	17 Jan 2006 20:11:48 -0000	1.4
@@ -1 +1 @@
-docutils-0.3.9.tar.gz
+python-docutils.spec


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/python-docutils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-docutils.spec	7 Jun 2005 23:07:17 -0000	1.2
+++ python-docutils.spec	17 Jan 2006 20:11:48 -0000	1.3
@@ -1,25 +1,23 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?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 srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.3.9
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
-License:        Public domain, BSD, PSF, GPL - see COPYING.txt
+License:        Public Domain, BSD, Python License, GPL - see COPYING.txt
 URL:            http://docutils.sourceforge.net
 Source0:	http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python-devel
+Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
-Requires:	python-abi = %{pyver}
 
 %description
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -35,15 +33,18 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 
+# Remove a shebang from one of the library files
+sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
+
 %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
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 	
-for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
+for file in %{buildroot}/%{_bindir}/*.py; do
 	mv $file `dirname $file`/`basename $file .py`
 done
 
@@ -55,7 +56,7 @@
 # it manually here.
 file=roman.py
 extradest=%{python_sitelib}
-fullextradest=$RPM_BUILD_ROOT/$extradest
+fullextradest=%{buildroot}/$extradest
 install -m 0644 extras/$file $fullextradest
 %{__python} -c "import py_compile; py_compile.compile(\
     '$fullextradest/$file', \
@@ -65,42 +66,34 @@
     '$fullextradest/$file', \
     '$fullextradest/$file' + 'o', \
     '$extradest/$file')"
+    
+echo '%defattr (0644,root,root,0755)' > pyfiles
+find %{buildroot}%{python_sitelib}/docutils -type d | \
+  sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -not -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):%ghost \1:' >> pyfiles
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f pyfiles
 %defattr(-,root,root,-)
-%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
+%doc BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
+%doc THANKS.txt licenses docs tools/editors
 %{_bindir}/*
-%dir %{python_sitelib}/docutils
-%dir %{python_sitelib}/docutils/languages
-%dir %{python_sitelib}/docutils/parsers
-%dir %{python_sitelib}/docutils/parsers/rst
-%dir %{python_sitelib}/docutils/parsers/rst/directives
-%dir %{python_sitelib}/docutils/parsers/rst/languages
-%dir %{python_sitelib}/docutils/readers
-%dir %{python_sitelib}/docutils/readers/python
-%dir %{python_sitelib}/docutils/transforms
-%dir %{python_sitelib}/docutils/writers
 %{python_sitelib}/roman.py
 %{python_sitelib}/roman.pyc
-%{python_sitelib}/docutils/*.py
-%{python_sitelib}/docutils/*.pyc
-%{python_sitelib}/docutils/*/*.py
-%{python_sitelib}/docutils/*/*.pyc
-%{python_sitelib}/docutils/*/*/*.py
-%{python_sitelib}/docutils/*/*/*.pyc
-%{python_sitelib}/docutils/*/*/*/*.py
-%{python_sitelib}/docutils/*/*/*/*.pyc
-
 %ghost %{python_sitelib}/roman.pyo
-%ghost %{python_sitelib}/docutils/*.pyo
-%ghost %{python_sitelib}/docutils/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
+- Update to 0.4.
+- Scripted the listing of files in the python module.
+- Add a missingok requirement on python-imaging as docutils can make use of
+  it when converting to formats that have images.
+  
 * Tue Jun 7 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.9-1
 - Update to version 0.3.9.
 - Use a dist tag as there aren't any differences between supported fc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jun 2005 23:07:17 -0000	1.3
+++ sources	17 Jan 2006 20:11:48 -0000	1.4
@@ -1 +1 @@
-3b6727e4f53e88ae7cea7c296694fc6c  docutils-0.3.9.tar.gz
+4414a94628dfb736252e922e038bd32e  python-docutils.spec



From fedora-extras-commits at redhat.com  Tue Jan 17 20:15:57 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 15:15:57 -0500
Subject: rpms/python-docutils/devel .cvsignore, 1.3, 1.4 python-docutils.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601172016.k0HKGU6Q031900@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31879

Modified Files:
	.cvsignore python-docutils.spec sources 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
- Update to 0.4.
- Scripted the listing of files in the python module.
- Add a missingok requirement on python-imaging as docutils can make use of
  it when converting to formats that have images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jun 2005 21:45:42 -0000	1.3
+++ .cvsignore	17 Jan 2006 20:15:57 -0000	1.4
@@ -1 +1 @@
-docutils-0.3.9.tar.gz
+docutils-0.4.tar.gz


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/python-docutils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-docutils.spec	7 Jun 2005 21:45:42 -0000	1.4
+++ python-docutils.spec	17 Jan 2006 20:15:57 -0000	1.5
@@ -1,25 +1,23 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?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 srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.3.9
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
-License:        Public domain, BSD, PSF, GPL - see COPYING.txt
+License:        Public Domain, BSD, Python License, GPL - see COPYING.txt
 URL:            http://docutils.sourceforge.net
 Source0:	http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python-devel
+Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
-Requires:	python-abi = %{pyver}
 
 %description
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -35,15 +33,18 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 
+# Remove a shebang from one of the library files
+sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
+
 %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
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 	
-for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
+for file in %{buildroot}/%{_bindir}/*.py; do
 	mv $file `dirname $file`/`basename $file .py`
 done
 
@@ -55,7 +56,7 @@
 # it manually here.
 file=roman.py
 extradest=%{python_sitelib}
-fullextradest=$RPM_BUILD_ROOT/$extradest
+fullextradest=%{buildroot}/$extradest
 install -m 0644 extras/$file $fullextradest
 %{__python} -c "import py_compile; py_compile.compile(\
     '$fullextradest/$file', \
@@ -65,42 +66,34 @@
     '$fullextradest/$file', \
     '$fullextradest/$file' + 'o', \
     '$extradest/$file')"
+    
+echo '%defattr (0644,root,root,0755)' > pyfiles
+find %{buildroot}%{python_sitelib}/docutils -type d | \
+  sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -not -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):%ghost \1:' >> pyfiles
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f pyfiles
 %defattr(-,root,root,-)
-%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
+%doc BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
+%doc THANKS.txt licenses docs tools/editors
 %{_bindir}/*
-%dir %{python_sitelib}/docutils
-%dir %{python_sitelib}/docutils/languages
-%dir %{python_sitelib}/docutils/parsers
-%dir %{python_sitelib}/docutils/parsers/rst
-%dir %{python_sitelib}/docutils/parsers/rst/directives
-%dir %{python_sitelib}/docutils/parsers/rst/languages
-%dir %{python_sitelib}/docutils/readers
-%dir %{python_sitelib}/docutils/readers/python
-%dir %{python_sitelib}/docutils/transforms
-%dir %{python_sitelib}/docutils/writers
 %{python_sitelib}/roman.py
 %{python_sitelib}/roman.pyc
-%{python_sitelib}/docutils/*.py
-%{python_sitelib}/docutils/*.pyc
-%{python_sitelib}/docutils/*/*.py
-%{python_sitelib}/docutils/*/*.pyc
-%{python_sitelib}/docutils/*/*/*.py
-%{python_sitelib}/docutils/*/*/*.pyc
-%{python_sitelib}/docutils/*/*/*/*.py
-%{python_sitelib}/docutils/*/*/*/*.pyc
-
 %ghost %{python_sitelib}/roman.pyo
-%ghost %{python_sitelib}/docutils/*.pyo
-%ghost %{python_sitelib}/docutils/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
+- Update to 0.4.
+- Scripted the listing of files in the python module.
+- Add a missingok requirement on python-imaging as docutils can make use of
+  it when converting to formats that have images.
+  
 * Tue Jun 7 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.9-1
 - Update to version 0.3.9.
 - Use a dist tag as there aren't any differences between supported fc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jun 2005 21:45:42 -0000	1.3
+++ sources	17 Jan 2006 20:15:57 -0000	1.4
@@ -1 +1 @@
-3b6727e4f53e88ae7cea7c296694fc6c  docutils-0.3.9.tar.gz
+0fe7b42bb3c2aa3680fe30f9a5fbf712  docutils-0.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:22:41 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 15:22:41 -0500
Subject: owners owners.list,1.542,1.543
Message-ID: <200601172023.k0HKNDtk031972@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31953

Modified Files:
	owners.list 
Log Message:
unorphan i810switch


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- owners.list	17 Jan 2006 14:23:16 -0000	1.542
+++ owners.list	17 Jan 2006 20:22:40 -0000	1.543
@@ -396,7 +396,7 @@
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|i810switch|Display management utility for i810 chipsets|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ibmonitor|Interactive bandwidth monitor|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|fredrik at dolda2000.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 20:25:17 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 15:25:17 -0500
Subject: rpms/i810switch/devel .cvsignore, 1.2, 1.3 i810switch.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601172025.k0HKPnkM032059@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32019

Modified Files:
	.cvsignore i810switch.spec sources 
Log Message:
make: `clog' is up to date.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jan 2005 16:49:20 -0000	1.2
+++ .cvsignore	17 Jan 2006 20:25:16 -0000	1.3
@@ -1 +1 @@
-i810switch-0.6.2.tar.gz
+i810switch-0.6.5.tar.gz


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- i810switch.spec	6 Apr 2005 22:12:02 -0000	1.3
+++ i810switch.spec	17 Jan 2006 20:25:16 -0000	1.4
@@ -1,12 +1,12 @@
 Name: i810switch
-Version: 0.6.2
-Release: 4
+Version: 0.6.5
+Release: 1
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
 License: GPL
-URL: http://vorfgglon.cwru.edu/~ames/i810switch/
-Source0: http://vorlon.cwru.edu/~ames/i810switch/i810switch-0.6.2.tar.gz
+URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
+Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
@@ -37,6 +37,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 17 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-1
+- update to 0.6.5, change URLs due to new upstream maintainer
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jan 2005 16:49:20 -0000	1.2
+++ sources	17 Jan 2006 20:25:16 -0000	1.3
@@ -1 +1 @@
-b31cc8fde7a36d553406339d2626d3e3  i810switch-0.6.2.tar.gz
+5ca07aee624589bdce5761c796e5f9a8  i810switch-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:25:29 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 15:25:29 -0500
Subject: rpms/python-docutils/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200601172026.k0HKQ1vP032092@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015

Modified Files:
	.cvsignore sources 
Log Message:
* Upload the correct docutils tarball this time.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jan 2006 20:11:48 -0000	1.4
+++ .cvsignore	17 Jan 2006 20:25:28 -0000	1.5
@@ -1 +1 @@
-python-docutils.spec
+docutils-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jan 2006 20:11:48 -0000	1.4
+++ sources	17 Jan 2006 20:25:28 -0000	1.5
@@ -1 +1 @@
-4414a94628dfb736252e922e038bd32e  python-docutils.spec
+0fe7b42bb3c2aa3680fe30f9a5fbf712  docutils-0.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:33:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 15:33:55 -0500
Subject: rpms/rpmlint/devel rpmlint-0.71-disttag.patch, NONE,
	1.1 rpmlint-0.71-doc-exec.patch, NONE,
	1.1 rpmlint-0.71-la-exec.patch, NONE,
	1.1 rpmlint-0.71-prereq.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 rpmlint-fedora-config, 1.10, 1.11 rpmlint.spec, 1.18,
	1.19 sources, 1.9, 1.10 DocFilesCheck.py, 1.1,
	NONE rpmlint-0.71-docfilescheck.patch, 1.1,
	NONE rpmlint-0.71-errmsg.patch, 1.1,
	NONE rpmlint-0.71-locale.patch, 1.1,
	NONE rpmlint-0.71-objdump.patch, 1.1,
	NONE rpmlint-0.71-paths.patch, 1.1,
	NONE rpmlint-0.71-scriptinfo.patch, 1.1,
	NONE rpmlint-0.71-symlinks.patch, 1.1,
	NONE rpmlint-disttag.patch, 1.1, NONE rpmlint-execs.patch, 1.1,
	NONE rpmlint-initvars.patch, 1.2, NONE rpmlint-perl-bs.patch,
	1.1, NONE rpmlint-prereq.patch, 1.1,
	NONE rpmlint-svcdefault.patch, 1.1, NONE
Message-ID: <200601172034.k0HKYRBY032248@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32213

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
Removed Files:
	DocFilesCheck.py rpmlint-0.71-docfilescheck.patch 
	rpmlint-0.71-errmsg.patch rpmlint-0.71-locale.patch 
	rpmlint-0.71-objdump.patch rpmlint-0.71-paths.patch 
	rpmlint-0.71-scriptinfo.patch rpmlint-0.71-symlinks.patch 
	rpmlint-disttag.patch rpmlint-execs.patch 
	rpmlint-initvars.patch rpmlint-perl-bs.patch 
	rpmlint-prereq.patch rpmlint-svcdefault.patch 
Log Message:
* 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.


rpmlint-0.71-disttag.patch:

--- NEW FILE rpmlint-0.71-disttag.patch ---
--- TagsCheck.py~	2006-01-15 23:33:42.000000000 +0200
+++ TagsCheck.py	2006-01-15 23:34:30.000000000 +0200
@@ -424,2 +424,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension', 'mdk')
@@ -636,3 +637,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)

rpmlint-0.71-doc-exec.patch:

--- NEW FILE rpmlint-0.71-doc-exec.patch ---
Index: FilesCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
retrieving revision 1.96
diff -u -U1 -r1.96 FilesCheck.py
--- FilesCheck.py	15 Jan 2006 09:59:04 -0000	1.96
+++ FilesCheck.py	15 Jan 2006 21:08:24 -0000
@@ -565,3 +565,3 @@
 
-                            if mode & 0111 == 0:
+                            if mode & 0111 == 0 and not doc_regex.search(f):
                                 printError(pkg, 'non-executable-script', f, oct(perm))

rpmlint-0.71-la-exec.patch:

--- NEW FILE rpmlint-0.71-la-exec.patch ---
Index: FilesCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
retrieving revision 1.96
diff -u -U1 -r1.96 FilesCheck.py
--- FilesCheck.py	15 Jan 2006 09:59:04 -0000	1.96
+++ FilesCheck.py	15 Jan 2006 21:08:59 -0000
@@ -189,2 +189,3 @@
 script_regex=re.compile('^/((usr/)?s?bin|etc/(rc.d/init.d|profile.d|X11/xinit.d|cron.(hourly|daily|monthly|weekly)))/')
+libtool_archive_regex=re.compile('\.la$')
 lib64python_regex=re.compile('^/usr/lib64/python')
@@ -562,3 +563,3 @@
                                     printError(pkg, 'wrong-script-interpreter', f, '"' + res.group(1) + '"')
-                            else:
+                            elif not (lib_path_regex.search(f) and libtool_archive_regex.search(f)):
                                 printError(pkg, 'script-without-shellbang', f)

rpmlint-0.71-prereq.patch:

--- NEW FILE rpmlint-0.71-prereq.patch ---
Index: SpecCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/SpecCheck.py,v
retrieving revision 1.32
diff -u -r1.32 SpecCheck.py
--- SpecCheck.py	15 Jan 2006 09:59:04 -0000	1.32
+++ SpecCheck.py	15 Jan 2006 21:05:12 -0000
@@ -45,6 +45,7 @@
 biarch_package_regex=re.compile(DEFAULT_BIARCH_PACKAGES)
 hardcoded_lib_path_exceptions_regex=re.compile(Config.getOption('HardcodedLibPathExceptions', DEFAULT_HARDCODED_LIB_PATH_EXCEPTIONS))
 prereq_regex=re.compile('^PreReq:\s*(.+?)\s*$', re.IGNORECASE)
+buildprereq_regex=re.compile('^BuildPreReq:\s*(.+?)\s*$', re.IGNORECASE)
 use_utf8=Config.getOption('UseUTF8', Config.USEUTF8_DEFAULT)
 
 # Only check for /lib, /usr/lib, /usr/X11R6/lib
@@ -190,7 +191,11 @@
 
                 res=prereq_regex.search(line)
                 if res:
-                    printError(pkg, 'prereq-use', res.group(1))
+                    printWarning(pkg, 'prereq-use', res.group(1))
+
+                res=buildprereq_regex.search(line)
+                if res:
+                    printWarning(pkg, 'buildprereq-use', res.group(1))
 
             if not buildroot:
                 printError(pkg, 'no-buildroot-tag')
@@ -284,8 +289,13 @@
 patch to be effective only on a given arch.''',
 
 'prereq-use',
-'''The use of PreReq is deprecated. You should use Requires(pre), Requires(post),
-Requires(preun) or Requires(postun) according to your needs.''',
+'''The use of PreReq is deprecated. In the majority of cases, a plain Requires
+is enough and the right thing to do. Sometimes Requires(pre), Requires(post),
+Requires(preun) and/or Requires(postun) can also be used instead of PreReq.''',
+
+'buildprereq-use',
+'''The use of BuildPreReq is deprecated, build dependencies are always required
+before a package can be built.  Use plain BuildRequires instead.''',
 
 )
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Aug 2005 19:32:46 -0000	1.9
+++ .cvsignore	17 Jan 2006 20:33:54 -0000	1.10
@@ -1 +1,2 @@
 rpmlint-0.71.tar.bz2
+rpmlint-0.71-cvs20060115.patch.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint-fedora-config	20 Nov 2005 21:21:02 -0000	1.10
+++ rpmlint-fedora-config	17 Jan 2006 20:33:54 -0000	1.11
@@ -9,7 +9,9 @@
 setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
+setOption("UseDefaultRunlevels", 0)
 setOption("UseEpoch", 0)
+setOption("UseUTF8", 1)
 setOption("ValidSrcPerms", (0664, 0644, ))
 setOption("ValidGroups", (
     "Amusements/Games",


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmlint.spec	20 Nov 2005 21:21:02 -0000	1.18
+++ rpmlint.spec	17 Jan 2006 20:33:54 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.71
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -8,20 +8,11 @@
 URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
 Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Source2:        DocFilesCheck.py
-Patch0:         %{name}-svcdefault.patch
-Patch1:         %{name}-prereq.patch
-Patch2:         %{name}-disttag.patch
-Patch3:         %{name}-initvars.patch
-Patch4:         %{name}-execs.patch
-Patch5:         %{name}-perl-bs.patch
-Patch6:         %{name}-0.71-paths.patch
-Patch7:         %{name}-0.71-errmsg.patch
-Patch8:         %{name}-0.71-symlinks.patch
-Patch9:         %{name}-0.71-docfilescheck.patch
-Patch10:        %{name}-0.71-objdump.patch
-Patch11:        %{name}-0.71-locale.patch
-Patch12:        %{name}-0.71-scriptinfo.patch
+Patch0:         %{name}-0.71-disttag.patch
+Patch1:         %{name}-0.71-cvs20060115.patch.bz2
+Patch2:         %{name}-0.71-prereq.patch
+Patch3:         %{name}-0.71-la-exec.patch
+Patch4:         %{name}-0.71-doc-exec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +22,7 @@
 Requires:       rpm-python
 Requires:       python >= 1.5.2
 Requires:       cpio
+Requires:       binutils
 
 %description
 rpmlint is a tool for checking common errors in RPM packages.  Binary
@@ -39,20 +31,11 @@
 
 %prep
 %setup -q
-install -pm 644 %{SOURCE2} .
-%patch0
 %patch1
+%patch0
 %patch2
 %patch3
 %patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 for f in AUTHORS ChangeLog ; do
@@ -105,6 +88,11 @@
 
 
 %changelog
+* 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
 - Take file based dependencies into account in dangling symlink checks
   (completes the fix for #165839).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Aug 2005 19:32:46 -0000	1.9
+++ sources	17 Jan 2006 20:33:54 -0000	1.10
@@ -1 +1,2 @@
 9e7645ee79bfc75540c885f05dca0751  rpmlint-0.71.tar.bz2
+ed1fa7aaa6cbfcdf866b423adcd40cb2  rpmlint-0.71-cvs20060115.patch.bz2


--- DocFilesCheck.py DELETED ---


--- rpmlint-0.71-docfilescheck.patch DELETED ---


--- rpmlint-0.71-errmsg.patch DELETED ---


--- rpmlint-0.71-locale.patch DELETED ---


--- rpmlint-0.71-objdump.patch DELETED ---


--- rpmlint-0.71-paths.patch DELETED ---


--- rpmlint-0.71-scriptinfo.patch DELETED ---


--- rpmlint-0.71-symlinks.patch DELETED ---


--- rpmlint-disttag.patch DELETED ---


--- rpmlint-execs.patch DELETED ---


--- rpmlint-initvars.patch DELETED ---


--- rpmlint-perl-bs.patch DELETED ---


--- rpmlint-prereq.patch DELETED ---


--- rpmlint-svcdefault.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 20:53:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:53:32 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.7,1.8
Message-ID: <200601172054.k0HKs4JI032424@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32389

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc5 on branch devel from perl-Convert-UUlib-1.06-2.fc5.src.rpm
1.06 < 1.051 -> bump epoch


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	16 Jan 2006 22:55:56 -0000	1.7
+++ import.log	17 Jan 2006 20:53:32 -0000	1.8
@@ -4,3 +4,4 @@
 perl-Convert-UUlib-1_03-0_fdr_1_1_92:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.92.src.rpm:1099889960
 perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049
 perl-Convert-UUlib-1_06-1_fc4:FC-4:perl-Convert-UUlib-1.06-1.fc4.src.rpm:1137452147
+perl-Convert-UUlib-1_06-2_fc5:HEAD:perl-Convert-UUlib-1.06-2.fc5.src.rpm:1137531201



From fedora-extras-commits at redhat.com  Tue Jan 17 20:53:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:53:38 -0500
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.11,1.12
Message-ID: <200601172054.k0HKsAwA032427@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32389/devel

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc5 on branch devel from perl-Convert-UUlib-1.06-2.fc5.src.rpm
1.06 < 1.051 -> bump epoch


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Convert-UUlib.spec	16 Jan 2006 22:54:24 -0000	1.11
+++ perl-Convert-UUlib.spec	17 Jan 2006 20:53:38 -0000	1.12
@@ -2,7 +2,8 @@
 
 Name:      perl-%{rname}
 Version:   1.06
-Release:   1%{?dist}
+Epoch:     1
+Release:   2%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-2
+- bump epoch to force updates
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
 - 1.06 (can't believe I'm still listed as this package owner)
 



From fedora-extras-commits at redhat.com  Tue Jan 17 20:56:23 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:56:23 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.8,1.9
Message-ID: <200601172056.k0HKutfp032521@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32489

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-2.fc4.src.rpm
1.06 < 1.051 -> bump epoch


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	17 Jan 2006 20:53:32 -0000	1.8
+++ import.log	17 Jan 2006 20:56:23 -0000	1.9
@@ -5,3 +5,4 @@
 perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049
 perl-Convert-UUlib-1_06-1_fc4:FC-4:perl-Convert-UUlib-1.06-1.fc4.src.rpm:1137452147
 perl-Convert-UUlib-1_06-2_fc5:HEAD:perl-Convert-UUlib-1.06-2.fc5.src.rpm:1137531201
+perl-Convert-UUlib-1_06-2_fc4:FC-4:perl-Convert-UUlib-1.06-2.fc4.src.rpm:1137531372



From fedora-extras-commits at redhat.com  Tue Jan 17 20:56:29 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:56:29 -0500
Subject: rpms/perl-Convert-UUlib/FC-4 perl-Convert-UUlib.spec,1.10,1.11
Message-ID: <200601172057.k0HKv1xL032529@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32489/FC-4

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-2.fc4.src.rpm
1.06 < 1.051 -> bump epoch


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/perl-Convert-UUlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Convert-UUlib.spec	16 Jan 2006 22:56:02 -0000	1.10
+++ perl-Convert-UUlib.spec	17 Jan 2006 20:56:28 -0000	1.11
@@ -2,7 +2,8 @@
 
 Name:      perl-%{rname}
 Version:   1.06
-Release:   1%{?dist}
+Epoch:     1
+Release:   2%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-2
+- bump epoch to force updates
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
 - 1.06 (can't believe I'm still listed as this package owner)
 



From fedora-extras-commits at redhat.com  Tue Jan 17 20:59:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 15:59:58 -0500
Subject: rpms/bash-completion/devel
	bash-completion-20050721-bash31quoting.patch, NONE,
	1.1 bash-completion.spec, 1.12, 1.13
Message-ID: <200601172100.k0HL0USs032638@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32591

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-20050721-bash31quoting.patch 
Log Message:
* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 20050721-3
- Patch to hopefully fix quoting problems with bash 3.1 (#177056).


bash-completion-20050721-bash31quoting.patch:

--- NEW FILE bash-completion-20050721-bash31quoting.patch ---
--- bash_completion/bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion/bash_completion	2006-01-08 17:31:57.000000000 +0200
@@ -661,4 +661,4 @@
 			COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host |
-			sed -ne '/^['$'\t '']*Sharename/,/^$/p' |
-			sed -ne '3,$s|^[^A-Za-z]*\([^'$'\t '']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
+			sed -ne '/^[\t ]*Sharename/,/^$/p' |
+			sed -ne '3,$s|^[^A-Za-z]*\([^\t ]*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
 		fi
@@ -2398,5 +2398,5 @@
 	    # expand path (if present) to global known hosts file
-	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	    # expand path (if present) to user known hosts file
-	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	fi
@@ -2476,3 +2476,3 @@
 	    if [ ${#config[@]} -gt 0 ] && [ -n "$aliases" ]; then
-		hosts=$( compgen -W "$( sed -ne "s/^[Hh][Oo][Ss][Tt]["$'\t '"]*\([^*?]*\)$/\1/p" ${config[@]} )" -- $ocur )
+		hosts=$( compgen -W '$( sed -ne "s/^[Hh][Oo][Ss][Tt][\t ]*\([^*?]*\)$/\1/p" ${config[@]} )' -- $ocur )
 		COMPREPLY=( ${COMPREPLY[@]} $hosts )
@@ -5860,3 +5860,3 @@
 	dict $host $port $1 2>/dev/null | sed -ne \
-	    's/^['$'\t '']['$'\t '']*\([^'$'\t '']*\).*$/\1/p'
+	    's/^[\t ][\t ]*\([^\t ]*\).*$/\1/p'
 }
--- bash_completion/contrib/sitecopy~	2005-01-03 04:44:22.000000000 +0200
+++ bash_completion/contrib/sitecopy	2006-01-08 17:35:19.000000000 +0200
@@ -20,7 +20,7 @@
 		;;
 	    *)
 		if [ -r ~/.sitecopyrc ]; then
-		    COMPREPLY=( $( compgen -W "$(grep '^["$'\t '"]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
+		    COMPREPLY=( $( compgen -W "$(grep '^[\t ]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
 		fi
 		;;
 	esac


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bash-completion.spec	28 Nov 2005 20:26:32 -0000	1.12
+++ bash-completion.spec	17 Jan 2006 20:59:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -12,6 +12,7 @@
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
 Patch0:         %{name}-20050721-cvs-stat.patch
+Patch1:         %{name}-20050721-bash31quoting.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,6 +26,7 @@
 %prep
 %setup -q -n bash_completion
 %patch0
+%patch1 -p1
 install -pm 644 %{SOURCE2} contrib/mock
 install -pm 644 %{SOURCE3} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
@@ -88,6 +90,9 @@
 
 
 %changelog
+* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 20050721-3
+- Patch to hopefully fix quoting problems with bash 3.1 (#177056).
+
 * Mon Nov 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 20050721-2
 - Work around potential login problem in profile.d snippet (#174355).
 



From fedora-extras-commits at redhat.com  Tue Jan 17 21:16:09 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 16:16:09 -0500
Subject: rpms/i810switch/FC-4 .cvsignore, 1.2, 1.3 i810switch.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601172116.k0HLGgnj002077@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2056

Modified Files:
	.cvsignore i810switch.spec sources 
Log Message:
make: `clog' is up to date.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jan 2005 16:49:20 -0000	1.2
+++ .cvsignore	17 Jan 2006 21:16:09 -0000	1.3
@@ -1 +1 @@
-i810switch-0.6.2.tar.gz
+i810switch-0.6.5.tar.gz


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/i810switch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- i810switch.spec	6 Apr 2005 22:12:02 -0000	1.3
+++ i810switch.spec	17 Jan 2006 21:16:09 -0000	1.4
@@ -1,12 +1,12 @@
 Name: i810switch
-Version: 0.6.2
-Release: 4
+Version: 0.6.5
+Release: 1
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
 License: GPL
-URL: http://vorfgglon.cwru.edu/~ames/i810switch/
-Source0: http://vorlon.cwru.edu/~ames/i810switch/i810switch-0.6.2.tar.gz
+URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
+Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
@@ -37,6 +37,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 17 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-1
+- update to 0.6.5, change URLs due to new upstream maintainer
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jan 2005 16:49:20 -0000	1.2
+++ sources	17 Jan 2006 21:16:09 -0000	1.3
@@ -1 +1 @@
-b31cc8fde7a36d553406339d2626d3e3  i810switch-0.6.2.tar.gz
+5ca07aee624589bdce5761c796e5f9a8  i810switch-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 21:18:04 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 16:18:04 -0500
Subject: rpms/i810switch/FC-4 i810switch.spec,1.4,1.5
Message-ID: <200601172118.k0HLIafe002155@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2115

Modified Files:
	i810switch.spec 
Log Message:
add dist tag


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/i810switch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i810switch.spec	17 Jan 2006 21:16:09 -0000	1.4
+++ i810switch.spec	17 Jan 2006 21:18:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 1
+Release: 1%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support



From fedora-extras-commits at redhat.com  Tue Jan 17 21:18:13 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Jan 2006 16:18:13 -0500
Subject: rpms/sobby/FC-4 sobby.spec,1.2,1.3
Message-ID: <200601172118.k0HLIjbf002190@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2135

Modified Files:
	sobby.spec 
Log Message:
Rebuild


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sobby.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sobby.spec	15 Dec 2005 20:19:34 -0000	1.2
+++ sobby.spec	17 Jan 2006 21:18:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sobby
 Version:        0.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Luke Macken <lmacken at redhat.com> - 0.2.0-3
+- Rebuild
+
 * Thu Dec 15 2005 Luke Macken <lmacken at redhat.com> - 0.2.0-2
 - Regress package to 0.2.0 for FC-{3,4}
 



From fedora-extras-commits at redhat.com  Tue Jan 17 21:19:42 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 16:19:42 -0500
Subject: rpms/i810switch/devel i810switch.spec,1.4,1.5
Message-ID: <200601172120.k0HLKEKt002275@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2249

Modified Files:
	i810switch.spec 
Log Message:
add dist tag


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i810switch.spec	17 Jan 2006 20:25:16 -0000	1.4
+++ i810switch.spec	17 Jan 2006 21:19:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 1
+Release: 1%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support



From fedora-extras-commits at redhat.com  Tue Jan 17 21:42:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 16:42:28 -0500
Subject: rpms/perl-IO-Tty/devel perl-IO-Tty.spec,1.7,1.8
Message-ID: <200601172143.k0HLh0Q5002396@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IO-Tty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2369

Modified Files:
	perl-IO-Tty.spec 
Log Message:
* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.02-4
- Rebuild, cosmetic cleanups.



Index: perl-IO-Tty.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-IO-Tty.spec	6 Apr 2005 22:12:45 -0000	1.7
+++ perl-IO-Tty.spec	17 Jan 2006 21:42:28 -0000	1.8
@@ -1,15 +1,12 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-IO-Tty
 Version:        1.02
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Perl interface to pseudo tty's
 
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/IO-Tty/
-Source0:        http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-1.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl
@@ -23,22 +20,20 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -49,13 +44,16 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
-%{perl_vendorarch}/auto/IO
-%{perl_vendorarch}/IO
-%{_mandir}/man3/*.3*
+%{perl_vendorarch}/auto/IO/
+%{perl_vendorarch}/IO/
+%{_mandir}/man3/IO::*ty*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.02-4
+- Rebuild, cosmetic cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.02-3
 - rebuilt
 
 * Sun Feb  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.02-0.fdr.2



From fedora-extras-commits at redhat.com  Tue Jan 17 21:43:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 16:43:32 -0500
Subject: rpms/perl-IPC-Run/devel perl-IPC-Run.spec,1.10,1.11
Message-ID: <200601172144.k0HLi4FK002453@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IPC-Run/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2433

Modified Files:
	perl-IPC-Run.spec 
Log Message:
* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.79-3
- Rebuild, cosmetic cleanups.



Index: perl-IPC-Run.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-IPC-Run.spec	10 Apr 2005 17:09:46 -0000	1.10
+++ perl-IPC-Run.spec	17 Jan 2006 21:43:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Run
 Version:        0.79
-Release:        2
+Release:        3%{?dist}
 Summary:        Perl module for interacting with child processes
 
 License:        GPL or Artistic
@@ -25,6 +25,7 @@
 %prep
 %setup -q -n IPC-Run-%{version}
 chmod 644 lib/IPC/*.pm lib/IPC/Run/*.pm Changes eg/*
+%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' eg/run_daemon
 
 
 %build
@@ -38,9 +39,11 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
+rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/IPC/Run/Win32*.pm
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/IPC::Run::Win32*.3*
 
 
-%check || :
+%check
 # https://rt.cpan.org/NoAuth/Bug.html?id=11129
 [ ! -d /dev/pts ] || IPCRUNDEBUG=2 make test
 
@@ -53,12 +56,13 @@
 %defattr(-,root,root,-)
 %doc Changes TODO eg/
 %{perl_vendorlib}/IPC/
-%exclude %{perl_vendorlib}/IPC/Run/Win32*.pm
 %{_mandir}/man3/IPC::Run*.3*
-%exclude %{_mandir}/man3/IPC::Run::Win32*.3*
 
 
 %changelog
+* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.79-3
+- Rebuild, cosmetic cleanups.
+
 * Sun Apr 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.79-2
 - Exclude Win32 specific modules.
 - Include more docs.



From fedora-extras-commits at redhat.com  Tue Jan 17 22:24:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:24:26 -0500
Subject: rpms/torsmo - New directory
Message-ID: <200601172224.k0HMOSap004385@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377/torsmo

Log Message:
Directory /cvs/extras/rpms/torsmo added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 22:24:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:24:32 -0500
Subject: rpms/torsmo/devel - New directory
Message-ID: <200601172224.k0HMOYjP004400@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377/torsmo/devel

Log Message:
Directory /cvs/extras/rpms/torsmo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 22:24:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:24:56 -0500
Subject: rpms/torsmo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601172224.k0HMOwkH004434@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4422

Added Files:
	Makefile import.log 
Log Message:
Setup of module torsmo


--- NEW FILE Makefile ---
# Top level Makefile for module torsmo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 22:25:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:25:03 -0500
Subject: rpms/torsmo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601172225.k0HMP4Sm004454@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4422/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module torsmo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 22:26:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:26:28 -0500
Subject: rpms/torsmo import.log,1.1,1.2
Message-ID: <200601172227.k0HMR0CE004533@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4496

Modified Files:
	import.log 
Log Message:
auto-import torsmo-0.18-4 on branch devel from torsmo-0.18-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/torsmo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 22:24:56 -0000	1.1
+++ import.log	17 Jan 2006 22:26:27 -0000	1.2
@@ -0,0 +1 @@
+torsmo-0_18-4:HEAD:torsmo-0.18-4.src.rpm:1137536740



From fedora-extras-commits at redhat.com  Tue Jan 17 22:26:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:26:34 -0500
Subject: rpms/torsmo/devel torsmo.desktop, NONE, 1.1 torsmo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601172227.k0HMR75P004537@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4496/devel

Modified Files:
	.cvsignore sources 
Added Files:
	torsmo.desktop torsmo.spec 
Log Message:
auto-import torsmo-0.18-4 on branch devel from torsmo-0.18-4.src.rpm


--- NEW FILE torsmo.desktop ---
[Desktop Entry]
Name=torsmo
Comment=TyopoytaORvelo System MOnitor
Exec=torsmo
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE torsmo.spec ---
Name:           torsmo
Version:        0.18
Release:        4%{?dist}
Summary:        TyopoytaORvelo System MOnitor

Group:          Applications/System
License:        BSD
URL:            http://torsmo.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/torsmo/torsmo-0.18.tar.gz
Source1:        torsmo.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  xorg-x11-devel
BuildRequires:  fontconfig-devel
BuildRequires:  freetype-devel
BuildRequires:  desktop-file-utils

# modular X
BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel

%description
Torsmo (TyopoytaORvelo System MOnitor) is a system monitor that sits in the
corner of your desktop. Torsmo can show various information about your system
and its peripherals. Torsmo is very light and customizable, and it renders
text on the root window.

For a sample configuration take a look torsmorc.sample.

%prep
%setup -q

%build
%configure --enable-xft --enable-proc-uptime --enable-seti \
--x-includes=%{_includedir} --x-libraries=%{_libdir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README readme.html torsmorc.sample
%{_bindir}/torsmo
%{_mandir}/man1/*
%{_datadir}/applications/*desktop

%changelog
* Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-4
- add dist
- fix up description

* Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-3
- add sample rc
- switch to devel BR

* Sun Jan 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-2
- Fix spec for fe inclusion
- add desktop entry

* Sat Jan 14 2006 Thomas Jansen <mithi[AT]mithi.net>
0.18-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torsmo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 22:25:02 -0000	1.1
+++ .cvsignore	17 Jan 2006 22:26:34 -0000	1.2
@@ -0,0 +1 @@
+torsmo-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torsmo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 22:25:02 -0000	1.1
+++ sources	17 Jan 2006 22:26:34 -0000	1.2
@@ -0,0 +1 @@
+88bd8f627637d785a1d681f4f15f00b6  torsmo-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 22:34:45 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 17 Jan 2006 17:34:45 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.16,1.17
Message-ID: <200601172235.k0HMZHw1004648@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631

Modified Files:
	cernlib.spec 
Log Message:
* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12
- attempt a rebuild against newer openmotif



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cernlib.spec	22 Dec 2005 09:32:55 -0000	1.16
+++ cernlib.spec	17 Jan 2006 22:34:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.4
+Release:       12%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -712,6 +712,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12
+- attempt a rebuild against newer openmotif
+
 * Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint



From fedora-extras-commits at redhat.com  Tue Jan 17 22:39:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 17 Jan 2006 17:39:57 -0500
Subject: rpms/meld/devel meld.spec,1.11,1.12
Message-ID: <200601172240.k0HMeUvq004744@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4725

Modified Files:
	meld.spec 
Log Message:



Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- meld.spec	13 Nov 2005 09:39:53 -0000	1.11
+++ meld.spec	17 Jan 2006 22:39:57 -0000	1.12
@@ -1,3 +1,6 @@
+# targeting FC-5
+# spec for FC-4 differs (and could be merged)
+
 Name:             meld
 Version:          1.1.2
 Release:          1%{?dist}



From fedora-extras-commits at redhat.com  Tue Jan 17 23:21:09 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:21:09 -0500
Subject: rpms/gdesklets/devel .cvsignore, 1.2, 1.3 gdesklets.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200601172321.k0HNLfCv006901@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6878

Modified Files:
	.cvsignore gdesklets.spec sources 
Log Message:

updated gdesklets.spec and added updated upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
+++ .cvsignore	17 Jan 2006 23:21:09 -0000	1.3
@@ -1 +1 @@
-gDesklets-0.35.2.tar.bz2
+gDesklets-0.35.3.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdesklets.spec	5 Jan 2006 20:23:25 -0000	1.6
+++ gdesklets.spec	17 Jan 2006 23:21:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gdesklets
-Version:        0.35.2
-Release:        26%{?dist}
+Version:        0.35.3
+Release:        1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 
 URL:            http://www.gdesklets.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -39,7 +38,7 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1 
+
 
 %build
 
@@ -87,9 +86,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
 %{_bindir}/%{name}
-%{_bindir}/%{name}-display-thumbnailer
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_datadir}/pixmaps/%{name}.png
@@ -99,6 +96,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
+- Updated to 0.35.3
+- Removed thumbmail
+- Removed patch, no longer needed
+
 * Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-26.fc5
 - Minor rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 22:14:49 -0000	1.2
+++ sources	17 Jan 2006 23:21:09 -0000	1.3
@@ -1 +1 @@
-8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2
+3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 17 23:24:41 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:24:41 -0500
Subject: rpms/gdesklets/FC-4 .cvsignore, 1.2, 1.3 gdesklets.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601172325.k0HNPDiF006974@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6943

Modified Files:
	.cvsignore gdesklets.spec sources 
Log Message:

updated gdesklets.spec




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
+++ .cvsignore	17 Jan 2006 23:24:40 -0000	1.3
@@ -1 +1 @@
-gDesklets-0.35.2.tar.bz2
+gDesklets-0.35.3.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
+++ gdesklets.spec	17 Jan 2006 23:24:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gdesklets
-Version:        0.35.2
-Release:        22%{?dist}
+Version:        0.35.3
+Release:        1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 
 URL:            http://gdesklets.gnomedesktop.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -37,7 +36,7 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1 
+
 
 %build
 
@@ -85,9 +84,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
 %{_bindir}/%{name}
-%{_bindir}/%{name}-display-thumbnailer
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_datadir}/pixmaps/%{name}.png
@@ -99,6 +96,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
+- Updated to 0.35.3
+- Removed thumbnail schema
+- Removed patch, no longer needed
+
 * Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 22:14:49 -0000	1.2
+++ sources	17 Jan 2006 23:24:40 -0000	1.3
@@ -1 +1 @@
-8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2
+3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 17 23:27:04 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:27:04 -0500
Subject: rpms/gdesklets/FC-3 gdesklets.spec,1.2,1.3
Message-ID: <200601172327.k0HNRaUW007042@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7016

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/gdesklets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
+++ gdesklets.spec	17 Jan 2006 23:27:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gdesklets
-Version:        0.35.2
-Release:        22%{?dist}
+Version:        0.35.3
+Release:        1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 
 URL:            http://gdesklets.gnomedesktop.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -37,7 +36,7 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1 
+
 
 %build
 
@@ -85,9 +84,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
 %{_bindir}/%{name}
-%{_bindir}/%{name}-display-thumbnailer
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_datadir}/pixmaps/%{name}.png
@@ -99,6 +96,12 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
+- Updated to 0.35.3
+- Removed thumbnail schema
+- Removed patch, no longer needed
+
+
 * Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up



From fedora-extras-commits at redhat.com  Tue Jan 17 23:36:05 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:36:05 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.7,1.8
Message-ID: <200601172336.k0HNacjC007213@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdesklets.spec	17 Jan 2006 23:21:09 -0000	1.7
+++ gdesklets.spec	17 Jan 2006 23:36:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbmail



From fedora-extras-commits at redhat.com  Tue Jan 17 23:46:31 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:46:31 -0500
Subject: rpms/dejavu-fonts import.log,1.28,1.29
Message-ID: <200601172347.k0HNl3Il007343@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-3.fc4 on branch FC-4 from dejavu-fonts-2.2-3.fc4.src.rpm
fix comparator ?


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- import.log	16 Jan 2006 20:43:26 -0000	1.28
+++ import.log	17 Jan 2006 23:46:30 -0000	1.29
@@ -25,3 +25,4 @@
 dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706
 dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269
 dejavu-fonts-2_2-3_fc5:HEAD:dejavu-fonts-2.2-3.fc5.src.rpm:1137444196
+dejavu-fonts-2_2-3_fc4:FC-4:dejavu-fonts-2.2-3.fc4.src.rpm:1137541581



From fedora-extras-commits at redhat.com  Tue Jan 17 23:46:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:46:36 -0500
Subject: rpms/dejavu-fonts/FC-4 dejavu-fonts.spec,1.8,1.9
Message-ID: <200601172347.k0HNl9Z7007346@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311/FC-4

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-3.fc4 on branch FC-4 from dejavu-fonts-2.2-3.fc4.src.rpm
fix comparator ?


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dejavu-fonts.spec	16 Jan 2006 18:46:04 -0000	1.8
+++ dejavu-fonts.spec	17 Jan 2006 23:46:36 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,7 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Conflicts: fontconfig > = 2.3.0
+Conflicts: fontconfig >= 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -62,6 +62,9 @@
 %ghost %{fontdir}/fonts.cache-1
 
 %changelog
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-3
+- > = -> >=
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
 - Seems FC-4 and FC-3 have the same needs after all
 



From fedora-extras-commits at redhat.com  Tue Jan 17 23:50:46 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:50:46 -0500
Subject: rpms/dejavu-fonts import.log,1.29,1.30
Message-ID: <200601172351.k0HNpJJm007470@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7438

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-3.fc3 on branch FC-3 from dejavu-fonts-2.2-3.fc3.src.rpm
fix comparator ?


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- import.log	17 Jan 2006 23:46:30 -0000	1.29
+++ import.log	17 Jan 2006 23:50:46 -0000	1.30
@@ -26,3 +26,4 @@
 dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269
 dejavu-fonts-2_2-3_fc5:HEAD:dejavu-fonts-2.2-3.fc5.src.rpm:1137444196
 dejavu-fonts-2_2-3_fc4:FC-4:dejavu-fonts-2.2-3.fc4.src.rpm:1137541581
+dejavu-fonts-2_2-3_fc3:FC-3:dejavu-fonts-2.2-3.fc3.src.rpm:1137541836



From fedora-extras-commits at redhat.com  Tue Jan 17 23:50:52 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:50:52 -0500
Subject: rpms/dejavu-fonts/FC-3 dejavu-fonts.spec,1.8,1.9
Message-ID: <200601172351.k0HNpO6N007473@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7438/FC-3

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-3.fc3 on branch FC-3 from dejavu-fonts-2.2-3.fc3.src.rpm
fix comparator ?


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dejavu-fonts.spec	16 Jan 2006 18:48:05 -0000	1.8
+++ dejavu-fonts.spec	17 Jan 2006 23:50:52 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,7 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Conflicts: fontconfig > = 2.3.0
+Conflicts: fontconfig >= 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -62,6 +62,9 @@
 %ghost %{fontdir}/fonts.cache-1
 
 %changelog
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-3
+- > = -> >=
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
 - Seems FC-4 and FC-3 have the same needs after all
 



From fedora-extras-commits at redhat.com  Wed Jan 18 00:02:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 17 Jan 2006 19:02:53 -0500
Subject: owners owners.list,1.543,1.544
Message-ID: <200601180003.k0I03PXG009276@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226

Modified Files:
	owners.list 
Log Message:
New maintainer of perl-Mail-Sendmail, perl-Net-SSLeay, perl-IO-Socket-SSL,
perl-IPC-SharedCache (ville -> jpo).



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -r1.543 -r1.544
--- owners.list	17 Jan 2006 20:22:40 -0000	1.543
+++ owners.list	18 Jan 2006 00:02:52 -0000	1.544
@@ -838,14 +838,14 @@
 Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -858,7 +858,7 @@
 Fedora Extras|perl-Mail-GnuPG|Process email with GPG|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Mbox-MessageParser|A fast and simple mbox folder reader|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -878,7 +878,7 @@
 Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Jan 18 00:06:57 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 19:06:57 -0500
Subject: rpms/lzop import.log,1.4,1.5
Message-ID: <200601180008.k0I08pk9009347@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9312

Modified Files:
	import.log 
Log Message:
auto-import lzop-1.01-4.fc5 on branch devel from lzop-1.01-4.fc5.src.rpm
gcc 4.1 fest


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lzop/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:50:43 -0000	1.4
+++ import.log	18 Jan 2006 00:06:57 -0000	1.5
@@ -1,3 +1,4 @@
 lzop-1_01-0_fdr_1_rh90:HEAD:lzop-1.01-0.fdr.1.rh90.src.rpm:1099889431
 lzop-1_01-0_fdr_1_1:HEAD:lzop-1.01-0.fdr.1.1.src.rpm:1099889437
 lzop-1_01-0_fdr_1_2:HEAD:lzop-1.01-0.fdr.1.2.src.rpm:1099889443
+lzop-1_01-4_fc5:HEAD:lzop-1.01-4.fc5.src.rpm:1137542768



From fedora-extras-commits at redhat.com  Wed Jan 18 00:07:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 19:07:32 -0500
Subject: rpms/lzop/devel lzop.spec,1.7,1.8
Message-ID: <200601180008.k0I08pnN009346@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9312/devel

Modified Files:
	lzop.spec 
Log Message:
auto-import lzop-1.01-4.fc5 on branch devel from lzop-1.01-4.fc5.src.rpm
gcc 4.1 fest


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lzop.spec	22 May 2005 23:49:12 -0000	1.7
+++ lzop.spec	18 Jan 2006 00:07:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name: lzop
 Version: 1.01
-Release: 3
+Release: 4%{?dist}
 
 Summary: Real-time file compressor
 
@@ -43,6 +43,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.01-4
+- gcc 4.1 build time
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.01-3
 - rebuild on all arches
 
@@ -50,7 +53,7 @@
 - rebuilt
 
 * Tue Apr 20 2004 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0:1.01-0.fdr.1
-* Fedorization
+- Fedorization
 
 * Tue Mar 09 2004 Dag Wieers <dag at wieers.com> - 1.01-1
 - Initial package. (using DAR)



From fedora-extras-commits at redhat.com  Wed Jan 18 02:14:09 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 17 Jan 2006 21:14:09 -0500
Subject: rpms/mod_security/devel .cvsignore, 1.3, 1.4 mod_security.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200601180214.k0I2EfkF013114@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13093

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 08:39:23 -0000	1.3
+++ .cvsignore	18 Jan 2006 02:14:08 -0000	1.4
@@ -1 +1 @@
-modsecurity-apache-1.9.tar.gz
+modsecurity-apache-1.9.2.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_security.spec	15 Dec 2005 22:36:12 -0000	1.9
+++ mod_security.spec	18 Jan 2006 02:14:08 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.1
-Release: 2%{?dist}
+Version: 1.9.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -40,6 +40,9 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
+- New upstream release
+
 * Fri Dec 16 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-2
 - Bump for new httpd
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 11:32:58 -0000	1.4
+++ sources	18 Jan 2006 02:14:08 -0000	1.5
@@ -1 +1 @@
-d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz
+c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 03:08:09 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 17 Jan 2006 22:08:09 -0500
Subject: rpms/mod_security/FC-4 .cvsignore, 1.4, 1.5 mod_security.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <200601180308.k0I38fHY015052@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Dec 2005 11:29:03 -0000	1.4
+++ .cvsignore	18 Jan 2006 03:08:08 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.1.tar.gz
+modsecurity-apache-1.9.2.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_security.spec	1 Dec 2005 11:29:03 -0000	1.5
+++ mod_security.spec	18 Jan 2006 03:08:08 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.1
+Version: 1.9.2
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -40,6 +40,12 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
+- New upstream release
+
+* Fri Dec 16 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-2
+- Bump for new httpd
+
 * Thu Dec 1 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-1
 - New release 1.9.1 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 11:29:03 -0000	1.4
+++ sources	18 Jan 2006 03:08:08 -0000	1.5
@@ -1 +1 @@
-d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz
+c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 03:12:43 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 17 Jan 2006 22:12:43 -0500
Subject: rpms/mod_security/FC-3 .cvsignore, 1.3, 1.4 mod_security.spec, 1.8, 
	1.9 sources, 1.4, 1.5
Message-ID: <200601180313.k0I3DW2l015171@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:46:13 -0000	1.3
+++ .cvsignore	18 Jan 2006 03:12:42 -0000	1.4
@@ -1 +1 @@
-modsecurity-apache-1.9.tar.gz
+modsecurity-apache-1.9.2.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_security.spec	1 Dec 2005 11:31:52 -0000	1.8
+++ mod_security.spec	18 Jan 2006 03:12:42 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.1
+Version: 1.9.2
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -40,6 +40,12 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
+- New upstream release
+
+* Fri Dec 16 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-2
+- Bump for new httpd
+
 * Thu Dec 1 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-1
 - New release 1.9.1 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 11:31:52 -0000	1.4
+++ sources	18 Jan 2006 03:12:42 -0000	1.5
@@ -1 +1 @@
-d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz
+c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 05:05:31 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 00:05:31 -0500
Subject: rpms/fyre/FC-3 fyre.spec,1.9,1.10
Message-ID: <200601180507.k0I57853020818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20770/FC-3

Modified Files:
	fyre.spec 
Log Message:
Move chkconfig and service to %%preun (#178129)


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-3/fyre.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fyre.spec	1 Dec 2005 10:54:36 -0000	1.9
+++ fyre.spec	18 Jan 2006 05:05:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -14,7 +14,8 @@
 
 BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
 Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): desktop-file-utils shared-mime-info
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -54,14 +55,16 @@
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+%preun
 if [ $1 = 0 ]; then
  /sbin/chkconfig --del fyre-cluster
  /sbin/service fyre-cluster stop >> /dev/null
 fi
 
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -75,6 +78,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-11
+- Move chkconfig and service to %%preun (#178129)
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams <ivazquez ivazquez net> 1.0.0-10
 - Fix NLS in initscript
 



From fedora-extras-commits at redhat.com  Wed Jan 18 05:05:53 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 00:05:53 -0500
Subject: rpms/fyre/FC-4 fyre.spec,1.10,1.11
Message-ID: <200601180507.k0I578sp020817@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20770/FC-4

Modified Files:
	fyre.spec 
Log Message:
Move chkconfig and service to %%preun (#178129)


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-4/fyre.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fyre.spec	1 Dec 2005 10:54:42 -0000	1.10
+++ fyre.spec	18 Jan 2006 05:05:53 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -14,7 +14,8 @@
 
 BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
 Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): desktop-file-utils shared-mime-info
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -54,14 +55,16 @@
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+%preun
 if [ $1 = 0 ]; then
  /sbin/chkconfig --del fyre-cluster
  /sbin/service fyre-cluster stop >> /dev/null
 fi
 
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -75,6 +78,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-11
+- Move chkconfig and service to %%preun (#178129)
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams <ivazquez ivazquez net> 1.0.0-10
 - Fix NLS in initscript
 



From fedora-extras-commits at redhat.com  Wed Jan 18 05:06:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 00:06:33 -0500
Subject: rpms/fyre/devel fyre.spec,1.11,1.12
Message-ID: <200601180507.k0I57BT1020823@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20770/devel

Modified Files:
	fyre.spec 
Log Message:
Move chkconfig and service to %%preun (#178129)


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fyre.spec	1 Dec 2005 10:36:31 -0000	1.11
+++ fyre.spec	18 Jan 2006 05:06:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -14,7 +14,8 @@
 
 BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
 Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): desktop-file-utils shared-mime-info
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -54,14 +55,16 @@
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+%preun
 if [ $1 = 0 ]; then
  /sbin/chkconfig --del fyre-cluster
  /sbin/service fyre-cluster stop >> /dev/null
 fi
 
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -75,6 +78,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-12
+- Move chkconfig and service to %%preun (#178129)
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-11
 - Fix NLS in initscript
 



From fedora-extras-commits at redhat.com  Wed Jan 18 07:13:29 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 02:13:29 -0500
Subject: rpms/php-json/devel php-json.spec,1.2,1.3
Message-ID: <200601180714.k0I7E10X024884@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24866

Modified Files:
	php-json.spec 
Log Message:
Rebuild for new PHP


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-json.spec	31 Dec 2005 11:28:39 -0000	1.2
+++ php-json.spec	18 Jan 2006 07:13:28 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -63,5 +63,8 @@
 %{php_extdir}/json.so
 
 %changelog
+* Wed Jan 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.0-2
+- Rebuild for new PHP
+
 * Fri Dec 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.0-1
 - Initial RPM release



From fedora-extras-commits at redhat.com  Wed Jan 18 08:16:58 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 18 Jan 2006 03:16:58 -0500
Subject: rpms/fbida/devel fbida.spec,1.9,1.10
Message-ID: <200601180817.k0I8HVZE026930@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26913

Modified Files:
	fbida.spec 
Log Message:
* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-7
- moved file Ida to %{_datadir}/X11/app-defaults



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fbida.spec	24 Nov 2005 08:19:46 -0000	1.9
+++ fbida.spec	18 Jan 2006 08:16:58 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -58,6 +58,7 @@
 %{__mv} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
+%{__mv} %{buildroot}%{_sysconfdir}/X11 %{buildroot}%{_datadir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -74,7 +75,7 @@
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/ida*
 %{_bindir}/ida
-%config %{_prefix}/lib/X11/app-defaults/Ida
+%config %{_datadir}/X11/app-defaults/Ida
 
 %files fbgs
 %defattr(-, root, root, -)
@@ -82,6 +83,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-7
+- moved file Ida to %%{_datadir}/X11/app-defaults
+
 * Thu Nov 24 2005 Adrian Reber <adrian at lisas.de> - 2.03-6
 - updated for modular xorg-x11
 



From fedora-extras-commits at redhat.com  Wed Jan 18 09:32:35 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 18 Jan 2006 04:32:35 -0500
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.3,1.4
Message-ID: <200601180933.k0I9X80s029538@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29521

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdesklets.spec	17 Jan 2006 23:24:40 -0000	1.3
+++ gdesklets.spec	18 Jan 2006 09:32:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbnail schema



From fedora-extras-commits at redhat.com  Wed Jan 18 10:27:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:27:44 -0500
Subject: rpms/SIBsim4 - New directory
Message-ID: <200601181027.k0IARkBW031667@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31659/SIBsim4

Log Message:
Directory /cvs/extras/rpms/SIBsim4 added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 10:27:49 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:27:49 -0500
Subject: rpms/SIBsim4/devel - New directory
Message-ID: <200601181027.k0IARqvv031682@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31659/SIBsim4/devel

Log Message:
Directory /cvs/extras/rpms/SIBsim4/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:08 -0500
Subject: rpms/SIBsim4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601181028.k0IASAKA031716@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31704

Added Files:
	Makefile import.log 
Log Message:
Setup of module SIBsim4


--- NEW FILE Makefile ---
# Top level Makefile for module SIBsim4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:14 -0500
Subject: rpms/SIBsim4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601181028.k0IASGAp031736@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31704/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module SIBsim4


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:45 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:45 -0500
Subject: rpms/SIBsim4 import.log,1.1,1.2
Message-ID: <200601181029.k0IATHfn031805@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31770

Modified Files:
	import.log 
Log Message:
auto-import SIBsim4-0.9-1 on branch devel from SIBsim4-0.9-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jan 2006 10:28:08 -0000	1.1
+++ import.log	18 Jan 2006 10:28:45 -0000	1.2
@@ -0,0 +1 @@
+SIBsim4-0_9-1:HEAD:SIBsim4-0.9-1.src.rpm:1137580118



From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:51 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:51 -0500
Subject: rpms/SIBsim4/devel SIBsim4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601181029.k0IATN6R031809@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31770/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SIBsim4.spec 
Log Message:
auto-import SIBsim4-0.9-1 on branch devel from SIBsim4-0.9-1.src.rpm


--- NEW FILE SIBsim4.spec ---
Name:           SIBsim4
Version:        0.9
Release:        1%{?dist}
Summary:        Align expressed RNA sequences on a DNA template
Group:          Applications/Engineering
License:        GPL
URL:            http://sibsim4.sourceforge.net
Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
SIBsim4 is a modified version of the sim4 program, which is a
similarity-based tool for aligning an expressed DNA sequence (EST,
mRNA) with a genomic sequence.


%prep
%setup -q


%build
make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS" LIBS=-lm


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
install -m 755 SIBsim4 $RPM_BUILD_ROOT/%{_bindir}/
install -m 644 SIBsim4.1 $RPM_BUILD_ROOT/%{_mandir}/man1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Wed Jan 18 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9-1
- Add LIBS=-lm.

* Fri Jan 13 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9-0
- Version 0.9.

* Wed Aug 27 2004 Christian Iseli <Christian.Iseli at licr.org>
- Version 0.8.

* Wed Jun 23 2004 Christian Iseli <Christian.Iseli at licr.org>
- Version 0.7.

* Thu May 27 2004 Christian Iseli <Christian.Iseli at licr.org>
- Version 0.6.

* Fri Apr 30 2004 Christian Iseli <Christian.Iseli at licr.org>
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2006 10:28:14 -0000	1.1
+++ .cvsignore	18 Jan 2006 10:28:51 -0000	1.2
@@ -0,0 +1 @@
+SIBsim4-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2006 10:28:14 -0000	1.1
+++ sources	18 Jan 2006 10:28:51 -0000	1.2
@@ -0,0 +1 @@
+6d086c4cfd2e5b270d6ea6a5dec099b3  SIBsim4-0.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 10:34:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:34:03 -0500
Subject: owners owners.list,1.544,1.545
Message-ID: <200601181034.k0IAYaHx031895@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31878

Modified Files:
	owners.list 
Log Message:
Add SIBsim4 package.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -r1.544 -r1.545
--- owners.list	18 Jan 2006 00:02:52 -0000	1.544
+++ owners.list	18 Jan 2006 10:34:03 -0000	1.545
@@ -1145,6 +1145,7 @@
 Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 10:52:58 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 18 Jan 2006 05:52:58 -0500
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.6,
	1.7 perl-Params-Util.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601181053.k0IArUib032039@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32016

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 14:36:54 -0000	1.6
+++ .cvsignore	18 Jan 2006 10:52:58 -0000	1.7
@@ -1 +1 @@
-Params-Util-0.09.tar.gz
+Params-Util-0.10.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Util.spec	11 Jan 2006 14:36:54 -0000	1.5
+++ perl-Params-Util.spec	18 Jan 2006 10:52:58 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.09
+Version: 	0.10
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 14:36:54 -0000	1.6
+++ sources	18 Jan 2006 10:52:58 -0000	1.7
@@ -1 +1 @@
-5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz
+1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 10:53:45 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 18 Jan 2006 05:53:45 -0500
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.6,
	1.7 perl-Params-Util.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601181054.k0IAsIgw032066@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32045

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 14:36:48 -0000	1.6
+++ .cvsignore	18 Jan 2006 10:53:44 -0000	1.7
@@ -1 +1 @@
-Params-Util-0.09.tar.gz
+Params-Util-0.10.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Util.spec	11 Jan 2006 14:36:48 -0000	1.5
+++ perl-Params-Util.spec	18 Jan 2006 10:53:44 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.09
+Version: 	0.10
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 14:36:48 -0000	1.6
+++ sources	18 Jan 2006 10:53:44 -0000	1.7
@@ -1 +1 @@
-5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz
+1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 10:55:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 18 Jan 2006 05:55:24 -0500
Subject: rpms/perl-Params-Util/FC-3 .cvsignore, 1.6,
	1.7 perl-Params-Util.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601181055.k0IAtvgT032095@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32072

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 14:36:42 -0000	1.6
+++ .cvsignore	18 Jan 2006 10:55:24 -0000	1.7
@@ -1 +1 @@
-Params-Util-0.09.tar.gz
+Params-Util-0.10.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/perl-Params-Util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Util.spec	11 Jan 2006 14:36:42 -0000	1.5
+++ perl-Params-Util.spec	18 Jan 2006 10:55:24 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.09
+Version: 	0.10
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 14:36:42 -0000	1.6
+++ sources	18 Jan 2006 10:55:24 -0000	1.7
@@ -1 +1 @@
-5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz
+1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 12:30:36 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Wed, 18 Jan 2006 07:30:36 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.6,1.7
Message-ID: <200601181231.k0ICV8s2003403@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3386

Modified Files:
	streamtuner.spec 
Log Message:
only a sync of the version number with the increased one from FC3


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- streamtuner.spec	7 Jan 2006 10:13:24 -0000	1.6
+++ streamtuner.spec	18 Jan 2006 12:30:35 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 9%{?dist}
+Release: 11%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-11
+- only a sync of the version number with the increased one from FC3
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
 - desktop-file-utils dependency removed from requires(post) and requires(postun)  
 



From fedora-extras-commits at redhat.com  Wed Jan 18 12:33:51 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Wed, 18 Jan 2006 07:33:51 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.4,1.5
Message-ID: <200601181234.k0ICYNbp003478@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3461

Modified Files:
	streamtuner.spec 
Log Message:
only a sync of the version number with the increased one from FC3


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- streamtuner.spec	7 Jan 2006 10:23:02 -0000	1.4
+++ streamtuner.spec	18 Jan 2006 12:33:51 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 9%{?dist}
+Release: 11%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-11
+- only a sync of the version number with the increased one from FC3
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
 - desktop-file-utils dependency removed from requires(post) and requires(postun)  
 



From fedora-extras-commits at redhat.com  Wed Jan 18 13:27:50 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 18 Jan 2006 08:27:50 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.7, 1.8 mlmmj.spec, 1.17, 1.18 sources,
	1.7, 1.8
Message-ID: <200601181328.k0IDSMw1005475@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5454

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
- New upstream release. 1.2.9 has a serious bug in find_email_adr(), all
  should upgrade.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Dec 2005 00:06:39 -0000	1.7
+++ .cvsignore	18 Jan 2006 13:27:50 -0000	1.8
@@ -1 +1 @@
-mlmmj-1.2.9.tar.bz2
+mlmmj-1.2.10.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mlmmj.spec	15 Dec 2005 07:43:52 -0000	1.17
+++ mlmmj.spec	18 Jan 2006 13:27:50 -0000	1.18
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.9
-Release: 2.1%{?dist}
+Version: 1.2.10
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,10 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
+- New upstream release. 1.2.9 has a serious bug in find_email_adr(), all
+  should upgrade.
+
 * Thu Dec 15 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.9-2.1
 - New upstream stable release
 - Fix Release tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Dec 2005 00:06:39 -0000	1.7
+++ sources	18 Jan 2006 13:27:50 -0000	1.8
@@ -1 +1 @@
-6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2
+09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 13:33:23 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 18 Jan 2006 08:33:23 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.6, 1.7 mlmmj.spec, 1.13, 1.14 sources,
	1.6, 1.7
Message-ID: <200601181333.k0IDXt8q005551@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5528

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
- New upstream release. All users should upgrade.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Dec 2005 23:41:35 -0000	1.6
+++ .cvsignore	18 Jan 2006 13:33:22 -0000	1.7
@@ -1 +1 @@
-mlmmj-1.2.9.tar.bz2
+mlmmj-1.2.10.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mlmmj.spec	14 Dec 2005 23:41:35 -0000	1.13
+++ mlmmj.spec	18 Jan 2006 13:33:22 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.9
+Version: 1.2.10
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
+- New upstream release. All users should upgrade.
+
 * Thu Dec 15 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.9-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Dec 2005 23:41:35 -0000	1.6
+++ sources	18 Jan 2006 13:33:22 -0000	1.7
@@ -1 +1 @@
-6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2
+09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 13:35:52 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 18 Jan 2006 08:35:52 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.6, 1.7 mlmmj.spec, 1.13, 1.14 sources,
	1.6, 1.7
Message-ID: <200601181336.k0IDaPFR005658@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5633

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
- New upstream release. All users should upgrade.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2005 07:51:53 -0000	1.6
+++ .cvsignore	18 Jan 2006 13:35:52 -0000	1.7
@@ -1 +1 @@
-mlmmj-1.2.9.tar.bz2
+mlmmj-1.2.10.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mlmmj.spec	15 Dec 2005 07:51:53 -0000	1.13
+++ mlmmj.spec	18 Jan 2006 13:35:52 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.9
+Version: 1.2.10
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
+- New upstream release. All users should upgrade.
+
 * Thu Dec 15 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.9-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Dec 2005 07:51:53 -0000	1.6
+++ sources	18 Jan 2006 13:35:52 -0000	1.7
@@ -1 +1 @@
-6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2
+09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 13:38:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 08:38:16 -0500
Subject: rpms/synce-trayicon/devel synce-trayicon.spec,1.2,1.3
Message-ID: <200601181338.k0IDcmh8005719@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5702

Modified Files:
	synce-trayicon.spec 
Log Message:
- bump release



Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- synce-trayicon.spec	13 Dec 2005 23:21:19 -0000	1.2
+++ synce-trayicon.spec	18 Jan 2006 13:38:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -53,6 +53,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-5
+- bump release
+
 * Wed Dec 14 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.0-4
 - add dist



From fedora-extras-commits at redhat.com  Wed Jan 18 13:43:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 08:43:50 -0500
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 sylpheed-claws.spec, 1.32, 1.33
Message-ID: <200601181344.k0IDiMgF005829@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5801

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Jan 2006 07:52:38 -0000	1.13
+++ .cvsignore	18 Jan 2006 13:43:50 -0000	1.14
@@ -1 +1 @@
-sylpheed-claws-2.0.0-rc3.tar.bz2
+sylpheed-claws-2.0.0-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Jan 2006 07:52:38 -0000	1.14
+++ sources	18 Jan 2006 13:43:50 -0000	1.15
@@ -1 +1 @@
-105875aa5c853f47c38996bd8820a49e  sylpheed-claws-2.0.0-rc3.tar.bz2
+a3efc6cedbd36cfd3f5f636f76cad61c  sylpheed-claws-2.0.0-rc4.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sylpheed-claws.spec	9 Jan 2006 07:52:38 -0000	1.32
+++ sylpheed-claws.spec	18 Jan 2006 13:43:50 -0000	1.33
@@ -2,12 +2,12 @@
 
 Name:           sylpheed-claws
 Version:        2.0.0
-Release:        0.rc3%{?dist}
+Release:        0.rc4%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc3.tar.bz2
+Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc4.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -47,7 +47,7 @@
 for development with %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-rc3
+%setup -q -n %{name}-%{version}-rc4
 
 %build
 #%if %openssl_pc
@@ -82,7 +82,7 @@
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
-%{__install} %{_builddir}/%{name}-%{version}-rc3/sylpheed-claws.png \
+%{__install} %{_builddir}/%{name}-%{version}-rc4/sylpheed-claws.png \
 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
 %clean
@@ -113,6 +113,10 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.0.0-0.rc4
+- version upgrade
+
 * Mon Jan 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-0.rc3
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Jan 18 13:44:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 08:44:43 -0500
Subject: rpms/libopensync-plugin-evolution2/devel
	libopensync-plugin-evolution2.spec, 1.2, 1.3
Message-ID: <200601181345.k0IDjG1k005930@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5835

Modified Files:
	libopensync-plugin-evolution2.spec 
Log Message:
- bump release



Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/libopensync-plugin-evolution2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
+++ libopensync-plugin-evolution2.spec	18 Jan 2006 13:44:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
 Version:        0.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
+- bump release
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 



From fedora-extras-commits at redhat.com  Wed Jan 18 13:51:47 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 18 Jan 2006 08:51:47 -0500
Subject: fedora-security/audit fc4,1.130,1.131 fc5,1.41,1.42
Message-ID: <200601181351.k0IDplIn006008@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988

Modified Files:
	fc4 fc5 
Log Message:
Note the new thunderbird issue doesn't affect us.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- fc4	17 Jan 2006 16:12:05 -0000	1.130
+++ fc4	18 Jan 2006 13:51:40 -0000	1.131
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERALBE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
 CVE-2006-0200 version (aaph, 5.1.0 5.1.1 only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- fc5	17 Jan 2006 17:11:08 -0000	1.41
+++ fc5	18 Jan 2006 13:51:40 -0000	1.42
@@ -15,6 +15,7 @@
 
 ** are items that need attention
 
+CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERABLE (php)
 CVE-2006-0207 VULNERABLE (php)
 CVE-2006-0200 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Wed Jan 18 13:56:45 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:56:45 -0500
Subject: rpms/jakarta-commons-cli - New directory
Message-ID: <200601181356.k0IDulkb006071@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/jakarta-commons-cli

Log Message:
Directory /cvs/extras/rpms/jakarta-commons-cli added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 13:56:51 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:56:51 -0500
Subject: rpms/jakarta-commons-cli/devel - New directory
Message-ID: <200601181356.k0IDurk7006086@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/jakarta-commons-cli/devel

Log Message:
Directory /cvs/extras/rpms/jakarta-commons-cli/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:09 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:09 -0500
Subject: rpms/jakarta-commons-cli Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601181357.k0IDvBV8006124@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6112

Added Files:
	Makefile import.log 
Log Message:
Setup of module jakarta-commons-cli


--- NEW FILE Makefile ---
# Top level Makefile for module jakarta-commons-cli
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:15 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:15 -0500
Subject: rpms/jakarta-commons-cli/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601181357.k0IDvHkx006144@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6112/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jakarta-commons-cli


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:52 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:52 -0500
Subject: rpms/jakarta-commons-cli import.log,1.1,1.2
Message-ID: <200601181358.k0IDwOJJ006220@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6183

Modified Files:
	import.log 
Log Message:
auto-import jakarta-commons-cli-1.0-6jpp_5 on branch devel from jakarta-commons-cli-1.0-6jpp_5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jan 2006 13:57:08 -0000	1.1
+++ import.log	18 Jan 2006 13:57:52 -0000	1.2
@@ -0,0 +1 @@
+jakarta-commons-cli-1_0-6jpp_5:HEAD:jakarta-commons-cli-1.0-6jpp_5.src.rpm:1137592664



From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:58 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:58 -0500
Subject: rpms/jakarta-commons-cli/devel jakarta-commons-cli-crosslink.patch, 
	NONE, 1.1 jakarta-commons-cli.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601181358.k0IDwUB6006224@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6183/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jakarta-commons-cli-crosslink.patch jakarta-commons-cli.spec 
Log Message:
auto-import jakarta-commons-cli-1.0-6jpp_5 on branch devel from jakarta-commons-cli-1.0-6jpp_5.src.rpm

jakarta-commons-cli-crosslink.patch:

--- NEW FILE jakarta-commons-cli-crosslink.patch ---
--- build.xml~	2002-11-06 07:10:24.000000000 +0200
+++ build.xml	2003-10-12 22:24:53.000000000 +0300
@@ -9,7 +9,9 @@
   <property name="distdir" value="dist"></property>
   <property name="javadocdir" value="target/docs/apidocs"></property>
   <property name="final.name" value="commons-cli-1.0-beta-2-dev"></property>
-  
+  <property name="j2se.javadoc"
+    value="http://java.sun.com/j2se/1.4/docs/api/"/>
+
   <target name="init" description="o Initializes some properties">
 
     <condition property="noget">
@@ -121,6 +123,7 @@
         </fileset>
         <pathelement location="target/${final.name}.jar"></pathelement>
       </classpath>
+      <link href="${j2se.javadoc}"/>
     </javadoc>
  
   </target>
@@ -155,4 +158,4 @@
   </target>
 
 </project>
-    
\ No newline at end of file
+    


--- NEW FILE jakarta-commons-cli.spec ---
%define base_name       cli
%define short_name      commons-%{base_name}
%define name            jakarta-%{short_name}
%define section         devel

Name:           %{name}
Version:        1.0
Release:        6jpp_5%{?dist}
Epoch:          0
Summary:        Command Line Interface Library for Java
License:        Apache Software License
Group:          Development/Libraries
URL:            http://jakarta.apache.org/commons/cli/
Source:         http://archive.apache.org/dist/jakarta/commons/cli/source/cli-1.0-src.tar.gz
Patch0:         %{name}-crosslink.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires:  ant >= 0:1.6, ant-junit >= 0:1.6, junit, jakarta-commons-lang, jakarta-commons-logging
BuildRequires:  jpackage-utils >= 0:1.5
# libgcj aot-compiled native libraries
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
Requires:       jakarta-commons-lang, jakarta-commons-logging

%description
The CLI library provides a simple and easy to use API for working with
the command line arguments and options.

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

%description    javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{short_name}-%{version}
%patch0 -p0


%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=%(build-classpath commons-logging commons-lang )
export CLASSPATH="$CLASSPATH:target/%{short_name}.jar:target/test-classes"
 # for tests
mkdir lib
ant \
  -Dbuild.sysclasspath=only \
  -Dfinal.name=%{short_name} \
  -Dj2se.javadoc=%{_javadocdir}/java \
  jar test dist


%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(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)

aot-compile-rpm

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p %{_bindir}/rebuild-gcj-db

%postun -p %{_bindir}/rebuild-gcj-db

%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt
%{_javadir}/*
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}


%changelog
* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 0:1.0-6jpp_5
- Fix Summary.
- Clean up %files.

* Tue Jan 17 2006 Anthony Green <green at redhat.com> - 0:1.0-6jpp_4
- Build for Fedora.
- Remove unversioned javadoc dir.
- Adjust Groups.

* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0-6jpp_3fc
- rebuilt again

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0-6jpp_2fc
- rebuilt

* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-6jpp_1fc
- Build into Fedora.

* Mon Dec 20 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.0-6jpp_1rh
- First Red Hat release

* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0-6jpp
- Rebuild with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-5jpp
- Void change

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-4jpp
- Upgrade to Ant 1.6.X

* Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0-3jpp
- Non-versioned javadoc dir symlink.
- Crosslink with local J2SE javadocs.

* Fri Apr  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0-2jpp
- Rebuild for JPackage 1.5.

* Tue Dec 10 2002 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-1jpp
- 1.0, first JPackage release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2006 13:57:15 -0000	1.1
+++ .cvsignore	18 Jan 2006 13:57:58 -0000	1.2
@@ -0,0 +1 @@
+cli-1.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2006 13:57:15 -0000	1.1
+++ sources	18 Jan 2006 13:57:58 -0000	1.2
@@ -0,0 +1 @@
+ba34d585046b1f17dacbb13b377f4255  cli-1.0-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 14:00:42 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 09:00:42 -0500
Subject: owners owners.list,1.545,1.546
Message-ID: <200601181401.k0IE1IeT007949@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6271

Modified Files:
	owners.list 
Log Message:
Add jakarta-commons-cli



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -r1.545 -r1.546
--- owners.list	18 Jan 2006 10:34:03 -0000	1.545
+++ owners.list	18 Jan 2006 14:00:42 -0000	1.546
@@ -424,6 +424,7 @@
 Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|jakarta-commons-cli|Command Line Interface Library for Java|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|jed|A fast, compact editor based on the S-Lang screen library.|notting at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 16:42:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 18 Jan 2006 11:42:30 -0500
Subject: owners owners.list,1.546,1.547
Message-ID: <200601181643.k0IGh2Ud012744@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12716

Modified Files:
	owners.list 
Log Message:
Updated my email address to be consistent with Fedora Account System (again, undone by 1.460 accident)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -r1.546 -r1.547
--- owners.list	18 Jan 2006 14:00:42 -0000	1.546
+++ owners.list	18 Jan 2006 16:42:29 -0000	1.547
@@ -250,16 +250,16 @@
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|galculator|GTK 2 based scientific calculator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -292,7 +292,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|
@@ -318,7 +318,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -357,8 +357,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -411,7 +411,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -506,15 +506,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -552,7 +552,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 16:44:37 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 18 Jan 2006 11:44:37 -0500
Subject: owners owners.list,1.547,1.548
Message-ID: <200601181645.k0IGj9C7012784@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12765

Modified Files:
	owners.list 
Log Message:
Taking ownership of orphaned libsigc++


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -r1.547 -r1.548
--- owners.list	18 Jan 2006 16:42:29 -0000	1.547
+++ owners.list	18 Jan 2006 16:44:36 -0000	1.548
@@ -553,7 +553,7 @@
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++|Typesafe Signal Framework for C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++|Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|oliver at linux-kernel.at|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 20:43:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 18 Jan 2006 15:43:27 -0500
Subject: rpms/perl-MailTools/devel .cvsignore, 1.6, 1.7 perl-MailTools.spec, 
	1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200601182043.k0IKhxci020902@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20881

Modified Files:
	.cvsignore perl-MailTools.spec sources 
Log Message:
* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.72-1
- 1.72.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 08:56:48 -0000	1.6
+++ .cvsignore	18 Jan 2006 20:43:26 -0000	1.7
@@ -1 +1 @@
-MailTools-1.71.tar.gz
+MailTools-1.72.tar.gz


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-MailTools.spec	6 Jan 2006 08:56:48 -0000	1.13
+++ perl-MailTools.spec	18 Jan 2006 20:43:26 -0000	1.14
@@ -1,6 +1,6 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
-Version:        1.71
+Version:        1.72
 Release:        1%{?dist}
 
 License:        GPL or Artistic
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.72-1
+- 1.72.
+
 * Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.71-1
 - 1.71.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 08:56:48 -0000	1.6
+++ sources	18 Jan 2006 20:43:26 -0000	1.7
@@ -1 +1 @@
-f42de7cd61246870b9c08369fd4a5e60  MailTools-1.71.tar.gz
+9e9d40fe0f3acbcdefdfe678f478436e  MailTools-1.72.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 20:46:37 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:46:37 -0500
Subject: rpms/wp_tray - New directory
Message-ID: <200601182046.k0IKkdfl021000@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20992/wp_tray

Log Message:
Directory /cvs/extras/rpms/wp_tray added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 20:46:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:46:43 -0500
Subject: rpms/wp_tray/devel - New directory
Message-ID: <200601182046.k0IKkjDt021015@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20992/wp_tray/devel

Log Message:
Directory /cvs/extras/rpms/wp_tray/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 20:47:02 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:47:02 -0500
Subject: rpms/wp_tray Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601182047.k0IKl4VJ021049@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21037

Added Files:
	Makefile import.log 
Log Message:
Setup of module wp_tray


--- NEW FILE Makefile ---
# Top level Makefile for module wp_tray
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 18 20:47:08 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:47:08 -0500
Subject: rpms/wp_tray/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601182047.k0IKlALY021069@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21037/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wp_tray


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 18 20:48:07 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:48:07 -0500
Subject: rpms/wp_tray import.log,1.1,1.2
Message-ID: <200601182048.k0IKmdLC021145@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21108

Modified Files:
	import.log 
Log Message:
auto-import wp_tray-0.5.1-1 on branch devel from wp_tray-0.5.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jan 2006 20:47:02 -0000	1.1
+++ import.log	18 Jan 2006 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+wp_tray-0_5_1-1_fc5:HEAD:wp_tray-0.5.1-1.src.rpm:1137617280



From fedora-extras-commits at redhat.com  Wed Jan 18 20:48:13 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:48:13 -0500
Subject: rpms/wp_tray/devel wp_tray-0.5.1-paths.patch, NONE, 1.1 wp_tray.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601182048.k0IKmjpv021149@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21108/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wp_tray-0.5.1-paths.patch wp_tray.spec 
Log Message:
auto-import wp_tray-0.5.1-1 on branch devel from wp_tray-0.5.1-1.src.rpm

wp_tray-0.5.1-paths.patch:

--- NEW FILE wp_tray-0.5.1-paths.patch ---
--- wp_tray-0.5.1/src/Makefile.in.paths	2006-01-17 12:22:42.000000000 -0500
+++ wp_tray-0.5.1/src/Makefile.in	2006-01-17 12:24:24.000000000 -0500
@@ -322,7 +322,7 @@
 	-rm -f config.h stamp-h1
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+	test -z "$(DESTDIR)$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -396,7 +396,7 @@
 uninstall-info-am:
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+	test -z "$(DESTDIR)$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
 	@list='$(glade_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- wp_tray-0.5.1/Makefile.in.paths	2006-01-17 12:32:12.000000000 -0500
+++ wp_tray-0.5.1/Makefile.in	2006-01-17 12:32:58.000000000 -0500
@@ -306,7 +306,7 @@
 uninstall-info-am:
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
+	test -z "$(DESTDIR)$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
 	@list='$(icon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -323,7 +323,7 @@
 	done
 install-schemasDATA: $(schemas_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
+	test -z "$(DESTDIR)$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
 	@list='$(schemas_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -340,7 +340,7 @@
 	done
 install-serverDATA: $(server_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+	test -z "$(DESTDIR)$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
 	@list='$(server_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \


--- NEW FILE wp_tray.spec ---
Name:           wp_tray
Version:        0.5.1
Release:        1%{?dist}
Summary:        A wallpaper-changing applet for GNOME

Group:          Amusements/Graphics
License:        GPL
URL:            http://planetearthworm.com/projects/wp_tray/
Source0:        http://planetearthworm.com/projects/wp_tray/files/%{name}-%{version}.tar.gz
Patch:          wp_tray-0.5.1-paths.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext libglademm24-devel libgnomecanvasmm26-devel
BuildRequires:  gconfmm26-devel libgnomemm26-devel libgnomeuimm26-devel
BuildRequires:  gnome-panel-devel boost-devel

%description
Wallpaper Tray is a GNOME applet used for changing your wallpaper.

%prep
%setup -q
%patch -p 1 -b .paths

%build
%configure --with-boostfilesystem=/usr/lib/libboost_filesystem.so \
  --with-boostregex=/usr/lib/libboost_regex.so
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null  || :
killall -HUP gconfd-2 &>/dev/null || :

%postun
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas >/dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi

%preun
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_libdir}/bonobo/servers/*.server
%{_libexecdir}/*
%{_sysconfdir}/gconf/schemas/*.schemas

%changelog
* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.1-1
- Upstream update
- Merge Chris Chabot's spec file changes

* Mon Jan  2 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4.6-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2006 20:47:08 -0000	1.1
+++ .cvsignore	18 Jan 2006 20:48:13 -0000	1.2
@@ -0,0 +1 @@
+wp_tray-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2006 20:47:08 -0000	1.1
+++ sources	18 Jan 2006 20:48:13 -0000	1.2
@@ -0,0 +1 @@
+b94b32245558cadd384538ff7d8df403  wp_tray-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 21:51:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 16:51:51 -0500
Subject: rpms/torsmo/FC-3 torsmo.spec,1.1,1.2
Message-ID: <200601182152.k0ILqNSw023239@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23207/FC-3

Modified Files:
	torsmo.spec 
Log Message:
- substitute devel spec with <= fc4 spec



Index: torsmo.spec
===================================================================
RCS file: /cvs/extras/rpms/torsmo/FC-3/torsmo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torsmo.spec	17 Jan 2006 22:26:34 -0000	1.1
+++ torsmo.spec	18 Jan 2006 21:51:51 -0000	1.2
@@ -10,14 +10,11 @@
 Source1:        torsmo.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  desktop-file-utils
 
-# modular X
-BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel
-
 %description
 Torsmo (TyopoytaORvelo System MOnitor) is a system monitor that sits in the
 corner of your desktop. Torsmo can show various information about your system
@@ -30,8 +27,7 @@
 %setup -q
 
 %build
-%configure --enable-xft --enable-proc-uptime --enable-seti \
---x-includes=%{_includedir} --x-libraries=%{_libdir}
+%configure --enable-xft --enable-proc-uptime --enable-seti
 make %{?_smp_mflags}
 
 %install
@@ -62,7 +58,6 @@
 * Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-3
 - add sample rc
-- switch to devel BR
 
 * Sun Jan 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-2



From fedora-extras-commits at redhat.com  Wed Jan 18 21:51:57 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 16:51:57 -0500
Subject: rpms/torsmo/FC-4 torsmo.spec,1.1,1.2
Message-ID: <200601182152.k0ILqTDB023242@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23207/FC-4

Modified Files:
	torsmo.spec 
Log Message:
- substitute devel spec with <= fc4 spec



Index: torsmo.spec
===================================================================
RCS file: /cvs/extras/rpms/torsmo/FC-4/torsmo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torsmo.spec	17 Jan 2006 22:26:34 -0000	1.1
+++ torsmo.spec	18 Jan 2006 21:51:56 -0000	1.2
@@ -10,14 +10,11 @@
 Source1:        torsmo.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  desktop-file-utils
 
-# modular X
-BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel
-
 %description
 Torsmo (TyopoytaORvelo System MOnitor) is a system monitor that sits in the
 corner of your desktop. Torsmo can show various information about your system
@@ -30,8 +27,7 @@
 %setup -q
 
 %build
-%configure --enable-xft --enable-proc-uptime --enable-seti \
---x-includes=%{_includedir} --x-libraries=%{_libdir}
+%configure --enable-xft --enable-proc-uptime --enable-seti
 make %{?_smp_mflags}
 
 %install
@@ -62,7 +58,6 @@
 * Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-3
 - add sample rc
-- switch to devel BR
 
 * Sun Jan 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-2



From fedora-extras-commits at redhat.com  Wed Jan 18 22:10:58 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 18 Jan 2006 17:10:58 -0500
Subject: rpms/mock/devel mock-0.4-unpackaged-files-fix.patch, NONE,
	1.1 mock.spec, 1.8, 1.9
Message-ID: <200601182211.k0IMBjRC025106@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25062

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-unpackaged-files-fix.patch 
Log Message:
* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
- Add unpackaged files fix from RH#163576 (Adrian Reber)



mock-0.4-unpackaged-files-fix.patch:

--- NEW FILE mock-0.4-unpackaged-files-fix.patch ---
--- mock-0.4/mock.py.rpmbuild-fix	2006-01-18 17:05:43.000000000 -0500
+++ mock-0.4/mock.py	2006-01-18 17:06:14.000000000 -0500
@@ -311,7 +311,7 @@
         srpmfn = os.path.basename(srpm_in)
         # run with --nodeps b/c of the check above we know we have our build
         # deps satisfied.
-        cmd = "%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
+        cmd = "cd /;%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
              self.config['runuser'], self.target_arch, srpm_in, 
              self.config['chrootuser'])
         


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mock.spec	16 Aug 2005 16:40:28 -0000	1.8
+++ mock.spec	18 Jan 2006 22:10:57 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: mock-0.4-unpackaged-files-fix.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -17,6 +18,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .unpackaged-files-fix
+
 %build
 make
 
@@ -65,6 +68,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
+- Add unpackaged files fix from RH#163576 (Adrian Reber)
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
 - Fix ?fedora check when not defined (would fail to parse).
 



From fedora-extras-commits at redhat.com  Wed Jan 18 22:16:27 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 18 Jan 2006 17:16:27 -0500
Subject: rpms/mock/FC-4 mock-0.4-unpackaged-files-fix.patch, NONE,
	1.1 mock.spec, 1.8, 1.9
Message-ID: <200601182217.k0IMH0sh025250@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25227

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-unpackaged-files-fix.patch 
Log Message:
* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
- Add unpackaged files fix from RH#163576 (Adrian Reber)



mock-0.4-unpackaged-files-fix.patch:

--- NEW FILE mock-0.4-unpackaged-files-fix.patch ---
--- mock-0.4/mock.py.rpmbuild-fix	2006-01-18 17:05:43.000000000 -0500
+++ mock-0.4/mock.py	2006-01-18 17:06:14.000000000 -0500
@@ -311,7 +311,7 @@
         srpmfn = os.path.basename(srpm_in)
         # run with --nodeps b/c of the check above we know we have our build
         # deps satisfied.
-        cmd = "%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
+        cmd = "cd /;%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
              self.config['runuser'], self.target_arch, srpm_in, 
              self.config['chrootuser'])
         


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mock.spec	16 Aug 2005 16:40:22 -0000	1.8
+++ mock.spec	18 Jan 2006 22:16:27 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: mock-0.4-unpackaged-files-fix.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -17,6 +18,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .unpackaged-files-fix
+
 %build
 make
 
@@ -65,6 +68,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
+- Add unpackaged files fix from RH#163576 (Adrian Reber)
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
 - Fix ?fedora check when not defined (would fail to parse).
 



From fedora-extras-commits at redhat.com  Wed Jan 18 22:18:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 18 Jan 2006 17:18:03 -0500
Subject: rpms/hddtemp/devel hddtemp.db,1.8,1.9 hddtemp.spec,1.14,1.15
Message-ID: <200601182218.k0IMIZaV025275@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.7.beta14
- Update drive database to 2006-01-18.
- Init script is not a config file.
- Mark consle.perms snippet as noreplace.



Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hddtemp.db	21 Sep 2005 18:09:14 -0000	1.8
+++ hddtemp.db	18 Jan 2006 22:18:03 -0000	1.9
@@ -45,28 +45,44 @@
 # "ExcelStor Technology CT215"    ??? ? "ExcelStor CT215"
 "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
 "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
+"ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)"
 "ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)"
+"ExcelStor Technology J880" 194 C "ExcelStor Technology J880 (80 GB)"
+
 
 
 ########################################
 ############# Fujitsu drives
 ########################################
 "FUJITSU MHM2100AT"		0    C  "Fujitsu MHM2100AT"
+
+"FUJITSU MHN2150AT"		194  C  "Fujitsu MHN2150AT"
 "FUJITSU MHN2200AT"		194  C  "Fujitsu MHN2200AT"
 "FUJITSU MHN2300AT"		194  C  "Fujitsu MHN2300AT"
+
 "FUJITSU MHR2020AT"		194  C  "Fujitsu MHR2020AT"
 "FUJITSU MHR2030AT"		194  C  "Fujitsu MHR2030AT"
+
 "FUJITSU MHS2030AT"		194  C  "Fujitsu MHS2030AT"
 "FUJITSU MHS2040AT"		194  C  "Fujitsu MHS2040AT"
 "FUJITSU MHS2060AT"             194  C  "Fujitsu MHS2060AT (Apple PowerBook G4)"
+
+"FUJITSU MHT2030AC"             194  C  "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)"
+
 "FUJITSU MHT2030AT"             194  C  "Fujitsu MHT2030AT"
 "FUJITSU MHT2040AH"		194  C  "Fujitsu MHT2040AH"
 "FUJITSU MHT2040AT"		194  C  "Fujitsu MHT2040AT"
 "FUJITSU MHT2060AH"		194  C  "Fujitsu MHT2060AH"
 "FUJITSU MHT2060AT"		194  C  "Fujitsu MHT2060AT"
 "FUJITSU MHT2080AH"		194  C  "Fujitsu MHT2080AH"
-"FUJITSU MHN2150AT"		194  C  "Fujitsu MHN2150AT"
+
+"FUJITSU MHU2100AT"		194  C  "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)"
+
+"FUJITSU MHV2100AT"		194  C  "FUJITSU MHV2100AT" 
+"FUJITSU MHV2080AH"             194  C  "FUJITSU MHV2080AH"
+
 "FUJITSU MPF3204AH"		194  C  "Fujitsu MPF3204AH"
+
 "FUJITSU MPG3204AT.*"		194  C  "Fujitsu MPG3204AT"
 "FUJITSU MPG3307AT"		194  C  "Fujitsu MPG3307AT"
 "FUJITSU MPG3409AT.*"		194  C  "Fujitsu MPG3409AT E"
@@ -74,6 +90,8 @@
 "FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 "FUJITSU MPG3102AT E"           194  C  "FUJITSU MPG3102AT E"
 
+
+
 ########################################
 ############# Hitachi drives
 ########################################
@@ -87,7 +105,7 @@
 "HITACHI_DK23DA-[234]0"		194  C  "Hitachi DK23DA series"
 "HITACHI_DK23EA-[346]0"		194  C  "Hitachi DK23EA series"
 "HITACHI_DK23EB-40"             194  C  "Hitachi DK23EB series"
-"HITACHI_DK23FA-[46]0"          194  C  "Hitachi DK23FA series"
+"HITACHI_DK23FA-[468]0"		194  C  "Hitachi DK23FA series"
 "HITACHI_DK23FB-[46]0"		194  C  "Hitachi DK23FB series"
 
 "HDS722516VLAT[28]0"            194  C  "Hitachi Deskstar 7K250 160GB 2/8MB cache"
@@ -100,11 +118,12 @@
 
 "HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
 
-"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA"
+"HDT7225(16|25)DLAT80"          194  C  "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA"
 "HDT722516DLA380 V43O"		194  C  "Hitachi T7K250 SATA"
 "HDS722580VLSA80"		194  C  "Hitachi Deskstar 7K250 80GB SATA"
 "HDS728040PLAT20"		194  C  "Hitachi Deskstar 7K80 40GB"
 
+"HTE721010G9AT00"		194  C  "Hitachi Travelstar 100GB (7200RPM)"
 "HTE726060M9AT00"               194  C  "Hitachi Travelstar 60GB (7200RPM)"
 "HTS424030M9AT00"               194  C  "Hitachi Travelstar 30GB (4200RPM)"
 "HTS424040M9AT00"               194  C  "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
@@ -115,8 +134,10 @@
 "HTS548040M9AT00"		194  C  "Hitachi Travelstar 40GB (5400RPM)"
 "HTS548060M9AT00"		194  C  "Hitachi Travelstar 60GB (5400RPM)"
 "HTS548080M9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
+"HTS721080G9AT00"               194  C  "Hitachi Travelstar 7K100 80GB (7200RPM)"
 "HTS726060M9AT00"		194  C  "Hitachi Travelstar 60GB"
 
+
 ########################################
 ############# IBM drives
 ########################################
@@ -172,6 +193,7 @@
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
 "Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
+"Maxtor 6L300R0"					194  C  "Maxtor 6L300R0"
 "Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7L300R0"					194  C  "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
@@ -203,6 +225,7 @@
 #"SAMSUNG SP2014N"					194  C	"Samsung SpinPoint 200GB, 7200RPM, 8MB cache"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C"	194  C  "Samsung SpinPoint P80 series - SATA"
 "SAMSUNG SP0411N"					194  C  "Samsung SpinPoint PL40 serie"
+"SAMSUNG SP0822N"					194  C  "Samsung SP0822N"
 "SAMSUNG SP(0812|1213|1614)C"				194  C  "Samsung Spinpoint 160G SATA"
 "SAMSUNG SV0432A"					0    C  "Samsung SV0432A"
 "SAMSUNG SV3002H"					0    C  "Samsung SpinPoint V30 serie"
@@ -213,7 +236,6 @@
 "SAMSUNG SV4012H"					194  C  "Samsung 40GB, 5400RPM, 2MB cache"
 "SAMSUNG SP(2014|2514)N"				194  C	"Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
 
-
 ########################################
 ############# Seagate drives
 ########################################
@@ -255,45 +277,63 @@
 "ST380021A"				194  C  "Seagate Barracuda IV ST380021A"
 "ST380022A"				194  C  "Seagate Barracuda U7 80022, Ultra ATA/100"
 "ST380023A"                             194  C  "Seagate Barracuda V ST380023A"
+"ST380817AS"                            194  C  "Seagate Barracuda 7200.7 80GB - SATA"
 "ST39111A"				194  C  "Seagate ST39111A (from Sun Ultra)"
 "ST3120020A"				194  C  "Seagate ST3120020A"
 "ST3120022A"				194  C  "Seagate Baraccuda 7200.7 120GB"
 "ST3120023A"                            194  C  "Seagate Barracuda V ST3120023A"
 "ST3120024A"				194  C  "Seagate Barracuda V ST3120024A"
+"ST3120025ACE"				194  C  "Seagate Barracuda V ST3120025ACE"
 "ST3120026A"				194  C  "Seagate Barracuda V ST3120026A"
 "ST3160021A"				194  C  "Seagate Barracuda 7200.7 - ST3160021A"
-"ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)"
-"ST3200822A"                            194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)"
+"ST3160827AS"				194  C  "Seagate Barracuda 7200.7 160GB (Serial ATA)" 
+"ST3200021A"				194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200822(A|AS)"                       194  C  "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)"
 "ST3200826A"                            194  C  "Seagate Barracuda 7200.8 200Gb"
+"ST3250623A"                            194  C  "Seagate Barracuda 7200.16 250GB"
 "ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
 "ST3250823A"                            194  C  "Seagate Barracuda 7200.7 Plus 250GB"
+"ST3250823NS"                           194  C  "Seagate NL35 SATA (RAID-Edition) 7200 250GB"
 "ST3300831A"				194  C  "Seagate 300GB ST3300831A"
 "ST3400832A"                            194  C  "Seagate Barracuda 7200.8 Plus 400GB"
+"ST910021A"				194  C  "Seagate Momentus 7200.1 100GB" 
 "ST9100823A"				194  C	"Seagate Momentus 5400.2 100GB"
+"ST9120821A"				194  C  "Seagate Momentus 5400.2 120GB"
 "ST94019A"				194  C  "Seagate ST94019A"
+"ST94813A"                              194  C  "Seagate Momentus 5400.2 40GB"
 "ST94[08]11A"				194  C  "Seagate ST94011A"
 "ST960821A"                             194  C  "Seagate ST960821A"
 "ST960822A"                             194  C  "Seagate Momentus 5400.2 60GB"
+"ST96812AS"				194  C  "Seagate Momentus 5400.2 60GB SATA"
+"ST9808211A"				194  C  "Seagate Momentus 5400.2 80GB"
 
 ########################################
 ############# TOSHIBA Laptops
 ########################################
 "MK4313MAT"				220  C  "Toshiba MK4313MAT"
+"TOSHIBA MK1032GAX"                     194  C  "Toshiba MK1032GAX"
 "TOSHIBA MK1517GAP"			0    C  "Toshiba MK1517GAP"
 "TOSHIBA MK2018GAS"			226  F  "Toshiba MK2018GAS"
 "TOSHIBA MK2023GAS"			194  C  "Toshiba MK2023GAS"
+
 "TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 "TOSHIBA MK3025GAS"                     194  C  "Toshiba MK3025GAS" 
+
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
 "TOSHIBA MK4021GAS"			194  C  "Toshiba MK4021GAS"
 "TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK4026GAS"			194  C  "Toshiba MK4026GAS 40 Go"
+"TOSHIBA MK4032GAX"                     194  C  "Toshiba MK4032GAX" 
+
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 "TOSHIBA MK6025GAS"			194  C  "Toshiba MK6025GAS"
+"TOSHIBA MK6026GAX"			194  C  "Toshiba MK6026GAX" 
 "TOSHIBA MK8025GAS"			194  C  "Toshiba MK8025GAS"
 "TOSHIBA MK8026GAX"			194  C  "Toshiba MK8026GAX" 
+
 "MK4025GAS"                             194  C  "Toshiba MK4025GAS"
 
 
@@ -302,57 +342,67 @@
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
-"WDC AC22000L"						  0 C "Western Digital Caviar AC22000"
-"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
-"WDC AC418000D"						231 C "Western Digital AC418000D"
-"WDC WD135BA"						231 C "Western Digital WD135BA"
-
-"WDC WD100EB-00BHF0"            			  0 C "Western Digital 100EB-00BHF0"
-"WDC WD200BB-00AUA1"            			  0 C "Western Digital Caviar WD200BB"
-#"WDC WD200BB-60DGA0"					  0 C "Western Digital Caviar WD200BB"
-"WDC WD300BB-00CAA0"					  0 C "Western Digital WD300BB"
-"WDC WD360GD-00FNA0"					194 C "Western Digital SATA Raptor 36.7GB"
-"WDC WD400BB-00J[KH]A0"					194 C "Western Digital Caviar WD400BB"
-"WDC WD400BB-23JHC0"					194 C "Western Digital 23JHC0"
-#"WDC WD400BB-00GFA0"					  0 C ""
-"WDC WD400BB-55HEA0"					194 C "Western Digital Caviar WD400BB"
-"WDC WD400BB-(18CA|00DE)A0"     			  0 C "Western Digital Caviar WD400BB"
-"WDC WD400BB-75FJA1"					194 C "Western Digital Caviar WD400BB"
-"WDC WD400EB-00CPF0"					  0 C "Western Digital 400EB-00CPF0"
-"WDC WD400JB-00(JJ|FM|FS)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
-"WDC WD400JB-00ETA0"					194 C "Western Digital 400JB-00ETA0"
-"WDC WD400JB-00JJC0"					194 C "Western Digital 400JB-00JJC0 40GB"
-"WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
-"WDC WD600JB-00ETA0"					194 C "Western Digital 600JB-00ETA0"
-"WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
-"WDC WD740GD-00FL21.0"					194 C "Western Digital SATA Raptor"
-"WDC WD740GD-(00FLC0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
-"WDC WD800BB-00CAA1"					  0 C "Western Digital WD800BB-00CAA1"
-"WDC WD800BB-(00|22)DKA0"				194 C "Western Digital WD800BB 80 Go"
-"WDC WD800BB-32CCB0"					194 C "Western Digital 800BB-32CCB0"
-"WDC WD800BB-55HEA0"					194 C "Western Digital 800BB-55HEA0"
-"WDC WD800BB-00JHA0"					194 C "Western Digital 800BB-00JHA0" 
-"WDC WD800BB-00JKA0"					194 C "Western Digital 800BB-00JKA0" 
-"WDC WD800BB-55JKA0"					194 C "Western Digital 800BB-55JKA0" 
-"WDC WD800BB-75FRA0"					194 C "Western Digital Caviar WD800BB"				
-"WDC WD800JB-00CRA1"            			  0 C "Western Digital Caviar WD800JB"
-"WDC WD800JB-00(ET|FM|FS)A0"				194 C "Western Digital Caviar 80GB Special Edition 8MB"
-"WDC WD800JB-00JJ[AC]0"					194 C "Western Digital WD800JB"
-"WDC WD800JD-00HKA0"					194 C "Western Digital SATA 80GB, 8MB Cache"
-"WDC WD800LB-(00|55)DNA0"				194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
-"WDC WD1200BB-00(FTA|GUA)0"				194 C "Western Digital Caviar EIDE 2MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 120GB Special Edition 8MB" 
-"WDC WD1200JB-22GVA0"                                   194 C "Western Digital Caviar 120GB"
-"WDC WD1200JD-00GBB0"           			194 C "Western Digital WD1200JD"
-"WDC WD1200LB-55EDA0"					194 C "Western Digital WD1220LB"
-"WDC WD1600BB-00DWA0"					194 C "Western Digital Caviar WD1600BB"
-"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
-"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
-"WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC WD2500JB-00GVC0"					194 C "Western Digital 250GB"
-"WDC WD2500JD-00GBB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
-"WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC WD3200JB-00KFA0"					194 C "Western Digital Caviar 320GB 8MB"
+"WDC AC22000L"							  0 C "Western Digital Caviar AC22000"
+"WDC AC420400D"                 				231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"							231 C "Western Digital AC418000D"
+"WDC WD135BA"							231 C "Western Digital WD135BA"
+
+"WDC WD100EB-00BHF0"            				  0 C "Western Digital 100EB-00BHF0"
+"WDC WD200BB-00AUA1"            				  0 C "Western Digital Caviar WD200BB"
+#"WDC WD200BB-60DGA0"						  0 C "Western Digital Caviar WD200BB"
+"WDC WD300BB-00CAA0"						  0 C "Western Digital WD300BB"
+"WDC WD360GD-00FNA0"						194 C "Western Digital SATA Raptor 36.7GB"
+"WDC WD400BB-00J[KH]A0"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-23JHC0"						194 C "Western Digital 23JHC0"
+#"WDC WD400BB-00GFA0"						  0 C ""
+"WDC WD400BB-55HEA0"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-(18CA|00DE)A0"     				  0 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-75FJA1"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400EB-00CPF0"						  0 C "Western Digital 400EB-00CPF0"
+"WDC WD400JB-00(JJ|FM|FS)A0"					194 C "Western Digital Caviar 40GB Special Edition 8MB"
+"WDC WD400JB-00ETA0"						194 C "Western Digital 400JB-00ETA0"
+"WDC WD400JB-00JJC0"						194 C "Western Digital 400JB-00JJC0 40GB"
+"WDC WD400LB-00DNA0"						194 C "Western Digital 400LB-00DNA0"
+"WDC WD400UE-22HCT0"						194 C "Western Digital 40GB Notebook HDD"
+"WDC WD400VE-75HDT1"						194 C "Western Digital Scorpio 40GB"
+"WDC WD600BB-32BSA0"						  0 C "Western Digital 600BB-32BSA0"
+"WDC WD600JB-00ETA0"						194 C "Western Digital 600JB-00ETA0"
+"WDC WD600LB-00DNA0"            				194 C "Western Digital 60GB"
+"WDC WD600VE-75HDT0"						194 C "Western Digital 600VE-75HDT0"
+"WDC WD600VE-00HDT0"						194 C "Western Digital 600VE-00HDT0"
+"WDC WD740GD-00FL21.0"						194 C "Western Digital SATA Raptor"
+"WDC WD740GD-(00FL[AC]0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
+"WDC WD800BB-00CAA1"						  0 C "Western Digital WD800BB-00CAA1"
+"WDC WD800BB-(00|22)DKA0"					194 C "Western Digital WD800BB 80 Go"
+"WDC WD800BB-32CCB0"						194 C "Western Digital 800BB-32CCB0"
+"WDC WD800BB-55HEA0"						194 C "Western Digital 800BB-55HEA0"
+"WDC WD800BB-00JHA0"						194 C "Western Digital 800BB-00JHA0" 
+"WDC WD800BB-00JKA0"						194 C "Western Digital 800BB-00JKA0" 
+"WDC WD800BB-55JKA0"						194 C "Western Digital 800BB-55JKA0" 
+"WDC WD800BB-75FRA0"						194 C "Western Digital Caviar WD800BB"				
+"WDC WD800JB-00CRA1"            				  0 C "Western Digital Caviar WD800JB"
+"WDC WD800JB-00(ET|FM|FS)A0"					194 C "Western Digital Caviar 80GB Special Edition 8MB"
+"WDC WD800JB-00JJ[AC]0"						194 C "Western Digital WD800JB"
+"WDC WD800JD-00HKA0"						194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD800LB-(00|55)DNA0"					194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
+"WDC WD1200BB-00(FTA|GUA)0"					194 C "Western Digital Caviar EIDE 2MB Cache"
+"WDC WD1200JB-00(EV|FU|GV)A0"   				194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-22GVA0"                                   	194 C "Western Digital Caviar 120GB"
+"WDC WD1200JD-00GBB0"           				194 C "Western Digital WD1200JD"
+"WDC WD1200LB-55EDA0"						194 C "Western Digital WD1220LB"
+"WDC WD1200SB-01KB[AC]0"					194 C "Western Digital Caviar RE (Raid Edition) 120 GB"
+"WDC WD1600BB-00DWA0"						194 C "Western Digital Caviar WD1600BB"
+"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD2000BB-00FTA0"						194 C "Western Digital WD2000BB"
+"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
+"WDC WD2000JB-00GVC0"						194 C "Western Digital WD2000JB"
+"WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"				194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500JB-00GVC0"						194 C "Western Digital 250GB"
+"WDC WD2500JD-(00G|32H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
+"WDC WD2500PB-98FBA0"						194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD3000JB-00KFA0"						194 C "Western Digital WD3000JB"
+"WDC WD3200JB-00KFA0"						194 C "Western Digital Caviar 320GB 8MB"
+"WDC WD4000KD-00NAB0"						194 C "Western Digital Caviar SE16 400GB 16MB"
 
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hddtemp.spec	21 Sep 2005 18:09:14 -0000	1.14
+++ hddtemp.spec	18 Jan 2006 22:18:03 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.6.%{beta}%{?dist}
+Release:        0.7.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -86,9 +86,9 @@
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO contribs
 %config(noreplace) %{_sysconfdir}/sysconfig/hddtemp
-%config(noreplace) %{_initrddir}/hddtemp
 %config(noreplace) %{_sysconfdir}/pam.d/hddtemp
-%config %{_sysconfdir}/security/console.apps/hddtemp
+%config(noreplace) %{_sysconfdir}/security/console.apps/hddtemp
+%{_initrddir}/hddtemp
 %{_bindir}/hddtemp
 %{_sbindir}/hddtemp
 %config %{_datadir}/misc/hddtemp.db
@@ -96,6 +96,11 @@
 
 
 %changelog
+* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.7.beta14
+- Update drive database to 2006-01-18.
+- Init script is not a config file.
+- Mark consle.perms snippet as noreplace.
+
 * Tue Sep 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.6.beta14
 - 0.3-beta14, drive database 2005-09-20.
 



From fedora-extras-commits at redhat.com  Wed Jan 18 22:23:08 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 18 Jan 2006 17:23:08 -0500
Subject: rpms/mock/FC-3 mock-0.4-unpackaged-files-fix.patch, NONE,
	1.1 mock.spec, 1.8, 1.9
Message-ID: <200601182223.k0IMNeoQ025388@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25368

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-unpackaged-files-fix.patch 
Log Message:
* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
- Add unpackaged files fix from RH#163576 (Adrian Reber)



mock-0.4-unpackaged-files-fix.patch:

--- NEW FILE mock-0.4-unpackaged-files-fix.patch ---
--- mock-0.4/mock.py.rpmbuild-fix	2006-01-18 17:05:43.000000000 -0500
+++ mock-0.4/mock.py	2006-01-18 17:06:14.000000000 -0500
@@ -311,7 +311,7 @@
         srpmfn = os.path.basename(srpm_in)
         # run with --nodeps b/c of the check above we know we have our build
         # deps satisfied.
-        cmd = "%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
+        cmd = "cd /;%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
              self.config['runuser'], self.target_arch, srpm_in, 
              self.config['chrootuser'])
         


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mock.spec	16 Aug 2005 16:40:22 -0000	1.8
+++ mock.spec	18 Jan 2006 22:23:07 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: mock-0.4-unpackaged-files-fix.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -17,6 +18,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .unpackaged-files-fix
+
 %build
 make
 
@@ -65,6 +68,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
+- Add unpackaged files fix from RH#163576 (Adrian Reber)
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
 - Fix ?fedora check when not defined (would fail to parse).
 



From fedora-extras-commits at redhat.com  Thu Jan 19 07:50:05 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 19 Jan 2006 02:50:05 -0500
Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.2,
	1.3 perl-Params-Validate.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601190750.k0J7obdX010054@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 04:26:08 -0000	1.2
+++ .cvsignore	19 Jan 2006 07:50:04 -0000	1.3
@@ -1 +1 @@
-Params-Validate-0.78.tar.gz
+Params-Validate-0.79.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Validate.spec	14 Aug 2005 04:31:33 -0000	1.2
+++ perl-Params-Validate.spec	19 Jan 2006 07:50:04 -0000	1.3
@@ -1,18 +1,19 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.78
-Release: 	2%{?dist}
+Version: 	0.79
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # Required by the tests
 BuildRequires: 	perl(Test::Taint)
+BuildRequires:	perl(Readonly)
+BuildRequires:	perl(Readonly::XS)
 
 %description
 The Params::Validate module allows you to validate method or function
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.79-1
+- Upstream update.
+- BR perl(Readonly), perl(Readonly::XS).
+
 * Sun Aug 14 2005 Ralf Corsepius <ralf at links2linux.de> - 0.78-2
 - Spec file cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 04:26:08 -0000	1.2
+++ sources	19 Jan 2006 07:50:04 -0000	1.3
@@ -1 +1 @@
-8b6951214915c33addc4cc16e047546f  Params-Validate-0.78.tar.gz
+3e0a710c3cb2c40000999071442c368e  Params-Validate-0.79.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 08:04:33 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 19 Jan 2006 03:04:33 -0500
Subject: rpms/perl-Params-Validate/FC-4 .cvsignore, 1.2,
	1.3 perl-Params-Validate.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601190805.k0J85jdU011852@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11831

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 04:26:08 -0000	1.2
+++ .cvsignore	19 Jan 2006 08:04:30 -0000	1.3
@@ -1 +1 @@
-Params-Validate-0.78.tar.gz
+Params-Validate-0.79.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/perl-Params-Validate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Validate.spec	14 Aug 2005 04:31:33 -0000	1.2
+++ perl-Params-Validate.spec	19 Jan 2006 08:04:31 -0000	1.3
@@ -1,18 +1,19 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.78
-Release: 	2%{?dist}
+Version: 	0.79
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # Required by the tests
 BuildRequires: 	perl(Test::Taint)
+BuildRequires:	perl(Readonly)
+BuildRequires:	perl(Readonly::XS)
 
 %description
 The Params::Validate module allows you to validate method or function
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.79-1
+- Upstream update.
+- BR perl(Readonly), perl(Readonly::XS).
+
 * Sun Aug 14 2005 Ralf Corsepius <ralf at links2linux.de> - 0.78-2
 - Spec file cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 04:26:08 -0000	1.2
+++ sources	19 Jan 2006 08:04:31 -0000	1.3
@@ -1 +1 @@
-8b6951214915c33addc4cc16e047546f  Params-Validate-0.78.tar.gz
+3e0a710c3cb2c40000999071442c368e  Params-Validate-0.79.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 08:19:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:19:24 -0500
Subject: rpms/scribus/FC-3 .cvsignore, 1.5, 1.6 scribus.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <200601190819.k0J8JuXV012085@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027/FC-3

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jan 2005 19:29:45 -0000	1.5
+++ .cvsignore	19 Jan 2006 08:19:23 -0000	1.6
@@ -1 +1 @@
-scribus-1.2.1.tar.bz2
+scribus-1.2.4.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-3/scribus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scribus.spec	7 Jul 2005 22:36:07 -0000	1.9
+++ scribus.spec	19 Jan 2006 08:19:23 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           scribus
-Version:        1.2.2.1
-Release:        2%{?dist}
+Version:        1.2.4.1
+Release:        1%{?dist}
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2
+Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 #Patch0:        scribus-x86_64.patch
@@ -135,6 +135,10 @@
 
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1
+- version upgrade
+
 * Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2
 - use dist tag for sanity between branches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jul 2005 22:36:49 -0000	1.6
+++ sources	19 Jan 2006 08:19:23 -0000	1.7
@@ -1,2 +1 @@
-002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2
-8c2eac0a358b04c39252586d9d85ab24  scribus-1.2.2.1.tar.bz2
+d72ffe72b1d9ba1230557692af803927  scribus-1.2.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 08:19:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:19:30 -0500
Subject: rpms/scribus/FC-4 .cvsignore, 1.6, 1.7 scribus.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200601190820.k0J8K2ZT012090@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027/FC-4

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jul 2005 22:41:31 -0000	1.6
+++ .cvsignore	19 Jan 2006 08:19:29 -0000	1.7
@@ -1,2 +1 @@
-scribus-1.2.1.tar.bz2
-scribus-1.2.2.1.tar.bz2
+scribus-1.2.4.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scribus.spec	7 Jul 2005 22:36:07 -0000	1.14
+++ scribus.spec	19 Jan 2006 08:19:29 -0000	1.15
@@ -1,13 +1,13 @@
 Name:           scribus
-Version:        1.2.2.1
-Release:	2%{?dist}
+Version:        1.2.4.1
+Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2
+Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 #Patch0:         scribus-x86_64.patch
@@ -136,6 +136,10 @@
 
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1
+- version upgrade
+
 * Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2
 - use dist tag for sanity between branches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jul 2005 22:41:31 -0000	1.6
+++ sources	19 Jan 2006 08:19:29 -0000	1.7
@@ -1,2 +1 @@
-002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2
-8c2eac0a358b04c39252586d9d85ab24  scribus-1.2.2.1.tar.bz2
+d72ffe72b1d9ba1230557692af803927  scribus-1.2.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 08:19:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:19:36 -0500
Subject: rpms/scribus/devel .cvsignore, 1.5, 1.6 scribus.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200601190820.k0J8K8fR012095@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027/devel

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jan 2005 19:29:45 -0000	1.5
+++ .cvsignore	19 Jan 2006 08:19:35 -0000	1.6
@@ -1 +1 @@
-scribus-1.2.1.tar.bz2
+scribus-1.2.4.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scribus.spec	22 Dec 2005 08:35:34 -0000	1.12
+++ scribus.spec	19 Jan 2006 08:19:35 -0000	1.13
@@ -1,15 +1,16 @@
 Name:           scribus
-Version:        1.2.1
-Release:        6
+Version:        1.2.4.1
+Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2
+Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
-Patch0:         scribus-x86_64.patch
+Source2:	scribus.desktop
+#Patch0:         scribus-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -22,24 +23,42 @@
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel >= 2.2
+BuildRequires:  python-devel >= 2.3
 BuildRequires:  qt-devel >= 1:3.3
 BuildRequires:  zlib-devel
+BuildRequires:  freetype-devel
 Requires:       ghostscript >= 7.07
-Requires:       python >= 2.2
+Requires:       python >= 2.3
 Requires:       tkinter
 Requires(post): shared-mime-info
 Requires(post): desktop-file-utils
 Requires(postun): shared-mime-info
 Requires(postun): desktop-file-utils
 
-Obsoletes:      scribus-i18n-en
-
+Obsoletes:     scribus-i18n-en
+Obsoletes:     scribus-svg
+Obsoletes:     scribus-scripting
+Obsoletes:     scribus-short-words
+Obsoletes:     scribus-vnla
+Obsoletes:     scribus-i18en
+Obsoletes:     scribus-i18de
+Obsoletes:     scribus-i18fr
+Obsoletes:     scribus-templates
+
+Provides:      scribus-i18n-en
+Provides:      scribus-svg
+Provides:      scribus-scripting
+Provides:      scribus-short-words
+Provides:      scribus-vnla
+Provides:      scribus-i18en
+Provides:      scribus-i18de
+Provides:      scribus-i18fr
+Provides:      scribus-templates
 
 %description
-Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???,
-QuarkXPress??? or Adobe?? InDesign???, except that it is published under the
-GNU GPL.
+Scribus is an desktop open source page layout program with
+the aim of producing commercial grade output in PDF and
+Postscript, primarily, though not exclusively for Linux.
 
 While the goals of the program are for ease of use and simple easy to
 understand tools, Scribus offers support for professional publishing
@@ -48,7 +67,7 @@
 
 
 %package        devel
-Summary:        Header files for Scribus.
+Summary:        Header files for Scribus
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
@@ -58,7 +77,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x86_64
+#%patch -p1 -b .x86_64
 
 
 %build
@@ -117,8 +136,26 @@
 
 
 %changelog
-* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 1.2.1-6
-- Rebuild against new openssl (Bug #174781)
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1
+- version upgrade
+
+* Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2
+- use dist tag for sanity between branches
+
+* Tue Jul 5 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2.1-1
+- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs
+
+* Sun Jul 3 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2-0.fc4
+- 1.2.2 final
+
+* Tue Jun 28 2005 P Linnell <mrdocs AT scribus.info>- 1.2.2cvs-0
+- test build for 1.2.2cvs
+- Add freetype2 explicit build requirement
+- Add obsoletes. See PACKAGING in the source tarball
+- Change the description per PACKAGING
+- Bump required python. 2.2 is no longer supported.
+
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.1-5
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jan 2005 19:29:45 -0000	1.5
+++ sources	19 Jan 2006 08:19:35 -0000	1.6
@@ -1 +1 @@
-002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2
+d72ffe72b1d9ba1230557692af803927  scribus-1.2.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 08:43:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:43:25 -0500
Subject: rpms/openal/FC-3 .cvsignore, 1.3, 1.4 openal.spec, 1.6, 1.7 sources,
	1.3, 1.4 openal-conf.patch, 1.1, NONE openal-etc_openalrc.patch,
	1.1, NONE openal-incl.patch, 1.1, NONE
Message-ID: <200601190843.k0J8hwS9012247@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/FC-3

Modified Files:
	.cvsignore openal.spec sources 
Removed Files:
	openal-conf.patch openal-etc_openalrc.patch openal-incl.patch 
Log Message:
- use noncvs sources
- major cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:57:47 -0000	1.3
+++ .cvsignore	19 Jan 2006 08:43:25 -0000	1.4
@@ -1 +1 @@
-openal-20040726.tar.bz2
+openal-0.0.8.tar.gz


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openal.spec	2 Feb 2005 14:16:49 -0000	1.6
+++ openal.spec	19 Jan 2006 08:43:25 -0000	1.7
@@ -1,20 +1,13 @@
 Name:           openal
-Version:        0.0
-Release:        0.2.20040726
+Version:        0.0.8
+Release:        2%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.openal.org/
-# use the following to get / verify source:
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login
-#password: guest
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository export -D  20040726 openal
-Source0:        openal-20040726.tar.bz2
+Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
-Patch0:         openal-conf.patch
-Patch1:         openal-etc_openalrc.patch
-Patch2:         openal-incl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -26,8 +19,7 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  SDL-devel
 BuildRequires:  texinfo
-Requires(post): info
-Requires(preun): info
+Obsoletes:      %{name}-test < 0.0.8
 
 %description
 OpenAL is an audio library designed in the spirit of OpenGL--machine
@@ -36,25 +28,13 @@
 
 
 %package        devel
-Summary:        Static libraries and header files for openal library
-Requires:       %{name} = %{version}-%{release}
+Summary:        Development files for openal library
 Group:          Development/Libraries
-
-%description    devel
-This package contains static libraries and header files for the openal library.
-
-OpenAL is an audio library designed in the spirit of OpenGL - machine
-independent, cross platform, and data format neutral, with a clean,
-simple C-based API.
-
-
-%package        test
-Summary:        Tests for openal library
 Requires:       %{name} = %{version}-%{release}
-Group:          Development/Libraries
+Requires:       pkgconfig
 
-%description    test
-This package contains tests for the openal library.
+%description    devel
+This package contains development files for the openal library.
 
 OpenAL is an audio library designed in the spirit of OpenGL - machine
 independent, cross platform, and data format neutral, with a clean,
@@ -62,15 +42,9 @@
 
 
 %prep
-%setup -q -n openal
-%patch0 -p1
-%patch1
-%patch2 -p1
-
+%setup -q
 
 %build
-cd linux
-sh ./autogen.sh
 %configure --enable-arts                   \
            --enable-alsa                   \
            --enable-esd                    \
@@ -78,74 +52,58 @@
            --enable-sdl                    \
            --disable-smpeg                 \
            --enable-capture
-
 make %{?_smp_mflags}
-make -C doc
-make -C test
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make -C linux DESTDIR=${RPM_BUILD_ROOT}%{_prefix}/ \
-              DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
-              install
-#
-# tests
-install -m0755 -d ${RPM_BUILD_ROOT}%{_libdir}/openal
-cp -r linux/test/* ${RPM_BUILD_ROOT}%{_libdir}/openal
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/openal/*.o \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/Makefile* \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/CVS
-#
-# info 
-install -m0755 -d ${RPM_BUILD_ROOT}%{_infodir}
-install -m0644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}
-#
-
-#
-# configuration
-install -m0755 -d ${RPM_BUILD_ROOT}/etc
-install -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=${RPM_BUILD_ROOT}
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
+install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
 
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
+%clean
+rm -rf ${RPM_BUILD_ROOT}
 
-%preun
-if [ "$1" -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-fi
-
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING CREDITS README 
-%config %{_sysconfdir}/openalrc
-%attr(0644,root,root)%{_libdir}/libopenal.so.*
-%attr(0644,root,root)%{_infodir}/*.info*
+%doc AUTHORS ChangeLog COPYING NOTES README TODO
+%config(noreplace) %{_sysconfdir}/openalrc
+%{_libdir}/libopenal.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc README
-%{_includedir}/AL
-%attr(0644,root,root)%{_libdir}/libopenal.a
-%attr(0644,root,root)%{_libdir}/libopenal.so
+%doc common/specification/*
+%{_bindir}/openal-config
+%{_includedir}/AL/
+%{_libdir}/libopenal.so
+%{_libdir}/pkgconfig/openal.pc
+
+
+%changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.8-2
+- switch to non cvs sources
+- major cleanups
+
+* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
+- 0.0.8, patches applied upstream.
+- Mark /etc/openalrc as noreplace.
+- Don't ship static library.
+- Drop test subpackage.
 
-%files test
-%defattr(-,root,root,-)
-%{_libdir}/openal
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.0-0.4.20040726
+- rebuild on all arches
 
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.0-0.3.20040726
+- rebuilt
 
-%changelog -n openal
 * Thu Apr 08 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.0-0.2.fdr.0.20040726
 - Clean up spec/Bump release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:57:47 -0000	1.3
+++ sources	19 Jan 2006 08:43:25 -0000	1.4
@@ -1 +1 @@
-850583d59b54d7298ee843700d3add6f  openal-20040726.tar.bz2
+0379bd39fc84454491ef38434a2e6e8d  openal-0.0.8.tar.gz


--- openal-conf.patch DELETED ---


--- openal-etc_openalrc.patch DELETED ---


--- openal-incl.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 08:43:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:43:37 -0500
Subject: rpms/openal/devel .cvsignore, 1.4, 1.5 openal.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200601190844.k0J8i9aw012257@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/devel

Modified Files:
	.cvsignore openal.spec sources 
Log Message:
- use noncvs sources
- major cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Oct 2005 21:30:12 -0000	1.4
+++ .cvsignore	19 Jan 2006 08:43:37 -0000	1.5
@@ -1 +1 @@
-openal-0.0.8.tar.bz2
+openal-0.0.8.tar.gz


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openal.spec	10 Oct 2005 21:30:12 -0000	1.10
+++ openal.spec	19 Jan 2006 08:43:37 -0000	1.11
@@ -1,16 +1,12 @@
 Name:           openal
 Version:        0.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.openal.org/
-# use the following to get / verify source:
-# cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login
-# password: guest
-# cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository ex -r Linux_Spec1-0 openal/{COPYING,README,include,linux}
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +19,6 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  SDL-devel
 BuildRequires:  texinfo
-Requires(post): /sbin/ldconfig
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 Obsoletes:      %{name}-test < 0.0.8
 
 %description
@@ -49,13 +42,9 @@
 
 
 %prep
-%setup -q -n openal
-cd linux
-sh ./autogen.sh
-
+%setup -q
 
 %build
-cd linux
 %configure --enable-arts                   \
            --enable-alsa                   \
            --enable-esd                    \
@@ -68,12 +57,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C linux DESTDIR=${RPM_BUILD_ROOT}%{_prefix}/ \
-              DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
-              install
-rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.a
+make install DESTDIR=${RPM_BUILD_ROOT}
 
-install -Dpm 644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}/openal.info
+rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
 install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
 
@@ -81,28 +67,19 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-fi
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%doc COPYING README linux/ChangeLog linux/TODO
+%doc AUTHORS ChangeLog COPYING NOTES README TODO
 %config(noreplace) %{_sysconfdir}/openalrc
 %{_libdir}/libopenal.so.*
-%{_infodir}/*.info*
 
 %files devel
 %defattr(-,root,root,-)
+%doc common/specification/*
 %{_bindir}/openal-config
 %{_includedir}/AL/
 %{_libdir}/libopenal.so
@@ -110,6 +87,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.8-2
+- switch to non cvs sources
+- major cleanups
+
 * Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
 - 0.0.8, patches applied upstream.
 - Mark /etc/openalrc as noreplace.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2005 21:30:12 -0000	1.4
+++ sources	19 Jan 2006 08:43:37 -0000	1.5
@@ -1 +1 @@
-d7bb526b7c13f9addecb05365934cbd7  openal-0.0.8.tar.bz2
+0379bd39fc84454491ef38434a2e6e8d  openal-0.0.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 08:43:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:43:31 -0500
Subject: rpms/openal/FC-4 .cvsignore, 1.3, 1.4 openal.spec, 1.9, 1.10 sources,
	1.3, 1.4 openal-conf.patch, 1.1, NONE openal-etc_openalrc.patch,
	1.1, NONE openal-incl.patch, 1.1, NONE
Message-ID: <200601190844.k0J8i4h1012252@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/FC-4

Modified Files:
	.cvsignore openal.spec sources 
Removed Files:
	openal-conf.patch openal-etc_openalrc.patch openal-incl.patch 
Log Message:
- use noncvs sources
- major cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:57:47 -0000	1.3
+++ .cvsignore	19 Jan 2006 08:43:31 -0000	1.4
@@ -1 +1 @@
-openal-20040726.tar.bz2
+openal-0.0.8.tar.gz


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openal.spec	23 May 2005 00:18:22 -0000	1.9
+++ openal.spec	19 Jan 2006 08:43:31 -0000	1.10
@@ -1,21 +1,13 @@
 Name:           openal
-Version:        0.0
-Release:        0.4.20040726
-
+Version:        0.0.8
+Release:        2%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.openal.org/
-# use the following to get / verify source:
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login
-#password: guest
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository export -D  20040726 openal
-Source0:        openal-20040726.tar.bz2
+Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
-Patch0:         openal-conf.patch
-Patch1:         openal-etc_openalrc.patch
-Patch2:         openal-incl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -27,8 +19,7 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  SDL-devel
 BuildRequires:  texinfo
-Requires(post): info
-Requires(preun): info
+Obsoletes:      %{name}-test < 0.0.8
 
 %description
 OpenAL is an audio library designed in the spirit of OpenGL--machine
@@ -37,25 +28,13 @@
 
 
 %package        devel
-Summary:        Static libraries and header files for openal library
-Requires:       %{name} = %{version}-%{release}
+Summary:        Development files for openal library
 Group:          Development/Libraries
-
-%description    devel
-This package contains static libraries and header files for the openal library.
-
-OpenAL is an audio library designed in the spirit of OpenGL - machine
-independent, cross platform, and data format neutral, with a clean,
-simple C-based API.
-
-
-%package        test
-Summary:        Tests for openal library
 Requires:       %{name} = %{version}-%{release}
-Group:          Development/Libraries
+Requires:       pkgconfig
 
-%description    test
-This package contains tests for the openal library.
+%description    devel
+This package contains development files for the openal library.
 
 OpenAL is an audio library designed in the spirit of OpenGL - machine
 independent, cross platform, and data format neutral, with a clean,
@@ -63,15 +42,9 @@
 
 
 %prep
-%setup -q -n openal
-%patch0 -p1
-%patch1
-%patch2 -p1
-
+%setup -q
 
 %build
-cd linux
-sh ./autogen.sh
 %configure --enable-arts                   \
            --enable-alsa                   \
            --enable-esd                    \
@@ -79,78 +52,56 @@
            --enable-sdl                    \
            --disable-smpeg                 \
            --enable-capture
-
 make %{?_smp_mflags}
-make -C doc
-make -C test
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make -C linux DESTDIR=${RPM_BUILD_ROOT}%{_prefix}/ \
-              DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
-              install
-#
-# tests
-install -m0755 -d ${RPM_BUILD_ROOT}%{_libdir}/openal
-cp -r linux/test/* ${RPM_BUILD_ROOT}%{_libdir}/openal
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/openal/*.o \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/Makefile* \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/CVS
-#
-# info
-install -m0755 -d ${RPM_BUILD_ROOT}%{_infodir}
-install -m0644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}
-#
-
-#
-# configuration
-install -m0755 -d ${RPM_BUILD_ROOT}/etc
-install -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
-
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=${RPM_BUILD_ROOT}
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
+install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
 
 
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-fi
+%clean
+rm -rf ${RPM_BUILD_ROOT}
 
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING CREDITS README
-%config %{_sysconfdir}/openalrc
-%attr(0644,root,root)%{_libdir}/libopenal.so.*
-%attr(0644,root,root)%{_infodir}/*.info*
+%doc AUTHORS ChangeLog COPYING NOTES README TODO
+%config(noreplace) %{_sysconfdir}/openalrc
+%{_libdir}/libopenal.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc README
-%{_includedir}/AL
-%attr(0644,root,root)%{_libdir}/libopenal.a
-%attr(0644,root,root)%{_libdir}/libopenal.so
-
-%files test
-%defattr(-,root,root,-)
-%{_libdir}/openal
+%doc common/specification/*
+%{_bindir}/openal-config
+%{_includedir}/AL/
+%{_libdir}/libopenal.so
+%{_libdir}/pkgconfig/openal.pc
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.8-2
+- switch to non cvs sources
+- major cleanups
+
+* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
+- 0.0.8, patches applied upstream.
+- Mark /etc/openalrc as noreplace.
+- Don't ship static library.
+- Drop test subpackage.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.0-0.4.20040726
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.0-0.3.20040726
 - rebuilt
 
 * Thu Apr 08 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.0-0.2.fdr.0.20040726


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:57:47 -0000	1.3
+++ sources	19 Jan 2006 08:43:31 -0000	1.4
@@ -1 +1 @@
-850583d59b54d7298ee843700d3add6f  openal-20040726.tar.bz2
+0379bd39fc84454491ef38434a2e6e8d  openal-0.0.8.tar.gz


--- openal-conf.patch DELETED ---


--- openal-etc_openalrc.patch DELETED ---


--- openal-incl.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 09:01:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:01:20 -0500
Subject: rpms/lcms/devel .cvsignore, 1.5, NONE Makefile, 1.2,
	NONE lcms-1.14-fc4-swigtype.patch, 1.1, NONE lcms.spec, 1.9,
	NONE sources, 1.5, NONE
Message-ID: <200601190901.k0J91MQB014038@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/lcms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12338/devel

Removed Files:
	.cvsignore Makefile lcms-1.14-fc4-swigtype.patch lcms.spec 
	sources 
Log Message:
- version upgrade for fc{3,4}
- remove devel branch (in rawhide now)



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lcms-1.14-fc4-swigtype.patch DELETED ---


--- lcms.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 09:01:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:01:03 -0500
Subject: rpms/lcms/FC-3 .cvsignore, 1.5, 1.6 lcms.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200601190901.k0J91Z4C014051@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/lcms/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12338/FC-3

Modified Files:
	.cvsignore lcms.spec sources 
Log Message:
- version upgrade for fc{3,4}
- remove devel branch (in rawhide now)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2004 18:40:50 -0000	1.5
+++ .cvsignore	19 Jan 2006 09:01:03 -0000	1.6
@@ -1 +1 @@
-lcms-1.14.tar.gz
+lcms-1.15.tar.gz


Index: lcms.spec
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-3/lcms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lcms.spec	19 Dec 2004 18:40:50 -0000	1.6
+++ lcms.spec	19 Jan 2006 09:01:03 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           lcms
-Version:        1.14
-Release:        1
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Color Management System.
 
 Group:          Applications/Productivity
 License:        LGPL
 URL:            http://www.littlecms.com/
-Source0:        http://www.littlecms.com/lcms-1.14.tar.gz
+Source0:        http://www.littlecms.com/lcms-1.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.15-1
+- verion upgrade
+
 * Thu May 20 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:1.14-1
 - Update to 1.14.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2004 18:40:50 -0000	1.5
+++ sources	19 Jan 2006 09:01:03 -0000	1.6
@@ -1 +1 @@
-a1ea406408099300ee994e4b9daee19a  lcms-1.14.tar.gz
+76c921973fdea4f880944a024197f924  lcms-1.15.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 09:01:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:01:05 -0500
Subject: rpms/lcms/FC-4 .cvsignore, 1.5, 1.6 lcms.spec, 1.8, 1.9 sources, 1.5,
	1.6 lcms-1.14-fc4-swigtype.patch, 1.1, NONE
Message-ID: <200601190901.k0J91c7s014054@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/lcms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12338/FC-4

Modified Files:
	.cvsignore lcms.spec sources 
Removed Files:
	lcms-1.14-fc4-swigtype.patch 
Log Message:
- version upgrade for fc{3,4}
- remove devel branch (in rawhide now)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2004 18:40:50 -0000	1.5
+++ .cvsignore	19 Jan 2006 09:01:04 -0000	1.6
@@ -1 +1 @@
-lcms-1.14.tar.gz
+lcms-1.15.tar.gz


Index: lcms.spec
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-4/lcms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lcms.spec	22 May 2005 17:22:38 -0000	1.8
+++ lcms.spec	19 Jan 2006 09:01:04 -0000	1.9
@@ -1,15 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           lcms
-Version:        1.14
-Release:        3
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
 License:        LGPL
 URL:            http://www.littlecms.com/
-Source0:        http://www.littlecms.com/lcms-1.14.tar.gz
-Patch0:         lcms-1.14-fc4-swigtype.patch
+Source0:        http://www.littlecms.com/lcms-1.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -49,8 +48,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fc4-swigtype
-
 
 %build
 %configure --with-python
@@ -98,6 +95,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.15-1
+- version upgrade
+- remove swigtype patch (applied upstream)
+
 * Sun May 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.14-3
 - Fix FC4 build (#114146).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2004 18:40:50 -0000	1.5
+++ sources	19 Jan 2006 09:01:04 -0000	1.6
@@ -1 +1 @@
-a1ea406408099300ee994e4b9daee19a  lcms-1.14.tar.gz
+76c921973fdea4f880944a024197f924  lcms-1.15.tar.gz


--- lcms-1.14-fc4-swigtype.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 09:15:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:15:27 -0500
Subject: owners owners.list,1.548,1.549
Message-ID: <200601190916.k0J9GFUu014520@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14450

Modified Files:
	owners.list 
Log Message:
- take ownership of scribus, scribus-templates, lcms, openal
- add torsmo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -r1.548 -r1.549
--- owners.list	18 Jan 2006 16:44:36 -0000	1.548
+++ owners.list	19 Jan 2006 09:15:26 -0000	1.549
@@ -477,7 +477,7 @@
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|lcms|Color Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -682,7 +682,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1134,8 +1134,8 @@
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|scribus|DeskTop Publishing app in QT|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1238,6 +1238,7 @@
 Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 09:19:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 19 Jan 2006 04:19:38 -0500
Subject: rpms/grads/FC-4 grads.spec,1.5,1.6
Message-ID: <200601190920.k0J9KPnC014718@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14701

Modified Files:
	grads.spec 
Log Message:
* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
- add BR on readline-devel close #178285



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grads.spec	23 Dec 2005 09:10:40 -0000	1.5
+++ grads.spec	19 Jan 2006 09:19:38 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.2
+Release:        6%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -34,11 +34,10 @@
 BuildRequires:  hdf-devel 
 %endif
 BuildRequires:  udunits-devel netcdf-devel 
-#BuildRequires:  opendap-devel
+BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-#Requires:       
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -109,7 +108,10 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5.2
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+- add BR on readline-devel close #178285
+
+* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-4



From fedora-extras-commits at redhat.com  Thu Jan 19 11:15:36 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:15:36 -0500
Subject: rpms/python-4Suite-XML - New directory
Message-ID: <200601191115.k0JBFcB9018835@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18827/python-4Suite-XML

Log Message:
Directory /cvs/extras/rpms/python-4Suite-XML added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 11:15:42 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:15:42 -0500
Subject: rpms/python-4Suite-XML/devel - New directory
Message-ID: <200601191115.k0JBFiVZ018850@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18827/python-4Suite-XML/devel

Log Message:
Directory /cvs/extras/rpms/python-4Suite-XML/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:00 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:00 -0500
Subject: rpms/python-4Suite-XML Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601191116.k0JBG2fZ018884@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18872

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-4Suite-XML


--- NEW FILE Makefile ---
# Top level Makefile for module python-4Suite-XML
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:06 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:06 -0500
Subject: rpms/python-4Suite-XML/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601191116.k0JBG84P018906@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18872/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-4Suite-XML


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:44 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:44 -0500
Subject: rpms/python-4Suite-XML import.log,1.1,1.2
Message-ID: <200601191117.k0JBHG7M018977@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18943

Modified Files:
	import.log 
Log Message:
auto-import python-4Suite-XML-1.0-0.3.b3 on branch devel from python-4Suite-XML-1.0-0.3.b3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 11:16:00 -0000	1.1
+++ import.log	19 Jan 2006 11:16:43 -0000	1.2
@@ -0,0 +1 @@
+python-4Suite-XML-1_0-0_3_b3:HEAD:python-4Suite-XML-1.0-0.3.b3.src.rpm:1137669422



From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:50 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:50 -0500
Subject: rpms/python-4Suite-XML/devel python-4Suite-XML.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601191117.k0JBHMi9018981@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18943/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-4Suite-XML.spec 
Log Message:
auto-import python-4Suite-XML-1.0-0.3.b3 on branch devel from python-4Suite-XML-1.0-0.3.b3.src.rpm


--- NEW FILE python-4Suite-XML.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define ver 1.0b3

Name: python-4Suite-XML
Version: 1.0
Release: 0.3.b3
Summary: A collection of XML-related technologies for Python

Group: Development/Libraries
License: Apacheish
URL: http://www.4suite.org/
Source0: http://dl.sourceforge.net/foursuite/4Suite-XML-%{ver}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: python-devel
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
4Suite-XML is a suite of Python modules for XML and RDF processing.
Its major components include the following:

 * Ft.Xml.Domlette: A very fast, lightweight XPath-oriented DOM.
 * Ft.Xml.XPath: An XPath 1.0 implementation for Domlette documents.
 * Ft.Xml.Xslt: A robust XSLT 1.0 processor.
 * Ft.Lib: Various support libraries that can be used independently.

%prep
%setup -q -n 4Suite-%{ver}

%build
export CFLAGS="$RPM_OPT_FLAGS"
python setup.py config --system --pythonlibdir=%{python_sitearch} \
	--bindir=%{_bindir} --datadir=%{_datadir}/4Suite \
	--sysconfdir=%{_sysconfdir}/4Suite \
	--localstatedir=%{_localstatedir}/lib/4Suite \
	--libdir=%{_libdir}/4Suite --docdir=%{_datadir}/doc/4Suite \
	--localedir=%{_datadir}/locale --mandir=%{_mandir}
python setup.py build

%install
rm -rf $RPM_BUILD_ROOT

python setup.py bdist_install -O1 --root=$RPM_BUILD_ROOT

chmod a-x $RPM_BUILD_ROOT%{_datadir}/4Suite/Data/Stylesheets/*.xslt

# Move documentation to the right place
mv $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/html html
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/xml

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYRIGHT README html
%{_bindir}/4*
%exclude %{_libdir}/4Suite
%{python_sitearch}/Ft
%{_datadir}/4Suite

%changelog
* Fri Jan  6 2006 Miloslav Trmac <mitr at redhat.com> - 1.0-0.3.b3
- Fix Summary:
- Use an URL in Source0:

* Thu Jan  5 2006 Miloslav Trmac <mitr at redhat.com> - 1.0-0.2.b3
- Require python-abi
- Ship .pyo files
- Use macros instead of hardcoded paths

* Tue Dec 13 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-0.1.b3
- Update to 4Suite-XML-1.0b3

* Mon Nov  7 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-0.1.b2
- Initial package, based on Fedora Core 4Suite-1.0-9.b1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 11:16:06 -0000	1.1
+++ .cvsignore	19 Jan 2006 11:16:49 -0000	1.2
@@ -0,0 +1 @@
+4Suite-XML-1.0b3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 11:16:06 -0000	1.1
+++ sources	19 Jan 2006 11:16:49 -0000	1.2
@@ -0,0 +1 @@
+9decb8b1032415ae155fe9a917fe8126  4Suite-XML-1.0b3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 11:21:18 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:21:18 -0500
Subject: owners owners.list,1.549,1.550
Message-ID: <200601191121.k0JBLoZZ019052@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19035

Modified Files:
	owners.list 
Log Message:
Add python-4Suite-XML



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -r1.549 -r1.550
--- owners.list	19 Jan 2006 09:15:26 -0000	1.549
+++ owners.list	19 Jan 2006 11:21:18 -0000	1.550
@@ -1017,6 +1017,7 @@
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|colin at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 11:27:23 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Jan 2006 06:27:23 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200601191127.k0JBRu6W019147@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19121

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
New upstream version 1.3.82



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkwave.spec	13 Dec 2005 14:05:50 -0000	1.3
+++ gtkwave.spec	19 Jan 2006 11:27:23 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.81
+Version:		1.3.82
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
+- update to 1.3.82
+
 * Tue Dec 13 2005 Paul Howarth <paul at city-fan.org> 1.3.81-1
 - update to 1.3.81
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 14:05:50 -0000	1.4
+++ sources	19 Jan 2006 11:27:23 -0000	1.5
@@ -1 +1 @@
-3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz
+0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 14:05:50 -0000	1.4
+++ .cvsignore	19 Jan 2006 11:27:23 -0000	1.5
@@ -1 +1 @@
-gtkwave-1.3.81.tgz
+gtkwave-1.3.82.tgz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:30:04 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Jan 2006 06:30:04 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200601191130.k0JBUati019225@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19195

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkwave.spec	13 Dec 2005 14:09:46 -0000	1.3
+++ gtkwave.spec	19 Jan 2006 11:30:03 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.81
+Version:		1.3.82
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
+- update to 1.3.82
+
 * Tue Dec 13 2005 Paul Howarth <paul at city-fan.org> 1.3.81-1
 - update to 1.3.81
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 14:09:46 -0000	1.4
+++ sources	19 Jan 2006 11:30:03 -0000	1.5
@@ -1 +1 @@
-3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz
+0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 14:09:46 -0000	1.4
+++ .cvsignore	19 Jan 2006 11:30:03 -0000	1.5
@@ -1 +1 @@
-gtkwave-1.3.81.tgz
+gtkwave-1.3.82.tgz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:30:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Jan 2006 06:30:49 -0500
Subject: rpms/perl-Glib/FC-4 .cvsignore, 1.6, 1.7 perl-Glib.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200601191131.k0JBVMOi019301@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19222/FC-4

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
- Update to 1.103.
- Provides list: filtered out perl(MY) (#177956).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Jan 2006 16:31:57 -0000	1.6
+++ .cvsignore	19 Jan 2006 11:30:49 -0000	1.7
@@ -1 +1 @@
-Glib-1.102.tar.gz
+Glib-1.103.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/perl-Glib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Glib.spec	2 Jan 2006 16:31:57 -0000	1.10
+++ perl-Glib.spec	19 Jan 2006 11:30:49 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Glib
-Version:        1.102
+Version:        1.103
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
@@ -12,7 +12,7 @@
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  glib2-devel
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module provides perl access to Glib and GLib's GObject libraries.
@@ -26,6 +26,15 @@
 %prep
 %setup -q -n Glib-%{version}
 
+# Provides: exclude perl(MY)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(MY)$'
+__EOF__
+%define __perl_provides %{_builddir}/Glib-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
@@ -57,6 +66,10 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.103-1
+- Update to 1.103.
+- Provides list: filtered out perl(MY) (#177956).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
 - Update to 1.102.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2006 16:31:58 -0000	1.6
+++ sources	19 Jan 2006 11:30:49 -0000	1.7
@@ -1 +1 @@
-d49aa86f0c77f04c0a196414ba0a27fa  Glib-1.102.tar.gz
+fe8d123a872776a0c5cae50d513bf938  Glib-1.103.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:30:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Jan 2006 06:30:55 -0500
Subject: rpms/perl-Glib/devel .cvsignore, 1.8, 1.9 perl-Glib.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200601191131.k0JBVSMQ019306@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19222/devel

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
- Update to 1.103.
- Provides list: filtered out perl(MY) (#177956).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Nov 2005 15:15:22 -0000	1.8
+++ .cvsignore	19 Jan 2006 11:30:55 -0000	1.9
@@ -1 +1 @@
-Glib-1.102.tar.gz
+Glib-1.103.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Glib.spec	30 Nov 2005 15:15:22 -0000	1.12
+++ perl-Glib.spec	19 Jan 2006 11:30:55 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Glib
-Version:        1.102
+Version:        1.103
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
@@ -12,7 +12,7 @@
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  glib2-devel
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module provides perl access to Glib and GLib's GObject libraries.
@@ -26,6 +26,15 @@
 %prep
 %setup -q -n Glib-%{version}
 
+# Provides: exclude perl(MY)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(MY)$'
+__EOF__
+%define __perl_provides %{_builddir}/Glib-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
@@ -57,6 +66,10 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.103-1
+- Update to 1.103.
+- Provides list: filtered out perl(MY) (#177956).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
 - Update to 1.102.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Nov 2005 15:15:22 -0000	1.8
+++ sources	19 Jan 2006 11:30:55 -0000	1.9
@@ -1 +1 @@
-d49aa86f0c77f04c0a196414ba0a27fa  Glib-1.102.tar.gz
+fe8d123a872776a0c5cae50d513bf938  Glib-1.103.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:32:28 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Jan 2006 06:32:28 -0500
Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200601191133.k0JBX1s1019408@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19353

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkwave.spec	13 Dec 2005 14:12:18 -0000	1.3
+++ gtkwave.spec	19 Jan 2006 11:32:28 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.81
+Version:		1.3.82
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
+- update to 1.3.82
+
 * Tue Dec 13 2005 Paul Howarth <paul at city-fan.org> 1.3.81-1
 - update to 1.3.81
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 14:12:18 -0000	1.4
+++ sources	19 Jan 2006 11:32:28 -0000	1.5
@@ -1 +1 @@
-3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz
+0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 14:12:18 -0000	1.4
+++ .cvsignore	19 Jan 2006 11:32:28 -0000	1.5
@@ -1 +1 @@
-gtkwave-1.3.81.tgz
+gtkwave-1.3.82.tgz



From fedora-extras-commits at redhat.com  Thu Jan 19 12:26:45 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 19 Jan 2006 07:26:45 -0500
Subject: rpms/fbida/devel fbida.spec,1.10,1.11
Message-ID: <200601191227.k0JCRHLS021489@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21472

Modified Files:
	fbida.spec 
Log Message:
* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-8
- rebuilt



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fbida.spec	18 Jan 2006 08:16:58 -0000	1.10
+++ fbida.spec	19 Jan 2006 12:26:45 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -58,7 +58,8 @@
 %{__mv} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
-%{__mv} %{buildroot}%{_sysconfdir}/X11 %{buildroot}%{_datadir}
+%{__mv} %{buildroot}%{_libdir}/X11 %{buildroot}%{_datadir}
+%{__rm} -rf %{buildroot}%{_libdir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +84,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-8
+- rebuilt
+
 * Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-7
 - moved file Ida to %%{_datadir}/X11/app-defaults
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:37:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:37:28 -0500
Subject: rpms/treecc/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 treecc.spec,
	1.6, 1.7
Message-ID: <200601191238.k0JCc18R021610@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/treecc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553/FC-3

Modified Files:
	.cvsignore sources treecc.spec 
Log Message:
- version upgrade
- use one spec for all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2004 06:20:12 -0000	1.5
+++ .cvsignore	19 Jan 2006 12:37:28 -0000	1.6
@@ -1 +1 @@
-treecc-0.3.4.tar.gz
+treecc-0.3.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2004 06:20:12 -0000	1.5
+++ sources	19 Jan 2006 12:37:28 -0000	1.6
@@ -1 +1 @@
-c6cbc91a03ae5c46afdb32c7f87fa560  treecc-0.3.4.tar.gz
+ca26c97d00cff28fa312155b2228ff97  treecc-0.3.8.tar.gz


Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-3/treecc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- treecc.spec	20 Feb 2005 20:11:12 -0000	1.6
+++ treecc.spec	19 Jan 2006 12:37:28 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           treecc
-Version:        0.3.4
-Release:        2
-Summary:        Tree Compiler Compiler.
+Version:        0.3.8
+Release:        1%{?dist}
+
+Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://dotgnu.org/
-Source0:        ftp://ftp.gnu.org/gnu/dotgnu/pnet/treecc-0.3.4.tar.gz
+URL:            http://www.southern-storm.com.au/treecc.html
+Source0:        http://www.southern-storm.com.au/download/treecc-0.3.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison >= 1.28
@@ -37,7 +38,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtreecc.a
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -47,7 +48,7 @@
 
 
 %preun
-if [ "$1" -eq 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
@@ -61,6 +62,17 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.3.8-1
+- same spec for all arches hence add dist
+- upgrade to new version
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.3.4-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sun Feb 20 2005 David Woodhouse <dwmw2 at infradead.org> 0.3.4-2
 - Don't package %%{_infodir}/dir
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:37:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:37:34 -0500
Subject: rpms/treecc/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 treecc.spec,
	1.9, 1.10
Message-ID: <200601191238.k0JCc67l021615@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/treecc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553/FC-4

Modified Files:
	.cvsignore sources treecc.spec 
Log Message:
- version upgrade
- use one spec for all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2004 06:20:12 -0000	1.5
+++ .cvsignore	19 Jan 2006 12:37:34 -0000	1.6
@@ -1 +1 @@
-treecc-0.3.4.tar.gz
+treecc-0.3.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2004 06:20:12 -0000	1.5
+++ sources	19 Jan 2006 12:37:34 -0000	1.6
@@ -1 +1 @@
-c6cbc91a03ae5c46afdb32c7f87fa560  treecc-0.3.4.tar.gz
+ca26c97d00cff28fa312155b2228ff97  treecc-0.3.8.tar.gz


Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-4/treecc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- treecc.spec	23 May 2005 00:08:46 -0000	1.9
+++ treecc.spec	19 Jan 2006 12:37:34 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           treecc
-Version:        0.3.4
-Release: 4
+Version:        0.3.8
+Release:        1%{?dist}
 
 Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://dotgnu.org/
-Source0:        ftp://ftp.gnu.org/gnu/dotgnu/pnet/treecc-0.3.4.tar.gz
+URL:            http://www.southern-storm.com.au/treecc.html
+Source0:        http://www.southern-storm.com.au/download/treecc-0.3.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison >= 1.28
@@ -38,7 +38,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtreecc.a
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -62,6 +62,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.3.8-1
+- same spec for all arches hence add dist
+- upgrade to new version
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.3.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:37:40 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:37:40 -0500
Subject: rpms/treecc/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 treecc.spec,
	1.9, 1.10
Message-ID: <200601191238.k0JCcC0K021620@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/treecc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553/devel

Modified Files:
	.cvsignore sources treecc.spec 
Log Message:
- version upgrade
- use one spec for all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2004 06:20:12 -0000	1.5
+++ .cvsignore	19 Jan 2006 12:37:40 -0000	1.6
@@ -1 +1 @@
-treecc-0.3.4.tar.gz
+treecc-0.3.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2004 06:20:12 -0000	1.5
+++ sources	19 Jan 2006 12:37:40 -0000	1.6
@@ -1 +1 @@
-c6cbc91a03ae5c46afdb32c7f87fa560  treecc-0.3.4.tar.gz
+ca26c97d00cff28fa312155b2228ff97  treecc-0.3.8.tar.gz


Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/treecc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- treecc.spec	23 May 2005 00:08:46 -0000	1.9
+++ treecc.spec	19 Jan 2006 12:37:40 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           treecc
-Version:        0.3.4
-Release: 4
+Version:        0.3.8
+Release:        1%{?dist}
 
 Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://dotgnu.org/
-Source0:        ftp://ftp.gnu.org/gnu/dotgnu/pnet/treecc-0.3.4.tar.gz
+URL:            http://www.southern-storm.com.au/treecc.html
+Source0:        http://www.southern-storm.com.au/download/treecc-0.3.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison >= 1.28
@@ -38,7 +38,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtreecc.a
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -62,6 +62,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.3.8-1
+- same spec for all arches hence add dist
+- upgrade to new version
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.3.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:51:48 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:51:48 -0500
Subject: owners owners.list,1.550,1.551
Message-ID: <200601191252.k0JCqK1S021682@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21663

Modified Files:
	owners.list 
Log Message:
- take treecc



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -r1.550 -r1.551
--- owners.list	19 Jan 2006 11:21:18 -0000	1.550
+++ owners.list	19 Jan 2006 12:51:48 -0000	1.551
@@ -1243,7 +1243,7 @@
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
-Fedora Extras|treecc|Tree Compiler Compiler|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 15:51:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 19 Jan 2006 10:51:23 -0500
Subject: rpms/kasablanca/devel kasablanca-0.4.0.2-dt.patch, NONE,
	1.1 kasablanca.spec, 1.10, 1.11
Message-ID: <200601191551.k0JFptPR027463@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27443

Modified Files:
	kasablanca.spec 
Added Files:
	kasablanca-0.4.0.2-dt.patch 
Log Message:
* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
- drop x-modular hack(s) (kdelibs-devel fixed)
- .desktop: GenericName=FTP client
- update %description


kasablanca-0.4.0.2-dt.patch:

--- NEW FILE kasablanca-0.4.0.2-dt.patch ---
--- kasablanca-0.4.0.2/src/kasablanca.desktop.dt	2004-03-22 12:58:39.000000000 -0600
+++ kasablanca-0.4.0.2/src/kasablanca.desktop	2006-01-19 09:48:07.000000000 -0600
@@ -1,26 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=kasablanca
-Name[xx]=xxkasablancaxx
+GenericName=FTP Client
 Exec=kasablanca
 Icon=kasablanca
 Type=Application
-Comment=A simple KDE Application
-Comment[ca]=Una simple aplicaci?? KDE
-Comment[da]=Et simpelt KDE program
-Comment[de]=Eine einfache KDE-Anwendung
-Comment[el]=?????? ???????? ???????????????? ?????? KDE
-Comment[es]=Una aplicaci??n de KDE sencilla
-Comment[et]=Lihtne KDE rakendus
-Comment[fr]=Une application simple pour KDE.
-Comment[hu]=Egyszer?? KDE-alkalmaz??s
-Comment[it]=Una semplice applicazione KDE
-Comment[nl]=Een eenvoudige KDE-toepassing
-Comment[pt]=Uma aplica????o KDE simples
-Comment[pt_BR]=Um simples Aplicativo do KDE
-Comment[ru]=?????????????? ???????????????????? KDE
-Comment[sl]=Preprost program za KDE
-Comment[sr]=?????????????????????? KDE ??????????????
-Comment[sv]=Ett enkelt KDE-program
-Comment[xx]=xxA simple KDE Applicationxx
-Comment[zh_CN]=???????????????KDE????????????


Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kasablanca.spec	19 Dec 2005 21:25:47 -0000	1.10
+++ kasablanca.spec	19 Jan 2006 15:51:23 -0000	1.11
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -14,15 +14,16 @@
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
-# Workaround for kdelibs-devel missing deps:
-# http://bugzilla.redhat.com/bugzilla/176159
-%if "%{?fedora}" > "4"
-BuildRequires: xorg-x11-proto-devel libXt-devel
-%endif
 
 %description
-Kasablanca is an ftp client for KDE, among its features are currently 
-encryption (auth tls) support, fxp, site bookmarks, and queued transfers.
+Kasablanca is an ftp client for KDE, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
 
 
 %prep
@@ -104,12 +105,17 @@
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
+- drop x-modular hack(s) (kdelibs-devel fixed)
+- .desktop: GenericName=FTP client
+- update %%description
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-6
 - fix for modular X
 - workaround kdelibs-devel missing deps (#176159)



From fedora-extras-commits at redhat.com  Thu Jan 19 15:57:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 19 Jan 2006 10:57:47 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.11,1.12
Message-ID: <200601191558.k0JFwKoB027498@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27481

Modified Files:
	kasablanca.spec 
Log Message:
actually *use* -dt.patch



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kasablanca.spec	19 Jan 2006 15:51:23 -0000	1.11
+++ kasablanca.spec	19 Jan 2006 15:57:47 -0000	1.12
@@ -10,6 +10,8 @@
 Group: 	 Applications/Internet 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kasablanca-0.4.0.2-dt.patch
+
 BuildRequires: gettext 
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
@@ -29,6 +31,8 @@
 %prep
 %setup -q 
 
+%patch1 -p1 -b .dt
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh



From fedora-extras-commits at redhat.com  Thu Jan 19 15:59:21 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 19 Jan 2006 10:59:21 -0500
Subject: rpms/kasablanca/FC-4 kasablanca-0.4.0.2-dt.patch, NONE,
	1.1 kasablanca.spec, 1.10, 1.11
Message-ID: <200601191559.k0JFxr5X027568@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27543

Modified Files:
	kasablanca.spec 
Added Files:
	kasablanca-0.4.0.2-dt.patch 
Log Message:
* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
- drop x-modular hack(s) (kdelibs-devel fixed)
- .desktop: GenericName=FTP client
- update %description


kasablanca-0.4.0.2-dt.patch:

--- NEW FILE kasablanca-0.4.0.2-dt.patch ---
--- kasablanca-0.4.0.2/src/kasablanca.desktop.dt	2004-03-22 12:58:39.000000000 -0600
+++ kasablanca-0.4.0.2/src/kasablanca.desktop	2006-01-19 09:48:07.000000000 -0600
@@ -1,26 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=kasablanca
-Name[xx]=xxkasablancaxx
+GenericName=FTP Client
 Exec=kasablanca
 Icon=kasablanca
 Type=Application
-Comment=A simple KDE Application
-Comment[ca]=Una simple aplicaci?? KDE
-Comment[da]=Et simpelt KDE program
-Comment[de]=Eine einfache KDE-Anwendung
-Comment[el]=?????? ???????? ???????????????? ?????? KDE
-Comment[es]=Una aplicaci??n de KDE sencilla
-Comment[et]=Lihtne KDE rakendus
-Comment[fr]=Une application simple pour KDE.
-Comment[hu]=Egyszer?? KDE-alkalmaz??s
-Comment[it]=Una semplice applicazione KDE
-Comment[nl]=Een eenvoudige KDE-toepassing
-Comment[pt]=Uma aplica????o KDE simples
-Comment[pt_BR]=Um simples Aplicativo do KDE
-Comment[ru]=?????????????? ???????????????????? KDE
-Comment[sl]=Preprost program za KDE
-Comment[sr]=?????????????????????? KDE ??????????????
-Comment[sv]=Ett enkelt KDE-program
-Comment[xx]=xxA simple KDE Applicationxx
-Comment[zh_CN]=???????????????KDE????????????


Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kasablanca.spec	19 Dec 2005 21:25:42 -0000	1.10
+++ kasablanca.spec	19 Jan 2006 15:59:20 -0000	1.11
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -10,24 +10,29 @@
 Group: 	 Applications/Internet 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kasablanca-0.4.0.2-dt.patch
+
 BuildRequires: gettext 
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
-# Workaround for kdelibs-devel missing deps:
-# http://bugzilla.redhat.com/bugzilla/176159
-%if "%{?fedora}" > "4"
-BuildRequires: xorg-x11-proto-devel libXt-devel
-%endif
 
 %description
-Kasablanca is an ftp client for KDE, among its features are currently 
-encryption (auth tls) support, fxp, site bookmarks, and queued transfers.
+Kasablanca is an ftp client for KDE, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
 
 
 %prep
 %setup -q 
 
+%patch1 -p1 -b .dt
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -104,12 +109,17 @@
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
+- drop x-modular hack(s) (kdelibs-devel fixed)
+- .desktop: GenericName=FTP client
+- update %%description
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-6
 - fix for modular X
 - workaround kdelibs-devel missing deps (#176159)



From fedora-extras-commits at redhat.com  Thu Jan 19 16:24:33 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 11:24:33 -0500
Subject: rpms/blender/devel .cvsignore, 1.6, 1.7 blender.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200601191625.k0JGP6IH029422@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29401

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jun 2005 00:22:58 -0000	1.6
+++ .cvsignore	19 Jan 2006 16:24:33 -0000	1.7
@@ -1 +1 @@
-blender-2.37.tar.gz
+blender-2.40.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blender.spec	8 Jul 2005 10:41:39 -0000	1.13
+++ blender.spec	19 Jan 2006 16:24:33 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           blender
-Version:        2.37
-Release:        3
+Version:        2.40
+Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.blender.org
-Source0:        http://download.blender.org/source/blender-2.37.tar.gz
+Source0:        http://download.blender.org/source/blender-%{version}.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
 Source3:        blender.png
@@ -45,8 +45,8 @@
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1 -b .x86_64
+%setup -q 
+# %patch0 -p1 -b .x86_64
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+- New upstream release.
+
 * Mon Jun 6 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-3
 - Bump release for development.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jun 2005 00:22:58 -0000	1.6
+++ sources	19 Jan 2006 16:24:33 -0000	1.7
@@ -1 +1 @@
-a233a77abcc5561fbe2c5fe307654b41  blender-2.37.tar.gz
+3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 16:43:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Jan 2006 11:43:07 -0500
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.9, 1.10 perl-Gtk2.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200601191643.k0JGhdh7029578@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29545

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
- Update to 1.103.
- Converted the Gtk2::Helper man page to utf8 (#177802).
- Provides list: filtered out perl(main) (#177802).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Nov 2005 15:34:03 -0000	1.9
+++ .cvsignore	19 Jan 2006 16:43:07 -0000	1.10
@@ -1 +1 @@
-Gtk2-1.102.tar.gz
+Gtk2-1.103.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Gtk2.spec	30 Nov 2005 15:34:03 -0000	1.13
+++ perl-Gtk2.spec	19 Jan 2006 16:43:07 -0000	1.14
@@ -1,5 +1,11 @@
+#
+# Rebuild option:
+#
+#   --with testsuite         - run the test suite (requires X)
+#
+
 Name:           perl-Gtk2
-Version:        1.102
+Version:        1.103
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -10,10 +16,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.102
+BuildRequires:  gtk2-devel, perl-Glib >= 1.103
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.102
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl-Glib >= 1.103
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module allows you to write Gtk+ graphical user interfaces in a
@@ -25,6 +31,17 @@
 %prep
 %setup -q -n Gtk2-%{version}
 
+iconv -f iso-8859-1 -t utf-8 -o pm/Helper.pm{.utf8,}
+mv pm/Helper.pm{.utf8,}
+
+# Provides: exclude perl(main)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(main)$'
+__EOF__
+%define __perl_provides %{_builddir}/Gtk2-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -41,8 +58,7 @@
 
 
 %check
-# Testing requires X
-%{?_with_tests:make test}
+%{?_with_testsuite:make test}
 
 
 %clean
@@ -59,6 +75,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.103-1
+- Update to 1.103.
+- Converted the Gtk2::Helper man page to utf8 (#177802).
+- Provides list: filtered out perl(main) (#177802).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
 - Update to 1.102.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Nov 2005 15:34:03 -0000	1.9
+++ sources	19 Jan 2006 16:43:07 -0000	1.10
@@ -1 +1 @@
-8bd7173c8a2b6b8baf2fa3c3d48d4bb5  Gtk2-1.102.tar.gz
+7c7a6970cd58756a19c787976306e635  Gtk2-1.103.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 18:05:29 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu, 19 Jan 2006 13:05:29 -0500
Subject: CVSROOT avail,1.23,1.24
Message-ID: <200601191805.k0JI5TSG000957@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv935

Modified Files:
	avail 
Log Message:
Adding new maintainers of Fedora Trans to the proper ACLS to work on and add their own docs.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- avail	4 Jan 2006 20:37:13 -0000	1.23
+++ avail	19 Jan 2006 18:05:10 -0000	1.24
@@ -27,11 +27,12 @@
 avail | sopwith,dwalsh,kwade | web/html/About/Projects
 avail | alikins,trobert | web/html/Download
 avail | llch | web/html/About/Projects/i18n
-avail | sarahs | web/html/About/Projects/translations
+avail | sarahs,aalam,ccheng | web/html/About/Projects/translations
 avail | kwade,pfrields | web/html/docs
-avail | sarahs | web/html/docs/translation-faq
-avail | sarahs | web/html/docs/translation-guide
-avail | sarahs | web/html/docs/translation-windows
+avail | sarahs,aalam,ccheng | web/html/docs/translation-faq
+avail | sarahs,aalam,ccheng | web/html/docs/translation-guide
+avail | sarahs,aalam,ccheng | web/html/docs/translation-windows
+avail | sarahs,aalam,ccheng | web/html/docs/translation-quick-start-guide
 avail | dmalcolm | web/html/About/Projects/stateless
 avail | dmalcolm | web/html/docs/stateless
 avail | riel | web/html/docs/virtualisation



From fedora-extras-commits at redhat.com  Thu Jan 19 18:21:11 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Jan 2006 13:21:11 -0500
Subject: rpms/celestia/devel celestia.spec,1.11,1.12
Message-ID: <200601191821.k0JILheU001283@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1263

Modified Files:
	celestia.spec 
Log Message:
Remove redundant BR: xorg-x11-proto-devel.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- celestia.spec	14 Jan 2006 22:16:05 -0000	1.11
+++ celestia.spec	19 Jan 2006 18:21:11 -0000	1.12
@@ -18,7 +18,6 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libGL-devel
-BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  libXt-devel
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -99,7 +98,7 @@
 
 %changelog
 * Thu Jan 05 2006 Steven Pritchard <steve at kspei.com> 1.4.0-2
-- Add BR: xorg-x11-proto-devel, libXt-devel
+- Add BR: libXt-devel
 
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0



From fedora-extras-commits at redhat.com  Thu Jan 19 18:28:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Jan 2006 13:28:13 -0500
Subject: rpms/perl-HTML-Mason/devel perl-HTML-Mason.spec,1.3,1.4
Message-ID: <200601191828.k0JISjZt001397@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1380

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Epoch bump to resolve rpm thinking 1.3101 > 1.32.



Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTML-Mason.spec	11 Jan 2006 01:00:28 -0000	1.3
+++ perl-HTML-Mason.spec	19 Jan 2006 18:28:12 -0000	1.4
@@ -1,6 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.32
-Release:        1%{?dist}
+Release:        2%{?dist}
+Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -80,6 +81,9 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Thu Jan 19 2006 Steven Pritchard <steve at kspei.com> 1:1.32-2
+- Epoch bump to resolve rpm thinking 1.3101 > 1.32
+
 * Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 1.32-1
 - Update to 1.32
 



From fedora-extras-commits at redhat.com  Thu Jan 19 18:37:01 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 13:37:01 -0500
Subject: rpms/gdesklets/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200601191837.k0JIbXRp001482@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1462

Modified Files:
	.cvsignore sources 
Log Message:

source updated




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
+++ .cvsignore	19 Jan 2006 18:37:00 -0000	1.3
@@ -1 +1 @@
-gDesklets-0.35.2.tar.bz2
+gDesklets-0.35.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 22:14:49 -0000	1.2
+++ sources	19 Jan 2006 18:37:00 -0000	1.3
@@ -1 +1 @@
-8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2
+3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 19:18:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Jan 2006 14:18:54 -0500
Subject: rpms/perl-Text-Iconv/devel perl-Text-Iconv.spec,1.5,1.6
Message-ID: <200601191919.k0JJJRQP003417@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Text-Iconv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3400

Modified Files:
	perl-Text-Iconv.spec 
Log Message:
* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-3
- Specfile cleanup.



Index: perl-Text-Iconv.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Iconv/devel/perl-Text-Iconv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Text-Iconv.spec	6 Apr 2005 22:13:08 -0000	1.5
+++ perl-Text-Iconv.spec	19 Jan 2006 19:18:54 -0000	1.6
@@ -1,15 +1,12 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Text-Iconv
 Version:        1.4
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl interface to iconv() codeset conversion function
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Text-Iconv/
-Source0:       http://www.cpan.org/authors/id/M/MP/MPIOTR/Text-Iconv-1.4.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MP/MPIOTR/Text-Iconv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -30,21 +27,20 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,13 +51,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorarch}/auto/Text
-%{perl_vendorarch}/Text
+%{perl_vendorarch}/auto/Text/
+%{perl_vendorarch}/Text/
 %{_mandir}/man3/Text::Iconv.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-3
+- Specfile cleanup.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.4-2
 - rebuilt
 
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Jan 19 19:23:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Jan 2006 14:23:19 -0500
Subject: rpms/perl-String-Ediff/devel perl-String-Ediff.spec,1.11,1.12
Message-ID: <200601191923.k0JJNprB003531@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-String-Ediff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514

Modified Files:
	perl-String-Ediff.spec 
Log Message:
* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.08-2
- Rebuild, cosmetics.



Index: perl-String-Ediff.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-String-Ediff.spec	9 Aug 2005 15:37:37 -0000	1.11
+++ perl-String-Ediff.spec	19 Jan 2006 19:23:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-String-Ediff
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Produce common sub-string indices for two strings
 
 Group:          Development/Libraries
@@ -23,8 +23,8 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
@@ -49,10 +49,13 @@
 %doc ChangeLog README
 %{perl_vendorarch}/auto/String/
 %{perl_vendorarch}/String/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/String::Ediff.3*
 
 
 %changelog
+* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.08-2
+- Rebuild, cosmetics.
+
 * Mon Aug  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.08-1
 - 0.08.
 



From fedora-extras-commits at redhat.com  Thu Jan 19 19:38:09 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 14:38:09 -0500
Subject: rpms/gdesklets/FC-3 gdesklets.spec,1.3,1.4
Message-ID: <200601191938.k0JJcg69003645@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3628

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/gdesklets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdesklets.spec	17 Jan 2006 23:27:04 -0000	1.3
+++ gdesklets.spec	19 Jan 2006 19:38:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,12 +96,14 @@
 
 
 %changelog
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbnail schema
 - Removed patch, no longer needed
 
-
 * Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up



From fedora-extras-commits at redhat.com  Thu Jan 19 19:39:38 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 14:39:38 -0500
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.4,1.5
Message-ID: <200601191940.k0JJeA9Q003708@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3689

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdesklets.spec	18 Jan 2006 09:32:35 -0000	1.4
+++ gdesklets.spec	19 Jan 2006 19:39:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1.1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
 - Rebuilt
 



From fedora-extras-commits at redhat.com  Thu Jan 19 19:40:49 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 14:40:49 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.8,1.9
Message-ID: <200601191941.k0JJfMqr003769@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3752

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdesklets.spec	17 Jan 2006 23:36:05 -0000	1.8
+++ gdesklets.spec	19 Jan 2006 19:40:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1.1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
 - Rebuilt
 



From fedora-extras-commits at redhat.com  Thu Jan 19 19:45:51 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 14:45:51 -0500
Subject: rpms/blender/FC-4 .cvsignore, 1.6, 1.7 blender.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200601191946.k0JJkOSv003877@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3840

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    Update to new upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jun 2005 03:47:41 -0000	1.6
+++ .cvsignore	19 Jan 2006 19:45:51 -0000	1.7
@@ -1 +1 @@
-blender-2.37.tar.gz
+blender-2.40.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blender.spec	8 Jul 2005 10:41:39 -0000	1.13
+++ blender.spec	19 Jan 2006 19:45:51 -0000	1.14
@@ -1,19 +1,18 @@
 Name:           blender
-Version:        2.37
-Release:        2
+Version:        2.40
+Release:        1.%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.blender.org
-Source0:        http://download.blender.org/source/blender-2.37.tar.gz
+Source0:        http://download.blender.org/source/blender-%{version}.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
 Source3:        blender.png
 Source4:        blender.desktop
 Source5:        blender.xml
-Patch0:         blender-2.37-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -45,8 +44,7 @@
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1 -b .x86_64
+%setup -q 
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -93,6 +91,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+- Update to new upstream release.
+
 * Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-2
 - Patch to fix compilation errors on x86_64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jun 2005 03:47:41 -0000	1.6
+++ sources	19 Jan 2006 19:45:51 -0000	1.7
@@ -1 +1 @@
-a233a77abcc5561fbe2c5fe307654b41  blender-2.37.tar.gz
+3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 19:50:50 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:50:50 -0500
Subject: rpms/byzanz - New directory
Message-ID: <200601191950.k0JJoqIA004066@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4058/byzanz

Log Message:
Directory /cvs/extras/rpms/byzanz added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 19:50:56 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:50:56 -0500
Subject: rpms/byzanz/devel - New directory
Message-ID: <200601191950.k0JJowM1004081@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4058/byzanz/devel

Log Message:
Directory /cvs/extras/rpms/byzanz/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 19:51:15 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:51:15 -0500
Subject: rpms/byzanz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601191951.k0JJpHei004116@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104

Added Files:
	Makefile import.log 
Log Message:
Setup of module byzanz


--- NEW FILE Makefile ---
# Top level Makefile for module byzanz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 19:51:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:51:21 -0500
Subject: rpms/byzanz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601191951.k0JJpNu3004138@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module byzanz


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 19:51:58 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:51:58 -0500
Subject: rpms/byzanz import.log,1.1,1.2
Message-ID: <200601191952.k0JJqULH004208@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4174

Modified Files:
	import.log 
Log Message:
auto-import byzanz-0.0.3-2 on branch devel from byzanz-0.0.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/byzanz/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 19:51:14 -0000	1.1
+++ import.log	19 Jan 2006 19:51:58 -0000	1.2
@@ -0,0 +1 @@
+byzanz-0_0_3-2:HEAD:byzanz-0.0.3-2.src.rpm:1137700311



From fedora-extras-commits at redhat.com  Thu Jan 19 19:52:04 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:52:04 -0500
Subject: rpms/byzanz/devel byzanz.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601191952.k0JJqaps004212@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4174/devel

Modified Files:
	.cvsignore sources 
Added Files:
	byzanz.spec 
Log Message:
auto-import byzanz-0.0.3-2 on branch devel from byzanz-0.0.3-2.src.rpm


--- NEW FILE byzanz.spec ---
Summary: A desktop recorder
Name: byzanz
Version: 0.0.3
Release: 2
License: GPL
Group: Applications/Multimedia
URL: http://www.freedesktop.org/~company/byzanz/
Source0: http://www.freedesktop.org/~company/byzanz/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: libXdamage-devel >= 1.0
BuildRequires: glib2-devel >= 2.6.0
BuildRequires: gnome-panel-devel >= 2.10.0
BuildRequires: gnome-vfs2-devel >= 2.12.0
BuildRequires: libgnomeui-devel >= 2.12.0

%description
Byzanz is a desktop recorder. Just like Istanbul. But it doesn't
record to Ogg Theora, but to GIF.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

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

%clean
rm -rf %{buildroot}

%files -f byzanz.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS

%{_bindir}/byzanz-record
%{_libdir}/bonobo/servers/ByzanzApplet.server
%{_libexecdir}/byzanz-applet

%changelog
* Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 19:51:20 -0000	1.1
+++ .cvsignore	19 Jan 2006 19:52:04 -0000	1.2
@@ -0,0 +1 @@
+byzanz-0.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 19:51:20 -0000	1.1
+++ sources	19 Jan 2006 19:52:04 -0000	1.2
@@ -0,0 +1 @@
+3c57cd11aba49fe05f77709cd9a7d609  byzanz-0.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 19:55:27 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:55:27 -0500
Subject: owners owners.list,1.551,1.552
Message-ID: <200601191955.k0JJtxJb004272@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4254

Modified Files:
	owners.list 
Log Message:
Added byzanz.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -r1.551 -r1.552
--- owners.list	19 Jan 2006 12:51:48 -0000	1.551
+++ owners.list	19 Jan 2006 19:55:27 -0000	1.552
@@ -85,6 +85,7 @@
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|byzanz|A desktop recorder|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 20:00:27 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 15:00:27 -0500
Subject: rpms/byzanz/devel byzanz.spec,1.1,1.2
Message-ID: <200601192001.k0JK10dw004334@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312

Modified Files:
	byzanz.spec 
Log Message:
Bump release.


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- byzanz.spec	19 Jan 2006 19:52:04 -0000	1.1
+++ byzanz.spec	19 Jan 2006 20:00:27 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
 Version: 0.0.3
-Release: 2
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -43,6 +43,9 @@
 %{_libexecdir}/byzanz-applet
 
 %changelog
+* Thu Jan 19 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-3
+- Bump release.
+
 * Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1
 - Initial build.
 



From fedora-extras-commits at redhat.com  Thu Jan 19 20:03:11 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 15:03:11 -0500
Subject: rpms/blender/FC-4 blender.spec,1.14,1.15
Message-ID: <200601192003.k0JK3o4G006091@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6074

Modified Files:
	blender.spec 
Log Message:

  Description:
    Add libtiff-devel as BuildRequires.



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blender.spec	19 Jan 2006 19:45:51 -0000	1.14
+++ blender.spec	19 Jan 2006 20:03:10 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           blender
 Version:        2.40
-Release:        1.%{?dist}
+Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -30,6 +30,8 @@
 BuildRequires:  scons
 BuildRequires:  SDL-devel
 BuildRequires:  zlib-devel
+BuildRequires:  libtiff-devel
+
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -92,6 +94,7 @@
 
 %changelog
 * Thu Jan 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+- Add libtiff-devel as BuildRequire2.
 - Update to new upstream release.
 
 * Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-2



From fedora-extras-commits at redhat.com  Thu Jan 19 20:32:03 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:32:03 -0500
Subject: rpms/lzop import.log,1.5,1.6
Message-ID: <200601192032.k0JKWZs1006433@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6389

Modified Files:
	import.log 
Log Message:
auto-import lzop-1.02-0.1.fc5 on branch devel from lzop-1.02-0.1.fc5.src.rpm
prepare for lzo2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lzop/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	18 Jan 2006 00:06:57 -0000	1.5
+++ import.log	19 Jan 2006 20:32:02 -0000	1.6
@@ -2,3 +2,4 @@
 lzop-1_01-0_fdr_1_1:HEAD:lzop-1.01-0.fdr.1.1.src.rpm:1099889437
 lzop-1_01-0_fdr_1_2:HEAD:lzop-1.01-0.fdr.1.2.src.rpm:1099889443
 lzop-1_01-4_fc5:HEAD:lzop-1.01-4.fc5.src.rpm:1137542768
+lzop-1_02-0_1_fc5:HEAD:lzop-1.02-0.1.fc5.src.rpm:1137702711



From fedora-extras-commits at redhat.com  Thu Jan 19 20:32:09 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:32:09 -0500
Subject: rpms/lzop/devel .cvsignore, 1.2, 1.3 lzop.spec, 1.8, 1.9 sources,
	1.2, 1.3 lzop-1.01-gcc29.patch, 1.1, NONE
Message-ID: <200601192032.k0JKWges006438@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6389/devel

Modified Files:
	.cvsignore lzop.spec sources 
Removed Files:
	lzop-1.01-gcc29.patch 
Log Message:
auto-import lzop-1.02-0.1.fc5 on branch devel from lzop-1.02-0.1.fc5.src.rpm
prepare for lzo2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:50:31 -0000	1.2
+++ .cvsignore	19 Jan 2006 20:32:09 -0000	1.3
@@ -1 +1 @@
-lzop-1.01.tar.gz
+lzop-1.02rc1.tar.gz


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lzop.spec	18 Jan 2006 00:07:32 -0000	1.8
+++ lzop.spec	19 Jan 2006 20:32:09 -0000	1.9
@@ -1,14 +1,15 @@
+%define archivever 1.02rc1
+
 Name: lzop
-Version: 1.01
-Release: 4%{?dist}
+Version: 1.02
+Release: 0.1%{?dist}
 
 Summary: Real-time file compressor
 
 Group: Applications/Archiving
 License: GPL
-URL: http://www.lzop.org/
-Source: http://www.lzop.org/download/lzop-%{version}.tar.gz
-Patch0: lzop-1.01-gcc29.patch
+URL: http://www.%{name}.org/
+Source: http://www.%{name}.org/download/%{name}-%{archivever}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: lzo-devel
@@ -22,8 +23,7 @@
 drop-in compatiblity to gzip.
 
 %prep
-%setup
-%patch0
+%setup -n %{name}-%{archivever}
 
 %build
 %configure
@@ -38,11 +38,15 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%doc AUTHORS NEWS README THANKS
+%doc AUTHORS COPYING NEWS README THANKS ChangeLog
 %doc %{_mandir}/man?/*
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Jan 19 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.02-0.1
+- update to 1.02rc1
+- build with lzop 2
+
 * Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.01-4
 - gcc 4.1 build time
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:31 -0000	1.2
+++ sources	19 Jan 2006 20:32:09 -0000	1.3
@@ -1 +1 @@
-de1f90bc21a0e56a27f39322f56a275d  lzop-1.01.tar.gz
+4b999030716b1353c3dac049b269df7a  lzop-1.02rc1.tar.gz


--- lzop-1.01-gcc29.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 20:33:55 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:33:55 -0500
Subject: rpms/lzop import.log,1.6,1.7
Message-ID: <200601192034.k0JKYS5q006552@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6506

Modified Files:
	import.log 
Log Message:
auto-import lzop-1.02-0.1.fc4 on branch FC-4 from lzop-1.02-0.1.fc4.src.rpm
prepare for lzo2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lzop/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	19 Jan 2006 20:32:02 -0000	1.6
+++ import.log	19 Jan 2006 20:33:55 -0000	1.7
@@ -3,3 +3,4 @@
 lzop-1_01-0_fdr_1_2:HEAD:lzop-1.01-0.fdr.1.2.src.rpm:1099889443
 lzop-1_01-4_fc5:HEAD:lzop-1.01-4.fc5.src.rpm:1137542768
 lzop-1_02-0_1_fc5:HEAD:lzop-1.02-0.1.fc5.src.rpm:1137702711
+lzop-1_02-0_1_fc4:FC-4:lzop-1.02-0.1.fc4.src.rpm:1137702826



From fedora-extras-commits at redhat.com  Thu Jan 19 20:34:01 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:34:01 -0500
Subject: rpms/lzop/FC-4 .cvsignore, 1.2, 1.3 lzop.spec, 1.7, 1.8 sources, 1.2,
	1.3 lzop-1.01-gcc29.patch, 1.1, NONE
Message-ID: <200601192034.k0JKYXTW006557@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6506/FC-4

Modified Files:
	.cvsignore lzop.spec sources 
Removed Files:
	lzop-1.01-gcc29.patch 
Log Message:
auto-import lzop-1.02-0.1.fc4 on branch FC-4 from lzop-1.02-0.1.fc4.src.rpm
prepare for lzo2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lzop/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:50:31 -0000	1.2
+++ .cvsignore	19 Jan 2006 20:34:01 -0000	1.3
@@ -1 +1 @@
-lzop-1.01.tar.gz
+lzop-1.02rc1.tar.gz


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/FC-4/lzop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lzop.spec	22 May 2005 23:49:12 -0000	1.7
+++ lzop.spec	19 Jan 2006 20:34:01 -0000	1.8
@@ -1,14 +1,15 @@
+%define archivever 1.02rc1
+
 Name: lzop
-Version: 1.01
-Release: 3
+Version: 1.02
+Release: 0.1%{?dist}
 
 Summary: Real-time file compressor
 
 Group: Applications/Archiving
 License: GPL
-URL: http://www.lzop.org/
-Source: http://www.lzop.org/download/lzop-%{version}.tar.gz
-Patch0: lzop-1.01-gcc29.patch
+URL: http://www.%{name}.org/
+Source: http://www.%{name}.org/download/%{name}-%{archivever}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: lzo-devel
@@ -22,8 +23,7 @@
 drop-in compatiblity to gzip.
 
 %prep
-%setup
-%patch0
+%setup -n %{name}-%{archivever}
 
 %build
 %configure
@@ -38,11 +38,18 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%doc AUTHORS NEWS README THANKS
+%doc AUTHORS COPYING NEWS README THANKS ChangeLog
 %doc %{_mandir}/man?/*
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Jan 19 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.02-0.1
+- update to 1.02rc1
+- build with lzop 2
+
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.01-4
+- gcc 4.1 build time
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.01-3
 - rebuild on all arches
 
@@ -50,7 +57,7 @@
 - rebuilt
 
 * Tue Apr 20 2004 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0:1.01-0.fdr.1
-* Fedorization
+- Fedorization
 
 * Tue Mar 09 2004 Dag Wieers <dag at wieers.com> - 1.01-1
 - Initial package. (using DAR)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lzop/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:31 -0000	1.2
+++ sources	19 Jan 2006 20:34:01 -0000	1.3
@@ -1 +1 @@
-de1f90bc21a0e56a27f39322f56a275d  lzop-1.01.tar.gz
+4b999030716b1353c3dac049b269df7a  lzop-1.02rc1.tar.gz


--- lzop-1.01-gcc29.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 21:33:37 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Jan 2006 16:33:37 -0500
Subject: mock mock.py,1.32,1.33
Message-ID: <200601192133.k0JLXbPZ008686@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668

Modified Files:
	mock.py 
Log Message:
s/mach/mock/ in comments.


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mock.py	27 Dec 2005 18:30:26 -0000	1.32
+++ mock.py	19 Jan 2006 21:33:30 -0000	1.33
@@ -219,7 +219,7 @@
 
     def yum(self, cmd):
         """use yum to install packages/package groups into the chroot"""
-        # mach-helper yum --installroot=rootdir cmd
+        # mock-helper yum --installroot=rootdir cmd
         basecmd = '%s --installroot %s' % (self.config['yum'], self.rootdir)
         
         self._mount() # check it again        
@@ -619,7 +619,7 @@
         #self.do_chroot ("mkdir -p /boot", fatal = True)
         #self.do_chroot ("echo '#ifndef __BOOT_KERNEL_H_' > /boot/kernel.h", fatal = True)
         #self.do_chroot ("echo '#define __BOOT_KERNEL_H_' >> /boot/kernel.h", fatal = True)
-        #self.do_chroot ("echo '#error This is a kernel.h generated by mach, including this indicates a build error !' >> /boot/kernel.h", fatal = True)
+        #self.do_chroot ("echo '#error This is a kernel.h generated by mock, including this indicates a build error !' >> /boot/kernel.h", fatal = True)
         #self.do_chroot ("echo '#endif /* __BOOT_KERNEL_H_ */' >> /boot/kernel.h", fatal = True)
         
 def command_parse():



From fedora-extras-commits at redhat.com  Thu Jan 19 21:54:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 16:54:03 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.10, 1.11 rxvt-unicode.spec,
	1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200601192154.k0JLsZ0b008808@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8752/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jan 2006 23:43:59 -0000	1.10
+++ .cvsignore	19 Jan 2006 21:54:03 -0000	1.11
@@ -1 +1 @@
-rxvt-unicode-7.0.tar.bz2
+rxvt-unicode-7.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rxvt-unicode.spec	13 Jan 2006 23:43:59 -0000	1.12
+++ rxvt-unicode.spec	19 Jan 2006 21:54:03 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -58,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/README.xvt doc/etc doc/menu COPYING
+%doc README.FAQ INSTALL doc/README.xvt doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.1-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Jan 2006 23:43:59 -0000	1.10
+++ sources	19 Jan 2006 21:54:03 -0000	1.11
@@ -1 +1 @@
-4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2
+2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 21:54:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 16:54:09 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.10, 1.11 rxvt-unicode.spec,
	1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200601192154.k0JLsgoV008813@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8752/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jan 2006 23:44:05 -0000	1.10
+++ .cvsignore	19 Jan 2006 21:54:09 -0000	1.11
@@ -1 +1 @@
-rxvt-unicode-7.0.tar.bz2
+rxvt-unicode-7.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rxvt-unicode.spec	13 Jan 2006 23:44:05 -0000	1.12
+++ rxvt-unicode.spec	19 Jan 2006 21:54:09 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -58,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/README.xvt doc/etc doc/menu COPYING
+%doc README.FAQ INSTALL doc/README.xvt doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.1-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Jan 2006 23:44:05 -0000	1.10
+++ sources	19 Jan 2006 21:54:09 -0000	1.11
@@ -1 +1 @@
-4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2
+2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 21:54:15 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 16:54:15 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.10, 1.11 rxvt-unicode.spec,
	1.15, 1.16 sources, 1.10, 1.11
Message-ID: <200601192154.k0JLslTu008818@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8752/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jan 2006 23:44:11 -0000	1.10
+++ .cvsignore	19 Jan 2006 21:54:15 -0000	1.11
@@ -1 +1 @@
-rxvt-unicode-7.0.tar.bz2
+rxvt-unicode-7.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rxvt-unicode.spec	13 Jan 2006 23:44:11 -0000	1.15
+++ rxvt-unicode.spec	19 Jan 2006 21:54:15 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/README.xvt doc/etc doc/menu COPYING
+%doc README.FAQ INSTALL doc/README.menu doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
@@ -71,6 +71,11 @@
 %{_libdir}/urxvt
 
 %changelog
+%changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.1-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Jan 2006 23:44:11 -0000	1.10
+++ sources	19 Jan 2006 21:54:15 -0000	1.11
@@ -1 +1 @@
-4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2
+2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 22:10:13 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 17:10:13 -0500
Subject: rpms/blender/devel blender.spec,1.14,1.15
Message-ID: <200601192210.k0JMAkx2010701@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681

Modified Files:
	blender.spec 
Log Message:

  Description:
    Adapted to modular X.
    Add libtiff-devel as Build-Requires.




Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blender.spec	19 Jan 2006 16:24:33 -0000	1.14
+++ blender.spec	19 Jan 2006 22:10:08 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           blender
 Version:        2.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -31,6 +31,12 @@
 BuildRequires:  scons
 BuildRequires:  SDL-devel
 BuildRequires:  zlib-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
+buildRequires:  freetype-devel
+
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -93,8 +99,10 @@
 
 
 %changelog
-* Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+* Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-2
 - New upstream release.
+- adapting to mudular X.
+- add libtiff-devel as BuildRequires.
 
 * Mon Jun 6 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-3
 - Bump release for development.



From fedora-extras-commits at redhat.com  Thu Jan 19 22:24:05 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:24:05 -0500
Subject: rpms/alltray/devel alltray.spec,1.2,1.3
Message-ID: <200601192224.k0JMObMC010883@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10865

Modified Files:
	alltray.spec 
Log Message:
Added -fPIC to RPM_OPT_FLAGS


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alltray.spec	30 Dec 2005 23:47:30 -0000	1.2
+++ alltray.spec	19 Jan 2006 22:24:04 -0000	1.3
@@ -20,6 +20,7 @@
 %setup -q
 
 %build
+RPM_OPT_FLAGS="-fPIC $RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
 
@@ -49,5 +50,6 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu Dec 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
+* Thu Jan 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
+- Added -fPIC to RPM_OPT_FLAGS
 - Initial RPM release



From fedora-extras-commits at redhat.com  Thu Jan 19 22:37:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 17:37:34 -0500
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wine-docs.spec, 1.2, 1.3
Message-ID: <200601192238.k0JMc7gk011066@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11011/FC-3

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
+++ .cvsignore	19 Jan 2006 22:37:34 -0000	1.3
@@ -1 +1 @@
-wine-docs-0.9.5.tar.bz2
+wine-docs-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 08:17:27 -0000	1.2
+++ sources	19 Jan 2006 22:37:34 -0000	1.3
@@ -1 +1 @@
-0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2
+23c9067d57639c637eaf065feb6c9917  wine-docs-0.9.6.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
+++ wine-docs.spec	19 Jan 2006 22:37:34 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-3
 - add dist



From fedora-extras-commits at redhat.com  Thu Jan 19 22:37:40 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 17:37:40 -0500
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wine-docs.spec, 1.2, 1.3
Message-ID: <200601192238.k0JMcDMV011071@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11011/FC-4

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
+++ .cvsignore	19 Jan 2006 22:37:40 -0000	1.3
@@ -1 +1 @@
-wine-docs-0.9.5.tar.bz2
+wine-docs-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 08:17:27 -0000	1.2
+++ sources	19 Jan 2006 22:37:40 -0000	1.3
@@ -1 +1 @@
-0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2
+23c9067d57639c637eaf065feb6c9917  wine-docs-0.9.6.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
+++ wine-docs.spec	19 Jan 2006 22:37:40 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-3
 - add dist



From fedora-extras-commits at redhat.com  Thu Jan 19 22:37:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 17:37:46 -0500
Subject: rpms/wine-docs/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wine-docs.spec, 1.2, 1.3
Message-ID: <200601192238.k0JMcIvj011076@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11011/devel

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
+++ .cvsignore	19 Jan 2006 22:37:46 -0000	1.3
@@ -1 +1 @@
-wine-docs-0.9.5.tar.bz2
+wine-docs-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 08:17:27 -0000	1.2
+++ sources	19 Jan 2006 22:37:46 -0000	1.3
@@ -1 +1 @@
-0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2
+23c9067d57639c637eaf065feb6c9917  wine-docs-0.9.6.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
+++ wine-docs.spec	19 Jan 2006 22:37:46 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-3
 - add dist



From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:20 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:20 -0500
Subject: rpms/nagios - New directory
Message-ID: <200601192244.k0JMiM5L011165@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11157/nagios

Log Message:
Directory /cvs/extras/rpms/nagios added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:26 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:26 -0500
Subject: rpms/nagios/devel - New directory
Message-ID: <200601192244.k0JMiSxu011180@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11157/nagios/devel

Log Message:
Directory /cvs/extras/rpms/nagios/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:44 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:44 -0500
Subject: rpms/nagios Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601192244.k0JMik0X011214@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11202

Added Files:
	Makefile import.log 
Log Message:
Setup of module nagios


--- NEW FILE Makefile ---
# Top level Makefile for module nagios
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:50 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:50 -0500
Subject: rpms/nagios/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601192244.k0JMiqqV011234@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11202/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nagios


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 22:47:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:47:14 -0500
Subject: rpms/nagios import.log,1.1,1.2
Message-ID: <200601192247.k0JMlkEl011321@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11286

Modified Files:
	import.log 
Log Message:
auto-import nagios-1.3-14 on branch devel from nagios-1.3-14.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 22:44:44 -0000	1.1
+++ import.log	19 Jan 2006 22:47:14 -0000	1.2
@@ -0,0 +1 @@
+nagios-1_3-14:HEAD:nagios-1.3-14.src.rpm:1137710827



From fedora-extras-commits at redhat.com  Thu Jan 19 22:47:20 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:47:20 -0500
Subject: rpms/nagios/devel nagios.logrotate, NONE, 1.1 nagios.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601192247.k0JMlqFu011327@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11286/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nagios.logrotate nagios.spec 
Log Message:
auto-import nagios-1.3-14 on branch devel from nagios-1.3-14.src.rpm


--- NEW FILE nagios.logrotate ---
# Important!  Nagios rotates its own logs.  Only enable this logrotate if you
# know what you are doing!

# For more information please see "log_rotate_method" in: 
# /etc/nagios/nagios.cfg

# ----- logrotate config -------------
#/var/log/nagios/*.log {
#       missingok
#       weekly
#       notifempty
#       nocompress
#       create 644 nagios nagios
#}



--- NEW FILE nagios.spec ---
Name: nagios
Version: 1.3
Release: 14
Summary: Host/service/network monitoring program

Group: Applications/System
License: GPL
URL: http://www.nagios.org/
Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
Source1: nagios.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gd-devel > 1.8
Requires: httpd
Requires(pre): %{_sbindir}/useradd
Requires(preun): /sbin/service /sbin/chkconfig
Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/usermod
Requires(postun): /sbin/service

%description
Nagios is a program that will monitor hosts and services on your
network.  It has the ability to send email or page alerts when a
problem arises and when a problem is resolved.  Nagios is written
in C and is designed to run under Linux (and some other *NIX
variants) as a background process, intermittently running checks
on various services that you specify.

The actual service checks are performed by separate "plugin" programs
which return the status of the checks to Nagios. The plugins are
available at http://sourceforge.net/projects/nagiosplug.

This package provides the core program, web interface, and documentation
files for Nagios. Development files are built as a separate package.

%package devel
Group: Applications/System
Summary: Provides include files that Nagios-related applications may compile against
Requires: %{name} = %{version}-%{release}

%description devel
Nagios is a program that will monitor hosts and services on your
network. It has the ability to email or page you when a problem arises
and when a problem is resolved. Nagios is written in C and is
designed to run under Linux (and some other *NIX variants) as a
background process, intermittently running checks on various services
that you specify.

This package provides include files that Nagios-related applications
may compile against.

%prep
%setup -q

%build
./configure \
	--prefix=%{_datadir}/%{name} \
	--exec-prefix=%{_localstatedir}/lib/%{name} \
	--with-init-dir=%{_initrddir} \
	--with-cgiurl=/%{name}/cgi-bin/ \
	--with-htmlurl=/%{name} \
	--with-lockfile=%{_localstatedir}/run/%{name}.pid \
	--with-nagios-user=nagios \
	--with-nagios-grp=nagios \
	--bindir=%{_sbindir} \
	--libexecdir=%{_libdir}/%{name}/plugins \
	--sysconfdir=%{_sysconfdir}/%{name} \
	--localstatedir=%{_localstatedir}/log/%{name} \
	--with-gd-lib=%{_libdir} \
	--with-gd-inc=%{_includedir} \
	--enable-embedded-perl \
	--with-perlcache \
	--with-template-objects \
	--with-template-extinfo	
make %{?_smp_mflags} all

%{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora
%{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \
	 -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora
%{__sed} -e "s|resource.cfg|private/resource.cfg|" \
	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
%{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config
%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private
%{__install} -D -m 0755 base/nagios %{buildroot}/%{_sbindir}/nagios
%{__install} -d -m 0755 cgi/ %{buildroot}/%{_libdir}/%{name}/cgi-bin/
%{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
%{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
%{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
%{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
%{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
%{__install} -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
%{__mkdir} -p %{buildroot}/%{_initrddir}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__cp} -a html/* %{buildroot}/%{_datadir}/%{name}/html/
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/*in
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/Makefile
%{__mv} %{buildroot}/%{_sysconfdir}/%{name}/resource.cfg-sample %{buildroot}/%{_sysconfdir}/%{name}/private/resource.cfg-sample

%clean
rm -rf %{buildroot} > /dev/null 2>&1

%pre
%{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || :

%preun
/sbin/service nagios stop > /dev/null 2>&1 || :
/sbin/chkconfig --del %{name} || :

%post
/sbin/chkconfig --add %{name} || :
/sbin/service httpd condrestart > /dev/null 2>&1 || :
%{_sbindir}/usermod -G %{name} apache || :

%postun
/sbin/service httpd condrestart > /dev/null 2>&1 || :

%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/%{name}
%dir %{_libdir}/%{name}/plugins/eventhandlers
%dir %{_libdir}/%{name}/cgi-bin
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/html
%doc %{_datadir}/%{name}/html/docs
%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
%{_datadir}/%{name}/html/[^d]*
%{_sbindir}/*
%{_libdir}/%{name}/cgi-bin/*cgi
%{_initrddir}/nagios
%config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample

%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private
%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}

%changelog
* Sun Jan 15 2005 Mike McGrath <imlinux at gmail.com> 1.3-14
- Fedora friendly spec file

* Sat May 31 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.1-1)
- Merge with CVS for 1.1 release

* Fri May 30 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.0-4)
- cmdgrp was not always getting created
- patches for cmd.cgi and history.cgi

* Sat May 24 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.0-3)
- patches for doco and PostgreSQL timestamp
- make sure all files are packaged (otherwise, will not build on RH9)

* Sat May 17 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.0-2)
- patch for file descriptor leak

* Fri Oct 04 2002 Karl DeBisschop <kdebisschop at users.sourceforge.net>
- merge many improvements from Ramiro Morales <rm-rpms at gmx.net>
  (macros for PERF_EXTERNAL and EMBPERL, cleanup pre/post scripts,
   nnmmsg logger macro, include eventhandlers, convertcfg, mini_epn)
- use LSB-standard /etc/init.d/nagios startup location

* Tue Aug 13 2002 Karl DeBisschop <kdebisschop at users.sourceforge.net>
- INSTALL was renamed INSTALLING
- p1.pl script included in package
- web server restarted because Red Hat 7.3 init does not do 'reload'

* Fri Jun 14 2002 Ethan Galstad <nagios at nagios.org) (1.0b4)
- Modified requirements to work when installed using KickStart (Jeff Frost)
- Changed method used for checking for user/group existence (Jeff Frost)

* Tue May 15 2002 Ethan Galstad <nagios at nagios.org) (1.0b1)
- Updated to work with new sample template-based config files (Darren Gamble)

* Sun Feb 17 2002 Ole Gjerde <gjerde at ignus.com> (1.0a4)
- Fixed spec file to work with Nagios

* Wed Jan 17 2001 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.7a5-1)
- switch from /usr/libexec to /usr/lib because linux FHS has no libexec
- use global macro to set location of init script
- fold htaccess.sample into contrib directory of tarball

* Fri Nov 03 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6-1)
- Rebuild with final sources

* Wed Sep 06 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b5-1)
- Create separate cgi, html, and devel packages
- Include commands.cfg

* Sun Aug 27 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b5-1)
- beta 5

* Sun Jul 23 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b3-2)
- fixes for daemon-init, multi-OS RPM building

* Wed Jul 12 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b3-1)
- beta 3

* Sun Jun 25 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b2-3)
- true beta2 sources

* Sat Jun 24 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b2-2)
- cleanup spec, still using pre-beta2 sources

* Sat Jun 24 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b2-1)
- mandrake merge using pre-beta2 sources (many thanks to Stefan van der Eijk <s.vandereijk at chello.nl>)

* Wed Jun 14 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b1-1)
- add stylesheet diffs

* Mon Jun 12 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b1-1)
- adapt for 0.0.6b1

* Mon Jun 05 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.5-4)
- add traceroute.cgi and htaccess.sample
- move placement of docs (in files) to avoid group warnings
- change www user and group to nobody and add warning

* Mon Jun 05 2000 Karsten Weiss <knweiss at gmx.de> (0.0.5-3)
- official group name
- improved user detection

* Tue Oct 19 1999 Mike McHenry <mmchen at minn.net) (0.0.4-2)
- Fixed init.d scripts to better fit new Redhat init.d script formats

* Fri Sep 03 1999 Mike McHenry <mmchen at minn.net> (0.0.4-1)
- Upgraded package from 0.0.4b4 to 0.0.4

* Mon Aug 16 1999 Mike McHenry <mmchen at minn.net>
- First RPM build (0.0.4b4)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 22:44:50 -0000	1.1
+++ .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
@@ -0,0 +1 @@
+nagios-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 22:44:50 -0000	1.1
+++ sources	19 Jan 2006 22:47:20 -0000	1.2
@@ -0,0 +1 @@
+2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 22:59:35 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 17:59:35 -0500
Subject: rpms/azureus - New directory
Message-ID: <200601192259.k0JMxb7g011466@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11458/azureus

Log Message:
Directory /cvs/extras/rpms/azureus added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 22:59:41 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 17:59:41 -0500
Subject: rpms/azureus/devel - New directory
Message-ID: <200601192259.k0JMxhoS011482@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11458/azureus/devel

Log Message:
Directory /cvs/extras/rpms/azureus/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 23:00:04 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:00:04 -0500
Subject: rpms/azureus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601192300.k0JN07mc011525@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11513

Added Files:
	Makefile import.log 
Log Message:
Setup of module azureus


--- NEW FILE Makefile ---
# Top level Makefile for module azureus
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:00:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:00:10 -0500
Subject: rpms/azureus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601192300.k0JN0CwF011545@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11513/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module azureus


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:07:40 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:07:40 -0500
Subject: rpms/azureus import.log,1.1,1.2
Message-ID: <200601192308.k0JN8YHu013485@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410

Modified Files:
	import.log 
Log Message:
auto-import azureus-2.3.0.6-13 on branch devel from azureus-2.3.0.6-13.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/azureus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 23:00:04 -0000	1.1
+++ import.log	19 Jan 2006 23:07:40 -0000	1.2
@@ -0,0 +1 @@
+azureus-2_3_0_6-13:HEAD:azureus-2.3.0.6-13.src.rpm:1137712030



From fedora-extras-commits at redhat.com  Thu Jan 19 23:08:03 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:08:03 -0500
Subject: rpms/azureus/devel Azureus.desktop, NONE, 1.1 azureus-ChangeLog.txt,
	NONE, 1.1 azureus-ConfigurationManager-improvement.patch, NONE,
	1.1 azureus-GKR.patch, NONE, 1.1 azureus-License.txt, NONE,
	1.1 azureus-base64.patch, NONE, 1.1 azureus-cache-size.patch,
	NONE, 1.1 azureus-java.beans.XMLEncoder.patch, NONE,
	1.1 azureus-jessie.patch, NONE,
	1.1 azureus-no-bouncycastle.patch, NONE,
	1.1 azureus-remove-manifest-classpath.patch, NONE,
	1.1 azureus-remove-win32-PlatformManagerUpdateChecker.patch,
	NONE, 1.1 azureus-remove-win32-osx-platforms.patch, NONE,
	1.1 azureus-sun.misc.Cleaner.patch, NONE,
	1.1 azureus-sun.misc.Signal.patch, NONE,
	1.1 azureus.applications, NONE, 1.1 azureus.script, NONE,
	1.1 azureus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601192308.k0JN8dW5013489@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Azureus.desktop azureus-ChangeLog.txt 
	azureus-ConfigurationManager-improvement.patch 
	azureus-GKR.patch azureus-License.txt azureus-base64.patch 
	azureus-cache-size.patch azureus-java.beans.XMLEncoder.patch 
	azureus-jessie.patch azureus-no-bouncycastle.patch 
	azureus-remove-manifest-classpath.patch 
	azureus-remove-win32-PlatformManagerUpdateChecker.patch 
	azureus-remove-win32-osx-platforms.patch 
	azureus-sun.misc.Cleaner.patch azureus-sun.misc.Signal.patch 
	azureus.applications azureus.script azureus.spec 
Log Message:
auto-import azureus-2.3.0.6-13 on branch devel from azureus-2.3.0.6-13.src.rpm


--- NEW FILE Azureus.desktop ---
[Desktop Entry]
Name=Azureus
Comment=A BitTorrent Client
Exec=azureus
Icon=azureus
Terminal=false
Type=Application
MimeType=application/x-bittorrent
Categories=Application;Network;



--- NEW FILE azureus-ChangeLog.txt ---
AZUREUS CHANGELOG
---------

2005.11.22 | Azureus 2.3.0.6

FEATURE: Core | Built in tracker support for multiple listen ports [Parg]
FEATURE: Core | Tracker support for multi-hash scrapes [Parg]
FEATURE: Core | "Date added" field added for hosted torrents [Parg]
FEATURE: Core | Alternate max upload rate limit when only seeding option [Nolar]
FEATURE: Core | Ability to move a download's data files and torrent added [Parg]
FEATURE: Core | Added ability to turn off DHT originated IP Filter violation logs [Parg]
FEATURE: Core | When a peer is banned remove any data downloaded from it in partially complete pieces [Parg]
FEATURE: Core | Added "block banning" feature when multiple bad peers found with "close" IPs [Parg]
FEATURE: Core | Support for platform-specific plugin update components [Parg]
FEATURE: Core | Support for .torrent file download using just infohash hex string (via DHT magnet lookup mechanism) [Nolar]
FEATURE: Core | Added some control over initial share ratio for "add for seeding" downloads [Parg]
FEATURE: Core | Added feature to allow disabling of multi-hash tracker scrapes [Parg]
FEATURE: Core | Tracker connections respect bind-ip settings (http only) [Parg]
FEATURE: Core | Banned ips persisted across restart [Parg]
FEATURE: Core | Ability to add an alternative max-torrent-limit when seeding [Parg]
FEATURE: Core | DHT NAT punching for firewalled peers [Parg]
FEATURE: Core | Ability to rename and redirect files within a torrent [Parg]
FEATURE: Core | Compact storage for "do not download" files [Parg]
FEATURE: Core | Magnet URI protocol registration under windows [Parg]
FEATURE: Plug | UPnP plugin will warn if it discovers a router that has known protocol problems [Parg]
FEATURE: Plug | Magnet URI accessor method added to Torrent [Parg]
FEATURE: Plug | Added "launchable plugins" that can be used to start Azureus [Parg]
FEATURE: Plug | Added single-instance management function [Parg]
FEATURE: Plug | Made some platform-specific functions available to plugins [Parg]
FEATURE: Plug | Ability to add Swing based interfaces as plugin views [Parg]
FEATURE: UI   | Console UI support for viewing specific plugin logs [Parg]
FEATURE: UI   | Beginner configuration user mode provides a simplified interface [Gouss]
FEATURE: UI   | Support for --closedown parameter to org.gudy.azureus2.ui.swt.Main to closedown an existing AZ instance [Parg]
FEATURE: UI   | Added Average Peer Completion percentage column to MyTorrents view and Details view [Nolar]
FEATURE: UI   | Added NAT status icon to status area [Parg]
FEATURE: UI   | Indicate potential DHT port problems in SWT status area [Parg]
FEATURE: UI   | Added swarm average to activity view plus a legend [Parg]
FEATURE: UI   | Console support for listing shares improved, deleting of shares added [Parg]

CHANGE: Core  | Countermeasures against swarm DOS/poisoning [Nolar]
CHANGE: Core  | Health status for swarms where all known peers are connected now reported as OK [Parg]
CHANGE: Core  | Friendly hash-checking option now only applied during recheck operations and delay based on piece size [Parg]
CHANGE: Core  | Don't automatically remove directory contents shares if they (appear to) have been deleted [Parg]
CHANGE: Core  | Improved algorithm for detecting DHT port reachability [Parg]
CHANGE: Core  | DHT - removed cache-distance metrics and added value versions to handle value evolution correctly [Parg]
CHANGE: Core  | Reduced thread count by aggregating async listener dispatchers [Parg]
CHANGE: Core  | Major refactoring of Download and Disk managers [Parg]
CHANGE: Core  | Download totals don't include hash fails and discards and aren't included in share-ratio calculation [Parg]
CHANGE: Core  | "Max simultaneous outbound connection attempts" option no longer accepts zero as a disable value [Nolar]
CHANGE: Core  | Under OSX, new bundle launches using the Java Preferences application configured JVM, enabling JRE 5.0 support [Nolar]
CHANGE: Core  | Under Windows, now runs via a launcher built by exe4j - taskmanager process is now "Azureus.exe" [Nolar,Parg]
CHANGE: Plug  | Major refactoring of plugin interface to separate out UI-level and core-level stuff [Parg]
CHANGE: UI    | Update to the latest release SWT library (3.1.1) [Nolar]

BUGFIX: Core  | Fix interested flag being set sometimes when seeding [Nolar]
BUGFIX: Core  | Wrong file name returned for stopped simple torrents [Parg]
BUGFIX: Core  | Seeder/leecher counts missing for published torrents [Parg]
BUGFIX: Core  | Stats going negative for hosted torrent average up/down [Parg]
BUGFIX: Core  | Fix piece request ignore bug [Nolar]
BUGFIX: Core  | Fixed DHT initialisation hang if port already in use [Parg]
BUGFIX: Core  | Don't allow prohibited peer sources to be enabled (ui artifact only) [Parg]
BUGFIX: Core  | Fixed too many socket selectors created when in safe selector mode [Nolar]
BUGFIX: Core  | Fixed re-announce interval when receiving "failure reason" error response from tracker [Nolar]
BUGFIX: Core  | Fixed and improved restarts under OSX (and linux) [Nolar,Gouss]
BUGFIX: Core  | Fixed and improved one-to-one LAN transfer speeds [Nolar]
BUGFIX: Plug  | UPnP fix for picking up changed network interfaces [Parg]
BUGFIX: UI    | Fixed 100% CPU problem with download bars [Parg]
BUGFIX: UI    | Fixed UI foregrounding itself on every unverified localhost:6880 socket connection attempt [Nolar]
BUGFIX: UI    | Create-torrent wizard fix for multi-torrent checkbox enabling error [Parg]




2005.06.27 | Azureus 2.3.0.4

FEATURE: Core | DHT torrent lookup now based on sha1(hash) and torrent xfer encrypted using hash-derived key [Parg]
FEATURE: Core | More aggressive banning of peers sending bad data - algorithm change and block-banning feature [Gudy,Parg]
FEATURE: Core | Support for multiple DHT networks on same port [Parg]
FEATURE: Core | Introduced "passive torrents" - these are tracked but not downloaded [Parg]
FEATURE: Core | Category setting functions added to "My Tracker" [Parg]
FEATURE: Core | Added ability to make plugin config ui components invisible [Parg]
FEATURE: UI   | Average peer speed for swarm column added [Nolar]
FEATURE: Plug | Plugin interface extension to allow per-plugin torrent-attributes [Parg]
FEATURE: Plug | Plugin ResourceDownload feature for accessing content-type [Parg]

CHANGE: Core  | Improved optimistic unchoke anti-leech algorithms [Nolar]
CHANGE: Core  | CVS versions run multiple DHTs to permit validations of changes [Parg]
CHANGE: Core  | DHT anti-spoof for cache forwards [Parg]
CHANGE: Core  | DHT mechanisms for flood prevention [Parg]
CHANGE: Core  | Added local tracker url to torrents when hosting external torrents [Parg]
CHANGE: Core  | Hosted torrents now become "passively tracked" when their corresponding download is removed [Parg]
CHANGE: Core  | More pro-active injection of DHT scrapes for torrents with failing trackers [Parg]
CHANGE: Plug  | More JPC plugin enhancements to help reduce cache server load [Nolar]

BUGFIX: Core  | DHT protocol version logic fixes [Parg]
BUGFIX: Core  | Fix for 100% cpu when more than 60 connections are registered with a selector under buggy network stacks [Nolar]
BUGFIX: Core  | Invalid listen port configuration would prevent Azureus from starting [Nolar]
BUGFIX: Core  | Added hooks to catch Windows shutdown events to allow graceful Azureus exit [Nolar]
BUGFIX: Core  | Fix for start-stopped non-simple torrents showing data-missing error on restart [Parg]
BUGFIX: Core  | Fix for drag-n-drop SWT exceptions blocking Azureus startup [Nolar]
BUGFIX: Core  | Fixed up "interested" message for downloads with "do not download" files [Parg,Nolar]
BUGFIX: UI    | Categories not being correctly displayed when torrents transit between downloading and seeding [Parg]



2005.05.25 | Azureus 2.3.0.2

FEATURE: UI   | Console UI now has update check, alerting and DHT stats [Parg]
FEATURE: UI   | SWT make torrent wizard remembers value for "add other hashes" [Parg]
FEATURE: UI   | Console UI logging config [Fatal]
FEATURE: Plug | Added progress indicator and torrent stats to tracker web templates [Parg, Gouss]
FEATURE: Plug | Availability column added to webui + some alignment changes [Parg]
FEATURE: Plug | XML/http interface access to individual torrent file stats added [Parg]

CHANGE: Core  | CPU usage reductions when connected to many idle peers [Nolar]
CHANGE: Core  | Disable console view logging by default [Nolar]
CHANGE: Core  | Memory usage reductions and optimizations [Gudy, Parg, Nolar]
CHANGE: Core  | Improved long-term connection-attempt management [Nolar]
CHANGE: Core  | DHT bootstrap in absence of version-check server improved [Parg]
CHANGE: Core  | DHT IP filter reports reduced [Parg]
CHANGE: Core  | Disk manager read/write threads now started on demand [Parg]
CHANGE: UI    | Default for "add other hashes" in make torrent wizard and sharing config changed to false [Parg]
CHANGE: UI    | Retention of log history removed as taking up to 1MB mem [Parg]
CHANGE: UI    | Added missing spaces back into SWT dock item's tooltip [Parg]
CHANGE: UI    | Restore version number on status bar and add protocol rate to the stats view [Nolar]
CHANGE: Plug  | JPC plugin refactoring to help reduce cache server load [Nolar]

BUGFIX: Core  | Fix compatibility with JRE 1.4 series under Win32 due to NIO bug [Nolar]
BUGFIX: Core  | Ignore peers with these data ports config option didn't work the DHT and PEX obtained peers [Nolar]
BUGFIX: Core  | DHT IP derivation from contacts fixed [Parg]



2005.05.02 | Azureus 2.3.0.0

FEATURE: Core | Client support for the 'trackerid' announce extension [Nolar]
FEATURE: Core | Client support for the 'min interval' announce extension [Nolar]
FEATURE: Core | Added options to disable scrape entirely or just for non-running torrents [Parg]
FEATURE: Core | RSS Feed parse APIs added to plugin interface [Parg]
FEATURE: Core | Non-blocking sockets based TCP tracker implementation [Parg]
FEATURE: Core | Client identification plugin interface [Parg]
FEATURE: Core | Separate protocol payload and overhead stats [Nolar]
FEATURE: Core | Data deletion can now defer to Recycle Bin and Trash under Windows and Mac OS X, respectively [Parg, CrazyAlchemist]
FEATURE: Core | Distributed Database [Parg]
FEATURE: Core | Decentralised tracking [Parg]
FEATURE: Core | Magnet URI for location of decentralised torrents [Parg]
FEATURE: Core | Ability to update built-in plugins independently of the core [Parg]
FEATURE: Core | Diagnostic collection for system properties and config settings [Parg]
FEATURE: Core | added option to move newly completed seeds to the end of the seeding list, rather than the front [Parg]
FEATURE: Core | Support for I2P plugin [Parg]
FEATURE: Core | Network selection support (public, i2p, tor) [Parg]
FEATURE: Core | Inter-client peer exchange [Nolar]
FEATURE: UI   | Option to disable small fonts under OSX [Nolar]
FEATURE: UI   | Console support for aliases [Fatal]
FEATURE: UI   | Torrent export option added to SWT UI [Parg]
FEATURE: UI   | Keyboard shortcut parsing system [CrazyAlchemist]
FEATURE: UI   | System tray menus for setting global upload and download bandwidth limits [CrazyAlchemist]
FEATURE: UI   | Synthesized speech alerts for Mac OS X; Go to Azureus / Preferences to enable it [CrazyAlchemist]
FEATURE: UI   | New file icon for Mac OS X [CrazyAlchemist]
FEATURE: Plug | Added local host configuration setting for statusmailer [Parg]
FEATURE: Plug | Reworked CSS for tracker web pages to create old and new styles [Gouss]
FEATURE: Plug | StartStop Rules: First Priority ignore Rules: 0 Peers and SeedsPeers Ratio [Gouss]
FEATURE: Plug | RSS Feed added to tracker web pages [Parg]
FEATURE: Plug | Tracker stats added to tracker web pages [Parg]
FEATURE: Plug | Generic Messaging API: inter-client message passing [Nolar]
FEATURE: Plug | Joltid Peer Cache plugin is now bundled with Azureus [Nolar, Parg, Gudy]
FEATURE: Plug | I2P plugin [Parg]

CHANGE: Core | Smarter re-announce interval handling, especially for lopsided swarms [Nolar]
CHANGE: Core | Added many new peerid identifications [Nolar, Gouss]
CHANGE: Core | First piece priority option now also prioritizes last piece of file [Nolar]
CHANGE: Core | NAT check functions even when downloads have already been started [Nolar]
CHANGE: Core | Update check can now check via configured proxy [Nolar]
CHANGE: Core | Rewritten download code: decreased cpu usage and faster speeds in LAN network environments [Nolar]
CHANGE: Core | Network IP_TOS option now sets required registry setting under Win2K/XP [Parg, Nolar]
CHANGE: Core | Favor establishing inbound peer connections, to increase the health of swarms with firewalled clients [Nolar]
CHANGE: Core | Improved seeding unchoking algorithm: distributes data more evenly [Nolar]
CHANGE: Core | Anti-leech code to prevent optimistic unchoke leechers [Nolar]
CHANGE: Core | Reduced threads required for multiple torrents [Parg]
CHANGE: Core | Relaxed cross-torrent file locking to permit multiple read access [Parg]
CHANGE: Core | changed HTTP user-agent to include OS and java version [Parg]
CHANGE: Core | max cache size limited to 32M less than VM size [Parg]
CHANGE: UI   | Reintroduced download completion alerts in Mac OS X (use System Preferences / Sound to set the alert sound of choice) [CrazyAlchemist]
CHANGE: UI   | For Mac OS X, contextual menu items no longer carry images for better compliance with Apple Human Interface Guidelines [CrazyAlchemist]
CHANGE: UI   | RFE #1092614: Informational popup messages now auto-close after 5 seconds - unless the message window is closed manually, or if the mouse is over it / details view is open (the timing will be 'reset' then) [CrazyAlchemist]
CHANGE: UI   | Miscellaneous cosmetics updates for Mac OS X [CrazyAlchemist]
CHANGE: UI   | Bug #1112278: https:// URLs now autopaste in Open URL window [CrazyAlchemist]
CHANGE: UI   | Main menu bar should now be more streamlined in its arrangement [CrazyAlchemist]
CHANGE: UI   | Console view will now display information logged (for the duration of the application session) when the Console view is closed [CrazyAlchemist]
CHANGE: UI   | ETA and remaining now take into account DHD files [Parg]
CHANGE: Plug | More choices in First Priority ShareRatio [Gouss]

BUGFIX: Core | IPFilters loaded from static config file weren't working [Parg]
BUGFIX: Core | Fix re-announce interval bug when zero peers in swarm [Nolar]
BUGFIX: Core | Send uninterested message when complete while using do-not-download feature [Nolar]
BUGFIX: Core | Optimistic Connect, when seeding, no longer drops just random connections [Nolar]
BUGFIX: Core | Better recovery from corrupt resume data [Parg]
BUGFIX: Core | Better handling of invalid torrent save locations [Parg]
BUGFIX: Core | fix for SSL (https) problems introduced by changes in JDK 5.0 [Parg]
BUGFIX: Core | fix for hash-fails when running with cache + incremental file creation enabled [Parg]
BUGFIX: Core | Fix scrape processing stall bug when scrape url was invalid [Nolar]
BUGFIX: UI   | Corrected save dialog behaviour on Make Torrent Wizard regarding file selection [CrazyAlchemist]
BUGFIX: UI   | Bug #953619 concerning Mac OS X: Double-clicking .torrent files now activate Azureus with the expected Finder dialogs (Dragging files to the Dock icon will continue to malfunction for the indefinite future) [CrazyAlchemist]
BUGFIX: UI   | Bug #1120995: Improper validation could allow unreasonably low global upload cap [CrazyAlchemist]
BUGFIX: UI   | Main window no longer tries to steal focus on opening (Mac OS X) [CrazyAlchemist]
BUGFIX: UI   | Pop up messages no longer try to steal focus (Mac OS X) [CrazyAlchemist]
BUGFIX: UI   | Resolved fuzzy dock icon display under Mac OS X if Column Setup is opened [CrazyAlchemist]
BUGFIX: UI   | Upload caps for individual transfers now display more sensible values if global upload cap is set to unlimited [CrazyAlchemist]
BUGFIX: UI   | In My Torrents, a category view will no longer prevent its corresponding table view's horizontal scrolling [CrazyAlchemist]
BUGFIX: UI   | Download bars should no longer disappear when the main window is minimized (Mac OS X) [CrazyAlchemist]
BUGFIX: UI   | Certain table column contents no longer 'disappear' when a row is selected (Mac OS X) [CrazyAlchemist]
BUGFIX: Plug | StartStop Rules: Autostart Seed Count Only and Prefer Large Swarms removed First Priority [Gouss]




2004.12.18 | Azureus 2.2.0.2

FEATURE: Core | Manual peer upload blocking (when seeding) and kick-banning [Nolar]
FEATURE: Core | Control added to not cache small files (default no cache for < 1MB) [Parg]
FEATURE: Core | Ability to cancel torrent creation processes added [Parg, Gudy]
FEATURE: Core | Ability to cancel sharing process added [Parg]
FEATURE: Core | Ability to pass multiple torrents to Azureus.exe [Parg]
FEATURE: Core | Added configuration items for tracker processing limits [Parg]
FEATURE: Core | Option to open torrent for seeding in create-torrent Wizard [Parg,Gudy]
FEATURE: Core | Auto-rescan of shared resources + addition/deletion of shares accordingly [Parg]
FEATURE: Core | Persistence of download and tracker stats for shares [Parg]
FEATURE: Core | Advanced network settings: MTU, SO_RCVBUF, SO_SNDBUF, IPTOS [Nolar]
FEATURE: Core | Optimistic Connect: drop inactive connections in order to find better ones [Nolar]
FEATURE: Core | Added ability to apply updates and shutdown Azureus instead of restarting [Parg]
FEATURE: Core | Can now specify that password protected tracker web is only available via HTTPS, HTTP access -> access denied [Parg]
FEATURE: Core | Can now specify comment to be added to share torrents [Parg]
FEATURE: Core | resume data no longer saved to torrent files, stored in %user-dir%/active instead [Parg]
FEATURE: Core | Plugin support for installing and uninstaling plugins [Parg]
FEATURE: Core | Category support for shares [Parg]
FEATURE: Core | Apply updates and defer applicaton to later restart/close [Parg/Gudy]
FEATURE: UI   | Added 'share' support to console UI [Nolar]
FEATURE: UI   | Option to show confirmation dialog on torrent Removal [Nolar]
FEATURE: UI   | Added Seed2PeerRatio item to MyTorrents view [Nolar]
FEATURE: UI   | Added detailed connection State to peers view [Nolar]
FEATURE: UI   | Added Connected Time item to peers view [Nolar]
FEATURE: UI   | Option to add torrent downloads silently (without activating main Azureus window) [Nolar]
FEATURE: UI   | Added download speed limit column to MyTorrents [Parg]
FEATURE: UI   | Telnet UI added [Fatal]
FEATURE: UI   | Auto-open stats option added [Parg]
FEATURE: UI   | Plugin install/uninstall wizards [Gudy]
FEATURE: UI   | Double click on status bar progress area to give details of update/install/uninstall progress [Parg]
FEATURE: UI   | SWT/Console share support for setting category [Parg]
FEATURE: UI   | Pick out links (anything prefixed with "http") in torrent comments in general view [Parg]
FEATURE: Plug | Status mailer support for SMTP port, user + password [Parg]
FEATURE: Plug | Status mailer support for plain text notifications [Parg]

CHANGE: Core | Support azureus.install.path parameter, used by new linux launcher script [Nolar]
CHANGE: Core | Moved config items for tracker client overrides + UDP to tracker client config [Parg]
CHANGE: Core | Also do dynamic tracker re-announce interval overrides when seeding; uses peer count only [Nolar]
CHANGE: Core | NAT check url changed to aelitis server [Nolar]
CHANGE: Core | Reduce tracker re-announce frequency when incoming connections are accepted (unfirewalled) [Nolar]
CHANGE: Core | Remove old auto-migration code [Nolar]
CHANGE: Core | Update restart logic now preserves JVM max mem setting for Sun JVMs [Parg]
CHANGE: Core | Cleanup and optimize choke-unchoke logic [Nolar]
CHANGE: Core | Added an option to enable the prioritization of most completed Files, default is off [Gudy]
CHANGE: Core | Default http tracker to disabled [Parg]
CHANGE: UI   | Create torrent wizard now initially defaults torrent save path from "save to" default [Parg]
CHANGE: UI   | Obey "start stopped" config item for dropped torrents [Parg]
CHANGE: UI   | Torrents no longer need to be stopped before removal is allowed [Nolar]
CHANGE: UI   | Graphical view item refresh optimizations [Nolar]
CHANGE: UI   | Change context menu selection for queue/stop/force-start/recheck to be "at least one can be..." rather than "all can be..." [Parg]
CHANGE: UI   | More pre-defined speed ranges for queue slot limits [Parg]
CHANGE: UI   | Improve wording of "delete torrent?" prompt [Parg]
CHANGE: Plug | UPnP information messages now off by default [Parg]

BUGFIX: Core | Fix for kernel panics under MacOSX [ej32206, Nolar]
BUGFIX: Core | Handle passing of torrents to already running but not fully initialised process better [Parg]
BUGFIX: Core | Default save dir was defaulting to ON, changed to OFF [Parg]
BUGFIX: Core | Tidied up UPnP error handing if action missing [Parg]
BUGFIX: Core | Scrape mult-tracker torrents correctly when download not running [Parg]
BUGFIX: Core | Upload/download/share ratio frig for newly added seeds made consistent [Parg]
BUGFIX: Core | Fix for stalls from system clock being set backwards in time [Nolar]
BUGFIX: Core | Fixed up bad behaviour on out-of-disk-space falures [Parg]
BUGFIX: Core | Fixed torrents getting stuck in READY state [Parg]
BUGFIX: Core | Fix potential connection establishment backlog [Nolar]
BUGFIX: Core | Fix potential DOS by timing out stalled connections [Nolar]
BUGFIX: Core | Fix bug in re-announce interval override calculation when connection limit has been reached [Nolar]
BUGFIX: Core | Fix for hangs when scraping due to slow DNS resolves [Parg]
BUGFIX: Core | Fix for UPnP failing if trailing spaces in 'action name' [Parg]
BUGFIX: Core | Fixed bug in choke/unchoke logic when number of connected peers < max upload slots [Nolar]
BUGFIX: Core | Updater problems with non-ascii chars in user dir (again!) [Parg]
BUGFIX: Core | Created torrents had name.utf-8 tag in wrong place [Parg]
BUGFIX: Core | UDP scrape responses being handled incorrectly [Parg]
BUGFIX: Core | Fixed the "high priority" piece-picking for files [Gudy]
BUGFIX: UI   | Old language files in user dir causing !missing! item texts [Nolar]
BUGFIX: UI   | Fix for window state not being remembered between sessions [Nolar]
BUGFIX: UI   | Fix for messages window being closed while animated [Gudy]
BUGFIX: UI   | Fix for BUG 1059432 : Download bars spawning multiple times when set to auto open [Gudy]
BUGFIX: UI   | Fix for BUG 1061538 : /0 error if no pieces [Parg]
BUGFIX: UI   | Fix create-torrent wizard to remember paths properly [Parg]
BUGFIX: UI   | Fixed up opening of torrent files not ending in ".tor" or ".torrent" [Parg]
BUGFIX: UI   | Fix Health icons sometimes not refreshing [Nolar]
BUGFIX: UI   | Fix bug with Azureus crashing when quitting on OSX if the Stats view has been opened [Gudy]
BUGFIX: UI   | Fix the fuzzy Azureus icon bug under OSX [Gudy]
BUGFIX: UI   | IPFilter config view slow to display when thousands of ranges are set [Gudy]
BUGGIX: UI   | Fixed bug with sharing window re-animating even when opened [Gudy]
BUGFIX: UI   | Fixed bug 1081886 : stats graphics can now be 2000 pixels wide, instead of only 1600 before [Gudy]
BUGFIX: Plug | UPnP plugin support for multi-homed machines improved [Parg]




2004.10.31 | Azureus 2.2.0.0

FEATURE: Core | Disk cache [Parg]
FEATURE: Core | Ability to set IP type-of-service (TOS) field for outbound data [Nolar]
FEATURE: Core | Show current upload and download limits in status area [Parg]
FEATURE: Core | Locale selection - options to add in all defined encodings + show lax list [Parg]
FEATURE: Core | Change the incoming data port without restarting [Parg]
FEATURE: Core | Display "warning message" responses in announce replies [Parg]
FEATURE: Core | Added option for tracker to perform a connectability check to peers [Parg]
FEATURE: Core | Have message aggregation, for bandwidth savings/efficiency [Nolar] 
FEATURE: Core | Torrent HTTP urls now accepted as program command line parameter [Nolar]
FEATURE: Core | Option added to disable system tray [Parg]
FEATURE: Core | Concurrent hashing for >1 CPU [Parg]
FEATURE: Core | Added ability to not outward connect to a defined set of port numbers [Parg]
FEATURE: Core | SOCKS V4, V4a and V5 (no auth/user+password methods) support for outgoing data connections [Parg]
FEATURE: Core | Torrents created by Azureus now include .utf-8 fields [Parg]
FEATURE: Core | Dynamic piece request queue scaling [Gudy]
FEATURE: Core | Added torrent name to authentication dialog [Parg]
FEATURE: Core | Per-torrent upload speed limits [Nolar,Gudy]
FEATURE: Core | Ability to change the sound played on torrent completion added [Parg]
FEATURE: Core | Added session uptime to stats [Nolar]
FEATURE: UI   | 'Download' menu added with start/stop all + pause/resume options [Parg]
FEATURE: UI   | Table col sort order default option added, thanks to Charnobo! [Parg]
FEATURE: UI   | URL Downloader window now support to set-up referrer and saves last used referrers [Parg, Gudy]
FEATURE: UI   | New Statistic page about the disk cache (yeah more CPU consuming graphs) [Gudy]
FEATURE: UI   | Down/Up speed indicators in main view are now double-clickable to open the Stats View [Gudy]
FEATURE: UI   | Added Path and # Remaining Pieces to Files view, Tracker Name to MyTorrents view [Nolar]
FEATURE: Plug | webui support for torrent encoding choice [Parg]
FEATURE: Plug | Tracker torrent stats available via xml/http interface [Parg]

CHANGE: Core | Show time to re-announce/scrape in general view using hh::mm::ss [Parg]
CHANGE: Core | Timeout tracker server operations [Parg]
CHANGE: Core | Torrent opener will now report errors opening torrents better [Parg]
CHANGE: Core | Complete core networking/messaging rewrite [Nolar]
CHANGE: Core | Stop scrape on UDP V2 torrents when download running [Parg]
CHANGE: Core | Refactor of DiskManager [Parg]
CHANGE: Core | Protocol tweaking for significantly reduced discard rates [Nolar]
CHANGE: Core | Tracker now treats port value of 0 as 'explicitly firewalled' [Parg]
CHANGE: Core | Tracker client will revert to "initialised" state after explicit failure from tracker [Parg]
CHANGE: Core | Locale selection changed to show more possible encodings [Parg]
CHANGE: Core | XML stats - downloads ordered by downloading/index then seeding/index [Parg]
CHANGE: Core | Reworked connection establishment to conform to new WinXP SP2 limits [Nolar]
CHANGE: Core | When restarting torrents are checked in smallest->largest size [Parg]
CHANGE: Core | Reworked the piece picking so that slow peers don't "block" pieces to be completed [Gudy]
CHANGE: Core | JAR signing for webui (etc) now based on "tools.jar" from Sun JDK due to changes with their 1.5 JRE [Parg]
CHANGE: Core | "Pause" command now greyed out if there is nothing to pause [Parg]
CHANGE: Core | Create-torrent wizard now remembers comment data on back button + defaults for open/save dirs [Parg]
CHANGE: Core | Reduced memory used of ipfilter list to help support large list sizes [Parg]
CHANGE: Core | Added "*.*" to list of selectable file types in open-torrent dialogs [Parg]
CHANGE: UI   | Added a legend to the Pieces View [Gudy]
CHANGE: UI   | Pieces View now display if the blocks are in the cache or not [Gudy]
CHANGE: UI   | New Tools menu, Configuration --> Options, Plugins root menu, Language selection moved to config [Nolar,Gudy]
CHANGE: Plug | UPnP plugin now only uses plugin interfaces [Parg]
CHANGE: Plug | Differentiate UDP and TCP mappings in UPnP desc as some routers need this [Parg]
CHANGE: Plug | UpdateLanguagePlugin removed, as no longer maintained [Nolar]

BUGFIX: Core | Throw an error message if existing data file length is too large [Nolar]
BUGFIX: Core | Fix new bug with tracker announce every 10s when no peers were connected [Nolar]
BUGFIX: Core | Fix for renaming files across volumes [Parg]
BUGFIX: Core | Torrent auto-import now works with console UI [Nolar]
BUGFIX: Core | Bug when setting upload to unlimited (forced download to unlimited too) [Parg]
BUGFIX: Core | Set downloaded amount correctly when opening a torrent with existing download data [Parg]
BUGFIX: Core | Detect changed file sizes (smaller) when resuming torrents [Parg]
BUGFIX: Core | Random shuffling of multi-tracker torrent URLs fixed [Parg]
BUGFIX: Core | Fix occasional 60sec delay on initial tracker announce [Nolar]
BUGFIX: Core | Fix for reading piece data from a too-long file [Nolar/Parg]
BUGFIX: Core | Stop scraping all announce URLs in a torrent when removing torrent [Parg]
BUGFIX: Core | File handle closing [Parg/Nolar]
BUGFIX: UI   | Labels with '&' displaying incorrectly [Parg]
BUGFIX: UI   | Torrent Downloader Window : retry button now placed correctly [Gudy]
BUGFIX: UI   | Fix for clicking the plugins directory and open the folder from the Configuration>Plugins view [Gudy]
BUGFIX: UI   | Fix for animated message windows not being at the right place on dual monitors. [Gudy,Bluelive]
BUGFIX: Plug | Netgear WGT624 was crashing when processing UPnP requests [Parg]
BUGFIX: Plug | Webui 'view' mode wasn't working [Parg]
BUGFIX: Plug | Webui - excessively long status text messing up table [Parg]
BUGFIX: Plug | azplugins - web tracker pages wasn't picking up "show details" option [Parg]
BUGFIX: Plug | webui - fixed bug with re-ordering of columns [Parg]




2004.07.08 | Azureus 2.1.0.4

FEATURE: Core | Show built-in plugins in config view [Parg]
FEATURE: Core | Fallback encoding for torrents (a-zA-Z0-9 type encoding with hex chars for others) [Parg]
FEATURE: Core | Numbers now localized to selected language [TuxPaper]
FEATURE: Core | More "polite" hash checking...doesn't stress the cpu/system as much [Nolar]
FEATURE: Core | Tracker seed retention limit added to limit tracker memory on torrents with high seed counts [Parg]
FEATURE: Core | Show Bad ips/banned ips in ipfilter window + allow clear/reset [Parg]
FEATURE: Core | Option to start torrents in a stopped state [Parg]
FEATURE: Core | Torrent removal rules. Initially to handle unauthorised torrents + AZ update torrents [Parg]
FEATURE: Dev  | More features for torrent creation [Parg]
FEATURE: UI   | New peer columns to help track leechers [TuxPaper]
FEATURE: Plug | Experimental data upload facility for tracker web pages [Parg]
FEATURE: Plug | WebUI support for "host" operation [Parg]
FEATURE: Plug | Run the web interface standalone (outside of a browser) [Parg]
FEATURE: Plug | Option to keep hold of UPnP port mappings when closing Azureus [Parg]

CHANGE: Core | More sensible merging of plugin.properties on plugin update [Parg]
CHANGE: Core | Retuned tracker connect failure retry interval [Nolar]
CHANGE: Core | Torrents downloaded by URL now named after torrent if not already .torrent [Parg]
CHANGE: Core | Performance of ipfilter checking improved [Parg]
CHANGE: Plug | Green colour used on tracker web pages now more legible [Nolar]

BUGFIX: Core | 99.X% / continuous hash fails fix [Parg]
BUGFIX: Core | Basic plugin config model parameters not working in non-swt (e.g. console) mode [Parg]
BUGFIX: Core | Fix for 'completed' announce event not being sent on occasion [Nolar]
BUGFIX: Core | Fix for occassional missing of resume data write -> recheck on start up [Parg]
BUGFIX: Core | Bad peers not being detected on hashfail if they contributed all blocks [Parg]
BUGFIX: Core | Better handling of "auto import" + default torrent save dir being the same [Parg]
BUGFIX: Core | Strip resume data on open of new torrent [Parg]
BUGFIX: UI   | Fix bug where failed-hashcheck pieces never reappeared in Pieces view [Nolar]
BUGFIX: Plug | Web UI authentication for torrent download not working with default port URLs [Parg]



2004.06.21 | Azureus 2.1.0.2

FEATURE: Core | Health items now show if a torrent is being shared/published [Parg]
FEATURE: Core | Creation of self-signed certificates for SSL (etc) via UI [Parg]
FEATURE: Core | Set download speed per torrent [Parg]
FEATURE: Core | Universal Plugin and Play (UPnP) support [Parg]
FEATURE: Dev  | ToolTip access functions for table cells [TuxPaper]
FEATURE: Plug | Tracker plugin supports simple category view [Parg]
FEATURE: Plug | Webui support for password protected trackers [Parg]
FEATURE: Plug | Webui attempts to get access to system clipboard to fix copy/paste issues [Parg]
FEATURE: Plug | Plugin interface extensions for basic plugin config [Parg]
FEATURE: Plug | External authorisation framework [Parg]
FEATURE: Plug | WebUI + XML/HTTP i/f now have separately configurable username/password via Plugin config (*not* plugin.properties) [Parg]
FEATURE: Plug | WebUI can now use signed jars, if configured, so that clipboard access doesn't require local config [Parg]
FEATURE: UI   | Better scrape result reporting, including new "Next Tracker Access" column [TuxPaper]
FEATURE: UI   | Tooltip for Health Icon [TuxPaper]
FEATURE: UI   | New language: Japanese [Gouss]

CHANGE: Core | Core update checker now uses aelitis.com server to grab latest version instead of SF's one [Gudy]
CHANGE: Core | Default socket write buffer now a more conservative 1460 bytes for smoother uploading [Nolar]
CHANGE: Core | Central control of global outgoing peer connection rates...i.e. a better SlowConnect [Nolar]
CHANGE: Core | Unused potential peer connections are cached for later use [Nolar]
CHANGE: Core | Tracker now doesn't return peer list on "stopped" event [Parg]
CHANGE: Plug | Tracker web plugin configuration moved to plugin config from core config  [Parg]
CHANGE: Plug | Tracker web contexts now have the option to not apply IP Filters - this affects the web plugin and xml/http interface [Parg]
CHANGE: UI   | About Window is closeable by hitting the 'ESC' key [Gudy]

BUGFIX: Core | Fix for Library Paths using single quotes [Parg]
BUGFIX: Core | Fixed shared plugin dir location on OSX [Parg]
BUGFIX: Core | File Open dialogs now correctly remember their last path [Nolar]
BUGFIX: Core | Plugin loader picking up .zip files instead of corresponding .jar files [Parg]
BUGFIX: Core | Don't delete the imported .torrent file if the import dir happens to also be the Save torrent dir [Nolar]
BUGFIX: Core | Torrents leave READY state quicker after other torrents are re-queued [TuxPaper]
BUGFIX: Core | Fix for Fast Resume not working when a 0-byte file exists in the torrent [Nolar]
BUGIFX: Core | Fix for Fast Resume not working when Incremental File Creation is enabled [Nolar]
BUGFIX: Core | Show error message if previously-allocated data cannot be found, instead of re-creating it [Nolar]
BUGFIX: Core | Force a file handle recycle every 50M read so the OS cache clears (Win2k, possibly other OSes) [TuxPaper]
BUGFIX: Core | Tracker stats wrong [Parg]
BUGFIX: Core | Not deleting backup torrents (.bak) when MyTorrent->remove + delete [Parg]
BUGFIX: UI   | # Column now on by default again [TuxPaper]
BUGFIX: UI   | Fix for Bug #966867: Context Menu not appearing after setting up columns on Linux [TuxPaper]
BUGFIX: UI   | IP column now sorts by hex groups [TuxPaper]
BUGFIX: UI   | Fix for .torrent icons with new Azureus.exe [Parg]
BUGFIX: UI   | Fix for text color on some Table cells not moving when row moved [TuxPaper]
BUGFIX: UI   | Moving torrent from Uncategorized category to new category now removes the row from the display [TuxPaper]
BUGFIX: UI   | Fix for empty table rows appearing in Peers Details tab and Pieces tab [TuxPaper]
BUGFIX: UI   | Windows : Tray Icon should come back after explorer crash (needs latest SWT build) [SWT team, Gudy]
BUGFIX: UI   | 192 bytes memory leak fixed on OSX [SWT Team, Gudy]



30.05.04 | Azureus 2.1.0.0

FEATURE: Core | Ability to limit global download speed [Parg]
FEATURE: Core | Added ability to automatically exclude files when making torrents (e.g. .DS_Store & Thumbs.db) [Parg]
FEATURE: Core | Caching of peer info to disk for quick restarts if tracker is unavailable [Parg]
FEATURE: Core | Detection of plugin updates [Parg]
FEATURE: Core | HTTP scrapes to same tracker combined into one request if tracker supports it [TuxPaper]
FEATURE: Core | Support for scraping trackers like http://tracker.boxtorrents.com:6969/ that scrape with /scrape but don't have "announce" in announce URL [Parg]
FEATURE: Core | Tracker connections proxy support (peer connections not supported yet) [Nolar]
FEATURE: Core | UDP authentication protocol added [Parg]
FEATURE: Core | UDP tracker version 2 support added [Parg]
FEATURE: Core | Generic update mechanisms for core, updater and swt [Parg/Gudy]
FEATURE: Core | Support for loading user-specific plugins from user dir and shared ones from app dir [Parg]
FEATURE: Dev  | Column management for any of Azureus' table views. [TuxPaper]
FEATURE: Dev  | Easy to use "basic plugin view": see PluginInterface::getUIManager::getBasicPluginViewModel [Parg, Gudy]
FEATURE: UI   | Ability to upload torrents with xml/http interface [Parg]
FEATURE: UI   | All columns sortable and configurable [TuxPaper]
FEATURE: UI   | Added "Remaining", "DLing For" (time) and "Seeding For" (time) columns to "My Torrents" [TuxPaper]
FEATURE: UI   | Added option to auto-update language file from web (Config -> Interface -> Language) [TuxPaper]
FEATURE: UI   | Added option to show transfer rates in bits/sec [Parg]
FEATURE: UI   | In the Details view, the peer's pieces that we already have are shown in a faded color [TuxPaper]
FEATURE: UI   | Linux system tray support [Gudy]
FEATURE: UI   | MyTracker row right-click support for copying torrent URL to clipboard [Parg]
FEATURE: UI   | Right-click menu sorting of columns (Sorting for OSX) [TuxPaper]
FEATURE: UI   | Send text in My Torrents to clipboard [TuxPaper]
FEATURE: UI   | When torrent data is missing, you can change directory via the context menu [TuxPaper]
FEATURE: UI   | OSX : About and Preferences items are listed under 'Azureus' menu [Gudy]
FEATURE: UI   | Added an option not to use units bigger than MB [Gudy]
FEATURE: UI   | Option to show peer host names instead of IP address [Parg]
FEATURE: UI   | Embedded tracker IP blocks shown in Blocked IPs List [Parg]
FEATURE: WebUI| Web Plugin now can set upload rate [Parg]
FEATURE: WebUI| Web Plugin support for uploading torrents [Parg]
FEATURE: WebUI| Webui + xml/http "access" property support for IP range [Parg]
FEATURE: WebUI| Webui + xml/http plugins have had basic plugin view added [Parg]

CHANGE:      | IRC and Tracker Web Pages moved to separate plugin [Parg]
CHANGE: Core | Auto-imported .torrent files are moved (not copied) to default .torrent save dir if enabled [Nolar]
CHANGE: Core | Auto-imported .torrent files are renamed *.imported if default .torrent save dir is not enabled [Nolar]
CHANGE: Core | Can set per-torrent and global peer connection limits [Nolar]
CHANGE: Core | Config/pref/torrent file saving uses intermediate .saving file for more reliability [Nolar]
CHANGE: Core | Currently-connected peer connections are dropped when IPFilter is enabled [Nolar]
CHANGE: Core | File descriptor handles increased from default of 256 to 8192 under OSX [Nolar]
CHANGE: Core | Ignore Share Ratio can now be non-integer [TuxPaper]
CHANGE: Core | New SHA-1 hasher: up to 25% faster [Gudy / Nolar]
CHANGE: Core | Scrape interval now based on # of seeds (15min minimum) [TuxPaper]
CHANGE: Core | Socket writes now done in full MSS-sized chunks [Nolar]
CHANGE: Core | Upload limit can now be set less than 5KB/sec. However, doing so limits download speed too [Parg]
CHANGE: Core | User config/pref/plugins dir culled from Windows' Registry (needs aereg.dll) [Parg]
CHANGE: Core | OSX user- pref/plugin dir moved from ~/Library/Azureus/ to ~/Library/Application Support/Azureus/ to meet osx standards [Nolar]
CHANGE: Core | Unix user- pref/plugin dir moved from ~/Azureus/ to ~/.Azureus/ to meet unix standards [Nolar]
CHANGE: UI   | All progress/piece bars re-done (again) [TuxPaper]
CHANGE: UI   | Azureus should work with SWT 2.12 until we break backwards compat. again [TuxPaper]
CHANGE: UI   | Shrink "My Torrents" Context menu [TuxPaper]
CHANGE: UI   | Systray4j removed: system tray support now from SWT built-in code (Requires SWT-M8+) [Gudy]
CHANGE: UI   | Torrent name shown with IPs in the blocked-IPFilter list [Nolar]
CHANGE: UI   | The Donation Window is now Closeable using the 'Esc' Key [Gudy]
CHANGE: UI   | In the Donation Window the OK button should be on top of other Controls [Gudy]
CHANGE: UI   | Added a "what's new" item in help menu, pointing to changelog for current version [Gudy / Gouss]

BUGFIX: Core | Files incorrectly shared if contents not a torrent when opening [Parg]
BUGFIX: Core | First Priority rules based on time now work across sessions [TuxPaper]
BUGFIX: Core | Fix for saving of .torrent file in wrong dir: Bug #916137 [Nolar]
BUGFIX: Core | Fix for some discarded data due to occasional duplicate request [Nolar]
BUGFIX: Core | Fix for system clock changes stalling downloads: Bug #918193 [Nolar]
BUGFIX: Core | Fix for system clock running faster when using Azureus [Nolar]
BUGFIX: Core | Fix for underlying socket handles not closing under linux ("Too many open files") [Nolar]
BUGFIX: Core | Individual file priorities remembered after Stop-Start [Nolar]
BUGFIX: Core | Multiple shares of same resources causing problems (e.g. share contents+share contents recursive of same dir) [Parg]
BUGFIX: Core | Simpler and more reliable file allocation...won't b0rk existing data [Nolar]
BUGFIX: Core | Re-check on completion no longer sends Have messages [Nolar]
BUGFIX: UI   | Fix for the General View in a torrent details, not being layout correctly [Gudy]
BUGFIX: UI   | Fix for the toolbar on linux / OS X [Gudy]
BUGFIX: UI   | Fix for the Torrent Maker not getting the correct Tracker when choosing from the Combo on OS X [Gudy]
BUGFIX: UI   | Fix for the Freeze on exit under OSX [Gudy]





16.03.04 | Azureus 2.0.8.4

CHANGE: WebUI plugin included in mainline (see http://azureus.sf.net/CVS/web.interface.howto.htm) [Parg]
CHANGE: Much more reliable SF mirror auto-update handling [Nolar]

BUGFIX: Fix for loading .torrent files via web-browser/shell/doubleclick/etc [Nolar]



15.03.04 | Azureus 2.0.8.2

FEATURE: Show last time IPFilter list was updated in status area [Parg]
FEATURE: Support for "compact" tracker announce protocol [Parg]
FEATURE: Support for "key" tracker announce protocol [Parg]
FEATURE: Download Speed column in "My Torrents" turns red if below speed set in Queue config. [TuxPaper]
FEATURE: Webplugin swing ui has status area with total ul/dl [Parg]
FEATURE: XML over HTTP remote plugin interface (initially to support GTS) - mail parg at users.sf.net for details [Parg]

CHANGE: All config/pref files utilize .bak backup files [Parg]
CHANGE: Option to limit outstanding disk writes and piece hash checks [Parg]
CHANGE: Can delete shares in QUEUED state [Parg]

BUGFIX: Fix of startup issues under Win95/98/Me [TuxPaper]
BUGFIX: Locale-specific dir creation [Parg]
BUGFIX: Hebrew language works now [TuxPaper]
BUGFIX: Fixed long load times under Linux of Configuration view and General tab [TuxPaper]
BUGFIX: Popup windows now center in main monitor on multi-monitor setups [TuxPaper]
BUGFIX: Fix for Pieces and Files views off-by-one row drawing glitch under linux [TuxPaper]
BUGFIX: Sort on Health and Availability now enabled [TuxPaper]
BUGFIX: Various memory leaks (DiskManager instances not being freed) [Parg]



08.03.04 | Azureus 2.0.8.0

FEATURE: QUEUED status. Torrents that are queued are stopped, but available for automatic starting [TuxPaper]
FEATURE: Partial support for Read-Only data (for seeding) [TuxPaper]
FEATURE: Added "Forced-Start" to force a torrent to start, ignoring download limits or seeding rules [TuxPaper]
FEATURE: Auto-positioning of finished torrent based on how badly the torrent needs seeding [TuxPaper]
FEATURE: Added Availability, Seeding Rank, SavePath, Max # Uploads, and Total Speed columns to My Torrents view [TuxPaper]
FEATURE: Categories to group your torrents in (right click on My Torrents and select Set Category to get started) [TuxPaper]
FEATURE: More auto-seeding options [TuxPaper]
FEATURE: Ability to limit maximum number of file handles open/in-use at any given time [Parg]
FEATURE: Tracker - various performance enhancements such as announce/scrape caching. Tested to 500,000 peers on single torrent [Parg]
FEATURE: Tracker activity logging to %azhome%/tracker.log [Parg]
FEATURE: Tracker bytes in/out + scrapes recorded [Parg]
FEATURE: Tracker - ability to limit number of peers returned [Parg]
FEATURE: Share ratio now shown on tracker web pages [Parg]
FEATURE: Tracker/client support for "no_peer_id" spec for bandwidth savings [Parg/Nolar]
FEATURE: More plugin stuff - alert raising, ipfilter reloading, various other stuff [Parg]
FEATURE: Applet UI enhanced into usable state (start/stop/add/remove downloads) + auto refresh [Parg]
FEATURE: Added torrent hashes for G2 + ED2K (ala http://www.torrentaid.com/) [ Parg]
FEATURE: Added colours to file view to show: grey -> requested; red -> data recently written [Parg]

CHANGE: Split torrents in My Torrents view into 2 lists: Downloading and Seeding (Completed) [TuxPaper]
CHANGE: STOPPED status now means the torrent never auto-starts [TuxPaper]
CHANGE: Moved icon from Rank column to Name column [TuxPaper]
CHANGE: Removed Lock Priority.  No longer an issue since priority only gets autochanged once [TuxPaper]
CHANGE: Remove "Lock Start/Stop" menu option.  Stop now means no auto-starting/stopping [TuxPaper]
CHANGE: Re-design of Configuration view [TuxPaper]
CHANGE: Language files (MessagesBundle_xx_XX.properties) are read in the following order: Azureus user directory, Azureus application directory, JAR file [TuxPaper]
CHANGE: Remember sorted column and order for all views [TuxPaper]
CHANGE: Core performance optimizations and major cpu usage reductions [Nolar]
CHANGE: User prompt when (1) tracker listens fails (2) incoming server port bind fails [Parg]
CHANGE: Config files/dirs and plugins now stored in OS user dir (Win: C:\Documents and Settings\username\Application Data\Azureus\, OSX: /Users/username/Library/Azureus/, Linux: /home/username/Azureus/) [Nolar]
CHANGE: Tracker log now includes date as well as time [Parg]

BUGFIX: Once a torrent is complete, and you remove the data, it wil no longer start downloading again when seeding rules are on [TuxPaper]
BUGFIX: 1st column of MyTorrents no longer has a gap if there's no icon. (Windows Only Bug) [TuxPaper]
BUGFIX: Fix for download stalls at 99% / 100% cpu usage bug introduced in 2070 [Parg/Gudy] 
BUGFIX: Fix for minimize/close causing the program to disappear from view under OSX [Nolar]
BUGFIX: Fix for icon bar buttons not being flat (Bug #890166) [Gudy]
BUGFIX: More reliable .config and .torrent file save/load management [Nolar]
BUGFIX: Better handling of failures when performing "move on complete" [Parg]
BUGFIX: Handle torrent file names with trailing spaces and CR/NL (from Mac) [Parg]


02.02.04 | Azureus 2.0.7.0

FEATURE: Under Linux + GTK, added an option to setup a vertical offset to re-align graphics [Gudy]
FEATURE: SSL tracker client now gives option to import certificate rather than manually doing so via "keytool" [Parg]
FEATURE: Start All Downloads option on tray icon [Nolar]
FEATURE: Support for trackers that do not return peerIDs on announce [Parg]
FEATURE: Sharing - allows files/dirs/dir contents (recursive) to automatically have torrents created for them and torrents hosted
		 The shared resources will automatically have their torrents recalculated if they change (over Azureus restart) [Parg]
FEATURE: Tracker allows number of peers returned to be limited [Parg]
FEATURE: Experimental UDP tracker protocol (see Config->Tracker->Extensions). Azureus client/tracker supports this, as does the XBT tracker (http://sourceforge.net/projects/xbtt/) [Parg]
FEATURE: Tracker support for GZIP encoding [Parg]
FEATURE: Tracker support for multiple pages [IAmChrist]
FEATURE: Tracker pages skinable by placing pages in %azhome%/web [Parg]
FEATURE: Major extensions to plugin interfaces [Parg]
FEATURE: Simple Swing based remote admin interface (over SSL+password auth) - email parg at users.sourceforge.net for details [Parg]
FEATURE: Click on hash in general view to copy hash to clipboard [Parg]

CHANGE: Azureus now identifies itself via User-Agent in tracker http communications [Nolar]
CHANGE: Less flickering, on all platforms (tested on both windows and linux+GTK) [Gudy]
CHANGE: Azureus now responds as Server: Azureus <version> in tracker http comms [Parg]
CHANGE: Unwritten blocks in Pieces view shown in red [Gijs Overvliet]
CHANGE: Prioritizing first piece of file(s) now optional in config [Nolar]
CHANGE: Confirmation on data deletion now optional in config [Nolar]
CHANGE: More intelligent announce url '&numwant=' handling [Nolar]
CHANGE: On tracker announce errors, retry interval now uses exponential backoff [Nolar]
CHANGE: Removed multi-port listening, as shared single port is far superior [Nolar]
CHANGE: More reliable .config and .torrent file writing [Nolar]
CHANGE: Tracker scraper now honors a 'flags: min_request_interval' response [TuxPaper]
CHANGE: Plugins can be initialised from plugin.properties freestanding (not just in .jar file) [Parg]

BUGFIX: Problem with tracker not responding with "Connection: close" causing SSL session maintainance with HttpsURLConnection to stuff up and fail clients with "recv fail" [Parg]
BUGFIX: Fast resuming with Chinese directories: Bug #869749 [Parg]
BUGFIX: System tray icon re-shown after explorer.exe crash (again) [Rele]
BUGFIX: Fix for potential memory leaks [Nolar]
BUGFIX: Fix for stalled piece writing [Gijs Overvliet]
BUGFIX: Fix for .torrent file data not being fully written on shutdown [Parg]
BUGFIX: Fix for OutOfMemoryError in DiskManager: Bug #865553 [TuxPaper]
BUGFIX: Fix for 'Open a URL' downloading of .torrent file which contains white spaces: Bug #878990 [Parg]
BUGFIX: Fix for Fast Resume with Chinese torrents: Bug #878015 [Parg]
BUGFIX: Fix for excess thread creation when tracker does not support single-infohash scrapes [Nolar]
BUGFIX: Fix for hash checking 0-byte files: Bug #853126 [Nolar]
BUGFIX: Fix for opening files via Files tab when using MoveOnComplete: Bugs #860822, #878795 [Nolar] 
BUGFIX: Fix for 100% cpu usage after network disconnect/reconnect: Bugs #873957, #879498 [Nolar]
BUGFIX: Fix for downloaded blocks not being written to disk, due to write-thread stall under high load [Nolar]
BUGFIX: Fix for various non-unicode torrent encoding issues regarding resume data [Parg]



19.12.03 | Azureus 2.0.6.0

FEATURE: Intelligent Tracker Checking: optimizes tracker re-ask interval for quicker download speed ramp up [Nolar]
FEATURE: Azureus can now run all downloads off one shared incoming port: only need to open/forward one port in your firewall/NAT [Parg]
FEATURE: Drag-n-Drop moving of downloads in MyTorrents; moving of downloads in MyTorrents with Ctrl + Arrow-Up/Down [Rele]
FEATURE: Password protected access to tracker web and torrents [Parg]
FEATURE: GUI Update interval is configurable [Gudy]
FEATURE: Images update interval is configurable [Gudy]
FEATURE: Auto sort on tables possible, interval configurable [Gudy]
FEATURE: MyTorrents view can now be customized (choice of columns and order) [Gudy]
FEATURE: Added new columns to MyTorrents : 'Share Ratio', 'Downloaded', 'Uploaded', 'Health' [Gudy]
FEATURE: Details view can now be customized (choice of columns and order) [Gudy]
FEATURE: SSL now supported for tracker web and tracker updates [Parg]
FEATURE: Added Drag and Drop of URLs [Rele]
FEATURE: Multi-Trackers torrents can now be created/edited [Gudy]
FEATURE: Menu option to force a re-check of downloaded data [Nolar]
FEATURE: End-Game Mode: Completes the last few pieces of a download faster [Gudy]
FEATURE: Attempts to download the very beginning of a file first - to support previewing [Nolar]
FEATURE: IPFiltering stats shown in status bar [Gudy]
FEATURE: Toolbar! [Gudy]
FEATURE: Logging of console output to disk [Parg]
FEATURE: Option to confirm on exit [Rele]
FEATURE: Bad Peer Detection [Gudy]
FEATURE: Inclusion of XSL stylesheed tag in stats XML file [Parg]
FEATURE: Editing and selection of tracker announce URLs from general view [Gudy]
FEATURE: Plugin interface for tracker web serving [Parg]
FEATURE: HTML template (http://html-tmpl-java.sourceforge.net/) support for tracker web serving from %az_home%/web folder [Parg]
FEATURE: Opening a second torrent with same hash as existing download causes second torrent's announce urls to be merged into the first [Parg]
FEATURE: Option to not accept multiple connections from the same IP [Gudy]
FEATURE: Option to use the IP Filter list as an 'ALLOW' list [Gudy]
FEATURE: Super-Seed Mode [Gudy]
FEATURE: Pressing a character selects the next download with a name beginning with this character in MyTorrents view [Rele]
FEATURE: Option to move-on-complete only when data is inside the default save dir [Nolar]
FEATURE: Auto-import new .torrents from a chosen folder regularly [Rele]
FEATURE: Create torrent allows manual piece size selection [Parg]
FEATURE: New 'Activity' view (download and upload speed graphics) [Gudy]
FEATURE: Gzip encoding support for tracker announces [Parg]
FEATURE: Tray icon: added Stop All Torrents [Rele]
FEATURE: If .torrents are dropped in COPY state (with modifier key Ctrl under Windows), they will begin in STOPPED state [Rele]
FEATURE: Ctrl + [Home/End/CursorUp/CursorDown] moves selected torrents to top/end/up/down, "Del" removes selected torrents [Rele]
FEATURE: Ctrl + [S/R] stops/resumes(starts) selected torrents, Ctrl+Shift+S stops all torrents, Ctrl+A selects all torrents [Rele]
FEATURE: Option to backup .torrent files [Rele]
FEATURE: Option to play a sound on download finish [Rele]
FEATURE: Download Basket: TrayWindow always visible for Drag-n-Drop of .torrents [Rele]
FEATURE: Clickable Tracker URL in Details/General copies the announce URL into clipboard [Rele]
FEATURE: Tab hot keys: F6 selects next Tab, Shift+F6 selects previous Tab, ESC or CTRL+F4 closes current Tab [Rele]
FEATURE: Extended Plugin interface [Parg,Gudy]

CHANGE: 'Bind to local IP address' now binds outbound sockets as well [Nolar]
CHANGE: Status now shows when it is re-checking pieces on download completion [Nolar]
CHANGE: URL dialogs are initialized with the first valid link beginning with http:// from clipboard [Rele]
CHANGE: Under linux, only use ~/.azureus dir if it already exists, otherwise use normal program dir for files [Nolar] 
CHANGE: Auto-update: now writes a log to an 'update.log' file [Nolar]
CHANGE: Option to disconnect seeds when seeding is now checked by default [Gudy]
CHANGE: FilesView now shows files even in other states than Downloading (configurable) [Rele]
CHANGE: Updated/additional menu buttons [Gudy]
CHANGE: Some speed optimizations with piece-picking [Nolar]
CHANGE: Generated PeerID only uses chars that don't need to be escaped, saving bandwidth for tracker communications [Nolar]
CHANGE: Can now identify BitComet, TurboBT, LibTorrent clients [Nolar]
CHANGE: Support for both SI byte units (KiB,MiB,GiB) and more well known, but incorrect KB/MB/GB units via config Interface param [Parg]
CHANGE: locale choice can force prompt via new config param on "File" tab [Parg]

BUGFIX: 'Re-check pieces when done' now always ignores fast-resume data: Bug #825881 [Nolar]
BUGFIX: Fix some decoding bugs in Chinese torrent files due to missing locale encodings in dialog box [Akilgard]
BUGFIX: System tray icon re-shown after explorer.exe crash [Rele]
BUGFIX: Completed downloads shown in different color when Stopped [Nolar]
BUGFIX: Fix possible data loss when moving complete files if not enough free space avail: Bug #855284 [Nolar]
BUGFIX: Fix for the incremental vs allocate choice in Config [Gudy]
BUGFIX: DNS lookups are no longer cached for ever [Parg]
BUGFIX: OSX: Hang when closing: Bug #824459 [Nhilep]


20.11.03 | Azureus 2.0.4.2

FEATURE: Added tooltip general support [Gudy]
FEATURE: Default torrent encoding selection added to Config->File [Parg]
FEATURE: Public tracker support - config item allows external use of tracker [Parg]

CHANGE: Full scrape of embedded tracker now supported as SN requires this for hosting [Parg]
CHANGE: Better peer client identification [Nolar]
CHANGE: Added AZ version + torrent size to stats [Parg]
CHANGE: Added 'comment' field to torrent create [Parg]
CHANGE: Moving of .torrent to completed dir now optional [Nolar]
CHANGE: Additional upload speed options [Nolar]
CHANGE: Cleanup of Configuration tabs [Nolar]
CHANGE: Rewrite of locale selection code for torrents. Only one encoding allowed per torrent [Parg]
CHANGE: File->Open... now opens to the default download/torrent dirs set in config [Parg]
CHANGE: ETA/TimeRemaining now uses just two significant measures, and "kB" changed to "KB"  [Nolar] 

BUGFIX: Torrent hosting - resetting of tracker url to original after hosting cancelled [Parg]
BUGFIX: Allow for torrent files with '.tor' extention [Nolar]
BUGFIX: Renamed file not reused after torrent Stop-Start: Bug #842750 [Nolar]
BUGFIX: No longer deletes files if the 'completed' dir points to the download dir: Bug #842896 [Nolar]
BUGFIX: Fast resume data no longer duplicated [Nolar]
BUGFIX: File 'downloads.config' kept better up-to-date [Nolar]
BUGFIX: % Completed is now correct again in MyTorrents view on stopped downloads [Gudy]
BUGFIX: Non-UTF8 encoded 'comment' fields in torrents not showing properly [Parg]
BUGFIX: Some dead-lock issues (especially on startup) [Gudy]
BUGFIX: Better recovery on connection closing [Nolar]
BUGFIX: Uncleaned buffers in peer handling code [Nolar]
BUGFIX: Outgoing message correctness verification [Nolar]
BUGFIX: Text scroll is now ok in irc view [Gudy]
BUGFIX: Size is now displayed even when the torrent is stopped [Gudy]
BUGFIX: Sorting by 'Discarded', 'Overall Down Speed', 'Stat Up' in Details view [Nolar]
BUGFIX: Torrent 'discarded' and 'hash fails' now remembered between sessions [Nolar]
BUGFIX: Corrected sorting by DownSpeed, UpSpeed, ETA in MyTorrents view [Nolar]
BUXFIX: Irc input text area gets focus correctly now [Gudy]
BUXFIX: On Windows bundle, systray4.dll as been updated to support chinese characters [evilcai]



13.11.03 | Azureus 2.0.4.0

FEATURE: Disable (per torrent) the auto priority setting when seeding [Gudy]
FEATURE: Disable (per torrent) the rules to start / stop a seeding torrent [Gudy]
FEATURE: Move files to a directory upon completion [Nolar]
FEATURE: Slowly establish new connections to peers (for those with internet disconnection issues) [Nolar]
FEATURE: Bind to local IP address [Nolar]
FEATURE: Export/import torrent file to/from XML file [Parg]
FEATURE: Export of runtime statistics to XML file [Parg]
FEATURE: Hosting of torrents using built-in tracker [Parg]
FEATURE: Trackers used in the 'make torrent' wizard are now remembered.
FEATURE: Embedded tracker [Parg]
FEATURE: Enhanced peer client identification [Nolar]
FEATURE: Publishing of torrents to tracker (as opposed to hosting them) [Parg]
FEATURE: Choosable color for the progress bars [Gudy]
FEATURE: Plugin support [Gudy]
FEATURE: Open a torrent file without using the default save location [Gudy]
FEATURE: Added a FAQ and a Donate link in Help menu [Gudy]
FEATURE: New languages : Brazilian-Portuguese, Czech, Lithuanian [Gouss - Translators]

CHANGE: Some GUI Changes, so that SWT WinXP theme is better supported [Gudy]
CHANGE: Saving of torrent files to central dir now optional [Nolar]
CHANGE: Checking after crash now remembers Fast Resume data [Nolar]
CHANGE: Internal refactorization of core classes [Parg]
CHANGE: More logging of reasons for connection closed [Gudy]

BUGFIX: Fixed snub/unsnub multiple peers on the peers list [Gudy]
BUGFIX: Save file dialog now opens as a 'save' dialog, and not 'open' (for OSX) [Gudy]
BUGFIX: DNS name resolution caching no longer infinite [Nolar]
BUGFIX: Better recovery checking of partially-allocated files [Nolar]
BUGFIX: Re-check file(s) integrity after completion [Nolar]
BUGFIX: Max torrent file size was limited to 1MB - limit removed [Parg]
BUGFIX: Fix for several exceptions thrown during socket reads/writes [Nolar]
BUGFIX: Fix for exception thrown when peer sends an invalid bitfield [Nolar]
BUGFIX: AZ was reporting cumulative upload/download stats to tracker - should be per session [Parg]
BUGFIX: Fix for handling single data files larger than 2GB [Nolar]
BUGFIX: Corrected socket writing [Gudy]
BUGFIX: Weren't sending "complete" event to tracker on download->seeding transition [Parg]
azureus-ConfigurationManager-improvement.patch:

--- NEW FILE azureus-ConfigurationManager-improvement.patch ---
--- org/gudy/azureus2/core3/config/impl/ConfigurationManager.java~	2005-10-03 09:36:58.000000000 -0700
+++ org/gudy/azureus2/core3/config/impl/ConfigurationManager.java	2005-12-18 07:30:07.000000000 -0800
@@ -201,14 +201,14 @@
   }
   
   private String getStringParameter(String parameter, byte[] defaultValue) {
-    try {
-      return new String(getByteParameter(parameter, defaultValue));
-    } catch (Exception e) {
-      byte[] bytesReturn = getByteParameter(parameter, null);
-      if (bytesReturn == null)
-        return null;
-      return new String(bytesReturn);
-    }
+    byte[] bp = getByteParameter(parameter, defaultValue);
+    if (bp == null)
+      {
+	bp = getByteParameter(parameter, null);
+	if (bp == null)
+	  return null;
+      }
+    return new String(bp);
   }
   
   public String getStringParameter(String parameter, String defaultValue) {

azureus-GKR.patch:

--- NEW FILE azureus-GKR.patch ---
--- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~	2005-12-19 07:55:50.000000000 -0800
+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java	2006-01-14 16:52:09.000000000 -0800
@@ -336,7 +336,7 @@
 		try{
 			this_mon.enter();
 		
-			KeyStore keystore = KeyStore.getInstance("JKS");
+			KeyStore keystore = KeyStore.getInstance("GKR");
 			
 			if ( !new File(name).exists()){
 		
@@ -391,7 +391,7 @@
 		
 		throws Exception
 	{
-		KeyStore key_store = KeyStore.getInstance("JKS");
+		KeyStore key_store = KeyStore.getInstance("GKR");
 		
 		if ( !new File(keystore_name).exists()){
 			
@@ -676,7 +676,7 @@
 		try{
 			this_mon.enter();
 		
-			KeyStore keystore = KeyStore.getInstance("JKS");
+			KeyStore keystore = KeyStore.getInstance("GKR");
 			
 			if ( !new File(truststore_name).exists()){
 		


--- NEW FILE azureus-License.txt ---
The GNU General Public License (GPL)
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.

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) 

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.

azureus-base64.patch:

--- NEW FILE azureus-base64.patch ---
--- com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java~	2005-11-22 12:07:30.000000000 -0800
+++ com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java	2006-01-17 21:56:00.000000000 -0800
@@ -43,7 +43,7 @@
 import com.aelitis.net.udp.PRUDPPacketRequest;
 import com.aelitis.net.udp.PRUDPRequestHandler;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 public class 
 PRUDPPacketHandlerImpl
--- org/gudy/azureus2/ui/console/util/StringEncrypter.java~	2005-10-14 04:43:14.000000000 -0700
+++ org/gudy/azureus2/ui/console/util/StringEncrypter.java	2006-01-17 21:56:24.000000000 -0800
@@ -12,7 +12,7 @@
 import javax.crypto.spec.DESKeySpec;
 import javax.crypto.spec.DESedeKeySpec;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 /**
  * utility class to encrypt strings. this class was taken from the examples at:
--- org/gudy/azureus2/ui/swt/auth/AuthenticatorWindow.java~	2005-10-14 00:17:38.000000000 -0700
+++ org/gudy/azureus2/ui/swt/auth/AuthenticatorWindow.java	2006-01-17 21:56:47.000000000 -0800
@@ -42,7 +42,7 @@
 import org.gudy.azureus2.core3.config.*;
 import org.gudy.azureus2.core3.security.*;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 public class 
 AuthenticatorWindow 
--- org/gudy/azureus2/core3/tracker/server/impl/tcp/TRTrackerServerProcessorTCP.java~	2005-10-15 17:36:18.000000000 -0700
+++ org/gudy/azureus2/core3/tracker/server/impl/tcp/TRTrackerServerProcessorTCP.java	2006-01-17 21:57:15.000000000 -0800
@@ -31,7 +31,7 @@
 import org.gudy.azureus2.core3.tracker.server.impl.*;
 import org.gudy.azureus2.core3.util.*;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 public abstract class 
 TRTrackerServerProcessorTCP

azureus-cache-size.patch:

--- NEW FILE azureus-cache-size.patch ---
--- org/gudy/azureus2/core3/config/COConfigurationManager.java~	2005-10-05 11:27:44.000000000 -0700
+++ org/gudy/azureus2/core3/config/COConfigurationManager.java	2006-01-18 19:49:48.000000000 -0800
@@ -39,7 +39,7 @@
 	public static final int CONFIG_CACHE_SIZE_MAX_MB;
 	
 	static{
-		long max_mem_bytes 	= Runtime.getRuntime().maxMemory();
+	    long max_mem_bytes 	= Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
 	    long mb_1			= 1*1024*1024;
 	    long mb_32			= 32*mb_1;
 	    CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);

azureus-java.beans.XMLEncoder.patch:

--- NEW FILE azureus-java.beans.XMLEncoder.patch ---
--- org/gudy/azureus2/ui/console/multiuser/UserManager.java~	2005-09-06 08:44:54.000000000 -0700
+++ org/gudy/azureus2/ui/console/multiuser/UserManager.java	2005-12-17 12:06:13.000000000 -0800
@@ -23,7 +23,7 @@
 package org.gudy.azureus2.ui.console.multiuser;
 
 import java.beans.XMLDecoder;
-import java.beans.XMLEncoder;
+// import java.beans.XMLEncoder;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -159,9 +159,9 @@
 		List users = new ArrayList( usersMap.values() );
 		config.setUsers(users);
 		
-		XMLEncoder encoder = new XMLEncoder( new BufferedOutputStream( out ) );
-		encoder.writeObject(config);
-		encoder.close();
+		// XMLEncoder encoder = new XMLEncoder( new BufferedOutputStream( out ) );
+		// encoder.writeObject(config);
+		// encoder.close();
 	}
 
 	public static UserManager getInstance(PluginInterface pi) 

azureus-jessie.patch:

--- NEW FILE azureus-jessie.patch ---
--- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~	2005-11-03 07:32:04.000000000 -0800
+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java	2005-12-17 19:33:27.000000000 -0800
@@ -86,7 +86,7 @@
 		
 		try{
 			Security.addProvider((java.security.Provider)
-				Class.forName("com.sun.net.ssl.internal.ssl.Provider").newInstance());
+				Class.forName("org.metastatic.jessie.provider.Jessie").newInstance());
 			
 		}catch( Throwable e ){
 			

azureus-no-bouncycastle.patch:

--- NEW FILE azureus-no-bouncycastle.patch ---
--- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~	2006-01-17 21:58:55.000000000 -0800
+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java	2006-01-17 22:20:05.000000000 -0800
@@ -94,7 +94,7 @@
 		}
 		
 		try{
-			SESecurityManagerBC.initialise();
+		    //			SESecurityManagerBC.initialise();
 			
 		}catch( Throwable e ){
 			
@@ -505,7 +505,8 @@
 	
 		throws Exception
 	{
-		return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
+	    //		return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
+	    return null;
 	}
 	
 	public boolean

azureus-remove-manifest-classpath.patch:

--- NEW FILE azureus-remove-manifest-classpath.patch ---
--- build.xml~	2005-10-25 07:21:24.000000000 -0700
+++ build.xml	2006-01-19 06:39:07.000000000 -0800
@@ -39,7 +39,6 @@
       <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
          <manifest>
             <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
-            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
          </manifest>
       </jar>
       

azureus-remove-win32-PlatformManagerUpdateChecker.patch:

--- NEW FILE azureus-remove-win32-PlatformManagerUpdateChecker.patch ---
--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java~	2005-10-18 17:40:06.000000000 -0700
+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2005-12-17 19:19:51.000000000 -0800
@@ -131,11 +131,6 @@
    					"azbpcorepatcher", 
    					"CorePatcher",
 					"true" },
-	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
-   					"org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker", 
-   					"azplatform2", 
-   					"azplatform2",
-					"true" },
 	   		{	 PluginManagerDefaults.PID_JPC, 
 					"com.aelitis.azureus.plugins.jpc.JPCPlugin", 
 					"azjpc", 

azureus-remove-win32-osx-platforms.patch:

--- NEW FILE azureus-remove-win32-osx-platforms.patch ---
--- org/gudy/azureus2/platform/PlatformManagerFactory.java~	2005-09-12 14:00:06.000000000 -0700
+++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2005-12-17 12:35:09.000000000 -0800
@@ -44,28 +44,6 @@
 			class_mon.enter();
 		
 			if ( platform_manager == null ){
-										  
-				try{
-					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
-						
-						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
-						
-					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
-						
-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
-	                    
-					}
-				}catch( PlatformManagerException e ){
-					
-						// exception will already have been logged
-					
-				}catch( Throwable e ){
-					
-					Debug.printStackTrace(e);
-				}
-			}
-			
-			if ( platform_manager == null ){
 				
 				platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
 			}

azureus-sun.misc.Cleaner.patch:

--- NEW FILE azureus-sun.misc.Cleaner.patch ---
--- com/aelitis/azureus/core/diskmanager/MemoryMappedFile.java~	2004-09-23 08:52:12.000000000 -0700
+++ com/aelitis/azureus/core/diskmanager/MemoryMappedFile.java	2005-12-17 12:03:21.000000000 -0800
@@ -220,8 +220,8 @@
   				try {
   					Method getCleanerMethod = buffer.getClass().getMethod( "cleaner", new Class[0] );
   					getCleanerMethod.setAccessible( true );
-  					sun.misc.Cleaner cleaner = (sun.misc.Cleaner)getCleanerMethod.invoke( buffer, new Object[0] );
-  					cleaner.clean();
+					// sun.misc.Cleaner cleaner = (sun.misc.Cleaner)getCleanerMethod.invoke( buffer, new Object[0] );
+  					// cleaner.clean();
   				}
           catch (Exception e) { Debug.printStackTrace( e ); }
   				return null;

azureus-sun.misc.Signal.patch:

--- NEW FILE azureus-sun.misc.Signal.patch ---
--- ./org/gudy/azureus2/core3/util/ShutdownHook.java~	2005-06-14 19:06:26.000000000 -0700
+++ ./org/gudy/azureus2/core3/util/ShutdownHook.java	2005-12-17 12:01:13.000000000 -0800
@@ -22,8 +22,8 @@
 
 package org.gudy.azureus2.core3.util;
 
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
+// import sun.misc.Signal;
+// import sun.misc.SignalHandler;
 
 
 
@@ -40,44 +40,6 @@
    * @param handler
    */
   public static void install( final Handler handler) {
-    try{
-      final SignalHandler[] old_handlers = new SignalHandler[2];
-    
-      //ctrl-c signal
-      old_handlers[0] = Signal.handle( new Signal( "INT" ), new SignalHandler() {
-        public void handle( Signal sig ) {
-          try{
-            handler.shutdown( sig.getName() );  //main ShutdownHook.Handler
-            
-            if( old_handlers[0] != null && old_handlers[0] != SIG_DFL && old_handlers[0] != SIG_IGN ) {  //chain back to previous handler if one exists
-              old_handlers[0].handle( sig );
-            }
-          }
-          catch( Throwable t ) {
-            Debug.out( t );
-          }
-        }
-      });
-      
-      //os termination signal
-      old_handlers[1] = Signal.handle( new Signal( "TERM" ), new SignalHandler() {
-        public void handle( Signal sig ) {
-          try{
-            handler.shutdown( sig.getName() );  //main ShutdownHook.Handler
-            
-            if( old_handlers[1] != null && old_handlers[1] != SIG_DFL && old_handlers[1] != SIG_IGN ) {  //chain back to previous handler if one exists
-              old_handlers[1].handle( sig );
-            }
-          }
-          catch( Throwable t ) {
-            Debug.out( t );
-          }
-        }
-      });
-    }
-    catch( Throwable t ) {
-      Debug.out( t );
-    }
     
   }
   


--- NEW FILE azureus.applications ---
azureus
	command=azureus
	name=Azureus
	can_open_multiple_files=true
	expects_uris=true
	requires_terminal=false
	supported_uri_schemes=http,ftp,file
	mime_types=application/x-bittorrent


--- NEW FILE azureus.script ---
#!/bin/sh

CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main $*


--- NEW FILE azureus.spec ---
Name:           azureus
Version:        2.3.0.6
Release:        13%{?dist}
Summary:        A BitTorrent Client

Group:          Applications/Internet
License:        GPL
URL:            http://azureus.sourceforge.net

# This is just the upstream Azureus_2.3.0.6_source.zip file with 
# the crypto code removed (org/bouncycastle).
Source0:        Azureus_2.3.0.6_source_nocrypto.zip

Source1:        azureus.script
Source2:        Azureus.desktop
Source3:        azureus.applications
Source4:        azureus-License.txt
Source5:        azureus-ChangeLog.txt

Patch0:         azureus-sun.misc.Cleaner.patch
Patch1:         azureus-sun.misc.Signal.patch
Patch2:         azureus-java.beans.XMLEncoder.patch
Patch3:         azureus-remove-win32-osx-platforms.patch
Patch4:         azureus-remove-win32-PlatformManagerUpdateChecker.patch
Patch5:         azureus-jessie.patch
Patch6:         azureus-GKR.patch
Patch7:         azureus-ConfigurationManager-improvement.patch
Patch8:         azureus-base64.patch
Patch9:         azureus-no-bouncycastle.patch
Patch10:        azureus-cache-size.patch
Patch11:        azureus-remove-manifest-classpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
Requires:       libgcj >= 4.1.0-0.15
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
BuildRequires:    desktop-file-utils
Requires(post):   desktop-file-utils
Requires(postun): desktop-file-utils

%description 
Azureus implements the BitTorrent protocol using java language and
comes bundled with many invaluable features for both beginners and
advanced users.

%prep
%setup -q -c %{name}-%{version}
%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p0
%patch7 -p0
%patch8 -p0
%patch9 -p0
%patch10 -p0
%patch11 -p0
cp %{SOURCE4} License.txt
cp %{SOURCE5} ChangeLog.txt

%build
mkdir -p build/libs
build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 junit log4j gnu-crypto
find ./ -name osx | xargs rm -r
find ./ -name macosx | xargs rm -r
find ./ -name [Ww]in32\* | xargs rm -r
# Remove the BouncyCastle security manager.
rm org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
# Remove test code
rm org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
ant jar

%install
rm -rf $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{_javadir}
install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_javadir}/Azureus2.jar
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -m 644 org/gudy/azureus2/ui/icons/a32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/azureus.png
install -m 644 org/gudy/azureus2/ui/icons/a16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/azureus.png
install -m 644 org/gudy/azureus2/ui/icons/a32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/azureus.png
install -m 644 org/gudy/azureus2/ui/icons/a64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/azureus.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora 			\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
	--add-category X-Fedora				\
	%{SOURCE2}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/application-registry

# Convert line endings...
%{__sed} -i 's/\r//' License.txt
%{__sed} -i 's/\r//' ChangeLog.txt
chmod 644 *.txt

aot-compile-rpm

%clean
rm -rf $RPM_BUILD_ROOT

%post
%{_bindir}/rebuild-gcj-db
update-desktop-database %{_datadir}/applications
# update icon themes
touch %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi

%postun
%{_bindir}/rebuild-gcj-db
update-desktop-database %{_datadir}/applications
# update icon themes
touch %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi

%files
%defattr(-,root,root)
%doc License.txt ChangeLog.txt
%{_datadir}/applications/*
%{_datadir}/application-registry/*
%{_datadir}/pixmaps/azureus.png
%{_datadir}/icons/hicolor/16x16/apps/azureus.png
%{_datadir}/icons/hicolor/32x32/apps/azureus.png
%{_datadir}/icons/hicolor/64x64/apps/azureus.png
%{_bindir}/azureus
%{_javadir}/*.jar
%{_libdir}/gcj/*

%changelog
* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-13
- Drop the junit dependencies.
- Delete unused test code.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-12
- Convert line endings with sed, not dos2unix.
- Add BuildRequires for desktop-file-utils.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-11
- Add Requires(post/postun): desktop-file-utils.
- Install .desktop file with desktop-file-install.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-10
- Fix post and postun desktop integration.
- Add MimeType to .desktop file.
- Add comment about SOURCE0.
- Install files with install, not cp.
- Fix permissions on doc files.
- Add BuildRequires xml-commons-apis.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-9
- Require libgcj with the latest fixes for running Azureus.
- Be explicit about .png files in %files.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-8
- Remove bouncycastle from build-classpath in startup script.
- Remove exclusive arch.
- Remove classpath from manifest.
- Add License.txt and ChangeLog.txt.

* Tue Jan 17 2006 Anthony Green <green at redhat.com> - 2.3.0.6-7
- Add azureus-cache-size.patch

* Tue Jan 17 2006 Anthony Green <green at redhat.com> - 2.3.0.6-6
- Experimental build with no bouncycastle dependency.

* Mon Jan 16 2006 Chris Chabot <chabot at xs4all.nl> - 2.3.0.6-5
- Changed file section so package doesn't end up owning
  standard directories.

* Sun Jan 15 2006 Anthony Green <green at redhat.com> - 2.3.0.6-4
- Remove bouncycastle crypto from zipball.
- Add bouncycastle build- and runtime dependencies.
- Desktop integration work.

* Sun Dec 18 2005 Anthony Green <green at redhat.com> - 2.3.0.6-3
- Add azureus-ConfigurationManager-improvement.patch

* Sat Dec 17 2005 Anthony Green <green at redhat.com> - 2.3.0.6-2
- Add azureus-remove-win32-PlatformManagerUpdateChecker.patch

* Sat Dec 17 2005 Anthony Green <green at redhat.com> - 2.3.0.6-1
- Created.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 23:00:10 -0000	1.1
+++ .cvsignore	19 Jan 2006 23:08:02 -0000	1.2
@@ -0,0 +1 @@
+Azureus_2.3.0.6_source_nocrypto.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 23:00:10 -0000	1.1
+++ sources	19 Jan 2006 23:08:02 -0000	1.2
@@ -0,0 +1 @@
+e53e5b114750c552dc0773106160275b  Azureus_2.3.0.6_source_nocrypto.zip



From fedora-extras-commits at redhat.com  Thu Jan 19 23:12:42 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 18:12:42 -0500
Subject: rpms/alltray/devel alltray.spec,1.3,1.4
Message-ID: <200601192313.k0JNDE3p013599@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13582

Modified Files:
	alltray.spec 
Log Message:
Quick fix thanks to Ville


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alltray.spec	19 Jan 2006 22:24:04 -0000	1.3
+++ alltray.spec	19 Jan 2006 23:12:41 -0000	1.4
@@ -20,7 +20,7 @@
 %setup -q
 
 %build
-RPM_OPT_FLAGS="-fPIC $RPM_OPT_FLAGS"
+export CFLAGS="-fPIC $RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
 
@@ -51,5 +51,5 @@
 
 %changelog
 * Thu Jan 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
-- Added -fPIC to RPM_OPT_FLAGS
+- Added -fPIC to CFLAGS
 - Initial RPM release



From fedora-extras-commits at redhat.com  Thu Jan 19 23:20:39 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 18:20:39 -0500
Subject: owners owners.list,1.552,1.553
Message-ID: <200601192320.k0JNKxHZ013733@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13715

Modified Files:
	owners.list 
Log Message:
nagios and wp_tray


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -r1.552 -r1.553
--- owners.list	19 Jan 2006 19:55:27 -0000	1.552
+++ owners.list	19 Jan 2006 23:20:38 -0000	1.553
@@ -638,6 +638,7 @@
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
+Fedora Extras|nagios|Host/service/network monitoring program|imlinux at gmail.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|
@@ -1290,6 +1291,7 @@
 Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|workrave|Recovery and prevention of RSI assistant|tmraz at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|mattdm at mattdm.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 23:22:42 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 18:22:42 -0500
Subject: rpms/nagios/devel nagios.spec,1.1,1.2
Message-ID: <200601192323.k0JNNEB9013807@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13780

Modified Files:
	nagios.spec 
Log Message:
Disttag


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios.spec	19 Jan 2006 22:47:20 -0000	1.1
+++ nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 1.3
-Release: 14
+Release: 14%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System



From fedora-extras-commits at redhat.com  Thu Jan 19 23:33:22 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:33:22 -0500
Subject: rpms/wine/FC-3 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 wine.spec, 1.6,
	1.7 wine-CVE-2005-4560.patch, 1.1, NONE
Message-ID: <200601192333.k0JNXsHx013923@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13864/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	wine-CVE-2005-4560.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jan 2006 11:00:54 -0000	1.3
+++ .cvsignore	19 Jan 2006 23:33:21 -0000	1.4
@@ -1,2 +1 @@
-wine-0.9.5.tar.bz2
-wine-fonts-20050524.tar.gz
+wine-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jan 2006 11:00:54 -0000	1.4
+++ sources	19 Jan 2006 23:33:21 -0000	1.5
@@ -1,2 +1 @@
-b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
-fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
+1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wine.spec	8 Jan 2006 09:06:36 -0000	1.6
+++ wine.spec	19 Jan 2006 23:33:21 -0000	1.7
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.6.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -19,8 +19,6 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
-# CVS-2005-4560 wmf exploit
-Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -146,7 +144,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
-%patch100 -p1
 autoconf
 
 %build
@@ -515,7 +512,6 @@
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
-#%{_libdir}/wine/winetty.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
 %{_libdir}/wine/wininet.dll.so
@@ -533,6 +529,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/security.dll.so
 %dir %{_datadir}/fonts/wine
 %{_datadir}/fonts/wine/wine_coure.fon
 %{_datadir}/fonts/wine/wine_couree.fon
@@ -679,6 +676,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+- drop wmf exploit patch (part of current version)
+
 * Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix for CVE-2005-4560


--- wine-CVE-2005-4560.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:33:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:33:28 -0500
Subject: rpms/wine/FC-4 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 wine.spec, 1.8,
	1.9 wine-CVE-2005-4560.patch, 1.1, NONE
Message-ID: <200601192334.k0JNY0aI013931@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13864/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	wine-CVE-2005-4560.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jan 2006 11:01:00 -0000	1.4
+++ .cvsignore	19 Jan 2006 23:33:27 -0000	1.5
@@ -1,2 +1 @@
-wine-0.9.5.tar.bz2
-wine-fonts-20050524.tar.gz
+wine-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jan 2006 11:01:00 -0000	1.5
+++ sources	19 Jan 2006 23:33:27 -0000	1.6
@@ -1,2 +1 @@
-b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
-fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
+1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine.spec	8 Jan 2006 09:06:46 -0000	1.8
+++ wine.spec	19 Jan 2006 23:33:27 -0000	1.9
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.6.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -19,9 +19,6 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
-# CVS-2005-4560 wmf exploit from wine cvs
-# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
-Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -147,7 +144,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
-%patch100 -p1
 autoconf
 
 %build
@@ -516,7 +512,6 @@
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
-#%{_libdir}/wine/winetty.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
 %{_libdir}/wine/wininet.dll.so
@@ -534,6 +529,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/security.dll.so
 %dir %{_datadir}/fonts/wine
 %{_datadir}/fonts/wine/wine_coure.fon
 %{_datadir}/fonts/wine/wine_couree.fon
@@ -680,6 +676,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+- drop wmf exploit patch (part of current version)
+
 * Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix for CVE-2005-4560


--- wine-CVE-2005-4560.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:33:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:33:34 -0500
Subject: rpms/wine/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 wine.spec,
	1.10, 1.11 wine-CVE-2005-4560.patch, 1.1, NONE
Message-ID: <200601192334.k0JNY6KG013967@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13864/devel

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	wine-CVE-2005-4560.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jan 2006 11:01:06 -0000	1.4
+++ .cvsignore	19 Jan 2006 23:33:33 -0000	1.5
@@ -1,2 +1 @@
-wine-0.9.5.tar.bz2
-wine-fonts-20050524.tar.gz
+wine-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jan 2006 11:01:06 -0000	1.5
+++ sources	19 Jan 2006 23:33:33 -0000	1.6
@@ -1,2 +1 @@
-b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
-fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
+1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wine.spec	8 Jan 2006 09:07:13 -0000	1.10
+++ wine.spec	19 Jan 2006 23:33:33 -0000	1.11
@@ -1,14 +1,14 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.6.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -21,9 +21,6 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
-# CVS-2005-4560 wmf exploit from wine cvs
-# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
-Patch100:       wine-CVE-2005-4560.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -159,7 +156,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
-%patch100 -p1
 autoconf
 
 %build
@@ -529,7 +525,6 @@
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
-#%{_libdir}/wine/winetty.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
 %{_libdir}/wine/wininet.dll.so
@@ -547,6 +542,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/security.dll.so
 %dir %{_datadir}/fonts/wine
 %{_datadir}/fonts/wine/wine_coure.fon
 %{_datadir}/fonts/wine/wine_couree.fon
@@ -693,6 +689,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+- drop wmf exploit patch (part of current version)
+
 * Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix for CVE-2005-4560


--- wine-CVE-2005-4560.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:34:16 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:34:16 -0500
Subject: rpms/ldns/FC-4 sources,1.2,1.3
Message-ID: <200601192334.k0JNYmfB013987@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13882

Modified Files:
	sources 
Log Message:
new sources file for ldns



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 04:08:25 -0000	1.2
+++ sources	19 Jan 2006 23:34:16 -0000	1.3
@@ -1 +1 @@
-bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz
+39210ff3bb2673d57e024f7908d31be5  ldns-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:35:59 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:35:59 -0500
Subject: rpms/ldns/FC-3 sources,1.2,1.3
Message-ID: <200601192336.k0JNaVix014021@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13999

Modified Files:
	sources 
Log Message:
new sources file for ldns



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 04:08:25 -0000	1.2
+++ sources	19 Jan 2006 23:35:58 -0000	1.3
@@ -1 +1 @@
-bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz
+39210ff3bb2673d57e024f7908d31be5  ldns-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:37:49 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:37:49 -0500
Subject: rpms/wine/FC-3 .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200601192338.k0JNcLZA014099@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
- fix sources (forgot wine-fonts)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jan 2006 23:33:21 -0000	1.4
+++ .cvsignore	19 Jan 2006 23:37:48 -0000	1.5
@@ -1 +1,2 @@
 wine-0.9.6.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 23:33:21 -0000	1.5
+++ sources	19 Jan 2006 23:37:48 -0000	1.6
@@ -1 +1,2 @@
 1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:37:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:37:55 -0500
Subject: rpms/wine/FC-4 .cvsignore,1.5,1.6 sources,1.6,1.7
Message-ID: <200601192338.k0JNcRx3014103@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
- fix sources (forgot wine-fonts)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 23:33:27 -0000	1.5
+++ .cvsignore	19 Jan 2006 23:37:54 -0000	1.6
@@ -1 +1,2 @@
 wine-0.9.6.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2006 23:33:27 -0000	1.6
+++ sources	19 Jan 2006 23:37:54 -0000	1.7
@@ -1 +1,2 @@
 1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:38:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:38:01 -0500
Subject: rpms/wine/devel .cvsignore,1.5,1.6 sources,1.6,1.7
Message-ID: <200601192338.k0JNcXUp014107@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037/devel

Modified Files:
	.cvsignore sources 
Log Message:
- fix sources (forgot wine-fonts)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 23:33:33 -0000	1.5
+++ .cvsignore	19 Jan 2006 23:38:00 -0000	1.6
@@ -1 +1,2 @@
 wine-0.9.6.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2006 23:33:33 -0000	1.6
+++ sources	19 Jan 2006 23:38:00 -0000	1.7
@@ -1 +1,2 @@
 1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:44:45 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:44:45 -0500
Subject: rpms/fetchlog - New directory
Message-ID: <200601192344.k0JNilbg014224@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14216/fetchlog

Log Message:
Directory /cvs/extras/rpms/fetchlog added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 23:44:51 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:44:51 -0500
Subject: rpms/fetchlog/devel - New directory
Message-ID: <200601192344.k0JNirwu014239@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14216/fetchlog/devel

Log Message:
Directory /cvs/extras/rpms/fetchlog/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 23:45:09 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:45:09 -0500
Subject: rpms/fetchlog Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601192345.k0JNjCMO014275@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14263

Added Files:
	Makefile import.log 
Log Message:
Setup of module fetchlog


--- NEW FILE Makefile ---
# Top level Makefile for module fetchlog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:45:16 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:45:16 -0500
Subject: rpms/fetchlog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601192345.k0JNjIQG014295@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14263/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fetchlog


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:45:58 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:45:58 -0500
Subject: rpms/fetchlog import.log,1.1,1.2
Message-ID: <200601192346.k0JNkU5G014365@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14329

Modified Files:
	import.log 
Log Message:
auto-import fetchlog-1.0-2 on branch devel from fetchlog-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 23:45:09 -0000	1.1
+++ import.log	19 Jan 2006 23:45:58 -0000	1.2
@@ -0,0 +1 @@
+fetchlog-1_0-2:HEAD:fetchlog-1.0-2.src.rpm:1137714389



From fedora-extras-commits at redhat.com  Thu Jan 19 23:46:04 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:46:04 -0500
Subject: rpms/fetchlog/devel fetchlog.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601192346.k0JNkanl014372@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14329/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fetchlog.spec 
Log Message:
auto-import fetchlog-1.0-2 on branch devel from fetchlog-1.0-2.src.rpm


--- NEW FILE fetchlog.spec ---
Summary: The fetchlog utility displays the last new messages of a logfile
Name: fetchlog
Version: 1.0
Release: 2%{?dist}
License: GPL
Url: http://sourceforge.net/projects/%{name}/
Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The fetchlog utility displays the last new messages of a logfile. It is
similar like tail (1) but offers some extra functionality for output
formatting. To show only the new messages appeared since the last call
fetchlog uses a bookmark to remember which messages have been fetched.

%prep
%setup -q 

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_bindir}
install -d %{buildroot}/%{_mandir}/man1
install -m755 %{name} %{buildroot}/%{_bindir}
install -m644 %{name}.1 %{buildroot}/%{_mandir}/man1

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_bindir}/%{name}
%doc CHANGES LICENSE README README.Nagios README.SNMP
%{_mandir}/*/*

%changelog
* Mon Jan 17 2006 Paul Wouters <paul at xelerance.com> 1.0-2
- Fixed install target for man page and cleaning before install

* Mon Jan 16 2006 Paul Wouters <paul at xelerance.com> 1.0-1
- Initial version for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 23:45:15 -0000	1.1
+++ .cvsignore	19 Jan 2006 23:46:04 -0000	1.2
@@ -0,0 +1 @@
+fetchlog-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 23:45:15 -0000	1.1
+++ sources	19 Jan 2006 23:46:04 -0000	1.2
@@ -0,0 +1 @@
+e2ef0a076d1901c489c953fe48e1b2a9  fetchlog-1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 00:20:34 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 19:20:34 -0500
Subject: owners owners.list,1.553,1.554
Message-ID: <200601200021.k0K0L6D0016707@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16689

Modified Files:
	owners.list 
Log Message:
Added ownership of fetchlog



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- owners.list	19 Jan 2006 23:20:38 -0000	1.553
+++ owners.list	20 Jan 2006 00:20:34 -0000	1.554
@@ -1381,3 +1381,4 @@
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 05:00:17 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 20 Jan 2006 00:00:17 -0500
Subject: rpms/azureus/devel azureus.spec,1.1,1.2
Message-ID: <200601200500.k0K50oZL024275@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24258

Modified Files:
	azureus.spec 
Log Message:
Remove junit from build-jar-repository.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus.spec	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus.spec	20 Jan 2006 05:00:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -66,7 +66,7 @@
 
 %build
 mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 junit log4j gnu-crypto
+build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -143,6 +143,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-14
+- Remove junit from build-jar-repository.
+
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-13
 - Drop the junit dependencies.
 - Delete unused test code.



From fedora-extras-commits at redhat.com  Fri Jan 20 05:22:32 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 20 Jan 2006 00:22:32 -0500
Subject: rpms/azureus/devel azureus.spec,1.2,1.3
Message-ID: <200601200523.k0K5N4uR026134@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26117

Modified Files:
	azureus.spec 
Log Message:
Remove PrintTransferTypes, which is unused and not 64-bit clean.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus.spec	20 Jan 2006 05:00:17 -0000	1.2
+++ azureus.spec	20 Jan 2006 05:22:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -74,6 +74,7 @@
 rm org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
 # Remove test code
 rm org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
+rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
 ant jar
 
 %install
@@ -143,6 +144,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-15
+- Remove PrintTransferTypes, which is unused and not 64-bit clean.
+
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-14
 - Remove junit from build-jar-repository.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 08:23:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Jan 2006 03:23:20 -0500
Subject: rpms/openal/FC-4 openal.spec,1.10,1.11
Message-ID: <200601200823.k0K8Nq96032680@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32662

Modified Files:
	openal.spec 
Log Message:
- drop smpflags



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openal.spec	19 Jan 2006 08:43:31 -0000	1.10
+++ openal.spec	20 Jan 2006 08:23:19 -0000	1.11
@@ -52,7 +52,8 @@
            --enable-sdl                    \
            --disable-smpeg                 \
            --enable-capture
-make %{?_smp_mflags}
+# drop smpflags do not work
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Fri Jan 20 08:30:33 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Jan 2006 03:30:33 -0500
Subject: rpms/rxvt-unicode/devel rxvt-unicode.spec,1.16,1.17
Message-ID: <200601200831.k0K8V57p000308@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32757

Modified Files:
	rxvt-unicode.spec 
Log Message:
- fix doc



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rxvt-unicode.spec	19 Jan 2006 21:54:15 -0000	1.16
+++ rxvt-unicode.spec	20 Jan 2006 08:30:30 -0000	1.17
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/etc doc/changes.txt COPYING
+%doc README.FAQ INSTALL doc/README.xvt doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:13 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:13 -0500
Subject: rpms/libupnp - New directory
Message-ID: <200601200838.k0K8cFcj000441@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433/libupnp

Log Message:
Directory /cvs/extras/rpms/libupnp added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:19 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:19 -0500
Subject: rpms/libupnp/devel - New directory
Message-ID: <200601200838.k0K8cLq5000456@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433/libupnp/devel

Log Message:
Directory /cvs/extras/rpms/libupnp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:40 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:40 -0500
Subject: rpms/libupnp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601200838.k0K8cgrJ000491@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv479

Added Files:
	Makefile import.log 
Log Message:
Setup of module libupnp


--- NEW FILE Makefile ---
# Top level Makefile for module libupnp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:46 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:46 -0500
Subject: rpms/libupnp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601200838.k0K8cmUS000511@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv479/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libupnp


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 20 08:40:06 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:40:06 -0500
Subject: rpms/libupnp import.log,1.1,1.2
Message-ID: <200601200840.k0K8ecJE000606@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv561

Modified Files:
	import.log 
Log Message:
auto-import libupnp-1.2.1a-4 on branch devel from libupnp-1.2.1a-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libupnp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Jan 2006 08:38:40 -0000	1.1
+++ import.log	20 Jan 2006 08:40:05 -0000	1.2
@@ -0,0 +1 @@
+libupnp-1_2_1a-4:HEAD:libupnp-1.2.1a-4.src.rpm:1137746395



From fedora-extras-commits at redhat.com  Fri Jan 20 08:40:11 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:40:11 -0500
Subject: rpms/libupnp/devel libupnp.spec, NONE, 1.1 libupnp_dsm_320.patch,
	NONE, 
	1.1 libupnp_ixml_FC4.patch, NONE, 1.1 libupnp_performance.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601200840.k0K8eixk000610@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv561/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libupnp.spec libupnp_dsm_320.patch libupnp_ixml_FC4.patch 
	libupnp_performance.patch 
Log Message:
auto-import libupnp-1.2.1a-4 on branch devel from libupnp-1.2.1a-4.src.rpm


--- NEW FILE libupnp.spec ---
Version: 1.2.1a
Summary: Universal Plug and Play (UPnP) SDK
Name: libupnp
Release: 4%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://upnp.sourceforge.net/
Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz
Patch0: libupnp_dsm_320.patch 
Patch1: libupnp_ixml_FC4.patch 
Patch2: libupnp_performance.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The Universal Plug and Play (UPnP) SDK for Linux provides 
support for building UPnP-compliant control points, devices, 
and bridges on Linux.

%package devel
Group: Development/Libraries
Summary: Include files needed for development with libupnp
Requires: libupnp = %{version}-%{release}

%description devel
The libupnp-devel package contains the files necessary for development with
the UPnP SDK libraries.

%prep
%setup -q

%patch0 -p0
%patch1 -p0
%patch2 -p1
chmod 644 {LICENSE,README}

# Fix permissions for files in debuginfo package
find . -name '*.[ch]' | xargs chmod 644

# Fix libupnp.so symlink
sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile

# Remove -Os optflag and add RPM optflags in makefiles
# Install libraries in correct directories
find . -name '[Mm]akefile' | xargs sed -i \
	-e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \
	-e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \
	-e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \
	-e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \
	-e 's#/usr/lib$#%{_libdir}#g'

%build
make -C upnp STRIP="echo Not stripping" %{?_smp_mflags}

%install
rm -rf %{buildroot}

## Install libupnp.so and headers
make -C upnp PREFIX=%{buildroot} install

## Install libixml.so and headers
make -C ixml PREFIX=%{buildroot} install
install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp

## Install libthreadutil.so and headers
make -C threadutil PREFIX=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_libdir}/libixml.so*
%{_libdir}/libthreadutil.so*
%{_libdir}/libupnp.so*

%files devel
%defattr(0644,root,root,0755)
%{_includedir}/upnp/

%clean
rm -rf %{buildroot}

%changelog
* Mon Jan  9 2006 Eric Tanguy 1.2.1a-4
- Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1

* Sun Jan  8 2006 Paul Howarth 1.2.1a-3
- Disable stripping of object code for sane debuginfo generation
- Edit makefiles to hnnor RPM optflags
- Install libraries in %%{_libdir} rather than hardcoded /usr/lib
- Fix libupnp.so symlink
- Own directory %%{_includedir}/upnp
- Fix permissions in -devel package

* Fri Jan 06 2006 Eric Tanguy 1.2.1a-2
- Use 'install -p' to preserve timestamps
- Devel now require full version-release of main package

* Thu Dec 22 2005 Eric Tanguy 1.2.1a-1
- Modify spec file from 
http://rpm.pbone.net/index.php3/stat/4/idpl/2378737/com/libupnp-1.2.1a_DSM320-3.i386.rpm.html

libupnp_dsm_320.patch:

--- NEW FILE libupnp_dsm_320.patch ---
diff -Naur ../libupnp-1.2.1a/upnp/inc/config.h upnp/inc/config.h
--- ../libupnp-1.2.1a/upnp/inc/config.h	2003-02-13 17:19:02.000000000 +0100
+++ upnp/inc/config.h	2005-11-05 20:42:25.000000000 +0100
@@ -56,6 +56,17 @@
 #define THREAD_IDLE_TIME 5000
 //@}
 
+/** @name X_USER_AGENT
+ *  The {\tt X_USER_AGENT} constant specifies the value of the X-User-Agent:
+ *  HTTP header. The value "redsonic" is needed for the DSM-320. See
+ *  https://sourceforge.net/forum/message.php?msg_id=3166856 for more
+ * information
+ */
+
+//@{
+#define X_USER_AGENT "redsonic"
+//@}
+
 /** @name JOBS_PER_THREAD
  *  The {\tt JOBS_PER_THREAD} constant determines when a new thread will be
  *  allocated to the thread pool inside the  SDK. The thread pool will
diff -Naur ../libupnp-1.2.1a/upnp/src/gena/gena_device.c upnp/src/gena/gena_device.c
--- ../libupnp-1.2.1a/upnp/src/gena/gena_device.c	2003-02-13 17:19:11.000000000 +0100
+++ upnp/src/gena/gena_device.c	2005-11-05 20:18:42.000000000 +0100
@@ -1164,10 +1164,16 @@
 
     membuffer_init( &response );
     response.size_inc = 30;
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+ * added X-User-Agent header
+ */
     if( http_MakeMessage( &response, major, minor,
-                          "R" "D" "S" "ssc" "sc" "c",
+                          "R" "D" "S" "Xc" "ssc" "sc" "c",
                           HTTP_OK,
-                          "SID: ", sub->sid, timeout_str ) != 0 ) {
+                          X_USER_AGENT,
+                          "SID: ", sub->sid, timeout_str ) != 0 ) 
+/* - PATCH END --- */        
+    {
         membuffer_destroy( &response );
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
         return UPNP_E_OUTOF_MEMORY;
diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c upnp/src/genlib/net/http/httpreadwrite.c
--- ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c	2003-02-13 17:19:13.000000000 +0100
+++ upnp/src/genlib/net/http/httpreadwrite.c	2005-11-05 20:04:51.000000000 +0100
@@ -1632,6 +1632,9 @@
 *				appends content-length, content-type and HTML body for given code
 *		'T':	arg = char * content_type; format e.g: "text/html";	
 *				 content-type header
+* --- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+*       'X':    arg = const char useragent; "redsonic" HTTP X-User-Agent: useragent
+* --- PATCH END ---
 *
 *	Return : int;
 *		0 - On Success
@@ -1800,6 +1803,24 @@
             }
         }
 
+/* --- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
+        if( c == 'X' )          // C string
+        {
+            s = ( char * )va_arg( argp, char * );
+
+            assert( s );
+
+            if( membuffer_append_str( buf, "X-User-Agent: ") != 0 ) {
+                goto error_handler;
+            }
+            if( membuffer_append( buf, s, strlen( s ) ) != 0 ) {
+                goto error_handler;
+            }
+        }
+        
+/* --- PATCH END --- */
+    
+
         else if( c == 'R' ) {
             // response start line
             //   e.g.: 'HTTP/1.1 200 OK'
diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c upnp/src/genlib/net/http/webserver.c
--- ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c	2003-02-13 17:19:14.000000000 +0100
+++ upnp/src/genlib/net/http/webserver.c	2005-11-05 20:53:56.000000000 +0100
@@ -1368,16 +1368,22 @@
     }
 
     if( RespInstr->IsRangeActive && RespInstr->IsChunkActive ) {
+
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+ * added X-User-Agent header
+ */
+        
         //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         //Transfer-Encoding: chunked
         // K means add chunky header ang G means range header.
-        if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSCc", HTTP_PARTIAL_CONTENT, // status code
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code
                               // RespInstr->ReadSendSize,// content length
                               finfo.content_type,
                               //     content_type.buf,            // content type
                               RespInstr,    // Range
                               "LAST-MODIFIED: ",
-                              &finfo.last_modified ) != 0 ) {
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
     } else if( RespInstr->IsRangeActive && !RespInstr->IsChunkActive ) {
@@ -1385,13 +1391,14 @@
         //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         //Transfer-Encoding: chunked
         // K means add chunky header ang G means range header.
-        if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSCc", HTTP_PARTIAL_CONTENT, // status code
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code
                               RespInstr->ReadSendSize,  // content length
                               finfo.content_type,
                               //content_type.buf,            // content type
                               RespInstr,    //Range Info
                               "LAST-MODIFIED: ",
-                              &finfo.last_modified ) != 0 ) {
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
@@ -1400,12 +1407,13 @@
         //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         //Transfer-Encoding: chunked
         // K means add chunky header ang G means range header.
-        if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSCc", HTTP_OK,   // status code
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSXcCc", HTTP_OK,   // status code
                               //RespInstr->ReadSendSize,// content length
                               finfo.content_type,
                               // content_type.buf,            // content type
                               "LAST-MODIFIED: ",
-                              &finfo.last_modified ) != 0 ) {
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
@@ -1414,28 +1422,31 @@
             //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
             //Transfer-Encoding: chunked
             // K means add chunky header ang G means range header.
-            if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSCc", HTTP_OK,   // status code
+            if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSXcCc", HTTP_OK,   // status code
                                   RespInstr->ReadSendSize,  // content length
                                   finfo.content_type,
                                   //content_type.buf,          // content type
                                   "LAST-MODIFIED: ",
-                                  &finfo.last_modified ) != 0 ) {
+                                  &finfo.last_modified,
+                                  X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         } else {
             //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
             //Transfer-Encoding: chunked
             // K means add chunky header ang G means range header.
-            if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSCc", HTTP_OK,    // status code
+            if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSXcCc", HTTP_OK,    // status code
                                   //RespInstr->ReadSendSize,// content length
                                   finfo.content_type,
                                   //content_type.buf,          // content type
                                   "LAST-MODIFIED: ",
-                                  &finfo.last_modified ) != 0 ) {
+                                  &finfo.last_modified,
+                                  X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         }
     }
+/* -- PATCH END -- */
 
     if( req->method == HTTPMETHOD_HEAD ) {
         *rtype = RESP_HEADERS;
@@ -1717,8 +1728,14 @@
                     http_RecvPostMessage( parser, info, filename.buf,
                                           &RespInstr );
                 //Send response.
-                http_MakeMessage( &headers, 1, 1, "RTDSCc", ret,
-                                  "text/html" );
+
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+ * added X-User-Agent header
+ */
+                http_MakeMessage( &headers, 1, 1, "RTDSXcCc", ret,
+                                  "text/html", X_USER_AGENT );
+/* - PATCH END --- */
+
                 http_SendMessage( info, &timeout, "b", headers.buf,
                                   headers.length );
                 break;
diff -Naur ../libupnp-1.2.1a/upnp/src/soap/soap_device.c upnp/src/soap/soap_device.c
--- ../libupnp-1.2.1a/upnp/src/soap/soap_device.c	2003-02-13 17:19:20.000000000 +0100
+++ upnp/src/soap/soap_device.c	2005-11-05 20:44:41.000000000 +0100
@@ -221,17 +221,20 @@
 
     // make headers
     membuffer_init( &headers );
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */    
     if( http_MakeMessage( &headers, major, minor,
-                          "RNsDsSc" "sssss",
+                          "RNsDsSXc" "sssss",
                           500,
                           content_length,
                           ContentTypeHeader,
                           "EXT:\r\n",
+                          X_USER_AGENT,
                           start_body, err_code_str, mid_body, err_msg,
                           end_body ) != 0 ) {
         membuffer_destroy( &headers );
         return;                 // out of mem
     }
+/*-- PATCH END - */
     // send err msg
     http_SendMessage( info, &timeout_secs, "b",
                       headers.buf, headers.length );
@@ -285,16 +288,21 @@
 
     // make headers
     membuffer_init( &response );
+    
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
     if( http_MakeMessage( &response, major, minor,
-                          "RNsDsSc" "sss",
+                          "RNsDsSXcc" "sss",
                           HTTP_OK,
                           content_length,
                           ContentTypeHeader,
                           "EXT:\r\n",
+                          X_USER_AGENT,
                           start_body, var_value, end_body ) != 0 ) {
         membuffer_destroy( &response );
         return;                 // out of mem
     }
+/* -- PATCH END - */
+    
     // send msg
     http_SendMessage( info, &timeout_secs, "b",
                       response.buf, response.length );
@@ -704,11 +712,14 @@
         strlen( end_body );
 
     // make headers
-    if( http_MakeMessage( &headers, major, minor, "RNsDsSc", HTTP_OK,   // status code
-                          content_length, ContentTypeHeader, "EXT:\r\n" // EXT header
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */    
+    if( http_MakeMessage( &headers, major, minor, "RNsDsSXcc", HTTP_OK,   // status code
+                          content_length, ContentTypeHeader, "EXT:\r\n", X_USER_AGENT // EXT header
          ) != 0 ) {
         goto error_handler;
     }
+/* -- PATCH END - */
+
     // send whole msg
     ret_code = http_SendMessage( info, &timeout_secs, "bbbb",
                                  headers.buf, headers.length,
diff -Naur ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c upnp/src/ssdp/ssdp_device.c
--- ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c	2003-02-13 17:19:21.000000000 +0100
+++ upnp/src/ssdp/ssdp_device.c	2005-11-05 21:04:52.000000000 +0100
@@ -290,12 +290,16 @@
     *packet = NULL;
 
     if( msg_type == MSGTYPE_REPLY ) {
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
         ret_code = http_MakeMessage( &buf, 1, 1,
-                                     "R" "sdc" "D" "s" "ssc" "S" "ssc"
+                                     "R" "sdc" "D" "s" "ssc" "S" "Xc" "ssc"
                                      "ssc" "c", HTTP_OK,
                                      "CACHE-CONTROL: max-age=", duration,
                                      "EXT:\r\n", "LOCATION: ", location,
+                                     X_USER_AGENT,
                                      "ST: ", nt, "USN: ", usn );
+/* -- PATCH END - */
+        
         if( ret_code != 0 ) {
             return;
         }
@@ -310,14 +314,16 @@
 
         // NOTE: The CACHE-CONTROL and LOCATION headers are not present in
         //  a shutdown msg, but are present here for MS WinMe interop.
-
+        
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
         ret_code = http_MakeMessage( &buf, 1, 1,
                                      "Q" "sssdc" "sdc" "ssc" "ssc" "ssc"
-                                     "S" "ssc" "c", HTTPMETHOD_NOTIFY, "*",
+                                     "S" "Xc" "ssc" "c", HTTPMETHOD_NOTIFY, "*",
                                      1, "HOST: ", SSDP_IP, ":", SSDP_PORT,
                                      "CACHE-CONTROL: max-age=", duration,
                                      "LOCATION: ", location, "NT: ", nt,
-                                     "NTS: ", nts, "USN: ", usn );
+                                     "NTS: ", nts, X_USER_AGENT, "USN: ", usn );
+/* -- PATCH END - */        
         if( ret_code != 0 ) {
             return;
         }

libupnp_ixml_FC4.patch:

--- NEW FILE libupnp_ixml_FC4.patch ---
--- ../libupnp-1.2.1a/ixml/src/element.c	2003-02-13 17:18:51.000000000 +0100
+++ ixml/src/element.c	2005-11-05 20:47:25.000000000 +0100
@@ -454,9 +454,12 @@
             element->n.firstAttr = nextSib;
         }
 
-        ( IXML_Attr * ) attrNode->parentNode = NULL;
-        ( IXML_Attr * ) attrNode->prevSibling = NULL;
-        ( IXML_Attr * ) attrNode->nextSibling = NULL;
+        // removed the casts, else it did not compile on FC4
+        // Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+        attrNode->parentNode = NULL;
+        attrNode->prevSibling = NULL;
+        attrNode->nextSibling = NULL;
+        
         *rtAttr = ( IXML_Attr * ) attrNode;
         return IXML_SUCCESS;
 

libupnp_performance.patch:

--- NEW FILE libupnp_performance.patch ---
--- libupnp-1.2.1a/upnp/inc/config.h	2003-02-13 17:19:02.000000000 +0100
+++ libupnp-1.2.1a/upnp/inc/config.h	2005-03-08 21:26:25.000000000 +0100
@@ -65,7 +65,7 @@
  */
 
 //@{
-#define JOBS_PER_THREAD 10
+#define JOBS_PER_THREAD 1
 //@}
 
 /** @name MIN_THREADS
@@ -78,7 +78,7 @@
  */
 
 //@{
-#define MIN_THREADS 2 
+#define MIN_THREADS 4 
 //@}
 
 /** @name MAX_THREADS


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2006 08:38:46 -0000	1.1
+++ .cvsignore	20 Jan 2006 08:40:11 -0000	1.2
@@ -0,0 +1 @@
+libupnp-1.2.1a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2006 08:38:46 -0000	1.1
+++ sources	20 Jan 2006 08:40:11 -0000	1.2
@@ -0,0 +1 @@
+e72b3550bf064eedf080f16f09688891  libupnp-1.2.1a.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 09:10:03 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Fri, 20 Jan 2006 04:10:03 -0500
Subject: rpms/fbida/devel fbida.spec,1.11,1.12
Message-ID: <200601200910.k0K9AbkY002844@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2814

Modified Files:
	fbida.spec 
Log Message:
* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-9
- this should finally work; also on x86_64



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fbida.spec	19 Jan 2006 12:26:45 -0000	1.11
+++ fbida.spec	20 Jan 2006 09:10:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -42,7 +42,7 @@
 %setup -q
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__sed} -i -e "s,/X11R6,,g" GNUmakefile
-%{__sed} -i -e "s,/usr/X11R6/lib/X11,/usr/lib/X11,g" mk/Autoconf.mk
+%{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
 
 %build
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -58,8 +58,6 @@
 %{__mv} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
-%{__mv} %{buildroot}%{_libdir}/X11 %{buildroot}%{_datadir}
-%{__rm} -rf %{buildroot}%{_libdir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -84,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-9
+- this should finally work; also on x86_64
+
 * Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-8
 - rebuilt
 



From fedora-extras-commits at redhat.com  Fri Jan 20 09:10:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Jan 2006 04:10:46 -0500
Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.3,1.4
Message-ID: <200601200911.k0K9BJfW003042@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2843

Modified Files:
	wine-docs.spec 
Log Message:
- try to fix fc4 build



Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine-docs.spec	19 Jan 2006 22:37:40 -0000	1.3
+++ wine-docs.spec	20 Jan 2006 09:10:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           wine-docs
 Version:        0.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
@@ -11,6 +11,7 @@
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
 BuildRequires:  openjade
+BuildRequires:  elinks
 
 %description
 This package is Wine's documentation repository. It consists of 
@@ -37,6 +38,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Fri Jan 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-2
+- try to fix fc4 build
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.6-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Jan 20 10:00:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:00:32 -0500
Subject: rpms/prozilla/devel prozilla-1.3.7.4-buf.patch, NONE,
	1.1 prozilla.spec, 1.11, 1.12
Message-ID: <200601201001.k0KA146f004942@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3272

Modified Files:
	prozilla.spec 
Added Files:
	prozilla-1.3.7.4-buf.patch 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791


prozilla-1.3.7.4-buf.patch:

--- NEW FILE prozilla-1.3.7.4-buf.patch ---
--- prozilla-1.3.7.4/src/ftpsearch.c.buf	2006-01-05 11:43:08.000000000 +0100
+++ prozilla-1.3.7.4/src/ftpsearch.c	2006-01-05 11:59:49.000000000 +0100
@@ -81,9 +81,10 @@
     return (strstr(buf, "</A"));
 }
 
-char *get_string_ahref(char *buf, char *out)
+static char *get_string_ahref(char *buf, char *out, size_t out_size)
 {
     char *p1, *p2, *p3;
+    size_t to_copy;
 
     p1 = find_ahref(buf);
     assert(p1 != NULL);
@@ -93,11 +94,14 @@
 
     p3 = find_closed_a(p2);
     assert(p3 != NULL);
-
-    strncpy(out, p2 + 1, p3 - p2 - 1);
-    out[p3 - p2 - 1] = 0;
+    
+    to_copy = p3 - p2 - 1;
+    if (to_copy >= out_size)
+        to_copy = out_size - 1;
+    strncpy(out, p2 + 1, to_copy);
+    out[to_copy] = 0;
+    
     return p3;
-
 }
 
 
@@ -242,9 +246,8 @@
 
     p1 = kmalloc((j - i - 5) + 100);
     strncpy(p1, i + 5, j - i - 5);
-
-    debug_prz("\nstring len= %ld", strlen(p1));
     p1[j - i - 5 + 1] = 0;
+    debug_prz("\nstring len= %ld", strlen(p1));
 
     p2 = p1;
 
@@ -275,9 +278,9 @@
     for (k = 0; k < *num_servers; k++)
     {
 	memset(&(ftp_mirrors[k]), 0, sizeof(ftp_mirror));
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].server_name = kstrdup(buf);
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 
 	/*Strip any leading slash in the path name if preent */
 	if (*buf == '/')
@@ -285,7 +288,7 @@
 	else
 	    ftp_mirrors[k].path = kstrdup(buf);
 
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].file_name = kstrdup(buf);
     }
 


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prozilla.spec	9 Sep 2005 11:26:07 -0000	1.11
+++ prozilla.spec	20 Jan 2006 10:00:32 -0000	1.12
@@ -1,11 +1,12 @@
 Summary:	Advanced Linux download manager
 Name:		prozilla
 Version:	1.3.7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
+Patch0:		prozilla-1.3.7.4-buf.patch
 URL:		http://prozilla.genesys.ro/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .buf
 %configure
 
 %build
@@ -49,6 +51,9 @@
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Fix CAN-2005-2961 / bugzilla 169791
+
 * Fri Sep 09 2005 Ralf Corsepius <rc040203 at freenet.de>
 - %%{_bindir}/proz.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 10:08:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:08:02 -0500
Subject: rpms/prozilla/FC-4 prozilla-1.3.7.4-buf.patch, NONE,
	1.1 prozilla.spec, 1.11, 1.12
Message-ID: <200601201008.k0KA8ZsU005101@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5081

Modified Files:
	prozilla.spec 
Added Files:
	prozilla-1.3.7.4-buf.patch 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791


prozilla-1.3.7.4-buf.patch:

--- NEW FILE prozilla-1.3.7.4-buf.patch ---
--- prozilla-1.3.7.4/src/ftpsearch.c.buf	2006-01-05 11:43:08.000000000 +0100
+++ prozilla-1.3.7.4/src/ftpsearch.c	2006-01-05 11:59:49.000000000 +0100
@@ -81,9 +81,10 @@
     return (strstr(buf, "</A"));
 }
 
-char *get_string_ahref(char *buf, char *out)
+static char *get_string_ahref(char *buf, char *out, size_t out_size)
 {
     char *p1, *p2, *p3;
+    size_t to_copy;
 
     p1 = find_ahref(buf);
     assert(p1 != NULL);
@@ -93,11 +94,14 @@
 
     p3 = find_closed_a(p2);
     assert(p3 != NULL);
-
-    strncpy(out, p2 + 1, p3 - p2 - 1);
-    out[p3 - p2 - 1] = 0;
+    
+    to_copy = p3 - p2 - 1;
+    if (to_copy >= out_size)
+        to_copy = out_size - 1;
+    strncpy(out, p2 + 1, to_copy);
+    out[to_copy] = 0;
+    
     return p3;
-
 }
 
 
@@ -242,9 +246,8 @@
 
     p1 = kmalloc((j - i - 5) + 100);
     strncpy(p1, i + 5, j - i - 5);
-
-    debug_prz("\nstring len= %ld", strlen(p1));
     p1[j - i - 5 + 1] = 0;
+    debug_prz("\nstring len= %ld", strlen(p1));
 
     p2 = p1;
 
@@ -275,9 +278,9 @@
     for (k = 0; k < *num_servers; k++)
     {
 	memset(&(ftp_mirrors[k]), 0, sizeof(ftp_mirror));
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].server_name = kstrdup(buf);
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 
 	/*Strip any leading slash in the path name if preent */
 	if (*buf == '/')
@@ -285,7 +288,7 @@
 	else
 	    ftp_mirrors[k].path = kstrdup(buf);
 
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].file_name = kstrdup(buf);
     }
 


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-4/prozilla.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prozilla.spec	9 Sep 2005 11:26:08 -0000	1.11
+++ prozilla.spec	20 Jan 2006 10:08:02 -0000	1.12
@@ -1,11 +1,12 @@
 Summary:	Advanced Linux download manager
 Name:		prozilla
 Version:	1.3.7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
+Patch0:		prozilla-1.3.7.4-buf.patch
 URL:		http://prozilla.genesys.ro/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .buf
 %configure
 
 %build
@@ -49,6 +51,9 @@
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Fix CAN-2005-2961 / bugzilla 169791
+
 * Fri Sep 09 2005 Ralf Corsepius <rc040203 at freenet.de>
 - %%{_bindir}/proz.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 10:15:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:15:01 -0500
Subject: rpms/prozilla/FC-3 prozilla.spec,1.9,1.10
Message-ID: <200601201015.k0KAFlKZ005173@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5154

Modified Files:
	prozilla.spec 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791



Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-3/prozilla.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- prozilla.spec	9 Sep 2005 11:26:13 -0000	1.9
+++ prozilla.spec	20 Jan 2006 10:15:01 -0000	1.10
@@ -1,11 +1,12 @@
 Summary:	Advanced Linux download manager
 Name:		prozilla
 Version:	1.3.7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
+Patch0:		prozilla-1.3.7.4-buf.patch
 URL:		http://prozilla.genesys.ro/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .buf
 %configure
 
 %build
@@ -49,6 +51,9 @@
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Fix CAN-2005-2961 / bugzilla 169791
+
 * Fri Sep 09 2005 Ralf Corsepius <rc040203 at freenet.de>
 - %%{_bindir}/proz.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 10:16:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:16:53 -0500
Subject: rpms/prozilla/FC-3 prozilla-1.3.7.4-buf.patch,NONE,1.1
Message-ID: <200601201016.k0KAGtFf005204@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5192

Added Files:
	prozilla-1.3.7.4-buf.patch 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791


prozilla-1.3.7.4-buf.patch:

--- NEW FILE prozilla-1.3.7.4-buf.patch ---
--- prozilla-1.3.7.4/src/ftpsearch.c.buf	2006-01-05 11:43:08.000000000 +0100
+++ prozilla-1.3.7.4/src/ftpsearch.c	2006-01-05 11:59:49.000000000 +0100
@@ -81,9 +81,10 @@
     return (strstr(buf, "</A"));
 }
 
-char *get_string_ahref(char *buf, char *out)
+static char *get_string_ahref(char *buf, char *out, size_t out_size)
 {
     char *p1, *p2, *p3;
+    size_t to_copy;
 
     p1 = find_ahref(buf);
     assert(p1 != NULL);
@@ -93,11 +94,14 @@
 
     p3 = find_closed_a(p2);
     assert(p3 != NULL);
-
-    strncpy(out, p2 + 1, p3 - p2 - 1);
-    out[p3 - p2 - 1] = 0;
+    
+    to_copy = p3 - p2 - 1;
+    if (to_copy >= out_size)
+        to_copy = out_size - 1;
+    strncpy(out, p2 + 1, to_copy);
+    out[to_copy] = 0;
+    
     return p3;
-
 }
 
 
@@ -242,9 +246,8 @@
 
     p1 = kmalloc((j - i - 5) + 100);
     strncpy(p1, i + 5, j - i - 5);
-
-    debug_prz("\nstring len= %ld", strlen(p1));
     p1[j - i - 5 + 1] = 0;
+    debug_prz("\nstring len= %ld", strlen(p1));
 
     p2 = p1;
 
@@ -275,9 +278,9 @@
     for (k = 0; k < *num_servers; k++)
     {
 	memset(&(ftp_mirrors[k]), 0, sizeof(ftp_mirror));
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].server_name = kstrdup(buf);
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 
 	/*Strip any leading slash in the path name if preent */
 	if (*buf == '/')
@@ -285,7 +288,7 @@
 	else
 	    ftp_mirrors[k].path = kstrdup(buf);
 
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].file_name = kstrdup(buf);
     }
 



From fedora-extras-commits at redhat.com  Fri Jan 20 15:37:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 10:37:52 -0500
Subject: rpms/lyx/devel helpers.conf, NONE, 1.1 helpers.sh, NONE,
	1.1 lyx-1.3.7-helpers.patch, NONE, 1.1 lyx-1.3.7-noxfonts.patch,
	NONE, 1.1 lyx-qt.desktop, NONE, 1.1 lyx-xforms.desktop, NONE,
	1.1 lyx.conf, NONE, 1.1 lyx.sh, NONE, 1.1 .cvsignore, 1.3,
	1.4 lyx.desktop, 1.2, 1.3 lyx.spec, 1.14, 1.15 sources, 1.4,
	1.5 find_helpers.sh, 1.1, NONE lyx-1.3.5-helpers.patch, 1.3, NONE
Message-ID: <200601201538.k0KFcPVK015024@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14983

Modified Files:
	.cvsignore lyx.desktop lyx.spec sources 
Added Files:
	helpers.conf helpers.sh lyx-1.3.7-helpers.patch 
	lyx-1.3.7-noxfonts.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.conf lyx.sh 
Removed Files:
	find_helpers.sh lyx-1.3.5-helpers.patch 
Log Message:
* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
- 1.3.7
- -qt/-xforms: frontend pkgs (#178116)



--- NEW FILE helpers.conf ---

ps_viewers="evince gsview32 gsview ggv kghostview gv ghostview"


***** Error reading new file: [Errno 2] No such file or directory: 'helpers.sh'
lyx-1.3.7-helpers.patch:

--- NEW FILE lyx-1.3.7-helpers.patch ---
--- lyx-1.3.7/lib/configure.m4.helpers	2006-01-11 10:32:15.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 11:55:31.000000000 -0600
@@ -269,7 +269,7 @@
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,evince gsview32 gsview ggv kghostview gv ghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
   *) PS_VIEWER="$GHOSTVIEW";;
@@ -277,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)
 
 # Search something to preview dvi
 SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
--- lyx-1.3.7/lib/configure.helpers	2006-01-16 08:51:48.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:00:54.000000000 -0600
@@ -478,9 +478,9 @@
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview kghostview)"
+echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)"
 GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview kghostview
+for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -519,9 +519,9 @@
 
 # Search for a program to preview pdf
 echo $ac_n "checking for a PDF previewer""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)"
+echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)"
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -591,9 +591,9 @@
 
 # Search something to preview html
 echo $ac_n "checking for an HTML previewer""... $ac_c"
-echo "$ac_t""("mozilla file://\$\$p\$\$i" netscape)"
+echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)"
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" 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

lyx-1.3.7-noxfonts.patch:

--- NEW FILE lyx-1.3.7-noxfonts.patch ---
--- lyx-1.3.7/lib/configure.noxfonts	2006-01-17 12:00:54.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:14:49.000000000 -0600
@@ -1610,6 +1610,8 @@
 EOF
 fi
 
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then 
 ######## X FONTS
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
@@ -1643,6 +1645,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib
--- lyx-1.3.7/lib/configure.m4.noxfonts	2006-01-17 11:55:31.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 12:14:31.000000000 -0600
@@ -676,7 +676,9 @@
 EOF
 fi
 
-######## X FONTS
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then
+######## X FONTS 
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
 
@@ -709,6 +711,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib


--- NEW FILE lyx-qt.desktop ---
[Desktop Entry]
Name=LyX-qt
GenericName=WYSIWYM document processor
Comment=Lyx using Qt frontend
Exec=lyx-qt
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx-xforms.desktop ---
[Desktop Entry]
Name=LyX-xforms
GenericName=WYSIWYM document processor
Comment=Lyx using XForms frontend
Exec=lyx-xforms
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx.conf ---
LYX_FRONTEND=lyx-qt


--- NEW FILE lyx.sh ---
#!/bin/bash

if [ -f /etc/lyx/lyx.conf ]; then
 source /etc/lyx/lyx.conf
fi

if [ -f ${HOME}/.lyx/lyx.conf ]; then
 source ${HOME}/.lyx/lyx.conf
fi

if [ -z "${LYX_FRONTEND}" ]; then
  LYX_FRONTEND=qt
fi

# Try LYX_FRONTEND
which lyx-${LYX_FRONTEND} >& /dev/null && \
  exec lyx-${LYX_FRONTEND} ${1+"$@"}

# Fall back to trying lyx-qt, lyx-xforms
for frontend in qt xforms ; do
  which lyx-$frontend >& /dev/null && exec lyx-$frontend ${1+"$@"} ||:
done

# ERROR should not reach this point
exit 1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Aug 2005 17:51:33 -0000	1.3
+++ .cvsignore	20 Jan 2006 15:37:52 -0000	1.4
@@ -1 +1 @@
-lyx-1.3.6.tar.gz
+lyx-1.3.7.tar.bz2


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lyx.desktop	4 Dec 2004 12:21:23 -0000	1.2
+++ lyx.desktop	20 Jan 2006 15:37:52 -0000	1.3
@@ -3,7 +3,7 @@
 GenericName=WYSIWYM document processor
 Comment=WYSIWYM document processor
 Exec=lyx
-Icon=lyx.png
+Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lyx.spec	2 Sep 2005 12:16:21 -0000	1.14
+++ lyx.spec	20 Jan 2006 15:37:52 -0000	1.15
@@ -1,32 +1,41 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.3.6
-Release: 4%{?dist}%{?kde}
+Version: 1.3.7 
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz
+Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.3.5-helpers.patch
+Patch1: lyx-1.3.7-helpers.patch
+Patch2: lyx-1.3.7-noxfonts.patch
+
+# app-wrapper for various frontends
+Source10: lyx.sh
+
+Source20: lyx.desktop
+Source21: lyx-qt.desktop
+Source22: lyx-xforms.desktop
 
-Source1: lyx.desktop
 # "borrow" kde's crystal icon for lyx
-Source2: lyx-crystal.png
+Source30: lyx-crystal.png
 
 # TODO: use this find_helpers.sh script at runtime, instead of depending on
 # lyx's configure and %%triggers
-Source10: find_helpers.sh
+#Source100: helpers.sh
+
+# Front-ends
+BuildRequires: qt-devel
+BuildRequires: xforms-devel libjpeg-devel
 
 BuildRequires: desktop-file-utils
 BuildRequires: aiksaurus-devel
 BuildRequires: aspell-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-#BuildRequires: /usr/X11R6/bin/makepsres
-BuildRequires: xorg-x11
 
 # For texhash
 Requires(post): tetex-fonts
@@ -37,13 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
-
-BuildRequires: qt-devel >= 1:3.3
-%if "%{?kde}" != "%{nil}"
-# kde-redhat crud, not needed in Fedora Extras
-%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )}
-Requires: qt >= 1:%{qt_ver}
-%endif
+Requires: %{name}-frontend = %{version}
 
 
 %description
@@ -64,29 +67,65 @@
 and let the computer take care of the rest.
 
 
+%package qt 
+Summary: Lyx graphical frontend using Qt
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description qt
+%{summary}.
+
+%package xforms
+Summary: Lyx graphical frontend using XForms
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description xforms
+%{summary}.
+
+
 %prep
 
 %setup -q
 
 %patch1 -p1 -b .helpers
+%patch2 -p1 -b .noxfonts
+
+# ./autogen.sh
 
 
 %build
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 
 unset LINGUAS ||:
 
+# QT
+test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
-
 %configure \
   --with-frontend=qt \
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-pspell \
-  --disable-dependency-tracking
+  --without-warnings --disable-debug --disable-dependency-tracking
+
+make %{?_smp_mflags} && \
+ cp -a src/lyx lyx-qt
 
-make %{?_smp_mflags}
+# Intermediate cleanup 
+# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
+make -C src/frontends clean
+
+# XFORMS
+%configure \
+  --with-frontend=xforms \
+  --enable-optimization="$RPM_OPT_FLAGS" \
+  --with-aiksaurus \
+  --with-pspell \
+  --without-warnings --disable-debug --disable-dependency-tracking
+
+make %{?_smp_mflags} && \
+cp -a src/lyx lyx-xforms
 
 
 %install
@@ -94,38 +133,42 @@
 
 unset LINGUAS ||:
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Handle front-ends
+install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
+install -p -m0755 -D lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
+
 
-#
 # Set up the lyx-specific class files where TeX can see them
-#
 texmf=%{_datadir}/texmf
-mkdir -p ${RPM_BUILD_ROOT}${texmf}/tex/latex
-mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
-   ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx
-
-# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
+mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex
+mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
+   $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
+
+# KDE already has a nice builtin crystalsvg icon, 
+# but this is for gnome's benefit (gtk2 < 2.6)
+install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category "X-Fedora" \
-   %{SOURCE1}
+   %{SOURCE21} %{SOURCE22}
 
 %find_lang %{name} || touch %{name}.lang
 
-touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
+#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
 
 
 %post
-# Make TeX understand where LyX-specific packages are
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
-# Now configure LyX
 cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
 
 %postun
-# Fix the TeX file hash
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
 
 # Catch installed/uninstalled helpers
@@ -145,22 +188,39 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%{_datadir}/applications/*.desktop
+%{_bindir}/lyx
+%{_bindir}/noweb2lyx
+%{_bindir}/reLyX
+#{_datadir}/applications/*-lyx.desktop
 %{_datadir}/pixmaps/*
-%{_bindir}/*
 %{_mandir}/man?/*
-%{_datadir}/%{name}
-%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst
-%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults
-%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.*
-%{_datadir}/texmf/tex/latex/%{name}
+%{_datadir}/lyx/
+%{_datadir}/texmf/tex/latex/lyx/
+%verify(not md5 size mtime) %{_datadir}/lyx/*.lst
+%verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults
+%verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx
+
+%files qt
+%defattr(-,root,root,-)
+%{_bindir}/lyx-qt
+%{_datadir}/applications/*-lyx-qt.desktop
+
+%files xforms
+%defattr(-,root,root,-)
+%{_bindir}/lyx-xforms
+%{_datadir}/applications/*-lyx-xforms.desktop
+
+
+%changelog
+* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
+- 1.3.7
+- -qt/-xforms: frontend pkgs (#178116)
 
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
+- %%post/%%postun: update-desktop-database
 
-%changelog 
 * Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
 - leave out kde-redhat bits in Fedora Extras build
 - define/use safer (esp for x86_64) QTDIR bits


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2005 17:51:33 -0000	1.4
+++ sources	20 Jan 2006 15:37:52 -0000	1.5
@@ -1 +1 @@
-20fd8515cc025129d97232dd2583f35f  lyx-1.3.6.tar.gz
+cef9a2fca128c32ffa04c214d02cde04  lyx-1.3.7.tar.bz2


--- find_helpers.sh DELETED ---


--- lyx-1.3.5-helpers.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 20 16:05:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 11:05:51 -0500
Subject: rpms/xforms/devel xforms.spec,1.14,1.15
Message-ID: <200601201606.k0KG6Osu016935@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	xforms.spec 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-6
- -devel: Req: libjpeg-devel(flimage), libXpm-devel



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xforms.spec	2 Jan 2006 21:40:01 -0000	1.14
+++ xforms.spec	20 Jan 2006 16:05:50 -0000	1.15
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -18,7 +18,7 @@
 BuildRequires: libGL-devel
 %if "%{?fedora}" > "4"
 BuildRequires: libXpm-devel
-%define x_deps libX11-devel
+%define x_deps libX11-devel libXpm-devel
 %endif
 
 # import/export: png, sgi (optional?)
@@ -41,6 +41,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
+Requires: libjpeg-devel
 %description devel
 %{summary}.
 
@@ -94,6 +95,9 @@
 
 
 %changelog 
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-6
+- -devel: Req: libjpeg-devel(flimage), libXpm-devel
+
 * Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
 - prelink.patch: fix undefined symbols in (shared) lib(s)
 



From fedora-extras-commits at redhat.com  Fri Jan 20 16:08:06 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 20 Jan 2006 11:08:06 -0500
Subject: owners owners.list,1.554,1.555
Message-ID: <200601201608.k0KG8dxT017044@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16993

Modified Files:
	owners.list 
Log Message:
Add azureus.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- owners.list	20 Jan 2006 00:20:34 -0000	1.554
+++ owners.list	20 Jan 2006 16:08:05 -0000	1.555
@@ -55,6 +55,7 @@
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 16:08:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 11:08:32 -0500
Subject: rpms/lyx/devel lyx.spec,1.15,1.16
Message-ID: <200601201609.k0KG95w6017055@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17032

Modified Files:
	lyx.spec 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
- BR: libXpm-devel



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lyx.spec	20 Jan 2006 15:37:52 -0000	1.15
+++ lyx.spec	20 Jan 2006 16:08:32 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.7 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -27,9 +27,14 @@
 # lyx's configure and %%triggers
 #Source100: helpers.sh
 
-# Front-ends
+# qt frontend
 BuildRequires: qt-devel
-BuildRequires: xforms-devel libjpeg-devel
+# xforms frontend
+BuildRequires: xforms-devel
+BuildRequires: libjpeg-devel
+%if "{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%endif
 
 BuildRequires: desktop-file-utils
 BuildRequires: aiksaurus-devel
@@ -214,6 +219,9 @@
 
 
 %changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
+- BR: libXpm-devel
+
 * Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
 - 1.3.7
 - -qt/-xforms: frontend pkgs (#178116)



From fedora-extras-commits at redhat.com  Fri Jan 20 16:39:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 20 Jan 2006 11:39:54 -0500
Subject: rpms/kdesvn/devel .cvsignore, 1.4, 1.5 kdesvn.spec, 1.9,
	1.10 sources, 1.4, 1.5 kdesvn-0.7.1-gcc41.patch, 1.1, NONE
Message-ID: <200601201640.k0KGeRUW017253@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17228

Modified Files:
	.cvsignore kdesvn.spec sources 
Removed Files:
	kdesvn-0.7.1-gcc41.patch 
Log Message:
- Update to 0.7.2
- Remove gcc41 patch fixed upstream
- Remove apr-1-config and apu-1-config args - fixed upstream
- Drop srcver - bad idea



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Dec 2005 16:37:28 -0000	1.4
+++ .cvsignore	20 Jan 2006 16:39:54 -0000	1.5
@@ -1 +1 @@
-kdesvn-0.7.1.tar.gz
+kdesvn-0.7.2.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdesvn.spec	19 Dec 2005 16:16:00 -0000	1.9
+++ kdesvn.spec	20 Jan 2006 16:39:54 -0000	1.10
@@ -1,16 +1,13 @@
-%define srcver  0.7.1
-
 Name:           kdesvn
-Version:        0.7.1
-Release:        3%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
-Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
+Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.gz
 Patch0:         kdesvn-0.7.1-x.patch
-Patch1:         kdesvn-0.7.1-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -31,16 +28,14 @@
 
 
 %prep
-%setup -q -n %{name}-%{srcver}
+%setup -q
 %patch -p1 -b .x11
-%patch1 -p1 -b .gcc41
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath --with-svn-lib=%{_libdir} \
-           --with-apr-config=apr-1-config --with-apu-config=apu-1-config
+%configure --disable-rpath --with-svn-lib=%{_libdir}
 make %{?_smp_mflags}
 
 
@@ -102,6 +97,12 @@
 
 
 %changelog
+* Fri Jan 20 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
+- Update to 0.7.2
+- Remove gcc41 patch fixed upstream
+- Remove apr-1-config and apu-1-config args - fixed upstream
+- Drop srcver - bad idea
+
 * Fri Dec 16 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-3
 - Add missing files not detected by mock
 - Add patch to fix gcc41 compile error


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Dec 2005 16:37:28 -0000	1.4
+++ sources	20 Jan 2006 16:39:54 -0000	1.5
@@ -1 +1 @@
-46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz
+7ebc3e786bab67f23826df99a1828b08  kdesvn-0.7.2.tar.gz


--- kdesvn-0.7.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 20 16:42:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 20 Jan 2006 11:42:54 -0500
Subject: rpms/kdesvn/FC-4 .cvsignore, 1.3, 1.4 kdesvn.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200601201643.k0KGhQC4017326@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17303

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
New upstream version 0.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Dec 2005 16:22:28 -0000	1.3
+++ .cvsignore	20 Jan 2006 16:42:54 -0000	1.4
@@ -1 +1 @@
-kdesvn-0.7.1.tar.gz
+kdesvn-0.7.2.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdesvn.spec	16 Dec 2005 18:42:17 -0000	1.4
+++ kdesvn.spec	20 Jan 2006 16:42:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kdesvn
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Fri Jan 20 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
+- New upstream version 0.7.2
+
 * Fri Dec 16 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-2
 - Add missing files not detected by mock
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Dec 2005 16:22:28 -0000	1.3
+++ sources	20 Jan 2006 16:42:54 -0000	1.4
@@ -1 +1 @@
-46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz
+7ebc3e786bab67f23826df99a1828b08  kdesvn-0.7.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 16:43:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 20 Jan 2006 11:43:57 -0500
Subject: rpms/kdesvn/FC-4 kdesvn.spec,1.5,1.6
Message-ID: <200601201644.k0KGiTXB017370@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17353

Modified Files:
	kdesvn.spec 
Log Message:
Gah - 2006!



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdesvn.spec	20 Jan 2006 16:42:54 -0000	1.5
+++ kdesvn.spec	20 Jan 2006 16:43:57 -0000	1.6
@@ -95,7 +95,7 @@
 
 
 %changelog
-* Fri Jan 20 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
+* Fri Jan 20 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
 - New upstream version 0.7.2
 
 * Fri Dec 16 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-2



From fedora-extras-commits at redhat.com  Fri Jan 20 17:51:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 12:51:39 -0500
Subject: rpms/lyx/FC-4 helpers.conf, NONE, 1.1 helpers.sh, NONE,
	1.1 lyx-qt.desktop, NONE, 1.1 lyx-xforms.desktop, NONE,
	1.1 lyx.conf, NONE, 1.1 lyx.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 lyx.desktop, 1.2, 1.3 lyx.spec, 1.13, 1.14 sources, 1.4,
	1.5 find_helpers.sh, 1.1, NONE lyx-1.3.5-helpers.patch, 1.3, NONE
Message-ID: <200601201752.k0KHqCeZ019339@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19308

Modified Files:
	.cvsignore lyx.desktop lyx.spec sources 
Added Files:
	helpers.conf helpers.sh lyx-qt.desktop lyx-xforms.desktop 
	lyx.conf lyx.sh 
Removed Files:
	find_helpers.sh lyx-1.3.5-helpers.patch 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
- cleanup/fix snarfing of intermediate frontend builds.

* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
- BR: libXpm-devel

* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
- 1.3.7
- -qt/-xforms: frontend pkgs (#178116)

* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
- %%post/%%postun: update-desktop-database




--- NEW FILE helpers.conf ---

ps_viewers="evince gsview32 gsview ggv kghostview gv ghostview"


***** Error reading new file: [Errno 2] No such file or directory: 'helpers.sh'

--- NEW FILE lyx-qt.desktop ---
[Desktop Entry]
Name=LyX-qt
GenericName=WYSIWYM document processor
Comment=Lyx using Qt frontend
Exec=lyx-qt
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx-xforms.desktop ---
[Desktop Entry]
Name=LyX-xforms
GenericName=WYSIWYM document processor
Comment=Lyx using XForms frontend
Exec=lyx-xforms
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx.conf ---
LYX_FRONTEND=lyx-qt


--- NEW FILE lyx.sh ---
#!/bin/bash

if [ -f /etc/lyx/lyx.conf ]; then
 source /etc/lyx/lyx.conf
fi

if [ -f ${HOME}/.lyx/lyx.conf ]; then
 source ${HOME}/.lyx/lyx.conf
fi

if [ -z "${LYX_FRONTEND}" ]; then
  LYX_FRONTEND=qt
fi

# Try LYX_FRONTEND
which lyx-${LYX_FRONTEND} >& /dev/null && \
  exec lyx-${LYX_FRONTEND} ${1+"$@"}

# Fall back to trying lyx-qt, lyx-xforms
for frontend in qt xforms ; do
  which lyx-$frontend >& /dev/null && exec lyx-$frontend ${1+"$@"} ||:
done

# ERROR should not reach this point
exit 1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:01 -0000	1.2
+++ .cvsignore	20 Jan 2006 17:51:39 -0000	1.3
@@ -1 +1 @@
-lyx-1.3.4.tar.bz2
+lyx-1.3.7.tar.bz2


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lyx.desktop	4 Dec 2004 12:21:23 -0000	1.2
+++ lyx.desktop	20 Jan 2006 17:51:39 -0000	1.3
@@ -3,7 +3,7 @@
 GenericName=WYSIWYM document processor
 Comment=WYSIWYM document processor
 Exec=lyx
-Icon=lyx.png
+Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lyx.spec	2 Sep 2005 12:16:20 -0000	1.13
+++ lyx.spec	20 Jan 2006 17:51:39 -0000	1.14
@@ -1,32 +1,46 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.3.6
-Release: 4%{?dist}%{?kde}
+Version: 1.3.7 
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz
+Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.3.5-helpers.patch
+Patch1: lyx-1.3.7-helpers.patch
+Patch2: lyx-1.3.7-noxfonts.patch
+
+# app-wrapper for various frontends
+Source10: lyx.sh
+
+Source20: lyx.desktop
+Source21: lyx-qt.desktop
+Source22: lyx-xforms.desktop
 
-Source1: lyx.desktop
 # "borrow" kde's crystal icon for lyx
-Source2: lyx-crystal.png
+Source30: lyx-crystal.png
 
 # TODO: use this find_helpers.sh script at runtime, instead of depending on
 # lyx's configure and %%triggers
-Source10: find_helpers.sh
+#Source100: helpers.sh
+
+# qt frontend
+BuildRequires: qt-devel
+# xforms frontend
+BuildRequires: xforms-devel
+BuildRequires: libjpeg-devel
+%if "{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%endif
 
 BuildRequires: desktop-file-utils
 BuildRequires: aiksaurus-devel
 BuildRequires: aspell-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-#BuildRequires: /usr/X11R6/bin/makepsres
-BuildRequires: xorg-x11
 
 # For texhash
 Requires(post): tetex-fonts
@@ -37,13 +51,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
-
-BuildRequires: qt-devel >= 1:3.3
-%if "%{?kde}" != "%{nil}"
-# kde-redhat crud, not needed in Fedora Extras
-%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )}
-Requires: qt >= 1:%{qt_ver}
-%endif
+Requires: %{name}-frontend = %{version}
 
 
 %description
@@ -64,29 +72,65 @@
 and let the computer take care of the rest.
 
 
+%package qt 
+Summary: Lyx graphical frontend using Qt
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description qt
+%{summary}.
+
+%package xforms
+Summary: Lyx graphical frontend using XForms
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description xforms
+%{summary}.
+
+
 %prep
 
 %setup -q
 
 %patch1 -p1 -b .helpers
+%patch2 -p1 -b .noxfonts
+
+# ./autogen.sh
 
 
 %build
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 
 unset LINGUAS ||:
 
+# QT
+test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
-
 %configure \
   --with-frontend=qt \
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-pspell \
-  --disable-dependency-tracking
+  --without-warnings --disable-debug --disable-dependency-tracking
+
+make %{?_smp_mflags}
+cp -a src/lyx lyx-qt
+
+# Intermediate cleanup 
+# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
+make -C src/frontends clean
+
+# XFORMS
+%configure \
+  --with-frontend=xforms \
+  --enable-optimization="$RPM_OPT_FLAGS" \
+  --with-aiksaurus \
+  --with-pspell \
+  --without-warnings --disable-debug --disable-dependency-tracking
 
 make %{?_smp_mflags}
+cp -a src/lyx lyx-xforms
 
 
 %install
@@ -94,38 +138,42 @@
 
 unset LINGUAS ||:
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Handle front-ends
+install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
+install -p -m0755 -D lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
+
 
-#
 # Set up the lyx-specific class files where TeX can see them
-#
 texmf=%{_datadir}/texmf
-mkdir -p ${RPM_BUILD_ROOT}${texmf}/tex/latex
-mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
-   ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx
-
-# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
+mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex
+mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
+   $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
+
+# KDE already has a nice builtin crystalsvg icon, 
+# but this is for gnome's benefit (gtk2 < 2.6)
+install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category "X-Fedora" \
-   %{SOURCE1}
+   %{SOURCE21} %{SOURCE22}
 
 %find_lang %{name} || touch %{name}.lang
 
-touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
+#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
 
 
 %post
-# Make TeX understand where LyX-specific packages are
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
-# Now configure LyX
 cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
 
 %postun
-# Fix the TeX file hash
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
 
 # Catch installed/uninstalled helpers
@@ -145,22 +193,45 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%{_datadir}/applications/*.desktop
+%{_bindir}/lyx
+%{_bindir}/noweb2lyx
+%{_bindir}/reLyX
+#{_datadir}/applications/*-lyx.desktop
 %{_datadir}/pixmaps/*
-%{_bindir}/*
 %{_mandir}/man?/*
-%{_datadir}/%{name}
-%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst
-%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults
-%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.*
-%{_datadir}/texmf/tex/latex/%{name}
+%{_datadir}/lyx/
+%{_datadir}/texmf/tex/latex/lyx/
+%verify(not md5 size mtime) %{_datadir}/lyx/*.lst
+%verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults
+%verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx
+
+%files qt
+%defattr(-,root,root,-)
+%{_bindir}/lyx-qt
+%{_datadir}/applications/*-lyx-qt.desktop
+
+%files xforms
+%defattr(-,root,root,-)
+%{_bindir}/lyx-xforms
+%{_datadir}/applications/*-lyx-xforms.desktop
+
+
+%changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
+- cleanup/fix snarfing of intermediate frontend builds.
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
+- BR: libXpm-devel
+
+* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
+- 1.3.7
+- -qt/-xforms: frontend pkgs (#178116)
 
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
+- %%post/%%postun: update-desktop-database
 
-%changelog 
 * Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
 - leave out kde-redhat bits in Fedora Extras build
 - define/use safer (esp for x86_64) QTDIR bits


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2005 18:39:46 -0000	1.4
+++ sources	20 Jan 2006 17:51:39 -0000	1.5
@@ -1 +1 @@
-20fd8515cc025129d97232dd2583f35f  lyx-1.3.6.tar.gz
+cef9a2fca128c32ffa04c214d02cde04  lyx-1.3.7.tar.bz2


--- find_helpers.sh DELETED ---


--- lyx-1.3.5-helpers.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 20 17:53:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 12:53:07 -0500
Subject: rpms/lyx/FC-4 lyx-1.3.7-helpers.patch, NONE,
	1.1 lyx-1.3.7-noxfonts.patch, NONE, 1.1 lyx.spec, 1.14, 1.15
Message-ID: <200601201753.k0KHrduG019407@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19384

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch 
Log Message:
include 1.3.7 patches


lyx-1.3.7-helpers.patch:

--- NEW FILE lyx-1.3.7-helpers.patch ---
--- lyx-1.3.7/lib/configure.m4.helpers	2006-01-11 10:32:15.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 11:55:31.000000000 -0600
@@ -269,7 +269,7 @@
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,evince gsview32 gsview ggv kghostview gv ghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
   *) PS_VIEWER="$GHOSTVIEW";;
@@ -277,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)
 
 # Search something to preview dvi
 SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
--- lyx-1.3.7/lib/configure.helpers	2006-01-16 08:51:48.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:00:54.000000000 -0600
@@ -478,9 +478,9 @@
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview kghostview)"
+echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)"
 GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview kghostview
+for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -519,9 +519,9 @@
 
 # Search for a program to preview pdf
 echo $ac_n "checking for a PDF previewer""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)"
+echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)"
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -591,9 +591,9 @@
 
 # Search something to preview html
 echo $ac_n "checking for an HTML previewer""... $ac_c"
-echo "$ac_t""("mozilla file://\$\$p\$\$i" netscape)"
+echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)"
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" 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

lyx-1.3.7-noxfonts.patch:

--- NEW FILE lyx-1.3.7-noxfonts.patch ---
--- lyx-1.3.7/lib/configure.noxfonts	2006-01-17 12:00:54.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:14:49.000000000 -0600
@@ -1610,6 +1610,8 @@
 EOF
 fi
 
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then 
 ######## X FONTS
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
@@ -1643,6 +1645,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib
--- lyx-1.3.7/lib/configure.m4.noxfonts	2006-01-17 11:55:31.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 12:14:31.000000000 -0600
@@ -676,7 +676,9 @@
 EOF
 fi
 
-######## X FONTS
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then
+######## X FONTS 
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
 
@@ -709,6 +711,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lyx.spec	20 Jan 2006 17:51:39 -0000	1.14
+++ lyx.spec	20 Jan 2006 17:53:07 -0000	1.15
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.7 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -219,7 +219,7 @@
 
 
 %changelog
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
 - cleanup/fix snarfing of intermediate frontend builds.
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2



From fedora-extras-commits at redhat.com  Fri Jan 20 18:29:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 13:29:55 -0500
Subject: rpms/tidy/devel tidy.spec,1.13,1.14
Message-ID: <200601201830.k0KIUSJ5021293@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/tidy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21269

Modified Files:
	tidy.spec 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-9.20051025
- libtidy returns to be multilib friendly



Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tidy.spec	28 Oct 2005 12:05:40 -0000	1.13
+++ tidy.spec	20 Jan 2006 18:29:55 -0000	1.14
@@ -1,8 +1,10 @@
 
+%define libname libtidy
+
 Name:    tidy
 Summary: Utility to clean up and pretty print HTML/XHTML/XML
 Version: 0.99.0
-Release: 8.20051025%{?dist}
+Release: 9.20051025%{?dist}
 
 Group:   Applications/Text
 License: W3C Software License
@@ -11,7 +13,7 @@
 
 Source0: http://tidy.sourceforge.net/src/tidy_src_051025.tgz
 # When next snapshot is released, to become:
-#Source0: http://tidy.sourceforge.net/src/old/tidy_src_050803.tgz
+#Source0: http://tidy.sourceforge.net/src/old/tidy_src_051025.tgz
 
 Source1: http://tidy.sourceforge.net/docs/tidy_docs_051020.tgz
 
@@ -19,9 +21,6 @@
 BuildRequires: doxygen
 BuildRequires: libxslt
 
-Obsoletes: libtidy < %{version}-%{release}
-Provides:  libtidy = %{version}-%{release}
-
 %description
 When editing HTML it's easy to make mistakes. Wouldn't it be nice if
 there was a simple way to fix these mistakes automatically and tidy up
@@ -32,13 +31,19 @@
 identify where you need to pay further attention on making your pages
 more accessible to people with disabilities.
 
-%package devel
-Summary: Development files for %{name} 
+%package -n %{libname} 
+Summary: Shared libraries for tidy
+Group:	 System Environment/Libraries
+%description -n %{libname} 
+%{summary}.
+
+%package -n %{libname}-devel
+Summary: Development files for libtidy 
 Group:   Development/Libraries
-Obsoletes: libtidy-devel < %{version}-%{release}
-Provides:  libtidy-devel = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-%description devel
+Obsoletes: tidy-devel < %{version}-%{release}
+Provides:  tidy-devel = %{version}-%{release}
+Requires: %{libname} = %{version}-%{release}
+%description -n %{libname}-devel
 %{summary}.
 
 
@@ -72,9 +77,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT 
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-install -D -p -m644 htmldoc/tidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
+install -p -m644 -D htmldoc/tidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
 
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -84,9 +89,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
 
 %files
@@ -94,9 +99,12 @@
 %doc htmldoc/*.html htmldoc/*.css htmldoc/*.gif
 %{_bindir}/*
 %{_mandir}/man1/*
+
+%files -n %{libname} 
+%defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 
-%files devel
+%files -n %{libname}-devel
 %defattr(-,root,root,-)
 %doc htmldoc/api/*
 %{_includedir}/*
@@ -104,6 +112,9 @@
 
 
 %changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-9.20051025
+- libtidy returns to be multilib friendly
+
 * Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-8.20051025
 - Update to 051025 and docs to 051020
 



From fedora-extras-commits at redhat.com  Fri Jan 20 18:43:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 13:43:46 -0500
Subject: rpms/lyx/FC-4 lyx.spec,1.15,1.16
Message-ID: <200601201844.k0KIiIeE021386@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21365

Modified Files:
	lyx.spec 
Log Message:
typo, {?fedora} -> %{?fedora}



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lyx.spec	20 Jan 2006 17:53:07 -0000	1.15
+++ lyx.spec	20 Jan 2006 18:43:46 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.7 
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -32,7 +32,7 @@
 # xforms frontend
 BuildRequires: xforms-devel
 BuildRequires: libjpeg-devel
-%if "{?fedora}" > "4"
+%if "%{?fedora}" > "4"
 BuildRequires: libXpm-devel
 %endif
 
@@ -219,7 +219,7 @@
 
 
 %changelog
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-5
 - cleanup/fix snarfing of intermediate frontend builds.
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2



From fedora-extras-commits at redhat.com  Fri Jan 20 18:57:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 20 Jan 2006 13:57:33 -0500
Subject: rpms/perl-Module-Signature/FC-4 .cvsignore, 1.4,
	1.5 perl-Module-Signature.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601201858.k0KIw5Mr021522@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482/FC-4

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
- 0.52.
- Run non-live tests during build and make live ones optional, enabled
  when building with "--with livetests".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2006 16:41:35 -0000	1.4
+++ .cvsignore	20 Jan 2006 18:57:32 -0000	1.5
@@ -1 +1 @@
-Module-Signature-0.51.tar.gz
+Module-Signature-0.52.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/perl-Module-Signature.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Module-Signature.spec	2 Jan 2006 16:41:35 -0000	1.4
+++ perl-Module-Signature.spec	20 Jan 2006 18:57:32 -0000	1.5
@@ -1,8 +1,12 @@
 # Must use expand to ensure mktemp is run only once
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
+# Yep, this is a noarch package, but this is to avoid debug*.list which
+# interfere with some of the signature tests.
+%define debug_package %{nil}
+
 Name:           perl-Module-Signature
-Version:        0.51
+Version:        0.52
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -31,6 +35,7 @@
 
 %build
 mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg
+PERL_AUTOINSTALL=--skipdeps \
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
 
@@ -45,9 +50,7 @@
 
 %check
 export GNUPGHOME=%{mytempdir}/_gnupg
-for f in debug*.list ; do test -e $f && mv $f %{mytempdir} ; done
-# make test # would require network access
-for f in %{mytempdir}/debug*.list ; do test -e $f && mv $f . ; done
+make test %{!?_with_livetests:TEST_FILES=t/1-basic.t}
 
 
 %clean
@@ -56,13 +59,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS Changes README TODO *.pub
+%doc AUTHORS Changes README *.pub
 %{_bindir}/cpansign
 %{perl_vendorlib}/Module/
 %{_mandir}/man[13]/*.[13]*
 
 
 %changelog
+* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
+- 0.52.
+- Run non-live tests during build and make live ones optional, enabled
+  when building with "--with livetests".
+
 * Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
 - 0.51.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 16:41:35 -0000	1.4
+++ sources	20 Jan 2006 18:57:32 -0000	1.5
@@ -1 +1 @@
-c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz
+4f5ce59239561f1f0c29efb1b485744b  Module-Signature-0.52.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 18:57:38 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 20 Jan 2006 13:57:38 -0500
Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.5,
	1.6 perl-Module-Signature.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200601201858.k0KIwBdP021527@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482/devel

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
- 0.52.
- Run non-live tests during build and make live ones optional, enabled
  when building with "--with livetests".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 16:41:41 -0000	1.5
+++ .cvsignore	20 Jan 2006 18:57:38 -0000	1.6
@@ -1 +1 @@
-Module-Signature-0.51.tar.gz
+Module-Signature-0.52.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Module-Signature.spec	2 Jan 2006 16:41:41 -0000	1.5
+++ perl-Module-Signature.spec	20 Jan 2006 18:57:38 -0000	1.6
@@ -1,8 +1,12 @@
 # Must use expand to ensure mktemp is run only once
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
+# Yep, this is a noarch package, but this is to avoid debug*.list which
+# interfere with some of the signature tests.
+%define debug_package %{nil}
+
 Name:           perl-Module-Signature
-Version:        0.51
+Version:        0.52
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -31,6 +35,7 @@
 
 %build
 mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg
+PERL_AUTOINSTALL=--skipdeps \
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
 
@@ -45,9 +50,7 @@
 
 %check
 export GNUPGHOME=%{mytempdir}/_gnupg
-for f in debug*.list ; do test -e $f && mv $f %{mytempdir} ; done
-# make test # would require network access
-for f in %{mytempdir}/debug*.list ; do test -e $f && mv $f . ; done
+make test %{!?_with_livetests:TEST_FILES=t/1-basic.t}
 
 
 %clean
@@ -56,13 +59,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS Changes README TODO *.pub
+%doc AUTHORS Changes README *.pub
 %{_bindir}/cpansign
 %{perl_vendorlib}/Module/
 %{_mandir}/man[13]/*.[13]*
 
 
 %changelog
+* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
+- 0.52.
+- Run non-live tests during build and make live ones optional, enabled
+  when building with "--with livetests".
+
 * Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
 - 0.51.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 16:41:41 -0000	1.5
+++ sources	20 Jan 2006 18:57:38 -0000	1.6
@@ -1 +1 @@
-c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz
+4f5ce59239561f1f0c29efb1b485744b  Module-Signature-0.52.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 19:21:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 20 Jan 2006 14:21:01 -0500
Subject: owners owners.list,1.555,1.556
Message-ID: <200601201921.k0KJLXM5023422@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23403

Modified Files:
	owners.list 
Log Message:
Sync with Wiki (and hopefully reality).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- owners.list	20 Jan 2006 16:08:05 -0000	1.555
+++ owners.list	20 Jan 2006 19:21:01 -0000	1.556
@@ -156,7 +156,7 @@
 Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|diction|Identifies diction and style errors|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org|
@@ -315,7 +315,7 @@
 Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-telnet|A fancy GNOME telnet client|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -355,7 +355,7 @@
 Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
-Fedora Extras|gtkglarea2|An OpenGL GTK widget|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
@@ -389,7 +389,7 @@
 Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|hpic|Healpix manipulation binaries and library|matt at truch.net|extras-qa at fedoraproject.org|
-Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|kuko at maarmas.com|extras-qa at fedoraproject.org|
+Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|extras-qa at fedoraproject.org|
 Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -602,7 +602,7 @@
 Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|
-Fedora Extras|manedit|GUI editor for creating man pages.|nos at utelsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -619,7 +619,7 @@
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org|
 Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
@@ -655,7 +655,7 @@
 Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|net6|A TCP protocol abstraction for library C++|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|
-Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|netgo|Networking profile manager|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org|
@@ -1006,7 +1006,7 @@
 Fedora Extras|pptp|Point-to-Point Tunneling Protocol (PPTP) Client|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|prozilla|An advanced Linux download manager|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|prozilla|An advanced Linux download manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 19:41:49 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 20 Jan 2006 14:41:49 -0500
Subject: owners owners.list,1.556,1.557
Message-ID: <200601201942.k0KJgMKu023509@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23485

Modified Files:
	owners.list 
Log Message:
tla has been orphaned for a while; Ville reminded me to fix the email address



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- owners.list	20 Jan 2006 19:21:01 -0000	1.556
+++ owners.list	20 Jan 2006 19:41:49 -0000	1.557
@@ -1238,7 +1238,7 @@
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tklib|Useful extensions for Tk|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|tla|The Low-Budget arch Revision Control System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 20:27:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 15:27:29 -0500
Subject: rpms/allegro/devel allegro.spec,1.18,1.19
Message-ID: <200601202028.k0KKS23Z025344@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25325

Modified Files:
	allegro.spec 
Log Message:
update / fix BuildRequires for modular X


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- allegro.spec	16 Dec 2005 09:29:20 -0000	1.18
+++ allegro.spec	20 Jan 2006 20:27:28 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        2
+Release:        3
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -16,7 +16,9 @@
 Patch2:         allegro-4.0.3-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
-BuildRequires:  libX11-devel, libXext-devel, libXau, libXdmcp
+BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
+BuildRequires:  libXpm-devel, libXcursor-devel, libXxf86vm-devel
+BuildRequires:  libXxf86dga-devel
 
 %description
 Allegro is a cross-platform library intended for use in computer games
@@ -45,8 +47,8 @@
 Summary(it):    Una libreria per la programmazione di videogiochi
 Summary(cz):    Knihovna pro programov??n?? her
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, libX11-devel
-Requires:       libXext-devel, libXau, libXdmcp
+Requires:       %{name} = %{version}-%{release}, xorg-x11-proto-devel
+Requires:       libX11-devel, libXcursor-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -204,6 +206,9 @@
 
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-3
+- update / fix BuildRequires for modular X
+
 * Fri Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 4.2.0-2
 - update dependencies for the new modular X
 - disable _smp_mflags to workaround build failure caused



From fedora-extras-commits at redhat.com  Fri Jan 20 21:36:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 20 Jan 2006 16:36:14 -0500
Subject: rpms/xchat-gnome/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xchat-gnome.spec, 1.11, 1.12 xchat-gnome-certificates.patch,
	1.1, NONE
Message-ID: <200601202136.k0KLalHo027324@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Removed Files:
	xchat-gnome-certificates.patch 
Log Message:
* Fri Jan 20 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-1
- Update to 0.9.
- Add BR for libnotify-devel.
- Drop certificates patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Dec 2005 21:16:11 -0000	1.6
+++ .cvsignore	20 Jan 2006 21:36:14 -0000	1.7
@@ -1 +1 @@
-xchat-gnome-0.8.tar.bz2
+xchat-gnome-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Dec 2005 21:16:11 -0000	1.6
+++ sources	20 Jan 2006 21:36:14 -0000	1.7
@@ -1 +1 @@
-048f0bb530bc2afce43aff6eb9538554  xchat-gnome-0.8.tar.bz2
+607d36afbadd35a163464b3f39c93526  xchat-gnome-0.9.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xchat-gnome.spec	30 Dec 2005 17:53:20 -0000	1.11
+++ xchat-gnome.spec	20 Jan 2006 21:36:14 -0000	1.12
@@ -1,12 +1,9 @@
-%if "%fedora" >= "5"
-    %define with_dbus 1
-%else
-    %define with_dbus 0
-%endif
+%define with_dbus 1
+%define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -14,7 +11,6 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-certificates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -31,6 +27,11 @@
 BuildRequires:	dbus-devel
 %endif
 
+# Leave as conditional until API is more stable.
+%if %{with_libnotify}
+BuildRequires:	libnotify-devel
+%endif
+
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -52,7 +53,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
-%patch1 -p0 -b .certificates
 
 
 %build
@@ -134,6 +134,11 @@
 
 
 %changelog
+* Fri Jan 20 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-1
+- Update to 0.9.
+- Add BR for libnotify-devel.
+- Drop certificates patch.
+
 * Fri Dec 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-2
 - add patch for self-signed certificate acceptance. (#174591)
 


--- xchat-gnome-certificates.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 21 01:09:27 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 20 Jan 2006 20:09:27 -0500
Subject: rpms/celestia/devel celestia.spec,1.12,1.13
Message-ID: <200601210110.k0L1A0Ae002324@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304

Modified Files:
	celestia.spec 
Log Message:
More build fixes.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- celestia.spec	19 Jan 2006 18:21:11 -0000	1.12
+++ celestia.spec	21 Jan 2006 01:09:26 -0000	1.13
@@ -17,8 +17,9 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
+BuildRequires:  libXmu-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -41,6 +42,7 @@
 
 
 %build
+export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -98,7 +100,8 @@
 
 %changelog
 * Thu Jan 05 2006 Steven Pritchard <steve at kspei.com> 1.4.0-2
-- Add BR: libXt-devel
+- Add BR: libGLU-devel, libXt-devel, libXmu-devel
+- Add -lpangox-1.0 to GTK_LIBS
 
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0



From fedora-extras-commits at redhat.com  Sat Jan 21 01:38:18 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 20 Jan 2006 20:38:18 -0500
Subject: fedora-security/audit fc4,1.131,1.132
Message-ID: <200601210138.k0L1cI5u002424@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2406

Modified Files:
	fc4 
Log Message:
Note the FC4 httpd update. (FEDORA-2006-052)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- fc4	18 Jan 2006 13:51:40 -0000	1.131
+++ fc4	21 Jan 2006 01:38:10 -0000	1.132
@@ -95,9 +95,9 @@
 CVE-2005-3389 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56)
+CVE-2005-3357 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
+CVE-2005-3352 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]
 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-3322 version (squid, not upstream) SUSE only
@@ -168,7 +168,7 @@
 CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-2974 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-2973 version (kernel, 2.6.14 at least) [since FEODRA-2005-1067]
-CVE-2005-2970 VULNERABLE (httpd) bz#171759
+CVE-2005-2970 backport (httpd) bz#171759 [since FEDORA-2006-052]
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h) [since FEDORA-2005-986]
 CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986]
 CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963]



From fedora-extras-commits at redhat.com  Sat Jan 21 05:15:10 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 21 Jan 2006 00:15:10 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.12,1.13
Message-ID: <200601210515.k0L5FhAn009868@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9851

Modified Files:
	xchat-gnome.spec 
Log Message:
* Sat Jan 21 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-2
- Add xchat_gnome_url_handler.schemas to scriptlet.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xchat-gnome.spec	20 Jan 2006 21:36:14 -0000	1.12
+++ xchat-gnome.spec	21 Jan 2006 05:15:10 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           xchat-gnome
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -81,18 +81,20 @@
 
 %pre
 if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
-    	gconftool-2 --makefile-uninstall-rule \
-      	    %{_sysconfdir}/gconf/schemas/$i >/dev/null || :
-    done
-    killall -HUP gconfd-2 || :
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+    	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+	done
+	killall -HUP gconfd-2 || :
 fi
 
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
+SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+for i in $SCHEMAS; do
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
 done
@@ -102,12 +104,13 @@
 
 %preun
 if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
-    	gconftool-2 --makefile-uninstall-rule \
-      		%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
-    done
-    killall -HUP gconfd-2 || :
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
+	done
+	killall -HUP gconfd-2 || :
 fi
 
 
@@ -134,6 +137,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-2
+- Add xchat_gnome_url_handler.schemas to scriptlet.
+
 * Fri Jan 20 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-1
 - Update to 0.9.
 - Add BR for libnotify-devel.



From fedora-extras-commits at redhat.com  Sat Jan 21 05:18:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 21 Jan 2006 00:18:23 -0500
Subject: rpms/tclhttpd/FC-3 tclhttpd.spec,1.2,1.3
Message-ID: <200601210518.k0L5Itjo009963@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9916/FC-3

Modified Files:
	tclhttpd.spec 
Log Message:
Don't attempt to create the tclhttpd user if it already exists.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd.spec	16 Jan 2006 01:48:31 -0000	1.2
+++ tclhttpd.spec	21 Jan 2006 05:18:23 -0000	1.3
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -88,7 +88,10 @@
 %pre
 # The "tclhttpd" user is used so that we don't have to run the
 # server as "root" or "nobody".
-/usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -r -d %{contentdir} tclhttpd
+user_uid=`id -u tclhttpd 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+fi
 
 %post
 /sbin/chkconfig --add tclhttpd



From fedora-extras-commits at redhat.com  Sat Jan 21 05:18:29 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 21 Jan 2006 00:18:29 -0500
Subject: rpms/tclhttpd/FC-4 tclhttpd.spec,1.2,1.3
Message-ID: <200601210519.k0L5J12c009966@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9916/FC-4

Modified Files:
	tclhttpd.spec 
Log Message:
Don't attempt to create the tclhttpd user if it already exists.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd.spec	16 Jan 2006 01:48:37 -0000	1.2
+++ tclhttpd.spec	21 Jan 2006 05:18:28 -0000	1.3
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -88,7 +88,10 @@
 %pre
 # The "tclhttpd" user is used so that we don't have to run the
 # server as "root" or "nobody".
-/usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -r -d %{contentdir} tclhttpd
+user_uid=`id -u tclhttpd 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+fi
 
 %post
 /sbin/chkconfig --add tclhttpd



From fedora-extras-commits at redhat.com  Sat Jan 21 05:18:34 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 21 Jan 2006 00:18:34 -0500
Subject: rpms/tclhttpd/devel tclhttpd.spec,1.2,1.3
Message-ID: <200601210519.k0L5J72k009969@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9916/devel

Modified Files:
	tclhttpd.spec 
Log Message:
Don't attempt to create the tclhttpd user if it already exists.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd.spec	16 Jan 2006 01:35:32 -0000	1.2
+++ tclhttpd.spec	21 Jan 2006 05:18:34 -0000	1.3
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -88,7 +88,10 @@
 %pre
 # The "tclhttpd" user is used so that we don't have to run the
 # server as "root" or "nobody".
-/usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -r -d %{contentdir} tclhttpd
+user_uid=`id -u tclhttpd 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+fi
 
 %post
 /sbin/chkconfig --add tclhttpd



From fedora-extras-commits at redhat.com  Sat Jan 21 08:08:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Jan 2006 03:08:43 -0500
Subject: rpms/allegro/devel allegro.spec,1.19,1.20
Message-ID: <200601210809.k0L89Gmd015532@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15518

Modified Files:
	allegro.spec 
Log Message:
Add bz ticket nr to changelog


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- allegro.spec	20 Jan 2006 20:27:28 -0000	1.19
+++ allegro.spec	21 Jan 2006 08:08:41 -0000	1.20
@@ -207,7 +207,7 @@
 
 %changelog
 * Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-3
-- update / fix BuildRequires for modular X
+- update / fix BuildRequires for modular X (bz 178245)
 
 * Fri Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 4.2.0-2
 - update dependencies for the new modular X



From fedora-extras-commits at redhat.com  Sat Jan 21 08:13:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Jan 2006 03:13:21 -0500
Subject: rpms/gnumeric/devel gnumeric.spec,1.13,1.14
Message-ID: <200601210813.k0L8DsIQ015597@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15580

Modified Files:
	gnumeric.spec 
Log Message:
* Sat Jan 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-3
- Cleanup Requires
- Add (missing) call of gtk-update-icon-cache to %post and %postun



Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnumeric.spec	14 Dec 2005 07:59:08 -0000	1.13
+++ gnumeric.spec	21 Jan 2006 08:13:21 -0000	1.14
@@ -1,19 +1,13 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.6.1
-Release: 	2
+Release: 	3
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.2/gnumeric-%{version}.tar.bz2
 URL:		http://www.gnome.org/gnumeric/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Requires:       libgnomeui >= 2.8.2
-Requires:       libgnomeprintui22 >= 2.8.2
-Requires:       gtk2 >= 2.6.0
-Requires:  	libgnomedb >= 1.0.4
-PreReq:         desktop-file-utils >= 0.9
 BuildRequires:  desktop-file-utils >= 0.9
 BuildRequires:  libgnomeui-devel >= 2.4.0
 BuildRequires:  libgnomeprintui22-devel >= 2.8.2
@@ -102,10 +96,18 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null 2>&1
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %postun
 /sbin/ldconfig
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -132,6 +134,10 @@
 %{_datadir}/gnumeric/%{version}/idl/*.idl
 
 %changelog
+* Sat Jan 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-3
+- Cleanup Requires
+- Add (missing) call of gtk-update-icon-cache to %%post and %%postun
+
 * Thu Dec  8 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-2
 - Switch to core version of libgsf now Core has 1.13 instead of using special
   Extras libgsf113 version.



From fedora-extras-commits at redhat.com  Sat Jan 21 08:43:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Jan 2006 03:43:43 -0500
Subject: rpms/scribus/FC-4 scribus.spec,1.15,1.16
Message-ID: <200601210844.k0L8iF69015811@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15791

Modified Files:
	scribus.spec 
Log Message:
- rebuild



Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scribus.spec	19 Jan 2006 08:19:29 -0000	1.15
+++ scribus.spec	21 Jan 2006 08:43:42 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.2.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -136,8 +136,12 @@
 
 
 %changelog
+* Sat Jan 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1-2
+- rebuild (#178494)
+
 * Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.2.4.1
+1.2.4.1-1
 - version upgrade
 
 * Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2



From fedora-extras-commits at redhat.com  Sat Jan 21 12:32:26 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sat, 21 Jan 2006 07:32:26 -0500
Subject: owners owners.list,1.557,1.558
Message-ID: <200601211232.k0LCWwUb024677@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24660

Modified Files:
	owners.list 
Log Message:
Peter Lemenkov takes over fuse and fuse-sshfs; He already maintains fuse-encfs in FE and seems to be a lot more interested in it than I am.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- owners.list	20 Jan 2006 19:41:49 -0000	1.557
+++ owners.list	21 Jan 2006 12:32:25 -0000	1.558
@@ -238,9 +238,9 @@
 Fedora Extras|freeze|freeze/melt/fcat compression utilities|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org|
+Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|fuse|File System in Userspace|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 21 15:13:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 21 Jan 2006 10:13:25 -0500
Subject: rpms/lirc/devel .cvsignore, 1.9, 1.10 lirc.spec, 1.13, 1.14 sources,
	1.9, 1.10
Message-ID: <200601211514.k0LFE3XW030373@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30350

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
- 0.8.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jan 2006 19:34:32 -0000	1.9
+++ .cvsignore	21 Jan 2006 15:13:25 -0000	1.10
@@ -1 +1 @@
-lirc-0.8.0pre4.tar.bz2
+lirc-0.8.0.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lirc.spec	14 Jan 2006 19:34:32 -0000	1.13
+++ lirc.spec	21 Jan 2006 15:13:25 -0000	1.14
@@ -10,14 +10,13 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre4%{?dist}
+Release:        2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-#Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre4.tar.bz2
+Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +50,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre4
+%setup -q
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +138,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
+- 0.8.0.
+
 * Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
 - 0.8.0pre4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jan 2006 19:34:32 -0000	1.9
+++ sources	21 Jan 2006 15:13:25 -0000	1.10
@@ -1 +1 @@
-8e69494b32a14d7513499bd7d4a350d2  lirc-0.8.0pre4.tar.bz2
+0bf28bf82c7766a462f90927b6bf3af1  lirc-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 16:58:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 11:58:48 -0500
Subject: rpms/showimg/FC-4 showimg.spec,1.5,1.6
Message-ID: <200601211659.k0LGxKig002021@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1950/FC-4

Modified Files:
	showimg.spec 
Log Message:
- work around improper QT detection


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- showimg.spec	16 Jan 2006 08:27:04 -0000	1.5
+++ showimg.spec	21 Jan 2006 16:58:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -53,6 +53,7 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath \
            --disable-debug \
            --enable-libkipi \



From fedora-extras-commits at redhat.com  Sat Jan 21 16:58:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 11:58:54 -0500
Subject: rpms/showimg/devel showimg.spec,1.5,1.6
Message-ID: <200601211659.k0LGxQlT002031@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1950/devel

Modified Files:
	showimg.spec 
Log Message:
- work around improper QT detection


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- showimg.spec	16 Jan 2006 08:27:10 -0000	1.5
+++ showimg.spec	21 Jan 2006 16:58:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -53,6 +53,7 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath \
            --disable-debug \
            --enable-libkipi \



From fedora-extras-commits at redhat.com  Sat Jan 21 17:04:14 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Jan 2006 12:04:14 -0500
Subject: rpms/azureus/devel azureus.script,1.1,1.2 azureus.spec,1.3,1.4
Message-ID: <200601211704.k0LH4kp9003951@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3919

Modified Files:
	azureus.script azureus.spec 
Log Message:
Fix startup script.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus.script	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus.script	21 Jan 2006 17:04:07 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main $*
+CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus.spec	20 Jan 2006 05:22:31 -0000	1.3
+++ azureus.spec	21 Jan 2006 17:04:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -144,6 +144,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-16
+- Use "$@" instead of $* in azureus.script (thanks ivazquez).
+
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-15
 - Remove PrintTransferTypes, which is unused and not 64-bit clean.
 



From fedora-extras-commits at redhat.com  Sat Jan 21 17:16:38 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:16:38 -0500
Subject: rpms/showimg/FC-4 showimg.spec,1.6,1.7
Message-ID: <200601211717.k0LHHBfZ004138@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4099/FC-4

Modified Files:
	showimg.spec 
Log Message:
forgot to add changelog entry...


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- showimg.spec	21 Jan 2006 16:58:48 -0000	1.6
+++ showimg.spec	21 Jan 2006 17:16:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
+- fix improper QT detection
+
 * Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
 - version 0.9.5
 



From fedora-extras-commits at redhat.com  Sat Jan 21 17:16:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:16:44 -0500
Subject: rpms/showimg/devel showimg.spec,1.6,1.7
Message-ID: <200601211717.k0LHHGhM004143@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4099/devel

Modified Files:
	showimg.spec 
Log Message:
forgot to add changelog entry...


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- showimg.spec	21 Jan 2006 16:58:54 -0000	1.6
+++ showimg.spec	21 Jan 2006 17:16:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
+- fix improper QT detection
+
 * Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
 - version 0.9.5
 



From fedora-extras-commits at redhat.com  Sat Jan 21 17:26:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:26:47 -0500
Subject: rpms/grisbi/FC-4 .cvsignore, 1.5, 1.6 grisbi.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200601211727.k0LHRJbs004243@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/grisbi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4205/FC-4

Modified Files:
	.cvsignore grisbi.spec sources 
Log Message:
- version 0.5.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jun 2005 19:58:59 -0000	1.5
+++ .cvsignore	21 Jan 2006 17:26:46 -0000	1.6
@@ -1 +1 @@
-grisbi-0.5.7.tar.bz2
+grisbi-0.5.8.tar.bz2


Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-4/grisbi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grisbi.spec	11 Jun 2005 19:58:59 -0000	1.8
+++ grisbi.spec	21 Jan 2006 17:26:46 -0000	1.9
@@ -1,6 +1,6 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
-Version:	0.5.7
+Version:	0.5.8
 Release:	1%{?dist}
 Summary:	Personal finances manager
 
@@ -112,6 +112,12 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.5.8-1
+- version 0.5.8
+
+* Fri Dec 23 2005 Bill Nottingham <notting at redhat.com> 0.5.7-2
+- rebuild against new libofx
+
 * Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0.5.7-1
 - version 0.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jun 2005 19:58:59 -0000	1.5
+++ sources	21 Jan 2006 17:26:46 -0000	1.6
@@ -1 +1 @@
-571e5b08ee9477c2adec459fb4d99625  grisbi-0.5.7.tar.bz2
+6637c02bfad46ac061b9d0e91e404721  grisbi-0.5.8.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 17:26:52 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:26:52 -0500
Subject: rpms/grisbi/devel .cvsignore, 1.5, 1.6 grisbi.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200601211727.k0LHRPZL004248@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/grisbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4205/devel

Modified Files:
	.cvsignore grisbi.spec sources 
Log Message:
- version 0.5.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jun 2005 19:58:59 -0000	1.5
+++ .cvsignore	21 Jan 2006 17:26:52 -0000	1.6
@@ -1 +1 @@
-grisbi-0.5.7.tar.bz2
+grisbi-0.5.8.tar.bz2


Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grisbi.spec	24 Dec 2005 03:44:37 -0000	1.9
+++ grisbi.spec	21 Jan 2006 17:26:52 -0000	1.10
@@ -1,7 +1,7 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
-Version:	0.5.7
-Release:	2%{?dist}
+Version:	0.5.8
+Release:	1%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
@@ -112,6 +112,9 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.5.8-1
+- version 0.5.8
+
 * Fri Dec 23 2005 Bill Nottingham <notting at redhat.com> 0.5.7-2
 - rebuild against new libofx
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jun 2005 19:58:59 -0000	1.5
+++ sources	21 Jan 2006 17:26:52 -0000	1.6
@@ -1 +1 @@
-571e5b08ee9477c2adec459fb4d99625  grisbi-0.5.7.tar.bz2
+6637c02bfad46ac061b9d0e91e404721  grisbi-0.5.8.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 17:33:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 21 Jan 2006 12:33:50 -0500
Subject: extras-buildsys/utils extras-sign-move.py,1.4,1.5
Message-ID: <200601211733.k0LHXoYg004322@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4304

Modified Files:
	extras-sign-move.py 
Log Message:
Make error codes more distinguishable.


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- extras-sign-move.py	2 Nov 2005 14:37:45 -0000	1.4
+++ extras-sign-move.py	21 Jan 2006 17:33:43 -0000	1.5
@@ -156,7 +156,7 @@
 def main(dist):
     if not archdict.has_key(dist):
         print "No Distribution named %s found" % dist
-        sys.exit(1)
+        sys.exit(5)
     distdir = 'fedora-%s-extras' % dist    
     needsign = os.path.join(stagesdir, distdir)
     files = find_files(needsign)
@@ -178,7 +178,7 @@
     rpms = files['rpm'] + files['srpm'] + files['debuginfo']
     if len(rpms) == 0:
       print 'nothing to sign'
-      sys.exit(1)
+      sys.exit(4)
 
     print "Signing Packages:"
     if not DEBUG:



From fedora-extras-commits at redhat.com  Sat Jan 21 18:18:59 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 21 Jan 2006 13:18:59 -0500
Subject: extras-buildsys/utils extras-repoview.py, NONE, 1.1 extras-push, 1.1,
	1.2 extras-repobuild.py, 1.9, 1.10 extras-sign-move.py, 1.5, 1.6
Message-ID: <200601211818.k0LIIxrD006250@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6227

Modified Files:
	extras-push extras-repobuild.py extras-sign-move.py 
Added Files:
	extras-repoview.py 
Log Message:
Sync with production.


--- NEW FILE extras-repoview.py ---
#!/usr/bin/python -t
# 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 Library 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 St, Fifth Floor, Boston, MA  02110-1301  USA

import os
import sys
import shutil
import string

# get the path to where to look for the packages to be signed
# make repoview

treedir = '/rpmbuild/extras/tree/extras'
archdict = {'3':['x86_64', 'i386'], 
            'development':['ppc','x86_64','i386'],
            '4':['ppc','x86_64', 'i386']}


DEBUG = False

def debugprint(msg):
    if DEBUG:
        print msg
        

def run_and_check(cmd):
    debugprint(cmd)
    if not DEBUG:
        result = os.system(cmd)
        if result != 0:
            print >> sys.stderr, 'Error running command: %s ' % cmd
            sys.exit(result)


def do_repoview(repodir):
    print 'Generating repoview'
    cmd = '/usr/bin/repoview %s' % repodir
    run_and_check(cmd)            

    # if there's a debug subdir, make that a repo, too.
    dbg_repodir = os.path.join(repodir, 'debug')

    if os.path.exists(dbg_repodir):
        cmd = '/usr/bin/repoview %s' % dbg_repodir
        run_and_check(cmd)                    


def main(dist):
    if not archdict.has_key(dist):
        print "No Distribution named %s found" % dist
        sys.exit(1)
    
    destdir = os.path.join(treedir, dist)

    print "Making Repoview pages"

    do_repoview(os.path.join(destdir, 'SRPMS'))

    # arch repo creation
    for arch in archdict[dist]:
        repodir = os.path.join(destdir, arch)
        do_repoview(repodir)

if __name__ == '__main__':
    me = os.getcwd()
    if len(sys.argv) < 2:
        print "Usage:\nextras-repoview.py release\n\n"
        sys.exit(1)
    main(sys.argv[1])
    os.chdir(me)
    


Index: extras-push
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extras-push	17 Aug 2005 05:17:45 -0000	1.1
+++ extras-push	21 Jan 2006 18:18:51 -0000	1.2
@@ -5,5 +5,6 @@
    exit 1
 fi
 
-~/bin/extras-sign-move.py $1 && ~/bin/extras-repobuild.py $1
+~/bin/extras-sign-move.py $1 && ~/bin/extras-repobuild.py $1 && ~/bin/extras-repoview.py $1
+
 


Index: extras-repobuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- extras-repobuild.py	25 Nov 2005 17:45:22 -0000	1.9
+++ extras-repobuild.py	21 Jan 2006 18:18:51 -0000	1.10
@@ -11,7 +11,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
 import sys
@@ -70,10 +70,6 @@
         cmd = '/usr/bin/createrepo -c %s -q -x *debuginfo* %s' % (cachedir, repodir)
     
     run_and_check(cmd)            
-    
-    print 'Generating repoview'
-    cmd = '/usr/bin/repoview %s' % repodir
-    run_and_check(cmd)            
 
     # if there's a debug subdir, make that a repo, too.
     dbg_repodir = os.path.join(repodir, 'debug')
@@ -88,9 +84,6 @@
     
         cmd = '/usr/bin/createrepo -c %s -q %s' % (cachedir, dbg_repodir)
         run_and_check(cmd)            
-            
-        cmd = '/usr/bin/repoview %s' % dbg_repodir
-        run_and_check(cmd)                    
 
 
 def main(dist):
@@ -102,8 +95,7 @@
 
     print "Making Repository Metadata"
 
-    repodir = os.path.join(destdir, 'SRPMS')
-    do_repo_stuff(repodir)
+    do_repo_stuff(os.path.join(destdir, 'SRPMS'))
 
     # arch repo creation
     for arch in archdict[dist]:


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- extras-sign-move.py	21 Jan 2006 17:33:43 -0000	1.5
+++ extras-sign-move.py	21 Jan 2006 18:18:51 -0000	1.6
@@ -11,7 +11,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
 import sys
@@ -19,7 +19,6 @@
 import smtplib
 import shutil
 import string
-import tempfile
 from email.MIMEText import MIMEText
 
 
@@ -126,10 +125,7 @@
     s.connect()
     s.sendmail(mail_from, [mail_to], msg.as_string())
     s.close()
-    
-
-
-
+        
 def sign_pkgs(filelist):
     """gpg sign all the rpms"""
     numfiles = len(filelist)
@@ -166,8 +162,6 @@
       print ' %s' % os.path.basename(item)
 
     destdir = os.path.join(treedir, dist)
-    tmpdir = tempfile.mkdtemp(prefix=dist, dir='/var/tmp')
-    
     if not os.path.exists(destdir):
         for arch in archdict[dist]:
             if not DEBUG:
@@ -260,7 +254,7 @@
         if not DEBUG:
             os.unlink(file)
         
-    
+    # FIXME clean up empty dirs, too.
     
 if __name__ == '__main__':
     me = os.getcwd()



From fedora-extras-commits at redhat.com  Sat Jan 21 20:15:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:15:31 -0500
Subject: rpms/xfce4-taskmanager - New directory
Message-ID: <200601212015.k0LKFXDs010216@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10208/xfce4-taskmanager

Log Message:
Directory /cvs/extras/rpms/xfce4-taskmanager added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:15:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:15:36 -0500
Subject: rpms/xfce4-taskmanager/devel - New directory
Message-ID: <200601212015.k0LKFcT8010231@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10208/xfce4-taskmanager/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-taskmanager/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:15:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:15:58 -0500
Subject: rpms/xfce4-taskmanager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212016.k0LKG0Cl010265@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-taskmanager


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-taskmanager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:16:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:16:04 -0500
Subject: rpms/xfce4-taskmanager/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601212016.k0LKG6R4010285@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-taskmanager


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:17:06 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:17:06 -0500
Subject: rpms/xfce4-taskmanager import.log,1.1,1.2
Message-ID: <200601212017.k0LKHcBD010363@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10328

Modified Files:
	import.log 
Log Message:
auto-import xfce4-taskmanager-0.3.1-2.fc4 on branch devel from xfce4-taskmanager-0.3.1-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:15:58 -0000	1.1
+++ import.log	21 Jan 2006 20:17:06 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskmanager-0_3_1-2_fc4:HEAD:xfce4-taskmanager-0.3.1-2.fc4.src.rpm:1137874618



From fedora-extras-commits at redhat.com  Sat Jan 21 20:17:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:17:12 -0500
Subject: rpms/xfce4-taskmanager/devel xfce4-taskmanager.desktop, NONE,
	1.1 xfce4-taskmanager.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601212017.k0LKHil5010367@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10328/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-taskmanager.desktop xfce4-taskmanager.spec 
Log Message:
auto-import xfce4-taskmanager-0.3.1-2.fc4 on branch devel from xfce4-taskmanager-0.3.1-2.fc4.src.rpm


--- NEW FILE xfce4-taskmanager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Xfce 4 Taskmanager
GenericName=Taskmanager
Comment=View current processes
Comment[be]=?????????????????????? ?????????????? ??????????????
Comment[bg]=?????????????????? ???? ???????????????? ??????????????
Comment[bs]=Pregled trenutnih procesa
Comment[ca]=Visualitza els processos actuals i l'estat
Comment[cs]=Zobrazit aktu??ln?? procesy
Comment[cy]=Gweld prosesau cyfredol
Comment[da]=Vis aktive processer
Comment[de]=Momentan laufende Prozesse anzeigen
Comment[el]=?????????????? ?????????????????? ????????????????????
Comment[en_CA]=View current processes
Comment[en_GB]=View current processes
Comment[es]=Ver los procesos actuales
Comment[eu]=Ikusi uneko prozesuak
Comment[fi]=Katsele aktiivisia prosesseja
Comment[fr]=Affiche les processus en cours
Comment[gl]=Ver procesos actuais
Comment[hr]=Pregled trenutnih procesa
Comment[hu]=A jelenlegi folyamatok megtekint??se
Comment[id]=Lihat proses yang
Comment[it]=Mostra i processi correnti
Comment[li]=Tuin huijig proses
Comment[lt]=Parodo paleistus procesus
Comment[lv]=Skat??t pa??reiz??jos procesus
Comment[mk]=???????????????? ???? ???????????????????? ?????????????????? ??????????????
Comment[ms]=Lihat proses semasa
Comment[nb]=Vis aktive prosesser
Comment[nl]=Toon de huidige processen
Comment[no]=Vis aktive prosesser
Comment[pl]=Wy??wietla istniej??ce procesy
Comment[pt]=Ver processos actuais
Comment[pt_BR]=Exibe os processos atuais
Comment[ro]=Arat?? procesele curente
Comment[ru]=?????????????????? ?????? ?????????????????? ?????????????? ??????????????????
Comment[sk]=Zobrazuje aktu??lne procesy
Comment[sl]=Glej trenutne procese
Comment[sq]=Shfaq pro??eset aktual??
Comment[sr]=???????????????? ???????????????? ?????????????????? ??????????????
Comment[sr at Latn]=Pogledaj trenutno pokrenute procese
Comment[sv]=Visa aktuella processer
Comment[tr]=??al????an s??re??leri
Exec=xfce4-taskmanager
Icon=xfce4_xicon
Terminal=false
Type=Application
StartupNotify=true
X-Desktop-File-Install-Version=0.10
OnlyShowIn=XFCE;


--- NEW FILE xfce4-taskmanager.spec ---
Name:		xfce4-taskmanager
Version:	0.3.1
Release:	2%{?dist}
Summary:	Taskmanager for the Xfce desktop environment

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
Source1:	xfce4-taskmanager.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils

%description
A simple taskmanager for the Xfce desktop environment.

%prep
%setup -q
# fix permissions of a file in the debug package
%__chmod 0644 src/functions.c

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
	--add-category Application                            	\
	--add-category System                                	\
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2
- Initial Fedora Extras version.
- Add xfce4-taskmanager.desktop.
- Remove useless NEWS from %DOC.
- Clean up specfile.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc4.cw
- Updated to version 0.3.1.
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:16:03 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:17:12 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskmanager-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:16:03 -0000	1.1
+++ sources	21 Jan 2006 20:17:12 -0000	1.2
@@ -0,0 +1 @@
+f8b0370c6aa6046720b039fad932084d  xfce4-taskmanager-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 21 20:19:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:19:31 -0500
Subject: rpms/xfce4-mount-plugin - New directory
Message-ID: <200601212019.k0LKJXJg010460@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/xfce4-mount-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-mount-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:19:37 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:19:37 -0500
Subject: rpms/xfce4-mount-plugin/devel - New directory
Message-ID: <200601212019.k0LKJdHc010475@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/xfce4-mount-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-mount-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:19:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:19:55 -0500
Subject: rpms/xfce4-mount-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212019.k0LKJv6u010509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-mount-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-mount-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:20:01 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:20:01 -0500
Subject: rpms/xfce4-mount-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601212020.k0LKK3PR010529@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-mount-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:20:47 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:20:47 -0500
Subject: rpms/xfce4-mount-plugin import.log,1.1,1.2
Message-ID: <200601212021.k0LKLJSK010597@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10563

Modified Files:
	import.log 
Log Message:
auto-import xfce4-mount-plugin-0.3.2-3.fc4 on branch devel from xfce4-mount-plugin-0.3.2-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:19:55 -0000	1.1
+++ import.log	21 Jan 2006 20:20:47 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mount-plugin-0_3_2-3_fc4:HEAD:xfce4-mount-plugin-0.3.2-3.fc4.src.rpm:1137874839



From fedora-extras-commits at redhat.com  Sat Jan 21 20:20:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:20:53 -0500
Subject: rpms/xfce4-mount-plugin/devel xfce4-mount-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601212021.k0LKLPTF010601@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10563/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-mount-plugin.spec 
Log Message:
auto-import xfce4-mount-plugin-0.3.2-3.fc4 on branch devel from xfce4-mount-plugin-0.3.2-3.fc4.src.rpm


--- NEW FILE xfce4-mount-plugin.spec ---
Name:		xfce4-mount-plugin
Version:	0.3.2
Release:	3%{?dist}
Summary:	Mount/unmount utility for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
Mount and unmount filesystems from the Xfce panel.

%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 -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-1.fc4.cw
- Updated to version 0.3.2.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3-1.fc4.cw
- Updated to version 0.3.
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:20:01 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:20:52 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mount-plugin-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:20:01 -0000	1.1
+++ sources	21 Jan 2006 20:20:52 -0000	1.2
@@ -0,0 +1 @@
+ba0a96c9e3c3bb309e13851c77fd014c  xfce4-mount-plugin-0.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:28 -0500
Subject: rpms/xfce4-websearch-plugin - New directory
Message-ID: <200601212041.k0LKfUQl010782@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10774/xfce4-websearch-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-websearch-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:33 -0500
Subject: rpms/xfce4-websearch-plugin/devel - New directory
Message-ID: <200601212041.k0LKfZ12010797@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10774/xfce4-websearch-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-websearch-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:52 -0500
Subject: rpms/xfce4-websearch-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212041.k0LKfsaf010833@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10821

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-websearch-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-websearch-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:58 -0500
Subject: rpms/xfce4-websearch-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601212042.k0LKg0wQ010853@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10821/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-websearch-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:42:49 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:42:49 -0500
Subject: rpms/xfce4-websearch-plugin import.log,1.1,1.2
Message-ID: <200601212043.k0LKhMlK010921@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887

Modified Files:
	import.log 
Log Message:
auto-import xfce4-websearch-plugin-0.1.0-4.fc4 on branch devel from xfce4-websearch-plugin-0.1.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:41:52 -0000	1.1
+++ import.log	21 Jan 2006 20:42:49 -0000	1.2
@@ -0,0 +1 @@
+xfce4-websearch-plugin-0_1_0-4_fc4:HEAD:xfce4-websearch-plugin-0.1.0-4.fc4.src.rpm:1137876161



From fedora-extras-commits at redhat.com  Sat Jan 21 20:42:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:42:55 -0500
Subject: rpms/xfce4-websearch-plugin/devel xfce4-websearch-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601212043.k0LKhRld010925@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-websearch-plugin.spec 
Log Message:
auto-import xfce4-websearch-plugin-0.1.0-4.fc4 on branch devel from xfce4-websearch-plugin-0.1.0-4.fc4.src.rpm


--- NEW FILE xfce4-websearch-plugin.spec ---
Name: 		xfce4-websearch-plugin
Version: 	0.1.0
Release: 	4%{?dist}
Summary: 	Websearch plugin from the XFCE panel

Group: 		User Interface/Desktops
License:	GPL
URL: 		http://www.xfce.org/
Source0: 	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildREquires:  gettext

%description
Access searchengines from the XFCE panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-1%{?dist}%{?repo}
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:41:58 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:42:55 -0000	1.2
@@ -0,0 +1 @@
+xfce4-websearch-plugin-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:41:58 -0000	1.1
+++ sources	21 Jan 2006 20:42:55 -0000	1.2
@@ -0,0 +1 @@
+352ddd859ecd6649db34682a25012638  xfce4-websearch-plugin-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:12 -0500
Subject: rpms/xfce4-sensors-plugin - New directory
Message-ID: <200601212047.k0LKlEY2011010@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11002/xfce4-sensors-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-sensors-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:18 -0500
Subject: rpms/xfce4-sensors-plugin/devel - New directory
Message-ID: <200601212047.k0LKlKan011025@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11002/xfce4-sensors-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-sensors-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:36 -0500
Subject: rpms/xfce4-sensors-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212047.k0LKlcRs011059@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11047

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-sensors-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-sensors-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:42 -0500
Subject: rpms/xfce4-sensors-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601212047.k0LKli9S011079@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11047/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-sensors-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:48:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:48:28 -0500
Subject: rpms/xfce4-sensors-plugin import.log,1.1,1.2
Message-ID: <200601212049.k0LKn1ML011147@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113

Modified Files:
	import.log 
Log Message:
auto-import xfce4-sensors-plugin-0.7.0-2.fc4 on branch devel from xfce4-sensors-plugin-0.7.0-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:47:36 -0000	1.1
+++ import.log	21 Jan 2006 20:48:28 -0000	1.2
@@ -0,0 +1 @@
+xfce4-sensors-plugin-0_7_0-2_fc4:HEAD:xfce4-sensors-plugin-0.7.0-2.fc4.src.rpm:1137876501



From fedora-extras-commits at redhat.com  Sat Jan 21 20:48:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:48:34 -0500
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601212049.k0LKn6Kl011151@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-sensors-plugin.spec 
Log Message:
auto-import xfce4-sensors-plugin-0.7.0-2.fc4 on branch devel from xfce4-sensors-plugin-0.7.0-2.fc4.src.rpm


--- NEW FILE xfce4-sensors-plugin.spec ---
Name: 		xfce4-sensors-plugin
Version: 	0.7.0
Release: 	2%{?dist}
Summary: 	Sensors plugin for the Xfce panel

Group: 		User Interface/Desktops
License:	GPL
URL: 		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext, lm_sensors-devel >= 2.8
Requires:	lm_sensors >= 2.8

%description
This plugin displays various hardware sensor values in the Xfce panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-1
- Initial Fedora Extras version.
- Update to 0.7.0.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.6.2-1.fc4.cw
- Update to 0.6.2.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:47:42 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:48:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-sensors-plugin-0.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:47:42 -0000	1.1
+++ sources	21 Jan 2006 20:48:34 -0000	1.2
@@ -0,0 +1 @@
+10399ab7351c60e9e46e4d4375250157  xfce4-sensors-plugin-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 21:14:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 16:14:21 -0500
Subject: rpms/xfce4-xmms-plugin/FC-3 .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE branch, 1.1, NONE sources, 1.2, NONE xfce4-xmms-plugin.spec,
	1.1, NONE
Message-ID: <200601212114.k0LLEN6p013126@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13117

Removed Files:
	.cvsignore Makefile branch sources xfce4-xmms-plugin.spec 
Log Message:
remove core 3 branch, pango version to low


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- xfce4-xmms-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 21 21:32:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 16:32:15 -0500
Subject: owners owners.list,1.558,1.559
Message-ID: <200601212132.k0LLWmwo013203@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13186

Modified Files:
	owners.list 
Log Message:
add xfce4-mount-plugin, xfce4-sensors-plugin, xfce4-taskmanager & xfce4-websearch-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- owners.list	21 Jan 2006 12:32:25 -0000	1.558
+++ owners.list	21 Jan 2006 21:32:15 -0000	1.559
@@ -1323,17 +1323,21 @@
 Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-mount-plugin|Mount/unmount utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-taskmanager|Taskmanager for the Xfce desktop environment|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-websearch-plugin|Websearch plugin from the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 21 21:36:42 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sat, 21 Jan 2006 16:36:42 -0500
Subject: rpms/abiword/devel abiword.spec,1.28,1.29
Message-ID: <200601212137.k0LLbEkA013226@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13209

Modified Files:
	abiword.spec 
Log Message:
Disable the PDF plugin, as poppler doesn't ship the xpdf headers anymore




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- abiword.spec	14 Jan 2006 14:17:51 -0000	1.28
+++ abiword.spec	21 Jan 2006 21:36:41 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -65,7 +65,7 @@
 cd ../abiword-plugins
 libtoolize --copy --force
 ./nextgen.sh
-%configure --disable-gda --with-abiword=../abi
+%configure --disable-gda --disable-pdf --with-abiword=../abi
 # Remove libtool predep_objects and postdep_objects wonkiness so that
 # building without -nostdlib doesn't include them twice.  Because we
 # already link with g++, weird stuff happens if you don't let the
@@ -136,6 +136,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sat Jan 21 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-4.fc5
+- Disable the PDF plugin for now, as poppler doesn't ship the xpdf
+  headers anymore
+
 * Sat Jan 14 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-3.fc5
 - Remove redundant requires - bug 177305
 



From fedora-extras-commits at redhat.com  Sat Jan 21 22:24:09 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 17:24:09 -0500
Subject: rpms/xfce4-mount-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-mount-plugin.spec, 1.1, 1.2
Message-ID: <200601212224.k0LMOf6t015153@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15132

Modified Files:
	.cvsignore sources xfce4-mount-plugin.spec 
Log Message:
update to 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:20:52 -0000	1.2
+++ .cvsignore	21 Jan 2006 22:24:09 -0000	1.3
@@ -1 +1 @@
-xfce4-mount-plugin-0.3.2.tar.bz2
+xfce4-mount-plugin-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:20:52 -0000	1.2
+++ sources	21 Jan 2006 22:24:09 -0000	1.3
@@ -1 +1 @@
-ba0a96c9e3c3bb309e13851c77fd014c  xfce4-mount-plugin-0.3.2.tar.bz2
+94e0f1e0b5501d5a5ba7d137ca7e5be9  xfce4-mount-plugin-0.3.3.tar.bz2


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-mount-plugin.spec	21 Jan 2006 20:20:52 -0000	1.1
+++ xfce4-mount-plugin.spec	21 Jan 2006 22:24:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
-Version:	0.3.2
-Release:	3%{?dist}
+Version:	0.3.3
+Release:	1%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -36,6 +36,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
+- Updat to 0.3.3.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 02:10:04 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 21 Jan 2006 21:10:04 -0500
Subject: extras-buildsys/common Makefile,1.10,1.11
Message-ID: <200601220210.k0M2A4mT023501@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23480/common

Modified Files:
	Makefile 
Log Message:
No more lighttpd manager


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	29 Nov 2005 06:41:46 -0000	1.10
+++ Makefile	22 Jan 2006 02:08:56 -0000	1.11
@@ -20,7 +20,6 @@
 	SSLCommon.py \
 	SSLConnection.py \
 	XMLRPCServerProxy.py \
-	lighttpdManager.py \
 	daemonize.py \
 	__init__.py
 



From fedora-extras-commits at redhat.com  Sun Jan 22 02:45:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:45:07 -0500
Subject: rpms/kdocker/devel kdocker-1.3-paths.patch, NONE, 1.1 kdocker.spec, 
	1.2, 1.3 kdocker-qmake.patch, 1.1, NONE
Message-ID: <200601220245.k0M2jebm023594@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23574

Modified Files:
	kdocker.spec 
Added Files:
	kdocker-1.3-paths.patch 
Removed Files:
	kdocker-qmake.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)


kdocker-1.3-paths.patch:

--- NEW FILE kdocker-1.3-paths.patch ---
--- kdocker/kdocker.desktop.qmake	2004-11-22 10:11:49.000000000 -0600
+++ kdocker/kdocker.desktop	2006-01-21 20:39:14.000000000 -0600
@@ -4,7 +4,7 @@
 Comment=Docks any application into system tray
 Exec=kdocker
 TryExec=kdocker
-Icon=/usr/local/share/kdocker/icons/kdocker.png
+Icon=/usr/share/kdocker/icons/kdocker.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
--- kdocker/kdocker.pro.qmake	2005-04-04 22:14:58.000000000 -0500
+++ kdocker/kdocker.pro	2006-01-21 20:38:57.000000000 -0600
@@ -1,10 +1,10 @@
 TEMPLATE = app
 DEPENDPATH += i18n src
 INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
-LIBPATH += /usr/X11/lib /usr/X11R6/lib
+#LIBPATH += /usr/X11/lib /usr/X11R6/lib
 LIBS = -lX11 -lXpm -lXmu
 TARGET = kdocker
-INSTALL_PATH = /usr/local/share/kdocker
+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
 DOCS_PATH = $$INSTALL_PATH/docs
 
 # Defines
@@ -24,10 +24,10 @@
 docs.path = $$DOCS_PATH
 docs.files = README
 
-desktop.path = /usr/share/applications
+desktop.path = $$DESTDIR/usr/share/applications
 desktop.files = kdocker.desktop
 
-target.path = /usr/local/bin
+target.path = $$DESTDIR/usr/bin
 
 INSTALLS += target icons docs translations desktop
 


Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdocker.spec	1 Nov 2005 14:51:41 -0000	1.2
+++ kdocker.spec	22 Jan 2006 02:45:07 -0000	1.3
@@ -2,15 +2,15 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
 URL:	 http://kdocker.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-1.3.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdocker-qmake.patch 
+Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
@@ -40,7 +40,7 @@
 %prep
 %setup -q -n kdocker 
 
-%patch0 -p1 -b .qmake
+%patch1 -p1 -b .paths
 
 
 %build
@@ -63,7 +63,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
+  --add-category Qt \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -97,6 +97,9 @@
 
 
 %changelog 
+* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
+- .desktop: fix path to app-icon (#178531)
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-3
 - remove dup'd docs
 - %%lang'ify i18n bits


--- kdocker-qmake.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 02:49:57 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:49:57 -0500
Subject: rpms/kdocker/FC-3 kdocker-1.3-paths.patch,NONE,1.1
Message-ID: <200601220249.k0M2nxJW023708@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695/FC-3

Added Files:
	kdocker-1.3-paths.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)


kdocker-1.3-paths.patch:

--- NEW FILE kdocker-1.3-paths.patch ---
--- kdocker/kdocker.desktop.qmake	2004-11-22 10:11:49.000000000 -0600
+++ kdocker/kdocker.desktop	2006-01-21 20:39:14.000000000 -0600
@@ -4,7 +4,7 @@
 Comment=Docks any application into system tray
 Exec=kdocker
 TryExec=kdocker
-Icon=/usr/local/share/kdocker/icons/kdocker.png
+Icon=/usr/share/kdocker/icons/kdocker.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
--- kdocker/kdocker.pro.qmake	2005-04-04 22:14:58.000000000 -0500
+++ kdocker/kdocker.pro	2006-01-21 20:38:57.000000000 -0600
@@ -1,10 +1,10 @@
 TEMPLATE = app
 DEPENDPATH += i18n src
 INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
-LIBPATH += /usr/X11/lib /usr/X11R6/lib
+#LIBPATH += /usr/X11/lib /usr/X11R6/lib
 LIBS = -lX11 -lXpm -lXmu
 TARGET = kdocker
-INSTALL_PATH = /usr/local/share/kdocker
+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
 DOCS_PATH = $$INSTALL_PATH/docs
 
 # Defines
@@ -24,10 +24,10 @@
 docs.path = $$DOCS_PATH
 docs.files = README
 
-desktop.path = /usr/share/applications
+desktop.path = $$DESTDIR/usr/share/applications
 desktop.files = kdocker.desktop
 
-target.path = /usr/local/bin
+target.path = $$DESTDIR/usr/bin
 
 INSTALLS += target icons docs translations desktop
 



From fedora-extras-commits at redhat.com  Sun Jan 22 02:50:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:50:03 -0500
Subject: rpms/kdocker/FC-4 kdocker-1.3-paths.patch,NONE,1.1
Message-ID: <200601220250.k0M2o50x023726@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695/FC-4

Added Files:
	kdocker-1.3-paths.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)


kdocker-1.3-paths.patch:

--- NEW FILE kdocker-1.3-paths.patch ---
--- kdocker/kdocker.desktop.qmake	2004-11-22 10:11:49.000000000 -0600
+++ kdocker/kdocker.desktop	2006-01-21 20:39:14.000000000 -0600
@@ -4,7 +4,7 @@
 Comment=Docks any application into system tray
 Exec=kdocker
 TryExec=kdocker
-Icon=/usr/local/share/kdocker/icons/kdocker.png
+Icon=/usr/share/kdocker/icons/kdocker.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
--- kdocker/kdocker.pro.qmake	2005-04-04 22:14:58.000000000 -0500
+++ kdocker/kdocker.pro	2006-01-21 20:38:57.000000000 -0600
@@ -1,10 +1,10 @@
 TEMPLATE = app
 DEPENDPATH += i18n src
 INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
-LIBPATH += /usr/X11/lib /usr/X11R6/lib
+#LIBPATH += /usr/X11/lib /usr/X11R6/lib
 LIBS = -lX11 -lXpm -lXmu
 TARGET = kdocker
-INSTALL_PATH = /usr/local/share/kdocker
+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
 DOCS_PATH = $$INSTALL_PATH/docs
 
 # Defines
@@ -24,10 +24,10 @@
 docs.path = $$DOCS_PATH
 docs.files = README
 
-desktop.path = /usr/share/applications
+desktop.path = $$DESTDIR/usr/share/applications
 desktop.files = kdocker.desktop
 
-target.path = /usr/local/bin
+target.path = $$DESTDIR/usr/bin
 
 INSTALLS += target icons docs translations desktop
 



From fedora-extras-commits at redhat.com  Sun Jan 22 02:49:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:49:27 -0500
Subject: rpms/kdocker/FC-3 kdocker.spec, 1.2, 1.3 kdocker-qmake.patch, 1.1,
	NONE
Message-ID: <200601220250.k0M2oTYf023793@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23650/FC-3

Modified Files:
	kdocker.spec 
Removed Files:
	kdocker-qmake.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-3/kdocker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdocker.spec	1 Nov 2005 14:51:41 -0000	1.2
+++ kdocker.spec	22 Jan 2006 02:49:26 -0000	1.3
@@ -2,15 +2,15 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
 URL:	 http://kdocker.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-1.3.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdocker-qmake.patch 
+Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
@@ -40,7 +40,7 @@
 %prep
 %setup -q -n kdocker 
 
-%patch0 -p1 -b .qmake
+%patch1 -p1 -b .paths
 
 
 %build
@@ -63,7 +63,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
+  --add-category Qt \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -97,6 +97,9 @@
 
 
 %changelog 
+* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
+- .desktop: fix path to app-icon (#178531)
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-3
 - remove dup'd docs
 - %%lang'ify i18n bits


--- kdocker-qmake.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 02:49:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:49:32 -0500
Subject: rpms/kdocker/FC-4 kdocker.spec, 1.2, 1.3 kdocker-qmake.patch, 1.1,
	NONE
Message-ID: <200601220250.k0M2oZD5023796@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23650/FC-4

Modified Files:
	kdocker.spec 
Removed Files:
	kdocker-qmake.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-4/kdocker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdocker.spec	1 Nov 2005 14:51:41 -0000	1.2
+++ kdocker.spec	22 Jan 2006 02:49:32 -0000	1.3
@@ -2,15 +2,15 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
 URL:	 http://kdocker.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-1.3.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdocker-qmake.patch 
+Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
@@ -40,7 +40,7 @@
 %prep
 %setup -q -n kdocker 
 
-%patch0 -p1 -b .qmake
+%patch1 -p1 -b .paths
 
 
 %build
@@ -63,7 +63,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
+  --add-category Qt \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -97,6 +97,9 @@
 
 
 %changelog 
+* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
+- .desktop: fix path to app-icon (#178531)
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-3
 - remove dup'd docs
 - %%lang'ify i18n bits


--- kdocker-qmake.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 05:51:24 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 22 Jan 2006 00:51:24 -0500
Subject: rpms/azureus/devel Azureus.desktop,1.1,1.2 azureus.spec,1.4,1.5
Message-ID: <200601220551.k0M5pudD029206@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182

Modified Files:
	Azureus.desktop azureus.spec 
Log Message:
.desktop improvements



Index: Azureus.desktop
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/Azureus.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Azureus.desktop	19 Jan 2006 23:08:02 -0000	1.1
+++ Azureus.desktop	22 Jan 2006 05:51:23 -0000	1.2
@@ -1,10 +1,11 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Azureus
-Comment=A BitTorrent Client
+GenericName=BitTorrent Client
 Exec=azureus
 Icon=azureus
 Terminal=false
 Type=Application
 MimeType=application/x-bittorrent
-Categories=Application;Network;
+Categories=Application;Network;FileTransfer;P2P;GTK;Java
 


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- azureus.spec	21 Jan 2006 17:04:07 -0000	1.4
+++ azureus.spec	22 Jan 2006 05:51:23 -0000	1.5
@@ -146,6 +146,7 @@
 %changelog
 * Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-16
 - Use "$@" instead of $* in azureus.script (thanks ivazquez).
+- Improve .desktop file.
 
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-15
 - Remove PrintTransferTypes, which is unused and not 64-bit clean.



From fedora-extras-commits at redhat.com  Sun Jan 22 05:53:36 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 22 Jan 2006 00:53:36 -0500
Subject: rpms/azureus/devel azureus.spec,1.5,1.6
Message-ID: <200601220554.k0M5s81Z029270@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29247

Modified Files:
	azureus.spec 
Log Message:
Increment release number



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- azureus.spec	22 Jan 2006 05:51:23 -0000	1.5
+++ azureus.spec	22 Jan 2006 05:53:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -144,7 +144,7 @@
 %{_libdir}/gcj/*
 
 %changelog
-* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-16
+* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-17
 - Use "$@" instead of $* in azureus.script (thanks ivazquez).
 - Improve .desktop file.
 



From fedora-extras-commits at redhat.com  Sun Jan 22 05:59:19 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 00:59:19 -0500
Subject: extras-buildsys/common SSLConnection.py,1.5,1.6
Message-ID: <200601220559.k0M5xJ60029344@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29310/common

Modified Files:
	SSLConnection.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SSLConnection.py	25 Nov 2005 04:45:07 -0000	1.5
+++ SSLConnection.py	22 Jan 2006 05:59:12 -0000	1.6
@@ -29,6 +29,12 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
+
+        # Buffer stuff
+        self.__dict__["buffer_size"] = 16384
+        self.__dict__["pos"] = 0
+        self.__dict__["buffer"] = ""
+
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -76,57 +82,76 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-    def sendall(self, data, flags=0):
-        while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in write:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].sendall(data, flags)
-                    except SSL.SysCallError, e:
-                        if e[0] == 32:      # Broken Pipe
-                            self.close()
-                        else:
-                            raise socket.error(e)
-                    except SSL.WantWriteError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
-    def recv(self, bufsize, flags=0):
+
+    def write(self, data, flags=0):
+        origlen = len(data)
+        sent = 0
         while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in read:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].recv(bufsize, flags)
-                    except SSL.ZeroReturnError:
-                        return None
-                    except SSL.WantReadError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
+            try:
+                sent = self.__dict__["conn"].send(data)
+            except (SSL.WantReadError, SSL.WantWriteError):
+                continue
+            if sent == len(data):
+                break
+            data = data[sent:]
+
+        return origlen
+
+    def recv(self, amt):
+        return self.read(amt)
+
+    send = write
+
+    sendall = write
+
+    def tell(self):
+        return self.__dict__["pos"]
+
+    def seek(self, pos, mode=0):
+        raise NotImplementedError, "seek"
+
+    def read(self, amt, flags=0):
+        # Initially, the buffer size is the default buffer size.
+        # Unfortunately, pending() does not return meaningful data until
+        # recv() is called, so we only adjust the buffer size after the
+        # first read
+        buffer_size = self.__dict__["buffer_size"]
+        # Read only the specified amount of data
+        while amt is None or len(self.__dict__["buffer"]) < amt:
+            # if amt is None (read till the end), fills in self.__dict__["buffer"]
+            if amt is not None:
+                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
+
+            try:
+                data = self.__dict__["conn"].recv(buffer_size)
+            except SSL.ZeroReturnError:
+                # Nothing more to be read
+                break
+            except (SSL.WantReadError, SSL.WantWriteError):
+                # Try again
+                continue
+
+            self.__dict__["buffer"] = self.__dict__["buffer"] + data
+
+            # More bytes to read?
+            pending = self.__dict__["conn"].pending()
+            if pending == 0:
+                # we're done here
+                break
+
+        if amt:
+            ret = self.__dict__["buffer"][:amt]
+            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
+        else:
+            ret = self.__dict__["buffer"]
+            self.__dict__["buffer"] = ""
+
+        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
+        return ret
 
 class PlgFileObject(socket._fileobject):
+    def read(self, bufsize, flags=0):
+        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Sun Jan 22 05:59:14 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 00:59:14 -0500
Subject: extras-buildsys ChangeLog,1.157,1.158
Message-ID: <200601220559.k0M5xiex029347@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29310

Modified Files:
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- ChangeLog	1 Dec 2005 18:44:48 -0000	1.157
+++ ChangeLog	22 Jan 2006 05:59:06 -0000	1.158
@@ -1,3 +1,10 @@
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Be smarter about SSL stuff by using pending() where possible in a
+            vain effort not to hang as much.  Cribbed from rhn code by
+            misa at redhat
+
 2005-12-01  Dan Williams  <dcbw at redhat.com>
 
     Patch from Rudolf Kastl <che666 at gmail.com> #rh174573#:



From fedora-extras-commits at redhat.com  Sun Jan 22 06:00:42 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:00:42 -0500
Subject: extras-buildsys/server Builder.py,1.25,1.26
Message-ID: <200601220600.k0M60g7O029395@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29361/server

Modified Files:
	Builder.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/Builder.py
        - Move most of the building_jobs() logic into another thread to
            combat hanging issues




Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Builder.py	29 Nov 2005 06:41:51 -0000	1.25
+++ Builder.py	22 Jan 2006 06:00:35 -0000	1.26
@@ -34,6 +34,34 @@
 SUSPEND_TIMEOUT = 'timeout'
 SUSPEND_HARD_ERROR = 'hard-error'
 
+# HACK: This class is a hack to work around SSL hanging issues,
+# which cause the whole server to grind to a halt
+class BuildingJobsCheck(threading.Thread):
+    def __init__(self, server, address):
+        self._server = server
+        self._address = address
+
+        self.done = False
+        self.failed = False
+
+        threading.Thread.__init__(self)
+        self.setName("BuildingJobsCheck: %s" % address)
+
+    def run(self):
+        jobs = {}
+        free_slots = 0
+        try:
+            (jobs, free_slots) = self._server.building_jobs()
+        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
+            self.failed = True
+        except xmlrpclib.Fault, e:
+            print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, e)
+            self.failed = True
+        self.jobs = jobs
+        self.free_slots = free_slots
+        self.done = True
+
+
 class Builder(threading.Thread):
     """ Tracks all jobs on a builder instance """
 
@@ -65,16 +93,16 @@
             certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
             certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
 
-        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
+        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
         self._server_lock = threading.Lock()
 
+        threading.Thread.__init__(self)
+        self.setName("Builder: %s" % address)
+
         (self._alive, target_list) = self._ping_builder()
         if self._alive:
             self._init_builder(target_list)
 
-        threading.Thread.__init__(self)
-        self.setName("Builder: %s" % address)
-
     def _init_builder(self, target_list):
         self._target_list = target_list
 
@@ -99,18 +127,28 @@
         return num_slots
 
     def _building_jobs(self):
-        jobs = {}
-        try:
-            (jobs, free_slots) = self._server.building_jobs()
-            self._unavail_count = 0
-            self._alive = True
-            self._free_slots = free_slots
-        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
-            self._unavail_count = self._unavail_count + 1
-        except xmlrpclib.Fault, e:
-            print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self.address, e)
-            self._unavail_count = self._unavail_count + 1
-        return jobs
+        bjc = BuildingJobsCheck(self._server, self.address)
+
+        curtime = time.time()
+        bjc.start()
+
+        # Give the check 10s, otherwise screw it
+        while time.time() - curtime < 10:
+            if bjc.done:
+                break
+            time.sleep(0.5)
+
+        if bjc.done:
+            if not bjc.failed:
+                self._unavail_count = 0
+                self._alive = True
+                self._free_slots = bjc.free_slots
+                return bjc.jobs
+            else:
+                # Error of some kind
+                self._unavail_count = self._unavail_count + 1
+
+        return {}
 
     def _ping_builder(self):
         target_list = []
@@ -309,7 +347,7 @@
                     else:
                         # Wait and ping again
                         self._ping_timeout = time.time()
-
+
                     # Reset current ping interval to default
                     self._cur_ping_interval = self._BUILDER_PING_INTERVAL
                     self._ping_now = False



From fedora-extras-commits at redhat.com  Sun Jan 22 06:00:37 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:00:37 -0500
Subject: extras-buildsys ChangeLog,1.158,1.159
Message-ID: <200601220601.k0M617Cu031068@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29361

Modified Files:
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/Builder.py
        - Move most of the building_jobs() logic into another thread to
            combat hanging issues




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- ChangeLog	22 Jan 2006 05:59:06 -0000	1.158
+++ ChangeLog	22 Jan 2006 06:00:29 -0000	1.159
@@ -1,5 +1,11 @@
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
+    * server/Builder.py
+        - Move most of the building_jobs() logic into another thread to
+            combat hanging issues
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
     * common/SSLConnection.py
         - Be smarter about SSL stuff by using pending() where possible in a
             vain effort not to hang as much.  Cribbed from rhn code by



From fedora-extras-commits at redhat.com  Sun Jan 22 06:02:05 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:02:05 -0500
Subject: extras-buildsys/common SSLConnection.py,1.3.4.2,1.3.4.3
Message-ID: <200601220602.k0M625TT031139@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081/common

Modified Files:
      Tag: STABLE_0_4
	SSLConnection.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- SSLConnection.py	24 Nov 2005 22:32:02 -0000	1.3.4.2
+++ SSLConnection.py	22 Jan 2006 06:01:56 -0000	1.3.4.3
@@ -29,6 +29,12 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
+
+        # Buffer stuff
+        self.__dict__["buffer_size"] = 16384
+        self.__dict__["pos"] = 0
+        self.__dict__["buffer"] = ""
+
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -76,57 +82,76 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-    def sendall(self, data, flags=0):
-        while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in write:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].sendall(data, flags)
-                    except SSL.SysCallError, e:
-                        if e[0] == 32:      # Broken Pipe
-                            self.close()
-                        else:
-                            raise socket.error(e)
-                    except SSL.WantWriteError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
-    def recv(self, bufsize, flags=0):
+
+    def write(self, data, flags=0):
+        origlen = len(data)
+        sent = 0
         while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in read:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].recv(bufsize, flags)
-                    except SSL.ZeroReturnError:
-                        return None
-                    except SSL.WantReadError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
+            try:
+                sent = self.__dict__["conn"].send(data)
+            except (SSL.WantReadError, SSL.WantWriteError):
+                continue
+            if sent == len(data):
+                break
+            data = data[sent:]
+
+        return origlen
+
+    def recv(self, amt):
+        return self.read(amt)
+
+    send = write
+
+    sendall = write
+
+    def tell(self):
+        return self.__dict__["pos"]
+
+    def seek(self, pos, mode=0):
+        raise NotImplementedError, "seek"
+
+    def read(self, amt, flags=0):
+        # Initially, the buffer size is the default buffer size.
+        # Unfortunately, pending() does not return meaningful data until
+        # recv() is called, so we only adjust the buffer size after the
+        # first read
+        buffer_size = self.__dict__["buffer_size"]
+        # Read only the specified amount of data
+        while amt is None or len(self.__dict__["buffer"]) < amt:
+            # if amt is None (read till the end), fills in self.__dict__["buffer"]
+            if amt is not None:
+                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
+
+            try:
+                data = self.__dict__["conn"].recv(buffer_size)
+            except SSL.ZeroReturnError:
+                # Nothing more to be read
+                break
+            except (SSL.WantReadError, SSL.WantWriteError):
+                # Try again
+                continue
+
+            self.__dict__["buffer"] = self.__dict__["buffer"] + data
+
+            # More bytes to read?
+            pending = self.__dict__["conn"].pending()
+            if pending == 0:
+                # we're done here
+                break
+
+        if amt:
+            ret = self.__dict__["buffer"][:amt]
+            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
+        else:
+            ret = self.__dict__["buffer"]
+            self.__dict__["buffer"] = ""
+
+        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
+        return ret
 
 class PlgFileObject(socket._fileobject):
+    def read(self, bufsize, flags=0):
+        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Sun Jan 22 06:01:58 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:01:58 -0500
Subject: extras-buildsys ChangeLog,1.126.2.26,1.126.2.27
Message-ID: <200601220602.k0M62Vs0031143@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.26
retrieving revision 1.126.2.27
diff -u -r1.126.2.26 -r1.126.2.27
--- ChangeLog	1 Dec 2005 18:43:36 -0000	1.126.2.26
+++ ChangeLog	22 Jan 2006 06:01:43 -0000	1.126.2.27
@@ -1,3 +1,10 @@
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Be smarter about SSL stuff by using pending() where possible in a
+            vain effort not to hang as much.  Cribbed from rhn code by
+            misa at redhat
+
 2005-12-01  Dan Williams  <dcbw at redhat.com>
 
     Patch from Rudolf Kastl <che666 at gmail.com> #rh174573#:



From fedora-extras-commits at redhat.com  Sun Jan 22 06:05:26 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:05:26 -0500
Subject: extras-buildsys ChangeLog,1.126.2.27,1.126.2.28
Message-ID: <200601220605.k0M65QSs031183@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31159

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/Builder.py
        - Move most of the building_jobs() logic into another thread to
            combat hanging issues







From fedora-extras-commits at redhat.com  Sun Jan 22 06:08:30 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:08:30 -0500
Subject: extras-buildsys/server ArchJob.py,1.16.2.5,1.16.2.6
Message-ID: <200601220608.k0M68UeS031239@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200/server

Modified Files:
      Tag: STABLE_0_4
	ArchJob.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/ArchJob.py
        - Don't traceback when killing jobs on builders




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -r1.16.2.5 -r1.16.2.6
--- ArchJob.py	18 Nov 2005 15:08:20 -0000	1.16.2.5
+++ ArchJob.py	22 Jan 2006 06:08:01 -0000	1.16.2.6
@@ -275,7 +275,10 @@
         user_requested = self._die_user_requested
         self._die_lock.release()
         if should_die:
-            self._server.die(self.jobid)
+            try:
+                self._server.die(self.jobid)
+            except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error):
+                pass
             self._set_status('done')
             if user_requested:
                 print "%s (%s/%s): %s - killed." % (self.par_job.uid, self.par_job.package,



From fedora-extras-commits at redhat.com  Sun Jan 22 06:08:03 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:08:03 -0500
Subject: extras-buildsys ChangeLog,1.126.2.28,1.126.2.29
Message-ID: <200601220608.k0M68XdH031240@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/ArchJob.py
        - Don't traceback when killing jobs on builders




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.28
retrieving revision 1.126.2.29
diff -u -r1.126.2.28 -r1.126.2.29
--- ChangeLog	22 Jan 2006 06:05:08 -0000	1.126.2.28
+++ ChangeLog	22 Jan 2006 06:07:37 -0000	1.126.2.29
@@ -1,5 +1,10 @@
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
+    * server/ArchJob.py
+        - Don't traceback when killing jobs on builders
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
     * server/Builder.py
         - Move most of the building_jobs() logic into another thread to
             combat hanging issues



From fedora-extras-commits at redhat.com  Sun Jan 22 06:18:22 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:18:22 -0500
Subject: rpms/plague/devel plague.spec,1.20,1.21 sources,1.19,1.20
Message-ID: <200601220618.k0M6IsWE031315@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31296

Modified Files:
	plague.spec sources 
Log Message:
* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
- Don't traceback when killing jobs on builders
- Work around SSL hanging issues




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plague.spec	29 Nov 2005 06:46:52 -0000	1.20
+++ plague.spec	22 Jan 2006 06:18:22 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
+- Don't traceback when killing jobs on builders
+- Work around SSL hanging issues
+
 * Tue Nov 29 2005 Dan Williams <dcbw at redhat.com> 0.4.3-2
 - Move README and ChangeLog to -common package
 - Traceback/debug functionality added in server, depends on


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Nov 2005 06:46:52 -0000	1.19
+++ sources	22 Jan 2006 06:18:22 -0000	1.20
@@ -1 +1 @@
-ccf61419e286348a18126d783f7fe7e9  plague-0.4.3.tar.bz2
+dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 06:20:24 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:20:24 -0500
Subject: rpms/plague/FC-4 plague.spec,1.18,1.19 sources,1.17,1.18
Message-ID: <200601220620.k0M6Kvde031395@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31376

Modified Files:
	plague.spec sources 
Log Message:
* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
- Don't traceback when killing jobs on builders
- Work around SSL hanging issues




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plague.spec	29 Nov 2005 06:49:11 -0000	1.18
+++ plague.spec	22 Jan 2006 06:20:24 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
+- Don't traceback when killing jobs on builders
+- Work around SSL hanging issues
+
 * Tue Nov 29 2005 Dan Williams <dcbw at redhat.com> 0.4.3-2
 - Move README and ChangeLog to -common package
 - Traceback/debug functionality added in server, depends on


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 Nov 2005 06:49:11 -0000	1.17
+++ sources	22 Jan 2006 06:20:24 -0000	1.18
@@ -1 +1 @@
-ccf61419e286348a18126d783f7fe7e9  plague-0.4.3.tar.bz2
+dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 06:21:25 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:21:25 -0500
Subject: rpms/plague/FC-3 plague.spec,1.18,1.19 sources,1.17,1.18
Message-ID: <200601220621.k0M6LwVX031458@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31439

Modified Files:
	plague.spec sources 
Log Message:
* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
- Don't traceback when killing jobs on builders
- Work around SSL hanging issues




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plague.spec	29 Nov 2005 06:50:08 -0000	1.18
+++ plague.spec	22 Jan 2006 06:21:25 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
+- Don't traceback when killing jobs on builders
+- Work around SSL hanging issues
+
 * Tue Nov 29 2005 Dan Williams <dcbw at redhat.com> 0.4.3-2
 - Move README and ChangeLog to -common package
 - Traceback/debug functionality added in server, depends on


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 Nov 2005 06:50:08 -0000	1.17
+++ sources	22 Jan 2006 06:21:25 -0000	1.18
@@ -1 +1 @@
-ccf61419e286348a18126d783f7fe7e9  plague-0.4.3.tar.bz2
+dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 08:16:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 22 Jan 2006 03:16:54 -0500
Subject: rpms/perl-MailTools/devel .cvsignore, 1.7, 1.8 perl-MailTools.spec, 
	1.14, 1.15 sources, 1.7, 1.8
Message-ID: <200601220817.k0M8HQSd002930@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2909

Modified Files:
	.cvsignore perl-MailTools.spec sources 
Log Message:
* Sun Jan 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.73-1
- 1.73.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 20:43:26 -0000	1.7
+++ .cvsignore	22 Jan 2006 08:16:53 -0000	1.8
@@ -1 +1 @@
-MailTools-1.72.tar.gz
+MailTools-1.73.tar.gz


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-MailTools.spec	18 Jan 2006 20:43:26 -0000	1.14
+++ perl-MailTools.spec	22 Jan 2006 08:16:53 -0000	1.15
@@ -1,6 +1,6 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
-Version:        1.72
+Version:        1.73
 Release:        1%{?dist}
 
 License:        GPL or Artistic
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Jan 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.73-1
+- 1.73.
+
 * Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.72-1
 - 1.72.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 20:43:26 -0000	1.7
+++ sources	22 Jan 2006 08:16:53 -0000	1.8
@@ -1 +1 @@
-9e9d40fe0f3acbcdefdfe678f478436e  MailTools-1.72.tar.gz
+5fae3213871ae435014c613e88d081a7  MailTools-1.73.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 22 09:07:23 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:07:23 -0500
Subject: rpms/amarok/FC-4 .cvsignore, 1.17, 1.18 amarok.spec, 1.36,
	1.37 sources, 1.17, 1.18
Message-ID: <200601220907.k0M97uAD005649@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5609/FC-4

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	9 Dec 2005 10:24:48 -0000	1.17
+++ .cvsignore	22 Jan 2006 09:07:05 -0000	1.18
@@ -1 +1 @@
-amarok-1.3.7.tar.bz2
+amarok-1.3.8.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- amarok.spec	15 Dec 2005 19:08:57 -0000	1.36
+++ amarok.spec	22 Jan 2006 09:07:06 -0000	1.37
@@ -6,14 +6,14 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.7
+Version:    1.3.8
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
-Patch0:     amarok-1.3.4-helix-libs.patch
+Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+#Patch0:     amarok-1.3.4-helix-libs.patch
 Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,13 +22,17 @@
 BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  libGL
-BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
+%if "%fedora" >= "5"
+BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
+%else
+BuildRequires:  gstreamer-plugins-devel >= 0.8.4
+%endif
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -85,7 +89,7 @@
 %prep
 %setup -q
 # Discover the helix libs
-%patch0 -p1 -b .helix-libs
+#%patch0 -p1 -b .helix-libs
 # Use libtunepimp 0.4.0 (api changed)
 %patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
@@ -216,6 +220,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-1
+- version 1.3.8
+
 * Wed Dec 07 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.7-1
 - version 1.3.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Dec 2005 10:24:48 -0000	1.17
+++ sources	22 Jan 2006 09:07:23 -0000	1.18
@@ -1 +1 @@
-e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2
+fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 09:07:45 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:07:45 -0500
Subject: rpms/amarok/devel .cvsignore, 1.17, 1.18 amarok.spec, 1.34,
	1.35 sources, 1.17, 1.18
Message-ID: <200601220908.k0M98Lrt005656@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5609/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	9 Dec 2005 10:24:54 -0000	1.17
+++ .cvsignore	22 Jan 2006 09:07:44 -0000	1.18
@@ -1 +1 @@
-amarok-1.3.7.tar.bz2
+amarok-1.3.8.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- amarok.spec	15 Dec 2005 19:09:26 -0000	1.34
+++ amarok.spec	22 Jan 2006 09:07:44 -0000	1.35
@@ -6,14 +6,14 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.7
+Version:    1.3.8
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
-Patch0:     amarok-1.3.4-helix-libs.patch
+Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+#Patch0:     amarok-1.3.4-helix-libs.patch
 Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,13 +22,17 @@
 BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  libGL
-BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
+%if "%fedora" >= "5"
+BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
+%else
+BuildRequires:  gstreamer-plugins-devel >= 0.8.4
+%endif
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -85,7 +89,7 @@
 %prep
 %setup -q
 # Discover the helix libs
-%patch0 -p1 -b .helix-libs
+#%patch0 -p1 -b .helix-libs
 # Use libtunepimp 0.4.0 (api changed)
 %patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
@@ -216,6 +220,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-1
+- version 1.3.8
+
 * Wed Dec 07 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.7-1
 - version 1.3.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Dec 2005 10:24:54 -0000	1.17
+++ sources	22 Jan 2006 09:07:44 -0000	1.18
@@ -1 +1 @@
-e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2
+fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 09:37:50 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:37:50 -0500
Subject: rpms/showimg/FC-4 showimg.spec,1.7,1.8
Message-ID: <200601220938.k0M9cM5V009558@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9526/FC-4

Modified Files:
	showimg.spec 
Log Message:
fix x86_64 build


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- showimg.spec	21 Jan 2006 17:16:38 -0000	1.7
+++ showimg.spec	22 Jan 2006 09:37:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -59,6 +59,7 @@
            --enable-libkipi \
            --enable-mysql \
            --enable-pgsql \
+           --with-pqxxlibdir=%{_libdir} \
            --with-kexif \
            --with-showimgdb
 #           --enable-final \
@@ -121,6 +122,9 @@
 
 
 %changelog
+* Sun Jan 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-4
+- fix pqxx detection on x86_64
+
 * Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
 - fix improper QT detection
 



From fedora-extras-commits at redhat.com  Sun Jan 22 09:37:55 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:37:55 -0500
Subject: rpms/showimg/devel showimg.spec,1.7,1.8
Message-ID: <200601220938.k0M9cSak009561@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9526/devel

Modified Files:
	showimg.spec 
Log Message:
fix x86_64 build


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- showimg.spec	21 Jan 2006 17:16:44 -0000	1.7
+++ showimg.spec	22 Jan 2006 09:37:55 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -59,6 +59,7 @@
            --enable-libkipi \
            --enable-mysql \
            --enable-pgsql \
+           --with-pqxxlibdir=%{_libdir} \
            --with-kexif \
            --with-showimgdb
 #           --enable-final \
@@ -121,6 +122,9 @@
 
 
 %changelog
+* Sun Jan 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-4
+- fix pqxx detection on x86_64
+
 * Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
 - fix improper QT detection
 



From fedora-extras-commits at redhat.com  Sun Jan 22 10:51:52 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 22 Jan 2006 05:51:52 -0500
Subject: extras-buildsys/utils extras-push-all,NONE,1.1
Message-ID: <200601221051.k0MApqHE011493@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11476

Added Files:
	extras-push-all 
Log Message:
Improved push-em-all script.


--- NEW FILE extras-push-all ---
#!/bin/bash
#
# 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 Library 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 St, Fifth Floor, Boston, MA  02110-1301  USA

dists="3 4 development"
changed=

sign_move()
{
    dist=$1
    extras-sign-move.py $dist
    rc=$?
    if [ $rc -eq 4 ] ; then # no packages to sign?
        rc=0
    elif [ $rc -eq 0 ] ; then
        changed="$changed $dist"
    fi
    return $rc
}

for dist in $dists ; do
    sign_move $dist || exit $?
done

for dist in $changed ; do
    extras-repobuild.py $dist && extras-repoview.py $dist || exit $?
done

extras-sync



From fedora-extras-commits at redhat.com  Sun Jan 22 15:46:46 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 22 Jan 2006 10:46:46 -0500
Subject: rpms/wp_tray/FC-4 wp_tray.spec,1.1,1.2
Message-ID: <200601221547.k0MFlIqH020859@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20827/FC-4

Modified Files:
	wp_tray.spec 
Log Message:
Fix 64-bit build


Index: wp_tray.spec
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/FC-4/wp_tray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wp_tray.spec	18 Jan 2006 20:48:13 -0000	1.1
+++ wp_tray.spec	22 Jan 2006 15:46:45 -0000	1.2
@@ -22,8 +22,8 @@
 %patch -p 1 -b .paths
 
 %build
-%configure --with-boostfilesystem=/usr/lib/libboost_filesystem.so \
-  --with-boostregex=/usr/lib/libboost_regex.so
+%configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \
+  --with-boostregex=%{_libdir}/libboost_regex.so
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sun Jan 22 15:46:52 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 22 Jan 2006 10:46:52 -0500
Subject: rpms/wp_tray/devel wp_tray.spec,1.1,1.2
Message-ID: <200601221547.k0MFlOAh020862@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20827/devel

Modified Files:
	wp_tray.spec 
Log Message:
Fix 64-bit build


Index: wp_tray.spec
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/devel/wp_tray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wp_tray.spec	18 Jan 2006 20:48:13 -0000	1.1
+++ wp_tray.spec	22 Jan 2006 15:46:52 -0000	1.2
@@ -22,8 +22,8 @@
 %patch -p 1 -b .paths
 
 %build
-%configure --with-boostfilesystem=/usr/lib/libboost_filesystem.so \
-  --with-boostregex=/usr/lib/libboost_regex.so
+%configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \
+  --with-boostregex=%{_libdir}/libboost_regex.so
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sun Jan 22 16:35:24 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:35:24 -0500
Subject: rpms/moomps/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200601221635.k0MGZu9t022824@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22805

Modified Files:
	.cvsignore sources 
Log Message:
upstream 5.4 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 19:51:03 -0000	1.5
+++ .cvsignore	22 Jan 2006 16:35:23 -0000	1.6
@@ -1 +1 @@
-moomps-5.3.tar.bz2
+moomps-5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2005 19:51:03 -0000	1.5
+++ sources	22 Jan 2006 16:35:23 -0000	1.6
@@ -1 +1 @@
-3f00acd118e11403ef1d6e630cb759e0  moomps-5.3.tar.bz2
+37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 16:37:50 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:37:50 -0500
Subject: rpms/moodss/devel .cvsignore,1.6,1.7 sources,1.7,1.8
Message-ID: <200601221638.k0MGcMCu022855@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22832

Modified Files:
	.cvsignore sources 
Log Message:
upstream 21.0 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Aug 2005 19:41:28 -0000	1.6
+++ .cvsignore	22 Jan 2006 16:37:50 -0000	1.7
@@ -1 +1 @@
-moodss-20.4.tar.bz2
+moodss-21.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Aug 2005 19:41:28 -0000	1.7
+++ sources	22 Jan 2006 16:37:50 -0000	1.8
@@ -1 +1 @@
-562834a27ffe522a5cf88eb10b26fb89  moodss-20.4.tar.bz2
+1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 16:40:59 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:40:59 -0500
Subject: rpms/moodss/devel moodss.spec,1.18,1.19
Message-ID: <200601221641.k0MGfWs7022886@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22869

Modified Files:
	moodss.spec 
Log Message:
21.0 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- moodss.spec	23 Aug 2005 19:41:28 -0000	1.18
+++ moodss.spec	22 Jan 2006 16:40:59 -0000	1.19
@@ -1,26 +1,26 @@
 Name: moodss
-Version: 20.4
+Version: 21.0
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
-Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl
+Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl, R >= 2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
-multi-purpose monitoring tool with table, graphical, textual data
-viewers, thresholds, formulas and full drag and drop user interface as
-well as a UNIX daemon (separate moomps package available). Compatible
-with a variety of SQL databases for data history over time storage and
-display. Includes modules for Linux system, MySQL database, SNMP
-networking, Apache and Nagios. Modules can be written in Tcl, Perl
-(tclperl package required), Python (tclpython package required) or C.
-Moodss is localized (Japanese with input, partial French) and
-supports Unicode.
+multi-purpose monitoring and capacity planning tool with table,
+graphical, textual data viewers, thresholds, formulas and full drag
+and drop user interface as well as a UNIX daemon (separate moomps
+package available). Compatible with a variety of SQL databases for
+data history over time storage and display. Includes modules for Linux
+system, MySQL database, SNMP networking, Apache and Nagios. Modules
+can be written in Tcl, Perl (tclperl package required), Python
+(tclpython package required) or C.  Moodss is localized (Japanese with
+input, partial French) and supports Unicode.
 
 %prep
 %setup -q
@@ -58,6 +58,11 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 21.0-1
+- 21.0 upstream release
+- added R dependency
+- updated description
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 20.4-1
 - 20.4 upstream release
 



From fedora-extras-commits at redhat.com  Sun Jan 22 16:44:50 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:44:50 -0500
Subject: rpms/moomps/devel moomps.spec,1.7,1.8
Message-ID: <200601221645.k0MGjMb9022949@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22930

Modified Files:
	moomps.spec 
Log Message:
5.4 upstream release.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moomps.spec	23 Aug 2005 19:51:03 -0000	1.7
+++ moomps.spec	22 Jan 2006 16:44:49 -0000	1.8
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.3
+Version: 5.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 20.4, tclx >= 8.3
+Requires: moodss >= 21.0, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -78,6 +78,9 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.4-1
+- 5.4 upstream release
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.3-1
 - 5.3 upstream release
 



From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:10 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:22:10 -0500
Subject: rpms/gstreamer08-python - New directory
Message-ID: <200601221722.k0MHMCQw024931@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24920/gstreamer08-python

Log Message:
Directory /cvs/extras/rpms/gstreamer08-python added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:16 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:22:16 -0500
Subject: rpms/gstreamer08-python/devel - New directory
Message-ID: <200601221722.k0MHMIOp024952@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24920/gstreamer08-python/devel

Log Message:
Directory /cvs/extras/rpms/gstreamer08-python/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:43 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:22:43 -0500
Subject: rpms/testdisk - New directory
Message-ID: <200601221722.k0MHMjrH025003@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/testdisk

Log Message:
Directory /cvs/extras/rpms/testdisk added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:49 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:22:49 -0500
Subject: rpms/testdisk/devel - New directory
Message-ID: <200601221722.k0MHMpgo025023@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/testdisk/devel

Log Message:
Directory /cvs/extras/rpms/testdisk/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:55 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:22:55 -0500
Subject: rpms/gstreamer08-python Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601221722.k0MHMvC4025052@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029

Added Files:
	Makefile import.log 
Log Message:
Setup of module gstreamer08-python


--- NEW FILE Makefile ---
# Top level Makefile for module gstreamer08-python
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:00 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:23:00 -0500
Subject: rpms/gstreamer08-python/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601221723.k0MHN2Cp025077@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gstreamer08-python


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:07 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:23:07 -0500
Subject: rpms/testdisk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601221723.k0MHN9S9025104@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25090

Added Files:
	Makefile import.log 
Log Message:
Setup of module testdisk


--- NEW FILE Makefile ---
# Top level Makefile for module testdisk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:13 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:23:13 -0500
Subject: rpms/testdisk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601221723.k0MHNFpF025123@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25090/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module testdisk


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:55 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:23:55 -0500
Subject: rpms/testdisk import.log,1.1,1.2
Message-ID: <200601221724.k0MHOTNQ025210@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25169

Modified Files:
	import.log 
Log Message:
auto-import testdisk-6.2-2 on branch devel from testdisk-6.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/testdisk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 17:23:07 -0000	1.1
+++ import.log	22 Jan 2006 17:23:55 -0000	1.2
@@ -0,0 +1 @@
+testdisk-6_2-2:HEAD:testdisk-6.2-2.src.rpm:1137950622



From fedora-extras-commits at redhat.com  Sun Jan 22 17:24:03 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:24:03 -0500
Subject: rpms/testdisk/devel testdisk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601221724.k0MHOZGl025217@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25169/devel

Modified Files:
	.cvsignore sources 
Added Files:
	testdisk.spec 
Log Message:
auto-import testdisk-6.2-2 on branch devel from testdisk-6.2-2.src.rpm


--- NEW FILE testdisk.spec ---
Summary:	Tool to check and undelete partition
Summary(pl):	Narz?dzie sprawdzaj?ce i odzyskuj?ce partycje
Summary(fr):	Outil pour v?rifier et restorer des partitions
Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
Name:		testdisk
Version:	6.2
Release:	2
License:	GPL
Group:		Applications/System
Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
URL:		http://www.cgsecurity.org/testdisk.html
BuildRequires:	ncurses-devel >= 5.2
BuildRequires:  e2fsprogs-devel
BuildRequires:	libjpeg-devel
BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
LVM, LVM2, NSS, ReiserFS, UFS, XFS

%description -l pl
Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS

%description -l fr
Outil pour v?rifier et restorer des partitions. Fonctionne avec
FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS

%description -l ru_RU.KOI8-R
????????? ??? ???????? ? ?????????????? ???????? ?????.
???????????? ????????? ???? ????????:
FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS

%prep
%setup

%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR="$RPM_BUILD_ROOT" install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS doc
%attr(755,root,root) %{_sbindir}/testdisk
%attr(755,root,root) %{_sbindir}/photorec
%{_mandir}/man1/testdisk.1*
%{_mandir}/man1/photorec.1*
%changelog
* Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
- 5.0

* Wed Oct 1 2003 Christophe Grenier <grenier at cgsecurity.org> 4.5
- 4.5

* Wed Apr 23 2003 Christophe Grenier <grenier at cgsecurity.org> 4.4-2

* Sat Mar 29 2003 Pascal Terjan <CMoi at tuxfamily.org> 4.4-1mdk
- 4.4

* Fri Dec 27 2002 Olivier Thauvin <thauvin at aerov.jussieu.fr> 4.2-2mdk
- rebuild for rpm and glibc

* Sun Oct 06 2002 Olivier Thauvin <thauvin at aerov.jussieu.fr> 4.2-1mdk
- 4.2

* Mon Sep 02 2002 Olivier Thauvin <thauvin at aerov.jussieu.fr> 4.1-1mdk 
- By Pascal Terjan <pascal.terjan at free.fr>
	- first mdk release, adapted from PLD.
	- gz to bz2 compression.
- fix %%tmppath
- %%make instead %%{__make}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 17:23:13 -0000	1.1
+++ .cvsignore	22 Jan 2006 17:24:03 -0000	1.2
@@ -0,0 +1 @@
+testdisk-6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 17:23:13 -0000	1.1
+++ sources	22 Jan 2006 17:24:03 -0000	1.2
@@ -0,0 +1 @@
+9c103d130f56d3dd901246574a1df76b  testdisk-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:24:42 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:24:42 -0500
Subject: rpms/gstreamer08-python import.log,1.1,1.2
Message-ID: <200601221725.k0MHPExT025285@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25249

Modified Files:
	import.log 
Log Message:
auto-import gstreamer08-python-0.8.3-1 on branch devel from gstreamer08-python-0.8.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gstreamer08-python/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 17:22:54 -0000	1.1
+++ import.log	22 Jan 2006 17:24:42 -0000	1.2
@@ -0,0 +1 @@
+gstreamer08-python-0_8_3-1:HEAD:gstreamer08-python-0.8.3-1.src.rpm:1137950556



From fedora-extras-commits at redhat.com  Sun Jan 22 17:24:48 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:24:48 -0500
Subject: rpms/gstreamer08-python/devel gstreamer08-python.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601221725.k0MHPKe1025292@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25249/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gstreamer08-python.spec 
Log Message:
auto-import gstreamer08-python-0.8.3-1 on branch devel from gstreamer08-python-0.8.3-1.src.rpm


--- NEW FILE gstreamer08-python.spec ---
%define         gstreamer       gstreamer08

%define         gst_minver      0.8.7
%define         gstp_minver     0.8.5
%define         pygtk_minver    2.4.0

Name:           %{gstreamer}-python
Version:        0.8.3
Release:        1%{?dist}
Summary:        Python bindings for GStreamer

Group:          Development/Languages
License:        LGPL
URL:            http://gstreamer.freedesktop.org/
Source:         http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       python >= 2
Requires:       pygtk2 >= %{pygtk_minver}
Requires:       %{gstreamer} >= %{gst_minver}
Requires:       %{gstreamer}-plugins >= %{gstp_minver}

BuildRequires:  python >= 2
BuildRequires:  python-devel >= 2
BuildRequires:  pygtk2-devel >= %{pygtk_minver}

# xwindowlistener needs X11 Xlib
BuildRequires:  libX11-devel

BuildRequires:  %{gstreamer}-devel >= %{gst_minver}
BuildRequires:  %{gstreamer}-plugins-devel >= %{gstp_minver}

# sigh, libtool
BuildRequires:  gcc-c++

# no sense in splitting off a devel package just yet
Provides:       %{gstreamer}-python-devel = %{version}-%{release}

%description
This module contains a wrapper that allows GStreamer applications
to be written in Python.

%prep
%setup -q -n gst-python-%{version}

%build
# the "docs" were built when disting the tarball, so we don't need to
# rebuild them
%configure --disable-docs
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc examples/gst/*.py examples/gstplay/*.py
%{_libdir}/python?.?/site-packages/gst
%dir %{_datadir}/gst-python
%{_datadir}/gst-python/examples
%dir %{_datadir}/gst-python/2.0/
%dir %{_datadir}/gst-python/2.0/defs/
%{_datadir}/gst-python/2.0/defs/*.defs
%{_libdir}/pkgconfig/gst-python-0.8.pc

%changelog
* Sun Jan 22 2006 Thomas Vander Stichele <thomas at apestaart dot org>
- Renamed package to gstreamer08-python for rawhide before FC5
- Removed Requires: of -devel packages
- BuildRequire libX11-devel now that X.org is modular

* Sat Jan 14 2006 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.3-1
- fix requires and buildrequires which were using an underscore
- update to 0.8.3 version
- remove the lib64 hack, should be fixed upstream now

* Thu May 19 2005 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.1-6
- disable docs build - they're already in the tarball

* Tue May 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.8.1-5
- Move __init__.py* files from lib to _libdir on multilibarchs
  Found in thias spec file, fixes x86_64

* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.1-3
- include missing directories

* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.1-2
- add deps pygtk2-devel and gstreamer-devel for pkgconfig file

* Fri Dec 24 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.1-1: moved to Fedora Extras CVS

* Fri Dec 24 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.1-0.fdr.2: various cleanups

* Tue Dec 07 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.1-0.fdr.1: new upstream release

* Mon Nov 15 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.0-0.fdr.1: new upstream release

* Fri Nov 05 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.94-0.fdr.1: new upstream release

* Tue Oct 12 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.93-0.fdr.1: new upstream release

* Mon Jun 21 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.92-0.fdr.1: new upstream release

* Wed Mar 31 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.91-0.fdr.1: new upstream release

* Tue Sep 02 2003 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.1.0-0.fdr.1: first fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gstreamer08-python/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 17:23:00 -0000	1.1
+++ .cvsignore	22 Jan 2006 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+gst-python-0.8.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gstreamer08-python/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 17:23:00 -0000	1.1
+++ sources	22 Jan 2006 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+f33f6b95d3911e7ad355199abea8d0ff  gst-python-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:28:09 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:28:09 -0500
Subject: owners owners.list,1.559,1.560
Message-ID: <200601221728.k0MHSfJA025344@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25327

Modified Files:
	owners.list 
Log Message:
Add TestDisk entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- owners.list	21 Jan 2006 21:32:15 -0000	1.559
+++ owners.list	22 Jan 2006 17:28:09 -0000	1.560
@@ -1209,6 +1209,7 @@
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|testdisk|Tool to check and undelete partition|grenier at cgsecurity.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-arabtex|The ArabTeX package for TeX/LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-armtex|Support for typesetting Armenian with TeX and LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-beamer|A LaTeX class for producing presentations and slides|jpo at di.uminho.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 22 17:37:13 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 12:37:13 -0500
Subject: rpms/moodss/FC-4 .cvsignore, 1.7, 1.8 moodss.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200601221737.k0MHbj20025384@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25360

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.0 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Aug 2005 19:56:32 -0000	1.7
+++ .cvsignore	22 Jan 2006 17:37:12 -0000	1.8
@@ -1 +1 @@
-moodss-20.4.tar.bz2
+moodss-21.0.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- moodss.spec	23 Aug 2005 19:56:32 -0000	1.18
+++ moodss.spec	22 Jan 2006 17:37:12 -0000	1.19
@@ -1,26 +1,26 @@
 Name: moodss
-Version: 20.4
+Version: 21.0
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
-Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl
+Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl, R >= 2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
-multi-purpose monitoring tool with table, graphical, textual data
-viewers, thresholds, formulas and full drag and drop user interface as
-well as a UNIX daemon (separate moomps package available). Compatible
-with a variety of SQL databases for data history over time storage and
-display. Includes modules for Linux system, MySQL database, SNMP
-networking, Apache and Nagios. Modules can be written in Tcl, Perl
-(tclperl package required), Python (tclpython package required) or C.
-Moodss is localized (Japanese with input, partial French) and
-supports Unicode.
+multi-purpose monitoring and capacity planning tool with table,
+graphical, textual data viewers, thresholds, formulas and full drag
+and drop user interface as well as a UNIX daemon (separate moomps
+package available). Compatible with a variety of SQL databases for
+data history over time storage and display. Includes modules for Linux
+system, MySQL database, SNMP networking, Apache and Nagios. Modules
+can be written in Tcl, Perl (tclperl package required), Python
+(tclpython package required) or C.  Moodss is localized (Japanese with
+input, partial French) and supports Unicode.
 
 %prep
 %setup -q
@@ -58,6 +58,11 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 21.0-1
+- 21.0 upstream release
+- added R dependency
+- updated description
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 20.4-1
 - 20.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Aug 2005 19:56:32 -0000	1.7
+++ sources	22 Jan 2006 17:37:12 -0000	1.8
@@ -1 +1 @@
-562834a27ffe522a5cf88eb10b26fb89  moodss-20.4.tar.bz2
+1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:39:37 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 12:39:37 -0500
Subject: rpms/moomps/FC-4 .cvsignore, 1.5, 1.6 moomps.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200601221740.k0MHe9xv025447@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25422

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.4 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 19:54:42 -0000	1.5
+++ .cvsignore	22 Jan 2006 17:39:36 -0000	1.6
@@ -1 +1 @@
-moomps-5.3.tar.bz2
+moomps-5.4.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moomps.spec	23 Aug 2005 19:54:42 -0000	1.7
+++ moomps.spec	22 Jan 2006 17:39:36 -0000	1.8
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.3
+Version: 5.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 20.4, tclx >= 8.3
+Requires: moodss >= 21.0, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -78,6 +78,9 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.4-1
+- 5.4 upstream release
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.3-1
 - 5.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2005 19:54:42 -0000	1.5
+++ sources	22 Jan 2006 17:39:36 -0000	1.6
@@ -1 +1 @@
-3f00acd118e11403ef1d6e630cb759e0  moomps-5.3.tar.bz2
+37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:48:34 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:48:34 -0500
Subject: owners owners.list,1.560,1.561
Message-ID: <200601221749.k0MHn6we025534@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25510

Modified Files:
	owners.list 
Log Message:
add myself as owner of gstreamer08-python


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- owners.list	22 Jan 2006 17:28:09 -0000	1.560
+++ owners.list	22 Jan 2006 17:48:34 -0000	1.561
@@ -351,6 +351,7 @@
 Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 22 17:49:33 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 12:49:33 -0500
Subject: rpms/moomps/FC-3 .cvsignore, 1.5, 1.6 moomps.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200601221750.k0MHo5Cg025565@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25533

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.4 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 20:08:40 -0000	1.5
+++ .cvsignore	22 Jan 2006 17:49:33 -0000	1.6
@@ -1 +1 @@
-moomps-5.3.tar.bz2
+moomps-5.4.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-3/moomps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moomps.spec	23 Aug 2005 20:08:40 -0000	1.8
+++ moomps.spec	22 Jan 2006 17:49:33 -0000	1.9
@@ -1,11 +1,11 @@
 Name: moomps
-Version: 5.3
+Version: 5.4
 Release: 1%{?dist}
 Epoch: 0
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -14,7 +14,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 0:20.4, tclx >= 0:8.3
+Requires: moodss >= 0:21.0 tclx >= 0:8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:5.4-1
+- 5.4 upstream release
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:5.3-1
 - 5.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2005 20:08:40 -0000	1.5
+++ sources	22 Jan 2006 17:49:33 -0000	1.6
@@ -1 +1 @@
-3f00acd118e11403ef1d6e630cb759e0  moomps-5.3.tar.bz2
+37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 18:01:50 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 13:01:50 -0500
Subject: rpms/moodss/FC-3 .cvsignore, 1.7, 1.8 moodss.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200601221802.k0MI2P3v027369@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27318

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.0 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Aug 2005 20:01:04 -0000	1.7
+++ .cvsignore	22 Jan 2006 18:01:49 -0000	1.8
@@ -1 +1 @@
-moodss-20.4.tar.bz2
+moodss-21.0.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- moodss.spec	23 Aug 2005 20:01:05 -0000	1.12
+++ moodss.spec	22 Jan 2006 18:01:49 -0000	1.13
@@ -1,27 +1,27 @@
 Name: moodss
-Version: 20.4
+Version: 21.0
 Release: 1%{?dist}
 Epoch: 0
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 0:8.4.7
-Requires: tk >= 0:8.4.7, blt >= 0:2.4-0.fdr.0.z, tktable >= 0:2.7, sqlite2-tcl
+Requires: tk >= 0:8.4.7, blt >= 0:2.4-0.fdr.0.z, tktable >= 0:2.7, sqlite2-tcl, R >= 0:2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
-multi-purpose monitoring tool with table, graphical, textual data
-viewers, thresholds, formulas and full drag and drop user interface as
-well as a UNIX daemon (separate moomps package available). Compatible
-with a variety of SQL databases for data history over time storage and
-display. Includes modules for Linux system, MySQL database, SNMP
-networking, Apache and Nagios. Modules can be written in Tcl, Perl
-(tclperl package required), Python (tclpython package required) or C.
-Moodss is localized (Japanese with input, partial French) and
-supports Unicode.
+multi-purpose monitoring and capacity planning tool with table,
+graphical, textual data viewers, thresholds, formulas and full drag
+and drop user interface as well as a UNIX daemon (separate moomps
+package available). Compatible with a variety of SQL databases for
+data history over time storage and display. Includes modules for Linux
+system, MySQL database, SNMP networking, Apache and Nagios. Modules
+can be written in Tcl, Perl (tclperl package required), Python
+(tclpython package required) or C.  Moodss is localized (Japanese with
+input, partial French) and supports Unicode.
 
 %prep
 %setup -q
@@ -59,6 +59,11 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:21.0-1
+- 21.0 upstream release
+- added R dependency
+- updated description
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:20.4-1
 - 20.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Aug 2005 20:01:05 -0000	1.7
+++ sources	22 Jan 2006 18:01:49 -0000	1.8
@@ -1 +1 @@
-562834a27ffe522a5cf88eb10b26fb89  moodss-20.4.tar.bz2
+1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 19:54:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 14:54:33 -0500
Subject: rpms/xfce4-taskmanager/FC-3 xfce4-taskmanager.spec,1.1,1.2
Message-ID: <200601221955.k0MJt5SU029551@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29534

Modified Files:
	xfce4-taskmanager.spec 
Log Message:
Add startup-notification-devel BR for core 3


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/FC-3/xfce4-taskmanager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-taskmanager.spec	21 Jan 2006 20:17:12 -0000	1.1
+++ xfce4-taskmanager.spec	22 Jan 2006 19:54:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-taskmanager
 Version:	0.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Taskmanager for the Xfce desktop environment
 
 Group:		User Interface/Desktops
@@ -10,7 +10,8 @@
 Source1:	xfce4-taskmanager.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils
+BuildRequires:	libxfcegui4-devel >= 4.2, startup-notification-devel
+BuildRequires:	gettext, desktop-file-utils
 
 %description
 A simple taskmanager for the Xfce desktop environment.
@@ -46,6 +47,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Jan 22 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
+- Add startup-notification-devel requires.
+
 * Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2
 - Initial Fedora Extras version.
 - Add xfce4-taskmanager.desktop.



From fedora-extras-commits at redhat.com  Sun Jan 22 19:58:01 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 14:58:01 -0500
Subject: rpms/xfce4-taskmanager/FC-3 xfce4-taskmanager.spec,1.2,1.3
Message-ID: <200601221958.k0MJwXbm029611@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594

Modified Files:
	xfce4-taskmanager.spec 
Log Message:
fix year in changelog, it's 2006


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/FC-3/xfce4-taskmanager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-taskmanager.spec	22 Jan 2006 19:54:32 -0000	1.2
+++ xfce4-taskmanager.spec	22 Jan 2006 19:58:01 -0000	1.3
@@ -47,7 +47,7 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Sun Jan 22 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
 - Add startup-notification-devel requires.
 
 * Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2



From fedora-extras-commits at redhat.com  Sun Jan 22 20:08:44 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 22 Jan 2006 15:08:44 -0500
Subject: rpms/util-vserver/devel util-vserver.spec, 1.15, 1.16 sources, 1.7, 
	1.8 util-vserver-0.30.209-yum24.patch, 1.1,
	NONE util-vserver-0.30.209-dietfix.patch, 1.1, NONE
Message-ID: <200601222009.k0MK9G0r031445@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31426

Modified Files:
	util-vserver.spec sources 
Removed Files:
	util-vserver-0.30.209-yum24.patch 
	util-vserver-0.30.209-dietfix.patch 
Log Message:
- version 0.30.210
- removed patches which were from upstream
- do not require 'xalan' anymore by default
- removed 'Requires: apt'; apt-rpm is not maintained upstream anymore
- removed 'chattr' leftovers
- create the '/etc/vservers/.defaults/cachebase' symlink
- added /var/cache/vservers and the needed support
- set barrier attribute on /vservers/.pkg and /vservers/.hash
- added 'centos-release' to the list of packages in the copy-the-keys
  trigger script
- create '/vservers/.hash' and add initial configuration for it



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- util-vserver.spec	3 Nov 2005 18:04:20 -0000	1.15
+++ util-vserver.spec	22 Jan 2006 20:08:43 -0000	1.16
@@ -2,17 +2,14 @@
 
 ## This package understands the following switches:
 ## --without dietlibc        ...   disable usage of dietlibc
-## --without xalan           ...   do not require/use the xalan xslt processor
 ## --with    xalan           ...   require/use the xalan xslt processor
 
 ## Fedora Extras specific customization below...
-%{!?_with_xalan:%global _without_xalan	--without xalan}
 ##
 
 %global confdir		%_sysconfdir/vservers
 %global confdefaultdir	%confdir/.defaults
 %global pkglibdir	%_libdir/%name
-%global __chattr	/usr/bin/chattr
 %global chkconfig	/sbin/chkconfig
 
 %global _localstatedir	%_var
@@ -22,16 +19,13 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.209
-Release:	%release_func 4
+Version:	0.30.210
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2
 Source1:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.209-dietfix.patch
-# http://savannah.nongnu.org/cgi-bin/viewcvs/util-vserver/util-vserver/scripts/vyum-worker.diff?r1=1.5&r2=1.6
-Patch1:		util-vserver-0.30.209-yum24.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -43,14 +37,14 @@
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
 BuildRequires:	doxygen tetex-latex
-## HACK; 'make check' fails there and I do not know how to debug it
+## HACK; 'make check' fails there due to a kernel bug
 ## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
 ExcludeArch:	ppc
-Requires(post):		%__chattr
+Requires(post):		%name-core
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
 %{!?_without_dietlibc:BuildRequires:	dietlibc >= 0:0.25}
-%{!?_without_xalan:BuildRequires:	xalan-j}
+%{?_with_xalan:BuildRequires:	xalan-j}
 
 %package lib
 Summary:		Dynamic libraries for util-vserver
@@ -68,10 +62,7 @@
 Requires:		%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
-
-%ifarch %ix86
-Requires:		apt
-%endif
+Requires(post):		%name-core
 
 %package sysv
 Summary:		SysV-initscripts for vserver
@@ -176,8 +167,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dietfix
-%patch1 -p2 -b .yum24
 
 
 %build
@@ -211,10 +200,15 @@
 test -d /vservers      || mkdir -m0000 /vservers
 test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg
 
-f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers                        "$f"
-f="%confdefaultdir/run.rev";  test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f"
+f="%confdefaultdir/vdirbase";  test -L "$f" -o -e "$f" || ln -s /vservers                        "$f"
+f="%confdefaultdir/run.rev";   test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f"
+f="%confdefaultdir/cachebase"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/cache/vservers   "$f"
+
+%_sbindir/setattr --barrier /vservers /vservers/.pkg || :
+
 
-%_sbindir/setattr --barrier /vservers || :
+%preun
+test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 
 
 %post   lib -p /sbin/ldconfig
@@ -238,7 +232,7 @@
 test "$1" = 0  || %_initrddir/vprocunhide condrestart >/dev/null || :
 
 
-%triggerin build -- fedora-release
+%triggerin build -- fedora-release, centos-release
 function copy()
 {
     base=$1
@@ -251,13 +245,20 @@
 	cp -a "$i" "$target"
     done
 }
-
 copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-*
 copy fedora /etc/pki/rpm-gpg/RPM-GPG-*
-
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%post build
+test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
+
+f="%confdefaultdir/apps/vunify/hash"; test -e "$f"/method -o -e "$f"/00 || \
+	ln -s /vservers/.hash "$f"/00
+
+%_sbindir/setattr --barrier /vservers/.hash || :
+
+
 %preun build
 test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-*
 
@@ -306,9 +307,11 @@
 %dir %confdefaultdir/apps
 %dir %confdefaultdir/files
 %dir %pkglibdir/defaults
+%ghost %confdefaultdir/cachebase
 %ghost %confdefaultdir/vdirbase
 %ghost %confdefaultdir/run.rev
 
+%dir %_localstatedir/cache/vservers
 %dir %_localstatedir/run/vservers
 %dir %_localstatedir/run/vservers.rev
 %dir %_localstatedir/run/vshelper
@@ -347,6 +350,21 @@
 
 
 %changelog
+* Sun Jan 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-1
+- version 0.30.210
+- removed patches which were from upstream
+
+* Sun Jan 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-0
+- do not require 'xalan' anymore by default
+- removed 'Requires: apt'; apt-rpm is not maintained upstream anymore
+- removed 'chattr' leftovers
+- create the '/etc/vservers/.defaults/cachebase' symlink
+- added /var/cache/vservers and the needed support
+- set barrier attribute on /vservers/.pkg and /vservers/.hash
+- added 'centos-release' to the list of packages in the copy-the-keys
+  trigger script
+- create '/vservers/.hash' and add initial configuration for it
+
 * Thu Nov  3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.209-4
 - exclude PPC from build; see
   https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Oct 2005 10:44:10 -0000	1.7
+++ sources	22 Jan 2006 20:08:43 -0000	1.8
@@ -1,2 +1,2 @@
-674b122824292c20d3c53245b91f6088  util-vserver-0.30.209.tar.bz2
-f1386336cb8ec360ad7f440ab69ea21d  util-vserver-0.30.209.tar.bz2.asc
+1e8fff7cb6246d21ed029f082123019b  util-vserver-0.30.210.tar.bz2
+46625942d7064edeaa167ae5525694b7  util-vserver-0.30.210.tar.bz2.asc


--- util-vserver-0.30.209-yum24.patch DELETED ---


--- util-vserver-0.30.209-dietfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 20:24:01 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 15:24:01 -0500
Subject: rpms/xfce4-sensors-plugin/FC-4 xfce4-sensors-plugin.spec,1.1,1.2
Message-ID: <200601222024.k0MKOYkE031536@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31519

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
ExcludeArch ppc for there is no lm_sensors for power pc


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-4/xfce4-sensors-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-sensors-plugin.spec	21 Jan 2006 20:48:34 -0000	1.1
+++ xfce4-sensors-plugin.spec	22 Jan 2006 20:24:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
 Requires:	lm_sensors >= 2.8
+ExcludeArch:	ppc
 
 %description
 This plugin displays various hardware sensor values in the Xfce panel.
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
+- ExcludeArch ppc.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 20:45:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 15:45:44 -0500
Subject: rpms/xfce4-sensors-plugin/FC-3 xfce4-sensors-plugin.spec,1.1,1.2
Message-ID: <200601222046.k0MKkGnF031718@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31701

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
ExcludeArch ppc for there is no lm_sensors for power pc


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-3/xfce4-sensors-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-sensors-plugin.spec	21 Jan 2006 20:48:34 -0000	1.1
+++ xfce4-sensors-plugin.spec	22 Jan 2006 20:45:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
 Requires:	lm_sensors >= 2.8
+ExcludeArch:	ppc
 
 %description
 This plugin displays various hardware sensor values in the Xfce panel.
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
+- ExcludeArch ppc.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 20:47:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 15:47:56 -0500
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec,1.1,1.2
Message-ID: <200601222048.k0MKmTN6031784@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31767

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
ExcludeArch ppc for there is no lm_sensors for power pc


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-sensors-plugin.spec	21 Jan 2006 20:48:34 -0000	1.1
+++ xfce4-sensors-plugin.spec	22 Jan 2006 20:47:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
 Requires:	lm_sensors >= 2.8
+ExcludeArch:	ppc
 
 %description
 This plugin displays various hardware sensor values in the Xfce panel.
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
+- ExcludeArch ppc.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 20:55:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 22 Jan 2006 15:55:07 -0500
Subject: rpms/dosbox/devel dosbox.spec,1.13,1.14
Message-ID: <200601222055.k0MKtdmQ031814@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31797

Modified Files:
	dosbox.spec 
Log Message:
- rebuild/dist



Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dosbox.spec	30 May 2005 19:44:28 -0000	1.13
+++ dosbox.spec	22 Jan 2006 20:55:07 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.63
-Release:        6
+Release:        7%{?dist}
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -71,6 +71,11 @@
 
 
 %changelog
+* Sun Jan 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.64-7
+- add dist
+- rebuild
+
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.64-6
 - add a x86_64 bugfix from upstream 



From fedora-extras-commits at redhat.com  Sun Jan 22 21:51:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 22 Jan 2006 16:51:24 -0500
Subject: rpms/doctorj/devel .cvsignore, 1.2, NONE Makefile, 1.2,
	NONE doctorj-improperseq.patch, 1.1,
	NONE doctorj-precision.patch, 1.1, NONE doctorj-yagol.patch, 1.1,
	NONE doctorj.spec, 1.11, NONE sources, 1.2, NONE
Message-ID: <200601222151.k0MLpQ08001345@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1336/devel

Removed Files:
	.cvsignore Makefile doctorj-improperseq.patch 
	doctorj-precision.patch doctorj-yagol.patch doctorj.spec 
	sources 
Log Message:
Orphaned long enough and does not build with g++ 4.1 -> dropped.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- doctorj-improperseq.patch DELETED ---


--- doctorj-precision.patch DELETED ---


--- doctorj-yagol.patch DELETED ---


--- doctorj.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 21:53:38 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 22 Jan 2006 16:53:38 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.5,1.6
Message-ID: <200601222154.k0MLsBkU001379@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1361

Modified Files:
	ldns.spec 
Log Message:
version update



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ldns.spec	9 Jan 2006 02:34:27 -0000	1.5
+++ ldns.spec	22 Jan 2006 21:53:38 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -77,7 +77,7 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-2
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
 - Upgraded to 1.0.1. Removed temporary clean hack from spec file.
 
 * Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8



From fedora-extras-commits at redhat.com  Sun Jan 22 21:55:02 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 22 Jan 2006 16:55:02 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.6,1.7
Message-ID: <200601222155.k0MLtYaN001440@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1420

Modified Files:
	ldns.spec 
Log Message:
bump version



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ldns.spec	22 Jan 2006 21:53:38 -0000	1.6
+++ ldns.spec	22 Jan 2006 21:55:02 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 22 21:57:52 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 22 Jan 2006 16:57:52 -0500
Subject: rpms/ldns/FC-3 ldns.spec,1.3,1.4
Message-ID: <200601222158.k0MLwOGI001516@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499

Modified Files:
	ldns.spec 
Log Message:
* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
- Upgraded to 1.0.1. Removed temporary clean hack from spec file.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-3/ldns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
+++ ldns.spec	22 Jan 2006 21:57:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.0.0
-Release: 7%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -25,21 +25,20 @@
 
 %prep
 %setup -q 
-rm config.sub config.guess
-libtoolize
-autoreconf
-# only for 2.3.3, since upstream left .o files in release
-make clean
+
+#libtoolize
+#autoreconf
 
 %configure
 
 
 %build
-%{__make} %{?_smp_mflags} allautoconf
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} drill
-%{__make} %{?_smp_mflags} examples
-%{__make} %{?_smp_mflags} doc
+make %{?_smp_mflags} clean
+make %{?_smp_mflags} allautoconf
+make %{?_smp_mflags}
+make %{?_smp_mflags} drill
+make %{?_smp_mflags} examples
+make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
@@ -78,8 +77,17 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+- Upgraded to 1.0.1. Removed temporary clean hack from spec file.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8
+- Cannot use make clean because there are no Makefiles. Use hardcoded rm.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-7
+- Patched 'make clean' target to get rid of object files shipped with 1.0.0
+
 * Sun Dec 13 2005 Paul Wouters <paul at xelerance.com> 1.0.0-6
-- added a make clean for 1.0.0 since .o files were left behind upstream,
+- added a make clean for 2.3.3 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.0-5



From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:14 -0500
Subject: rpms/xfce4-fsguard-plugin - New directory
Message-ID: <200601222335.k0MNZGAp005306@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5298/xfce4-fsguard-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-fsguard-plugin added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:20 -0500
Subject: rpms/xfce4-fsguard-plugin/devel - New directory
Message-ID: <200601222335.k0MNZMDY005321@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5298/xfce4-fsguard-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-fsguard-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:39 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:39 -0500
Subject: rpms/xfce4-fsguard-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601222335.k0MNZfZS005355@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5343

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-fsguard-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-fsguard-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:44 -0500
Subject: rpms/xfce4-fsguard-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601222335.k0MNZkjE005376@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5343/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-fsguard-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:36:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:36:36 -0500
Subject: rpms/xfce4-fsguard-plugin import.log,1.1,1.2
Message-ID: <200601222337.k0MNb9nC005444@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5410

Modified Files:
	import.log 
Log Message:
auto-import xfce4-fsguard-plugin-0.2.1-2.fc4 on branch devel from xfce4-fsguard-plugin-0.2.1-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 23:35:38 -0000	1.1
+++ import.log	22 Jan 2006 23:36:36 -0000	1.2
@@ -0,0 +1 @@
+xfce4-fsguard-plugin-0_2_1-2_fc4:HEAD:xfce4-fsguard-plugin-0.2.1-2.fc4.src.rpm:1137972988



From fedora-extras-commits at redhat.com  Sun Jan 22 23:36:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:36:42 -0500
Subject: rpms/xfce4-fsguard-plugin/devel xfce4-fsguard-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601222337.k0MNbEe6005448@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5410/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-fsguard-plugin.spec 
Log Message:
auto-import xfce4-fsguard-plugin-0.2.1-2.fc4 on branch devel from xfce4-fsguard-plugin-0.2.1-2.fc4.src.rpm


--- NEW FILE xfce4-fsguard-plugin.spec ---
Name:		xfce4-fsguard-plugin
Version:	0.2.1
Release:	2%{?dist}
Summary:	Filesystem-Guard plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
A little Xfce plugin, which checks the free space on the chosen mountpoint 
frequently. It displays 4 different icons and a message box, depending on the
free space. The amount of free disk space is visible in a tooltip. If you 
left-click on its icon, it opens the mountpoint directory in the file manager.

%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 -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-fsguard

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-fsguard.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-1
- Initial Fedora Extras version.
- Update to 0.2.1.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 23:35:44 -0000	1.1
+++ .cvsignore	22 Jan 2006 23:36:42 -0000	1.2
@@ -0,0 +1 @@
+xfce4-fsguard-plugin-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 23:35:44 -0000	1.1
+++ sources	22 Jan 2006 23:36:42 -0000	1.2
@@ -0,0 +1 @@
+6fa6c2b734ee8d4c0a5901f6d704b6c9  xfce4-fsguard-plugin-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 22 23:38:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:38:52 -0500
Subject: rpms/xfce4-netload-plugin - New directory
Message-ID: <200601222338.k0MNcs74005538@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530/xfce4-netload-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-netload-plugin added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:38:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:38:58 -0500
Subject: rpms/xfce4-netload-plugin/devel - New directory
Message-ID: <200601222339.k0MNd0ID005553@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530/xfce4-netload-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-netload-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:39:19 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:39:19 -0500
Subject: rpms/xfce4-netload-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601222339.k0MNdL7B005587@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-netload-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-netload-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:39:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:39:24 -0500
Subject: rpms/xfce4-netload-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601222339.k0MNdQgr005607@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-netload-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:40:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:40:10 -0500
Subject: rpms/xfce4-netload-plugin import.log,1.1,1.2
Message-ID: <200601222340.k0MNehbt005677@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643

Modified Files:
	import.log 
Log Message:
auto-import xfce4-netload-plugin-0.3.3-3.fc4 on branch devel from xfce4-netload-plugin-0.3.3-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 23:39:18 -0000	1.1
+++ import.log	22 Jan 2006 23:40:10 -0000	1.2
@@ -0,0 +1 @@
+xfce4-netload-plugin-0_3_3-3_fc4:HEAD:xfce4-netload-plugin-0.3.3-3.fc4.src.rpm:1137973203



From fedora-extras-commits at redhat.com  Sun Jan 22 23:40:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:40:16 -0500
Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601222340.k0MNemwM005681@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-netload-plugin.spec 
Log Message:
auto-import xfce4-netload-plugin-0.3.3-3.fc4 on branch devel from xfce4-netload-plugin-0.3.3-3.fc4.src.rpm


--- NEW FILE xfce4-netload-plugin.spec ---
Name:		xfce4-netload-plugin
Version:	0.3.3
Release:	3%{?dist}
Summary:	Network-load monitor for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
A network-load monitor plugin for the Xfce panel.

%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 -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-netload

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-netload.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1.fc4.cw
- Updated to version 0.3.3.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-1.fc4.cw
- Updated to version 0.3.2.
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc3.cw
- Updated to version 0.3.1.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.3-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 23:39:24 -0000	1.1
+++ .cvsignore	22 Jan 2006 23:40:16 -0000	1.2
@@ -0,0 +1 @@
+xfce4-netload-plugin-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 23:39:24 -0000	1.1
+++ sources	22 Jan 2006 23:40:16 -0000	1.2
@@ -0,0 +1 @@
+7a0483c77240200f1a918a1a3c5e0b33  xfce4-netload-plugin-0.3.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 23:58:06 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:58:06 -0500
Subject: owners owners.list,1.561,1.562
Message-ID: <200601222358.k0MNwdTS005765@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5748

Modified Files:
	owners.list 
Log Message:
add xfce4-fsguard-plugin & xfce4-netload-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -r1.561 -r1.562
--- owners.list	22 Jan 2006 17:48:34 -0000	1.561
+++ owners.list	22 Jan 2006 23:58:06 -0000	1.562
@@ -1319,6 +1319,7 @@
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1326,6 +1327,7 @@
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mount-plugin|Mount/unmount utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-netload-plugin|Network-load monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 23 05:58:45 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:58:45 -0500
Subject: rpms/libibverbs import.log,1.2,1.3
Message-ID: <200601230559.k0N5xHvP017488@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17454

Modified Files:
	import.log 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch devel from libibverbs-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	26 Oct 2005 04:28:24 -0000	1.2
+++ import.log	23 Jan 2006 05:58:44 -0000	1.3
@@ -1 +1,2 @@
 libibverbs-1_0-0_2_rc4:HEAD:libibverbs-1.0-0.2.rc4.src.rpm:1130300901
+libibverbs-1_0-0_3_rc5:HEAD:libibverbs-1.0-0.3.rc5.src.rpm:1137995921



From fedora-extras-commits at redhat.com  Mon Jan 23 05:58:51 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:58:51 -0500
Subject: rpms/libibverbs/devel .cvsignore, 1.2, 1.3 libibverbs.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230559.k0N5xNxr017493@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17454/devel

Modified Files:
	.cvsignore libibverbs.spec sources 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch devel from libibverbs-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Oct 2005 04:28:24 -0000	1.2
+++ .cvsignore	23 Jan 2006 05:58:51 -0000	1.3
@@ -1 +1 @@
-libibverbs-1.0-rc4.tar.gz
+libibverbs-1.0-rc5.tar.gz


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libibverbs.spec	26 Oct 2005 04:28:24 -0000	1.1
+++ libibverbs.spec	23 Jan 2006 05:58:51 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libibverbs
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sysfsutils-devel
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Oct 2005 04:28:24 -0000	1.2
+++ sources	23 Jan 2006 05:58:51 -0000	1.3
@@ -1 +1 @@
-c0c757f35f19da472e313b1b6ca8827c  libibverbs-1.0-rc4.tar.gz
+a5ce940009d55d2a9f30575873e28964  libibverbs-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 05:59:53 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:59:53 -0500
Subject: rpms/libmthca import.log,1.2,1.3
Message-ID: <200601230600.k0N60Phg017598@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17556

Modified Files:
	import.log 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch devel from libmthca-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmthca/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Nov 2005 00:41:32 -0000	1.2
+++ import.log	23 Jan 2006 05:59:53 -0000	1.3
@@ -1 +1,2 @@
 libmthca-1_0-0_2_rc4:HEAD:libmthca-1.0-0.2.rc4.src.rpm:1131064890
+libmthca-1_0-0_3_rc5:HEAD:libmthca-1.0-0.3.rc5.src.rpm:1137995990



From fedora-extras-commits at redhat.com  Mon Jan 23 05:59:59 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:59:59 -0500
Subject: rpms/libmthca/devel .cvsignore, 1.2, 1.3 libmthca.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230600.k0N60Vlb017603@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17556/devel

Modified Files:
	.cvsignore libmthca.spec sources 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch devel from libmthca-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Nov 2005 00:41:38 -0000	1.2
+++ .cvsignore	23 Jan 2006 05:59:58 -0000	1.3
@@ -1 +1 @@
-libmthca-1.0-rc4.tar.gz
+libmthca-1.0-rc5.tar.gz


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmthca.spec	4 Nov 2005 00:41:38 -0000	1.1
+++ libmthca.spec	23 Jan 2006 05:59:58 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libmthca
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Nov 2005 00:41:38 -0000	1.2
+++ sources	23 Jan 2006 05:59:58 -0000	1.3
@@ -1 +1 @@
-c20df941bea20a059316eac38a20b1a2  libmthca-1.0-rc4.tar.gz
+8fca7cdccbdb5296a126bdd190c6096b  libmthca-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 06:06:18 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:06:18 -0500
Subject: rpms/libmthca import.log,1.3,1.4
Message-ID: <200601230606.k0N66oc7019413@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19379

Modified Files:
	import.log 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch FC-4 from libmthca-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmthca/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Jan 2006 05:59:53 -0000	1.3
+++ import.log	23 Jan 2006 06:06:17 -0000	1.4
@@ -1,2 +1,3 @@
 libmthca-1_0-0_2_rc4:HEAD:libmthca-1.0-0.2.rc4.src.rpm:1131064890
 libmthca-1_0-0_3_rc5:HEAD:libmthca-1.0-0.3.rc5.src.rpm:1137995990
+libmthca-1_0-0_3_rc5:FC-4:libmthca-1.0-0.3.rc5.src.rpm:1137996363



From fedora-extras-commits at redhat.com  Mon Jan 23 06:06:39 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:06:39 -0500
Subject: rpms/libmthca/FC-4 .cvsignore, 1.2, 1.3 libmthca.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230607.k0N67HBd019419@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19379/FC-4

Modified Files:
	.cvsignore libmthca.spec sources 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch FC-4 from libmthca-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Nov 2005 00:41:38 -0000	1.2
+++ .cvsignore	23 Jan 2006 06:06:38 -0000	1.3
@@ -1 +1 @@
-libmthca-1.0-rc4.tar.gz
+libmthca-1.0-rc5.tar.gz


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/libmthca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmthca.spec	4 Nov 2005 00:41:38 -0000	1.1
+++ libmthca.spec	23 Jan 2006 06:06:38 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libmthca
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Nov 2005 00:41:38 -0000	1.2
+++ sources	23 Jan 2006 06:06:38 -0000	1.3
@@ -1 +1 @@
-c20df941bea20a059316eac38a20b1a2  libmthca-1.0-rc4.tar.gz
+8fca7cdccbdb5296a126bdd190c6096b  libmthca-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 06:08:44 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:08:44 -0500
Subject: rpms/libibverbs import.log,1.3,1.4
Message-ID: <200601230609.k0N69dPc019524@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19486

Modified Files:
	import.log 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch FC-4 from libibverbs-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Jan 2006 05:58:44 -0000	1.3
+++ import.log	23 Jan 2006 06:08:44 -0000	1.4
@@ -1,2 +1,3 @@
 libibverbs-1_0-0_2_rc4:HEAD:libibverbs-1.0-0.2.rc4.src.rpm:1130300901
 libibverbs-1_0-0_3_rc5:HEAD:libibverbs-1.0-0.3.rc5.src.rpm:1137995921
+libibverbs-1_0-0_3_rc5:FC-4:libibverbs-1.0-0.3.rc5.src.rpm:1137996521



From fedora-extras-commits at redhat.com  Mon Jan 23 06:09:10 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:09:10 -0500
Subject: rpms/libibverbs/FC-4 .cvsignore, 1.2, 1.3 libibverbs.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230609.k0N69gKL019529@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19486/FC-4

Modified Files:
	.cvsignore libibverbs.spec sources 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch FC-4 from libibverbs-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Oct 2005 04:28:24 -0000	1.2
+++ .cvsignore	23 Jan 2006 06:09:10 -0000	1.3
@@ -1 +1 @@
-libibverbs-1.0-rc4.tar.gz
+libibverbs-1.0-rc5.tar.gz


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libibverbs.spec	26 Oct 2005 04:28:24 -0000	1.1
+++ libibverbs.spec	23 Jan 2006 06:09:10 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libibverbs
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sysfsutils-devel
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Oct 2005 04:28:24 -0000	1.2
+++ sources	23 Jan 2006 06:09:10 -0000	1.3
@@ -1 +1 @@
-c0c757f35f19da472e313b1b6ca8827c  libibverbs-1.0-rc4.tar.gz
+a5ce940009d55d2a9f30575873e28964  libibverbs-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 07:45:35 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Jan 2006 02:45:35 -0500
Subject: rpms/testdisk/devel testdisk.spec,1.1,1.2
Message-ID: <200601230746.k0N7k7nX021831@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21814

Modified Files:
	testdisk.spec 
Log Message:
Update spec file



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testdisk.spec	22 Jan 2006 17:24:03 -0000	1.1
+++ testdisk.spec	23 Jan 2006 07:45:35 -0000	1.2
@@ -4,7 +4,7 @@
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
 Version:	6.2
-Release:	2
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -57,6 +57,10 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Mon Jan 23 2006 Christophe Group <grenier at cgsecurity.org>
+- 6.2-3
+- same spec for all arches hence add dist
+
 * Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
 - 5.0
 



From fedora-extras-commits at redhat.com  Mon Jan 23 07:47:13 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Jan 2006 02:47:13 -0500
Subject: rpms/testdisk/FC-3 testdisk.spec,1.1,1.2
Message-ID: <200601230747.k0N7ljbZ021903@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21871/FC-3

Modified Files:
	testdisk.spec 
Log Message:
Same spec file for all dist



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/testdisk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testdisk.spec	22 Jan 2006 17:24:03 -0000	1.1
+++ testdisk.spec	23 Jan 2006 07:47:13 -0000	1.2
@@ -4,7 +4,7 @@
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
 Version:	6.2
-Release:	2
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -57,6 +57,10 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Mon Jan 23 2006 Christophe Group <grenier at cgsecurity.org>
+- 6.2-3
+- same spec for all arches hence add dist
+
 * Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
 - 5.0
 



From fedora-extras-commits at redhat.com  Mon Jan 23 07:47:19 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Jan 2006 02:47:19 -0500
Subject: rpms/testdisk/FC-4 testdisk.spec,1.1,1.2
Message-ID: <200601230747.k0N7lppk021906@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21871/FC-4

Modified Files:
	testdisk.spec 
Log Message:
Same spec file for all dist



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/testdisk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testdisk.spec	22 Jan 2006 17:24:03 -0000	1.1
+++ testdisk.spec	23 Jan 2006 07:47:18 -0000	1.2
@@ -4,7 +4,7 @@
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
 Version:	6.2
-Release:	2
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -57,6 +57,10 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Mon Jan 23 2006 Christophe Group <grenier at cgsecurity.org>
+- 6.2-3
+- same spec for all arches hence add dist
+
 * Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
 - 5.0
 



From fedora-extras-commits at redhat.com  Mon Jan 23 07:57:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 02:57:34 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.11, 1.12 rxvt-unicode.spec,
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200601230758.k0N7w6nL022102@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jan 2006 21:54:03 -0000	1.11
+++ .cvsignore	23 Jan 2006 07:57:34 -0000	1.12
@@ -1 +1 @@
-rxvt-unicode-7.1.tar.bz2
+rxvt-unicode-7.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rxvt-unicode.spec	19 Jan 2006 21:54:03 -0000	1.13
+++ rxvt-unicode.spec	23 Jan 2006 07:57:34 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.1
+Version:        7.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.2-1
+- version upgrade (should resolve #178561)
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jan 2006 21:54:03 -0000	1.11
+++ sources	23 Jan 2006 07:57:34 -0000	1.12
@@ -1 +1 @@
-2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2
+8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 07:57:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 02:57:39 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.11, 1.12 rxvt-unicode.spec,
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200601230758.k0N7wCCk022107@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jan 2006 21:54:09 -0000	1.11
+++ .cvsignore	23 Jan 2006 07:57:39 -0000	1.12
@@ -1 +1 @@
-rxvt-unicode-7.1.tar.bz2
+rxvt-unicode-7.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rxvt-unicode.spec	19 Jan 2006 21:54:09 -0000	1.13
+++ rxvt-unicode.spec	23 Jan 2006 07:57:39 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.1
+Version:        7.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.2-1
+- version upgrade (should resolve #178561)
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jan 2006 21:54:09 -0000	1.11
+++ sources	23 Jan 2006 07:57:39 -0000	1.12
@@ -1 +1 @@
-2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2
+8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 07:57:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 02:57:45 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.11, 1.12 rxvt-unicode.spec,
	1.17, 1.18 sources, 1.11, 1.12
Message-ID: <200601230758.k0N7wHOk022112@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jan 2006 21:54:15 -0000	1.11
+++ .cvsignore	23 Jan 2006 07:57:45 -0000	1.12
@@ -1 +1 @@
-rxvt-unicode-7.1.tar.bz2
+rxvt-unicode-7.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rxvt-unicode.spec	20 Jan 2006 08:30:30 -0000	1.17
+++ rxvt-unicode.spec	23 Jan 2006 07:57:45 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.1
+Version:        7.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,7 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
-%changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.2-1
+- version upgrade (should resolve #178561)
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jan 2006 21:54:15 -0000	1.11
+++ sources	23 Jan 2006 07:57:45 -0000	1.12
@@ -1 +1 @@
-2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2
+8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 08:00:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 03:00:56 -0500
Subject: rpms/fluxconf/FC-4 .cvsignore, 1.3, 1.4 fluxconf.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200601230801.k0N81SaY023898@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxconf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130/FC-4

Modified Files:
	.cvsignore fluxconf.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 May 2005 22:12:53 -0000	1.3
+++ .cvsignore	23 Jan 2006 08:00:55 -0000	1.4
@@ -1 +1 @@
-fluxconf-0.9.8.tar.gz
+fluxconf-0.9.9.tar.gz


Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-4/fluxconf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fluxconf.spec	16 Oct 2005 21:19:38 -0000	1.8
+++ fluxconf.spec	23 Jan 2006 08:00:55 -0000	1.9
@@ -1,13 +1,13 @@
 Name:		fluxconf
-Version:	0.9.8
-Release:	2%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 
 Summary:	Configuration utility for fluxbox
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://devaux.fabien.free.fr/flux
-Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
+Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.9.tar.gz
 Patch0:         fluxconf-Makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,6 +51,10 @@
 %lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.9-1
+- version upgrade
+
 * Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.8-2
 - use %lang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 May 2005 22:12:53 -0000	1.3
+++ sources	23 Jan 2006 08:00:55 -0000	1.4
@@ -1 +1 @@
-b4e17b45fcec48d04c1c16e75836b6b7  fluxconf-0.9.8.tar.gz
+ac37b12410daa06128f8eb29163a741d  fluxconf-0.9.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 08:00:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 03:00:50 -0500
Subject: rpms/fluxconf/FC-3 .cvsignore, 1.3, 1.4 fluxconf.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601230801.k0N81MVj023893@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxconf/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130/FC-3

Modified Files:
	.cvsignore fluxconf.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 May 2005 22:04:08 -0000	1.3
+++ .cvsignore	23 Jan 2006 08:00:50 -0000	1.4
@@ -1 +1 @@
-fluxconf-0.9.8.tar.gz
+fluxconf-0.9.9.tar.gz


Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-3/fluxconf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fluxconf.spec	31 May 2005 22:04:08 -0000	1.4
+++ fluxconf.spec	23 Jan 2006 08:00:50 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		fluxconf
-Version:	0.9.8
+Version:	0.9.9
 Release:	1%{?dist}
 Epoch:		0
 Summary:	Configuration utility for fluxbox
@@ -7,19 +7,14 @@
 Group:          User Interface/Desktops 
 License:	GPL
 Url:		http://devaux.fabien.free.fr/flux
-
-
-Source:		http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
+Source:		http://devaux.fabien.free.fr/flux/fluxconf-0.9.9.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
 Requires:	fluxbox
 
-
-
 %description
-
 Fluxbox graphical configuration utilities:
 fluxconf: a general configuration tool
 fluxkeys: keyboard shortcut configuration tool  
@@ -59,10 +54,14 @@
 %defattr(0644,root,root,0755)
 %doc ChangeLog README COPYING AUTHORS NEWS docs/*.png docs/*.html
 %defattr(0444,root,root)
-%{_prefix}/share/locale/fi/LC_MESSAGES/%{name}.mo
-%{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
+%lang(fi) %{_prefix}/share/locale/fi/LC_MESSAGES/%{name}.mo
+%lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.9-1
+- version upgrade
+
 * Tue May 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - upgrade to 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 May 2005 22:04:08 -0000	1.3
+++ sources	23 Jan 2006 08:00:50 -0000	1.4
@@ -1 +1 @@
-b4e17b45fcec48d04c1c16e75836b6b7  fluxconf-0.9.8.tar.gz
+ac37b12410daa06128f8eb29163a741d  fluxconf-0.9.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 08:01:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 03:01:05 -0500
Subject: rpms/fluxconf/devel .cvsignore, 1.2, 1.3 fluxconf.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200601230801.k0N81eV8023905@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxconf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130/devel

Modified Files:
	.cvsignore fluxconf.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:19:32 -0000	1.2
+++ .cvsignore	23 Jan 2006 08:01:02 -0000	1.3
@@ -1 +1 @@
-fluxconf-0.9.7.tar.gz
+fluxconf-0.9.9.tar.gz


Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fluxconf.spec	16 Oct 2005 21:19:38 -0000	1.8
+++ fluxconf.spec	23 Jan 2006 08:01:02 -0000	1.9
@@ -1,13 +1,13 @@
 Name:		fluxconf
-Version:	0.9.8
-Release:	2%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 
 Summary:	Configuration utility for fluxbox
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://devaux.fabien.free.fr/flux
-Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
+Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.9.tar.gz
 Patch0:         fluxconf-Makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,6 +51,10 @@
 %lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.9-1
+- version upgrade
+
 * Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.8-2
 - use %lang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jun 2005 10:57:56 -0000	1.3
+++ sources	23 Jan 2006 08:01:04 -0000	1.4
@@ -1 +1 @@
-b4e17b45fcec48d04c1c16e75836b6b7  fluxconf-0.9.8.tar.gz
+ac37b12410daa06128f8eb29163a741d  fluxconf-0.9.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 08:37:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Jan 2006 03:37:12 -0500
Subject: fedora-security/audit fc4,1.132,1.133 fc5,1.42,1.43
Message-ID: <200601230837.k0N8bCul024094@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24074

Modified Files:
	fc4 fc5 
Log Message:
(Many times I say aaagh instead of php)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- fc4	21 Jan 2006 01:38:10 -0000	1.132
+++ fc4	23 Jan 2006 08:37:04 -0000	1.133
@@ -3,10 +3,12 @@
 
 ** are items that need attention
 
+CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERALBE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
-CVE-2006-0200 version (aaph, 5.1.0 5.1.1 only)
+CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- fc5	18 Jan 2006 13:51:40 -0000	1.42
+++ fc5	23 Jan 2006 08:37:04 -0000	1.43
@@ -15,6 +15,8 @@
 
 ** are items that need attention
 
+CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERABLE (php)
 CVE-2006-0207 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Mon Jan 23 09:09:22 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Jan 2006 04:09:22 -0500
Subject: fedora-security/audit fc4,1.133,1.134 fc5,1.43,1.44
Message-ID: <200601230909.k0N99Mua026169@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26151

Modified Files:
	fc4 fc5 
Log Message:
Deal with issues over the last few days



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- fc4	23 Jan 2006 08:37:04 -0000	1.133
+++ fc4	23 Jan 2006 09:08:59 -0000	1.134
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060115
-Up to date FC4 as of 20060115
+Up to date CVE as of CVE email 20060122
+Up to date FC4 as of 20060122
 
 ** are items that need attention
 
@@ -17,6 +17,7 @@
 CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
+CVE-2006-0019 backport (kdelibs) [since FEDORA-2006-050]
 CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- fc5	23 Jan 2006 08:37:04 -0000	1.43
+++ fc5	23 Jan 2006 09:08:59 -0000	1.44
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060115
+Up to date CVE as of CVE email 20060122
 Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -30,6 +30,7 @@
 CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2006-0019 VULNERABLE (kdelibs)
 CVE-2005-4639 version (kernel, fixed 2.6.15)
 CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Mon Jan 23 09:42:03 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 23 Jan 2006 04:42:03 -0500
Subject: rpms/enigma/devel enigma.spec,1.10,1.11
Message-ID: <200601230942.k0N9gaeh026659@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26635

Modified Files:
	enigma.spec 
Log Message:
* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.92-2
- Added patch to build with gcc 4.1



Index: enigma.spec
===================================================================
RCS file: /cvs/extras/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- enigma.spec	25 Jun 2005 11:37:57 -0000	1.10
+++ enigma.spec	23 Jan 2006 09:42:03 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           enigma
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.nongnu.org/enigma/
 Source0:        http://savannah.nongnu.org/download/enigma/enigma-0.92.tar.gz
+Patch0:         enigma-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2  SDL_image-devel >= 1.2 SDL_mixer-devel >= 1.2.4
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-optimize
@@ -63,6 +65,9 @@
 %{_datadir}/applications/*enigma.desktop
 
 %changelog
+* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.92-2
+- Added patch to build with gcc 4.1
+
 * Sat May 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.92-1
 - Update to 0.92
 - Use disttag



From fedora-extras-commits at redhat.com  Mon Jan 23 09:48:19 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 23 Jan 2006 04:48:19 -0500
Subject: rpms/enigma/devel enigma-gcc41.patch,NONE,1.1
Message-ID: <200601230948.k0N9mLHP026735@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26723

Added Files:
	enigma-gcc41.patch 
Log Message:
* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.92-2
- Added patch to build with gcc 4.1


enigma-gcc41.patch:

--- NEW FILE enigma-gcc41.patch ---
diff -ur enigma-0.92/src/file_internal.hh enigma-0.92.new/src/file_internal.hh
--- enigma-0.92/src/file_internal.hh	2004-10-22 19:26:25.000000000 +0200
+++ enigma-0.92.new/src/file_internal.hh	2006-01-23 08:34:49.000000000 +0100
@@ -19,7 +19,7 @@
 
     class GameFS {
     public:
-        GameFS::GameFS();
+        GameFS();
 
         void clear() { entries.clear(); }

diff -ur enigma-0.92/src/stones_simple.cc enigma-0.92.new/src/stones_simple.cc
--- enigma-0.92/src/stones_simple.cc	2005-03-02 21:33:36.000000000 +0100
+++ enigma-0.92.new/src/stones_simple.cc	2006-01-23 08:39:51.000000000 +0100
@@ -1672,7 +1672,7 @@
             KillStone(p);
             SetItem(p, it_explosion1);
         }
-        void BombStone::message(const string &msg, const Value &) {
+        void message(const string &msg, const Value &) {
             if (msg =="expl" || msg =="bombstone")
                 change_state(BREAK);
         }



From fedora-extras-commits at redhat.com  Mon Jan 23 13:17:33 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 08:17:33 -0500
Subject: rpms/digikam/devel digikam.spec,1.19,1.20
Message-ID: <200601231318.k0NDI688001971@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1951

Modified Files:
	digikam.spec 
Log Message:
- Add some stuff to BuildRequires (finally fix bug #178031)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- digikam.spec	17 Jan 2006 16:36:04 -0000	1.19
+++ digikam.spec	23 Jan 2006 13:17:32 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -10,9 +10,10 @@
 Patch0:		digikam-0.8.0-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
-BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext libtool-ltdl-devel
+BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
+BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
+BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
+BuildRequires:	desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -118,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
+- Add some stuff to BuildRequires (finally fix bug #178031)
+
 * Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
 - Remove redundant BuildRequires (bug #178031)
 



From fedora-extras-commits at redhat.com  Mon Jan 23 14:03:14 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 23 Jan 2006 09:03:14 -0500
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.7, 1.8 gaim-meanwhile.spec, 
	1.11, 1.12 sources, 1.7, 1.8 g-mw-empty-message-crash.patch, 1.2,
	NONE g-mw-empty-title-crash.patch, 1.2, NONE
Message-ID: <200601231403.k0NE3phL003996@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3971

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Removed Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jan 2006 18:07:49 -0000	1.7
+++ .cvsignore	23 Jan 2006 14:03:14 -0000	1.8
@@ -1 +1 @@
-gaim-meanwhile-1.2.7.tar.gz
+gaim-meanwhile-1.2.8.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gaim-meanwhile.spec	13 Jan 2006 20:58:25 -0000	1.11
+++ gaim-meanwhile.spec	23 Jan 2006 14:03:14 -0000	1.12
@@ -6,23 +6,19 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
-Patch0:         g-mw-empty-title-crash.patch
-Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -43,7 +39,12 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
-* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+* Mon Jan 23 2006 - jwboyer at jdub.homelinux.org 1.2.8-1
+- Update to latest release
+- Remove patches (in upstream)
+- Fix typo in last changelog
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-3
 - Fix patches to have the correct strip level.  Gah.
 
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Jan 2006 18:07:49 -0000	1.7
+++ sources	23 Jan 2006 14:03:14 -0000	1.8
@@ -1 +1 @@
-890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz
+da891cb5304776ace34ce63c7f666172  gaim-meanwhile-1.2.8.tar.gz


--- g-mw-empty-message-crash.patch DELETED ---


--- g-mw-empty-title-crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 15:32:09 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 10:32:09 -0500
Subject: rpms/gtk-qt-engine/devel gtk-qt-engine-0.6-dt.patch, NONE,
	1.1 gtk-qt-engine.spec, 1.15, 1.16
Message-ID: <200601231532.k0NFWg6C006997@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6977

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-0.6-dt.patch 
Log Message:
* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
- don't dup "GTK Styles and fonts" in KDE menu(s)
- drop Req: kdebase


gtk-qt-engine-0.6-dt.patch:

--- NEW FILE gtk-qt-engine-0.6-dt.patch ---
--- gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop.dt	2004-08-22 03:40:29.000000000 -0500
+++ gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop	2006-01-23 09:28:15.000000000 -0600
@@ -12,3 +12,5 @@
 X-KDE-Library=kcmgtk
 X-KDE-ModuleType=Library
 Type=Application
+
+NotShowIn=KDE


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gtk-qt-engine.spec	27 Oct 2005 15:19:56 -0000	1.15
+++ gtk-qt-engine.spec	23 Jan 2006 15:32:09 -0000	1.16
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -34,7 +34,8 @@
 ## build fails w/gcc-2.9x:
 ## http://bugs.freedesktop.org/show_bug.cgi?id=4676
 Patch1: gtk-qt-engine-gcc29.patch
-
+## don't dup GTK-QT in kde menu(s)
+Patch2: gtk-qt-engine-0.6-dt.patch
 
 BuildRequires: automake17
 
@@ -45,9 +46,6 @@
 BuildRequires: kdelibs-devel >= 6:3.3
 BuildRequires: libpng-devel
 
-# For KDE Control center
-Requires: kdebase
-
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
@@ -61,6 +59,7 @@
 
 %{!?cvs:%patch0 -p0 -b .x86_64}
 %{?gcc296:%patch1 -p1 -b .gcc29}
+%patch2 -p1 -b .dt
 %patch3919 -p1 -b .3919
 %patch3983 -p1 -b .3983
 
@@ -75,8 +74,8 @@
 
 %configure \
   --disable-rpath \
-  %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
@@ -101,15 +100,19 @@
 %files -f gtkqtengine.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
-%{_datadir}/themes/Qt
-%{_datadir}/gtk-qt-engine
+%{_datadir}/themes/Qt/
+%{_datadir}/gtk-qt-engine/
 %{_datadir}/applications/*.desktop
-%{_datadir}/applnk/Settings/*/*.desktop
+%{_datadir}/applnk/Settings/LookNFeel/*.desktop
 %{_libdir}/gtk-2.0/*/engines/*
 %{_libdir}/kde3/kcm_*.*
 
 
 %changelog 
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+- don't dup "GTK Styles and fonts" in KDE menu(s)
+- drop Req: kdebase
+
 * Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
 - revert to 0.6.
 - Req: kdebase



From fedora-extras-commits at redhat.com  Mon Jan 23 15:33:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 10:33:56 -0500
Subject: rpms/gtk-qt-engine/FC-4 gtk-qt-engine.spec,1.8,1.9
Message-ID: <200601231534.k0NFYTeQ007069@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018

Modified Files:
	gtk-qt-engine.spec 
Log Message:
* Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
- revert to 0.6.
- Req: kdebase
- cleanout unused crud
- fix gtk/cairo crasher (fdo bug #3214)
- segfault in libqtengine.so drawing notebook (fdo bug #3919)



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/gtk-qt-engine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-qt-engine.spec	27 Oct 2005 15:21:52 -0000	1.8
+++ gtk-qt-engine.spec	23 Jan 2006 15:33:56 -0000	1.9
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -34,7 +34,8 @@
 ## build fails w/gcc-2.9x:
 ## http://bugs.freedesktop.org/show_bug.cgi?id=4676
 Patch1: gtk-qt-engine-gcc29.patch
-
+## don't dup GTK-QT in kde menu(s)
+Patch2: gtk-qt-engine-0.6-dt.patch
 
 BuildRequires: automake17
 
@@ -45,9 +46,6 @@
 BuildRequires: kdelibs-devel >= 6:3.3
 BuildRequires: libpng-devel
 
-# For KDE Control center
-Requires: kdebase
-
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
@@ -61,6 +59,7 @@
 
 %{!?cvs:%patch0 -p0 -b .x86_64}
 %{?gcc296:%patch1 -p1 -b .gcc29}
+%patch2 -p1 -b .dt
 %patch3919 -p1 -b .3919
 %patch3983 -p1 -b .3983
 
@@ -75,8 +74,8 @@
 
 %configure \
   --disable-rpath \
-  %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
@@ -101,15 +100,19 @@
 %files -f gtkqtengine.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
-%{_datadir}/themes/Qt
-%{_datadir}/gtk-qt-engine
+%{_datadir}/themes/Qt/
+%{_datadir}/gtk-qt-engine/
 %{_datadir}/applications/*.desktop
-%{_datadir}/applnk/Settings/*/*.desktop
+%{_datadir}/applnk/Settings/LookNFeel/*.desktop
 %{_libdir}/gtk-2.0/*/engines/*
 %{_libdir}/kde3/kcm_*.*
 
 
 %changelog 
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+- don't dup "GTK Styles and fonts" in KDE menu(s)
+- drop Req: kdebase
+
 * Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
 - revert to 0.6.
 - Req: kdebase



From fedora-extras-commits at redhat.com  Mon Jan 23 15:48:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 23 Jan 2006 10:48:40 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.13,1.14
Message-ID: <200601231549.k0NFnCCC007175@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7156

Modified Files:
	xchat-gnome.spec 
Log Message:
* Mon Jan 23 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-3
- Bump.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xchat-gnome.spec	21 Jan 2006 05:15:10 -0000	1.13
+++ xchat-gnome.spec	23 Jan 2006 15:48:40 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           xchat-gnome
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-3
+- Bump.
+
 * Sat Jan 21 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-2
 - Add xchat_gnome_url_handler.schemas to scriptlet.
 



From fedora-extras-commits at redhat.com  Mon Jan 23 16:00:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 11:00:54 -0500
Subject: rpms/gtk-qt-engine/FC-4 gtk-qt-engine-0.6-dt.patch, NONE,
	1.1 gtk-qt-engine.spec, 1.9, 1.10
Message-ID: <200601231601.k0NG1ViC008954@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240/FC-4

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-0.6-dt.patch 
Log Message:
Release++, add missed patch in FC-4 branch


gtk-qt-engine-0.6-dt.patch:

--- NEW FILE gtk-qt-engine-0.6-dt.patch ---
--- gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop.dt	2004-08-22 03:40:29.000000000 -0500
+++ gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop	2006-01-23 09:28:15.000000000 -0600
@@ -12,3 +12,5 @@
 X-KDE-Library=kcmgtk
 X-KDE-ModuleType=Library
 Type=Application
+
+NotShowIn=KDE


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/gtk-qt-engine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-qt-engine.spec	23 Jan 2006 15:33:56 -0000	1.9
+++ gtk-qt-engine.spec	23 Jan 2006 16:00:54 -0000	1.10
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -109,7 +109,7 @@
 
 
 %changelog 
-* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-7
 - don't dup "GTK Styles and fonts" in KDE menu(s)
 - drop Req: kdebase
 



From fedora-extras-commits at redhat.com  Mon Jan 23 16:01:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 11:01:00 -0500
Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.16,1.17
Message-ID: <200601231601.k0NG1W5u008957@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240/devel

Modified Files:
	gtk-qt-engine.spec 
Log Message:
Release++, add missed patch in FC-4 branch



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtk-qt-engine.spec	23 Jan 2006 15:32:09 -0000	1.16
+++ gtk-qt-engine.spec	23 Jan 2006 16:01:00 -0000	1.17
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -109,7 +109,7 @@
 
 
 %changelog 
-* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-7
 - don't dup "GTK Styles and fonts" in KDE menu(s)
 - drop Req: kdebase
 



From fedora-extras-commits at redhat.com  Mon Jan 23 17:12:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:12:47 -0500
Subject: rpms/perl-Pod-Simple/FC-3 .cvsignore, 1.3, 1.4 perl-Pod-Simple.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601231713.k0NHDJGw011176@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Simple/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/FC-3

Modified Files:
	.cvsignore perl-Pod-Simple.spec sources 
Log Message:
Update to 3.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:36:13 -0000	1.3
+++ .cvsignore	23 Jan 2006 17:12:47 -0000	1.4
@@ -1 +1 @@
-Pod-Simple-3.03.tar.gz
+Pod-Simple-3.04.tar.gz


Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-3/perl-Pod-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Pod-Simple.spec	22 Nov 2005 11:36:13 -0000	1.5
+++ perl-Pod-Simple.spec	23 Jan 2006 17:12:47 -0000	1.6
@@ -1,18 +1,18 @@
 Name:           perl-Pod-Simple
-Version:        3.03
+Version:        3.04
 Release:        1%{?dist}
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Simple/
-Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AR/ARANDAL/Pod-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  perl(Pod::Escapes)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Pod::Simple is a Perl library for parsing text in the Pod ("plain old
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.04-1
+- Update to 3.04.
+
 * Tue Nov 22 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.03-1
 - Update to 3.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 11:36:13 -0000	1.3
+++ sources	23 Jan 2006 17:12:47 -0000	1.4
@@ -1 +1 @@
-8b29d147d00245bffa39b2e97d9fe7b0  Pod-Simple-3.03.tar.gz
+bf566103b75c7955d0880da3ce268744  Pod-Simple-3.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:12:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:12:53 -0500
Subject: rpms/perl-Pod-Simple/FC-4 .cvsignore, 1.3, 1.4 perl-Pod-Simple.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601231713.k0NHDPXi011183@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/FC-4

Modified Files:
	.cvsignore perl-Pod-Simple.spec sources 
Log Message:
Update to 3.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:36:18 -0000	1.3
+++ .cvsignore	23 Jan 2006 17:12:53 -0000	1.4
@@ -1 +1 @@
-Pod-Simple-3.03.tar.gz
+Pod-Simple-3.04.tar.gz


Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-4/perl-Pod-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Pod-Simple.spec	22 Nov 2005 11:36:18 -0000	1.7
+++ perl-Pod-Simple.spec	23 Jan 2006 17:12:53 -0000	1.8
@@ -1,18 +1,18 @@
 Name:           perl-Pod-Simple
-Version:        3.03
+Version:        3.04
 Release:        1%{?dist}
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Simple/
-Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AR/ARANDAL/Pod-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  perl(Pod::Escapes)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Pod::Simple is a Perl library for parsing text in the Pod ("plain old
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.04-1
+- Update to 3.04.
+
 * Tue Nov 22 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.03-1
 - Update to 3.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 11:36:18 -0000	1.3
+++ sources	23 Jan 2006 17:12:53 -0000	1.4
@@ -1 +1 @@
-8b29d147d00245bffa39b2e97d9fe7b0  Pod-Simple-3.03.tar.gz
+bf566103b75c7955d0880da3ce268744  Pod-Simple-3.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:12:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:12:59 -0500
Subject: rpms/perl-Pod-Simple/devel .cvsignore, 1.3, 1.4 perl-Pod-Simple.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601231713.k0NHDVjb011190@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/devel

Modified Files:
	.cvsignore perl-Pod-Simple.spec sources 
Log Message:
Update to 3.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:36:23 -0000	1.3
+++ .cvsignore	23 Jan 2006 17:12:59 -0000	1.4
@@ -1 +1 @@
-Pod-Simple-3.03.tar.gz
+Pod-Simple-3.04.tar.gz


Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/perl-Pod-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Pod-Simple.spec	22 Nov 2005 11:36:23 -0000	1.7
+++ perl-Pod-Simple.spec	23 Jan 2006 17:12:59 -0000	1.8
@@ -1,18 +1,18 @@
 Name:           perl-Pod-Simple
-Version:        3.03
+Version:        3.04
 Release:        1%{?dist}
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Simple/
-Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AR/ARANDAL/Pod-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  perl(Pod::Escapes)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Pod::Simple is a Perl library for parsing text in the Pod ("plain old
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.04-1
+- Update to 3.04.
+
 * Tue Nov 22 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.03-1
 - Update to 3.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 11:36:23 -0000	1.3
+++ sources	23 Jan 2006 17:12:59 -0000	1.4
@@ -1 +1 @@
-8b29d147d00245bffa39b2e97d9fe7b0  Pod-Simple-3.03.tar.gz
+bf566103b75c7955d0880da3ce268744  Pod-Simple-3.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:25:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:25:55 -0500
Subject: rpms/perl-HTTP-Server-Simple/FC-4 .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601231726.k0NHQVxY011441@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11402/FC-4

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Nov 2005 18:23:42 -0000	1.4
+++ .cvsignore	23 Jan 2006 17:25:54 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-0.16.tar.gz
+HTTP-Server-Simple-0.17.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple.spec	10 Nov 2005 18:23:42 -0000	1.4
+++ perl-HTTP-Server-Simple.spec	23 Jan 2006 17:25:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.16
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 HTTP::Server::Simple is a very simple standalone HTTP daemon with no non-core
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.17-1
+- Update to 0.17.
+
 * Tue Nov  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.16-1
 - Update to 0.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2005 18:23:42 -0000	1.4
+++ sources	23 Jan 2006 17:25:54 -0000	1.5
@@ -1 +1 @@
-1dda81e7d0dbe40dd85635204a9fa060  HTTP-Server-Simple-0.16.tar.gz
+8fed9670c5d3b3802d6a9fa5eadccd8b  HTTP-Server-Simple-0.17.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:26:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:26:01 -0500
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601231726.k0NHQbhN011446@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11402/devel

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Nov 2005 18:23:47 -0000	1.4
+++ .cvsignore	23 Jan 2006 17:26:01 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-0.16.tar.gz
+HTTP-Server-Simple-0.17.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple.spec	10 Nov 2005 18:23:47 -0000	1.4
+++ perl-HTTP-Server-Simple.spec	23 Jan 2006 17:26:01 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.16
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 HTTP::Server::Simple is a very simple standalone HTTP daemon with no non-core
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.17-1
+- Update to 0.17.
+
 * Tue Nov  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.16-1
 - Update to 0.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2005 18:23:47 -0000	1.4
+++ sources	23 Jan 2006 17:26:01 -0000	1.5
@@ -1 +1 @@
-1dda81e7d0dbe40dd85635204a9fa060  HTTP-Server-Simple-0.16.tar.gz
+8fed9670c5d3b3802d6a9fa5eadccd8b  HTTP-Server-Simple-0.17.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:40:35 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 23 Jan 2006 12:40:35 -0500
Subject: rpms/giblib/devel giblib.spec,1.7,1.8
Message-ID: <200601231741.k0NHf8PE011608@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/giblib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11571/giblib/devel

Modified Files:
	giblib.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178653).



Index: giblib.spec
===================================================================
RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- giblib.spec	6 Apr 2005 22:11:38 -0000	1.7
+++ giblib.spec	23 Jan 2006 17:40:35 -0000	1.8
@@ -1,8 +1,7 @@
 Summary: Simple library and a wrapper for imlib2
 Name: giblib
 Version: 1.2.4
-Release: 3
-
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://linuxbrit.co.uk/giblib/
@@ -47,11 +46,9 @@
 %{__rm} -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -70,6 +67,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 1.2.4-4
+- Rebuilt for FC5.
+- Switch back /sbin/ldconfig calls to use -p.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Jan 23 17:40:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 23 Jan 2006 12:40:41 -0500
Subject: rpms/camE/devel camE.spec,1.7,1.8
Message-ID: <200601231741.k0NHfDsa011615@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/camE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11571/camE/devel

Modified Files:
	camE.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178653).



Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- camE.spec	14 Apr 2005 19:19:39 -0000	1.7
+++ camE.spec	23 Jan 2006 17:40:41 -0000	1.8
@@ -1,15 +1,14 @@
 Summary: Rewrite of the xawtv webcam app, which adds imlib2 support
 Name: camE
 Version: 1.9
-Release: 3
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
 URL: http://linuxbrit.co.uk/camE/
+Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: giblib >= 1.2.3
-BuildRequires: XFree86-devel, giblib-devel >= 1.2.3, imlib2-devel, curl-devel
-BuildRequires: zlib-devel
+BuildRequires: giblib-devel >= 1.2.3, imlib2-devel, curl-devel, zlib-devel
 
 %description
 camE is a rewrite of the xawtv webcam app, which adds imlib2 support and
@@ -36,10 +35,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING *.style example.camErc*
-%{_bindir}/%{name}
+%{_bindir}/camE
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 1.9-4
+- Remove explicit X build requirement since giblib-devel requires imlib2-devel
+  which in turn requires all necessary X development packages.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.9-3
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Jan 23 17:42:02 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 23 Jan 2006 12:42:02 -0500
Subject: fedora-security/audit fc4,1.134,1.135 fc5,1.44,1.45
Message-ID: <200601231742.k0NHg2P0011671@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11614

Modified Files:
	fc4 fc5 
Log Message:
Note a new openssh issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- fc4	23 Jan 2006 09:08:59 -0000	1.134
+++ fc4	23 Jan 2006 17:41:54 -0000	1.135
@@ -6,6 +6,7 @@
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
+CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
 CVE-2006-0208 VULNERALBE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
 CVE-2006-0200 version (php, 5.1.0 5.1.1 only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- fc5	23 Jan 2006 09:08:59 -0000	1.44
+++ fc5	23 Jan 2006 17:41:54 -0000	1.45
@@ -18,6 +18,7 @@
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
+CVE-2006-0225 VULNERABLE (openssh)
 CVE-2006-0208 VULNERABLE (php)
 CVE-2006-0207 VULNERABLE (php)
 CVE-2006-0200 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Mon Jan 23 18:23:28 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 23 Jan 2006 13:23:28 -0500
Subject: rpms/csmash/devel csmash-0.6.6-extraqualif.patch, NONE,
	1.1 csmash.spec, 1.9, 1.10
Message-ID: <200601231824.k0NIO0CP013569@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/csmash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13549

Modified Files:
	csmash.spec 
Added Files:
	csmash-0.6.6-extraqualif.patch 
Log Message:
Add modular X support, patch for gcc 4.1 and rebuild for FC5 (#178666).


csmash-0.6.6-extraqualif.patch:

--- NEW FILE csmash-0.6.6-extraqualif.patch ---
diff -Naupr csmash-0.6.6.orig/BallView.h csmash-0.6.6/BallView.h
--- csmash-0.6.6.orig/BallView.h	2003-07-13 17:26:24.000000000 +0200
+++ csmash-0.6.6/BallView.h	2006-01-23 18:43:13.000000000 +0100
@@ -32,7 +32,7 @@ public:
 
   static GLuint m_number[10];
 private:
-  void BallView::DrawTargetCircle();
+  void DrawTargetCircle();
   GLUquadricObj *m_quad;
 
   void DrawBall();


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- csmash.spec	24 May 2005 17:06:14 -0000	1.9
+++ csmash.spec	23 Jan 2006 18:23:27 -0000	1.10
@@ -1,16 +1,23 @@
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 9
+Release: 10%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://cannonsmash.sourceforge.net/
 Source: http://dl.sf.net/cannonsmash/csmash-%{version}.tar.gz
-Patch: csmash-0.6.6-64bit-gcc4-fixes.patch
+Patch0: csmash-0.6.6-64bit-gcc4-fixes.patch
+Patch1: csmash-0.6.6-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: Mesa-devel, libjpeg-devel, zlib-devel, gtk2-devel >= 2.0.0
+BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel, gcc-c++
 BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel
-BuildRequires: gcc-c++, desktop-file-utils
+BuildRequires: desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel, Mesa-devel
+%else
+BuildRequires: libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
+%endif
 
 %description
 CannonSmash is a 3D tabletennis game. The goal of this project is to
@@ -21,7 +28,8 @@
 
 %prep
 %setup
-%patch -p1 -b .64bit-gcc4
+%patch0 -p1 -b .64bit-gcc4
+%patch1 -p1 -b .extraqualif
 
 
 %build
@@ -67,6 +75,11 @@
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.6.6-10
+- Add conditional to build with/without modular X depending on FC version.
+- Include gcc 4.1 patch to fix "extra qualification" errors.
+- For some reason, adding libXt, libXext and libXmu to the build make it fail.
+
 * Tue May 24 2005 Matthias Saou <http://freshrpms.net/> 0.6.6-9
 - Update the gcc4 patch with diff from bug #156205.
 



From fedora-extras-commits at redhat.com  Mon Jan 23 19:55:09 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 23 Jan 2006 14:55:09 -0500
Subject: fedora-security/audit fc4,1.135,1.136 fc5,1.45,1.46
Message-ID: <200601231955.k0NJt9gT015573@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15550

Modified Files:
	fc4 fc5 
Log Message:
Note a new fetchmail issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- fc4	23 Jan 2006 17:41:54 -0000	1.135
+++ fc4	23 Jan 2006 19:55:02 -0000	1.136
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0321 ignore (fetchmail) 6.3.X only affected (fixed in 6.3.2)
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- fc5	23 Jan 2006 17:41:54 -0000	1.45
+++ fc5	23 Jan 2006 19:55:02 -0000	1.46
@@ -16,6 +16,7 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 VULNERABLE (openssh)



From fedora-extras-commits at redhat.com  Mon Jan 23 21:23:05 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 23 Jan 2006 16:23:05 -0500
Subject: rpms/cvsup/devel cvsup.spec,1.8,1.9
Message-ID: <200601232123.k0NLNcwn019343@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/cvsup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19325

Modified Files:
	cvsup.spec 
Log Message:
* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.16.1-9h
- rebuilt for modular X



Index: cvsup.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsup/devel/cvsup.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cvsup.spec	29 Mar 2005 20:41:04 -0000	1.8
+++ cvsup.spec	23 Jan 2006 21:23:05 -0000	1.9
@@ -7,7 +7,7 @@
 Summary: CVS-Optimized General-Purpose Network File Distribution System client
 Name: cvsup
 Version: 16.1
-Release: 8.h
+Release: 9.h
 URL: http://www.polstra.com/projects/freeware/CVSup/
 License: BSD
 Group: Applications/Internet
@@ -29,8 +29,9 @@
 Patch6: ezm3-1.2-ppc-jmpbufsize.patch
 Patch7: cvsup-gcc4.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: mktemp, sed, XFree86-devel, zlib-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: mktemp, sed, zlib-devel
+BuildRequires: libXt-devel libXmu-devel
 ExclusiveArch: i386 ppc
 
 %ifarch i386
@@ -121,7 +122,7 @@
 (cd %{m3name}-%{m3ver}; make BISON=yacc -f Makefile.%{M3TARGET})
 # ------------------------- End hackery ------------------------------ #
 # Now build cvsup -- whew!
-make PREFIX=%{_prefix} %{?_smp_mflags}
+make PREFIX=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -204,6 +205,9 @@
 %doc Acknowledgments Announce Blurb ChangeLog Install License doc examples
 
 %changelog
+* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.16.1-9h
+- rebuilt for modular X
+
 * Tue Mar 28 2005 Adrian Reber <adrian at lisas.de> - 0.16.1-8h
 - added gcc4 patch
 



From fedora-extras-commits at redhat.com  Mon Jan 23 21:33:50 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 23 Jan 2006 16:33:50 -0500
Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.7, 1.8 gaim-meanwhile.spec, 
	1.11, 1.12 sources, 1.8, 1.9 g-mw-empty-message-crash.patch, 1.2,
	NONE g-mw-empty-title-crash.patch, 1.2, NONE
Message-ID: <200601232134.k0NLYN1i019533@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19511

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Removed Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jan 2006 18:07:29 -0000	1.7
+++ .cvsignore	23 Jan 2006 21:33:49 -0000	1.8
@@ -1 +1 @@
-gaim-meanwhile-1.2.7.tar.gz
+gaim-meanwhile-1.2.8.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gaim-meanwhile.spec	13 Jan 2006 20:57:30 -0000	1.11
+++ gaim-meanwhile.spec	23 Jan 2006 21:33:49 -0000	1.12
@@ -6,23 +6,19 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
-Patch0:         g-mw-empty-title-crash.patch
-Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -43,7 +39,12 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
-* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+* Mon Jan 23 2006 - jwboyer at jdub.homelinux.org 1.2.8-1
+- Update to latest release
+- Remove patches (in upstream)
+- Fix typo in last changelog
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-3
 - Fix patches to have the correct strip level.  Gah.
 
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 18:07:29 -0000	1.8
+++ sources	23 Jan 2006 21:33:50 -0000	1.9
@@ -1 +1 @@
-890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz
+da891cb5304776ace34ce63c7f666172  gaim-meanwhile-1.2.8.tar.gz


--- g-mw-empty-message-crash.patch DELETED ---


--- g-mw-empty-title-crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 21:41:38 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 23 Jan 2006 16:41:38 -0500
Subject: rpms/pybliographer/FC-3 .cvsignore, 1.5, 1.6 pybliographer.spec, 1.7,
	1.8 sources, 1.5, 1.6 pybliographer.patch, 1.2, NONE
Message-ID: <200601232142.k0NLgBiI019662@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607/FC-3

Modified Files:
	.cvsignore pybliographer.spec sources 
Removed Files:
	pybliographer.patch 
Log Message:
Update to 1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2005 21:56:03 -0000	1.5
+++ .cvsignore	23 Jan 2006 21:41:38 -0000	1.6
@@ -1 +1 @@
-pybliographer-1.2.7.tar.gz
+pybliographer-1.2.8.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pybliographer.spec	20 Dec 2005 14:11:07 -0000	1.7
+++ pybliographer.spec	23 Jan 2006 21:41:38 -0000	1.8
@@ -1,11 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
-Patch0: pybliographer.patch
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.8.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -43,7 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -154,6 +152,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Zoltan Kota <z.kota at gmx.net> - 1.2.8-1
+- update to 1.2.8
+- drop patch, fixed upstream
+
 * Tue Dec 20 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-2
 - add patch for fixing different bugs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2005 21:56:03 -0000	1.5
+++ sources	23 Jan 2006 21:41:38 -0000	1.6
@@ -1 +1 @@
-c40c23565974f675e75d211bf0621e36  pybliographer-1.2.7.tar.gz
+3a4eaa405ce26347cbc42f6fb7854303  pybliographer-1.2.8.tar.gz


--- pybliographer.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 21:41:44 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 23 Jan 2006 16:41:44 -0500
Subject: rpms/pybliographer/FC-4 .cvsignore, 1.5, 1.6 pybliographer.spec,
	1.10, 1.11 sources, 1.5, 1.6 gnome-python.patch, 1.1,
	NONE pybliographer.patch, 1.2, NONE
Message-ID: <200601232142.k0NLgGku019667@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607/FC-4

Modified Files:
	.cvsignore pybliographer.spec sources 
Removed Files:
	gnome-python.patch pybliographer.patch 
Log Message:
Update to 1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2005 21:56:03 -0000	1.5
+++ .cvsignore	23 Jan 2006 21:41:44 -0000	1.6
@@ -1 +1 @@
-pybliographer-1.2.7.tar.gz
+pybliographer-1.2.8.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pybliographer.spec	20 Dec 2005 14:11:13 -0000	1.10
+++ pybliographer.spec	23 Jan 2006 21:41:44 -0000	1.11
@@ -1,12 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
-Patch0: pybliographer.patch
-Patch1: gnome-python.patch
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.8.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,8 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -156,6 +152,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Zoltan Kota <z.kota at gmx.net> - 1.2.8-1
+- update to 1.2.8
+- drop patches, fixed upstream
+
 * Tue Dec 20 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-2
 - add patches for fixing different bugs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2005 21:56:03 -0000	1.5
+++ sources	23 Jan 2006 21:41:44 -0000	1.6
@@ -1 +1 @@
-c40c23565974f675e75d211bf0621e36  pybliographer-1.2.7.tar.gz
+3a4eaa405ce26347cbc42f6fb7854303  pybliographer-1.2.8.tar.gz


--- gnome-python.patch DELETED ---


--- pybliographer.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 21:41:50 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 23 Jan 2006 16:41:50 -0500
Subject: rpms/pybliographer/devel .cvsignore, 1.5, 1.6 pybliographer.spec,
	1.11, 1.12 sources, 1.5, 1.6 gnome-python.patch, 1.1,
	NONE pybliographer.patch, 1.2, NONE
Message-ID: <200601232142.k0NLgMUm019672@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607/devel

Modified Files:
	.cvsignore pybliographer.spec sources 
Removed Files:
	gnome-python.patch pybliographer.patch 
Log Message:
Update to 1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2005 21:56:04 -0000	1.5
+++ .cvsignore	23 Jan 2006 21:41:50 -0000	1.6
@@ -1 +1 @@
-pybliographer-1.2.7.tar.gz
+pybliographer-1.2.8.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pybliographer.spec	20 Dec 2005 14:11:18 -0000	1.11
+++ pybliographer.spec	23 Jan 2006 21:41:50 -0000	1.12
@@ -1,12 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
-Patch0: pybliographer.patch
-Patch1: gnome-python.patch
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.8.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,8 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -156,6 +152,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Zoltan Kota <z.kota at gmx.net> - 1.2.8-1
+- update to 1.2.8
+- drop patches, fixed upstream
+
 * Tue Dec 20 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-2
 - add patches for fixing different bugs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2005 21:56:04 -0000	1.5
+++ sources	23 Jan 2006 21:41:50 -0000	1.6
@@ -1 +1 @@
-c40c23565974f675e75d211bf0621e36  pybliographer-1.2.7.tar.gz
+3a4eaa405ce26347cbc42f6fb7854303  pybliographer-1.2.8.tar.gz


--- gnome-python.patch DELETED ---


--- pybliographer.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 22:34:50 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 17:34:50 -0500
Subject: rpms/digikam/devel .cvsignore, 1.3, 1.4 digikam.spec, 1.20,
	1.21 sources, 1.3, 1.4 digikam-0.8.0-gcc41.patch, 1.1, NONE
Message-ID: <200601232235.k0NMZNfs021842@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21819

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.8.0-gcc41.patch 
Log Message:
- Add --enable-final
- Remove GCC 4.1 patch, applied upstream
- Update to version 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 15:20:30 -0000	1.3
+++ .cvsignore	23 Jan 2006 22:34:50 -0000	1.4
@@ -1,2 +1,3 @@
 digikam-0.7.4.tar.bz2
 digikam-0.8.0.tar.bz2
+digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- digikam.spec	23 Jan 2006 13:17:32 -0000	1.20
+++ digikam.spec	23 Jan 2006 22:34:50 -0000	1.21
@@ -1,13 +1,12 @@
 Name:		digikam
-Version:	0.8.0
-Release:	16%{?dist}
+Version:	0.8.1
+Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.8.0-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
@@ -39,7 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -48,7 +46,8 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -109,6 +108,7 @@
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*
+%{_datadir}/mimelnk/image/*.desktop
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -119,6 +119,11 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
+- Add --enable-final
+- Remove GCC 4.1 patch, applied upstream
+- Update to version 0.8.1
+
 * Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
 - Add some stuff to BuildRequires (finally fix bug #178031)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 15:20:30 -0000	1.3
+++ sources	23 Jan 2006 22:34:50 -0000	1.4
@@ -1 +1,2 @@
 9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
+2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2


--- digikam-0.8.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 22:42:20 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 23 Jan 2006 17:42:20 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.8, 1.9 mlmmj.spec, 1.18, 1.19 sources,
	1.8, 1.9
Message-ID: <200601232242.k0NMgqHo021923@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21902

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
- New upstream release (more bugfixes in address handling)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Jan 2006 13:27:50 -0000	1.8
+++ .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
@@ -1 +1 @@
-mlmmj-1.2.10.tar.bz2
+mlmmj-1.2.11.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mlmmj.spec	18 Jan 2006 13:27:50 -0000	1.18
+++ mlmmj.spec	23 Jan 2006 22:42:20 -0000	1.19
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
+- New upstream release (more bugfixes in address handling)
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
 - New upstream release. 1.2.9 has a serious bug in find_email_adr(), all
   should upgrade.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Jan 2006 13:27:50 -0000	1.8
+++ sources	23 Jan 2006 22:42:20 -0000	1.9
@@ -1 +1 @@
-09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2
+dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 22:44:40 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 23 Jan 2006 17:44:40 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.7, 1.8 mlmmj.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <200601232245.k0NMjCtB021982@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21959

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
- New upstream release (fixes to address handling/parsing).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 13:33:22 -0000	1.7
+++ .cvsignore	23 Jan 2006 22:44:39 -0000	1.8
@@ -1 +1 @@
-mlmmj-1.2.10.tar.bz2
+mlmmj-1.2.11.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlmmj.spec	18 Jan 2006 13:33:22 -0000	1.14
+++ mlmmj.spec	23 Jan 2006 22:44:39 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
+- New upstream release (fixes to address handling/parsing).
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
 - New upstream release. All users should upgrade.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 13:33:22 -0000	1.7
+++ sources	23 Jan 2006 22:44:39 -0000	1.8
@@ -1 +1 @@
-09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2
+dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 23:16:18 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 18:16:18 -0500
Subject: rpms/digikam/FC-3 .cvsignore, 1.5, 1.6 digikam.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601232316.k0NNGosq023985@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23951

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Add --disable-dependency-tracking & --enable-final
- Remove GCC 4.1 patch, applied upstream
- Update to version 0.8.1
- Add some stuff to BuildRequires (finally fix bug #178031)
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 12:00:56 -0000	1.5
+++ .cvsignore	23 Jan 2006 23:16:18 -0000	1.6
@@ -1,2 +1,3 @@
 digikam-0.7.4.tar.bz2
 digikam-0.8.0.tar.bz2
+digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- digikam.spec	21 Dec 2005 12:00:56 -0000	1.6
+++ digikam.spec	23 Jan 2006 23:16:18 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		digikam
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
@@ -9,9 +9,10 @@
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
-BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
+BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
+BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
+BuildRequires:	desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -39,12 +40,14 @@
 %setup -q
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -105,6 +108,7 @@
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*
+%{_datadir}/mimelnk/image/*.desktop
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -115,6 +119,57 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
+- Add --enable-final
+- Remove GCC 4.1 patch, applied upstream
+- Update to version 0.8.1
+
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
+- Add some stuff to BuildRequires (finally fix bug #178031)
+
+* Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
+- Remove redundant BuildRequires (bug #178031)
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
+- Remove --disable-dependency-tracking
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
+- Remove --enable-final (caused compilation errors)
+
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-dependency-tracking & --enable-final
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-11
+- Add libart_lgpl-devel and gamin-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-10
+- Add libacl-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-9
+- Add libidn-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-8
+- Fix compile on GCC 4.1
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-7
+- Remove autoreconf
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-6
+- Remove patch
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-5
+- Last chance to make it right (modular X.Org)
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-4
+- Try to build for modular X.Org
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-3
+- Add new paths for modular X.Org
+
+* Fri Dec 09 2005 Marcin Garski <mgarski at post.pl> 0.8.0-2
+- Work around for modular X.Org paths
+
 * Thu Dec 01 2005 Marcin Garski <mgarski at post.pl> 0.8.0-1
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 12:00:56 -0000	1.5
+++ sources	23 Jan 2006 23:16:18 -0000	1.6
@@ -1 +1,2 @@
 9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
+2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 23:17:38 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 18:17:38 -0500
Subject: rpms/digikam/FC-4 .cvsignore, 1.3, 1.4 digikam.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601232318.k0NNIAID024061@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24031

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Add --disable-dependency-tracking & --enable-final
- Remove GCC 4.1 patch, applied upstream
- Update to version 0.8.1
- Add some stuff to BuildRequires (finally fix bug #178031)
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 16:05:48 -0000	1.3
+++ .cvsignore	23 Jan 2006 23:17:38 -0000	1.4
@@ -1,2 +1,3 @@
 digikam-0.7.4.tar.bz2
 digikam-0.8.0.tar.bz2
+digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/digikam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- digikam.spec	1 Dec 2005 16:05:48 -0000	1.4
+++ digikam.spec	23 Jan 2006 23:17:38 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		digikam
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
@@ -9,9 +9,10 @@
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
-BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
+BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
+BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
+BuildRequires:	desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -39,12 +40,14 @@
 %setup -q
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -105,6 +108,7 @@
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*
+%{_datadir}/mimelnk/image/*.desktop
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -115,6 +119,57 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
+- Add --enable-final
+- Remove GCC 4.1 patch, applied upstream
+- Update to version 0.8.1
+
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
+- Add some stuff to BuildRequires (finally fix bug #178031)
+
+* Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
+- Remove redundant BuildRequires (bug #178031)
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
+- Remove --disable-dependency-tracking
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
+- Remove --enable-final (caused compilation errors)
+
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-dependency-tracking & --enable-final
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-11
+- Add libart_lgpl-devel and gamin-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-10
+- Add libacl-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-9
+- Add libidn-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-8
+- Fix compile on GCC 4.1
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-7
+- Remove autoreconf
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-6
+- Remove patch
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-5
+- Last chance to make it right (modular X.Org)
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-4
+- Try to build for modular X.Org
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-3
+- Add new paths for modular X.Org
+
+* Fri Dec 09 2005 Marcin Garski <mgarski at post.pl> 0.8.0-2
+- Work around for modular X.Org paths
+
 * Thu Dec 01 2005 Marcin Garski <mgarski at post.pl> 0.8.0-1
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 16:05:49 -0000	1.3
+++ sources	23 Jan 2006 23:17:38 -0000	1.4
@@ -1 +1,2 @@
 9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
+2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:11:41 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:11:41 -0500
Subject: extras-buildsys ChangeLog,1.126.2.29,1.126.2.30
Message-ID: <200601240111.k0O1BfYN028522@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28492

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
Update changelog for past changes


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.29
retrieving revision 1.126.2.30
diff -u -r1.126.2.29 -r1.126.2.30
--- ChangeLog	22 Jan 2006 06:07:37 -0000	1.126.2.29
+++ ChangeLog	24 Jan 2006 01:11:09 -0000	1.126.2.30
@@ -1,5 +1,18 @@
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
+    * server/Builder.py
+        - Move most of the building_jobs() logic into another thread to
+            combat hanging issues
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Be smarter about SSL stuff by using pending() where possible in a
+            vain effort not to hang as much.  Cribbed from rhn code by
+            misa at redhat
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
     * server/ArchJob.py
         - Don't traceback when killing jobs on builders
 



From fedora-extras-commits at redhat.com  Tue Jan 24 01:12:55 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:12:55 -0500
Subject: extras-buildsys/common SSLConnection.py,1.3.4.3,1.3.4.4
Message-ID: <200601240112.k0O1Ct80028577@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28536/common

Modified Files:
      Tag: STABLE_0_4
	SSLConnection.py 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- SSLConnection.py	22 Jan 2006 06:01:56 -0000	1.3.4.3
+++ SSLConnection.py	24 Jan 2006 01:12:41 -0000	1.3.4.4
@@ -29,12 +29,6 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
-
-        # Buffer stuff
-        self.__dict__["buffer_size"] = 16384
-        self.__dict__["pos"] = 0
-        self.__dict__["buffer"] = ""
-
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -82,76 +76,57 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-
-    def write(self, data, flags=0):
-        origlen = len(data)
-        sent = 0
+    def sendall(self, data, flags=0):
         while True:
-            try:
-                sent = self.__dict__["conn"].send(data)
-            except (SSL.WantReadError, SSL.WantWriteError):
-                continue
-            if sent == len(data):
-                break
-            data = data[sent:]
-
-        return origlen
-
-    def recv(self, amt):
-        return self.read(amt)
-
-    send = write
-
-    sendall = write
-
-    def tell(self):
-        return self.__dict__["pos"]
-
-    def seek(self, pos, mode=0):
-        raise NotImplementedError, "seek"
-
-    def read(self, amt, flags=0):
-        # Initially, the buffer size is the default buffer size.
-        # Unfortunately, pending() does not return meaningful data until
-        # recv() is called, so we only adjust the buffer size after the
-        # first read
-        buffer_size = self.__dict__["buffer_size"]
-        # Read only the specified amount of data
-        while amt is None or len(self.__dict__["buffer"]) < amt:
-            # if amt is None (read till the end), fills in self.__dict__["buffer"]
-            if amt is not None:
-                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
-
-            try:
-                data = self.__dict__["conn"].recv(buffer_size)
-            except SSL.ZeroReturnError:
-                # Nothing more to be read
-                break
-            except (SSL.WantReadError, SSL.WantWriteError):
-                # Try again
-                continue
-
-            self.__dict__["buffer"] = self.__dict__["buffer"] + data
-
-            # More bytes to read?
-            pending = self.__dict__["conn"].pending()
-            if pending == 0:
-                # we're done here
-                break
-
-        if amt:
-            ret = self.__dict__["buffer"][:amt]
-            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
-        else:
-            ret = self.__dict__["buffer"]
-            self.__dict__["buffer"] = ""
-
-        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
-        return ret
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in write:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].sendall(data, flags)
+                    except SSL.SysCallError, e:
+                        if e[0] == 32:      # Broken Pipe
+                            self.close()
+                        else:
+                            raise socket.error(e)
+                    except SSL.WantWriteError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
+    def recv(self, bufsize, flags=0):
+        while True:
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in read:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].recv(bufsize, flags)
+                    except SSL.ZeroReturnError:
+                        return None
+                    except SSL.WantReadError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
 
 class PlgFileObject(socket._fileobject):
-    def read(self, bufsize, flags=0):
-        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Tue Jan 24 01:12:43 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:12:43 -0500
Subject: extras-buildsys ChangeLog,1.126.2.30,1.126.2.31
Message-ID: <200601240113.k0O1DEkO028580@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28536

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.30
retrieving revision 1.126.2.31
diff -u -r1.126.2.30 -r1.126.2.31
--- ChangeLog	24 Jan 2006 01:11:09 -0000	1.126.2.30
+++ ChangeLog	24 Jan 2006 01:12:36 -0000	1.126.2.31
@@ -1,3 +1,8 @@
+2006-01-23  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Revert previous commit, causing too much trouble
+
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
     * server/Builder.py



From fedora-extras-commits at redhat.com  Tue Jan 24 01:19:08 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:19:08 -0500
Subject: extras-buildsys/common SSLConnection.py,1.6,1.7
Message-ID: <200601240119.k0O1J8Zs028643@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28609/common

Modified Files:
	SSLConnection.py 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SSLConnection.py	22 Jan 2006 05:59:12 -0000	1.6
+++ SSLConnection.py	24 Jan 2006 01:19:01 -0000	1.7
@@ -29,12 +29,6 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
-
-        # Buffer stuff
-        self.__dict__["buffer_size"] = 16384
-        self.__dict__["pos"] = 0
-        self.__dict__["buffer"] = ""
-
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -82,76 +76,57 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-
-    def write(self, data, flags=0):
-        origlen = len(data)
-        sent = 0
+    def sendall(self, data, flags=0):
         while True:
-            try:
-                sent = self.__dict__["conn"].send(data)
-            except (SSL.WantReadError, SSL.WantWriteError):
-                continue
-            if sent == len(data):
-                break
-            data = data[sent:]
-
-        return origlen
-
-    def recv(self, amt):
-        return self.read(amt)
-
-    send = write
-
-    sendall = write
-
-    def tell(self):
-        return self.__dict__["pos"]
-
-    def seek(self, pos, mode=0):
-        raise NotImplementedError, "seek"
-
-    def read(self, amt, flags=0):
-        # Initially, the buffer size is the default buffer size.
-        # Unfortunately, pending() does not return meaningful data until
-        # recv() is called, so we only adjust the buffer size after the
-        # first read
-        buffer_size = self.__dict__["buffer_size"]
-        # Read only the specified amount of data
-        while amt is None or len(self.__dict__["buffer"]) < amt:
-            # if amt is None (read till the end), fills in self.__dict__["buffer"]
-            if amt is not None:
-                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
-
-            try:
-                data = self.__dict__["conn"].recv(buffer_size)
-            except SSL.ZeroReturnError:
-                # Nothing more to be read
-                break
-            except (SSL.WantReadError, SSL.WantWriteError):
-                # Try again
-                continue
-
-            self.__dict__["buffer"] = self.__dict__["buffer"] + data
-
-            # More bytes to read?
-            pending = self.__dict__["conn"].pending()
-            if pending == 0:
-                # we're done here
-                break
-
-        if amt:
-            ret = self.__dict__["buffer"][:amt]
-            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
-        else:
-            ret = self.__dict__["buffer"]
-            self.__dict__["buffer"] = ""
-
-        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
-        return ret
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in write:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].sendall(data, flags)
+                    except SSL.SysCallError, e:
+                        if e[0] == 32:      # Broken Pipe
+                            self.close()
+                        else:
+                            raise socket.error(e)
+                    except SSL.WantWriteError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
+    def recv(self, bufsize, flags=0):
+        while True:
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in read:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].recv(bufsize, flags)
+                    except SSL.ZeroReturnError:
+                        return None
+                    except SSL.WantReadError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
 
 class PlgFileObject(socket._fileobject):
-    def read(self, bufsize, flags=0):
-        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Tue Jan 24 01:19:03 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:19:03 -0500
Subject: extras-buildsys ChangeLog,1.159,1.160
Message-ID: <200601240119.k0O1JXs5028646@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28609

Modified Files:
	ChangeLog 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog	22 Jan 2006 06:00:29 -0000	1.159
+++ ChangeLog	24 Jan 2006 01:18:55 -0000	1.160
@@ -1,3 +1,8 @@
+2006-01-23  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Revert previous commit, causing too much trouble
+
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
     * server/Builder.py



From fedora-extras-commits at redhat.com  Tue Jan 24 01:24:49 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:24:49 -0500
Subject: rpms/plague/devel plague.spec,1.21,1.22 sources,1.20,1.21
Message-ID: <200601240124.k0O1OpEv028715@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28694

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
- Revert SSL fixes from last build




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plague.spec	22 Jan 2006 06:18:22 -0000	1.21
+++ plague.spec	24 Jan 2006 01:24:49 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
+- Revert SSL fixes from last build
+
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
 - Don't traceback when killing jobs on builders
 - Work around SSL hanging issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	22 Jan 2006 06:18:22 -0000	1.20
+++ sources	24 Jan 2006 01:24:49 -0000	1.21
@@ -1 +1 @@
-dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2
+a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:25:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:25:23 -0500
Subject: rpms/plague/FC-4 plague.spec,1.19,1.20 sources,1.18,1.19
Message-ID: <200601240125.k0O1Ptm8028775@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28754

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
- Revert SSL fixes from last build




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plague.spec	22 Jan 2006 06:20:24 -0000	1.19
+++ plague.spec	24 Jan 2006 01:25:22 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
+- Revert SSL fixes from last build
+
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
 - Don't traceback when killing jobs on builders
 - Work around SSL hanging issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 06:20:24 -0000	1.18
+++ sources	24 Jan 2006 01:25:22 -0000	1.19
@@ -1 +1 @@
-dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2
+a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:26:34 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:26:34 -0500
Subject: rpms/plague/FC-3 plague.spec,1.19,1.20 sources,1.18,1.19
Message-ID: <200601240127.k0O1R6IO028801@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28781

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
- Revert SSL fixes from last build




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plague.spec	22 Jan 2006 06:21:25 -0000	1.19
+++ plague.spec	24 Jan 2006 01:26:34 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
+- Revert SSL fixes from last build
+
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
 - Don't traceback when killing jobs on builders
 - Work around SSL hanging issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 06:21:25 -0000	1.18
+++ sources	24 Jan 2006 01:26:34 -0000	1.19
@@ -1 +1 @@
-dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2
+a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:35:35 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:35:35 -0500
Subject: extras-buildsys/server Builder.py,1.20.2.5,1.20.2.6
Message-ID: <200601240135.k0O1ZZpe028920@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28902/server

Modified Files:
      Tag: STABLE_0_4
	Builder.py 
Log Message:
Restore builder connection timeout


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- Builder.py	22 Jan 2006 06:05:24 -0000	1.20.2.5
+++ Builder.py	24 Jan 2006 01:35:27 -0000	1.20.2.6
@@ -94,7 +94,7 @@
         else:
             certs = None
 
-        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
+        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
         self._server_lock = threading.Lock()
 
         threading.Thread.__init__(self)



From fedora-extras-commits at redhat.com  Tue Jan 24 01:36:04 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:36:04 -0500
Subject: extras-buildsys/server Builder.py,1.26,1.27
Message-ID: <200601240136.k0O1a42C028949@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931/server

Modified Files:
	Builder.py 
Log Message:
Restore builder connection timeout


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Builder.py	22 Jan 2006 06:00:35 -0000	1.26
+++ Builder.py	24 Jan 2006 01:35:57 -0000	1.27
@@ -93,7 +93,7 @@
             certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
             certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
 
-        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
+        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
         self._server_lock = threading.Lock()
 
         threading.Thread.__init__(self)



From fedora-extras-commits at redhat.com  Tue Jan 24 01:38:12 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:38:12 -0500
Subject: rpms/plague/devel plague.spec,1.22,1.23 sources,1.21,1.22
Message-ID: <200601240138.k0O1ciID028999@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28977

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
- Restore builder connection timeout




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plague.spec	24 Jan 2006 01:24:49 -0000	1.22
+++ plague.spec	24 Jan 2006 01:38:12 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
+- Restore builder connection timeout
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
 - Revert SSL fixes from last build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	24 Jan 2006 01:24:49 -0000	1.21
+++ sources	24 Jan 2006 01:38:12 -0000	1.22
@@ -1 +1 @@
-a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2
+e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:39:35 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:39:35 -0500
Subject: rpms/plague/FC-4 plague.spec,1.20,1.21 sources,1.19,1.20
Message-ID: <200601240140.k0O1e8BA029035@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
- Restore builder connection timeout




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plague.spec	24 Jan 2006 01:25:22 -0000	1.20
+++ plague.spec	24 Jan 2006 01:39:35 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
+- Restore builder connection timeout
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
 - Revert SSL fixes from last build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Jan 2006 01:25:22 -0000	1.19
+++ sources	24 Jan 2006 01:39:35 -0000	1.20
@@ -1 +1 @@
-a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2
+e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:40:22 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:40:22 -0500
Subject: rpms/plague/FC-3 plague.spec,1.20,1.21 sources,1.19,1.20
Message-ID: <200601240140.k0O1es53029060@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29041

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
- Restore builder connection timeout




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plague.spec	24 Jan 2006 01:26:34 -0000	1.20
+++ plague.spec	24 Jan 2006 01:40:22 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
+- Restore builder connection timeout
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
 - Revert SSL fixes from last build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Jan 2006 01:26:34 -0000	1.19
+++ sources	24 Jan 2006 01:40:22 -0000	1.20
@@ -1 +1 @@
-a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2
+e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 02:19:07 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 23 Jan 2006 21:19:07 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.7, 1.8 mlmmj.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <200601240219.k0O2JdvL031162@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31141

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
- New upstream release (Fixes for address handling).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 13:35:52 -0000	1.7
+++ .cvsignore	24 Jan 2006 02:19:07 -0000	1.8
@@ -1 +1 @@
-mlmmj-1.2.10.tar.bz2
+mlmmj-1.2.11.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlmmj.spec	18 Jan 2006 13:35:52 -0000	1.14
+++ mlmmj.spec	24 Jan 2006 02:19:07 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
+- New upstream release (Fixes for address handling).
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
 - New upstream release. All users should upgrade.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 13:35:52 -0000	1.7
+++ sources	24 Jan 2006 02:19:07 -0000	1.8
@@ -1 +1 @@
-09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2
+dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 03:39:30 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 23 Jan 2006 22:39:30 -0500
Subject: rpms/scim-anthy/FC-4 scim-anthy-wide-latin.diff, NONE,
	1.1 scim-anthy.spec, 1.22, 1.23
Message-ID: <200601240340.k0O3e3XG000766@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv746

Modified Files:
	scim-anthy.spec 
Added Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]

scim-anthy-wide-latin.diff:

--- NEW FILE scim-anthy-wide-latin.diff ---
--- src/scim_anthy_imengine.cpp.old	2006-01-20 22:53:48.000000000 +0900
+++ src/scim_anthy_imengine.cpp	2006-01-20 22:54:17.000000000 +0900
@@ -262,7 +262,7 @@
 
     // for wide Latin mode
     if (m_preedit.get_input_mode () == SCIM_ANTHY_MODE_WIDE_LATIN)
-        process_key_event_wide_latin_mode (key);
+        return process_key_event_wide_latin_mode (key);
 
     // for other mode
     if (get_typing_method () != SCIM_ANTHY_TYPING_METHOD_NICOLA ||


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scim-anthy.spec	1 Dec 2005 11:48:41 -0000	1.22
+++ scim-anthy.spec	24 Jan 2006 03:39:30 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           scim-anthy
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,6 +8,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
+Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -46,6 +48,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
+- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
+  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]
+
 * Thu Dec  1 2005 Akira TAGOH <tagoh at redhat.com> - 0.8.0-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Tue Jan 24 04:21:22 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 23 Jan 2006 23:21:22 -0500
Subject: rpms/scim-anthy/FC-3 scim-anthy-wide-latin.diff, NONE,
	1.1 scim-anthy.spec, 1.15, 1.16
Message-ID: <200601240421.k0O4LsXE002669@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2649

Modified Files:
	scim-anthy.spec 
Added Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]

scim-anthy-wide-latin.diff:

--- NEW FILE scim-anthy-wide-latin.diff ---
--- src/scim_anthy_imengine.cpp.old	2006-01-20 22:53:48.000000000 +0900
+++ src/scim_anthy_imengine.cpp	2006-01-20 22:54:17.000000000 +0900
@@ -262,7 +262,7 @@
 
     // for wide Latin mode
     if (m_preedit.get_input_mode () == SCIM_ANTHY_MODE_WIDE_LATIN)
-        process_key_event_wide_latin_mode (key);
+        return process_key_event_wide_latin_mode (key);
 
     // for other mode
     if (get_typing_method () != SCIM_ANTHY_TYPING_METHOD_NICOLA ||


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-anthy.spec	1 Dec 2005 11:39:47 -0000	1.15
+++ scim-anthy.spec	24 Jan 2006 04:21:22 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           scim-anthy
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,6 +8,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
+Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -46,6 +48,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
+- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
+  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]
+
 * Thu Dec  1 2005 Akira TAGOH <tagoh at redhat.com> - 0.8.0-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Tue Jan 24 08:24:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 24 Jan 2006 03:24:50 -0500
Subject: rpms/allegro/devel allegro-4.2.0-nostrip.patch, NONE,
	1.1 allegro.spec, 1.20, 1.21
Message-ID: <200601240825.k0O8PX1G011008@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10988

Modified Files:
	allegro.spec 
Added Files:
	allegro-4.2.0-nostrip.patch 
Log Message:
* Mon Jan 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-4
- add allegro-4.2.0-nostrip.patch, so that the main .so file
  doesn't get stripped and we actually get debuginfo for it in
  allegro-debuginfo


allegro-4.2.0-nostrip.patch:

--- NEW FILE allegro-4.2.0-nostrip.patch ---
--- allegro-4.2.0/misc/deplib.sh.nostrip	2006-01-23 21:35:02.000000000 +0100
+++ allegro-4.2.0/misc/deplib.sh	2006-01-23 21:35:09.000000000 +0100
@@ -70,7 +70,7 @@
 done
 echo "$prev"
 echo ""
-write_code alleg LIBALLEG -s
+write_code alleg LIBALLEG ""
 echo ""
 echo ""
 


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- allegro.spec	21 Jan 2006 08:08:41 -0000	1.20
+++ allegro.spec	24 Jan 2006 08:24:49 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        3
+Release:        4
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -14,6 +14,7 @@
 Source:         http://download.sourceforge.net/alleg/allegro-%{version}.tar.gz
 Patch1:         allegro-4.0.3-libdir.patch
 Patch2:         allegro-4.0.3-cfg.patch
+Patch3:         allegro-4.2.0-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -119,7 +120,7 @@
 %setup -q
 %patch1 -p0 -b .libdir
 %patch2 -p0 -b .cfg
-
+%patch3 -p1 -z .nostrip
 
 %build
 %configure \
@@ -206,6 +207,11 @@
 
 
 %changelog
+* Mon Jan 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-4
+- add allegro-4.2.0-nostrip.patch, so that the main .so file
+  doesn't get stripped and we actually get debuginfo for it in
+  allegro-debuginfo
+
 * Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-3
 - update / fix BuildRequires for modular X (bz 178245)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 09:31:03 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 24 Jan 2006 04:31:03 -0500
Subject: fedora-security/audit fc4,1.136,1.137 fc5,1.46,1.47
Message-ID: <200601240931.k0O9V3TU013430@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13408

Modified Files:
	fc4 fc5 
Log Message:
Deal with updates from yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- fc4	23 Jan 2006 19:55:02 -0000	1.136
+++ fc4	24 Jan 2006 09:30:55 -0000	1.137
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
-CVE-2006-0321 ignore (fetchmail) 6.3.X only affected (fixed in 6.3.2)
+CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
@@ -101,6 +101,7 @@
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3357 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
+CVE-2005-3356 VULNERABLE (kernel)
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3352 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]
@@ -938,6 +939,7 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
+CVE-2004-0592 version (kernel, not upstream flaw)
 CVE-2004-0587 version (kernel, not upstream flaw)
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
@@ -1306,6 +1308,7 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- fc5	23 Jan 2006 19:55:02 -0000	1.46
+++ fc5	24 Jan 2006 09:30:55 -0000	1.47
@@ -113,6 +113,7 @@
 CVE-2005-3388 version (php, fixed 5.1.1)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3357 VULNERABLE (httpd, affects 2.2.0) bz#177914
+CVE-2005-3356 VULNERABLE (kernel)
 CVE-2005-3353 version (php, not 5.0)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1) bz#177913
 CVE-2005-3351 version (spamassassin, fixed 3.1.0)
@@ -994,6 +995,7 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
+CVE-2004-0592 version (kernel, not upstream flaw)
 CVE-2004-0587 version (kernel) not upstream flaw
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
@@ -1359,6 +1361,7 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)



From fedora-extras-commits at redhat.com  Tue Jan 24 10:22:11 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 24 Jan 2006 05:22:11 -0500
Subject: rpms/blackbox/devel blackbox.spec,1.10,1.11
Message-ID: <200601241022.k0OAMhVa015435@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/blackbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15397/blackbox/devel

Modified Files:
	blackbox.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178651 & #178652)



Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- blackbox.spec	3 Nov 2005 15:11:47 -0000	1.10
+++ blackbox.spec	24 Jan 2006 10:22:10 -0000	1.11
@@ -1,14 +1,20 @@
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.70.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
 Source0: http://dl.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
 Source1: blackbox.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-devel, gcc-c++
+BuildRequires: gcc-c++, pkgconfig
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXt-devel, libXext-devel
+%endif
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -76,34 +82,37 @@
 
 
 %changelog
-* Thu Nov  3 2005 Mattthias Saou <http://freshrpms.net/> 0.70.1-1
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.70.1-2
+- Add conditional to build with/without modular X depending on FC version.
+
+* Thu Nov  3 2005 Matthias Saou <http://freshrpms.net/> 0.70.1-1
 - Update to 0.70.1.
 
-* Sat Mar 12 2005 Mattthias Saou <http://freshrpms.net/> 0.70.0-1
+* Sat Mar 12 2005 Matthias Saou <http://freshrpms.net/> 0.70.0-1
 - Update to 0.70.0.
 - Use bz2 source instead of gz.
 - Add devel sub-package for the libbt stuff.
 
-* Tue Nov 16 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-10
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-10
 - Bump release to provide Extras upgrade path.
 
-* Mon Nov 15 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-9
+* Mon Nov 15 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-9
 - Added gcc 3.4 patch from Arch Linux.
 
-* Thu May  6 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+* Thu May  6 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-8
 - Removed switchdesk file, it doesn't work because of hardcoded stuff.
 
-* Wed Mar 24 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+* Wed Mar 24 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-8
 - Removed explicit XFree86 dependency.
 
-* Mon Feb 23 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-7
+* Mon Feb 23 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-7
 - Added blackbox.desktop file for xsessions based on the GNOME one.
 
 * Tue Feb 10 2004 Scott R. Godin <nospam at webdragon.net> 0.65.0-6
 - Patch for #include <cassert> in Window.cc
 - Fixed nls problem, left in --disable just in case. Smile, Matthias. :-)
 
-* Fri Nov 14 2003 Mattthias Saou <http://freshrpms.net/> 0.65.0-5
+* Fri Nov 14 2003 Matthias Saou <http://freshrpms.net/> 0.65.0-5
 - Rebuild for Fedora Core 1.
 
 * Wed May 14 2003 Matthias Saou <http://freshrpms.net/>



From fedora-extras-commits at redhat.com  Tue Jan 24 10:22:17 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 24 Jan 2006 05:22:17 -0500
Subject: rpms/bbkeys/devel bbkeys.spec,1.8,1.9
Message-ID: <200601241022.k0OAMoec015438@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bbkeys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15397/bbkeys/devel

Modified Files:
	bbkeys.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178651 & #178652)



Index: bbkeys.spec
===================================================================
RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bbkeys.spec	8 Apr 2005 09:39:22 -0000	1.8
+++ bbkeys.spec	24 Jan 2006 10:22:17 -0000	1.9
@@ -1,13 +1,19 @@
 Summary: Completely configurable key-combo grabber for blackbox
 Name: bbkeys
 Version: 0.9.0
-Release: 1
+Release: 2%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://bbkeys.sourceforge.net/
 Source: http://dl.sf.net/bbkeys/bbkeys-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: blackbox-devel, XFree86-devel
+BuildRequires: blackbox-devel
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libX11-devel, libXext-devel
+%endif
 
 %description
 bbkeys is a configurable key-grabber designed for the blackbox window manager
@@ -48,6 +54,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.9.0-2
+- Add conditional to build with/without modular X depending on FC version.
+
 * Fri Apr  1 2005 Matthias Saou <http://freshrpms.net/> 0.9.0-1
 - Update to 0.9.0.
 



From fedora-extras-commits at redhat.com  Tue Jan 24 11:09:42 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 24 Jan 2006 06:09:42 -0500
Subject: rpms/digikam/FC-3 .cvsignore, 1.6, 1.7 digikam.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200601241110.k0OBAFOq017355@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17334

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Remove libtool-ltdl-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2006 23:16:18 -0000	1.6
+++ .cvsignore	24 Jan 2006 11:09:42 -0000	1.7
@@ -1,3 +1 @@
-digikam-0.7.4.tar.bz2
-digikam-0.8.0.tar.bz2
 digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- digikam.spec	23 Jan 2006 23:16:18 -0000	1.7
+++ digikam.spec	24 Jan 2006 11:09:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
 BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
 BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
-BuildRequires:	desktop-file-utils libtool-ltdl-devel
+BuildRequires:	desktop-file-utils
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -119,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Jan 24 2006 Marcin Garski <mgarski at post.pl> 0.8.1-2
+- Remove libtool-ltdl-devel
+
 * Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
 - Add --enable-final
 - Remove GCC 4.1 patch, applied upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 23:16:18 -0000	1.6
+++ sources	24 Jan 2006 11:09:42 -0000	1.7
@@ -1,2 +1 @@
-9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
 2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 13:01:39 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 08:01:39 -0500
Subject: extras-buildsys/server Builder.py,1.27,1.28
Message-ID: <200601241301.k0OD1d3B021116@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21089/server

Modified Files:
	Builder.py 
Log Message:
Increase builder sleep time to 20s to combat SSL hanging


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Builder.py	24 Jan 2006 01:35:57 -0000	1.27
+++ Builder.py	24 Jan 2006 13:01:09 -0000	1.28
@@ -354,7 +354,7 @@
 
             self._server_lock.release()
 
-            time.sleep(3)
+            time.sleep(20)
     
     def available(self):
         """



From fedora-extras-commits at redhat.com  Tue Jan 24 13:13:05 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 08:13:05 -0500
Subject: extras-buildsys/server Builder.py,1.20.2.6,1.20.2.7
Message-ID: <200601241313.k0ODD5uR021229@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21211/server

Modified Files:
      Tag: STABLE_0_4
	Builder.py 
Log Message:
Increase builder sleep time to 20s to combat SSL hanging


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.20.2.6
retrieving revision 1.20.2.7
diff -u -r1.20.2.6 -r1.20.2.7
--- Builder.py	24 Jan 2006 01:35:27 -0000	1.20.2.6
+++ Builder.py	24 Jan 2006 13:12:56 -0000	1.20.2.7
@@ -353,7 +353,7 @@
 
             self._server_lock.release()
 
-            time.sleep(3)
+            time.sleep(20)
     
     def available(self):
         """



From fedora-extras-commits at redhat.com  Tue Jan 24 13:59:30 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Tue, 24 Jan 2006 08:59:30 -0500
Subject: rpms/gstreamer-python/devel .cvsignore, 1.3,
	1.4 gstreamer-python.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200601241400.k0OE039a021352@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21325

Modified Files:
	.cvsignore gstreamer-python.spec sources 
Log Message:
update to gst-python 0.10.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Feb 2005 18:47:33 -0000	1.3
+++ .cvsignore	24 Jan 2006 13:59:30 -0000	1.4
@@ -1 +1 @@
-gst-python-0.8.1.tar.bz2
+gst-python-0.10.2.tar.bz2


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gstreamer-python.spec	19 May 2005 15:46:32 -0000	1.8
+++ gstreamer-python.spec	24 Jan 2006 13:59:30 -0000	1.9
@@ -1,11 +1,13 @@
-%define         gst_minver      0.8.7
-%define         gstp_minver     0.8.5
+%define         gst_minver      0.10.2
+%define         gstpb_minver    0.10.2
+%define         pygtk_minver    2.8.0
+%define         majorminor      0.10
 %define         gstreamer       gstreamer
 
 Name:           %{gstreamer}-python
-Version:        0.8.1
-Release:        6
-Summary:        Python bindings for GStreamer.
+Version:        0.10.2
+Release:        1%{?dist}
+Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
 License:        LGPL
@@ -14,27 +16,25 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       python >= 2
-Requires:       pygtk2 >= 2.4.0
-Requires:       %{gstreamer} >= %{_gst_minver}
-Requires:       %{gstreamer}-plugins >= %{_gstp_minver}
+Requires:       pygtk2 >= %{pygtk_minver}
+Requires:       %{gstreamer} >= %{gst_minver}
+Requires:       %{gstreamer}-plugins-base >= %{gstpb_minver}
 
 BuildRequires:  python >= 2
 BuildRequires:  python-devel >= 2
-BuildRequires:  pygtk2-devel >= 2.4.0
+BuildRequires:  pygtk2-devel >= %{pygtk_minver}
 
 # xwindowlistener needs X11 headers
-BuildRequires:  XFree86-devel
+BuildRequires:  libX11-devel
 
-BuildRequires:  %{gstreamer}-devel >= %{_gst_minver}
-BuildRequires:  %{gstreamer}-plugins-devel >= %{_gstp_minver}
+BuildRequires:  %{gstreamer}-devel >= %{gst_minver}
+BuildRequires:  %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
 
 # sigh, libtool
 BuildRequires:  gcc-c++
 
 # no sense in splitting off a devel package just yet
 Provides:       %{gstreamer}-python-devel = %{version}-%{release}
-Requires:       pygtk2-devel
-Requires:       gstreamer-devel
 
 %description
 This module contains a wrapper that allows GStreamer applications
@@ -53,11 +53,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-# The __init__.py* files go into lib instead of lib64, so fix that
-if [ "%{_lib}" != "lib" ]; then
-    %{__mv} %{buildroot}%{_prefix}/lib/python?.?/site-packages/gst/__init__.* \
-            %{buildroot}%{_libdir}/python?.?/site-packages/gst/
-fi
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
@@ -66,16 +61,20 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%doc examples/gst/*.py examples/gstplay/*.py
-%{_libdir}/python?.?/site-packages/gst
+%doc examples/*.py
+%{_libdir}/python?.?/site-packages/gst-%{majorminor}
+%{_libdir}/python?.?/site-packages/pygst.py
+%{_libdir}/python?.?/site-packages/pygst.pth
 %dir %{_datadir}/gst-python
-%{_datadir}/gst-python/examples
-%dir %{_datadir}/gst-python/2.0/
-%dir %{_datadir}/gst-python/2.0/defs/
-%{_datadir}/gst-python/2.0/defs/*.defs
-%{_libdir}/pkgconfig/gst-python-0.8.pc
+%{_datadir}/gst-python/%{majorminor}/examples
+%{_datadir}/gst-python/%{majorminor}/defs/*.defs
+%{_libdir}/pkgconfig/gst-python-%{majorminor}.pc
 
 %changelog
+* Tue Jan 24 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- update to GStreamer Python Bindings 0.10.2
+- remove -devel requirements
+
 * Thu May 19 2005 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.1-6
 - disable docs build - they're already in the tarball
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Feb 2005 18:47:33 -0000	1.3
+++ sources	24 Jan 2006 13:59:30 -0000	1.4
@@ -1 +1 @@
-4a7e23b885c6ec8a7d300714f2106ba2  gst-python-0.8.1.tar.bz2
+e29366d227204e211d867577ff8e7b89  gst-python-0.10.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 15:31:42 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 24 Jan 2006 10:31:42 -0500
Subject: rpms/ipython/FC-3 .cvsignore, 1.5, 1.6 ipython.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200601241532.k0OFWFB9026197@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26142/FC-3

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
update to new upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Jan 2006 15:34:54 -0000	1.5
+++ .cvsignore	24 Jan 2006 15:31:42 -0000	1.6
@@ -1 +1 @@
-ipython-0.7.0.tar.gz
+ipython-0.7.1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ipython.spec	12 Jan 2006 15:34:54 -0000	1.5
+++ ipython.spec	24 Jan 2006 15:31:42 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
+- Update to new upstream 0.7.1
+
 * Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
 - Update to new upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2006 15:34:54 -0000	1.6
+++ sources	24 Jan 2006 15:31:42 -0000	1.7
@@ -1 +1 @@
-3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz
+ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 15:31:48 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 24 Jan 2006 10:31:48 -0500
Subject: rpms/ipython/FC-4 .cvsignore, 1.6, 1.7 ipython.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200601241532.k0OFWL9t026202@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26142/FC-4

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
update to new upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jan 2006 15:35:00 -0000	1.6
+++ .cvsignore	24 Jan 2006 15:31:48 -0000	1.7
@@ -1 +1 @@
-ipython-0.7.0.tar.gz
+ipython-0.7.1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/ipython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ipython.spec	12 Jan 2006 15:35:00 -0000	1.7
+++ ipython.spec	24 Jan 2006 15:31:48 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
+- Update to new upstream 0.7.1
+
 * Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
 - Update to new upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2006 15:35:00 -0000	1.6
+++ sources	24 Jan 2006 15:31:48 -0000	1.7
@@ -1 +1 @@
-3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz
+ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 15:31:54 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 24 Jan 2006 10:31:54 -0500
Subject: rpms/ipython/devel .cvsignore, 1.6, 1.7 ipython.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200601241532.k0OFWQTm026207@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26142/devel

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
update to new upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jan 2006 15:35:16 -0000	1.6
+++ .cvsignore	24 Jan 2006 15:31:54 -0000	1.7
@@ -1 +1 @@
-ipython-0.7.0.tar.gz
+ipython-0.7.1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ipython.spec	12 Jan 2006 15:35:16 -0000	1.7
+++ ipython.spec	24 Jan 2006 15:31:54 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
+- Update to new upstream 0.7.1
+
 * Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
 - Update to new upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2006 15:35:16 -0000	1.6
+++ sources	24 Jan 2006 15:31:54 -0000	1.7
@@ -1 +1 @@
-3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz
+ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 15:34:40 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Tue, 24 Jan 2006 10:34:40 -0500
Subject: devel/gstreamer-python gstreamer-python.spec,1.9,1.10
Message-ID: <200601241535.k0OFZDxI026349@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/devel/gstreamer-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26332

Modified Files:
	gstreamer-python.spec 
Log Message:
change to include *.py*



Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/devel/gstreamer-python/gstreamer-python.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gstreamer-python.spec	24 Jan 2006 13:59:30 -0000	1.9
+++ gstreamer-python.spec	24 Jan 2006 15:34:40 -0000	1.10
@@ -63,7 +63,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc examples/*.py
 %{_libdir}/python?.?/site-packages/gst-%{majorminor}
-%{_libdir}/python?.?/site-packages/pygst.py
+%{_libdir}/python?.?/site-packages/pygst.py*
 %{_libdir}/python?.?/site-packages/pygst.pth
 %dir %{_datadir}/gst-python
 %{_datadir}/gst-python/%{majorminor}/examples



From fedora-extras-commits at redhat.com  Tue Jan 24 16:06:22 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:06:22 -0500
Subject: rpms/php-pear-DB - New directory
Message-ID: <200601241606.k0OG6O3U028272@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28263/php-pear-DB

Log Message:
Directory /cvs/extras/rpms/php-pear-DB added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:06:28 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:06:28 -0500
Subject: rpms/php-pear-DB/devel - New directory
Message-ID: <200601241606.k0OG6oCH028289@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28263/php-pear-DB/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:07:29 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:07:29 -0500
Subject: mock mock.py,1.33,1.34
Message-ID: <200601241607.k0OG7TD8028340@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28244

Modified Files:
	mock.py 
Log Message:
Add an option to create a new process group so that both mock and
all of its children can be easily killed with kill(-<mock pid>) without
killing mock's parent (ie, plague-builder).



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mock.py	19 Jan 2006 21:33:30 -0000	1.33
+++ mock.py	24 Jan 2006 16:07:11 -0000	1.34
@@ -648,6 +648,8 @@
             help="Arbitrary, unique extension to append to buildroot directory name")
     parser.add_option("--quiet", action ="store_true", dest="quiet", 
             default=False, help="quiet down output")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -711,7 +713,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)



From fedora-extras-commits at redhat.com  Tue Jan 24 16:07:27 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:07:27 -0500
Subject: rpms/php-pear-DB Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601241607.k0OG7Te8028341@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:07:34 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:07:34 -0500
Subject: rpms/php-pear-DB/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601241607.k0OG7aRY028361@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:09:07 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:09:07 -0500
Subject: rpms/php-pear-DB/devel php-pear-DB.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200601241609.k0OG9eNH028445@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28400/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB.spec 
Log Message:
auto-import php-pear-DB-1.7.6-3 on branch devel from php-pear-DB-1.7.6-3.src.rpm


--- NEW FILE php-pear-DB.spec ---
%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear)

Summary: PEAR: Database Abstraction Layer
Name: php-pear-DB
Version: 1.7.6
Release: 3
License: The PHP License
Group: Development/Libraries
Source0: http://pear.php.net/get/DB-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://pear.php.net/package/DB
BuildArchitectures: noarch
BuildRequires: php-pear
Provides: php-pear(DB) = 1.7.6
Requires: php >= 4.2.0, php-pear(PEAR)
Requires(post): php-pear
Requires(postun): php-pear

%description
DB is a database abstraction layer for PHP providing:

* an OO-style query API
* portability features that make programs written for one DBMS work with 
  other DBMS's
* a DSN (data source name) format for specifying database servers
* prepare/execute (bind) emulation for databases that don't support it natively
* a result object for each query response
* portable error codes
* sequence emulation
* sequential and non-sequential row fetching as well as bulk fetching
* formats fetched rows as associative arrays, ordered arrays or objects
* row limit support
* transactions support
* table information interface
* DocBook and phpDocumentor API documentation

DB layers itself on top of PHP's existing database extensions.

%prep
%setup -c -T
pear -v -c pearrc \
        -d php_dir=%{peardir} \
        -d doc_dir=/docs \
        -d bin_dir=%{_bindir} \
        -d data_dir=%{peardir}/data \
        -d test_dir=%{peardir}/tests \
        -d ext_dir=%{_libdir} \
        -s

%build

%install
rm -rf %{buildroot}
pear -c pearrc install --nodeps -R %{buildroot} %{SOURCE0}

# Clean up unnecessary files
rm -f pearrc
rm -f %{buildroot}%{peardir}/.filemap
rm -f %{buildroot}%{peardir}/.lock
rm -rf %{buildroot}%{peardir}/.registry
rm -rf %{buildroot}%{peardir}/.channels
rm -rf %{buildroot}%{peardir}/.depdb*

# Sort out documentation
mv %{buildroot}/docs/DB/* .
rm -rf %{buildroot}/docs

# Install XML package description
mkdir -p %{buildroot}%{_var}/lib/pear
tar -xzf %{SOURCE0} package.xml
cp -p package.xml %{buildroot}%{_var}/lib/pear/DB.xml

%clean
rm -rf %{buildroot}

%post
pear install --nodeps --soft --force --register-only %{_var}/lib/pear/DB.xml >/dev/null

%postun
if [ "$1" -eq "0" ]; then
    pear uninstall --nodeps --ignore-errors --register-only DB >/dev/null
fi

%files
%defattr(-,root,root)
%doc doc/IDEAS doc/MAINTAINERS doc/STATUS doc/TESTERS
%{_var}/lib/pear/DB.xml
%{peardir}/tests/DB
%{peardir}/DB.php
%{peardir}/DB

%changelog
* Tue Jan 24 2006 Tim Jackson <rpm at timj.co.uk> 1.7.6-3
- Requires(post,postun) php-pear

* Sat Dec 31 2005 Tim Jackson <rpm at timj.co.uk> 1.7.6-2
- Rearranged so it makes more sense
- Remove external license file
- peardir definition now comes from "pear config-get"
- BR php-pear
- shorten description
- be explicit about the files in the package
- use macro for /var
- remove versioning from pear(PEAR) dep; 1.0b1 is very old

* Sat Dec 31 2005 Tim Jackson <rpm at timj.co.uk> 1.7.6-1
- First RPM build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Jan 2006 16:07:34 -0000	1.1
+++ .cvsignore	24 Jan 2006 16:09:07 -0000	1.2
@@ -0,0 +1 @@
+DB-1.7.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2006 16:07:34 -0000	1.1
+++ sources	24 Jan 2006 16:09:07 -0000	1.2
@@ -0,0 +1 @@
+b5ff032f7e8873174e3e7fc21b7ec696  DB-1.7.6.tgz



From fedora-extras-commits at redhat.com  Tue Jan 24 16:08:39 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:08:39 -0500
Subject: rpms/php-pear-DB import.log,1.1,1.2
Message-ID: <200601241609.k0OG9fOZ028446@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28400

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-1.7.6-3 on branch devel from php-pear-DB-1.7.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Jan 2006 16:07:27 -0000	1.1
+++ import.log	24 Jan 2006 16:08:39 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-1_7_6-3:HEAD:php-pear-DB-1.7.6-3.src.rpm:1138118912



From fedora-extras-commits at redhat.com  Tue Jan 24 16:15:55 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:15:55 -0500
Subject: rpms/mock/devel mock-0.4-setpgrp.patch,NONE,1.1 mock.spec,1.9,1.10
Message-ID: <200601241616.k0OGGRKM028583@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28558

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
- Add option to create new process group so mock and its children
    may be more easily killed



mock-0.4-setpgrp.patch:

--- NEW FILE mock-0.4-setpgrp.patch ---
--- mock-0.4/mock.py.setpgrp	2006-01-24 11:10:40.000000000 -0500
+++ mock-0.4/mock.py	2006-01-24 11:12:08.000000000 -0500
@@ -621,6 +621,8 @@
             help="path for state dirresulting files to be put")
     parser.add_option("--uniqueext", action="store", type="string", default=None,
             help="Arbitrary, unique extension to append to buildroot directory name")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -683,7 +685,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mock.spec	18 Jan 2006 22:10:57 -0000	1.9
+++ mock.spec	24 Jan 2006 16:15:54 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
+Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -19,6 +20,7 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
+%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -68,6 +70,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
+- Add option to create new process group so mock and its children
+    may be more easily killed
+
 * Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
 - Add unpackaged files fix from RH#163576 (Adrian Reber)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 16:17:06 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:17:06 -0500
Subject: rpms/mock/FC-4 mock-0.4-setpgrp.patch,NONE,1.1 mock.spec,1.9,1.10
Message-ID: <200601241617.k0OGHcVT028777@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28704

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
- Add option to create new process group so mock and its children
    may be more easily killed



mock-0.4-setpgrp.patch:

--- NEW FILE mock-0.4-setpgrp.patch ---
--- mock-0.4/mock.py.setpgrp	2006-01-24 11:10:40.000000000 -0500
+++ mock-0.4/mock.py	2006-01-24 11:12:08.000000000 -0500
@@ -621,6 +621,8 @@
             help="path for state dirresulting files to be put")
     parser.add_option("--uniqueext", action="store", type="string", default=None,
             help="Arbitrary, unique extension to append to buildroot directory name")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -683,7 +685,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mock.spec	18 Jan 2006 22:16:27 -0000	1.9
+++ mock.spec	24 Jan 2006 16:17:06 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
+Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -19,6 +20,7 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
+%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -68,6 +70,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
+- Add option to create new process group so mock and its children
+    may be more easily killed
+
 * Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
 - Add unpackaged files fix from RH#163576 (Adrian Reber)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 16:18:10 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:18:10 -0500
Subject: rpms/mock/FC-3 mock-0.4-setpgrp.patch,NONE,1.1 mock.spec,1.9,1.10
Message-ID: <200601241618.k0OGIhuE028851@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28828

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
- Add option to create new process group so mock and its children
    may be more easily killed



mock-0.4-setpgrp.patch:

--- NEW FILE mock-0.4-setpgrp.patch ---
--- mock-0.4/mock.py.setpgrp	2006-01-24 11:10:40.000000000 -0500
+++ mock-0.4/mock.py	2006-01-24 11:12:08.000000000 -0500
@@ -621,6 +621,8 @@
             help="path for state dirresulting files to be put")
     parser.add_option("--uniqueext", action="store", type="string", default=None,
             help="Arbitrary, unique extension to append to buildroot directory name")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -683,7 +685,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mock.spec	18 Jan 2006 22:23:07 -0000	1.9
+++ mock.spec	24 Jan 2006 16:18:10 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
+Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -19,6 +20,7 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
+%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -68,6 +70,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
+- Add option to create new process group so mock and its children
+    may be more easily killed
+
 * Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
 - Add unpackaged files fix from RH#163576 (Adrian Reber)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 16:20:16 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:20:16 -0500
Subject: owners owners.list,1.562,1.563
Message-ID: <200601241620.k0OGKXxi028918@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28901

Modified Files:
	owners.list 
Log Message:
Add php-pear-DB owner



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- owners.list	22 Jan 2006 23:58:06 -0000	1.562
+++ owners.list	24 Jan 2006 16:20:15 -0000	1.563
@@ -981,6 +981,7 @@
 Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 24 16:38:50 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:38:50 -0500
Subject: rpms/altermime - New directory
Message-ID: <200601241638.k0OGcqjC029119@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29111/altermime

Log Message:
Directory /cvs/extras/rpms/altermime added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:38:55 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:38:55 -0500
Subject: rpms/altermime/devel - New directory
Message-ID: <200601241638.k0OGcviC029134@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29111/altermime/devel

Log Message:
Directory /cvs/extras/rpms/altermime/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:15 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:15 -0500
Subject: rpms/altermime Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601241639.k0OGdHdd029168@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29156

Added Files:
	Makefile import.log 
Log Message:
Setup of module altermime


--- NEW FILE Makefile ---
# Top level Makefile for module altermime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:21 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:21 -0500
Subject: rpms/altermime/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601241639.k0OGdNUZ029188@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29156/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module altermime


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:50 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:50 -0500
Subject: rpms/altermime import.log,1.1,1.2
Message-ID: <200601241640.k0OGeNrH029262@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29224

Modified Files:
	import.log 
Log Message:
auto-import altermime-0.3.6-1 on branch devel from altermime-0.3.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/altermime/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Jan 2006 16:39:15 -0000	1.1
+++ import.log	24 Jan 2006 16:39:50 -0000	1.2
@@ -0,0 +1 @@
+altermime-0_3_6-1:HEAD:altermime-0.3.6-1.src.rpm:1138120784



From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:56 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:56 -0500
Subject: rpms/altermime/devel altermime.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601241640.k0OGeSB9029266@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29224/devel

Modified Files:
	.cvsignore sources 
Added Files:
	altermime.spec 
Log Message:
auto-import altermime-0.3.6-1 on branch devel from altermime-0.3.6-1.src.rpm


--- NEW FILE altermime.spec ---
Name:           altermime
Version:        0.3.6
Release:        1%{?dist}
Summary:        Alter MIME-encoded mailpacks

Group:          Applications/Internet
License:        BSD
URL:            http://www.pldaniels.com/altermime/
Source0:        http://www.pldaniels.com/altermime/altermime-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
alterMIME is a small program which is used to alter MIME-encoded mailpacks.

alterMIME can:

 * Insert disclaimers
 * Insert arbitary X-headers
 * Modify existing headers
 * Remove attachments based on filename or content-type
 * Replace attachments based on filename 

%prep
%setup -q


%build
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
# Makefile has hardcoded paths
%{__mkdir_p} %{buildroot}%{_bindir}
%{__install} -m 755 altermime %{buildroot}%{_bindir}/

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/*

%doc CHANGELOG LICENCE README


%changelog
* Wed Jan 11 2006 Tim Jackson <rpm at timj.co.uk> 0.3.6-1
- Intial build for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/altermime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Jan 2006 16:39:20 -0000	1.1
+++ .cvsignore	24 Jan 2006 16:39:56 -0000	1.2
@@ -0,0 +1 @@
+altermime-0.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/altermime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2006 16:39:20 -0000	1.1
+++ sources	24 Jan 2006 16:39:56 -0000	1.2
@@ -0,0 +1 @@
+a9dc3962b00e4a6d6f3b93f10858bd35  altermime-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 16:53:47 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:53:47 -0500
Subject: owners owners.list,1.563,1.564
Message-ID: <200601241654.k0OGsJrt029333@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29316

Modified Files:
	owners.list 
Log Message:
Add altermime owner



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- owners.list	24 Jan 2006 16:20:15 -0000	1.563
+++ owners.list	24 Jan 2006 16:53:47 -0000	1.564
@@ -30,6 +30,7 @@
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|altermime|Alter MIME-encoded mailpacks|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|anjuta|GNOME IDE for C and C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 24 17:15:18 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:15:18 -0500
Subject: mock mock.py,1.34,1.35
Message-ID: <200601241715.k0OHFIdd031210@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31192

Modified Files:
	mock.py 
Log Message:
Back out setpgrp patch, found a better way to do it in plague


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mock.py	24 Jan 2006 16:07:11 -0000	1.34
+++ mock.py	24 Jan 2006 17:15:10 -0000	1.35
@@ -648,8 +648,6 @@
             help="Arbitrary, unique extension to append to buildroot directory name")
     parser.add_option("--quiet", action ="store_true", dest="quiet", 
             default=False, help="quiet down output")
-    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
-            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -713,12 +711,7 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-
-    # If requested, become a process group leader so that us and
-    # _all_ of our children can more easily be killed with kill(2)
-    if options.setpgrp:
-        os.setpgrp()
-
+    
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:16:33 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:16:33 -0500
Subject: rpms/mock/devel mock.spec, 1.10, 1.11 mock-0.4-setpgrp.patch, 1.1,
	NONE
Message-ID: <200601241717.k0OHH6hv031257@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31238

Modified Files:
	mock.spec 
Removed Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
- Back out setpgrp patch, found a better way to do it in plague




Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mock.spec	24 Jan 2006 16:15:54 -0000	1.10
+++ mock.spec	24 Jan 2006 17:16:33 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
-Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -20,7 +19,6 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
-%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -70,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
+- Back out setpgrp patch, found a better way to do it in plague
+
 * Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
 - Add option to create new process group so mock and its children
     may be more easily killed


--- mock-0.4-setpgrp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 24 17:18:05 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:18:05 -0500
Subject: rpms/mock/FC-4 mock.spec,1.10,1.11 mock-0.4-setpgrp.patch,1.1,NONE
Message-ID: <200601241718.k0OHIbXK031314@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31297

Modified Files:
	mock.spec 
Removed Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
- Back out setpgrp patch, found a better way to do it in plague




Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mock.spec	24 Jan 2006 16:17:06 -0000	1.10
+++ mock.spec	24 Jan 2006 17:18:04 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
-Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -20,7 +19,6 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
-%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -70,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
+- Back out setpgrp patch, found a better way to do it in plague
+
 * Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
 - Add option to create new process group so mock and its children
     may be more easily killed


--- mock-0.4-setpgrp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 24 17:20:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:20:23 -0500
Subject: rpms/mock/FC-3 mock.spec,1.10,1.11 mock-0.4-setpgrp.patch,1.1,NONE
Message-ID: <200601241720.k0OHKtIW031395@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31375

Modified Files:
	mock.spec 
Removed Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
- Back out setpgrp patch, found a better way to do it in plague




Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mock.spec	24 Jan 2006 16:18:10 -0000	1.10
+++ mock.spec	24 Jan 2006 17:20:23 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
-Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -20,7 +19,6 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
-%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -70,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
+- Back out setpgrp patch, found a better way to do it in plague
+
 * Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
 - Add option to create new process group so mock and its children
     may be more easily killed


--- mock-0.4-setpgrp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 24 17:40:09 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:40:09 -0500
Subject: extras-buildsys/common ExecUtils.py,1.4,1.5
Message-ID: <200601241740.k0OHe9Af031595@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31541/common

Modified Files:
	ExecUtils.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ExecUtils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/ExecUtils.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExecUtils.py	14 Nov 2005 19:13:01 -0000	1.4
+++ ExecUtils.py	24 Jan 2006 17:39:46 -0000	1.5
@@ -58,7 +58,7 @@
     fd = os.open(filespec, flags, 0644)
     return (fd, True)
 
-def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2):
+def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2, setpgrp=True):
     cmd = os.path.abspath(cmd)
     if not os.access (cmd, os.X_OK):
         raise RuntimeError(cmd + " can not be run")
@@ -75,6 +75,10 @@
 
     childpid = os.fork()
     if (not childpid):
+        # Become leader of a new process group if requested
+        if setpgrp:
+            os.setpgrp()
+
         if stdin != 0:
             os.dup2(stdin, 0)
             os.close(stdin)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:39:42 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:39:42 -0500
Subject: extras-buildsys ChangeLog,1.160,1.161
Message-ID: <200601241740.k0OHeCBT031598@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31541

Modified Files:
	ChangeLog 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog	24 Jan 2006 01:18:55 -0000	1.160
+++ ChangeLog	24 Jan 2006 17:39:23 -0000	1.161
@@ -1,3 +1,13 @@
+2006-01-24  Dan Williams  <dcbw at redhat.com>
+
+    * common/ExecUtils.py
+        - (exec_with_redirect): by default, have child start a new
+            process group
+
+    * builder/builder.py
+        - (_handle_death): kill child's entire process group, not just
+            the child itself
+
 2006-01-23  Dan Williams  <dcbw at redhat.com>
 
     * common/SSLConnection.py



From fedora-extras-commits at redhat.com  Tue Jan 24 17:40:07 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:40:07 -0500
Subject: extras-buildsys/builder builder.py,1.49,1.50
Message-ID: <200601241740.k0OHebih031603@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31541/builder

Modified Files:
	builder.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- builder.py	18 Nov 2005 14:34:05 -0000	1.49
+++ builder.py	24 Jan 2006 17:39:40 -0000	1.50
@@ -133,10 +133,12 @@
         if self._status != 'cleanup':
             # Kill a running non-cleanup mock process, if any
             if self._childpid:
+                child_pgroup = 0 - self._childpid
                 try:
-                    os.kill(self._childpid, 9)
+                    # Kill all members of the child's process group
+                    os.kill(child_pgroup, 9)
                 except OSError, e:
-                    self._log("ERROR: Couldn't kill process %d: %s\n" % (self._childpid, e))
+                    self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e))
                 else:
                     # Ensure child process is reaped
                     self._log("Waiting for mock process %d to exit...\n" % self._childpid)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:45:46 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:45:46 -0500
Subject: extras-buildsys/common ExecUtils.py,1.2.2.2,1.2.2.3
Message-ID: <200601241745.k0OHjkhh031686@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31636/common

Modified Files:
      Tag: STABLE_0_4
	ExecUtils.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ExecUtils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/ExecUtils.py,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ExecUtils.py	14 Nov 2005 19:15:22 -0000	1.2.2.2
+++ ExecUtils.py	24 Jan 2006 17:45:38 -0000	1.2.2.3
@@ -58,7 +58,7 @@
     fd = os.open(filespec, flags, 0644)
     return (fd, True)
 
-def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2):
+def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2, setpgrp=True):
     cmd = os.path.abspath(cmd)
     if not os.access (cmd, os.X_OK):
         raise RuntimeError(cmd + " can not be run")
@@ -75,6 +75,10 @@
 
     childpid = os.fork()
     if (not childpid):
+        # Become leader of a new process group if requested
+        if setpgrp:
+            os.setpgrp()
+
         if stdin != 0:
             os.dup2(stdin, 0)
             os.close(stdin)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:45:35 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:45:35 -0500
Subject: extras-buildsys ChangeLog,1.126.2.31,1.126.2.32
Message-ID: <200601241746.k0OHk5R8031689@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31636

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.31
retrieving revision 1.126.2.32
diff -u -r1.126.2.31 -r1.126.2.32
--- ChangeLog	24 Jan 2006 01:12:36 -0000	1.126.2.31
+++ ChangeLog	24 Jan 2006 17:45:26 -0000	1.126.2.32
@@ -1,3 +1,13 @@
+2006-01-24  Dan Williams  <dcbw at redhat.com>
+
+    * common/ExecUtils.py
+        - (exec_with_redirect): by default, have child start a new
+            process group
+
+    * builder/builder.py
+        - (_handle_death): kill child's entire process group, not just
+            the child itself
+
 2006-01-23  Dan Williams  <dcbw at redhat.com>
 
     * common/SSLConnection.py



From fedora-extras-commits at redhat.com  Tue Jan 24 17:45:40 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:45:40 -0500
Subject: extras-buildsys/builder builder.py,1.44.2.5,1.44.2.6
Message-ID: <200601241746.k0OHkBeE031692@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31636/builder

Modified Files:
      Tag: STABLE_0_4
	builder.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.44.2.5
retrieving revision 1.44.2.6
diff -u -r1.44.2.5 -r1.44.2.6
--- builder.py	18 Nov 2005 15:07:55 -0000	1.44.2.5
+++ builder.py	24 Jan 2006 17:45:33 -0000	1.44.2.6
@@ -133,10 +133,12 @@
         if self._status != 'cleanup':
             # Kill a running non-cleanup mock process, if any
             if self._childpid:
+                child_pgroup = 0 - self._childpid
                 try:
-                    os.kill(self._childpid, 9)
+                    # Kill all members of the child's process group
+                    os.kill(child_pgroup, 9)
                 except OSError, e:
-                    self._log("ERROR: Couldn't kill process %d: %s\n" % (self._childpid, e))
+                    self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e))
                 else:
                     # Ensure child process is reaped
                     self._log("Waiting for mock process %d to exit...\n" % self._childpid)



From fedora-extras-commits at redhat.com  Tue Jan 24 19:07:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 14:07:23 -0500
Subject: rpms/plague/devel plague.spec,1.23,1.24 sources,1.22,1.23
Message-ID: <200601241907.k0OJ7vUt002932@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2828

Modified Files:
	plague.spec sources 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
- Increase build server builder thread sleep time to work around SSL issues
- Spawn mock in a new process group, and when killing jobs kill the entire
    process group.  Hopefully fix orphaned rpmbuild processes on job kill




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plague.spec	24 Jan 2006 01:38:12 -0000	1.23
+++ plague.spec	24 Jan 2006 19:07:00 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,11 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
+- Increase build server builder thread sleep time to work around SSL issues
+- Spawn mock in a new process group, and when killing jobs kill the entire
+    process group.  Hopefully fix orphaned rpmbuild processes on job kill
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
 - Restore builder connection timeout
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	24 Jan 2006 01:38:12 -0000	1.22
+++ sources	24 Jan 2006 19:07:00 -0000	1.23
@@ -1 +1 @@
-e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2
+6282064ae35d13f6b72744400c8a49c0  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 19:07:39 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 14:07:39 -0500
Subject: rpms/plague/FC-4 plague.spec,1.21,1.22 sources,1.20,1.21
Message-ID: <200601241908.k0OJ8CoB002949@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2908

Modified Files:
	plague.spec sources 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
- Increase build server builder thread sleep time to work around SSL issues
- Spawn mock in a new process group, and when killing jobs kill the entire
    process group.  Hopefully fix orphaned rpmbuild processes on job kill




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plague.spec	24 Jan 2006 01:39:35 -0000	1.21
+++ plague.spec	24 Jan 2006 19:07:39 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,11 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
+- Increase build server builder thread sleep time to work around SSL issues
+- Spawn mock in a new process group, and when killing jobs kill the entire
+    process group.  Hopefully fix orphaned rpmbuild processes on job kill
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
 - Restore builder connection timeout
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Jan 2006 01:39:35 -0000	1.20
+++ sources	24 Jan 2006 19:07:39 -0000	1.21
@@ -1 +1 @@
-e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2
+6282064ae35d13f6b72744400c8a49c0  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 19:08:26 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 14:08:26 -0500
Subject: rpms/plague/FC-3 plague.spec,1.21,1.22 sources,1.20,1.21
Message-ID: <200601241909.k0OJ9ftc003116@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2950

Modified Files:
	plague.spec sources 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
- Increase build server builder thread sleep time to work around SSL issues
- Spawn mock in a new process group, and when killing jobs kill the entire
    process group.  Hopefully fix orphaned rpmbuild processes on job kill




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plague.spec	24 Jan 2006 01:40:22 -0000	1.21
+++ plague.spec	24 Jan 2006 19:08:26 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,11 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
+- Increase build server builder thread sleep time to work around SSL issues
+- Spawn mock in a new process group, and when killing jobs kill the entire
+    process group.  Hopefully fix orphaned rpmbuild processes on job kill
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
 - Restore builder connection timeout
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Jan 2006 01:40:22 -0000	1.20
+++ sources	24 Jan 2006 19:08:26 -0000	1.21
@@ -1 +1 @@
-e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2
+6282064ae35d13f6b72744400c8a49c0  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 19:44:10 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 24 Jan 2006 14:44:10 -0500
Subject: rpms/vpnc/devel vpnc-0.3.3-disconnect.patch, NONE, 1.1 vpnc.spec,
	1.9, 1.10
Message-ID: <200601241944.k0OJihxp003709@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3687

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.3.3-disconnect.patch 
Log Message:
* Tue Jan 24 2006 Tomas Mraz <tmraz at redhat.com> 0.3.3-5
- send the disconnect packet properly (patch by Laurence Moindrot)


vpnc-0.3.3-disconnect.patch:

--- NEW FILE vpnc-0.3.3-disconnect.patch ---
--- vpnc-0.3.3/tunip.c.disconnect	2005-05-05 12:25:00.000000000 +0200
+++ vpnc-0.3.3/tunip.c	2006-01-24 14:58:20.000000000 +0100
@@ -863,12 +863,7 @@
 		}
 	}
 	
-	sock = socket(AF_INET, SOCK_DGRAM, 0);
-	if (sock >= 0) {
-		sendto(sock, kill_packet, kill_packet_size, 0,
-			kill_dest, sizeof(struct sockaddr_in));
-		close(sock);
-	}
+	sendrecv(NULL,0,kill_packet,kill_packet_size,1);
 	tun_close(oursa->tun_fd, oursa->tun_name);
 	if (pidfile)
 		unlink(pidfile); /* ignore errors */
--- vpnc-0.3.3/vpnc.h.disconnect	2006-01-24 14:58:33.000000000 +0100
+++ vpnc-0.3.3/vpnc.h	2006-01-24 14:58:11.000000000 +0100
@@ -62,4 +62,6 @@
 extern const supported_algo_t *get_dh_group_ike(void);
 extern const supported_algo_t *get_dh_group_ipsec(int server_setting);
 
+extern ssize_t sendrecv(void *recvbuf, size_t recvbufsize, void *tosend, size_t sendsize, int sendonly);
+
 #endif
--- vpnc-0.3.3/vpnc.c.disconnect	2006-01-24 14:51:11.000000000 +0100
+++ vpnc-0.3.3/vpnc.c	2006-01-24 14:55:38.000000000 +0100
@@ -323,7 +323,7 @@
    new packet is put in RECVBUF of size RECVBUFSIZE and the actual size
    of the new packet is returned.  */
 
-static ssize_t
+ssize_t
 sendrecv(void *recvbuf, size_t recvbufsize, void *tosend, size_t sendsize, int sendonly)
 {
 	struct pollfd pfd;
@@ -2125,7 +2125,7 @@
 	/* Create the delete payload, now that we have all the information.  */
 	{
 		struct isakmp_payload *d_isakmp, *d_ipsec;
-		uint32_t del_msgid;
+		uint8_t del_msgid;
 
 		gcry_randomize((uint8_t *) & del_msgid, sizeof(del_msgid), GCRY_WEAK_RANDOM);
 		d_isakmp = new_isakmp_payload(ISAKMP_PAYLOAD_D);
@@ -2152,7 +2152,7 @@
 		memcpy(d_ipsec->u.d.spi[1], &s->tothem_esp_spi, 4);
 		phase2_authpacket(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL,
 			del_msgid, &s->kill_packet, &s->kill_packet_size,
-			nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length);
+			0, 0, 0, 0);
 		isakmp_crypt(s, s->kill_packet, s->kill_packet_size, 1);
 	}
 	DEBUG(2, printf("S7.8\n"));


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vpnc.spec	10 Oct 2005 08:21:55 -0000	1.9
+++ vpnc.spec	24 Jan 2006 19:44:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        4
+Release:        5
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -13,6 +13,7 @@
 Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.3.3-ip-output.patch
 Patch3:		vpnc-0.3.3-no-srcport.patch
+Patch4:		vpnc-0.3.3-disconnect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
@@ -30,6 +31,7 @@
 %patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .ip-output
 %patch3 -p1 -b .no-srcport
+%patch4 -p1 -b .disconnect
 
 %build
 make PREFIX=/usr
@@ -62,6 +64,9 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Tue Jan 24 2006 Tomas Mraz <tmraz at redhat.com> 0.3.3-5
+- send the disconnect packet properly (patch by Laurence Moindrot)
+
 * Thu Sep 22 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-4
 - improve compatibility with some Ciscos
 



From fedora-extras-commits at redhat.com  Tue Jan 24 22:44:00 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 24 Jan 2006 17:44:00 -0500
Subject: rpms/git-core/devel .cvsignore, 1.15, 1.16 git.spec, 1.3,
	1.4 sources, 1.15, 1.16
Message-ID: <200601242244.k0OMiXLw010777@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10754

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2006 05:03:53 -0000	1.15
+++ .cvsignore	24 Jan 2006 22:44:00 -0000	1.16
@@ -1 +1 @@
-git-1.1.2.tar.gz
+git-1.1.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git.spec	16 Jan 2006 05:03:53 -0000	1.3
+++ git.spec	24 Jan 2006 22:44:00 -0000	1.4
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.2
+Version: 	1.1.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 24 2006 Chris Wright <chrisw at redhat.com> 1.1.4-1
+- git-1.1.4
+
 * Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
 - git-1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jan 2006 05:03:53 -0000	1.15
+++ sources	24 Jan 2006 22:44:00 -0000	1.16
@@ -1 +1 @@
-b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz
+8a3ebe9070f738f4fc502b3a9fb7f3f5  git-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 22:45:54 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 24 Jan 2006 17:45:54 -0500
Subject: rpms/git-core/FC-4 .cvsignore, 1.15, 1.16 git.spec, 1.3, 1.4 sources,
	1.15, 1.16
Message-ID: <200601242246.k0OMkQn6010855@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10834

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2006 05:07:14 -0000	1.15
+++ .cvsignore	24 Jan 2006 22:45:53 -0000	1.16
@@ -1 +1 @@
-git-1.1.2.tar.gz
+git-1.1.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git.spec	16 Jan 2006 05:07:14 -0000	1.3
+++ git.spec	24 Jan 2006 22:45:53 -0000	1.4
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.2
+Version: 	1.1.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 24 2006 Chris Wright <chrisw at redhat.com> 1.1.4-1
+- git-1.1.4
+
 * Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
 - git-1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jan 2006 05:07:14 -0000	1.15
+++ sources	24 Jan 2006 22:45:53 -0000	1.16
@@ -1 +1 @@
-b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz
+8a3ebe9070f738f4fc502b3a9fb7f3f5  git-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 22:46:30 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 24 Jan 2006 17:46:30 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.4,1.5
Message-ID: <200601242247.k0OMl2Zr010919@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10861

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix missing requires (#178834)


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-sudoku.spec	16 Dec 2005 18:33:37 -0000	1.4
+++ gnome-sudoku.spec	24 Jan 2006 22:46:30 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
@@ -19,6 +19,8 @@
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
+Requires:   python-numeric
+
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -67,6 +69,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-4
+- Missing Requires: python-numeric (thanks to Brent Fox) (#178834)
+
 * Fri Dec 16 2005 Paul W. Frields <stickster at gmail.com> - 0.4.0-3
 - Fix broken full screen option
 



From fedora-extras-commits at redhat.com  Tue Jan 24 22:47:36 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 24 Jan 2006 17:47:36 -0500
Subject: rpms/git-core/FC-3 .cvsignore, 1.15, 1.16 git.spec, 1.3, 1.4 sources,
	1.15, 1.16
Message-ID: <200601242248.k0OMm8qe011001@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10969

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2006 05:09:22 -0000	1.15
+++ .cvsignore	24 Jan 2006 22:47:36 -0000	1.16
@@ -1 +1 @@
-git-1.1.2.tar.gz
+git-1.1.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git.spec	16 Jan 2006 05:09:22 -0000	1.3
+++ git.spec	24 Jan 2006 22:47:36 -0000	1.4
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.2
+Version: 	1.1.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 24 2006 Chris Wright <chrisw at redhat.com> 1.1.4-1
+- git-1.1.4
+
 * Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
 - git-1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jan 2006 05:09:22 -0000	1.15
+++ sources	24 Jan 2006 22:47:36 -0000	1.16
@@ -1 +1 @@
-b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz
+8a3ebe9070f738f4fc502b3a9fb7f3f5  git-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 01:29:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 24 Jan 2006 20:29:06 -0500
Subject: rpms/sobby/FC-4 .cvsignore, 1.3, 1.4 sobby.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200601250129.k0P1TdP4018495@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18473

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 20:19:34 -0000	1.3
+++ .cvsignore	25 Jan 2006 01:29:04 -0000	1.4
@@ -1 +1 @@
-sobby-0.2.0.tar.gz
+sobby-0.3.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sobby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sobby.spec	17 Jan 2006 21:18:13 -0000	1.3
+++ sobby.spec	25 Jan 2006 01:29:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sobby
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        0%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
 * Tue Jan 17 2006 Luke Macken <lmacken at redhat.com> - 0.2.0-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 20:19:34 -0000	1.3
+++ sources	25 Jan 2006 01:29:04 -0000	1.4
@@ -1 +1 @@
-68e740d9ad051e7939de29fa2c28da56  sobby-0.2.0.tar.gz
+5408fc08d610be5aac4476c6ea6277f9  sobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 02:08:00 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 24 Jan 2006 21:08:00 -0500
Subject: rpms/linphone/devel linphone.spec,1.16,1.17
Message-ID: <200601250208.k0P28Wh5020388@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20371

Modified Files:
	linphone.spec 
Log Message:
Fixed selecting entry from address book (#177189)


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linphone.spec	3 Jan 2006 12:05:15 -0000	1.16
+++ linphone.spec	25 Jan 2006 02:08:00 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -11,6 +11,7 @@
 Patch1:         linphone-1.2.0-ortp.patch
 Patch2:         linphone-1.1.0-Werror.patch
 Patch3:         linphone-1.2.0-maxrtp.patch
+Patch4:         linphone-1.2.0-gtkentry.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -47,6 +48,7 @@
 %patch1 -p 1 -b .ortp
 %patch2 -p 1 -b .Werror
 %patch3 -p 1 -b .maxrtp
+%patch4 -p 1 -b .gtkentry
 rm -r oRTP
 
 %build
@@ -99,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan 24 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
+- Fixed selecting entry from address book (#177189)
+
 * Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Wed Jan 25 02:10:16 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 24 Jan 2006 21:10:16 -0500
Subject: rpms/linphone/devel linphone-1.2.0-gtkentry.patch,NONE,1.1
Message-ID: <200601250210.k0P2AN2f020444@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20431

Added Files:
	linphone-1.2.0-gtkentry.patch 
Log Message:
And of course the patch...

linphone-1.2.0-gtkentry.patch:

--- NEW FILE linphone-1.2.0-gtkentry.patch ---
--- linphone-1.2.0/gnome/addressbook.c.gtkentry	2006-01-22 10:22:24.000000000 -0500
+++ linphone-1.2.0/gnome/addressbook.c	2006-01-22 10:23:12.000000000 -0500
@@ -164,7 +164,7 @@
 		gtk_tree_model_get (model, &iter,SIP_ADDRESS_COLUMN , &address, -1);
 	}
 	if (address!=NULL){
-		gtk_entry_set_text (GTK_ENTRY(gnome_entry_gtk_entry(GNOME_ENTRY(addressentry))),address);
+		gtk_entry_set_text (GTK_ENTRY(addressentry),address);
 		g_free(address);
 	}
 	gtk_widget_destroy(ab);



From fedora-extras-commits at redhat.com  Wed Jan 25 04:59:57 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 24 Jan 2006 23:59:57 -0500
Subject: rpms/Canna/devel Canna.spec,1.2,1.3
Message-ID: <200601250500.k0P50TbY025624@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/Canna/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25596

Modified Files:
	Canna.spec 
Log Message:
* Wed Jan 25 2006 Akira TAGOH <tagoh at redhat.com> - 3.7p3-15
- BuildRequires imake instead of XFree86-devel. (#178656)


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Canna.spec	26 Sep 2005 09:39:52 -0000	1.2
+++ Canna.spec	25 Jan 2006 04:59:56 -0000	1.3
@@ -6,7 +6,7 @@
 Summary: A Japanese character set input system.
 Name: Canna
 Version: 3.7p3
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: Distributable
 Group: System Environment/Libraries
 URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/
@@ -41,7 +41,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp
-BuildPrereq: XFree86-devel,cpp,gawk
+BuildRequires: imake cpp gawk
 Obsoletes: tamago
 
 %description
@@ -324,6 +324,9 @@
 %{_libdir}/libcanna16.so.*
 
 %changelog
+* Wed Jan 25 2006 Akira TAGOH <tagoh at redhat.com> - 3.7p3-15
+- BuildRequires imake instead of XFree86-devel. (#178656)
+
 * Mon Sep 26 2005 Akira TAGOH <tagoh at redhat.com> - 3.7p3-14
 - Imported into Extras.
 



From fedora-extras-commits at redhat.com  Wed Jan 25 05:38:27 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 25 Jan 2006 00:38:27 -0500
Subject: rpms/scim-skk/FC-4 .cvsignore, 1.5, 1.6 scim-skk.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200601250538.k0P5cx90027460@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27439

Modified Files:
	.cvsignore scim-skk.spec sources 
Log Message:
update to 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Dec 2005 10:16:18 -0000	1.5
+++ .cvsignore	25 Jan 2006 05:38:27 -0000	1.6
@@ -1 +1 @@
-scim-skk-0.5.1.tar.gz
+scim-skk-0.5.2.tar.gz


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-skk.spec	17 Dec 2005 10:16:18 -0000	1.8
+++ scim-skk.spec	25 Jan 2006 05:38:27 -0000	1.9
@@ -1,5 +1,5 @@
 Name:	    scim-skk
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-1
+- update to 0.5.2
+
 * Sat Dec 17 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.1-1
 - update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2005 10:16:18 -0000	1.5
+++ sources	25 Jan 2006 05:38:27 -0000	1.6
@@ -1 +1 @@
-b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz
+69d789660439c248e507da63c90ad70a  scim-skk-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 05:40:30 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 25 Jan 2006 00:40:30 -0500
Subject: rpms/scim-skk/devel scim-skk.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200601250541.k0P5f2aI027520@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27501

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.2



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-skk.spec	17 Dec 2005 10:17:01 -0000	1.8
+++ scim-skk.spec	25 Jan 2006 05:40:30 -0000	1.9
@@ -1,5 +1,5 @@
 Name:	    scim-skk
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-1
+- update to 0.5.2
+
 * Sat Dec 17 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.1-1
 - update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2005 10:17:01 -0000	1.5
+++ sources	25 Jan 2006 05:40:30 -0000	1.6
@@ -1 +1 @@
-b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz
+69d789660439c248e507da63c90ad70a  scim-skk-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 05:43:59 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 25 Jan 2006 00:43:59 -0500
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200601250544.k0P5iWoJ027581@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27562

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.2



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-skk.spec	17 Dec 2005 10:19:39 -0000	1.9
+++ scim-skk.spec	25 Jan 2006 05:43:59 -0000	1.10
@@ -1,5 +1,5 @@
 Name:	    scim-skk
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-1
+- update to 0.5.2
+
 * Sat Dec 17 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.1-1
 - update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2005 10:19:39 -0000	1.5
+++ sources	25 Jan 2006 05:43:59 -0000	1.6
@@ -1 +1 @@
-b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz
+69d789660439c248e507da63c90ad70a  scim-skk-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 05:53:42 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 00:53:42 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.5,1.6
Message-ID: <200601250554.k0P5sEJl027660@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27641

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix additional requires and synchronize spec


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-sudoku.spec	24 Jan 2006 22:46:30 -0000	1.5
+++ gnome-sudoku.spec	25 Jan 2006 05:53:42 -0000	1.6
@@ -3,14 +3,16 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%if %{fedora} <= 4
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -19,7 +21,7 @@
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
-Requires:   python-numeric
+Requires:   python-numeric, gnome-python2-canvas
 
 
 %description
@@ -29,7 +31,9 @@
 
 %prep
 %setup -q
+%if %{fedora} <= 4
 %patch0 -p1
+%endif
 # Fix one hardcoding instance
 sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
 # This must be something internal to the developer's system
@@ -69,6 +73,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
+- Fix missing Requires: gnome-python2-canvas
+- Enable conditional to synchronize spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-4
 - Missing Requires: python-numeric (thanks to Brent Fox) (#178834)
 



From fedora-extras-commits at redhat.com  Wed Jan 25 05:54:35 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 00:54:35 -0500
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec,1.3,1.4
Message-ID: <200601250555.k0P5t8Ck027688@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27671

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix additional requires and synchronize spec


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-sudoku.spec	16 Dec 2005 17:27:30 -0000	1.3
+++ gnome-sudoku.spec	25 Jan 2006 05:54:35 -0000	1.4
@@ -3,13 +3,16 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%if %{fedora} <= 4
+Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,6 +21,8 @@
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
+Requires:   python-numeric, gnome-python2-canvas
+
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -26,6 +31,9 @@
 
 %prep
 %setup -q
+%if %{fedora} <= 4
+%patch0 -p1
+%endif
 # Fix one hardcoding instance
 sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
 # This must be something internal to the developer's system
@@ -65,6 +73,16 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
+- Fix missing Requires: gnome-python2-canvas
+- Enable conditional to synchronize spec
+
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-4
+- Missing Requires: python-numeric (thanks to Brent Fox) (#178834)
+
+* Fri Dec 16 2005 Paul W. Frields <stickster at gmail.com> - 0.4.0-3
+- Fix broken full screen option
+
 * Fri Dec 16 2005 Paul W. Frields <stickster at gmail.com> - 0.4.0-2
 - Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
 



From fedora-extras-commits at redhat.com  Wed Jan 25 06:19:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 01:19:19 -0500
Subject: rpms/xmldiff/FC-4 xmldiff-0.6.7-clean-tmp.patch, NONE,
	1.1 xmldiff.spec, 1.2, 1.3
Message-ID: <200601250619.k0P6Jpsl029589@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29569

Modified Files:
	xmldiff.spec 
Added Files:
	xmldiff-0.6.7-clean-tmp.patch 
Log Message:
Prevent temp file logjam (#177800)

xmldiff-0.6.7-clean-tmp.patch:

--- NEW FILE xmldiff-0.6.7-clean-tmp.patch ---
diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev
--- xmldiff-0.6.7-original/bin/xmlrev	2006-01-24 22:10:13.000000000 -0800
+++ xmldiff-0.6.7/bin/xmlrev	2006-01-24 22:11:17.000000000 -0800
@@ -10,7 +10,7 @@
 TMPFILE_D=$(mktemp /tmp/xmlrev.xupdate.XXXXXX) || exit 1
 TMPFILE_XSLT=$(mktemp /tmp/xmlrev.xslt.XXXXXX) || exit 1
 TMPFILES="$TMPFILE_S $TMPFILE_X $TMPFILE_D $TMPFILE_XSLT"
-
+trap "rm -f $TMPFILES" exit
 
 function guess_doc_type() {
     # $1 filepath
@@ -124,5 +124,3 @@
 	revision "$1" "$2"
 	;;
 esac
-
-rm -f $TMPFILES


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldiff.spec	12 Jan 2006 15:53:42 -0000	1.2
+++ xmldiff.spec	25 Jan 2006 06:19:19 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -12,6 +12,7 @@
 # No license in original tarball, but referenced in docs
 Source1:	GPL
 Patch0:		xmldiff-0.6.7-xsldata.patch
+Patch1:		xmldiff-0.6.7-clean-tmp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 for i in man/*.1 __pkginfo__.py doc/*.txt
 do
 	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
+- Prevent temp file logjam (#177800)
+
 * Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
 - Add Requires: file
 - xmlrev: use proper XSL location



From fedora-extras-commits at redhat.com  Wed Jan 25 06:20:05 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 01:20:05 -0500
Subject: rpms/xmldiff/devel xmldiff-0.6.7-clean-tmp.patch, NONE,
	1.1 xmldiff.spec, 1.2, 1.3
Message-ID: <200601250620.k0P6Kbtd029620@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600

Modified Files:
	xmldiff.spec 
Added Files:
	xmldiff-0.6.7-clean-tmp.patch 
Log Message:
Prevent temp file logjam (#177800)

xmldiff-0.6.7-clean-tmp.patch:

--- NEW FILE xmldiff-0.6.7-clean-tmp.patch ---
diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev
--- xmldiff-0.6.7-original/bin/xmlrev	2006-01-24 22:10:13.000000000 -0800
+++ xmldiff-0.6.7/bin/xmlrev	2006-01-24 22:11:17.000000000 -0800
@@ -10,7 +10,7 @@
 TMPFILE_D=$(mktemp /tmp/xmlrev.xupdate.XXXXXX) || exit 1
 TMPFILE_XSLT=$(mktemp /tmp/xmlrev.xslt.XXXXXX) || exit 1
 TMPFILES="$TMPFILE_S $TMPFILE_X $TMPFILE_D $TMPFILE_XSLT"
-
+trap "rm -f $TMPFILES" exit
 
 function guess_doc_type() {
     # $1 filepath
@@ -124,5 +124,3 @@
 	revision "$1" "$2"
 	;;
 esac
-
-rm -f $TMPFILES


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldiff.spec	12 Jan 2006 15:53:48 -0000	1.2
+++ xmldiff.spec	25 Jan 2006 06:20:05 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -12,6 +12,7 @@
 # No license in original tarball, but referenced in docs
 Source1:	GPL
 Patch0:		xmldiff-0.6.7-xsldata.patch
+Patch1:		xmldiff-0.6.7-clean-tmp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 for i in man/*.1 __pkginfo__.py doc/*.txt
 do
 	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
+- Prevent temp file logjam (#177800)
+
 * Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
 - Add Requires: file
 - xmlrev: use proper XSL location



From fedora-extras-commits at redhat.com  Wed Jan 25 08:40:28 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 03:40:28 -0500
Subject: rpms/tinyerp/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tinyerp-client.patch, 1.2, 1.3 tinyerp-server, 1.2,
	1.3 tinyerp-server.patch, 1.3, 1.4 tinyerp.spec, 1.11, 1.12
Message-ID: <200601250841.k0P8f02o001062@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1023

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server 
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script
 - fixed using localization for the client
 - include all distributed addons



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 14:43:00 -0000	1.4
+++ .cvsignore	25 Jan 2006 08:40:27 -0000	1.5
@@ -1,2 +1,2 @@
-tinyerp-client-3.1.1.tar.gz
-tinyerp-server-3.1.1.tar.gz
+tinyerp-client-3.2.0.tar.gz
+tinyerp-server-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 14:43:00 -0000	1.4
+++ sources	25 Jan 2006 08:40:27 -0000	1.5
@@ -1,2 +1,2 @@
-c2c36a43704b470190e771b478f3f771  tinyerp-client-3.1.1.tar.gz
-eceb59222b7df18ac157ca50a20e8c67  tinyerp-server-3.1.1.tar.gz
+e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
+6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 14:43:00 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 08:40:27 -0000	1.3
@@ -1,21 +1,22 @@
-diff -Nru tinyerp-client-3.1.1.orig/setup.py tinyerp-client-3.1.1/setup.py
---- tinyerp-client-3.1.1.orig/setup.py	2005-09-18 16:19:18.000000000 +0200
-+++ tinyerp-client-3.1.1/setup.py	2005-11-28 15:30:40.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
+diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
+--- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
++++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+@@ -73,14 +73,13 @@
+ import pango
  
- name = 'tinyerp-client'
--version = '3.0.2'
-+version = '3.1.1'
+ # end testing
+-APP = 'terp'
+-DIR = 'po'
++APP = 'tinyerp-client'
  
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -49,7 +49,7 @@
-               ['bin/terp.glade', 'bin/tipoftheday.txt'])]
-     return files
+ locale.setlocale(locale.LC_ALL, '')
+-gettext.bindtextdomain(APP, DIR)
++gettext.bindtextdomain(APP)
+ gettext.textdomain(APP)
+-gettext.install(APP, DIR, unicode=1)
+-gtk.glade.bindtextdomain(APP, DIR)
++gettext.install(APP, unicode=1)
++gtk.glade.bindtextdomain(APP)
  
--included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
-+included_plugins = ['workflow_print']
+ import options
  
- def find_plugins():
-     for plugin in included_plugins:


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server	18 Dec 2005 20:12:51 -0000	1.2
+++ tinyerp-server	25 Jan 2006 08:40:27 -0000	1.3
@@ -27,24 +27,25 @@
 [ -z "/usr/bin/tinyerp-server" ] && exit 0
 
 RETVAL=0
+PIDFILE=/var/spool/tinyerp/tinyerp-server.pid
+LOCKFILE=/var/lock/subsys/tinyerp-server
 
 start() {
     echo -n $"Starting $prog: "
     daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
 
     RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
     echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-    	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/spool/tinyerp/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -61,11 +62,22 @@
 }    
 
 condrestart() {
-    [ -e /var/lock/subsys/tinyerp-server ] && restart || :
+    [ -e $LOCKFILE ] && restart || :
 }
 
 rhstatus() { 
-    status tinyerp-server
+    if [ -f $PIDFILE ] ; then
+        checkpid `cat $PIDFILE`
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+	    echo  $"$prog is running..."
+	else
+	    echo  $"$prog is stopped"
+	fi
+    else
+    	echo  $"$prog is stopped"
+    fi
+    return $RETVAL
 }
 
 case "$1" in

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server.patch	18 Dec 2005 20:14:37 -0000	1.3
+++ tinyerp-server.patch	25 Jan 2006 08:40:27 -0000	1.4
@@ -1,39 +1,21 @@
-diff -Nru tinyerp-server-3.1.1.orig/bin/PKG-INFO tinyerp-server-3.1.1/bin/PKG-INFO
---- tinyerp-server-3.1.1.orig/bin/PKG-INFO	2005-09-12 09:11:17.000000000 +0200
-+++ tinyerp-server-3.1.1/bin/PKG-INFO	2005-11-28 15:30:50.000000000 +0100
-@@ -1,6 +1,6 @@
- Metadata-Version: 1.1
- Name: Tiny ERP
--Version: 2.0.9
-+Version: 3.1.1
- Author: Tiny.be
- Author-email: fp at tiny be
- Maintainer: Tiny.be
-diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
---- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
-@@ -21,7 +21,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-server'
--version = '3.0.2'
-+version = '3.1.1'
- 
+diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
+--- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
++++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
+@@ -26,9 +26,11 @@
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -61,9 +61,9 @@
-     '''Build list of data files to be installed'''
-     files = [(opj('share', 'man', 'man1'),
-               ['man/tinyerp-server.1']),
--             (opj('share','doc', 'tinyerp-server'), 
-+             (opj('share','doc', 'tinyerp-server-%s' % version), 
-               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
--             (opj('share','doc','tinyerp-server', 'i18n'), 
-+             (opj('share','doc','tinyerp-server-%s' % version, 'i18n'), 
-               glob.glob('doc/i18n/*')),
-              (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-               glob.glob('bin/addons/custom/*xml') + 
-@@ -104,8 +104,9 @@
+ 
+-included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter',
++included_addons = ['account', 'audittrail', 'base', 'base_partner_relation',
++		   'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter',
+                    'marketing', 'mrp',
+-                   'network', 'product', 'project', 'purchase', 'sale',
++                   'network', 'product', 'product_electronic', 'product_expiry',
++		   'project', 'purchase', 'sale', 'scrum',
+                    'stock', 'subscription']
+ 
+ required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -104,8 +106,9 @@
  # create startup script
  start_script = \
  "#!/bin/sh\n\


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tinyerp.spec	18 Dec 2005 20:12:51 -0000	1.11
+++ tinyerp.spec	25 Jan 2006 08:40:27 -0000	1.12
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.1.1
-Release:	5%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
 Requires(pre):	fedora-usermgmt
 Requires(postun):	fedora-usermgmt
 
@@ -100,9 +101,9 @@
 %files server
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
-%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
-%{_sysconfdir}/logrotate.d/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -134,6 +135,12 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
+- update to upstream tinyerp 3.2.0
+- fixed status function in the init.d script
+- fixed using localization for the client
+- include all distributed addons
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
 - improved startup script, suggested by Enrico Scholz



From fedora-extras-commits at redhat.com  Wed Jan 25 09:14:04 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:14:04 -0500
Subject: rpms/tinyerp/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tinyerp-client.patch, 1.2, 1.3 tinyerp-server, 1.2,
	1.3 tinyerp-server.patch, 1.3, 1.4 tinyerp.spec, 1.9, 1.10
Message-ID: <200601250914.k0P9Ep2i003231@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3148

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server 
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script
 - fixed using localization for the client
 - include all distributed addons



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 14:40:32 -0000	1.4
+++ .cvsignore	25 Jan 2006 09:14:04 -0000	1.5
@@ -1,2 +1,2 @@
-tinyerp-client-3.1.1.tar.gz
-tinyerp-server-3.1.1.tar.gz
+tinyerp-client-3.2.0.tar.gz
+tinyerp-server-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 14:40:32 -0000	1.4
+++ sources	25 Jan 2006 09:14:04 -0000	1.5
@@ -1,2 +1,2 @@
-c2c36a43704b470190e771b478f3f771  tinyerp-client-3.1.1.tar.gz
-eceb59222b7df18ac157ca50a20e8c67  tinyerp-server-3.1.1.tar.gz
+e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
+6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 14:40:32 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 09:14:04 -0000	1.3
@@ -1,21 +1,22 @@
-diff -Nru tinyerp-client-3.1.1.orig/setup.py tinyerp-client-3.1.1/setup.py
---- tinyerp-client-3.1.1.orig/setup.py	2005-09-18 16:19:18.000000000 +0200
-+++ tinyerp-client-3.1.1/setup.py	2005-11-28 15:30:40.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
+diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
+--- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
++++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+@@ -73,14 +73,13 @@
+ import pango
  
- name = 'tinyerp-client'
--version = '3.0.2'
-+version = '3.1.1'
+ # end testing
+-APP = 'terp'
+-DIR = 'po'
++APP = 'tinyerp-client'
  
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -49,7 +49,7 @@
-               ['bin/terp.glade', 'bin/tipoftheday.txt'])]
-     return files
+ locale.setlocale(locale.LC_ALL, '')
+-gettext.bindtextdomain(APP, DIR)
++gettext.bindtextdomain(APP)
+ gettext.textdomain(APP)
+-gettext.install(APP, DIR, unicode=1)
+-gtk.glade.bindtextdomain(APP, DIR)
++gettext.install(APP, unicode=1)
++gtk.glade.bindtextdomain(APP)
  
--included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
-+included_plugins = ['workflow_print']
+ import options
  
- def find_plugins():
-     for plugin in included_plugins:


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server	18 Dec 2005 20:19:12 -0000	1.2
+++ tinyerp-server	25 Jan 2006 09:14:04 -0000	1.3
@@ -27,24 +27,25 @@
 [ -z "/usr/bin/tinyerp-server" ] && exit 0
 
 RETVAL=0
+PIDFILE=/var/spool/tinyerp/tinyerp-server.pid
+LOCKFILE=/var/lock/subsys/tinyerp-server
 
 start() {
     echo -n $"Starting $prog: "
     daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
 
     RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
     echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-    	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/spool/tinyerp/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -61,11 +62,22 @@
 }    
 
 condrestart() {
-    [ -e /var/lock/subsys/tinyerp-server ] && restart || :
+    [ -e $LOCKFILE ] && restart || :
 }
 
 rhstatus() { 
-    status tinyerp-server
+    if [ -f $PIDFILE ] ; then
+        checkpid `cat $PIDFILE`
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+	    echo  $"$prog is running..."
+	else
+	    echo  $"$prog is stopped"
+	fi
+    else
+    	echo  $"$prog is stopped"
+    fi
+    return $RETVAL
 }
 
 case "$1" in

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server.patch	18 Dec 2005 20:19:12 -0000	1.3
+++ tinyerp-server.patch	25 Jan 2006 09:14:04 -0000	1.4
@@ -1,39 +1,21 @@
-diff -Nru tinyerp-server-3.1.1.orig/bin/PKG-INFO tinyerp-server-3.1.1/bin/PKG-INFO
---- tinyerp-server-3.1.1.orig/bin/PKG-INFO	2005-09-12 09:11:17.000000000 +0200
-+++ tinyerp-server-3.1.1/bin/PKG-INFO	2005-11-28 15:30:50.000000000 +0100
-@@ -1,6 +1,6 @@
- Metadata-Version: 1.1
- Name: Tiny ERP
--Version: 2.0.9
-+Version: 3.1.1
- Author: Tiny.be
- Author-email: fp at tiny be
- Maintainer: Tiny.be
-diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
---- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
-@@ -21,7 +21,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-server'
--version = '3.0.2'
-+version = '3.1.1'
- 
+diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
+--- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
++++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
+@@ -26,9 +26,11 @@
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -61,9 +61,9 @@
-     '''Build list of data files to be installed'''
-     files = [(opj('share', 'man', 'man1'),
-               ['man/tinyerp-server.1']),
--             (opj('share','doc', 'tinyerp-server'), 
-+             (opj('share','doc', 'tinyerp-server-%s' % version), 
-               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
--             (opj('share','doc','tinyerp-server', 'i18n'), 
-+             (opj('share','doc','tinyerp-server-%s' % version, 'i18n'), 
-               glob.glob('doc/i18n/*')),
-              (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-               glob.glob('bin/addons/custom/*xml') + 
-@@ -104,8 +104,9 @@
+ 
+-included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter',
++included_addons = ['account', 'audittrail', 'base', 'base_partner_relation',
++		   'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter',
+                    'marketing', 'mrp',
+-                   'network', 'product', 'project', 'purchase', 'sale',
++                   'network', 'product', 'product_electronic', 'product_expiry',
++		   'project', 'purchase', 'sale', 'scrum',
+                    'stock', 'subscription']
+ 
+ required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -104,8 +106,9 @@
  # create startup script
  start_script = \
  "#!/bin/sh\n\


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyerp.spec	18 Dec 2005 20:19:12 -0000	1.9
+++ tinyerp.spec	25 Jan 2006 09:14:04 -0000	1.10
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.1.1
-Release:	5%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
 Requires(pre):	fedora-usermgmt
 Requires(postun):	fedora-usermgmt
 
@@ -100,9 +101,9 @@
 %files server
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
-%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
-%{_sysconfdir}/logrotate.d/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -134,6 +135,12 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
+- update to upstream tinyerp 3.2.0
+- fixed status function in the init.d script
+- fixed using localization for the client
+- include all distributed addons
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
 - improved startup script, suggested by Enrico Scholz



From fedora-extras-commits at redhat.com  Wed Jan 25 09:22:50 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:22:50 -0500
Subject: rpms/tinyerp/devel tinyerp-client.patch, 1.2, 1.3 tinyerp-server,
	1.1, 1.2 tinyerp.spec, 1.11, 1.12
Message-ID: <200601250923.k0P9NNQA003513@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3487

Modified Files:
	tinyerp-client.patch tinyerp-server tinyerp.spec 
Log Message:
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script
 - fixed using localization for the client
 - include all distributed addons


tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 15:01:50 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 09:22:50 -0000	1.3
@@ -1,21 +1,22 @@
-diff -Nru tinyerp-client-3.1.1.orig/setup.py tinyerp-client-3.1.1/setup.py
---- tinyerp-client-3.1.1.orig/setup.py	2005-09-18 16:19:18.000000000 +0200
-+++ tinyerp-client-3.1.1/setup.py	2005-11-28 15:30:40.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
+diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
+--- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
++++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+@@ -73,14 +73,13 @@
+ import pango
  
- name = 'tinyerp-client'
--version = '3.0.2'
-+version = '3.1.1'
+ # end testing
+-APP = 'terp'
+-DIR = 'po'
++APP = 'tinyerp-client'
  
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -49,7 +49,7 @@
-               ['bin/terp.glade', 'bin/tipoftheday.txt'])]
-     return files
+ locale.setlocale(locale.LC_ALL, '')
+-gettext.bindtextdomain(APP, DIR)
++gettext.bindtextdomain(APP)
+ gettext.textdomain(APP)
+-gettext.install(APP, DIR, unicode=1)
+-gtk.glade.bindtextdomain(APP, DIR)
++gettext.install(APP, unicode=1)
++gtk.glade.bindtextdomain(APP)
  
--included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
-+included_plugins = ['workflow_print']
+ import options
  
- def find_plugins():
-     for plugin in included_plugins:


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	20 Nov 2005 18:25:32 -0000	1.1
+++ tinyerp-server	25 Jan 2006 09:22:50 -0000	1.2
@@ -27,40 +27,25 @@
 [ -z "/usr/bin/tinyerp-server" ] && exit 0
 
 RETVAL=0
+PIDFILE=/var/spool/tinyerp/tinyerp-server.pid
+LOCKFILE=/var/lock/subsys/tinyerp-server
 
 start() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-    	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/run/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -77,11 +62,22 @@
 }    
 
 condrestart() {
-    [ -e /var/lock/subsys/tinyerp-server ] && restart || :
+    [ -e $LOCKFILE ] && restart || :
 }
 
 rhstatus() { 
-    status tinyerp-server
+    if [ -f $PIDFILE ] ; then
+        checkpid `cat $PIDFILE`
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+	    echo  $"$prog is running..."
+	else
+	    echo  $"$prog is stopped"
+	fi
+    else
+    	echo  $"$prog is stopped"
+    fi
+    return $RETVAL
 }
 
 case "$1" in


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tinyerp.spec	4 Jan 2006 11:19:48 -0000	1.11
+++ tinyerp.spec	25 Jan 2006 09:22:50 -0000	1.12
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.1.1
-Release:	6%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -19,7 +19,7 @@
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
 BuildRequires:	desktop-file-utils
-BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base, xorg-x11-fonts-misc
+BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base
 Requires:	pygtk2, pygtk2-libglade, pydot
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
@@ -136,6 +136,12 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
+- update to upstream tinyerp 3.2.0
+- fixed status function in the init.d script
+- fixed using localization for the client
+- include all distributed addons
+
 * Wed Jan  4 2006 Dan Horak <dan at danny.cz> 3.1.1-6
 - added new Xorg dependencies
 



From fedora-extras-commits at redhat.com  Wed Jan 25 09:24:24 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:24:24 -0500
Subject: rpms/tinyerp/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200601250924.k0P9OuL2003546@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3526

Modified Files:
	.cvsignore sources 
Log Message:
 - add new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 15:01:50 -0000	1.4
+++ .cvsignore	25 Jan 2006 09:24:24 -0000	1.5
@@ -1,2 +1,2 @@
-tinyerp-client-3.1.1.tar.gz
-tinyerp-server-3.1.1.tar.gz
+tinyerp-client-3.2.0.tar.gz
+tinyerp-server-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 15:01:50 -0000	1.4
+++ sources	25 Jan 2006 09:24:24 -0000	1.5
@@ -1,2 +1,2 @@
-c2c36a43704b470190e771b478f3f771  tinyerp-client-3.1.1.tar.gz
-eceb59222b7df18ac157ca50a20e8c67  tinyerp-server-3.1.1.tar.gz
+e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
+6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 09:40:10 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:40:10 -0500
Subject: rpms/tinyerp/devel tinyerp-server.patch, 1.2, 1.3 tinyerp.spec, 1.12,
	1.13
Message-ID: <200601250940.k0P9egKD003684@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657

Modified Files:
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - add updated server patch


tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 15:01:50 -0000	1.2
+++ tinyerp-server.patch	25 Jan 2006 09:40:10 -0000	1.3
@@ -1,35 +1,28 @@
-diff -Nru tinyerp-server-3.1.1.orig/bin/PKG-INFO tinyerp-server-3.1.1/bin/PKG-INFO
---- tinyerp-server-3.1.1.orig/bin/PKG-INFO	2005-09-12 09:11:17.000000000 +0200
-+++ tinyerp-server-3.1.1/bin/PKG-INFO	2005-11-28 15:30:50.000000000 +0100
-@@ -1,6 +1,6 @@
- Metadata-Version: 1.1
- Name: Tiny ERP
--Version: 2.0.9
-+Version: 3.1.1
- Author: Tiny.be
- Author-email: fp at tiny be
- Maintainer: Tiny.be
-diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
---- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
-@@ -21,7 +21,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-server'
--version = '3.0.2'
-+version = '3.1.1'
- 
+diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
+--- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
++++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
+@@ -26,9 +26,11 @@
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -61,9 +61,9 @@
-     '''Build list of data files to be installed'''
-     files = [(opj('share', 'man', 'man1'),
-               ['man/tinyerp-server.1']),
--             (opj('share','doc', 'tinyerp-server'), 
-+             (opj('share','doc', 'tinyerp-server-%s' % version), 
-               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
--             (opj('share','doc','tinyerp-server', 'i18n'), 
-+             (opj('share','doc','tinyerp-server-%s' % version, 'i18n'), 
-               glob.glob('doc/i18n/*')),
-              (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-               glob.glob('bin/addons/custom/*xml') + 
+ 
+-included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter',
++included_addons = ['account', 'audittrail', 'base', 'base_partner_relation',
++		   'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter',
+                    'marketing', 'mrp',
+-                   'network', 'product', 'project', 'purchase', 'sale',
++                   'network', 'product', 'product_electronic', 'product_expiry',
++		   'project', 'purchase', 'sale', 'scrum',
+                    'stock', 'subscription']
+ 
+ required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -104,8 +106,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tinyerp.spec	25 Jan 2006 09:22:50 -0000	1.12
+++ tinyerp.spec	25 Jan 2006 09:40:10 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-2
+- add updated server patch
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script



From fedora-extras-commits at redhat.com  Wed Jan 25 09:54:00 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 25 Jan 2006 04:54:00 -0500
Subject: rpms/lighttpd/devel lighttpd-1.4.9-mod_fastcgi-fix.patch, NONE,
	1.1 lighttpd.spec, 1.18, 1.19
Message-ID: <200601250954.k0P9sWMi003782@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3757

Modified Files:
	lighttpd.spec 
Added Files:
	lighttpd-1.4.9-mod_fastcgi-fix.patch 
Log Message:
Add mod_fastcgi-fix patch to fix crash on backend overload.


lighttpd-1.4.9-mod_fastcgi-fix.patch:

--- NEW FILE lighttpd-1.4.9-mod_fastcgi-fix.patch ---
--- lighttpd-1.4.9.orig/src/mod_fastcgi.c	2006-01-14 00:10:56.000000000 -0800
+++ lighttpd-1.4.9/src/mod_fastcgi.c	2006-01-24 13:06:33.710585506 -0800
@@ -2854,7 +2854,7 @@
 			 * -> EAGAIN */
 
 			log_error_write(srv, __FILE__, __LINE__, "ssdsdb", 
-				"backend is overloaded, we disable it for a 2 seconds and send the request to another backend instead:"
+				"backend is overloaded, we disable it for a 2 seconds and send the request to another backend instead:",
 				"reconnects:", hctx->reconnects,
 				"load:", host->load,
 				host->unixsocket);


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lighttpd.spec	16 Jan 2006 10:18:56 -0000	1.18
+++ lighttpd.spec	25 Jan 2006 09:54:00 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -16,6 +16,7 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch1: lighttpd-1.4.9-mod_fastcgi-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -67,6 +68,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
+%patch1 -pB -b .mod_fastcgi-fix
 
 
 %build
@@ -173,6 +175,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-2
+- Add mod_fastcgi-fix patch to fix crash on backend overload.
+
 * Mon Jan 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-1
 - Update to 1.4.9.
 



From fedora-extras-commits at redhat.com  Wed Jan 25 09:57:47 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 25 Jan 2006 04:57:47 -0500
Subject: rpms/lighttpd/devel lighttpd.spec,1.19,1.20
Message-ID: <200601250958.k0P9wJk5003868@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3851

Modified Files:
	lighttpd.spec 
Log Message:
Fix typo in new %patch line.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lighttpd.spec	25 Jan 2006 09:54:00 -0000	1.19
+++ lighttpd.spec	25 Jan 2006 09:57:47 -0000	1.20
@@ -68,7 +68,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -pB -b .mod_fastcgi-fix
+%patch1 -p1 -b .mod_fastcgi-fix
 
 
 %build



From fedora-extras-commits at redhat.com  Wed Jan 25 10:07:51 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 25 Jan 2006 05:07:51 -0500
Subject: rpms/allegro/devel allegro-4.0.3-cfg.patch, 1.1, 1.2 allegro.spec, 
	1.21, 1.22
Message-ID: <200601251008.k0PA8QxR005673@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5651/allegro/devel

Modified Files:
	allegro-4.0.3-cfg.patch allegro.spec 
Log Message:
* Wed Jan 25 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-5
- update default allegro configuration to use sound successfully,
  thanks to Hans de Goede (#178383)
- add timidity++ dependency



allegro-4.0.3-cfg.patch:

Index: allegro-4.0.3-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.0.3-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- allegro-4.0.3-cfg.patch	13 Feb 2005 22:10:46 -0000	1.1
+++ allegro-4.0.3-cfg.patch	25 Jan 2006 10:07:50 -0000	1.2
@@ -1,6 +1,15 @@
---- allegro.cfg~	2003-04-19 10:06:46.000000000 +0300
-+++ allegro.cfg	2005-02-13 23:41:13.339829153 +0200
-@@ -529,22 +529,21 @@
+--- allegro-4.2.0/allegro.cfg.config	2005-05-13 20:37:56.000000000 +0200
++++ allegro-4.2.0/allegro.cfg	2006-01-25 10:49:42.000000000 +0100
+@@ -548,7 +548,7 @@
+ 
+ 
+ # patch set for the DIGMID software wavetable driver
+-patches = 
++patches = /usr/share/timidity/timidity.cfg
+ 
+ 
+ 
+@@ -647,22 +647,21 @@
  
  
  # edit these shell commands to whatever helper programs you want to use...


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- allegro.spec	24 Jan 2006 08:24:49 -0000	1.21
+++ allegro.spec	25 Jan 2006 10:07:50 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        4
+Release:        5
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -19,7 +19,7 @@
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
 BuildRequires:  libXpm-devel, libXcursor-devel, libXxf86vm-devel
-BuildRequires:  libXxf86dga-devel
+BuildRequires:  libXxf86dga-devel, timidity++
 
 %description
 Allegro is a cross-platform library intended for use in computer games
@@ -119,7 +119,7 @@
 %prep
 %setup -q
 %patch1 -p0 -b .libdir
-%patch2 -p0 -b .cfg
+%patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
 
 %build
@@ -207,6 +207,11 @@
 
 
 %changelog
+* Wed Jan 25 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-5
+- update default allegro configuration to use sound successfully,
+  thanks to Hans de Goede (#178383)
+- add timidity++ dependency
+
 * Mon Jan 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-4
 - add allegro-4.2.0-nostrip.patch, so that the main .so file
   doesn't get stripped and we actually get debuginfo for it in



From fedora-extras-commits at redhat.com  Wed Jan 25 12:51:47 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 25 Jan 2006 07:51:47 -0500
Subject: rpms/cernlib/devel cernlib.m4,1.2,1.3 cernlib.spec,1.17,1.18
Message-ID: <200601251252.k0PCqKMR010073@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10049

Modified Files:
	cernlib.m4 cernlib.spec 
Log Message:
newer cernlib.m4



Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib.m4	14 Dec 2005 16:52:26 -0000	1.2
+++ cernlib.m4	25 Jan 2006 12:51:47 -0000	1.3
@@ -16,7 +16,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macro usage:
+dnl A basic example of the macro usage:
 dnl 
 dnl AC_LIB_CERNLIB(kernlib,CLTOU,
 dnl [
@@ -33,15 +33,15 @@
 dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
 dnl   assumed that a static linking using the information reported by that 
 dnl   script is wanted.
-dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
-dnl   location of the static library.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to 
+dnl   be the location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
 dnl - otherwise a simple linking is performed.
 dnl 
 dnl If a dynamic linking is selected:
-dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
-dnl   debian script and it is called with -dy.
+dnl - if the binary program 'cernlib' is in the path it is assumed that it 
+dnl   is the debian script and it is called with -dy.
 dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
@@ -57,7 +57,9 @@
 # AC_CERNLIB check for cernlib location and whether it should be 
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
+CERNLIB_PATH=
 CERNLIB_LIB_PATH=
+CERNLIB_BIN_PATH=
 CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
@@ -65,16 +67,25 @@
 
 AC_ARG_WITH(cernlib,
 [  --with-cernlib           cernlib location],
-[  CERNLIB_LIB_PATH=$withval    ])
+[  CERNLIB_PATH=$withval    
+   CERNLIB_LIB_PATH=$CERNLIB_PATH/lib
+   CERNLIB_BIN_PATH=$CERNLIB_PATH/bin
+])
 
+CERNLIB_BIN=
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
     CERNLIB_STATIC=yes
-    if test "z$CERNLIB_LIB_PATH" = z; then
+    if test "z$CERNLIB_PATH" = z; then
         AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
         if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
         fi
+    else
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no, [$CERNLIB_BIN_PATH:$PATH])
+        if test $CERNLIB_BIN = no; then
+            AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH])
+        fi
         if test $CERNLIB_BIN = no; then
             if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
                CERNLIB_LIB_PATH=$CERNLIB
@@ -86,8 +97,10 @@
         fi
     fi
 else
-    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-    if test "z$CERNLIB_LIB_PATH" != z; then
+    if test "z$CERNLIB_PATH" = z; then
+         AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
+    else
+         AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH])
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
 fi


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cernlib.spec	17 Jan 2006 22:34:44 -0000	1.17
+++ cernlib.spec	25 Jan 2006 12:51:47 -0000	1.18
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       12%{?dist}
+Release:       12%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -712,7 +712,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12
+* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12.1
 - attempt a rebuild against newer openmotif
 
 * Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11.4



From fedora-extras-commits at redhat.com  Wed Jan 25 12:56:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 07:56:36 -0500
Subject: rpms/dosbox/devel dosbox-gcc4.1.patch, NONE, 1.1 dosbox.spec, 1.14,
	1.15
Message-ID: <200601251257.k0PCv88M010192@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10167

Modified Files:
	dosbox.spec 
Added Files:
	dosbox-gcc4.1.patch 
Log Message:
- add gcc4.1 patch (178618)


dosbox-gcc4.1.patch:

--- NEW FILE dosbox-gcc4.1.patch ---
--- include/programs.h	2006-01-24 21:13:38.000000000 +0000
+++ include/programs.h	2006-01-24 21:13:56.000000000 +0000
@@ -40,7 +40,7 @@
 	CommandLine * cmd;
 	DOS_PSP * psp;
 	virtual void Run(void)=0;
-	bool Program::GetEnvStr(const char * entry,std::string & result);
+	bool GetEnvStr(const char * entry,std::string & result);
 	bool GetEnvNum(Bitu num,std::string & result);
 	Bitu GetEnvCount(void);
 	bool SetEnv(const char * entry,const char * new_string);


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dosbox.spec	22 Jan 2006 20:55:07 -0000	1.14
+++ dosbox.spec	25 Jan 2006 12:56:36 -0000	1.15
@@ -11,6 +11,7 @@
 Source1:        dosbox.desktop
 Source2:        dosbox.png
 Patch0:         dosbox-x86-64-build.patch
+Patch1:         dosbox-gcc4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure --enable-shots
@@ -75,6 +77,7 @@
 0.64-7
 - add dist
 - rebuild
+- add gcc4.1 patch
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.64-6



From fedora-extras-commits at redhat.com  Wed Jan 25 13:12:32 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Jan 2006 08:12:32 -0500
Subject: rpms/yumex/devel .cvsignore, 1.8, 1.9 sources, 1.11, 1.12 yumex.spec,
	1.12, 1.13
Message-ID: <200601251313.k0PDD4B6012030@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12009

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
New Release 0.99.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Jan 2006 12:34:06 -0000	1.8
+++ .cvsignore	25 Jan 2006 13:12:32 -0000	1.9
@@ -1 +1 @@
-yumex-0.45-2.tar.gz
+yumex-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Jan 2006 12:34:06 -0000	1.11
+++ sources	25 Jan 2006 13:12:32 -0000	1.12
@@ -1 +1 @@
-9c064934cf21ca340b45ff13ca232e55  yumex-0.45-2.tar.gz
+cd368053d51a8ac4a22c6171c17e4ba6  yumex-0.99.1.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yumex.spec	6 Jan 2006 12:35:45 -0000	1.12
+++ yumex.spec	25 Jan 2006 13:12:32 -0000	1.13
@@ -1,14 +1,12 @@
-%define   build_v 2
-
 Name:     yumex
-Version:  0.45
-Release:  2.0%{?dist}
+Version:  0.99.1
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
 License:  GPL
 URL:      http://linux.rasmil.dk/yumex
-Source0:  http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}-%{build_v}.tar.gz
+Source0:  http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}.tar.gz
 BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -56,9 +54,9 @@
 %doc COPYING ChangeLog
 %{_datadir}/pixmaps/yumex
 %{_datadir}/yumex
-
 %{_bindir}/yumex
-
+/usr/lib/python?.?/site-packages/yumex
+/usr/lib/python?.?/site-packages/yumgui
 %config(noreplace)  %{_sysconfdir}/yumex.profiles.conf
 %config(noreplace)  %{_sysconfdir}/yumex.conf
 %config(noreplace) %{_sysconfdir}/pam.d/yumex
@@ -67,6 +65,13 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Jan 24 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.1-1.0
+- Development Release 0.99.1-1.0
+- Changed versioning from X.Y to X.Y.Z
+- Remove build_v
+- Removed build_v from source0
+- Added /usr/lib/python?.?/site-packages/yumex to %files
+- Added /usr/lib/python?.?/site-packages/yumgui to %files
 * Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-2.0
 - Development Release 0.45-2.0
 - Lot of changes, check the changelog.



From fedora-extras-commits at redhat.com  Wed Jan 25 13:53:09 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:53:09 -0500
Subject: rpms/perl-Crypt-SmbHash - New directory
Message-ID: <200601251353.k0PDrBc6012197@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/perl-Crypt-SmbHash

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-SmbHash added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 25 13:53:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:53:15 -0500
Subject: rpms/perl-Crypt-SmbHash/devel - New directory
Message-ID: <200601251353.k0PDrHBm012212@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/perl-Crypt-SmbHash/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-SmbHash/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 25 13:53:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:53:56 -0500
Subject: rpms/perl-Crypt-SmbHash Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601251353.k0PDrw6m012246@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12234

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-SmbHash


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-SmbHash
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 25 13:54:02 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:54:02 -0500
Subject: rpms/perl-Crypt-SmbHash/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601251354.k0PDs4L5012266@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12234/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-SmbHash


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 25 13:54:45 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:54:45 -0500
Subject: rpms/perl-Crypt-SmbHash import.log,1.1,1.2
Message-ID: <200601251355.k0PDtHQj012334@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-SmbHash-0.12-2 on branch devel from perl-Crypt-SmbHash-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-SmbHash/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Jan 2006 13:53:56 -0000	1.1
+++ import.log	25 Jan 2006 13:54:45 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-SmbHash-0_12-2:HEAD:perl-Crypt-SmbHash-0.12-2.src.rpm:1138197274



From fedora-extras-commits at redhat.com  Wed Jan 25 13:54:51 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:54:51 -0500
Subject: rpms/perl-Crypt-SmbHash/devel perl-Crypt-SmbHash.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601251355.k0PDtNoV012338@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-SmbHash.spec 
Log Message:
auto-import perl-Crypt-SmbHash-0.12-2 on branch devel from perl-Crypt-SmbHash-0.12-2.src.rpm


--- NEW FILE perl-Crypt-SmbHash.spec ---
Summary:	Pure-perl Lanman and NT MD4 hash functions
Name:		perl-Crypt-SmbHash
Version:	0.12
Release:	2%{?dist}
License:	GPL
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-SmbHash/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires:	perl(Digest::MD4)
Requires:	perl(Digest::MD4)
BuildArch:	noarch

%description
This module generates Lanman and NT MD4 style password hashes, using perl-only
code for portability. The module aids in the administration of Samba style
systems.

%prep
%setup -q -n Crypt-SmbHash-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%{perl_vendorlib}/Crypt/
%{_mandir}/man3/Crypt::SmbHash.3pm*

%changelog
* Wed Jan 25 2006 Paul Howarth <paul at city-fan.org> 0.12-2
- Added buildreq perl(Digest::MD4) to ensure that the test suite runs in the
  same environment as the installed package will do (i.e. with the optional
  Digest::MD4 module installed)

* Tue Jan 17 2006 Paul Howarth <paul at city-fan.org> 0.12-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-SmbHash/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2006 13:54:02 -0000	1.1
+++ .cvsignore	25 Jan 2006 13:54:51 -0000	1.2
@@ -0,0 +1 @@
+Crypt-SmbHash-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-SmbHash/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2006 13:54:02 -0000	1.1
+++ sources	25 Jan 2006 13:54:51 -0000	1.2
@@ -0,0 +1 @@
+a6e3f4d65a89bfcc9ba0c69691e6105b  Crypt-SmbHash-0.12.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 13:58:54 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:58:54 -0500
Subject: owners owners.list,1.564,1.565
Message-ID: <200601251359.k0PDxQIk012435@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12418

Modified Files:
	owners.list 
Log Message:
Add perl-Crypt-SmbHash



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- owners.list	24 Jan 2006 16:53:47 -0000	1.564
+++ owners.list	25 Jan 2006 13:58:54 -0000	1.565
@@ -780,6 +780,7 @@
 Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Jan 25 14:02:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 09:02:43 -0500
Subject: rpms/dosbox/devel dosbox-64bit-gcc4.1.patch, NONE, 1.1 dosbox.spec, 
	1.15, 1.16
Message-ID: <200601251403.k0PE3YZh014188@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14152

Modified Files:
	dosbox.spec 
Added Files:
	dosbox-64bit-gcc4.1.patch 
Log Message:
- apply upstream patch
- fix typos


dosbox-64bit-gcc4.1.patch:

--- NEW FILE dosbox-64bit-gcc4.1.patch ---
diff -ru dosbox-0.63-orig/include/mem.h dosbox-0.63/include/mem.h
--- dosbox-0.63-orig/include/mem.h	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/include/mem.h	2006-01-18 10:22:29.183958360 +0100
@@ -77,10 +77,6 @@
 	off[3]=(Bit8u)(val >> 24);
 };
 
-#define MLEB(_MLE_VAL_) (_MLE_VAL_)
-#define MLEW(_MLE_VAL_) ((_MLE_VAL_ >> 8) | (_MLE_VAL_ << 8))
-#define MLED(_MLE_VAL_) ((_MLE_VAL_ >> 24)|((_MLE_VAL_ >> 8)&0xFF00)|((_MLE_VAL_ << 8)&0xFF0000)|((_MLE_VAL_ << 24)&0xFF000000))
-
 #else
 
 INLINE Bit8u host_readb(HostPt off) {
@@ -102,16 +98,20 @@
 	*(Bit32u *)(off)=val;
 };
 
-#define MLEB(_MLE_VAL_) (_MLE_VAL_)
-#define MLEW(_MLE_VAL_) (_MLE_VAL_)
-#define MLED(_MLE_VAL_) (_MLE_VAL_)
-
 #endif
 
-#define WLE(VAR_,VAL_)						\
-	if (sizeof(VAR_)==1) VAR_=MLEB(VAL_);	\
-	if (sizeof(VAR_)==2) VAR_=MLEW(VAL_);	\
-	if (sizeof(VAR_)==4) VAR_=MLED(VAL_);
+
+INLINE void var_write(Bit8u * var, Bit8u val) {
+	host_writeb((HostPt)var, val);
+}
+
+INLINE void var_write(Bit16u * var, Bit16u val) {
+	host_writew((HostPt)var, val);
+}
+
+INLINE void var_write(Bit32u * var, Bit32u val) {
+	host_writed((HostPt)var, val);
+}
 
 /* The Folowing six functions are slower but they recognize the paged memory system */
 
diff -ru dosbox-0.63-orig/include/programs.h dosbox-0.63/include/programs.h
--- dosbox-0.63-orig/include/programs.h	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/include/programs.h	2006-01-18 10:22:29.184958208 +0100
@@ -40,7 +40,7 @@
 	CommandLine * cmd;
 	DOS_PSP * psp;
 	virtual void Run(void)=0;
-	bool Program::GetEnvStr(const char * entry,std::string & result);
+	bool GetEnvStr(const char * entry,std::string & result);
 	bool GetEnvNum(Bitu num,std::string & result);
 	Bitu GetEnvCount(void);
 	bool SetEnv(const char * entry,const char * new_string);
diff -ru dosbox-0.63-orig/src/dos/cdrom_image.cpp dosbox-0.63/src/dos/cdrom_image.cpp
--- dosbox-0.63-orig/src/dos/cdrom_image.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/dos/cdrom_image.cpp	2006-01-18 10:22:51.518562984 +0100
@@ -32,6 +32,8 @@
 
 #if !defined(WIN32)
 #include <libgen.h>
+#else
+#include <string.h>
 #endif
 
 using namespace std;
@@ -387,6 +389,22 @@
 	return (pvd[0] == 1 && !strncmp((char*)(&pvd[1]), "CD001", 5) && pvd[6] == 1);
 }
 
+#if defined(WIN32)
+static string dirname(char * file) {
+	char * sep = strrchr(file, '\\');
+	if (sep == NULL)
+		sep = strrchr(file, '/');
+	if (sep == NULL)
+		return "";
+	else {
+		int len = (int)(sep - file);
+		char tmp[MAX_FILENAME_LENGTH];
+		strncpy(tmp, file, len);
+		return tmp;
+	}
+}
+#endif
+
 bool CDROM_Interface_Image::LoadCueSheet(char *cuefile)
 {
 	Track track = {0, 0, 0, 0, 0, 0, false, NULL};
@@ -399,11 +417,7 @@
 	bool canAddTrack = false;
 	char tmp[MAX_FILENAME_LENGTH];	// dirname can change its argument
 	strncpy(tmp, cuefile, MAX_FILENAME_LENGTH);
-#if defined(WIN32)
-	string pathname("");
-#else
 	string pathname(dirname(tmp));
-#endif
 	ifstream in;
 	in.open(cuefile, ios::in);
 	if (in.fail()) return false;
@@ -572,13 +586,11 @@
 	if (stat(filename.c_str(), &test) == 0) return true;
 	
 	// check if file with path relative to cue file exists
-#ifndef WIN32
 	string tmpstr(pathname + "/" + filename);
 	if (stat(tmpstr.c_str(), &test) == 0) {
 		filename = tmpstr;
 		return true;
 	}
-#endif
 	// finally check if file is in a dosbox local drive
 	char fullname[CROSS_LEN];
 	char tmp[CROSS_LEN];
diff -ru dosbox-0.63-orig/src/dos/drive_cache.cpp dosbox-0.63/src/dos/drive_cache.cpp
--- dosbox-0.63-orig/src/dos/drive_cache.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/dos/drive_cache.cpp	2006-01-18 10:22:29.185958056 +0100
@@ -317,7 +317,8 @@
 {
 	char* cpos = strchr(shortName,'~');
 	if (cpos) {
-		Bits compareCount1	= (int)cpos - (int)shortName;
+/* the following code is replaced as it's not safe when char* is 64 bits */
+/*		Bits compareCount1	= (int)cpos - (int)shortName;
 		char* endPos		= strchr(cpos,'.');
 		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
 		
@@ -327,6 +328,18 @@
 
 		compareCount2 -= numberSize;
 		if (compareCount2>compareCount1) compareCount1 = compareCount2;
+*/
+		size_t compareCount1 = strcspn(shortName,"~");
+		size_t numberSize    = strcspn(cpos,".");
+		size_t compareCount2 = strcspn(compareName,".");
+		if(compareCount2 > 8) compareCount2 = 8;
+		/* We want 
+		 * compareCount2 -= numberSize;
+		 * if (compareCount2>compareCount1) compareCount1 = compareCount2;
+		 * but to prevent negative numbers: 
+		 */
+		if(compareCount2 > compareCount1 + numberSize)
+			compareCount1 = compareCount2 - numberSize;
 		return strncmp(compareName,shortName,compareCount1);
 	}
 	return strcmp(compareName,shortName);
diff -ru dosbox-0.63-orig/src/dos/drive_local.cpp dosbox-0.63/src/dos/drive_local.cpp
--- dosbox-0.63-orig/src/dos/drive_local.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/dos/drive_local.cpp	2006-01-18 10:22:29.185958056 +0100
@@ -409,7 +409,7 @@
 	//TODO Give some doserrorcode;
 		return false;//ERROR
 	}
-	int ret=fseek(fhandle,*pos,seektype);
+	int ret=fseek(fhandle,*reinterpret_cast<Bit32s*>(pos),seektype);
 	if (ret!=0) {
 		// Out of file range, pretend everythings ok 
 		// and move file pointer top end of file... ?! (Black Thorne)
diff -ru dosbox-0.63-orig/src/gui/midi_alsa.h dosbox-0.63/src/gui/midi_alsa.h
--- dosbox-0.63-orig/src/gui/midi_alsa.h	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/gui/midi_alsa.h	2006-01-18 10:22:29.186957904 +0100
@@ -112,7 +112,7 @@
 			}
 			break;
 		default:
-			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (int)msg);
+			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08lx", (long)msg);
 			send_event(1);
 			break;
 		}
diff -ru dosbox-0.63-orig/src/ints/int10_vesa.cpp dosbox-0.63/src/ints/int10_vesa.cpp
--- dosbox-0.63-orig/src/ints/int10_vesa.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/ints/int10_vesa.cpp	2006-01-18 10:22:29.186957904 +0100
@@ -133,27 +133,27 @@
 	VideoModeBlock * mblock=&ModeList_VGA[i];
 	switch (mblock->type) {
 	case M_LIN8:		//Linear 8-bit
-		WLE(minfo.ModeAttributes,0x9b);
-		WLE(minfo.WinAAttributes,0x7);	//Exists/readable/writable
-		WLE(minfo.WinGranularity,64);
-		WLE(minfo.WinSize,64);
-		WLE(minfo.WinASegment,0xa000);
-//		WLE(minfo.WinBSegment,0xa000);
-		WLE(minfo.WinFuncPtr,CALLBACK_RealPointer(callback.setwindow));
-		WLE(minfo.BytesPerScanLine,mblock->swidth);
-		WLE(minfo.NumberOfPlanes,0x1);
-		WLE(minfo.BitsPerPixel,0x08);
-		WLE(minfo.NumberOfBanks,0x1);
-		WLE(minfo.MemoryModel,0x04);	//packed pixel
-		WLE(minfo.NumberOfImagePages,0x05);
-		WLE(minfo.Reserved_page,0x1);
+		var_write(&minfo.ModeAttributes,0x9b);
+		var_write(&minfo.WinAAttributes,0x7);	//Exists/readable/writable
+		var_write(&minfo.WinGranularity,64);
+		var_write(&minfo.WinSize,64);
+		var_write(&minfo.WinASegment,0xa000);
+//		var_write(&minfo.WinBSegment,0xa000);
+		var_write(&minfo.WinFuncPtr,CALLBACK_RealPointer(callback.setwindow));
+		var_write(&minfo.BytesPerScanLine,mblock->swidth);
+		var_write(&minfo.NumberOfPlanes,0x1);
+		var_write(&minfo.BitsPerPixel,0x08);
+		var_write(&minfo.NumberOfBanks,0x1);
+		var_write(&minfo.MemoryModel,0x04);	//packed pixel
+		var_write(&minfo.NumberOfImagePages,0x05);
+		var_write(&minfo.Reserved_page,0x1);
 		break;
 	}
-	WLE(minfo.XResolution,mblock->swidth);
-	WLE(minfo.YResolution,mblock->sheight);
-	WLE(minfo.XCharSize,mblock->cwidth);
-	WLE(minfo.YCharSize,mblock->cheight);
-	WLE(minfo.PhysBasePtr,S3_LFB_BASE);
+	var_write(&minfo.XResolution,mblock->swidth);
+	var_write(&minfo.YResolution,mblock->sheight);
+	var_write(&minfo.XCharSize,mblock->cwidth);
+	var_write(&minfo.YCharSize,mblock->cheight);
+	var_write(&minfo.PhysBasePtr,S3_LFB_BASE);
 
 	MEM_BlockWrite(buf,&minfo,sizeof(MODE_INFO));
 	return 0x00;


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dosbox.spec	25 Jan 2006 12:56:36 -0000	1.15
+++ dosbox.spec	25 Jan 2006 14:02:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.63
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -10,8 +10,8 @@
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        dosbox.desktop
 Source2:        dosbox.png
-Patch0:         dosbox-x86-64-build.patch
-Patch1:         dosbox-gcc4.1.patch
+# See upstream bug 1414547
+Patch0:         dosbox-64bit-gcc4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -33,8 +33,7 @@
 
 %prep
 %setup -q
-%patch0
-%patch1
+%patch0 -p1
 
 %build
 %configure --enable-shots
@@ -73,18 +72,23 @@
 
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.63-8
+- apply upstream patch
+- fix typos
+
 * Sun Jan 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.64-7
+0.63-7
 - add dist
 - rebuild
 - add gcc4.1 patch
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.64-6
+0.63-6
 - add a x86_64 bugfix from upstream 
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.64-5
+0.63-5
 - more build fixes and cleanups...
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Wed Jan 25 14:48:15 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Jan 2006 09:48:15 -0500
Subject: rpms/yumex/devel .cvsignore, 1.9, 1.10 sources, 1.12,
	1.13 yumex.spec, 1.13, 1.14
Message-ID: <200601251448.k0PEmlj8014354@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14332

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.99.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 Jan 2006 13:12:32 -0000	1.9
+++ .cvsignore	25 Jan 2006 14:48:15 -0000	1.10
@@ -1 +1 @@
-yumex-0.99.1.tar.gz
+yumex-0.99.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	25 Jan 2006 13:12:32 -0000	1.12
+++ sources	25 Jan 2006 14:48:15 -0000	1.13
@@ -1 +1 @@
-cd368053d51a8ac4a22c6171c17e4ba6  yumex-0.99.1.tar.gz
+c1515a14e7e23d3cd77adb299cd3f820  yumex-0.99.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yumex.spec	25 Jan 2006 13:12:32 -0000	1.13
+++ yumex.spec	25 Jan 2006 14:48:15 -0000	1.14
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.1
+Version:  0.99.2
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Jan 25 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.2-1.0
+- Development Release 0.99.2-1.0
 * Tue Jan 24 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.1-1.0
 - Development Release 0.99.1-1.0
 - Changed versioning from X.Y to X.Y.Z



From fedora-extras-commits at redhat.com  Wed Jan 25 15:01:38 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:01:38 -0500
Subject: rpms/libpolyxmass/FC-4 .cvsignore, 1.2, 1.3 libpolyxmass.spec, 1.4, 
	1.5 sources, 1.2, 1.3
Message-ID: <200601251502.k0PF2B0Q016390@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpolyxmass/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14641/FC-4

Modified Files:
	.cvsignore libpolyxmass.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 06:43:44 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:01:38 -0000	1.3
@@ -1 +1 @@
-libpolyxmass-0.8.9.tar.gz
+libpolyxmass-0.9.0.tar.gz


Index: libpolyxmass.spec
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-4/libpolyxmass.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpolyxmass.spec	21 Oct 2005 07:35:17 -0000	1.4
+++ libpolyxmass.spec	25 Jan 2006 15:01:38 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libpolyxmass
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        5%{?dist}
 Summary:        Polymer chemistry-related functionalities
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.8.9/libpolyxmass-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.9.0/libpolyxmass-0.9.0.tar.gz
 Patch0:         libpolyxmass-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.9-4
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 06:43:44 -0000	1.2
+++ sources	25 Jan 2006 15:01:38 -0000	1.3
@@ -1 +1 @@
-859c8a2c9a79c256e2fc83e371f1c07b  libpolyxmass-0.8.9.tar.gz
+e452336b89ea6ff09a86680e2cd951a0  libpolyxmass-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:01:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:01:44 -0500
Subject: rpms/libpolyxmass/devel .cvsignore, 1.2, 1.3 libpolyxmass.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601251502.k0PF2XQG016399@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpolyxmass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14641/devel

Modified Files:
	.cvsignore libpolyxmass.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 06:43:44 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:01:44 -0000	1.3
@@ -1 +1 @@
-libpolyxmass-0.8.9.tar.gz
+libpolyxmass-0.9.0.tar.gz


Index: libpolyxmass.spec
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/devel/libpolyxmass.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpolyxmass.spec	21 Oct 2005 07:35:17 -0000	1.4
+++ libpolyxmass.spec	25 Jan 2006 15:01:44 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libpolyxmass
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        5%{?dist}
 Summary:        Polymer chemistry-related functionalities
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.8.9/libpolyxmass-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.9.0/libpolyxmass-0.9.0.tar.gz
 Patch0:         libpolyxmass-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.9-4
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 06:43:44 -0000	1.2
+++ sources	25 Jan 2006 15:01:44 -0000	1.3
@@ -1 +1 @@
-859c8a2c9a79c256e2fc83e371f1c07b  libpolyxmass-0.8.9.tar.gz
+e452336b89ea6ff09a86680e2cd951a0  libpolyxmass-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:01:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:01:32 -0500
Subject: rpms/libpolyxmass/FC-3 .cvsignore, 1.2, 1.3 libpolyxmass.spec, 1.4, 
	1.5 sources, 1.2, 1.3
Message-ID: <200601251502.k0PF2YhT016402@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpolyxmass/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14641/FC-3

Modified Files:
	.cvsignore libpolyxmass.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 06:43:44 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:01:32 -0000	1.3
@@ -1 +1 @@
-libpolyxmass-0.8.9.tar.gz
+libpolyxmass-0.9.0.tar.gz


Index: libpolyxmass.spec
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-3/libpolyxmass.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpolyxmass.spec	21 Oct 2005 07:35:17 -0000	1.4
+++ libpolyxmass.spec	25 Jan 2006 15:01:32 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libpolyxmass
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        5%{?dist}
 Summary:        Polymer chemistry-related functionalities
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.8.9/libpolyxmass-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.9.0/libpolyxmass-0.9.0.tar.gz
 Patch0:         libpolyxmass-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.9-4
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 06:43:44 -0000	1.2
+++ sources	25 Jan 2006 15:01:32 -0000	1.3
@@ -1 +1 @@
-859c8a2c9a79c256e2fc83e371f1c07b  libpolyxmass-0.8.9.tar.gz
+e452336b89ea6ff09a86680e2cd951a0  libpolyxmass-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:24:23 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:24:23 -0500
Subject: rpms/polyxmass-bin/FC-3 .cvsignore, 1.2,
	1.3 polyxmass-bin-src-makefile.patch, 1.1,
	1.2 polyxmass-bin.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251524.k0PFOuQS016670@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-bin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16608/FC-3

Modified Files:
	.cvsignore polyxmass-bin-src-makefile.patch polyxmass-bin.spec 
	sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 08:59:05 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:24:23 -0000	1.3
@@ -1 +1 @@
-polyxmass-bin-0.8.9.tar.gz
+polyxmass-bin-0.9.0.tar.gz

polyxmass-bin-src-makefile.patch:

Index: polyxmass-bin-src-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/polyxmass-bin-src-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polyxmass-bin-src-makefile.patch	24 Oct 2005 08:59:05 -0000	1.1
+++ polyxmass-bin-src-makefile.patch	25 Jan 2006 15:24:23 -0000	1.2
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2005-08-10 17:10:52.000000000 +0200
-+++ src/Makefile.am	2005-09-06 21:49:50.000000000 +0200
-@@ -146,10 +146,9 @@
+--- src/Makefile.am.orig	2006-01-25 16:19:51.000000000 +0100
++++ src/Makefile.am	2006-01-25 16:20:05.000000000 +0100
+@@ -145,8 +145,7 @@
  	-DG_LOG_DOMAIN=\"polyxmass\"\
  	-I$(prefix)/include \
  	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
@@ -10,19 +10,3 @@
  
  polyxmass_LDFLAGS = \
  	-L$(prefix)/lib \
- 	-L/usr/lib -L/usr/local/lib -lpopt \
--	$(POLYXMASSBIN_LIBS)
-\ No newline at end of file
-+	$(POLYXMASSBIN_LIBS)
---- src/Makefile.in.orig	2005-09-02 14:57:54.000000000 +0200
-+++ src/Makefile.in	2005-09-06 21:49:55.000000000 +0200
-@@ -310,8 +310,7 @@
- 	-DG_LOG_DOMAIN=\"polyxmass\"\
- 	-I$(prefix)/include \
- 	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
--	$(POLYXMASSBIN_CFLAGS)\
--	-Werror
-+	$(POLYXMASSBIN_CFLAGS)
- 
- 
- polyxmass_LDFLAGS = \


Index: polyxmass-bin.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/polyxmass-bin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-bin.spec	24 Oct 2005 10:01:01 -0000	1.2
+++ polyxmass-bin.spec	25 Jan 2006 15:24:23 -0000	1.3
@@ -1,17 +1,17 @@
 Name:           polyxmass-bin
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        The GNU polyxmass software suite
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org/
-Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.8.9/polyxmass-bin-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.9.0/polyxmass-bin-0.9.0.tar.gz
 Source1:        polyxmass.desktop
 Patch0:         polyxmass-bin-src-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libpolyxmass-devel >= 0.8.9
+BuildRequires:  libpolyxmass-devel >= 0.9.0
 BuildRequires:  gtk2-devel >= 2.4.10
 BuildRequires:  librsvg2-devel >= 2.7.2
 BuildRequires:  libgnomecanvas-devel >= 2.6.1
@@ -72,10 +72,16 @@
 %exclude %{_datadir}/doc/polyxmass-bin
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-4
 - add dist
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-3
 - add icon to desktop file
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 08:59:05 -0000	1.2
+++ sources	25 Jan 2006 15:24:23 -0000	1.3
@@ -1 +1 @@
-18cef92ef87bf355990d4f71b45aa53f  polyxmass-bin-0.8.9.tar.gz
+070dcf6bdd2147fcfb9bda354b437751  polyxmass-bin-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:24:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:24:29 -0500
Subject: rpms/polyxmass-bin/FC-4 .cvsignore, 1.2,
	1.3 polyxmass-bin-src-makefile.patch, 1.1,
	1.2 polyxmass-bin.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251525.k0PFP1rv016679@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-bin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16608/FC-4

Modified Files:
	.cvsignore polyxmass-bin-src-makefile.patch polyxmass-bin.spec 
	sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 08:59:05 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:24:29 -0000	1.3
@@ -1 +1 @@
-polyxmass-bin-0.8.9.tar.gz
+polyxmass-bin-0.9.0.tar.gz

polyxmass-bin-src-makefile.patch:

Index: polyxmass-bin-src-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/polyxmass-bin-src-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polyxmass-bin-src-makefile.patch	24 Oct 2005 08:59:05 -0000	1.1
+++ polyxmass-bin-src-makefile.patch	25 Jan 2006 15:24:29 -0000	1.2
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2005-08-10 17:10:52.000000000 +0200
-+++ src/Makefile.am	2005-09-06 21:49:50.000000000 +0200
-@@ -146,10 +146,9 @@
+--- src/Makefile.am.orig	2006-01-25 16:19:51.000000000 +0100
++++ src/Makefile.am	2006-01-25 16:20:05.000000000 +0100
+@@ -145,8 +145,7 @@
  	-DG_LOG_DOMAIN=\"polyxmass\"\
  	-I$(prefix)/include \
  	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
@@ -10,19 +10,3 @@
  
  polyxmass_LDFLAGS = \
  	-L$(prefix)/lib \
- 	-L/usr/lib -L/usr/local/lib -lpopt \
--	$(POLYXMASSBIN_LIBS)
-\ No newline at end of file
-+	$(POLYXMASSBIN_LIBS)
---- src/Makefile.in.orig	2005-09-02 14:57:54.000000000 +0200
-+++ src/Makefile.in	2005-09-06 21:49:55.000000000 +0200
-@@ -310,8 +310,7 @@
- 	-DG_LOG_DOMAIN=\"polyxmass\"\
- 	-I$(prefix)/include \
- 	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
--	$(POLYXMASSBIN_CFLAGS)\
--	-Werror
-+	$(POLYXMASSBIN_CFLAGS)
- 
- 
- polyxmass_LDFLAGS = \


Index: polyxmass-bin.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/polyxmass-bin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-bin.spec	24 Oct 2005 10:01:01 -0000	1.2
+++ polyxmass-bin.spec	25 Jan 2006 15:24:29 -0000	1.3
@@ -1,17 +1,17 @@
 Name:           polyxmass-bin
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        The GNU polyxmass software suite
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org/
-Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.8.9/polyxmass-bin-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.9.0/polyxmass-bin-0.9.0.tar.gz
 Source1:        polyxmass.desktop
 Patch0:         polyxmass-bin-src-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libpolyxmass-devel >= 0.8.9
+BuildRequires:  libpolyxmass-devel >= 0.9.0
 BuildRequires:  gtk2-devel >= 2.4.10
 BuildRequires:  librsvg2-devel >= 2.7.2
 BuildRequires:  libgnomecanvas-devel >= 2.6.1
@@ -72,10 +72,16 @@
 %exclude %{_datadir}/doc/polyxmass-bin
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-4
 - add dist
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-3
 - add icon to desktop file
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 08:59:05 -0000	1.2
+++ sources	25 Jan 2006 15:24:29 -0000	1.3
@@ -1 +1 @@
-18cef92ef87bf355990d4f71b45aa53f  polyxmass-bin-0.8.9.tar.gz
+070dcf6bdd2147fcfb9bda354b437751  polyxmass-bin-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:24:35 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:24:35 -0500
Subject: rpms/polyxmass-bin/devel .cvsignore, 1.2,
	1.3 polyxmass-bin-src-makefile.patch, 1.1,
	1.2 polyxmass-bin.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251525.k0PFP7lf016688@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-bin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16608/devel

Modified Files:
	.cvsignore polyxmass-bin-src-makefile.patch polyxmass-bin.spec 
	sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 08:59:05 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:24:35 -0000	1.3
@@ -1 +1 @@
-polyxmass-bin-0.8.9.tar.gz
+polyxmass-bin-0.9.0.tar.gz

polyxmass-bin-src-makefile.patch:

Index: polyxmass-bin-src-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/polyxmass-bin-src-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polyxmass-bin-src-makefile.patch	24 Oct 2005 08:59:05 -0000	1.1
+++ polyxmass-bin-src-makefile.patch	25 Jan 2006 15:24:35 -0000	1.2
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2005-08-10 17:10:52.000000000 +0200
-+++ src/Makefile.am	2005-09-06 21:49:50.000000000 +0200
-@@ -146,10 +146,9 @@
+--- src/Makefile.am.orig	2006-01-25 16:19:51.000000000 +0100
++++ src/Makefile.am	2006-01-25 16:20:05.000000000 +0100
+@@ -145,8 +145,7 @@
  	-DG_LOG_DOMAIN=\"polyxmass\"\
  	-I$(prefix)/include \
  	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
@@ -10,19 +10,3 @@
  
  polyxmass_LDFLAGS = \
  	-L$(prefix)/lib \
- 	-L/usr/lib -L/usr/local/lib -lpopt \
--	$(POLYXMASSBIN_LIBS)
-\ No newline at end of file
-+	$(POLYXMASSBIN_LIBS)
---- src/Makefile.in.orig	2005-09-02 14:57:54.000000000 +0200
-+++ src/Makefile.in	2005-09-06 21:49:55.000000000 +0200
-@@ -310,8 +310,7 @@
- 	-DG_LOG_DOMAIN=\"polyxmass\"\
- 	-I$(prefix)/include \
- 	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
--	$(POLYXMASSBIN_CFLAGS)\
--	-Werror
-+	$(POLYXMASSBIN_CFLAGS)
- 
- 
- polyxmass_LDFLAGS = \


Index: polyxmass-bin.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/polyxmass-bin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-bin.spec	24 Oct 2005 10:01:01 -0000	1.2
+++ polyxmass-bin.spec	25 Jan 2006 15:24:35 -0000	1.3
@@ -1,17 +1,17 @@
 Name:           polyxmass-bin
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        The GNU polyxmass software suite
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org/
-Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.8.9/polyxmass-bin-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.9.0/polyxmass-bin-0.9.0.tar.gz
 Source1:        polyxmass.desktop
 Patch0:         polyxmass-bin-src-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libpolyxmass-devel >= 0.8.9
+BuildRequires:  libpolyxmass-devel >= 0.9.0
 BuildRequires:  gtk2-devel >= 2.4.10
 BuildRequires:  librsvg2-devel >= 2.7.2
 BuildRequires:  libgnomecanvas-devel >= 2.6.1
@@ -72,10 +72,16 @@
 %exclude %{_datadir}/doc/polyxmass-bin
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-4
 - add dist
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-3
 - add icon to desktop file
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 08:59:05 -0000	1.2
+++ sources	25 Jan 2006 15:24:35 -0000	1.3
@@ -1 +1 @@
-18cef92ef87bf355990d4f71b45aa53f  polyxmass-bin-0.8.9.tar.gz
+070dcf6bdd2147fcfb9bda354b437751  polyxmass-bin-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:33:15 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:33:15 -0500
Subject: rpms/polyxmass-doc/FC-3 .cvsignore, 1.2, 1.3 polyxmass-doc.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601251533.k0PFXldX016911@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-doc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856/FC-3

Modified Files:
	.cvsignore polyxmass-doc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 22:07:11 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:33:15 -0000	1.3
@@ -1 +1 @@
-polyxmass-doc-0.8.7.tar.gz
+polyxmass-doc-0.8.8.tar.gz


Index: polyxmass-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-3/polyxmass-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-doc.spec	1 Nov 2005 22:21:35 -0000	1.2
+++ polyxmass-doc.spec	25 Jan 2006 15:33:15 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           polyxmass-doc
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.8
+Release:        1%{?dist}
 Summary:        Documentation for polyxmass
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.7/polyxmass-doc-0.8.7.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.8/polyxmass-doc-0.8.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
@@ -45,7 +45,12 @@
 %exclude %{_datadir}/doc/polyxmass-doc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.8-1
+- version upgrade
+
 * Tue Nov 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.7-2
 - add dist
 
 * Tue Sep 06 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 22:07:11 -0000	1.2
+++ sources	25 Jan 2006 15:33:15 -0000	1.3
@@ -1 +1 @@
-276c0e1bcbbb3605ba03dbec62958d7f  polyxmass-doc-0.8.7.tar.gz
+b0adea8c38cc85a6cd9156d9700bda74  polyxmass-doc-0.8.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:33:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:33:21 -0500
Subject: rpms/polyxmass-doc/FC-4 .cvsignore, 1.2, 1.3 polyxmass-doc.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601251533.k0PFXrbc016916@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-doc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856/FC-4

Modified Files:
	.cvsignore polyxmass-doc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 22:07:11 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:33:21 -0000	1.3
@@ -1 +1 @@
-polyxmass-doc-0.8.7.tar.gz
+polyxmass-doc-0.8.8.tar.gz


Index: polyxmass-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-4/polyxmass-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-doc.spec	1 Nov 2005 22:21:35 -0000	1.2
+++ polyxmass-doc.spec	25 Jan 2006 15:33:21 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           polyxmass-doc
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.8
+Release:        1%{?dist}
 Summary:        Documentation for polyxmass
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.7/polyxmass-doc-0.8.7.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.8/polyxmass-doc-0.8.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
@@ -45,7 +45,12 @@
 %exclude %{_datadir}/doc/polyxmass-doc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.8-1
+- version upgrade
+
 * Tue Nov 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.7-2
 - add dist
 
 * Tue Sep 06 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 22:07:11 -0000	1.2
+++ sources	25 Jan 2006 15:33:21 -0000	1.3
@@ -1 +1 @@
-276c0e1bcbbb3605ba03dbec62958d7f  polyxmass-doc-0.8.7.tar.gz
+b0adea8c38cc85a6cd9156d9700bda74  polyxmass-doc-0.8.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:33:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:33:27 -0500
Subject: rpms/polyxmass-doc/devel .cvsignore, 1.2, 1.3 polyxmass-doc.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251533.k0PFXxo1016921@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856/devel

Modified Files:
	.cvsignore polyxmass-doc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 22:07:11 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:33:26 -0000	1.3
@@ -1 +1 @@
-polyxmass-doc-0.8.7.tar.gz
+polyxmass-doc-0.8.8.tar.gz


Index: polyxmass-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/devel/polyxmass-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-doc.spec	1 Nov 2005 22:21:35 -0000	1.2
+++ polyxmass-doc.spec	25 Jan 2006 15:33:26 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           polyxmass-doc
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.8
+Release:        1%{?dist}
 Summary:        Documentation for polyxmass
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.7/polyxmass-doc-0.8.7.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.8/polyxmass-doc-0.8.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
@@ -45,7 +45,12 @@
 %exclude %{_datadir}/doc/polyxmass-doc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.8-1
+- version upgrade
+
 * Tue Nov 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.7-2
 - add dist
 
 * Tue Sep 06 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 22:07:11 -0000	1.2
+++ sources	25 Jan 2006 15:33:26 -0000	1.3
@@ -1 +1 @@
-276c0e1bcbbb3605ba03dbec62958d7f  polyxmass-doc-0.8.7.tar.gz
+b0adea8c38cc85a6cd9156d9700bda74  polyxmass-doc-0.8.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:58:09 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 25 Jan 2006 10:58:09 -0500
Subject: rpms/python-twisted/devel python-twisted.spec,1.3,1.4
Message-ID: <200601251558.k0PFwfhN017085@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17063

Modified Files:
	python-twisted.spec 
Log Message:
rebuild for rawhide


Index: python-twisted.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted/devel/python-twisted.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-twisted.spec	6 Apr 2005 22:13:30 -0000	1.3
+++ python-twisted.spec	25 Jan 2006 15:58:08 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Event-driven networking framework written in Python
 Name: python-twisted
 Version: 1.3.0
-Release: 3
+Release: 4
 
 License: LGPL
 Group: Applications/Internet
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Wed Jan 25 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 1.3.0-4
+- rebuilt for rawhide, current package installs for python2.3
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Jan 25 16:34:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Jan 2006 11:34:46 -0500
Subject: rpms/perl-Chart/devel .cvsignore, 1.2, 1.3 perl-Chart.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601251635.k0PGZJjF019003@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Chart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18974

Modified Files:
	.cvsignore perl-Chart.spec sources 
Log Message:
* Wed Jan 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.1-1
- 2.4.1.
- Don't ship rgb.txt in docs.
- Specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2005 21:07:15 -0000	1.2
+++ .cvsignore	25 Jan 2006 16:34:46 -0000	1.3
@@ -1 +1 @@
-Chart-2.3.tar.gz
+Chart-2.4.1.tar.gz


Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/perl-Chart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Chart.spec	6 Apr 2005 22:12:43 -0000	1.3
+++ perl-Chart.spec	25 Jan 2006 16:34:46 -0000	1.4
@@ -1,19 +1,16 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Chart
-Version:        2.3
-Release:        3
-
+Version:        2.4.1
+Release:        1%{?dist}
 Summary:        Perl module for producing many types of charts
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Chart/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-2.3.tar.gz
+Source0:        http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(GD) >= 1.20
+BuildRequires:  perl(GD) >= 1.20
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -22,7 +19,7 @@
 
 %prep
 %setup -q -n Chart-%{version}
-chmod 644 Chart/*.pm TODO doc/Documentation.pdf
+chmod -c 644 Chart/*.pm TODO Documentation.pdf
 
 
 %build
@@ -38,7 +35,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -48,12 +45,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO doc/Documentation.pdf rgb.txt
-%{perl_vendorlib}/Chart
+%doc README TODO Documentation.pdf
+%{perl_vendorlib}/Chart*
+%{_mandir}/man3/Chart.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Jan 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.1-1
+- 2.4.1.
+- Don't ship rgb.txt in docs.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3-3
 - rebuilt
 
 * Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2005 21:07:15 -0000	1.2
+++ sources	25 Jan 2006 16:34:46 -0000	1.3
@@ -1 +1 @@
-809540667dd703353af30147ef27b67d  Chart-2.3.tar.gz
+5e7a80badfb8bf6e29b21879689bcc2f  Chart-2.4.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 16:36:13 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 11:36:13 -0500
Subject: rpms/perl-String-CRC32/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-String-CRC32.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200601251636.k0PGaFBS019061@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19007

Removed Files:
	.cvsignore Makefile perl-String-CRC32.spec sources 
Log Message:
Removing devel branch as perl-String-CRC32 is in rawhide

Self-removal now mentioned at http://fedoraproject.org/wiki/Extras/CVSSyncNeeded



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-String-CRC32.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Jan 25 21:12:34 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 25 Jan 2006 16:12:34 -0500
Subject: rpms/libnjb/devel libnjb.perms, NONE, 1.1 libnjb.rules, NONE,
	1.1 libnjb.spec, 1.4, 1.5
Message-ID: <200601252113.k0PLD7lB029333@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29310

Modified Files:
	libnjb.spec 
Added Files:
	libnjb.perms libnjb.rules 
Log Message:
Fixes in resp to bug 178543



--- NEW FILE libnjb.perms ---
<libnjb>=/dev/libnjb*
<console> 0600 <libnjb> 0600 root


--- NEW FILE libnjb.rules ---
# libnjb.rules a udev rules file for libnjb devices
# created by Linus Walleij, ENJOY!

SUBSYSTEM!="usb_device", ACTION!="add", GOTO="nomad_rules_end"

# Creative Nomad Jukebox
SYSFS{idVendor}=="0471", SYSFS{idProduct}=="0222", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox 2
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4100", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox 3
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4101", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4108", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen USB 2.0
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="410b", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen NX
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4109", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Xtra
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4110", SYMLINK+="libnjb-%k"
# Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4111", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Touch
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411b", SYMLINK+="libnjb-%k"
# Creative Zen (Zen Micro variant)
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411d", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Micro
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411e", SYMLINK+="libnjb-%k"
# Second Generation Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4126", SYMLINK+="libnjb-%k"
# Dell Pocket DJ
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4127", SYMLINK+="libnjb-%k"
# Creative Zen Sleek
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4136", SYMLINK+="libnjb-%k"
# Third Generation Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="412f", SYMLINK+="libnjb-%k"

LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnjb.spec	12 Oct 2005 18:46:48 -0000	1.4
+++ libnjb.spec	25 Jan 2006 21:12:33 -0000	1.5
@@ -6,21 +6,24 @@
 # test building a Fedora Extras package, define the following
 # two macros in .rpmmacros:
 #
-# %dist .fc4
-# %fedora 4
+# %dist .fc5
+# %fedora 5
 #
 
 Name:		libnjb
 Version:	2.2.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
 Group:		System Environment/Libraries
-Source:		http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:	libnjb.rules
+Source2:	libnjb.perms
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	BSD
-Requires:	hotplug
+Requires:	udev
+Requires:	pam
 BuildRequires:	libusb-devel
 BuildRequires:	zlib-devel
 BuildRequires:	ncurses-devel
@@ -67,10 +70,12 @@
 %makeinstall
 # Remove libtool archive remnant
 rm -f $RPM_BUILD_ROOT%{_libdir}/libnjb.la
-# Install hotplug scripts so they are up to date
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-install -p -m 755 nomadjukebox $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-install -p -m 644 nomad.usermap $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
+# Install udev rules file.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libnjb.rules
+# Install device permissions
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -84,8 +89,8 @@
 %files
 %defattr(-, root, root)
 %{_libdir}/*.so.*
-%config(noreplace) %{_sysconfdir}/hotplug/usb/*
-
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -100,6 +105,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Linus Walleij <triad at df.lth.se> 2.2.4-2
+- Fix udev problem, let go of hotplug, fix console perms.
+- Still working on libusb vs udev issues.
 * Wed Oct 12 2005 Linus Walleij <triad at df.lth.se> 2.2.4-1
 - New upstream release.
 * Mon Sep 19 2005 Linus Walleij <triad at df.lth.se> 2.2.3-1



From fedora-extras-commits at redhat.com  Wed Jan 25 21:37:56 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 25 Jan 2006 16:37:56 -0500
Subject: rpms/liferea/devel .cvsignore, 1.18, 1.19 liferea.spec, 1.27,
	1.28 sources, 1.19, 1.20
Message-ID: <200601252138.k0PLcTR0029513@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29487

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Wed Jan 25 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-2
- Update to 1.0.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Jan 2006 01:54:37 -0000	1.18
+++ .cvsignore	25 Jan 2006 21:37:56 -0000	1.19
@@ -1 +1 @@
-liferea-1.0.1.tar.gz
+liferea-1.0.2.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- liferea.spec	17 Jan 2006 01:54:37 -0000	1.27
+++ liferea.spec	25 Jan 2006 21:37:56 -0000	1.28
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.1
+Version:        1.0.2
 Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-2
+- Update to 1.0.2.
+
 * Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
 - Update to 1.0.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Jan 2006 01:54:37 -0000	1.19
+++ sources	25 Jan 2006 21:37:56 -0000	1.20
@@ -1 +1 @@
-c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz
+45cd555c60ce7f8a2eda4b776118e939  liferea-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 22:04:32 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 25 Jan 2006 17:04:32 -0500
Subject: rpms/grads/devel grads.spec,1.4,1.5
Message-ID: <200601252205.k0PM56NE031424@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31407

Modified Files:
	grads.spec 
Log Message:
* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
- add BR on readline-devel close #178285



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grads.spec	21 Dec 2005 08:02:35 -0000	1.4
+++ grads.spec	25 Jan 2006 22:04:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.1
+Release:        6%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -32,11 +32,10 @@
 BuildRequires:  hdf-devel 
 %endif
 BuildRequires:  udunits-devel netcdf-devel 
-#BuildRequires:  opendap-devel
+BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-#Requires:       
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -107,7 +106,10 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5.1
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+- add BR on readline-devel close #178285
+
+* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-4



From fedora-extras-commits at redhat.com  Thu Jan 26 06:56:13 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 01:56:13 -0500
Subject: rpms/system-config-control/FC-4 sources,1.2,1.3
Message-ID: <200601260656.k0Q6ujXQ014602@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14570/FC-4

Modified Files:
	sources 
Log Message:
Updated source


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 11:44:48 -0000	1.2
+++ sources	26 Jan 2006 06:56:12 -0000	1.3
@@ -1 +1 @@
-b38cb9e8aaba1b17930a249ad1a7e199  system-config-control-1.0.tar.bz2
+6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 06:56:18 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 01:56:18 -0500
Subject: rpms/system-config-control/devel sources,1.2,1.3
Message-ID: <200601260656.k0Q6upvE014605@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14570/devel

Modified Files:
	sources 
Log Message:
Updated source


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 11:44:48 -0000	1.2
+++ sources	26 Jan 2006 06:56:18 -0000	1.3
@@ -1 +1 @@
-b38cb9e8aaba1b17930a249ad1a7e199  system-config-control-1.0.tar.bz2
+6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 07:17:19 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 26 Jan 2006 02:17:19 -0500
Subject: rpms/python-myghty/devel .cvsignore, 1.4, 1.5 python-myghty.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601260717.k0Q7Hpsj016416@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16393

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Jan 2006 08:53:33 -0000	1.4
+++ .cvsignore	26 Jan 2006 07:17:19 -0000	1.5
@@ -1 +1 @@
-Myghty-0.99a.tar.gz
+Myghty-1.0.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-myghty.spec	4 Jan 2006 09:17:21 -0000	1.4
+++ python-myghty.spec	26 Jan 2006 07:17:19 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        0.99a
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 1.0-1
+- 1.0
+
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 0.99a-1
 - Bump to 0.99a
 - Install with --old-and-unmanageable to avoid Python Eggs annoyance


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Jan 2006 08:53:33 -0000	1.4
+++ sources	26 Jan 2006 07:17:19 -0000	1.5
@@ -1 +1 @@
-09953871f9616e4c5f6059fc6bf06b7e  Myghty-0.99a.tar.gz
+4329dea233683c2e073036ea48f23fd8  Myghty-1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 07:34:09 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 26 Jan 2006 02:34:09 -0500
Subject: rpms/azureus/devel azureus-themed.patch, NONE, 1.1 Azureus.desktop, 
	1.2, 1.3 azureus.script, 1.2, 1.3 azureus.spec, 1.6, 1.7
Message-ID: <200601260734.k0Q7Ygsp016533@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16505

Modified Files:
	Azureus.desktop azureus.script azureus.spec 
Added Files:
	azureus-themed.patch 
Log Message:
Revision -18.  Theme some icons with java-gnome.


azureus-themed.patch:

--- NEW FILE azureus-themed.patch ---
--- org/gudy/azureus2/ui/swt/ImageRepository.java~	2006-01-25 23:03:14.000000000 -0800
+++ org/gudy/azureus2/ui/swt/ImageRepository.java	2006-01-25 23:08:05.000000000 -0800
@@ -18,6 +18,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.util.*;
 
 /**
@@ -45,6 +47,25 @@
     loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
   }
 
+  private static org.gnu.gtk.IconTheme iconTheme;
+
+  public static String getThemedIcon (String name, String def)
+  {
+    try
+      {
+	if (iconTheme == null)
+	  iconTheme = org.gnu.gtk.IconTheme.getDefault();
+
+	return iconTheme.lookupIcon (name, 24, 
+				     org.gnu.gtk.IconLookupFlags.NO_SVG)
+	  .getFilename();
+      }
+    catch (Exception ex)
+      {
+	return def;
+      }
+  }
+
   public static void loadImages(Display display) {
     loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
     loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
@@ -88,20 +109,44 @@
     //ToolBar Icons
 
     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
+    loadImage(display, 
+	      getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"), 
+	      "cb_open_no_default");
     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
+    loadImage(display, 
+	      getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"), 
+	      "cb_new");
+    loadImage(display, 
+	      getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"), 
+	      "cb_up");
+    loadImage(display, 
+	      getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
+	      "cb_down");
+    loadImage(display, 
+	      getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"), 
+	      "cb_top");
+    loadImage(display, 
+	      getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"), 
+	      "cb_bottom");
+    loadImage(display, 
+	      getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"), 
+	      "cb_run");
+    loadImage(display, 
+	      getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"), 
+	      "cb_start");
+    loadImage(display, 
+	      getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"), 
+	      "cb_stop");
+    loadImage(display, 
+	      getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"), 
+	      "cb_remove");
+    loadImage(display, 
+	      getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"), 
+	      "cb_host");
+    loadImage(display, 
+	      getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), 
+	      "cb_publish");
 
     //Status icons
     loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
@@ -138,6 +183,16 @@
     Image im = getImage(name,false);
     if(null == im) {
       InputStream is = loader.getResourceAsStream(res);
+      if (is == null)
+	{
+	  try
+	    {
+	      is = new FileInputStream (res);
+	    }
+	  catch (FileNotFoundException fnf)
+	    {
+	    }
+	}
       if(null != is) {
         if(alpha == 255) {
           im = new Image(display, is);


Index: Azureus.desktop
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/Azureus.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Azureus.desktop	22 Jan 2006 05:51:23 -0000	1.2
+++ Azureus.desktop	26 Jan 2006 07:34:09 -0000	1.3
@@ -7,5 +7,5 @@
 Terminal=false
 Type=Application
 MimeType=application/x-bittorrent
-Categories=Application;Network;FileTransfer;P2P;GTK;Java
+Categories=Application;Network;FileTransfer;P2P;GTK;Java;
 


Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus.script	21 Jan 2006 17:04:07 -0000	1.2
+++ azureus.script	26 Jan 2006 07:34:09 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
+CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- azureus.spec	22 Jan 2006 05:53:36 -0000	1.6
+++ azureus.spec	26 Jan 2006 07:34:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -29,11 +29,12 @@
 Patch9:         azureus-no-bouncycastle.patch
 Patch10:        azureus-cache-size.patch
 Patch11:        azureus-remove-manifest-classpath.patch
+Patch12:        azureus-themed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
-Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java
+Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java
 Requires:       libgcj >= 4.1.0-0.15
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -61,12 +62,13 @@
 %patch9 -p0
 %patch10 -p0
 %patch11 -p0
+%patch12 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
 %build
 mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto
+build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -144,6 +146,12 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-18
+- Theme CoolBar icons with azureus-themed.patch.
+- Add libgtk-java and glib-java dependencies to spec file.
+- Add gtk2.8 and glib0.2 to azureus.script.
+- Add missing semi-colon to Azureus.desktop.
+
 * Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-17
 - Use "$@" instead of $* in azureus.script (thanks ivazquez).
 - Improve .desktop file.



From fedora-extras-commits at redhat.com  Thu Jan 26 07:35:54 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 26 Jan 2006 02:35:54 -0500
Subject: rpms/azureus/devel azureus.spec,1.7,1.8
Message-ID: <200601260736.k0Q7aQqt016586@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16569

Modified Files:
	azureus.spec 
Log Message:
Bump revision.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- azureus.spec	26 Jan 2006 07:34:09 -0000	1.7
+++ azureus.spec	26 Jan 2006 07:35:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -146,7 +146,7 @@
 %{_libdir}/gcj/*
 
 %changelog
-* Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-18
+* Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-19
 - Theme CoolBar icons with azureus-themed.patch.
 - Add libgtk-java and glib-java dependencies to spec file.
 - Add gtk2.8 and glib0.2 to azureus.script.



From fedora-extras-commits at redhat.com  Thu Jan 26 08:25:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 26 Jan 2006 03:25:35 -0500
Subject: rpms/perl-Test-Pod-Coverage/FC-4 .cvsignore, 1.2,
	1.3 perl-Test-Pod-Coverage.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601260826.k0Q8Q7gM018614@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18553/FC-4

Modified Files:
	.cvsignore perl-Test-Pod-Coverage.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2005 19:51:56 -0000	1.2
+++ .cvsignore	26 Jan 2006 08:25:35 -0000	1.3
@@ -1 +1 @@
-Test-Pod-Coverage-1.06.tar.gz
+Test-Pod-Coverage-1.08.tar.gz


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4/perl-Test-Pod-Coverage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Pod-Coverage.spec	12 May 2005 22:35:33 -0000	1.4
+++ perl-Test-Pod-Coverage.spec	26 Jan 2006 08:25:35 -0000	1.5
@@ -1,19 +1,19 @@
 Name:           perl-Test-Pod-Coverage
-Version:        1.06
-Release:        3%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Pod-Coverage/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Pod::Coverage)
-BuildRequires:  perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Pod), perl(Test::Builder::Tester)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Checks for POD coverage in files for your distribution.
@@ -36,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.08-1
+- Update to 1.08.
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-3
 - Add dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2005 19:51:56 -0000	1.2
+++ sources	26 Jan 2006 08:25:35 -0000	1.3
@@ -1 +1 @@
-2e9991d4ac04149179fa60f621b3f42f  Test-Pod-Coverage-1.06.tar.gz
+33405cca7c75b7b89c06ba30eea66692  Test-Pod-Coverage-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 08:25:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 26 Jan 2006 03:25:01 -0500
Subject: rpms/perl-Test-Pod-Coverage/FC-3 .cvsignore, 1.2,
	1.3 perl-Test-Pod-Coverage.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601260826.k0Q8Q4Up018609@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18553/FC-3

Modified Files:
	.cvsignore perl-Test-Pod-Coverage.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2005 19:51:56 -0000	1.2
+++ .cvsignore	26 Jan 2006 08:25:01 -0000	1.3
@@ -1 +1 @@
-Test-Pod-Coverage-1.06.tar.gz
+Test-Pod-Coverage-1.08.tar.gz


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3/perl-Test-Pod-Coverage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Pod-Coverage.spec	13 Jan 2005 19:51:56 -0000	1.1
+++ perl-Test-Pod-Coverage.spec	26 Jan 2006 08:25:01 -0000	1.2
@@ -1,22 +1,19 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Test-Pod-Coverage
-Version:        1.06
-Release:        1
-Epoch:          0
+Version:        1.08
+Release:        1%{?dist}
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Pod-Coverage/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Pod::Coverage)
-BuildRequires:  perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Pod), perl(Test::Builder::Tester)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Checks for POD coverage in files for your distribution.
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,6 +52,15 @@
 
 
 %changelog
+* Thu Jan 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.08-1
+- Update to 1.08.
+
+* Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-3
+- Add dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.06-2
+- rebuilt
+
 * Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2005 19:51:56 -0000	1.2
+++ sources	26 Jan 2006 08:25:01 -0000	1.3
@@ -1 +1 @@
-2e9991d4ac04149179fa60f621b3f42f  Test-Pod-Coverage-1.06.tar.gz
+33405cca7c75b7b89c06ba30eea66692  Test-Pod-Coverage-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 08:25:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 26 Jan 2006 03:25:49 -0500
Subject: rpms/perl-Test-Pod-Coverage/devel .cvsignore, 1.2,
	1.3 perl-Test-Pod-Coverage.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601260826.k0Q8QLbZ018619@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18553/devel

Modified Files:
	.cvsignore perl-Test-Pod-Coverage.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2005 19:51:56 -0000	1.2
+++ .cvsignore	26 Jan 2006 08:25:49 -0000	1.3
@@ -1 +1 @@
-Test-Pod-Coverage-1.06.tar.gz
+Test-Pod-Coverage-1.08.tar.gz


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/perl-Test-Pod-Coverage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Pod-Coverage.spec	12 May 2005 22:35:33 -0000	1.4
+++ perl-Test-Pod-Coverage.spec	26 Jan 2006 08:25:49 -0000	1.5
@@ -1,19 +1,19 @@
 Name:           perl-Test-Pod-Coverage
-Version:        1.06
-Release:        3%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Pod-Coverage/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Pod::Coverage)
-BuildRequires:  perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Pod), perl(Test::Builder::Tester)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Checks for POD coverage in files for your distribution.
@@ -36,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.08-1
+- Update to 1.08.
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-3
 - Add dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2005 19:51:56 -0000	1.2
+++ sources	26 Jan 2006 08:25:49 -0000	1.3
@@ -1 +1 @@
-2e9991d4ac04149179fa60f621b3f42f  Test-Pod-Coverage-1.06.tar.gz
+33405cca7c75b7b89c06ba30eea66692  Test-Pod-Coverage-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 11:40:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 26 Jan 2006 06:40:28 -0500
Subject: rpms/emelfm2/devel .cvsignore, 1.4, 1.5 emelfm2.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200601261141.k0QBf0Bu025016@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24995

Modified Files:
	.cvsignore emelfm2.spec sources 
Log Message:
update to 0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Dec 2005 21:19:30 -0000	1.4
+++ .cvsignore	26 Jan 2006 11:40:28 -0000	1.5
@@ -1 +1 @@
-emelfm2-0.1.4.tar.gz
+emelfm2-0.1.5.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emelfm2.spec	29 Dec 2005 21:06:19 -0000	1.6
+++ emelfm2.spec	26 Jan 2006 11:40:28 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           emelfm2
-Version:        0.1.4
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPL
-URL:            http://emelfm2.org/
-Source0:        http://emelfm2.org/rel/emelfm2-%{version}.tar.gz
+URL:            http://emelfm2.net/
+Source0:        http://emelfm2.net/rel/emelfm2-%{version}.tar.gz
 Patch0:		%{name}-0.1.2-makefile.config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +23,9 @@
 %patch0 -p0 -b .orig
 sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
 # fix for x86_64 libs
-sed -i 's|$(PREFIX)/lib/$(TARGET)/$(LIBS)/|$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/|' Makefile
+sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
 # fix broken icon in emelfm2.desktop
-sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
+sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
 make %{?_smp_mflags}
@@ -63,6 +63,9 @@
 
 	
 %changelog
+* Thu Jan 26 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.5-1
+- Update to 0.1.5.
+
 * Thu Dec 29 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.4-1
 - Update to 0.1.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Dec 2005 21:19:30 -0000	1.4
+++ sources	26 Jan 2006 11:40:28 -0000	1.5
@@ -1 +1 @@
-da39b1d017366fb41700c5d40365a1ae  emelfm2-0.1.4.tar.gz
+826e9edf31431a0b6a2c0208a475df54  emelfm2-0.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 11:56:26 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 26 Jan 2006 06:56:26 -0500
Subject: rpms/emelfm2/FC-4 .cvsignore, 1.3, 1.4 emelfm2.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601261156.k0QBuwK8025437@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25416

Modified Files:
	.cvsignore emelfm2.spec sources 
Log Message:
update to 0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 19:44:04 -0000	1.3
+++ .cvsignore	26 Jan 2006 11:56:26 -0000	1.4
@@ -1 +1 @@
-emelfm2-0.1.3.tar.gz
+emelfm2-0.1.5.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-4/emelfm2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emelfm2.spec	21 Nov 2005 19:44:04 -0000	1.3
+++ emelfm2.spec	26 Jan 2006 11:56:26 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           emelfm2
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPL
-URL:            http://emelfm2.org/
-Source0:        http://emelfm2.org/rel/emelfm2-%{version}.tar.gz
+URL:            http://emelfm2.net/
+Source0:        http://emelfm2.net/rel/emelfm2-%{version}.tar.gz
 Patch0:		%{name}-0.1.2-makefile.config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +23,9 @@
 %patch0 -p0 -b .orig
 sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
 # fix for x86_64 libs
-sed -i 's|$(PREFIX)/lib/$(TARGET)/$(LIBS)/|$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/|' Makefile
+sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
 # fix broken icon in emelfm2.desktop
-sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
+sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
 make %{?_smp_mflags}
@@ -63,8 +63,14 @@
 
 	
 %changelog
+* Thu Jan 26 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.5-1
+- Update to 0.1.5.
+
+* Thu Dec 29 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.4-1
+- Update to 0.1.4.
+
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-2
-- Removed nonexistent ROADMAP from %doc.
+- Removed nonexistant ROADMAP from %doc.
 
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-1
 - Update to 0.1.3.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 19:44:04 -0000	1.3
+++ sources	26 Jan 2006 11:56:26 -0000	1.4
@@ -1 +1 @@
-0f1412c28211aa4afa66cbd297eb9abd  emelfm2-0.1.3.tar.gz
+826e9edf31431a0b6a2c0208a475df54  emelfm2-0.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 11:57:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 26 Jan 2006 06:57:58 -0500
Subject: rpms/emelfm2/FC-3 .cvsignore, 1.3, 1.4 emelfm2.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601261158.k0QBwVdE025510@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25489

Modified Files:
	.cvsignore emelfm2.spec sources 
Log Message:
update to 0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 19:44:56 -0000	1.3
+++ .cvsignore	26 Jan 2006 11:57:58 -0000	1.4
@@ -1 +1 @@
-emelfm2-0.1.3.tar.gz
+emelfm2-0.1.5.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-3/emelfm2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emelfm2.spec	21 Nov 2005 19:44:56 -0000	1.3
+++ emelfm2.spec	26 Jan 2006 11:57:58 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           emelfm2
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPL
-URL:            http://emelfm2.org/
-Source0:        http://emelfm2.org/rel/emelfm2-%{version}.tar.gz
+URL:            http://emelfm2.net/
+Source0:        http://emelfm2.net/rel/emelfm2-%{version}.tar.gz
 Patch0:		%{name}-0.1.2-makefile.config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +23,9 @@
 %patch0 -p0 -b .orig
 sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
 # fix for x86_64 libs
-sed -i 's|$(PREFIX)/lib/$(TARGET)/$(LIBS)/|$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/|' Makefile
+sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
 # fix broken icon in emelfm2.desktop
-sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
+sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
 make %{?_smp_mflags}
@@ -63,8 +63,14 @@
 
 	
 %changelog
+* Thu Jan 26 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.5-1
+- Update to 0.1.5.
+
+* Thu Dec 29 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.4-1
+- Update to 0.1.4.
+
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-2
-- Removed nonexistent ROADMAP from %doc.
+- Removed nonexistant ROADMAP from %doc.
 
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-1
 - Update to 0.1.3.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 19:44:56 -0000	1.3
+++ sources	26 Jan 2006 11:57:58 -0000	1.4
@@ -1 +1 @@
-0f1412c28211aa4afa66cbd297eb9abd  emelfm2-0.1.3.tar.gz
+826e9edf31431a0b6a2c0208a475df54  emelfm2-0.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 12:35:57 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:35:57 -0500
Subject: rpms/system-config-control import.log,1.2,1.3
Message-ID: <200601261236.k0QCaTX5027497@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27456

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-4 on branch devel from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Nov 2005 11:44:42 -0000	1.2
+++ import.log	26 Jan 2006 12:35:57 -0000	1.3
@@ -1 +1,2 @@
 system-config-control-1_0-3:HEAD:system-config-control-1.0-3.src.rpm:1131968670
+system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947



From fedora-extras-commits at redhat.com  Thu Jan 26 12:36:03 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:36:03 -0500
Subject: rpms/system-config-control/devel sources,1.3,1.4
Message-ID: <200601261236.k0QCaZRu027505@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27456/devel

Modified Files:
	sources 
Log Message:
auto-import system-config-control-1.0-4 on branch devel from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jan 2006 06:56:18 -0000	1.3
+++ sources	26 Jan 2006 12:36:03 -0000	1.4
@@ -1 +1 @@
-6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2
+2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 12:38:09 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:38:09 -0500
Subject: rpms/system-config-control import.log,1.3,1.4
Message-ID: <200601261238.k0QCcfKq027605@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27573

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-4 on branch FC-4 from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	26 Jan 2006 12:35:57 -0000	1.3
+++ import.log	26 Jan 2006 12:38:09 -0000	1.4
@@ -1,2 +1,3 @@
 system-config-control-1_0-3:HEAD:system-config-control-1.0-3.src.rpm:1131968670
 system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947
+system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074



From fedora-extras-commits at redhat.com  Thu Jan 26 12:38:15 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:38:15 -0500
Subject: rpms/system-config-control/FC-4 sources,1.3,1.4
Message-ID: <200601261238.k0QCcl4C027608@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27573/FC-4

Modified Files:
	sources 
Log Message:
auto-import system-config-control-1.0-4 on branch FC-4 from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jan 2006 06:56:12 -0000	1.3
+++ sources	26 Jan 2006 12:38:14 -0000	1.4
@@ -1 +1 @@
-6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2
+2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 14:56:18 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 26 Jan 2006 09:56:18 -0500
Subject: rpms/js/devel js-1.5-va_copy.patch, NONE, 1.1 js.spec, 1.6,
	1.7 js-va_copy.patch, 1.1, NONE
Message-ID: <200601261456.k0QEuots031680@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31660

Modified Files:
	js.spec 
Added Files:
	js-1.5-va_copy.patch 
Removed Files:
	js-va_copy.patch 
Log Message:
Update to 1.5 final, add pkgconfig file (#178993).


js-1.5-va_copy.patch:

--- NEW FILE js-1.5-va_copy.patch ---
diff -Naupr js.orig/src/config/Linux_All.mk js/src/config/Linux_All.mk
--- js.orig/src/config/Linux_All.mk	2005-05-10 21:53:44.000000000 +0200
+++ js/src/config/Linux_All.mk	2006-01-26 11:38:12.000000000 +0100
@@ -91,8 +91,12 @@ endif
 JS_EDITLINE = 1
 
 ifeq ($(CPU_ARCH),x86_64)
-# Use VA_COPY() standard macro on x86-64
-# FIXME: better use it everywhere
+# Use va_copy() standard macro on x86-64
+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
+endif
+
+ifeq ($(CPU_ARCH),ppc)
+# Use va_copy() standard macro on ppc too
 OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
 endif
 
diff -Naupr js.orig/src/jsprf.c js/src/jsprf.c
--- js.orig/src/jsprf.c	2004-09-24 05:31:15.000000000 +0200
+++ js/src/jsprf.c	2006-01-26 11:34:52.000000000 +0100
@@ -55,7 +55,7 @@
 ** and requires array notation.
 */
 #ifdef HAVE_VA_COPY
-#define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
+#define VARARGS_ASSIGN(foo, bar)        va_copy(foo,bar)
 #elif defined(HAVE_VA_LIST_AS_ARRAY)
 #define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
 #else


Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- js.spec	19 Apr 2005 20:19:07 -0000	1.6
+++ js.spec	26 Jan 2006 14:56:17 -0000	1.7
@@ -1,11 +1,9 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
-%define real_version 1.5-rc6a
-
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 0.rc6a.6
+Release: 1
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -13,15 +11,14 @@
 %endif
 Group: Development/Languages
 URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz
 Patch0: js-make.patch
 Patch1: js-shlib.patch
-Patch2: js-perlconnect.patch
-Patch3: js-va_copy.patch
-Patch4: js-ldflags.patch
+Patch2: js-1.5-va_copy.patch
+Patch3: js-ldflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl >= 1:5.6.1 readline-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl >= 1:5.6.1, readline-devel
 Provides: libjs = %{version}-%{release}
 
 %description
@@ -29,10 +26,11 @@
 This package has been created for purposes of Sablotron and is suitable
 for embedding in applications.
 
+
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}, pkgconfig
 Provides: libjs-devel = %{version}-%{release}
 
 %description devel
@@ -40,73 +38,106 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
+
 %prep
 %setup -q -n %{name}
 %patch0 -b .make
 %patch1 -b .shlib
-%patch2 -b .perl
-%patch3 -p 1 -b .vacopy
-%patch4 -b .ldflags
-cp src/perlconnect/README.html src/README.perlconnect.html
+%patch2 -p1 -b .vacopy
+%patch3 -b .ldflags
+%{__cp} src/perlconnect/README.html src/README.perlconnect.html
+
+# Create pkgconfig file
+%{__cat} > libjs.pc << EOF
+prefix=%{_prefix}
+exec_prefix=${_prefix}
+libdir=${_libdir}
+includedir=${_includedir}
+
+Name: libjs
+Description: JS library
+Requires:
+Version: %{version}
+Libs: -L${libdir} -ljs
+Cflags: -I${includedir}
+EOF
+
 
 %build
 export BUILD_OPT=1
 %{__make} -C src -f Makefile.ref \
-	XCFLAGS="%{optflags} -fPIC" \
-	BUILD_OPT="1" \
+    XCFLAGS="%{optflags} -fPIC" \
+    BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-	JS_READLINE="1" \
+    JS_READLINE="1" \
 %endif
-	JS_PERLCONNECT="1"
+    JS_PERLCONNECT="1"
 cd src/perlconnect
-MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
+    MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
+    %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
 cd -
 
+
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_bindir} \
-			%{buildroot}%{_libdir} \
-			%{buildroot}%{_includedir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/js %{buildroot}%{_bindir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/jscpucfg %{buildroot}%{_bindir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.so %{buildroot}%{_libdir}/libjs.so.1
+%{__mkdir_p} %{buildroot}%{_bindir} \
+             %{buildroot}%{_libdir}/pkgconfig \
+             %{buildroot}%{_includedir}
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
+    %{buildroot}%{_bindir}/
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.{a,so} \
+    %{buildroot}%{_libdir}/
+%{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
-%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.a %{buildroot}%{_libdir}
-%{__install} -m0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
-  %{buildroot}%{_includedir}
+%{__install} -m 0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
+  %{buildroot}%{_includedir}/
+%{__install} -m 0644 libjs.pc \
+    %{buildroot}%{_libdir}/pkgconfig/
 %{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot}
 find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm
 find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm
-chmod -R u+w %{buildroot}/*
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
 
 %check || :
 ln -s libjs.so src/Linux_All_OPT.OBJ/libjs.so.1
 LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
+%doc src/README*.html src/perlconnect/bg.jpg
 %{_bindir}/js
 %{_libdir}/*.so.*
-%{perl_vendorarch}/auto/JS
+%{perl_vendorarch}/auto/JS/
 %{perl_vendorarch}/*.pm
 
 %files devel
 %defattr(-, root, root, 0755)
-%doc src/README*.html src/perlconnect/bg.jpg
 %{_bindir}/jscpucfg
+%{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_includedir}/js*.h
 
+
 %changelog
+* Thu Jan 26 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-1
+- Update to 1.5.0 final.
+- Spec file cleanups.
+- Move docs from devel to main, since we need the license there.
+- Remove no longer needed js-perlconnect.patch.
+- Update js-1.5-va_copy.patch.
+- Include a pkgconfig file (#178993).
+
 * Tue Apr 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.5-0.rc6a.6
 - Link shared lib with libperl.
 
@@ -130,3 +161,4 @@
 
 * Tue Mar 02 2004 Dag Wieers <dag at wieers.com> - 1.5-0.rc6
 - Initial package. (using DAR)
+


--- js-va_copy.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 14:59:14 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 26 Jan 2006 09:59:14 -0500
Subject: rpms/js/devel js.spec,1.7,1.8
Message-ID: <200601261459.k0QExkCc031738@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31697

Modified Files:
	js.spec 
Log Message:
Add dist to release in order to backport more easily to FC4.



Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- js.spec	26 Jan 2006 14:56:17 -0000	1.7
+++ js.spec	26 Jan 2006 14:59:14 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 1
+Release: 1%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else



From fedora-extras-commits at redhat.com  Thu Jan 26 15:25:33 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 26 Jan 2006 10:25:33 -0500
Subject: rpms/libxml++/FC-3 libxml++.spec,1.5,1.6
Message-ID: <200601261526.k0QFQ60K001170@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1123/FC-3

Modified Files:
	libxml++.spec 
Log Message:
Rebuild to address rh #178592.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-3/libxml++.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libxml++.spec	24 Oct 2005 20:12:33 -0000	1.5
+++ libxml++.spec	26 Jan 2006 15:25:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libxml++
 Version:        2.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.12.0-2
+- Rebuilt to address RH #178592
+
 * Thu Sep 08 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 2.12.0-1
 - Version 2.12.0
 - Use --disable-static for configure.



From fedora-extras-commits at redhat.com  Thu Jan 26 15:25:39 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 26 Jan 2006 10:25:39 -0500
Subject: rpms/libxml++/FC-4 libxml++.spec,1.11,1.12
Message-ID: <200601261526.k0QFQB4W001173@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1123/FC-4

Modified Files:
	libxml++.spec 
Log Message:
Rebuild to address rh #178592.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxml++.spec	9 Sep 2005 04:21:52 -0000	1.11
+++ libxml++.spec	26 Jan 2006 15:25:39 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libxml++
 Version:        2.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -39,7 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.12.0-2
+- Rebuilt to address RH #178592
+
 * Thu Sep 08 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 2.12.0-1
 - Version 2.12.0
 - Use --disable-static for configure.



From fedora-extras-commits at redhat.com  Thu Jan 26 15:25:45 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 26 Jan 2006 10:25:45 -0500
Subject: rpms/libxml++/devel libxml++.spec,1.10,1.11
Message-ID: <200601261526.k0QFQHSD001176@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1123/devel

Modified Files:
	libxml++.spec 
Log Message:
Rebuild to address rh #178592.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxml++.spec	9 Sep 2005 04:26:50 -0000	1.10
+++ libxml++.spec	26 Jan 2006 15:25:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libxml++
 Version:        2.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -39,7 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.12.0-2
+- Rebuilt to address RH #178592
+
 * Thu Sep 08 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 2.12.0-1
 - Version 2.12.0
 - Use --disable-static for configure.



From fedora-extras-commits at redhat.com  Thu Jan 26 15:42:51 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 26 Jan 2006 10:42:51 -0500
Subject: rpms/js/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200601261543.k0QFhNNQ001471@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1452

Modified Files:
	.cvsignore sources 
Log Message:
Commit new sources, oops.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/js/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:47:15 -0000	1.2
+++ .cvsignore	26 Jan 2006 15:42:51 -0000	1.3
@@ -1 +1 @@
-js-1.5-rc6a.tar.gz
+js-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/js/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:47:15 -0000	1.2
+++ sources	26 Jan 2006 15:42:51 -0000	1.3
@@ -1 +1 @@
-43e55003be28b4329b9005aedcc0f015  js-1.5-rc6a.tar.gz
+863bb6462f4ce535399a7c6276ae6776  js-1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 17:00:50 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:00:50 -0500
Subject: rpms/ushare - New directory
Message-ID: <200601261700.k0QH0qOK003474@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466/ushare

Log Message:
Directory /cvs/extras/rpms/ushare added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 17:00:56 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:00:56 -0500
Subject: rpms/ushare/devel - New directory
Message-ID: <200601261700.k0QH0woX003490@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466/ushare/devel

Log Message:
Directory /cvs/extras/rpms/ushare/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 17:01:42 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:01:42 -0500
Subject: rpms/ushare Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601261701.k0QH1ivG005220@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208

Added Files:
	Makefile import.log 
Log Message:
Setup of module ushare


--- NEW FILE Makefile ---
# Top level Makefile for module ushare
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 17:01:48 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:01:48 -0500
Subject: rpms/ushare/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601261701.k0QH1o0j005251@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ushare


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 17:03:57 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:03:57 -0500
Subject: rpms/ushare import.log,1.1,1.2
Message-ID: <200601261704.k0QH4T1W005357@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5319

Modified Files:
	import.log 
Log Message:
auto-import ushare-0.9.5-4 on branch devel from ushare-0.9.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ushare/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 17:01:42 -0000	1.1
+++ import.log	26 Jan 2006 17:03:57 -0000	1.2
@@ -0,0 +1 @@
+ushare-0_9_5-4:HEAD:ushare-0.9.5-4.src.rpm:1138295015



From fedora-extras-commits at redhat.com  Thu Jan 26 17:04:04 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:04:04 -0500
Subject: rpms/ushare/devel ushare-0.9.5-buffer.diff, NONE, 1.1 ushare.init, 
	NONE, 1.1 ushare.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601261704.k0QH4aOP005361@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5319/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ushare-0.9.5-buffer.diff ushare.init ushare.spec 
Log Message:
auto-import ushare-0.9.5-4 on branch devel from ushare-0.9.5-4.src.rpm

ushare-0.9.5-buffer.diff:

--- NEW FILE ushare-0.9.5-buffer.diff ---
--- ushare-0.9.5/src/buffer.c   2005-11-26 15:03:55.000000000 -0500
+++ ushare-0.9.5.p/src/buffer.c   2005-12-21 21:38:38.000000000 -0500
@@ -62,7 +62,7 @@
   len = buffer->len + strlen (str);
   if (len >= buffer->capacity)
   {
-    buffer->capacity = MIN (len, 2 * buffer->capacity);
+    buffer->capacity = MAX (len+1, 2 * buffer->capacity);
     buffer->buf = realloc (buffer->buf, buffer->capacity);
   }
 
@@ -74,14 +74,23 @@
 buffer_appendf (struct buffer_t *buffer, const char *format, ...)
 {
   char str[BUFFER_DEFAULT_CAPACITY];
+  int size;
   va_list va;
 
   if (!buffer || !format)
     return;
 
   va_start (va, format);
-  vsprintf (str, format, va);
-  buffer_append (buffer, str);
+  if ((size = vsnprintf (str, BUFFER_DEFAULT_CAPACITY, format, va))
+      >= BUFFER_DEFAULT_CAPACITY)
+  {
+    char* dynstr = (char*) malloc (size+1);
+    vsnprintf (dynstr,size+1,format,va);
+    buffer_append (buffer, dynstr);
+    free (dynstr);
+  }
+  else
+    buffer_append (buffer, str);
   va_end (va);
 } 


--- NEW FILE ushare.init ---
#!/bin/sh
#
# ushare		This shell script takes care of starting and stopping ushare.
#
# chkconfig: - 75 25
# description:	uShare UPnP A/V Media Server.
#

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

OPTIONS=""
prog=ushare
DESC="UPnP A/V Media Server"

[ -r "/etc/ushare.conf" ] && . /etc/ushare.conf
# abort if no shared directory is defined
[ -z "$USHARE_DIR" ] && exit 0


start() {
	echo -n $"Starting $prog: "
	daemon --user ushare $prog -D
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $prog
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog /var/run/ircd.pid
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $prog -HUP
	RETVAL=$?
	echo
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $prog
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f /var/lock/subsys/$prog ]; then
	  stop
	  start
	fi
	;;
  reload)
	reload
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status"
	exit 1
esac

exit $RETVAL


--- NEW FILE ushare.spec ---
Summary: UPnP (TM) A/V Media Server
Name: ushare
Version: 0.9.5
Release: 4%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://ushare.geexbox.org/

Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2
Source1:ushare.init
Patch0:	ushare-0.9.5-buffer.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libupnp-devel
Requires(pre): fedora-usermgmt
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service

%description
uShare is a UPnP (TM) A/V Media Server. It implements the server 
component that provides UPnP media devices with information on 
available multimedia files. uShare uses the built-in http server 
of libupnp to stream the files to clients.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall
%{__rm} -rf   %{buildroot}%{_sysconfdir}/init.d
%{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ushare
%{__mkdir_p} %{buildroot}%{_var}/lib/ushare
%find_lang %{name}

%clean
rm -rf %{buildroot}

%pre
%{_sbindir}/fedora-useradd 21 -s /sbin/nologin -M -r -d %{_var}/lib/ushare \
    -c "ushare service account" ushare &>/dev/null || :

%post
/sbin/chkconfig --add ushare

%preun
if [ $1 -eq 0 ]; then
    /sbin/service ushare stop &>/dev/null || :
    /sbin/chkconfig --del ushare
fi

%postun
if [ $1 -ge 1 ]; then
    /sbin/service ushare condrestart &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/ushare
%config(noreplace) %{_sysconfdir}/ushare.conf
%{_initrddir}/ushare
%{_mandir}/man1/*
%attr(770,ushare,ushare) %dir %{_var}/lib/ushare/

%changelog
* Tue Dec 27 2005 Eric Tanguy 0.9.5-4
- Use %find_lang macro instead of %{_datadir}/locale/*

* Tue Dec 27 2005 Eric Tanguy 0.9.5-3
- Drop "Requires: libupnp"
- replace %{_sysconfdir}/ushare.conf by %config(noreplace) %{_sysconfdir}/ushare.conf

* Tue Dec 27 2005 Eric Tanguy 0.9.5-2
- add patch for buffer

* Tue Dec 27 2005 Eric Tanguy 0.9.5-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 17:01:48 -0000	1.1
+++ .cvsignore	26 Jan 2006 17:04:03 -0000	1.2
@@ -0,0 +1 @@
+ushare-0.9.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 17:01:48 -0000	1.1
+++ sources	26 Jan 2006 17:04:03 -0000	1.2
@@ -0,0 +1 @@
+2f5371f84a17548988bdd4f0fbe781ff  ushare-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 17:08:41 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:08:41 -0500
Subject: owners owners.list,1.565,1.566
Message-ID: <200601261709.k0QH9DLs005419@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5400

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- owners.list	25 Jan 2006 13:58:54 -0000	1.565
+++ owners.list	26 Jan 2006 17:08:41 -0000	1.566
@@ -569,6 +569,7 @@
 Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libtunepimp|A library for creating MusicBrainz enabled tagging applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|libupnp|Universal Plug and Play (UPnP) SDK|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual|An abstraction library for audio visualisation plugins|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual-plugins|Plugins for use with libvisual|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfce4mcs|Multi-channel settings management support for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1272,6 +1273,7 @@
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 26 17:59:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 12:59:32 -0500
Subject: rpms/gsview/devel gsview.spec,1.14,1.15
Message-ID: <200601261800.k0QI04QQ005629@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gsview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5603

Modified Files:
	gsview.spec 
Log Message:
* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-5
- %post/%postun: update-desktop-database 



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gsview.spec	5 Aug 2005 19:31:56 -0000	1.14
+++ gsview.spec	26 Jan 2006 17:59:32 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: PostScript and PDF previewer
 Name: 	 gsview
 Version: 4.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: Aladdin Free Public License, Ghostgum Software Pty Ltd
 Group: 	 Applications/Publishing
@@ -100,6 +100,13 @@
 rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*}
 
 
+%post
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
 %files
 %defattr(-, root, root)
 %{_bindir}/*
@@ -116,6 +123,9 @@
 
 
 %changelog
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-5
+- %%post/%%postun: update-desktop-database 
+
 * Fri Aug  5 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-4
 - ExcludeArch: ppc (sed busted?)
 



From fedora-extras-commits at redhat.com  Thu Jan 26 18:01:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:01:08 -0500
Subject: rpms/lyx/devel lyx-1.4.0-helpers.patch, NONE, 1.1 lyx.spec, 1.16,
	1.17 lyx-1.3.7-helpers.patch, 1.1, NONE lyx-1.3.7-noxfonts.patch,
	1.1, NONE
Message-ID: <200601261801.k0QI1xdO007403@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7370

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.4.0-helpers.patch 
Removed Files:
	lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
- 1.4.0pre3


lyx-1.4.0-helpers.patch:

--- NEW FILE lyx-1.4.0-helpers.patch ---
--- lyx-1.4.0pre3/lib/configure.helpers	2005-12-24 03:57:10.000000000 -0600
+++ lyx-1.4.0pre3/lib/configure	2006-01-23 07:29:27.000000000 -0600
@@ -811,7 +811,7 @@
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
 echo "$ac_t"""
 PS_VIEWER=
-for ac_prog in gsview32 gv "ghostview -swap" kghostview
+for ac_prog in evince gsview32 gsview kghostview ggv gv "ghostview -swap" 
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -849,7 +849,7 @@
 echo $ac_n "checking for a PDF previewer""... $ac_c"
 echo "$ac_t"""
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview 
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -923,7 +923,7 @@
 echo $ac_n "checking for a HTML previewer""... $ac_c"
 echo "$ac_t"""
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" 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
--- lyx-1.4.0pre3/lib/configure.m4.helpers	2005-09-08 04:20:12.000000000 -0500
+++ lyx-1.4.0pre3/lib/configure.m4	2006-01-23 07:27:26.000000000 -0600
@@ -286,17 +286,17 @@
 SEARCH_PROG([for a LaTeX -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i")
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview)
+SEARCH_PROG([for a Postscript previewer],PS_VIEWER,evince gsview32 gsview kghostview ggv gv "ghostview -swap")
 EPS_VIEWER=$PS_VIEWER
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview)
 
 # Search something to preview dvi
-SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
+SEARCH_PROG([for a DVI previewer],DVI_VIEWER, kdvi xdvi windvi yap)
 
 # Search something to preview html
-SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i " "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lyx.spec	20 Jan 2006 16:08:32 -0000	1.16
+++ lyx.spec	26 Jan 2006 18:01:08 -0000	1.17
@@ -1,17 +1,18 @@
 
+%define beta pre3
+
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.3.7 
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 0.1.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source:  ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-1.4.0pre3.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.3.7-helpers.patch
-Patch2: lyx-1.3.7-noxfonts.patch
+Patch1: lyx-1.4.0-helpers.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -32,13 +33,15 @@
 # xforms frontend
 BuildRequires: xforms-devel
 BuildRequires: libjpeg-devel
-%if "{?fedora}" > "4"
+%if "%{?fedora}" > "4"
 BuildRequires: libXpm-devel
 %endif
 
 BuildRequires: desktop-file-utils
+BuildRequires: python
 BuildRequires: aiksaurus-devel
 BuildRequires: aspell-devel
+BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
 
@@ -91,60 +94,50 @@
 
 %prep
 
-%setup -q
+%setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
-%patch2 -p1 -b .noxfonts
 
 # ./autogen.sh
 
 
 %build
 
-unset LINGUAS ||:
-
 # QT
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
-%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
+
+for frontend in qt xforms ; do
+
 %configure \
-  --with-frontend=qt \
+  --disable-rpath \
+  --enable-compression-support \
+  --with-frontend=$frontend \
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
-  --with-pspell \
+  --with-aspell \
   --without-warnings --disable-debug --disable-dependency-tracking
 
-make %{?_smp_mflags} && \
- cp -a src/lyx lyx-qt
+#--with-included-boost
 
-# Intermediate cleanup 
+# Intermediate cleanup
 # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
 make -C src/frontends clean
 
-# XFORMS
-%configure \
-  --with-frontend=xforms \
-  --enable-optimization="$RPM_OPT_FLAGS" \
-  --with-aiksaurus \
-  --with-pspell \
-  --without-warnings --disable-debug --disable-dependency-tracking
+make %{?_smp_mflags}
 
-make %{?_smp_mflags} && \
-cp -a src/lyx lyx-xforms
+done
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-unset LINGUAS ||:
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 ## Handle front-ends
 install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
-install -p -m0755 -D lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
-install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
-
+install -p -m0755 -D src/lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
 
 # Set up the lyx-specific class files where TeX can see them
 texmf=%{_datadir}/texmf
@@ -154,7 +147,7 @@
 
 # KDE already has a nice builtin crystalsvg icon, 
 # but this is for gnome's benefit (gtk2 < 2.6)
-install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
+#install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -168,12 +161,12 @@
 
 
 %post
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-texhash >& /dev/null ||:
-cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+texhash > /dev/null 2>&1 ||:
+cd %{_datadir}/lyx && ./configure 
 
 %postun
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 texhash >& /dev/null ||:
 
 # Catch installed/uninstalled helpers
@@ -196,11 +189,11 @@
 %defattr(-,root,root,-)
 %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
 %{_bindir}/lyx
-%{_bindir}/noweb2lyx
-%{_bindir}/reLyX
+%{_bindir}/lyxclient
+%{_bindir}/tex2lyx
 #{_datadir}/applications/*-lyx.desktop
-%{_datadir}/pixmaps/*
-%{_mandir}/man?/*
+#{_datadir}/pixmaps/*
+%{_mandir}/man1/*
 %{_datadir}/lyx/
 %{_datadir}/texmf/tex/latex/lyx/
 %verify(not md5 size mtime) %{_datadir}/lyx/*.lst
@@ -219,6 +212,12 @@
 
 
 %changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
+- 1.4.0pre3
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
+- cleanup/fix snarfing of intermediate frontend builds.
+
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
 - BR: libXpm-devel
 


--- lyx-1.3.7-helpers.patch DELETED ---


--- lyx-1.3.7-noxfonts.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 18:06:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:06:33 -0500
Subject: rpms/lyx/devel .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200601261807.k0QI7SmN007467@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7448

Modified Files:
	.cvsignore sources 
Log Message:
new-sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Jan 2006 15:37:52 -0000	1.4
+++ .cvsignore	26 Jan 2006 18:06:33 -0000	1.5
@@ -1 +1 @@
-lyx-1.3.7.tar.bz2
+lyx-1.4.0pre3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jan 2006 15:37:52 -0000	1.5
+++ sources	26 Jan 2006 18:06:33 -0000	1.6
@@ -1 +1 @@
-cef9a2fca128c32ffa04c214d02cde04  lyx-1.3.7.tar.bz2
+d1e83cf590c2682b37cea2729608ac77  lyx-1.4.0pre3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 18:22:09 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:22:09 -0500
Subject: rpms/kdocker/devel kdocker.spec,1.3,1.4
Message-ID: <200601261822.k0QIMgCh007715@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7692

Modified Files:
	kdocker.spec 
Log Message:
mod-X fix(es)



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdocker.spec	22 Jan 2006 02:45:07 -0000	1.3
+++ kdocker.spec	26 Jan 2006 18:22:09 -0000	1.4
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 
 Group:   User Interface/Desktops
 License: GPL
@@ -14,6 +14,10 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
+%if "%{?fedora}" > "4"
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+%endif
 
 %description
 KDocker will help you dock any application in the system tray. This means you



From fedora-extras-commits at redhat.com  Thu Jan 26 18:23:10 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Thu, 26 Jan 2006 13:23:10 -0500
Subject: rpms/yumex/devel .cvsignore, 1.10, 1.11 sources, 1.13,
	1.14 yumex.spec, 1.14, 1.15
Message-ID: <200601261823.k0QINgn8007786@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7760

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.99.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Jan 2006 14:48:15 -0000	1.10
+++ .cvsignore	26 Jan 2006 18:23:10 -0000	1.11
@@ -1 +1 @@
-yumex-0.99.2.tar.gz
+yumex-0.99.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Jan 2006 14:48:15 -0000	1.13
+++ sources	26 Jan 2006 18:23:10 -0000	1.14
@@ -1 +1 @@
-c1515a14e7e23d3cd77adb299cd3f820  yumex-0.99.2.tar.gz
+9ed0c02ee3b77528f201a22254348c75  yumex-0.99.3.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- yumex.spec	25 Jan 2006 14:48:15 -0000	1.14
+++ yumex.spec	26 Jan 2006 18:23:10 -0000	1.15
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.2
+Version:  0.99.3
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Jan 26 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.3-1.0
+- Development Release 0.99.3-1.0
 * Wed Jan 25 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.2-1.0
 - Development Release 0.99.2-1.0
 * Tue Jan 24 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.1-1.0



From fedora-extras-commits at redhat.com  Thu Jan 26 18:36:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:36:00 -0500
Subject: rpms/apollon/devel apollon.spec,1.1,1.2
Message-ID: <200601261836.k0QIaWWG007880@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7863

Modified Files:
	apollon.spec 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-4
- drop libacl hack



Index: apollon.spec
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/apollon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apollon.spec	20 Dec 2005 15:14:06 -0000	1.1
+++ apollon.spec	26 Jan 2006 18:36:00 -0000	1.2
@@ -2,7 +2,7 @@
 Summary: Filesharing client
 Name:	 apollon
 Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Internet
@@ -20,8 +20,6 @@
 
 BuildRequires: qt-devel >= 1:3.3
 BuildRequires: kdelibs-devel >= 6:3.3
-# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602
-BuildRequires: libacl-devel
 
 %description
 A filesharing client which uses giFT.
@@ -112,6 +110,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-4
+- drop libacl hack
+
 * Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-3
 - BR: libacl-devel (workaround kdelibs bug #170602)
 



From fedora-extras-commits at redhat.com  Thu Jan 26 19:39:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:39:34 -0500
Subject: rpms/libksba/devel libksba.spec,1.15,1.16
Message-ID: <200601261940.k0QJe6X1009883@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libksba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9862

Modified Files:
	libksba.spec 
Log Message:
* Wed Nov 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.13-2
- remove hacks
- drop self Obsoletes



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libksba.spec	30 Nov 2005 16:47:45 -0000	1.15
+++ libksba.spec	26 Jan 2006 19:39:33 -0000	1.16
@@ -1,9 +1,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 0.9.13
-Release: 1%{?dist}.1
-#Version: 0.9.11
-#Release: 3%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
@@ -11,22 +9,8 @@
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Try to help x86_64 gnupg2/gpgsm crashes/issues
-Patch1: libksba-0.9.13-gl.patch
-
 BuildRequires: libgpg-error >= 0.7
 BuildRequires: libgcrypt-devel >= 1.2.0
-BuildRequires: automake
-BuildRequires: bison
-
-# Version 0.9.12-1 had issues (see gnupg2 pkg, 'make check' 
-# failures on x86_64), drop when resolved
-%if "%{version}" == "0.9.12"
-ExcludeArch: x86_64
-%endif
-%if "%{version}" == "0.9.11"
-Obsoletes: libksba = 0.9.12-1%{?dist}
-%endif
 
 %description
 KSBA is a library designed to build software based on the X.509 and
@@ -38,9 +22,6 @@
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-%if "%{version}" == "0.9.11"
-Obsoletes: libksba-devel = 0.9.12-1%{?dist}
-%endif
 %description devel
 %{summary}.
 
@@ -48,10 +29,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .gl
-
-./autogen.sh
-
 
 %build
 %configure \
@@ -61,7 +38,7 @@
 make %{?_smp_mflags}
 
 
-%check || :
+%check ||:
 make check
 
 
@@ -106,6 +83,10 @@
 
 
 %changelog
+* Wed Nov 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.13-2
+- remove hacks
+- drop self Obsoletes
+
 * Wed Nov 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.13-1
 - 0.9.13
 



From fedora-extras-commits at redhat.com  Thu Jan 26 19:47:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:47:49 -0500
Subject: rpms/sbcl/devel sbcl-0.9.9-permissive.patch, NONE, 1.1 sbcl.spec,
	1.32, 1.33 sbcl-0.9.6-permissive.patch, 1.1, NONE
Message-ID: <200601261948.k0QJmL5t009991@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9971

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.9-permissive.patch 
Removed Files:
	sbcl-0.9.6-permissive.patch 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
- 0.9.9


sbcl-0.9.9-permissive.patch:

--- NEW FILE sbcl-0.9.9-permissive.patch ---
--- sbcl-0.9.9/make-target-contrib.sh.permissive	2006-01-24 11:14:48.000000000 -0600
+++ sbcl-0.9.9/make-target-contrib.sh	2006-01-26 13:45:41.000000000 -0600
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed
+    # test -f $i/test-passed && rm $i/test-passed
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sbcl.spec	31 Dec 2005 21:03:00 -0000	1.32
+++ sbcl.spec	26 Jan 2006 19:47:49 -0000	1.33
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -66,7 +66,7 @@
 Patch5: sbcl-0.9.5-make-config-fix.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
-Patch7: sbcl-0.9.6-permissive.patch
+Patch7: sbcl-0.9.9-permissive.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
+- 0.9.9
+
 * Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
 - 0.9.8
 


--- sbcl-0.9.6-permissive.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 19:50:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:50:32 -0500
Subject: rpms/sbcl/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200601261951.k0QJp5rJ010028@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Dec 2005 21:03:00 -0000	1.8
+++ .cvsignore	26 Jan 2006 19:50:32 -0000	1.9
@@ -1,4 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.8-source.tar.bz2
 sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 sbcl-0.9.8-x86-linux-binary.tar.bz2
+sbcl-0.9.9-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2005 21:03:00 -0000	1.8
+++ sources	26 Jan 2006 19:50:32 -0000	1.9
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
 294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2
+4aafb2ce07bd7933f7edec29b404a595  sbcl-0.9.9-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 19:52:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:52:39 -0500
Subject: rpms/sbcl/devel sbcl.spec,1.33,1.34
Message-ID: <200601261953.k0QJrBT7010067@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10046

Modified Files:
	sbcl.spec 
Log Message:
update binary bootstraps, omitted from src.rpm by default



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sbcl.spec	26 Jan 2006 19:47:49 -0000	1.33
+++ sbcl.spec	26 Jan 2006 19:52:39 -0000	1.34
@@ -27,7 +27,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -35,7 +35,7 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -45,7 +45,7 @@
 ## ppc section
 # Latest powerpc-linux bootstrap, busted:
 # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 # another possible ppc bootstrap to try
 #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h



From fedora-extras-commits at redhat.com  Thu Jan 26 19:55:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:55:04 -0500
Subject: rpms/sbcl/FC-4 sbcl-0.9.9-permissive.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 sbcl.spec, 1.31, 1.32 sources, 1.7,
	1.8 sbcl-0.9.6-permissive.patch, 1.1, NONE
Message-ID: <200601261955.k0QJta5F010161@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10134

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-0.9.9-permissive.patch 
Removed Files:
	sbcl-0.9.6-permissive.patch 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
- 0.9.9


sbcl-0.9.9-permissive.patch:

--- NEW FILE sbcl-0.9.9-permissive.patch ---
--- sbcl-0.9.9/make-target-contrib.sh.permissive	2006-01-24 11:14:48.000000000 -0600
+++ sbcl-0.9.9/make-target-contrib.sh	2006-01-26 13:45:41.000000000 -0600
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed
+    # test -f $i/test-passed && rm $i/test-passed
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 10:42:48 -0000	1.7
+++ .cvsignore	26 Jan 2006 19:55:03 -0000	1.8
@@ -1,4 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.8-source.tar.bz2
 sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 sbcl-0.9.8-x86-linux-binary.tar.bz2
+sbcl-0.9.9-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sbcl.spec	1 Jan 2006 10:42:48 -0000	1.31
+++ sbcl.spec	26 Jan 2006 19:55:03 -0000	1.32
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -27,7 +27,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -35,7 +35,7 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -45,7 +45,7 @@
 ## ppc section
 # Latest powerpc-linux bootstrap, busted:
 # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 # another possible ppc bootstrap to try
 #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
@@ -66,7 +66,7 @@
 Patch5: sbcl-0.9.5-make-config-fix.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
-Patch7: sbcl-0.9.6-permissive.patch
+Patch7: sbcl-0.9.9-permissive.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
+- 0.9.9
+
 * Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
 - 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 10:42:48 -0000	1.7
+++ sources	26 Jan 2006 19:55:03 -0000	1.8
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
 294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2
+4aafb2ce07bd7933f7edec29b404a595  sbcl-0.9.9-source.tar.bz2


--- sbcl-0.9.6-permissive.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 19:56:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:56:23 -0500
Subject: rpms/sbcl/FC-3 sbcl-0.9.9-permissive.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 sbcl.spec, 1.27, 1.28 sources, 1.7, 1.8
Message-ID: <200601261956.k0QJutXa010197@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10172

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-0.9.9-permissive.patch 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
- 0.9.9


sbcl-0.9.9-permissive.patch:

--- NEW FILE sbcl-0.9.9-permissive.patch ---
--- sbcl-0.9.9/make-target-contrib.sh.permissive	2006-01-24 11:14:48.000000000 -0600
+++ sbcl-0.9.9/make-target-contrib.sh	2006-01-26 13:45:41.000000000 -0600
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed
+    # test -f $i/test-passed && rm $i/test-passed
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 10:42:22 -0000	1.7
+++ .cvsignore	26 Jan 2006 19:56:22 -0000	1.8
@@ -1,4 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.8-source.tar.bz2
 sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 sbcl-0.9.8-x86-linux-binary.tar.bz2
+sbcl-0.9.9-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sbcl.spec	1 Jan 2006 10:42:22 -0000	1.27
+++ sbcl.spec	26 Jan 2006 19:56:22 -0000	1.28
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -27,7 +27,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -35,7 +35,7 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -45,7 +45,7 @@
 ## ppc section
 # Latest powerpc-linux bootstrap, busted:
 # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 # another possible ppc bootstrap to try
 #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
@@ -66,7 +66,7 @@
 Patch5: sbcl-0.9.5-make-config-fix.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
-Patch7: sbcl-0.9.6-permissive.patch
+Patch7: sbcl-0.9.9-permissive.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
+- 0.9.9
+
 * Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
 - 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 10:42:22 -0000	1.7
+++ sources	26 Jan 2006 19:56:22 -0000	1.8
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
 294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2
+4aafb2ce07bd7933f7edec29b404a595  sbcl-0.9.9-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 19:59:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:59:55 -0500
Subject: rpms/gnupg2/FC-4 .cvsignore, 1.6, 1.7 gnupg2.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <200601262000.k0QK0RXO010299@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10259

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
- 1.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Oct 2005 16:20:45 -0000	1.6
+++ .cvsignore	26 Jan 2006 19:59:54 -0000	1.7
@@ -1,2 +1,2 @@
-gnupg-1.9.19.tar.bz2
-gnupg-1.9.19.tar.bz2.sig
+gnupg-1.9.20.tar.bz2
+gnupg-1.9.20.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnupg2.spec	5 Dec 2005 14:44:40 -0000	1.15
+++ gnupg2.spec	26 Jan 2006 19:59:54 -0000	1.16
@@ -4,10 +4,11 @@
 # it can use other implementations too (including non-pcsc ones).
 %define pcsc_lib libpcsclite.so.0
 
-Summary: GNU utility for secure communication and data storage
+Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.19
-Release: 8%{?dist}
+Version: 1.9.20
+Release: 1%{?dist}
+
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -36,7 +37,7 @@
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
 #BuildRequires: libksba-devel = 0.9.11
 #else
-BuildRequires: libksba-devel >= 0.9.12
+BuildRequires: libksba-devel >= 0.9.13
 #endif
 
 BuildRequires: gettext
@@ -74,9 +75,9 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-%ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
-%endif
+#ifarch x86_64
+#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+#endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -84,9 +85,9 @@
 %build
 
 %configure \
-  --disable-dependency-tracking \
   --disable-rpath \
-  --enable-gpg
+  --disable-dependency-tracking \
+  --enable-gpg 
 
 make %{?_smp_mflags}
 
@@ -95,7 +96,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-#make check ||:
+make check ||:
 
 
 %install
@@ -104,6 +105,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # enable auto-startup/shutdown of gpg-agent 
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
 install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
 install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
@@ -124,7 +126,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
@@ -134,6 +136,7 @@
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
+%{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
+- 1.9.20
+
 * Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.19-8
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Oct 2005 16:20:45 -0000	1.7
+++ sources	26 Jan 2006 19:59:54 -0000	1.8
@@ -1,2 +1,2 @@
-8084256a61aa90e0173d436bf1e6f82b  gnupg-1.9.19.tar.bz2
-9646e2b0f68474c5b1c8d37a09fb56d1  gnupg-1.9.19.tar.bz2.sig
+93899203fc0530f03e146d49b65c1e28  gnupg-1.9.20.tar.bz2
+76e3a5c1ac153c24a4fd3e0e83b0e9f6  gnupg-1.9.20.tar.bz2.sig



From fedora-extras-commits at redhat.com  Thu Jan 26 20:01:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 15:01:38 -0500
Subject: rpms/gnupg2/FC-3 .cvsignore, 1.5, 1.6 gnupg2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200601262002.k0QK2WqN012072@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12048

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
- 1.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Oct 2005 16:22:47 -0000	1.5
+++ .cvsignore	26 Jan 2006 20:01:37 -0000	1.6
@@ -1,2 +1,2 @@
-gnupg-1.9.19.tar.bz2
-gnupg-1.9.19.tar.bz2.sig
+gnupg-1.9.20.tar.bz2
+gnupg-1.9.20.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnupg2.spec	5 Dec 2005 15:16:53 -0000	1.10
+++ gnupg2.spec	26 Jan 2006 20:01:37 -0000	1.11
@@ -4,10 +4,11 @@
 # it can use other implementations too (including non-pcsc ones).
 %define pcsc_lib libpcsclite.so.0
 
-Summary: GNU utility for secure communication and data storage
+Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.19
-Release: 8%{?dist}
+Version: 1.9.20
+Release: 1%{?dist}
+
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -36,7 +37,7 @@
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
 #BuildRequires: libksba-devel = 0.9.11
 #else
-BuildRequires: libksba-devel >= 0.9.12
+BuildRequires: libksba-devel >= 0.9.13
 #endif
 
 BuildRequires: gettext
@@ -74,9 +75,9 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-%ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
-%endif
+#ifarch x86_64
+#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+#endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -84,9 +85,9 @@
 %build
 
 %configure \
-  --disable-dependency-tracking \
   --disable-rpath \
-  --enable-gpg
+  --disable-dependency-tracking \
+  --enable-gpg 
 
 make %{?_smp_mflags}
 
@@ -95,7 +96,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-#make check ||:
+make check ||:
 
 
 %install
@@ -104,6 +105,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # enable auto-startup/shutdown of gpg-agent 
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
 install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
 install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
@@ -124,7 +126,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
@@ -134,6 +136,7 @@
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
+%{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
+- 1.9.20
+
 * Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.19-8
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Oct 2005 16:22:47 -0000	1.6
+++ sources	26 Jan 2006 20:01:37 -0000	1.7
@@ -1,2 +1,2 @@
-8084256a61aa90e0173d436bf1e6f82b  gnupg-1.9.19.tar.bz2
-9646e2b0f68474c5b1c8d37a09fb56d1  gnupg-1.9.19.tar.bz2.sig
+93899203fc0530f03e146d49b65c1e28  gnupg-1.9.20.tar.bz2
+76e3a5c1ac153c24a4fd3e0e83b0e9f6  gnupg-1.9.20.tar.bz2.sig



From fedora-extras-commits at redhat.com  Thu Jan 26 20:28:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 15:28:08 -0500
Subject: rpms/sbcl/FC-3 sbcl-0.9.6-permissive.patch,1.1,NONE
Message-ID: <200601262028.k0QKSBhe012368@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12357

Removed Files:
	sbcl-0.9.6-permissive.patch 
Log Message:
drop old patch



--- sbcl-0.9.6-permissive.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:10:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:10:39 -0500
Subject: rpms/perl-Text-Levenshtein - New directory
Message-ID: <200601262110.k0QLAfWA014569@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14561/perl-Text-Levenshtein

Log Message:
Directory /cvs/extras/rpms/perl-Text-Levenshtein added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:10:45 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:10:45 -0500
Subject: rpms/perl-Text-Levenshtein/devel - New directory
Message-ID: <200601262110.k0QLAlMg014584@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14561/perl-Text-Levenshtein/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-Levenshtein/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:11:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:11:49 -0500
Subject: rpms/perl-Text-Levenshtein Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262111.k0QLBpD1014623@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14611

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-Levenshtein


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-Levenshtein
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:11:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:11:55 -0500
Subject: rpms/perl-Text-Levenshtein/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262112.k0QLCFY2014644@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14611/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-Levenshtein


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:13:47 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:13:47 -0500
Subject: rpms/perl-Text-Levenshtein import.log,1.1,1.2
Message-ID: <200601262114.k0QLEJdB014742@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14708

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-Levenshtein-0.05-2 on branch devel from perl-Text-Levenshtein-0.05-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Levenshtein/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:11:49 -0000	1.1
+++ import.log	26 Jan 2006 21:13:47 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-Levenshtein-0_05-2:HEAD:perl-Text-Levenshtein-0.05-2.src.rpm:1138310014



From fedora-extras-commits at redhat.com  Thu Jan 26 21:13:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:13:53 -0500
Subject: rpms/perl-Text-Levenshtein/devel perl-Text-Levenshtein.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262114.k0QLEQ4C014746@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14708/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-Levenshtein.spec 
Log Message:
auto-import perl-Text-Levenshtein-0.05-2 on branch devel from perl-Text-Levenshtein-0.05-2.src.rpm


--- NEW FILE perl-Text-Levenshtein.spec ---
Name:           perl-Text-Levenshtein
Version:        0.05
Release:        2%{?dist}
Summary:        Text::Levenshtein Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Levenshtein/
Source0:        http://www.cpan.org/modules/by-module/Text/Text-Levenshtein-0.05.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Levenshtein is an implementation of the Levenshtein edit
distance in Perl.

%prep
%setup -q -n Text-Levenshtein-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Sep 16 2005 Steven Pritchard <steve at kspei.com> 0.05-2
- Remove core module Test::More dependency.

* Sat Aug 27 2005 Steven Pritchard <steve at kspei.com> 0.05-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Levenshtein/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:11:55 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:13:52 -0000	1.2
@@ -0,0 +1 @@
+Text-Levenshtein-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Levenshtein/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:11:55 -0000	1.1
+++ sources	26 Jan 2006 21:13:52 -0000	1.2
@@ -0,0 +1 @@
+481bf8c903db6ba7e5c9251140e1b98f  Text-Levenshtein-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:20 -0500
Subject: rpms/perl-Crypt-DES_EDE3 - New directory
Message-ID: <200601262120.k0QLKMu0014834@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14826/perl-Crypt-DES_EDE3

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DES_EDE3 added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:25 -0500
Subject: rpms/perl-Crypt-DES_EDE3/devel - New directory
Message-ID: <200601262120.k0QLKRvB014849@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14826/perl-Crypt-DES_EDE3/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:52 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:52 -0500
Subject: rpms/perl-Crypt-DES_EDE3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262120.k0QLKsXM014883@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-DES_EDE3


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-DES_EDE3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:58 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:58 -0500
Subject: rpms/perl-Crypt-DES_EDE3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262121.k0QLL0fn014905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-DES_EDE3


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:13 -0500
Subject: rpms/perl-Convert-PEM - New directory
Message-ID: <200601262122.k0QLMFqg015036@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15028/perl-Convert-PEM

Log Message:
Directory /cvs/extras/rpms/perl-Convert-PEM added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:19 -0500
Subject: rpms/perl-Convert-PEM/devel - New directory
Message-ID: <200601262122.k0QLMLgu015053@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15028/perl-Convert-PEM/devel

Log Message:
Directory /cvs/extras/rpms/perl-Convert-PEM/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:21:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:21:49 -0500
Subject: rpms/perl-Crypt-DES_EDE3 import.log,1.1,1.2
Message-ID: <200601262122.k0QLMLqo015057@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14967

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-DES_EDE3-0.01-2 on branch devel from perl-Crypt-DES_EDE3-0.01-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:20:52 -0000	1.1
+++ import.log	26 Jan 2006 21:21:49 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-DES_EDE3-0_01-2:HEAD:perl-Crypt-DES_EDE3-0.01-2.src.rpm:1138310494



From fedora-extras-commits at redhat.com  Thu Jan 26 21:21:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:21:55 -0500
Subject: rpms/perl-Crypt-DES_EDE3/devel perl-Crypt-DES_EDE3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262122.k0QLMR7x015071@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14967/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-DES_EDE3.spec 
Log Message:
auto-import perl-Crypt-DES_EDE3-0.01-2 on branch devel from perl-Crypt-DES_EDE3-0.01-2.src.rpm


--- NEW FILE perl-Crypt-DES_EDE3.spec ---
Name:           perl-Crypt-DES_EDE3
Version:        0.01
Release:        2%{?dist}
Summary:        Crypt::DES_EDE3 Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Crypt-DES_EDE3/
Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-DES_EDE3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Crypt::DES)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is Crypt::DES_EDE3, a module implementing Triple-DES EDE
(encrypt-decrypt-encrypt) encryption and decryption.

%prep
%setup -q -n Crypt-DES_EDE3-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard <steve at kspei.com> 0.01-2
- Minor spec cleanup.
- Include license files.

* Fri Aug 26 2005 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:20:58 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:21:54 -0000	1.2
@@ -0,0 +1 @@
+Crypt-DES_EDE3-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:20:58 -0000	1.1
+++ sources	26 Jan 2006 21:21:54 -0000	1.2
@@ -0,0 +1 @@
+fde1995efa0735407a5f7c4a4c8147bc  Crypt-DES_EDE3-0.01.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:47 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:47 -0500
Subject: rpms/perl-Convert-PEM Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262122.k0QLMnhh015132@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Convert-PEM


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Convert-PEM
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:53 -0500
Subject: rpms/perl-Convert-PEM/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262122.k0QLMtNP015153@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Convert-PEM


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:40 -0500
Subject: rpms/perl-Convert-ASCII-Armour - New directory
Message-ID: <200601262123.k0QLNgxe015236@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15215/perl-Convert-ASCII-Armour

Log Message:
Directory /cvs/extras/rpms/perl-Convert-ASCII-Armour added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:46 -0500
Subject: rpms/perl-Convert-ASCII-Armour/devel - New directory
Message-ID: <200601262123.k0QLNmdT015269@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15215/perl-Convert-ASCII-Armour/devel

Log Message:
Directory /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:40 -0500
Subject: rpms/perl-Convert-PEM import.log,1.1,1.2
Message-ID: <200601262124.k0QLOCE4015305@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15217

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-PEM-0.07-2 on branch devel from perl-Convert-PEM-0.07-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-PEM/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:22:47 -0000	1.1
+++ import.log	26 Jan 2006 21:23:40 -0000	1.2
@@ -0,0 +1 @@
+perl-Convert-PEM-0_07-2:HEAD:perl-Convert-PEM-0.07-2.src.rpm:1138310607



From fedora-extras-commits at redhat.com  Thu Jan 26 21:24:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:24:13 -0500
Subject: rpms/perl-Convert-ASCII-Armour Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601262124.k0QLOFjR015321@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Convert-ASCII-Armour


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Convert-ASCII-Armour
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:24:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:24:19 -0500
Subject: rpms/perl-Convert-ASCII-Armour/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262124.k0QLOL5u015346@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Convert-ASCII-Armour


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:46 -0500
Subject: rpms/perl-Convert-PEM/devel perl-Convert-PEM.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262124.k0QLOIja015329@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15217/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Convert-PEM.spec 
Log Message:
auto-import perl-Convert-PEM-0.07-2 on branch devel from perl-Convert-PEM-0.07-2.src.rpm


--- NEW FILE perl-Convert-PEM.spec ---
Name:           perl-Convert-PEM
Version:        0.07
Release:        2%{?dist}
Summary:        Convert::PEM Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Convert-PEM/
Source0:        http://www.cpan.org/modules/by-module/Convert/Convert-PEM-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Crypt::DES_EDE3)
BuildRequires:  perl(Convert::ASN1) >= 0.10
BuildRequires:  perl(Class::ErrorHandler)
Requires:       perl(Crypt::DES_EDE3)
Requires:       perl(Convert::ASN1) >= 0.10
Requires:       perl(Class::ErrorHandler)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is Convert::PEM, a module implementing read/write access
to ASN.1-encoded PEM files (with optional encryption).

%prep
%setup -q -n Convert-PEM-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README ToDo COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard <steve at kspei.com> 0.07-2
- Remove explicit core module dependencies.
- Include license files.

* Thu Aug 25 2005 Steven Pritchard <steve at kspei.com> 0.07-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-PEM/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:22:53 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:23:46 -0000	1.2
@@ -0,0 +1 @@
+Convert-PEM-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-PEM/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:22:53 -0000	1.1
+++ sources	26 Jan 2006 21:23:46 -0000	1.2
@@ -0,0 +1 @@
+d2188dd87446004c8da882b5a1f20412  Convert-PEM-0.07.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:02 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:02 -0500
Subject: rpms/perl-CPAN-DistnameInfo - New directory
Message-ID: <200601262125.k0QLP4DO015450@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15442/perl-CPAN-DistnameInfo

Log Message:
Directory /cvs/extras/rpms/perl-CPAN-DistnameInfo added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:14 -0500
Subject: rpms/perl-CPAN-DistnameInfo/devel - New directory
Message-ID: <200601262125.k0QLPGOD015480@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15442/perl-CPAN-DistnameInfo/devel

Log Message:
Directory /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:13 -0500
Subject: rpms/perl-Convert-ASCII-Armour import.log,1.1,1.2
Message-ID: <200601262125.k0QLPsGX015520@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15452

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-ASCII-Armour-1.4-2 on branch devel from perl-Convert-ASCII-Armour-1.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:24:12 -0000	1.1
+++ import.log	26 Jan 2006 21:25:13 -0000	1.2
@@ -0,0 +1 @@
+perl-Convert-ASCII-Armour-1_4-2:HEAD:perl-Convert-ASCII-Armour-1.4-2.src.rpm:1138310692



From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:19 -0500
Subject: rpms/perl-Convert-ASCII-Armour/devel perl-Convert-ASCII-Armour.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262125.k0QLPsL1015521@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Convert-ASCII-Armour.spec 
Log Message:
auto-import perl-Convert-ASCII-Armour-1.4-2 on branch devel from perl-Convert-ASCII-Armour-1.4-2.src.rpm


--- NEW FILE perl-Convert-ASCII-Armour.spec ---
Name:           perl-Convert-ASCII-Armour
Version:        1.4
Release:        2%{?dist}
Summary:        Convert::ASCII::Armour Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Convert-ASCII-Armour/
Source0:        http://www.cpan.org/modules/by-module/Convert/Convert-ASCII-Armour-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Compress::Zlib)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module converts hashes of binary octets into ASCII messages
suitable for transfer over 6-bit clean transport channels.  The
encoded ASCII resembles PGP's armoured messages, but are in no way
compatible with PGP.

%prep
%setup -q -n Convert-ASCII-Armour-%{version}

for file in lib/Convert/ASCII/*.pm ; do
    %{__perl} -pi -e '$_=undef if (/^\#\!/ and $.==1)' $file
done

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC COPYING
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard <steve at kspei.com> 1.4-2
- Minor spec cleanup.
- Remove explicit dependencies on core modules.
- Remove #! lines from *.pm to quiet rpmlint.

* Sat Aug 27 2005 Steven Pritchard <steve at kspei.com> 1.4-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:24:18 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:25:19 -0000	1.2
@@ -0,0 +1 @@
+Convert-ASCII-Armour-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:24:18 -0000	1.1
+++ sources	26 Jan 2006 21:25:19 -0000	1.2
@@ -0,0 +1 @@
+7e0e61ff6b014062d6feecaea3f09018  Convert-ASCII-Armour-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:26:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:26:09 -0500
Subject: rpms/perl-CPAN-DistnameInfo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262126.k0QLQB7a015586@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15572

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-CPAN-DistnameInfo


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CPAN-DistnameInfo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:26:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:26:20 -0500
Subject: rpms/perl-CPAN-DistnameInfo/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262126.k0QLQMlr015606@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15572/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CPAN-DistnameInfo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:26:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:26:56 -0500
Subject: rpms/perl-Parse-CPAN-Packages - New directory
Message-ID: <200601262126.k0QLQwPX015675@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15663/perl-Parse-CPAN-Packages

Log Message:
Directory /cvs/extras/rpms/perl-Parse-CPAN-Packages added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:01 -0500
Subject: rpms/perl-Parse-CPAN-Packages/devel - New directory
Message-ID: <200601262127.k0QLR3Ou015703@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15663/perl-Parse-CPAN-Packages/devel

Log Message:
Directory /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:01 -0500
Subject: rpms/perl-CPAN-DistnameInfo import.log,1.1,1.2
Message-ID: <200601262127.k0QLRXsg015761@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15679

Modified Files:
	import.log 
Log Message:
auto-import perl-CPAN-DistnameInfo-0.06-1 on branch devel from perl-CPAN-DistnameInfo-0.06-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-DistnameInfo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:26:09 -0000	1.1
+++ import.log	26 Jan 2006 21:27:01 -0000	1.2
@@ -0,0 +1 @@
+perl-CPAN-DistnameInfo-0_06-1:HEAD:perl-CPAN-DistnameInfo-0.06-1.src.rpm:1138310811



From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:07 -0500
Subject: rpms/perl-CPAN-DistnameInfo/devel perl-CPAN-DistnameInfo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262127.k0QLRdxJ015783@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15679/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-CPAN-DistnameInfo.spec 
Log Message:
auto-import perl-CPAN-DistnameInfo-0.06-1 on branch devel from perl-CPAN-DistnameInfo-0.06-1.src.rpm


--- NEW FILE perl-CPAN-DistnameInfo.spec ---
Name:           perl-CPAN-DistnameInfo
Version:        0.06
Release:        1%{?dist}
Summary:        CPAN::DistnameInfo Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CPAN-DistnameInfo/
Source0:        http://www.cpan.org/modules/by-module/CPAN/CPAN-DistnameInfo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Many online services that are centered around CPAN attempt to
associate multiple uploads by extracting a distribution name from the
filename of the upload. For most distributions this is easy as they
have used ExtUtils::MakeMaker or Module::Build to create the
distribution, which results in a uniform name. But sadly not all
uploads are created in this way.

CPAN::DistnameInfo uses heuristics that have been learnt by
http://search.cpan.org/ to extract the distribution name and version
from filenames and also report if the version is to be treated as a
developer release.

%prep
%setup -q -n CPAN-DistnameInfo-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 19 2005 Steven Pritchard <steve at kspei.com> 0.06-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:26:19 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:27:07 -0000	1.2
@@ -0,0 +1 @@
+CPAN-DistnameInfo-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:26:19 -0000	1.1
+++ sources	26 Jan 2006 21:27:07 -0000	1.2
@@ -0,0 +1 @@
+f7154ef1681ce5d236e984d7ce72e3ac  CPAN-DistnameInfo-0.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:32 -0500
Subject: rpms/perl-Parse-CPAN-Packages Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601262127.k0QLRYZ6015764@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15749

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Parse-CPAN-Packages


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Parse-CPAN-Packages
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:38 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:38 -0500
Subject: rpms/perl-Parse-CPAN-Packages/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262127.k0QLRemT015786@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15749/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Parse-CPAN-Packages


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:28:08 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:28:08 -0500
Subject: rpms/perl-Parse-CPAN-Packages import.log,1.1,1.2
Message-ID: <200601262128.k0QLSeCW015905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15851

Modified Files:
	import.log 
Log Message:
auto-import perl-Parse-CPAN-Packages-2.25-1 on branch devel from perl-Parse-CPAN-Packages-2.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:27:31 -0000	1.1
+++ import.log	26 Jan 2006 21:28:08 -0000	1.2
@@ -0,0 +1 @@
+perl-Parse-CPAN-Packages-2_25-1:HEAD:perl-Parse-CPAN-Packages-2.25-1.src.rpm:1138310881



From fedora-extras-commits at redhat.com  Thu Jan 26 21:28:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:28:13 -0500
Subject: rpms/perl-Parse-CPAN-Packages/devel perl-Parse-CPAN-Packages.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262128.k0QLSkPi015909@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15851/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Parse-CPAN-Packages.spec 
Log Message:
auto-import perl-Parse-CPAN-Packages-2.25-1 on branch devel from perl-Parse-CPAN-Packages-2.25-1.src.rpm


--- NEW FILE perl-Parse-CPAN-Packages.spec ---
Name:           perl-Parse-CPAN-Packages
Version:        2.25
Release:        1%{?dist}
Summary:        Parse::CPAN::Packages - Parse 02packages.details.txt.gz
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Parse-CPAN-Packages/
Source0:        http://www.cpan.org/modules/by-module/Parse/Parse-CPAN-Packages-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CPAN::DistnameInfo)
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(IO::Zlib)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Sort::Versions)
Requires:       perl(CPAN::DistnameInfo)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(IO::Zlib)
Requires:       perl(Sort::Versions)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Comprehensive Perl Archive Network (CPAN) is a very useful
collection of Perl code. It has several indices of the files that it
hosts, including a file named "02packages.details.txt.gz" in the
"modules" directory. This file contains lots of useful information and
this module provides a simple interface to the data contained within.

%prep
%setup -q -n Parse-CPAN-Packages-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 19 2005 Steven Pritchard <steve at kspei.com> 2.25-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:27:37 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:28:13 -0000	1.2
@@ -0,0 +1 @@
+Parse-CPAN-Packages-2.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:27:37 -0000	1.1
+++ sources	26 Jan 2006 21:28:13 -0000	1.2
@@ -0,0 +1 @@
+10e167a0e35d0caefc52d6118e9e99e3  Parse-CPAN-Packages-2.25.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:28:27 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 26 Jan 2006 16:28:27 -0500
Subject: rpms/nagios/devel nagios.spec,1.2,1.3
Message-ID: <200601262129.k0QLT0Dc015938@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15888

Modified Files:
	nagios.spec 
Log Message:
Fixed bugzilla #49609


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
+++ nagios.spec	26 Jan 2006 21:28:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 1.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -120,7 +120,7 @@
 %post
 /sbin/chkconfig --add %{name} || :
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
-%{_sbindir}/usermod -G %{name} apache || :
+%{_sbindir}/usermod -a -G %{name} apache || :
 
 %postun
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
+- Fixed usermod -a issue, Bugzilla #49609
+
 * Sun Jan 15 2005 Mike McGrath <imlinux at gmail.com> 1.3-14
 - Fedora friendly spec file
 



From fedora-extras-commits at redhat.com  Thu Jan 26 21:47:48 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 26 Jan 2006 16:47:48 -0500
Subject: rpms/liferea/FC-4 .cvsignore, 1.18, 1.19 liferea.spec, 1.23,
	1.24 sources, 1.19, 1.20
Message-ID: <200601262148.k0QLmL7q016058@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16037

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Thu Jan 26 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-1
- Update to 1.0.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Jan 2006 05:32:57 -0000	1.18
+++ .cvsignore	26 Jan 2006 21:47:48 -0000	1.19
@@ -1 +1 @@
-liferea-1.0.1.tar.gz
+liferea-1.0.2.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- liferea.spec	17 Jan 2006 05:32:57 -0000	1.23
+++ liferea.spec	26 Jan 2006 21:47:48 -0000	1.24
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-1
+- Update to 1.0.2.
+
 * Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
 - Update to 1.0.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Jan 2006 05:32:57 -0000	1.19
+++ sources	26 Jan 2006 21:47:48 -0000	1.20
@@ -1 +1 @@
-c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz
+45cd555c60ce7f8a2eda4b776118e939  liferea-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:02:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:02:45 -0500
Subject: rpms/kernel-module-thinkpad/FC-4 .cvsignore, 1.4, NONE Makefile, 1.2,
	NONE branch, 1.1, NONE kernel-module-thinkpad-README.Fedora, 1.1,
	NONE kernel-module-thinkpad-percpu.patch, 1.1,
	NONE kernel-module-thinkpad.spec, 1.7, NONE sources, 1.4, NONE
Message-ID: <200601262202.k0QM2lpt017967@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kernel-module-thinkpad/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713/FC-4

Removed Files:
	.cvsignore Makefile branch 
	kernel-module-thinkpad-README.Fedora 
	kernel-module-thinkpad-percpu.patch 
	kernel-module-thinkpad.spec sources 
Log Message:
Never shipped, remove.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-thinkpad-README.Fedora DELETED ---


--- kernel-module-thinkpad-percpu.patch DELETED ---


--- kernel-module-thinkpad.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:02:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:02:25 -0500
Subject: rpms/kernel-module-thinkpad/FC-3 .cvsignore, 1.3, NONE Makefile, 1.2,
	NONE branch, 1.1, NONE kernel-module-thinkpad-kmodhelper, 1.1,
	NONE kernel-module-thinkpad-rpm.patch, 1.1,
	NONE kernel-module-thinkpad.makedev, 1.1,
	NONE kernel-module-thinkpad.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200601262202.k0QM2hXQ017956@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kernel-module-thinkpad/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713/FC-3

Removed Files:
	.cvsignore Makefile branch kernel-module-thinkpad-kmodhelper 
	kernel-module-thinkpad-rpm.patch 
	kernel-module-thinkpad.makedev kernel-module-thinkpad.spec 
	sources 
Log Message:
Never shipped, remove.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-thinkpad-kmodhelper DELETED ---


--- kernel-module-thinkpad-rpm.patch DELETED ---


--- kernel-module-thinkpad.makedev DELETED ---


--- kernel-module-thinkpad.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:03:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:03:20 -0500
Subject: rpms/kernel-module-thinkpad/devel .cvsignore, 1.4, NONE Makefile,
	1.2, NONE kernel-module-thinkpad-console.perms, 1.1,
	NONE kernel-module-thinkpad-percpu.patch, 1.1,
	NONE kernel-module-thinkpad.modules, 1.1,
	NONE kernel-module-thinkpad.spec, 1.13, NONE sources, 1.4, NONE
Message-ID: <200601262203.k0QM3M9u018019@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713/devel

Removed Files:
	.cvsignore Makefile kernel-module-thinkpad-console.perms 
	kernel-module-thinkpad-percpu.patch 
	kernel-module-thinkpad.modules kernel-module-thinkpad.spec 
	sources 
Log Message:
Never shipped, remove.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- kernel-module-thinkpad-console.perms DELETED ---


--- kernel-module-thinkpad-percpu.patch DELETED ---


--- kernel-module-thinkpad.modules DELETED ---


--- kernel-module-thinkpad.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:04:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:04:42 -0500
Subject: rpms/amavisd-new - New directory
Message-ID: <200601262204.k0QM4i5C018106@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/amavisd-new

Log Message:
Directory /cvs/extras/rpms/amavisd-new added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:05:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:05:09 -0500
Subject: rpms/amavisd-new/devel - New directory
Message-ID: <200601262205.k0QM5BoN018118@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/amavisd-new/devel

Log Message:
Directory /cvs/extras/rpms/amavisd-new/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:06:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:06:41 -0500
Subject: rpms/amavisd-new/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262206.k0QM6hcq018183@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18153/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module amavisd-new


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:06:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:06:23 -0500
Subject: rpms/amavisd-new Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262206.k0QM6e1S018166@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18153

Added Files:
	Makefile import.log 
Log Message:
Setup of module amavisd-new


--- NEW FILE Makefile ---
# Top level Makefile for module amavisd-new
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:09:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:09:51 -0500
Subject: rpms/thinkpad-kmod-common - New directory
Message-ID: <200601262209.k0QM9rU2018316@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18308/thinkpad-kmod-common

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod-common added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:10:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:10:15 -0500
Subject: rpms/thinkpad-kmod-common/devel - New directory
Message-ID: <200601262210.k0QMAH2v018336@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18308/thinkpad-kmod-common/devel

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod-common/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:12:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:12:08 -0500
Subject: rpms/thinkpad-kmod-common Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262212.k0QMCAfI018436@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18421

Added Files:
	Makefile import.log 
Log Message:
Setup of module thinkpad-kmod-common


--- NEW FILE Makefile ---
# Top level Makefile for module thinkpad-kmod-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:11:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:11:41 -0500
Subject: rpms/amavisd-new import.log,1.1,1.2
Message-ID: <200601262212.k0QMCUxF018440@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18362

Modified Files:
	import.log 
Log Message:
auto-import amavisd-new-2.3.3-4 on branch devel from amavisd-new-2.3.3-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:06:23 -0000	1.1
+++ import.log	26 Jan 2006 22:11:40 -0000	1.2
@@ -0,0 +1 @@
+amavisd-new-2_3_3-4:HEAD:amavisd-new-2.3.3-4.src.rpm:1138313438



From fedora-extras-commits at redhat.com  Thu Jan 26 22:11:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:11:54 -0500
Subject: rpms/amavisd-new/devel README.fedora, NONE, 1.1 amavis-clamd.conf, 
	NONE, 1.1 amavis-clamd.init, NONE, 1.1 amavis-clamd.sysconfig,
	NONE, 1.1 amavisd-condrestart.patch, NONE,
	1.1 amavisd-conf.patch, NONE, 1.1 amavisd-db.patch, NONE,
	1.1 amavisd-init.patch, NONE, 1.1 amavisd-new.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262212.k0QMCac0018461@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18362/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora amavis-clamd.conf amavis-clamd.init 
	amavis-clamd.sysconfig amavisd-condrestart.patch 
	amavisd-conf.patch amavisd-db.patch amavisd-init.patch 
	amavisd-new.spec 
Log Message:
auto-import amavisd-new-2.3.3-4 on branch devel from amavisd-new-2.3.3-4.src.rpm


--- NEW FILE README.fedora ---
INSTALLATION
------------
Installing amavisd-new from Fedora Extras is simple.  First, install
the amavisd-new package:

  yum -y install amavisd-new

Don't be alarmed at the number of dependencies this installs.  This
package tries to be as full-featured as possible, including many
optional components for amavisd-new.

Next, configure amavisd-new to start on boot:

  chkconfig --level 2345 amavisd on

If you want to use the Clam Antivirus daemon (recommended), set it to
start on boot as well:

  chkconfig --level 2345 clamd.amavisd on

When you are ready, start the clamd.amavisd (optional but recommended)
and amavisd services:

  service clamd.amavisd start
  service amavisd start

Check /var/log/maillog for startup messages from both daemons.

The next step is to integrate amavisd with your MTA.

POSTFIX
-------
The simplest method for enabling amavisd-new support in postfix is to
use the content_filter configuration option to tell postfix to relay
mail through amavisd-new using SMTP.  In this configuration, incoming
mail passes from postfix to amavisd and back to postfix.  (Mail never
actually leaves the control of postfix however, since amavisd does not
answer OK until it scans the message and transfers it back to postfix.
The worst that can happen is a failure at just the right time could
allow a message to be queued twice.)

Add the following to /etc/postfix/main.cf:

  content_filter = smtp:[127.0.0.1]:10024

You will probably also want to limit the number of postfix processes
to keep mail from coming in faster than it can be processed by adding
the following to /etc/postfix/main.cf:

  default_process_limit = 20

Add the following to /etc/postfix/master.cf:

  127.0.0.1:10025 inet n - - - 0 smtpd -o content_filter=

Be sure to read the TUNING section in README.postfix for information
on process limits.

SENDMAIL
--------
See README.sendmail* in this directory.

Please note that amavisd-new's milter functionality is not enabled in
this package.

EXIM
----
See README.exim* in this directory.


--- NEW FILE amavis-clamd.conf ---
# Use system logger.
LogSyslog

# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
LogFacility LOG_MAIL

# This option allows you to save a process identifier of the listening
# daemon (main thread).
PidFile /var/run/amavisd/clamd.pid

# Remove stale socket after unclean shutdown.
# Default: disabled
FixStaleSocket

# Run as a selected user (clamd must be started by root).
User amavis

# Path to a local socket file the daemon will listen on.
LocalSocket /var/spool/amavisd/clamd.sock


--- NEW FILE amavis-clamd.init ---
#!/bin/bash
#
# chkconfig: - 78 32
# description: The clamd server running for amavisd

CLAMD_SERVICE=amavisd
. /usr/share/clamav/clamd-wrapper


--- NEW FILE amavis-clamd.sysconfig ---
CLAMD_CONFIGFILE=/etc/clamd.d/amavisd.conf
CLAMD_SOCKET=/var/spool/amavisd/clamd.sock
CLAMD_OPTIONS=

amavisd-condrestart.patch:

--- NEW FILE amavisd-condrestart.patch ---
--- amavisd_init.sh.orig	2004-02-23 16:09:02.000000000 -0600
+++ amavisd_init.sh	2004-02-23 16:13:52.000000000 -0600
@@ -60,8 +60,12 @@
 	action $"Reloading ${prog_base}:" ${prog} -c ${prog_config_file} reload
 	RETVAL=$?
 	;;
+  condrestart)
+	[ -f /var/lock/subsys/${prog_base} ] && $0 restart || :
+	RETVAL=$?
+	;;
   *)
-	echo "Usage: $0 {start|stop|status|restart|reload}"
+	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
 	exit 1
 esac
 

amavisd-conf.patch:

--- NEW FILE amavisd-conf.patch ---
--- amavisd-new-2.3.2/amavisd.conf.orig	2005-06-29 05:26:05.000000000 -0500
+++ amavisd-new-2.3.2/amavisd.conf	2005-07-06 12:22:21.000000000 -0500
@@ -14,23 +14,23 @@
 # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
 
 $max_servers = 2;            # number of pre-forked children (2..15 is common)
-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis)
-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis)
+$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis)
+$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis)
 
 $mydomain = 'example.com';   # a convenient default for other settings
 
-$MYHOME   = '/var/amavis';   # a convenient default for other settings
+$MYHOME   = '/var/spool/amavisd';   # a convenient default for other settings
 $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
 $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
-$QUARANTINEDIR = '/var/virusmails';
+$QUARANTINEDIR = undef;
 # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
 
 # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
 
 # $db_home   = "$MYHOME/db";
 # $helpers_home = "$MYHOME/var";  # prefer $MYHOME clean and owned by root?
-# $pid_file  = "$MYHOME/var/amavisd.pid";
-# $lock_file = "$MYHOME/var/amavisd.lock";
+$pid_file  = "/var/run/amavisd/amavisd.pid";
+$lock_file = "/var/run/amavisd/amavisd.lock";
 #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
 
 @local_domains_maps = ( [".$mydomain"] );
@@ -65,11 +65,11 @@
 #     ["DBI:SQLite:dbname=$MYHOME/sql/mail_prefs.sqlite", '', ''] );
 # @storage_sql_dsn = @lookup_sql_dsn;  # none, same, or separate database
 
-$virus_admin               = "virusalert\@$mydomain";  # notifications recip.
+$virus_admin               = undef;  # notifications recip.
 
-$mailfrom_notify_admin     = "virusalert\@$mydomain";  # notifications sender
-$mailfrom_notify_recip     = "virusalert\@$mydomain";  # notifications sender
-$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
+$mailfrom_notify_admin     = undef;  # notifications sender
+$mailfrom_notify_recip     = undef;  # notifications sender
+$mailfrom_notify_spamadmin = undef; # notifications sender
 $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
 
 @addr_extension_virus_maps      = ('virus');
@@ -99,10 +99,10 @@
 # $notify_method  = 'smtp:[127.0.0.1]:10025';
 # $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
 
-# $final_virus_destiny      = D_DISCARD;
-# $final_banned_destiny     = D_BOUNCE;
-# $final_spam_destiny       = D_BOUNCE;
-# $final_bad_header_destiny = D_PASS;
+$final_virus_destiny      = D_DISCARD;
+$final_banned_destiny     = D_BOUNCE;
+$final_spam_destiny       = D_DISCARD;
+$final_bad_header_destiny = D_BOUNCE;
 
 
 # SOME OTHER VARIABLES WORTH CONSIDERING (see amavisd.conf-default for all)
@@ -286,10 +286,10 @@
 # ['Sophos SAVI', \&sophos_savi ],
 
 # ### http://www.clamav.net/
-# ['ClamAV-clamd',
-#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
-#   qr/\bOK$/, qr/\bFOUND$/,
-#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
+['ClamAV-clamd',
+  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
+  qr/\bOK$/, qr/\bFOUND$/,
+  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
 # # NOTE: the easiest is to run clamd under the same user as amavisd; match the
 # # socket name (LocalSocket) in clamav.conf to the socket name in this entry
 # # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],

amavisd-db.patch:

--- NEW FILE amavisd-db.patch ---
--- ./amavisd-nanny.org	2005-09-19 15:26:59.000000000 +0200
+++ ./amavisd-nanny	2005-09-19 15:27:37.000000000 +0200
@@ -51,7 +51,7 @@
 my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
                         # many seconds
 
-my($db_home) = '/var/amavis/db';  # DB databases directory
+my($db_home) = '/var/spool/amavisd/db';  # DB databases directory
 my($dbfile)  = 'nanny.db';
 my($wakeuptime) = 2;  # seconds
 
--- ./amavisd-agent.org	2005-09-19 15:28:15.000000000 +0200
+++ ./amavisd-agent	2005-09-19 15:20:24.000000000 +0200
@@ -107,7 +107,7 @@
 # main program starts here
   $SIG{INT} = sub { die "\n" };  # do the END code block
   my($env) = BerkeleyDB::Env->new(
-    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
+    '-Home'=>'/var/spool/amavisd/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
   my($db) = BerkeleyDB::Hash->new(
     '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env );

amavisd-init.patch:

--- NEW FILE amavisd-init.patch ---
--- amavisd-new-2.3.2.orig/amavisd_init.sh	2002-11-15 22:22:47.000000000 -0600
+++ amavisd-new-2.3.2/amavisd_init.sh	2005-07-06 16:11:23.000000000 -0500
@@ -4,10 +4,10 @@
 #		(to be used with version amavisd-new-20020630 or later)
 #
 
-# chkconfig: 2345 79 31
+# chkconfig: - 79 31
 # description: amavisd is an interface between MTA and content checkers
 # processname: amavisd
-# pidfile: /var/amavis/amavisd.pid
+# pidfile: /var/run/amavisd/amavisd.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -19,7 +19,7 @@
 prog="/usr/sbin/amavisd"
 prog_base="$(basename ${prog})"
 
-prog_config_file="/etc/amavisd.conf"
+prog_config_file="/etc/amavisd/amavisd.conf"
 
 # Source configuration.
 [ -e /etc/sysconfig/${prog_base} ] && . /etc/sysconfig/${prog_base}


--- NEW FILE amavisd-new.spec ---
#%%define prerelease rc1

Summary:        Email filter with virus scanner and spamassassin support
Name:           amavisd-new
Version:        2.3.3
Release:        4%{?prerelease:.%{prerelease}}
License:        GPL
Group:          Applications/System
URL:            http://www.ijs.si/software/amavisd/
Source0:        http://www.ijs.si/software/amavisd/amavisd-new-%{version}%{?prerelease:-%{prerelease}}.tar.gz
Source1:        amavis-clamd.init
Source2:        amavis-clamd.conf
Source3:        amavis-clamd.sysconfig
Source4:        README.fedora
Patch0:         amavisd-conf.patch
Patch1:         amavisd-init.patch
Patch2:         amavisd-condrestart.patch
Patch3:         amavisd-db.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
Requires:       smtpdaemon
Requires:       /usr/sbin/clamd, /etc/clamd.d
Requires:       tmpwatch
Requires:       bzip2
Requires:       gzip
Requires:       lha
Requires:       cpio
Requires:       freeze
Requires:       lzop
Requires:       nomarch
Requires:       zoo
Requires:       cabextract
Requires:       /usr/bin/ar
# We probably should parse the fetch_modules() code in amavisd for this list.
# These are just the dependencies that don't get picked up otherwise.
Requires:       perl(IO::Stringy)
Requires:       perl(MIME::Body)
Requires:       perl(MIME::Decoder::Base64)
Requires:       perl(MIME::Decoder::Binary)
Requires:       perl(MIME::Decoder::Gzip64)
Requires:       perl(MIME::Decoder::NBit)
Requires:       perl(MIME::Decoder::QuotedPrint)
Requires:       perl(MIME::Decoder::UU)
Requires:       perl(MIME::Head)
Requires:       perl(Mail::Field)
Requires:       perl(Mail::Header)
Requires:       perl(Mail::Internet)
Requires:       perl(Mail::SpamAssassin)
Requires:       perl(Archive::Tar)
Requires:       perl(Archive::Zip)
Requires:       perl(Convert::TNEF)
Requires:       perl(Convert::UUlib)
Requires:       perl(URI)
Requires:       perl(Net::DNS)
Requires:       perl(Net::LDAP)
Requires:       perl(DBI)
Requires:       perl(DBD::mysql)
Requires:       perl(DBD::SQLite)
Requires:       perl(Razor2::Client::Version)
Requires:       perl(Authen::SASL)
Requires:       perl(Mail::SPF::Query)
Requires:       perl(Compress::Zlib) >= 1.35
BuildArch:      noarch

%description
amavisd-new is a high-performance and reliable interface between mailer
(MTA) and one or more content checkers: virus scanners, and/or
Mail::SpamAssassin Perl module. It is written in Perl, assuring high
reliability, portability and maintainability. It talks to MTA via (E)SMTP
or LMTP, or by using helper programs. No timing gaps exist in the design,
which could cause a mail loss.

%prep
%setup -q -n %{name}-%{version}%{?prerelease:-%{prerelease}}
%patch0 -p1
%patch1 -p1
%patch2 -p0
%patch3 -p0
cp -a %{SOURCE4} README_FILES/

%build

%install
rm -rf "$RPM_BUILD_ROOT"

mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -m755 amavisd $RPM_BUILD_ROOT%{_sbindir}/
( cd $RPM_BUILD_ROOT%{_sbindir} && ln -s clamd clamd.amavisd )

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m755 amavisd-{agent,nanny} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m755 amavisd_init.sh $RPM_BUILD_ROOT%{_initrddir}/amavisd
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/clamd.amavisd

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/amavisd
install -m644 amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/amavisd/

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d/amavisd.conf

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd

mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db}
touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/

%clean
rm -rf "$RPM_BUILD_ROOT"

%pre
if ! id amavis > /dev/null 2>&1 ; then
    useradd -r -s /sbin/nologin -d /var/spool/amavisd amavis
fi

%preun
if [ "$1" = 0 ]; then
    chkconfig --del amavisd
    chkconfig --del clamd.amavisd
fi

%post
chkconfig --add amavisd
service amavisd condrestart
chkconfig --add clamd.amavisd
service clamd.amavisd condrestart

%files
%defattr(-,root,root)
%doc AAAREADME.first LDAP.schema LICENSE RELEASE_NOTES TODO
%doc README_FILES test-messages amavisd.conf-*
%dir %{_sysconfdir}/amavisd/
%attr(755,root,root) %{_initrddir}/amavisd
%attr(755,root,root) %{_initrddir}/clamd.amavisd
%config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
%config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
%{_sbindir}/amavisd
%{_sbindir}/clamd.amavisd
%{_bindir}/amavisd-*
%dir %attr(700,amavis,amavis) /var/spool/amavisd
%dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp
%dir %attr(700,amavis,amavis) /var/spool/amavisd/db
%dir %attr(755,amavis,amavis) /var/run/amavisd
%ghost /var/spool/amavisd/clamd.sock

%changelog
* Wed Sep 21 2005 Steven Pritchard <steve at kspei.com> 2.3.3-4
- Add TODO and amavisd.conf-* to %%doc

* Mon Sep 19 2005 Steven Pritchard <steve at kspei.com> 2.3.3-3
- Add amavisd-db.patch to fix the path to the db directory in
  amavisd-agent and amavisd-nanny.  (Thanks to Julien Tognazzi.)

* Fri Sep 02 2005 Steven Pritchard <steve at kspei.com> 2.3.3-2
- Requires: perl(Compress::Zlib) >= 1.35

* Thu Sep 01 2005 Steven Pritchard <steve at kspei.com> 2.3.3-1
- Update to 2.3.3
- Remove explicit dependencies on core perl modules

* Fri Aug 19 2005 Steven Pritchard <steve at kspei.com> 2.3.2-10
- Recommend using 127.0.0.1 instead of localhost in README.fedora
- .deb support requires ar

* Wed Aug 17 2005 Steven Pritchard <steve at kspei.com> 2.3.2-9
- Set $virus_admin, $mailfrom_notify_admin, $mailfrom_notify_recip,
  and $mailfrom_notify_spamadmin to undef in the default config to
  turn off notification emails

* Fri Aug 12 2005 Steven Pritchard <steve at kspei.com> 2.3.2-8
- Add dependencies for freeze, lzop, nomarch, zoo, cabextract

* Wed Jul 27 2005 Steven Pritchard <steve at kspei.com> 2.3.2-7
- Add README.fedora with simplified Postfix instructions

* Mon Jul 25 2005 Steven Pritchard <steve at kspei.com> 2.3.2-6
- Create /var/spool/amavisd/db

* Thu Jul 21 2005 Steven Pritchard <steve at kspei.com> 2.3.2-5
- Add perl(Mail::SPF::Query) (now packaged for Extras) dependency
- Drop /var/log/amavisd since we weren't using it
- Fix paths for clamd.sock and amavisd.pid in a couple of places

* Tue Jul 12 2005 Steven Pritchard <steve at kspei.com> 2.3.2-4
- Add a bunch of other missing Requires (both actually required modules
  and optional modules)

* Tue Jul 12 2005 Steven Pritchard <steve at kspei.com> 2.3.2-3
- Add missing Requires: perl(Convert::TNEF)

* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> 2.3.2-2
- Fix init script ordering
- Don't enable amavisd by default

* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> 2.3.2-1
- Update to 2.3.2

* Wed Jun 29 2005 Steven Pritchard <steve at kspei.com> 2.3.2-0.1.rc1
- Update to 2.3.2-rc1
- Fedora Extras clamav integration
- Drop amavisd-syslog.patch (Unix::Syslog is in Extras)

* Mon Feb 23 2004 Steven Pritchard <steve at kspei.com> 0.20030616.p7-0.fdr.0.1
- Add amavisd-syslog.patch to eliminate Unix::Syslog dependency
- Add in clamd helper
- Fix up init script
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:06:41 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
@@ -0,0 +1 @@
+amavisd-new-2.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:06:41 -0000	1.1
+++ sources	26 Jan 2006 22:11:54 -0000	1.2
@@ -0,0 +1 @@
+0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:12:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:12:32 -0500
Subject: rpms/thinkpad-kmod-common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262212.k0QMCYm4018457@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18421/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module thinkpad-kmod-common


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:13:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:13:53 -0500
Subject: rpms/thinkpad-kmod-common import.log,1.1,1.2
Message-ID: <200601262214.k0QMEfL3018605@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18532

Modified Files:
	import.log 
Log Message:
auto-import thinkpad-kmod-common-5.8-5 on branch devel from thinkpad-kmod-common-5.8-5.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod-common/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:12:08 -0000	1.1
+++ import.log	26 Jan 2006 22:13:53 -0000	1.2
@@ -0,0 +1 @@
+thinkpad-kmod-common-5_8-5:HEAD:thinkpad-kmod-common-5.8-5.src.rpm:1138313645



From fedora-extras-commits at redhat.com  Thu Jan 26 22:14:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:14:12 -0500
Subject: rpms/thinkpad-kmod-common/devel thinkpad-kmod-common-console.perms, 
	NONE, 1.1 thinkpad-kmod-common.modules, NONE,
	1.1 thinkpad-kmod-common.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601262214.k0QMEi5l018609@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18532/devel

Modified Files:
	.cvsignore sources 
Added Files:
	thinkpad-kmod-common-console.perms 
	thinkpad-kmod-common.modules thinkpad-kmod-common.spec 
Log Message:
auto-import thinkpad-kmod-common-5.8-5 on branch devel from thinkpad-kmod-common-5.8-5.src.rpm
Initial import.


--- NEW FILE thinkpad-kmod-common-console.perms ---
# console.perms definitions for ThinkPad devices, http://tpctl.sourceforge.net/

<console>  0600 /dev/thinkpad 0600 root


--- NEW FILE thinkpad-kmod-common.modules ---
#!/bin/sh

# Script for loading ThinkPad modules at boot time.

modprobe thinkpad >/dev/null 2>&1


--- NEW FILE thinkpad-kmod-common.spec ---
%define debug_package %{nil}
%define kmod_name     thinkpad

Name:           %{kmod_name}-kmod-common
Version:        5.8
Release:        5%{?dist}
Summary:        Supplemental kernel modules for ThinkPad?? laptop computers

License:        GPL
Group:          System Environment/Kernel
URL:            http://tpctl.sourceforge.net/
Source0:        http://download.sf.net/tpctl/%{kmod_name}_%{version}.tar.gz
Source1:        %{name}-console.perms
Source2:        %{name}.modules
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	kmod-%{kmod_name} = %{version}
Requires:       pam >= 0.79-8
Requires:       initscripts >= 8.08-1

ExclusiveArch:  i386

%description
This package contains common files for kernel modules that interface
the System Management Application Program Interface (SMAPI) BIOS found
in some ThinkPad?? laptop computers, and drivers for certain ThinkPad
hardware components.

ThinkPad is a registered trademark of Lenovo in the United States,
other countries, or both.


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


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 644 man/thinkpad.4 $RPM_BUILD_ROOT%{_mandir}/man4/thinkpad.4
install -Dpm 644 %{SOURCE1} \
    $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.perms.d/60-thinkpad.perms
install -Dpm 755 %{SOURCE2} \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/thinkpad.modules


%clean
rm -rf $RPM_BUILD_ROOT


%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README SUPPORTED-MODELS TECHNOTES
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-thinkpad.perms
%{_sysconfdir}/sysconfig/modules/thinkpad.modules
%{_mandir}/man4/thinkpad.4*


%changelog
* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-5
- Rename to thinkpad-kmod-common.

* Mon Dec 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-4
- Provide kmod-config(thinkpad).

* Mon Dec 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-3
- Resync with old kernel-module-thinkpad-5.8-2:
  - Autoload modules at boot time.
  - Add console.perms.d snippet, drop obsolete README.Fedora.

* Sun Dec 18 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 5.8-2
- Split into thinkpad and thinkpad-kmod.

* Sat Apr  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-1
- Adjust for FC4 kernel-devel.
- Drop console.perms munging, document it in README.Fedora instead.

* Sat Jan  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.3
- Patch to work with kernel 2.6.10.
- Drop udev stuff and thinkpad group, intruduce console.perms munging.

* Sun Dec  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.2
- Drop support for kernels < 2.6, require udev, clean up specfile.
- Install modules into /lib/modules/$uname/updates/thinkpad
  (was /lib/modules/$uname/thinkpad).

* Mon Nov 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.1
- Update to 5.8.
- Patch to work with kernel 2.6.9 (final).

* Wed Sep 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.7-0.fdr.1
- Update to 5.7.

* Sat Sep 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.2
- Reset module file modes to 644 for 2.6 kernels too.
- Drop private copy of kmodhelper, use the one in fedora-rpmdevtools instead
  (2.4 kernels only).

* Tue Sep  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.1
- Update to 5.6, parmdesc patch applied upstream.
- Patch to honor kernel optflags for 2.6 kernels.

* Fri Jul 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.5-0.fdr.1
- Update to 5.5.
- Clean up kernel >= 2.6 support.

* Sun Mar 14 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.4
- Fix README path in %%description (#503).
- Avoid misleading build error message when no kernel-source is installed.

* Mon Feb  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.3
- Update to kmodhelper 0.9.8.

* Sat Jan 31 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.2
- Further spec cleanups, kmodhelper 0.9.7.

* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.1
- Update to 5.0, and kmodhelper to 0.9.6.
- Use MAKEDEV again.

* Thu Jan  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.2.trial1
- Cosmetic specfile changes.

* Sun Dec 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.1.trial1
- Update to 4.999-trial1.
- Experimental, untested support for kernel 2.6.
- New version (0.9.5) of kmodhelper.

* Sat Dec 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.7
- Honor --target again.
- New version of kmodhelper.

* Fri Dec 19 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.6
- Pretty much reworked specfile, it should now be relatively easy to build
  modules for all kernel variants if one so desires.
- Back to providing kernel-module instead of kernel-modules because the
  naming scheme doesn't coexist prettily with up2date's kernel-modules
  behavior.
- Run depmod only if installing/uninstalling modules for the running kernel.

* Sat Dec  6 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.5
- Require /boot/vmlinuz-%%{kversion} (bug 503).
- Provide kernel-modules instead of kernel-module (bug 503).
- Build modules with the correct $CC.

* Tue Nov 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.4
- Don't use MAKEDEV to create /dev/thinkpad.

* Sat Nov 22 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.3
- Use sourceforge.net tarball.

* Sun Nov 16 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.2
- Add kernel config location workararound for .nptl kernels.

* Sat Oct 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.1
- Update to 4.8.
- Include kernel cflags scripts in the package.

* Tue Jul 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.2
- Nuke reference to README.modules.conf in %%description (bug 503).
- Use fedora-rpm-helper.

* Thu Jul 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.1
- Update to 4.6.
- Drop README.modules.conf; upstream README has the necessary info.

* Sat May 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.4-0.fdr.1
- Update to 4.4 (from Debian).
- Un-hardwire 2.4.x build.
- Use proper kernel CFLAGS.
- Require specific kernel version.
- Use /dev/MAKEDEV for creating the device node, and own it.
- %%{buildroot} -> $RPM_BUILD_ROOT.
- Post(un)install scriptlet cleanups.

* Fri Apr 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.4
- Actually build for a 2.4.x kernel, hardwired for now (#214).

* Mon Apr 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.3
- Rename to kernel-module-thinkpad.
- Obsolete kernel-mod-thinkpad.
- Add ExclusiveArch: i586 i686.
- Fix missing epoch in kernel-source dependency.

* Mon Apr  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.2
- Actually include README.modules.conf (#8 comment 13).

* Sat Apr  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.1
- Update to 4.3.
- More spec file cleanups.

* Mon Mar 31 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.3
- Small spec cleanups.

* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.2
- %%postun tricks for better cleanup after erase.

* Thu Mar 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.1
- Updated according to Fedora naming guidelines RC3.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.4
- Proof-of-concept for new kernel module packaging guideline proposal.
- Create group and /dev/thinkpad only on new install.
- Renamed to thinkpad-kernel.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.3
- Do install_modules instead of install in %%install to avoid unnecessary
  modprobing (#8).

* Sat Feb 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.2
- Add support for %%kernel define.

* Sat Feb  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.1
- First Fedora release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:12:32 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:14:12 -0000	1.2
@@ -0,0 +1 @@
+thinkpad_5.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:12:32 -0000	1.1
+++ sources	26 Jan 2006 22:14:12 -0000	1.2
@@ -0,0 +1 @@
+288ab19587bb3a8a4d6097448059b4c6  thinkpad_5.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:16:20 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 26 Jan 2006 17:16:20 -0500
Subject: rpms/nagios/FC-4 nagios.spec,1.2,1.3
Message-ID: <200601262216.k0QMGrid018679@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18657

Modified Files:
	nagios.spec 
Log Message:
Fixed bugzilla #49609


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
+++ nagios.spec	26 Jan 2006 22:16:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 1.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -120,7 +120,7 @@
 %post
 /sbin/chkconfig --add %{name} || :
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
-%{_sbindir}/usermod -G %{name} apache || :
+%{_sbindir}/usermod -a -G %{name} apache || :
 
 %postun
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
+- Fixed usermod -a issue, Bugzilla #49609
+
 * Sun Jan 15 2005 Mike McGrath <imlinux at gmail.com> 1.3-14
 - Fedora friendly spec file
 



From fedora-extras-commits at redhat.com  Thu Jan 26 22:19:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:19:33 -0500
Subject: rpms/thinkpad-kmod/devel - New directory
Message-ID: <200601262219.k0QMJZ2X018795@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/thinkpad-kmod/devel

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:19:16 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:19:16 -0500
Subject: rpms/thinkpad-kmod - New directory
Message-ID: <200601262219.k0QMJWpx018783@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/thinkpad-kmod

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:19:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:19:56 -0500
Subject: rpms/thinkpad-kmod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262219.k0QMJwel018831@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819

Added Files:
	Makefile import.log 
Log Message:
Setup of module thinkpad-kmod


--- NEW FILE Makefile ---
# Top level Makefile for module thinkpad-kmod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:20:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:20:05 -0500
Subject: rpms/thinkpad-kmod/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262220.k0QMK7Rr018851@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module thinkpad-kmod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:21:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:21:40 -0500
Subject: rpms/thinkpad-kmod import.log,1.1,1.2
Message-ID: <200601262222.k0QMMCQ5018941@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18900

Modified Files:
	import.log 
Log Message:
auto-import thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4 on branch devel from thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:19:54 -0000	1.1
+++ import.log	26 Jan 2006 22:21:37 -0000	1.2
@@ -0,0 +1 @@
+thinkpad-kmod-5_8-9_2_6_14_1_1656_FC4:HEAD:thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4.src.rpm:1138314107



From fedora-extras-commits at redhat.com  Thu Jan 26 22:21:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:21:46 -0500
Subject: rpms/thinkpad-kmod/devel kmodtool, NONE,
	1.1 thinkpad-kmod-2615pm.patch, NONE,
	1.1 thinkpad-kmod-percpu.patch, NONE, 1.1 thinkpad-kmod.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262222.k0QMMIxs018954@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18900/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kmodtool thinkpad-kmod-2615pm.patch thinkpad-kmod-percpu.patch 
	thinkpad-kmod.spec 
Log Message:
auto-import thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4 on branch devel from thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4.src.rpm
Initial import.


--- NEW FILE kmodtool ---
#!/bin/bash

# kmodtool - Helper script for building kernel module RPMs
# Copyright (c) 2003-2006 Ville Skytt?? <ville.skytta at iki.fi>,
#                         Thorsten Leemhuis <fedora at leemhuis.info>
#
# 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.

myprog="kmodtool"
myver="0.10.3"
knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
kmod_name=
kver=
verrel=
variant=

get_verrel ()
{
  verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
}

print_verrel ()
{
  get_verrel $@ || return $?
  echo "${verrel}"
}

get_variant ()
{
  variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
  [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
}

print_variant ()
{
  get_variant $@ || return $?
  echo "${variant}"
}


get_rpmtemplate ()
{
    local variant="${1}"
    local dashvariant="${variant:+-${variant}}"
    cat <<EOF
%package       -n kmod-${kmod_name}${dashvariant}
Summary:          ${kmod_name} kernel module(s)
Group:            System Environment/Kernel
Provides:         kernel-module = ${verrel}${variant}
Provides:         kmod-${kmod_name} = %{version}-%{release}
Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
Requires:         ${kmod_name}-kmod-common = %{version}
Requires(post):   /sbin/depmod
Requires(postun): /sbin/depmod
BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
%description   -n kmod-${kmod_name}${dashvariant}
This package provides the ${kmod_name} kernel modules built for the Linux
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
%post          -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aeF /boot/System.map-${verrel}${variant} ${verrel}${variant} > /dev/null || :
%postun        -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
%files         -n kmod-${kmod_name}${dashvariant}
%defattr(644,root,root,755)
/lib/modules/${verrel}${variant}/extra/${kmod_name}/

EOF
}

print_rpmtemplate ()
{
  kmod_name="${1}"
  shift
  kver="${1}"
  get_verrel "${1}"
  shift
  if [ -z "${kmod_name}" ] ; then
    echo "Please provide the kmodule-name as first parameter." >&2
    exit 2
  elif [ -z "${kver}" ] ; then
    echo "Please provide the kver as second parameter." >&2
    exit 2
  elif [ -z "${verrel}" ] ; then
    echo "Couldn't find out the verrel." >&2
    exit 2
  fi

  for variant in "$@" ; do
    get_rpmtemplate "${variant}"
  done
}

usage ()
{
  cat <<EOF
You called: ${invocation}

Usage: ${myprog} <command> <option>+
 Commands:
  verrel <uname>                               
    - Get "base" version-release.
  variant <uname>                               
    - Get variant from uname.
  rpmtemplate <mainpgkname> <uname> <variants> 
    - Return a template for
  version  
    - Output version number and exit.
EOF
}

invocation="$(basename ${0}) $@"
while [ "${1}" ] ; do
  case "${1}" in
    verrel)
      shift
      print_verrel $@
      exit $?
      ;;
    variant)
      shift
      print_variant $@
      exit $?
      ;;
    rpmtemplate)
      shift
      print_rpmtemplate "$@"
      exit $?
      ;;
    version)
      echo "${myprog} ${myver}"
      exit 0
      ;;
    *)
      echo "Error: Unknown option '${1}'." >&2
      usage >&2
      exit 2
      ;;
  esac
done

# Local variables:
# mode: sh
# sh-indentation: 2
# indent-tabs-mode: nil
# End:
# ex: ts=2 sw=2 et

thinkpad-kmod-2615pm.patch:

--- NEW FILE thinkpad-kmod-2615pm.patch ---
--- 2.6/drivers/thinkpadpm.c~	2004-09-19 12:32:57.000000000 +0300
+++ 2.6/drivers/thinkpadpm.c	2005-12-26 20:18:07.000000000 +0200
@@ -39,6 +39,9 @@
 #include <linux/apm_bios.h>
 #include <linux/pm.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+#include <linux/pm_legacy.h>
+#endif
 #include "thinkpad_common.h"
 #include "thinkpadpm.h"
 
@@ -472,7 +475,7 @@
 {
 
 	/*** Set up APM BIOS interface ***/
-	if ( !pm_active ) {
+	if ( !PM_IS_ACTIVE() ) {
 		printk(KERN_INFO "thinkpadpm: Power management not active. :-(\n");
 		return -ENODEV;
 	}

thinkpad-kmod-percpu.patch:

--- NEW FILE thinkpad-kmod-percpu.patch ---
--- 2.6/drivers/thinkpadpm.c~	2004-09-19 12:32:57.000000000 +0300
+++ 2.6/drivers/thinkpadpm.c	2005-01-08 01:18:48.000000000 +0200
@@ -169,11 +169,11 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 #define get_gdt_table()	(cpu_gdt_table[get_cpu()])
-#define put_gdt_table()	put_cpu()
 #else
-#define get_gdt_table()	(get_cpu_ptr(cpu_gdt_table))
-#define put_gdt_table()	put_cpu_ptr(cpu_gdt_table)
+#include <linux/percpu.h>
+#define get_gdt_table()	(per_cpu(cpu_gdt_table, get_cpu()))
 #endif
+#define put_gdt_table()	put_cpu()
 
 /**
  *	apm_bios_call	-	Make an APM BIOS 32bit call


--- NEW FILE thinkpad-kmod.spec ---
# stuff to be implemented externally:
Source10: kmodtool
%define   kmodtool sh %{SOURCE10}
# end stuff to be ...

                %define kmod_name thinkpad
                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}

Name:           %{kmod_name}-kmod
Summary:        %{kmod_name} kernel modules
Version:        5.8
Release:        9.%(echo %{kverrel} | tr - _)

URL:            http://tpctl.sourceforge.net/
Source0:        http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
Patch0:		%{name}-percpu.patch
Patch1:         %{name}-2615pm.patch
License:        GPL
Group:          System Environment/Kernel
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Do other arch thinkpads (that we care about) exist?
ExclusiveArch:  i586 i686

%description
This package provides %{kmod_name} kernel modules.

# magic hidden here:
%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}

%prep
# to understand the magic better or to debug it, uncomment this:
#%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null
#sleep 5

%setup -q -T -c -a 0
cd %{kmod_name}-%{version}
%{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile
sed -i 's|depmod -a|echo depmod -a disabled|' 2.6/drivers/Makefile
%patch0 -p0
%patch1 -p0
cd ..
for kvariant in %{kvariants} ; do
    cp -a %{kmod_name}-%{version}* _kmod_build_$kvariant
done


%build
for kvariant in %{kvariants} ; do
    make %{?_smp_mflags} -C _kmod_build_$kvariant/2.6/drivers V=1 \
       KSRC=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
done
    

%install
rm -rf $RPM_BUILD_ROOT
for kvariant in %{kvariants} ; do
    make -C _kmod_build_$kvariant/2.6/drivers install \
        MODULESROOT=$RPM_BUILD_ROOT/lib/modules/%{kverrel}$kvariant/extra
done
chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-9
- Remove "up" == "" support, related cleanups.

* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-8
- Add RHEL4 compatibility (packaging, not code).

* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-7
- Convert to using new kmodhelper.

* Wed Jan  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-6
- Drop 2.6.15pre support hack.

* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-5
- s/kmod-config(thinkpad)/thinkpad-kmod-common/

* Mon Dec 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-4
- Require kmod-config(thinkpad).

* Mon Dec 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-3
- Don't build xen-* or smp modules by default.
- Hack to build with kernel >= 2.6.15 without legacy PM configured.

* Sun Dec 18 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 5.8-2
- Split into thinkpad and thinkpad-kmod.
- Adjust to new Fedora Extras kernel module scheme.

* Sat Apr  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-1
- Adjust for FC4 kernel-devel.
- Drop console.perms munging, document it in README.Fedora instead.

* Sat Jan  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.3
- Patch to work with kernel 2.6.10.
- Drop udev stuff and thinkpad group, intruduce console.perms munging.

* Sun Dec  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.2
- Drop support for kernels < 2.6, require udev, clean up specfile.
- Install modules into /lib/modules/$uname/updates/thinkpad
  (was /lib/modules/$uname/thinkpad).

* Mon Nov 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.1
- Update to 5.8.
- Patch to work with kernel 2.6.9 (final).

* Wed Sep 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.7-0.fdr.1
- Update to 5.7.

* Sat Sep 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.2
- Reset module file modes to 644 for 2.6 kernels too.
- Drop private copy of kmodhelper, use the one in fedora-rpmdevtools instead
  (2.4 kernels only).

* Tue Sep  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.1
- Update to 5.6, parmdesc patch applied upstream.
- Patch to honor kernel optflags for 2.6 kernels.

* Fri Jul 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.5-0.fdr.1
- Update to 5.5.
- Clean up kernel >= 2.6 support.

* Sun Mar 14 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.4
- Fix README path in %%description (#503).
- Avoid misleading build error message when no kernel-source is installed.

* Mon Feb  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.3
- Update to kmodhelper 0.9.8.

* Sat Jan 31 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.2
- Further spec cleanups, kmodhelper 0.9.7.

* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.1
- Update to 5.0, and kmodhelper to 0.9.6.
- Use MAKEDEV again.

* Thu Jan  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.2.trial1
- Cosmetic specfile changes.

* Sun Dec 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.1.trial1
- Update to 4.999-trial1.
- Experimental, untested support for kernel 2.6.
- New version (0.9.5) of kmodhelper.

* Sat Dec 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.7
- Honor --target again.
- New version of kmodhelper.

* Fri Dec 19 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.6
- Pretty much reworked specfile, it should now be relatively easy to build
  modules for all kernel variants if one so desires.
- Back to providing kernel-module instead of kernel-modules because the
  naming scheme doesn't coexist prettily with up2date's kernel-modules
  behavior.
- Run depmod only if installing/uninstalling modules for the running kernel.

* Sat Dec  6 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.5
- Require /boot/vmlinuz-%%{kversion} (bug 503).
- Provide kernel-modules instead of kernel-module (bug 503).
- Build modules with the correct $CC.

* Tue Nov 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.4
- Don't use MAKEDEV to create /dev/thinkpad.

* Sat Nov 22 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.3
- Use sourceforge.net tarball.

* Sun Nov 16 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.2
- Add kernel config location workararound for .nptl kernels.

* Sat Oct 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.1
- Update to 4.8.
- Include kernel cflags scripts in the package.

* Tue Jul 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.2
- Nuke reference to README.modules.conf in %%description (bug 503).
- Use fedora-rpm-helper.

* Thu Jul 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.1
- Update to 4.6.
- Drop README.modules.conf; upstream README has the necessary info.

* Sat May 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.4-0.fdr.1
- Update to 4.4 (from Debian).
- Un-hardwire 2.4.x build.
- Use proper kernel CFLAGS.
- Require specific kernel version.
- Use /dev/MAKEDEV for creating the device node, and own it.
- %%{buildroot} -> $RPM_BUILD_ROOT.
- Post(un)install scriptlet cleanups.

* Fri Apr 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.4
- Actually build for a 2.4.x kernel, hardwired for now (#214).

* Mon Apr 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.3
- Rename to kernel-module-thinkpad.
- Obsolete kernel-mod-thinkpad.
- Add ExclusiveArch: i586 i686.
- Fix missing epoch in kernel-source dependency.

* Mon Apr  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.2
- Actually include README.modules.conf (#8 comment 13).

* Sat Apr  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.1
- Update to 4.3.
- More spec file cleanups.

* Mon Mar 31 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.3
- Small spec cleanups.

* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.2
- %%postun tricks for better cleanup after erase.

* Thu Mar 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.1
- Updated according to Fedora naming guidelines RC3.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.4
- Proof-of-concept for new kernel module packaging guideline proposal.
- Create group and /dev/thinkpad only on new install.
- Renamed to thinkpad-kernel.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.3
- Do install_modules instead of install in %%install to avoid unnecessary
  modprobing (#8).

* Sat Feb 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.2
- Add support for %%kernel define.

* Sat Feb  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.1
- First Fedora release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:20:04 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:21:45 -0000	1.2
@@ -0,0 +1 @@
+thinkpad_5.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:20:04 -0000	1.1
+++ sources	26 Jan 2006 22:21:45 -0000	1.2
@@ -0,0 +1 @@
+288ab19587bb3a8a4d6097448059b4c6  thinkpad_5.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:25:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:25:00 -0500
Subject: owners owners.list,1.566,1.567
Message-ID: <200601262225.k0QMPX7Q019046@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19027

Modified Files:
	owners.list 
Log Message:
-kernel-module-thinkpad, +thinkpad-kmod*


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- owners.list	26 Jan 2006 17:08:41 -0000	1.566
+++ owners.list	26 Jan 2006 22:25:00 -0000	1.567
@@ -451,7 +451,6 @@
 Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kernel-module-thinkpad|IBM ThinkPad support kernel modules|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1234,6 +1233,8 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 26 22:28:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:28:28 -0500
Subject: rpms/lirc-kmod-common - New directory
Message-ID: <200601262228.k0QMSU7n019103@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19095/lirc-kmod-common

Log Message:
Directory /cvs/extras/rpms/lirc-kmod-common added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:28:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:28:34 -0500
Subject: rpms/lirc-kmod-common/devel - New directory
Message-ID: <200601262228.k0QMSaOT019118@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19095/lirc-kmod-common/devel

Log Message:
Directory /cvs/extras/rpms/lirc-kmod-common/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:28:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:28:54 -0500
Subject: rpms/lirc-kmod-common Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262228.k0QMSutG019153@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19140

Added Files:
	Makefile import.log 
Log Message:
Setup of module lirc-kmod-common


--- NEW FILE Makefile ---
# Top level Makefile for module lirc-kmod-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:29:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:29:00 -0500
Subject: rpms/lirc-kmod-common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262229.k0QMT2cr019173@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19140/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lirc-kmod-common


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:29:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:29:32 -0500
Subject: rpms/lirc-kmod-common/devel lirc-kmod-common.spec,NONE,1.1
Message-ID: <200601262229.k0QMTYfB019225@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19200/devel

Added Files:
	lirc-kmod-common.spec 
Log Message:
auto-import lirc-kmod-common-0.8.0-2 on branch devel from lirc-kmod-common-0.8.0-2.src.rpm
Initial import.


--- NEW FILE lirc-kmod-common.spec ---
# TODO: udev rules

%define kmod_name lirc

Name:           %{kmod_name}-kmod-common
Version:        0.8.0
Release:        2%{?dist}
Summary:        Common files for LIRC kernel modules

Group:          System Environment/Kernel
License:        GPL
URL:            http://www.lirc.org/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       lirc = %{version}
Requires:       kmod-%{kmod_name} = %{version}
Requires:       udev

%description
%{summary}.


%prep
%setup -q -T -c


%install
rm -rf $RPM_BUILD_ROOT
# TODO: udev rules?


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)


%changelog
* Wed Dec 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
- Remove kmod-config(lirc) provision.

* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-1
- First build.



From fedora-extras-commits at redhat.com  Thu Jan 26 22:29:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:29:26 -0500
Subject: rpms/lirc-kmod-common import.log,1.1,1.2
Message-ID: <200601262229.k0QMTwbw019236@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19200

Modified Files:
	import.log 
Log Message:
auto-import lirc-kmod-common-0.8.0-2 on branch devel from lirc-kmod-common-0.8.0-2.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod-common/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:28:54 -0000	1.1
+++ import.log	26 Jan 2006 22:29:26 -0000	1.2
@@ -0,0 +1 @@
+lirc-kmod-common-0_8_0-2:HEAD:lirc-kmod-common-0.8.0-2.src.rpm:1138314586



From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:27 -0500
Subject: rpms/lirc-kmod/devel - New directory
Message-ID: <200601262233.k0QMXU14019391@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19368/lirc-kmod/devel

Log Message:
Directory /cvs/extras/rpms/lirc-kmod/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:12 -0500
Subject: rpms/lirc-kmod - New directory
Message-ID: <200601262233.k0QMXGMv019376@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19368/lirc-kmod

Log Message:
Directory /cvs/extras/rpms/lirc-kmod added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:48 -0500
Subject: rpms/lirc-kmod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262233.k0QMXolQ019448@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19435

Added Files:
	Makefile import.log 
Log Message:
Setup of module lirc-kmod


--- NEW FILE Makefile ---
# Top level Makefile for module lirc-kmod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:54 -0500
Subject: rpms/lirc-kmod/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262233.k0QMXusW019475@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19435/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lirc-kmod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:40 -0500
Subject: owners owners.list,1.567,1.568
Message-ID: <200601262234.k0QMYCKk019486@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19405

Modified Files:
	owners.list 
Log Message:
+lirc-kmod*


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- owners.list	26 Jan 2006 22:25:00 -0000	1.567
+++ owners.list	26 Jan 2006 22:33:39 -0000	1.568
@@ -585,6 +585,8 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod|LIRC kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 26 22:35:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:35:17 -0500
Subject: rpms/lirc-kmod import.log,1.1,1.2
Message-ID: <200601262235.k0QMZoDU019570@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19529

Modified Files:
	import.log 
Log Message:
auto-import lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5 on branch devel from lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:33:48 -0000	1.1
+++ import.log	26 Jan 2006 22:35:17 -0000	1.2
@@ -0,0 +1 @@
+lirc-kmod-0_8_0-1_2_6_15_1_1864_FC5:HEAD:lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5.src.rpm:1138314924



From fedora-extras-commits at redhat.com  Thu Jan 26 22:35:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:35:23 -0500
Subject: rpms/lirc-kmod/devel kmodtool, NONE, 1.1 lirc-kmod-0.8.0-2616.patch,
	NONE, 1.1 lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch, NONE,
	1.1 lirc-kmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262235.k0QMZtem019576@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19529/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kmodtool lirc-kmod-0.8.0-2616.patch 
	lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch lirc-kmod.spec 
Log Message:
auto-import lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5 on branch devel from lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5.src.rpm
Initial import.


--- NEW FILE kmodtool ---
#!/bin/bash

# kmodtool - Helper script for building kernel module RPMs
# Copyright (c) 2003-2006 Ville Skytt?? <ville.skytta at iki.fi>,
#                         Thorsten Leemhuis <fedora at leemhuis.info>
#
# 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.

myprog="kmodtool"
myver="0.10.3"
knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
kmod_name=
kver=
verrel=
variant=

get_verrel ()
{
  verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
}

print_verrel ()
{
  get_verrel $@ || return $?
  echo "${verrel}"
}

get_variant ()
{
  variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
  [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
}

print_variant ()
{
  get_variant $@ || return $?
  echo "${variant}"
}


get_rpmtemplate ()
{
    local variant="${1}"
    local dashvariant="${variant:+-${variant}}"
    cat <<EOF
%package       -n kmod-${kmod_name}${dashvariant}
Summary:          ${kmod_name} kernel module(s)
Group:            System Environment/Kernel
Provides:         kernel-module = ${verrel}${variant}
Provides:         kmod-${kmod_name} = %{version}-%{release}
Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
Requires:         ${kmod_name}-kmod-common = %{version}
Requires(post):   /sbin/depmod
Requires(postun): /sbin/depmod
BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
%description   -n kmod-${kmod_name}${dashvariant}
This package provides the ${kmod_name} kernel modules built for the Linux
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
%post          -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aeF /boot/System.map-${verrel}${variant} ${verrel}${variant} > /dev/null || :
%postun        -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
%files         -n kmod-${kmod_name}${dashvariant}
%defattr(644,root,root,755)
/lib/modules/${verrel}${variant}/extra/${kmod_name}/

EOF
}

print_rpmtemplate ()
{
  kmod_name="${1}"
  shift
  kver="${1}"
  get_verrel "${1}"
  shift
  if [ -z "${kmod_name}" ] ; then
    echo "Please provide the kmodule-name as first parameter." >&2
    exit 2
  elif [ -z "${kver}" ] ; then
    echo "Please provide the kver as second parameter." >&2
    exit 2
  elif [ -z "${verrel}" ] ; then
    echo "Couldn't find out the verrel." >&2
    exit 2
  fi

  for variant in "$@" ; do
    get_rpmtemplate "${variant}"
  done
}

usage ()
{
  cat <<EOF
You called: ${invocation}

Usage: ${myprog} <command> <option>+
 Commands:
  verrel <uname>                               
    - Get "base" version-release.
  variant <uname>                               
    - Get variant from uname.
  rpmtemplate <mainpgkname> <uname> <variants> 
    - Return a template for
  version  
    - Output version number and exit.
EOF
}

invocation="$(basename ${0}) $@"
while [ "${1}" ] ; do
  case "${1}" in
    verrel)
      shift
      print_verrel $@
      exit $?
      ;;
    variant)
      shift
      print_variant $@
      exit $?
      ;;
    rpmtemplate)
      shift
      print_rpmtemplate "$@"
      exit $?
      ;;
    version)
      echo "${myprog} ${myver}"
      exit 0
      ;;
    *)
      echo "Error: Unknown option '${1}'." >&2
      usage >&2
      exit 2
      ;;
  esac
done

# Local variables:
# mode: sh
# sh-indentation: 2
# indent-tabs-mode: nil
# End:
# ex: ts=2 sw=2 et

lirc-kmod-0.8.0-2616.patch:

--- NEW FILE lirc-kmod-0.8.0-2616.patch ---
Index: drivers/lirc_atiusb/lirc_atiusb.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_atiusb/lirc_atiusb.c,v
retrieving revision 1.51
diff -u -r1.51 lirc_atiusb.c
--- drivers/lirc_atiusb/lirc_atiusb.c	29 Oct 2005 14:18:53 -0000	1.51
+++ drivers/lirc_atiusb/lirc_atiusb.c	21 Jan 2006 21:27:35 -0000
@@ -1180,7 +1180,9 @@
 }
 
 static struct usb_driver usb_remote_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	usb_remote_probe,
 	.disconnect =	usb_remote_disconnect,
Index: drivers/lirc_i2c/lirc_i2c.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_i2c/lirc_i2c.c,v
retrieving revision 1.35
diff -u -r1.35 lirc_i2c.c
--- drivers/lirc_i2c/lirc_i2c.c	20 Oct 2005 18:25:58 -0000	1.35
+++ drivers/lirc_i2c/lirc_i2c.c	21 Jan 2006 21:27:36 -0000
@@ -360,9 +360,18 @@
 static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
 static struct i2c_driver driver = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+        driver: {
+                 name:  "lirc_i2c",
+        },
+        id:             I2C_DRIVERID_INFRARED,
+#else
         name:           "i2c ir driver",
-        id:             I2C_DRIVERID_EXP3, /* FIXME */
+        id:             I2C_DRIVERID_EXP3,
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
         flags:          I2C_DF_NOTIFY,
+#endif
         attach_adapter: ir_probe,
         detach_client:  ir_detach,
         command:        ir_command,
Index: drivers/lirc_igorplugusb/lirc_igorplugusb.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c,v
retrieving revision 1.7
diff -u -r1.7 lirc_igorplugusb.c
--- drivers/lirc_igorplugusb/lirc_igorplugusb.c	21 Mar 2005 14:39:38 -0000	1.7
+++ drivers/lirc_igorplugusb/lirc_igorplugusb.c	21 Jan 2006 21:27:36 -0000
@@ -615,7 +615,9 @@
 };
 
 static struct usb_driver usb_remote_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	usb_remote_probe,
 	.disconnect =	usb_remote_disconnect,
Index: drivers/lirc_imon/lirc_imon.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_imon/lirc_imon.c,v
retrieving revision 1.9
diff -u -r1.9 lirc_imon.c
--- drivers/lirc_imon/lirc_imon.c	3 Dec 2005 15:18:07 -0000	1.9
+++ drivers/lirc_imon/lirc_imon.c	21 Jan 2006 21:27:37 -0000
@@ -201,7 +201,9 @@
 
 /* USB Device data */
 static struct usb_driver imon_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner 		= THIS_MODULE,
+#endif
 	.name 		= MOD_NAME,
 	.probe 		= imon_probe,
 	.disconnect 	= imon_disconnect,
Index: drivers/lirc_mceusb/lirc_mceusb.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_mceusb/lirc_mceusb.c,v
retrieving revision 1.10
diff -u -r1.10 lirc_mceusb.c
--- drivers/lirc_mceusb/lirc_mceusb.c	29 Oct 2005 14:18:53 -0000	1.10
+++ drivers/lirc_mceusb/lirc_mceusb.c	21 Jan 2006 21:27:37 -0000
@@ -222,7 +222,9 @@
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver mceusb_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	mceusb_probe,
 	.disconnect =	mceusb_disconnect,
Index: drivers/lirc_mceusb2/lirc_mceusb2.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_mceusb2/lirc_mceusb2.c,v
retrieving revision 1.2
diff -u -r1.2 lirc_mceusb2.c
--- drivers/lirc_mceusb2/lirc_mceusb2.c	29 Oct 2005 14:18:53 -0000	1.2
+++ drivers/lirc_mceusb2/lirc_mceusb2.c	21 Jan 2006 21:27:38 -0000
@@ -585,7 +585,9 @@
 }
 
 static struct usb_driver usb_remote_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	usb_remote_probe,
 	.disconnect =	usb_remote_disconnect,
Index: drivers/lirc_sasem/lirc_sasem.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_sasem/lirc_sasem.c,v
retrieving revision 1.12
diff -u -r1.12 lirc_sasem.c
--- drivers/lirc_sasem/lirc_sasem.c	3 Dec 2005 15:18:07 -0000	1.12
+++ drivers/lirc_sasem/lirc_sasem.c	21 Jan 2006 21:27:38 -0000
@@ -189,7 +189,9 @@
 
 /* USB Device data */
 static struct usb_driver sasem_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner 		= THIS_MODULE,
+#endif
 	.name 		= MOD_NAME,
 	.probe 		= sasem_probe,
 	.disconnect 	= sasem_disconnect,
Index: drivers/lirc_streamzap/lirc_streamzap.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_streamzap/lirc_streamzap.c,v
retrieving revision 1.15
diff -u -r1.15 lirc_streamzap.c
--- drivers/lirc_streamzap/lirc_streamzap.c	6 Jan 2006 07:18:03 -0000	1.15
+++ drivers/lirc_streamzap/lirc_streamzap.c	21 Jan 2006 21:27:39 -0000
@@ -177,7 +177,9 @@
 /* usb specific object needed to register this driver with the usb subsystem */
 
 static struct usb_driver streamzap_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	streamzap_probe,
 	.disconnect =	streamzap_disconnect,

lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch:

--- NEW FILE lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch ---
--- drivers/lirc_gpio/lirc_gpio.c~	2005-04-14 15:04:44.000000000 +0300
+++ drivers/lirc_gpio/lirc_gpio.c	2005-12-28 01:55:23.000000000 +0200
@@ -50,10 +50,9 @@
 #include "../drivers/char/bttvp.h"
 #else
 #include "../drivers/media/video/bttv.h"
-#include "../drivers/media/video/bttvp.h"
 #endif
 
-#if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45)
+#if defined(BTTV_VERSION_CODE) && BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45)
 #error "*******************************************************"
 #error " Sorry, this driver needs bttv version 0.7.45 or       "
 #error " higher. If you are using the bttv package, copy it to "


--- NEW FILE lirc-kmod.spec ---
# TODO: cmdir: (req: extra hw driver, http://www.innovationone.ca/)

# stuff to be implemented externally:
Source10: kmodtool
%define   kmodtool sh %{SOURCE10}
# end stuff to be ...

                %define kmod_name lirc
                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}

Name:           %{kmod_name}-kmod
Version:        0.8.0
Release:        1.%(echo %{kverrel} | tr - _)
Summary:        LIRC kernel modules

Group:          System Environment/Kernel
License:        GPL
URL:            http://www.lirc.org/
Source0:        http://download.sf.net/lirc/%{kmod_name}-%{version}.tar.bz2
Patch0:         %{name}-0.8.0pre2-gpio-no-bttvp.patch
Patch1:         %{name}-0.8.0-2616.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
LIRC is a package that allows you to decode and send infra-red and
other signals of many (but not all) commonly used remote controls.
Included applications include daemons which decode the received
signals as well as user space applications which allow controlling a
computer with a remote control.  This package contains additional
kernel modules to support additional remote control units.

# magic hidden here:
%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}

%prep
# to understand the magic better or to debug it, uncomment this:
#%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null
#sleep 5

%setup -q -c -T -a 0
cd lirc-%{version}*
%patch0 -p0
%patch1 -p0
# *cough*
echo %{kverrel} | grep -q _FC5 && sed -i s/2,6,16/2,6,15/ \
    drivers/lirc_{i2c,imon,sasem,streamzap,*usb*}/lirc_*.c
# http://sf.net/tracker/?func=detail&aid=1406110&group_id=5444&atid=105444
sed -i -e 's/<asm\/segment\.h>/<asm\/uaccess.h>/' drivers/lirc_*/lirc_*.c
cd ..
for kvariant in %{kvariants} ; do
    cp -a lirc-%{version}* _kmod_build_$kvariant
done


%build
for kvariant in %{kvariants}
do
    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}

    cd _kmod_build_$kvariant

    # cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels), needs
    # additional hw driver from http://www.innovationone.ca/
    nobuild="cmdir"
    # gpio: missing drivers/media/video/bttv.h in kernel-devel
    [ -e $ksrc/drivers/media/video/bttv.h ] || nobuild="$nobuild gpio"
    # parallel: not smp safe
    grep -q ^CONFIG_SMP=y $ksrc/.config && nobuild="$nobuild parallel"
    for drv in $nobuild ; do
        sed -i -e "s/^\\s*(lirc_dev lirc_$drv)//" -e "s/^\\s*lirc_$drv//" \
            configure*
    done
    touch -r aclocal.m4 configure.in # avoid autofoo re-run

    %configure \
        --enable-sandboxed \
        --with-kerneldir=$ksrc \
        --with-moduledir=/lib/modules/%{kverrel}$kvariant/extra/%{kmod_name} \
        --with-driver=all
    make %{?_smp_mflags} -C drivers

    cd ..
done


%install
rm -rf $RPM_BUILD_ROOT
for dir in _kmod_build_* ; do
    make -C $dir/drivers install DESTDIR=$RPM_BUILD_ROOT
done
chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-1
- 0.8.0.
- Hopefully fix lirc_{it87,serial,sir} on PPC, thanks to upstream.
- Hopefully fix i2c and usb drivers with kernel >= 2.6.15.
- Remove "up" == "" support, related cleanups.

* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.9.pre4
- Add RHEL4 compatibility.

* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.8.pre4
- 0.8.0pre4.
- Build all variants in separate dirs again for proper -debuginfo reasons.

* Sun Jan  8 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.8.0-0.7.pre3
- Experiment with a new fedora-kmodhelper
- use a different approach for extracting/build/install

* Wed Jan  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.6.pre3
- Drop 2.6.15pre support hack.
- Clean up unneeded kernel-devel build dependency.

* Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.5.pre3
- 0.8.0pre3.

* Wed Dec 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.5.pre2
- Build non-UP modules against the correct source tree, D'oh!
- Patch gpio driver to not require bttvp.h (private), build and ship it
  if bttv.h is in kernel-devel.
- Disable parallel driver with SMP.

* Wed Dec 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.4.pre2
- s/kmod-config(lirc)/lirc-kmod-common/

* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.3.pre2
- Split from the main lirc package, adapt to new kmod standard.
- Disable debugging features.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:33:54 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:35:23 -0000	1.2
@@ -0,0 +1 @@
+lirc-0.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:33:54 -0000	1.1
+++ sources	26 Jan 2006 22:35:23 -0000	1.2
@@ -0,0 +1 @@
+0bf28bf82c7766a462f90927b6bf3af1  lirc-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 22:47:33 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 26 Jan 2006 17:47:33 -0500
Subject: rpms/octave/FC-4 octave.spec,1.22,1.23
Message-ID: <200601262248.k0QMm6De019638@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19619

Modified Files:
	octave.spec 
Log Message:
Rebuilt for new hdf5 libraries


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- octave.spec	11 Nov 2005 22:33:49 -0000	1.22
+++ octave.spec	26 Jan 2006 22:47:33 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.1.72
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-2
+- Rebuild for new release of hdf5.
+
 * Fri Nov 11 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-1
 - New upstream release, remove old patch.
 



From fedora-extras-commits at redhat.com  Thu Jan 26 22:49:15 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 26 Jan 2006 17:49:15 -0500
Subject: rpms/octave/devel octave.spec,1.27,1.28
Message-ID: <200601262249.k0QMnlBs019722@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19705

Modified Files:
	octave.spec 
Log Message:
Rebuilt for new hdf5 libraries


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- octave.spec	19 Dec 2005 22:23:04 -0000	1.27
+++ octave.spec	26 Jan 2006 22:49:15 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-5
+- Rebuild for new release of hdf5.
+
 * Mon Dec 19 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-4
 - Rebuild for gcc 4.1.
 



From fedora-extras-commits at redhat.com  Fri Jan 27 05:09:49 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 27 Jan 2006 00:09:49 -0500
Subject: rpms/byzanz/devel .cvsignore, 1.2, 1.3 byzanz.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601270510.k0R5ALsv000362@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv337

Modified Files:
	.cvsignore byzanz.spec sources 
Log Message:
Update to 0.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 19:52:04 -0000	1.2
+++ .cvsignore	27 Jan 2006 05:09:48 -0000	1.3
@@ -1 +1 @@
-byzanz-0.0.3.tar.gz
+byzanz-0.1.0.tar.gz


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- byzanz.spec	19 Jan 2006 20:00:27 -0000	1.2
+++ byzanz.spec	27 Jan 2006 05:09:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
-Version: 0.0.3
-Release: 3%{?dist}
+Version: 0.1.0
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -15,6 +15,10 @@
 BuildRequires: gnome-vfs2-devel >= 2.12.0
 BuildRequires: libgnomeui-devel >= 2.12.0
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 %description
 Byzanz is a desktop recorder. Just like Istanbul. But it doesn't
 record to Ogg Theora, but to GIF.
@@ -28,21 +32,55 @@
 
 %install
 rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=%{buildroot} install
 %find_lang byzanz
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+if [ $1 -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    if [ -f %{_sysconfdir}/gconf/schemas/byzanz.schemas ]; then
+        gconftool-2 --makefile-uninstall-rule \
+          %{_sysconfdir}/gconf/schemas/byzanz.schemas >/dev/null || :
+        killall -HUP gconfd-2 || :
+    fi
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/byzanz.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/byzanz.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
+
 %files -f byzanz.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
 
+%{_sysconfdir}/gconf/schemas/byzanz.schemas
 %{_bindir}/byzanz-record
 %{_libdir}/bonobo/servers/ByzanzApplet.server
 %{_libexecdir}/byzanz-applet
+%{_datadir}/gnome-2.0/ui/byzanzapplet.xml
+%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-area.png
+%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-screen.png
+%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png
 
 %changelog
+* Thu Jan 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.0-1
+- Update to 0.1.0
+- Add scriptlet for installing GConf schema.
+
 * Thu Jan 19 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-3
 - Bump release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 19:52:04 -0000	1.2
+++ sources	27 Jan 2006 05:09:48 -0000	1.3
@@ -1 +1 @@
-3c57cd11aba49fe05f77709cd9a7d609  byzanz-0.0.3.tar.gz
+3637e3a078aec602606ad053512b1209  byzanz-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 05:19:59 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 27 Jan 2006 00:19:59 -0500
Subject: rpms/byzanz/devel byzanz.spec,1.3,1.4
Message-ID: <200601270520.k0R5KVwj000480@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv463

Modified Files:
	byzanz.spec 
Log Message:
Add post and postun scripts to update the GTK+ icon cache.


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- byzanz.spec	27 Jan 2006 05:09:48 -0000	1.3
+++ byzanz.spec	27 Jan 2006 05:19:59 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
 Version: 0.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -62,6 +62,16 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/byzanz.schemas > /dev/null || :
 killall -HUP gconfd-2 || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f byzanz.lang
 %defattr(-,root,root,-)
@@ -77,6 +87,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png
 
 %changelog
+* Thu Jan 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.0-2
+- Add post and postun scripts to update the GTK+ icon cache.
+
 * Thu Jan 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.0-1
 - Update to 0.1.0
 - Add scriptlet for installing GConf schema.



From fedora-extras-commits at redhat.com  Fri Jan 27 06:48:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 27 Jan 2006 01:48:23 -0500
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.3,
	1.4 NetworkManager-vpnc.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601270648.k0R6mtPA002493@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2467

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
* Fri Jan 27 2006 Dan Williams <dcbw at redhat.com> - 0.5.0-1
- CVS snapshot for compatibility new NetworkManager




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Aug 2005 19:48:19 -0000	1.3
+++ .cvsignore	27 Jan 2006 06:48:22 -0000	1.4
@@ -1,2 +1,3 @@
 NetworkManager-vpnc-0.2.tar.gz
 NetworkManager-vpnc-0.3.tar.gz
+NetworkManager-vpnc-0.5.0.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetworkManager-vpnc.spec	6 Dec 2005 20:15:54 -0000	1.5
+++ NetworkManager-vpnc.spec	27 Jan 2006 06:48:22 -0000	1.6
@@ -1,4 +1,4 @@
-%define nm_version          0.4.1
+%define nm_version          0.5.1
 %define dbus_version        0.35
 %define gtk2_version        2.6.0
 %define vpnc_version        0.3.3-3
@@ -6,8 +6,8 @@
 
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
-Version: 0.3
-Release: 3
+Version: 0.5.0
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Fri Jan 27 2006 Dan Williams <dcbw at redhat.com> - 0.5.0-1
+- CVS snapshot for compatibility new NetworkManager
+
 * Tue Dec  6 2005 Jeremy Katz <katzj at redhat.com> - 0.3-3
 - rebuild for new dbus
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Aug 2005 19:48:19 -0000	1.3
+++ sources	27 Jan 2006 06:48:22 -0000	1.4
@@ -1 +1 @@
-1dbc51c83118494a20cf9446a667585b  NetworkManager-vpnc-0.3.tar.gz
+45ffcb2a1c03c545db0c8d8a4fcbd885  NetworkManager-vpnc-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 07:31:22 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:31:22 -0500
Subject: rpms/system-config-control import.log,1.4,1.5
Message-ID: <200601270731.k0R7VsXv004741@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-5 on branch devel from system-config-control-1.0-5.src.rpm
Changed the interface


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	26 Jan 2006 12:38:09 -0000	1.4
+++ import.log	27 Jan 2006 07:31:21 -0000	1.5
@@ -1,3 +1,4 @@
 system-config-control-1_0-3:HEAD:system-config-control-1.0-3.src.rpm:1131968670
 system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947
 system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074
+system-config-control-1_0-5:HEAD:system-config-control-1.0-5.src.rpm:1138347078



From fedora-extras-commits at redhat.com  Fri Jan 27 07:31:28 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:31:28 -0500
Subject: rpms/system-config-control/devel sources, 1.4,
	1.5 system-config-control.spec, 1.2, 1.3
Message-ID: <200601270732.k0R7W0b2004747@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706/devel

Modified Files:
	sources system-config-control.spec 
Log Message:
auto-import system-config-control-1.0-5 on branch devel from system-config-control-1.0-5.src.rpm
Changed the interface


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jan 2006 12:36:03 -0000	1.4
+++ sources	27 Jan 2006 07:31:27 -0000	1.5
@@ -1 +1 @@
-2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2
+39c7bbc5ff84d6331d204adf577f3bbe  system-config-control-1.0.tar.bz2


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-control.spec	17 Jan 2006 08:54:10 -0000	1.2
+++ system-config-control.spec	27 Jan 2006 07:31:27 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base



From fedora-extras-commits at redhat.com  Fri Jan 27 07:45:00 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:45:00 -0500
Subject: rpms/system-config-control import.log,1.5,1.6
Message-ID: <200601270745.k0R7jWeJ005064@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5029

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-5 on branch FC-4 from system-config-control-1.0-5.src.rpm
1_0-5 new version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Jan 2006 07:31:21 -0000	1.5
+++ import.log	27 Jan 2006 07:44:59 -0000	1.6
@@ -2,3 +2,4 @@
 system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947
 system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074
 system-config-control-1_0-5:HEAD:system-config-control-1.0-5.src.rpm:1138347078
+system-config-control-1_0-5:FC-4:system-config-control-1.0-5.src.rpm:1138347895



From fedora-extras-commits at redhat.com  Fri Jan 27 07:45:05 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:45:05 -0500
Subject: rpms/system-config-control/FC-4 sources, 1.4,
	1.5 system-config-control.spec, 1.2, 1.3
Message-ID: <200601270745.k0R7jc9W005068@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5029/FC-4

Modified Files:
	sources system-config-control.spec 
Log Message:
auto-import system-config-control-1.0-5 on branch FC-4 from system-config-control-1.0-5.src.rpm
1_0-5 new version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jan 2006 12:38:14 -0000	1.4
+++ sources	27 Jan 2006 07:45:05 -0000	1.5
@@ -1 +1 @@
-2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2
+39c7bbc5ff84d6331d204adf577f3bbe  system-config-control-1.0.tar.bz2


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/system-config-control.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-control.spec	17 Jan 2006 08:56:40 -0000	1.2
+++ system-config-control.spec	27 Jan 2006 07:45:05 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base



From fedora-extras-commits at redhat.com  Fri Jan 27 07:49:35 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:49:35 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.3,
	NONE
Message-ID: <200601270749.k0R7nbcE005210@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5201

Removed Files:
	system-config-control.spec 
Log Message:
removed spec which is giving tag errors


--- system-config-control.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 27 07:50:28 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:50:28 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.4,
	1.5
Message-ID: <200601270751.k0R7p1Dg005248@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5227

Added Files:
	system-config-control.spec 
Log Message:
added new system-config-control.spec


Index: system-config-control.spec
===================================================================
RCS file: system-config-control.spec
diff -N system-config-control.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ system-config-control.spec	27 Jan 2006 07:50:28 -0000	1.5
@@ -0,0 +1,58 @@
+Summary: Centralized tool for Fedora configuration utilities
+Name: system-config-control
+Version: 1.0
+Release: 5%{?dist}
+URL: http://www.indianoss.org/
+License: GPL
+Group: System Environment/Base
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+Source0: http://download.sourceforge.net/indianoss/%{name}-%{version}.tar.bz2
+BuildRequires: desktop-file-utils, gettext, intltool
+Requires: usermode, firstboot
+
+%description
+System-config-control provides an organized and centralized interface to all of
+Fedora's configuration utilities. It also hooks into firstboot, allowing these
+tools to be run after initial installation.
+
+%prep
+%setup -q
+
+%build
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make INSTROOT=$RPM_BUILD_ROOT install
+desktop-file-install --delete-original          \
+  --vendor fedora                               \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --mode 0644                                   \
+  --add-category X-Fedora                       \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%{_bindir}/%{name}
+%{_datadir}/%{name}/
+%{_datadir}/firstboot/modules/*
+%{_datadir}/applications/*.desktop
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
+
+%changelog
+* Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
+- Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
+- Added icons in the tabs of the categories.
+
+* Fri Oct 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
+- cleanups for Fedora
+
+* Mon Oct  3 2005 Ankit Patel <ankit644 at yahoo.com>
+- Initial build.



From fedora-extras-commits at redhat.com  Fri Jan 27 07:59:45 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:59:45 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.5,
	1.6
Message-ID: <200601270800.k0R80IhQ005351@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5326

Modified Files:
	system-config-control.spec 
Log Message:
Updated spec file


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-config-control.spec	27 Jan 2006 07:50:28 -0000	1.5
+++ system-config-control.spec	27 Jan 2006 07:59:45 -0000	1.6
@@ -47,6 +47,10 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Fri Jan 27 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-5
+- Modified the GUI and the some tools inside it.
+- This is done by Tejas Dinkar.
+
 * Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
 - Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
 - Added icons in the tabs of the categories.



From fedora-extras-commits at redhat.com  Fri Jan 27 08:14:11 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 03:14:11 -0500
Subject: rpms/system-config-control import.log,1.6,1.7
Message-ID: <200601270814.k0R8EhX6007266@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-6 on branch devel from system-config-control-1.0-6.src.rpm
1_0-6 version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	27 Jan 2006 07:44:59 -0000	1.6
+++ import.log	27 Jan 2006 08:14:11 -0000	1.7
@@ -3,3 +3,4 @@
 system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074
 system-config-control-1_0-5:HEAD:system-config-control-1.0-5.src.rpm:1138347078
 system-config-control-1_0-5:FC-4:system-config-control-1.0-5.src.rpm:1138347895
+system-config-control-1_0-6:HEAD:system-config-control-1.0-6.src.rpm:1138349641



From fedora-extras-commits at redhat.com  Fri Jan 27 08:14:17 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 03:14:17 -0500
Subject: rpms/system-config-control/devel sources, 1.5,
	1.6 system-config-control.spec, 1.6, 1.7
Message-ID: <200601270814.k0R8En7D007270@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232/devel

Modified Files:
	sources system-config-control.spec 
Log Message:
auto-import system-config-control-1.0-6 on branch devel from system-config-control-1.0-6.src.rpm
1_0-6 version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jan 2006 07:31:27 -0000	1.5
+++ sources	27 Jan 2006 08:14:16 -0000	1.6
@@ -1 +1 @@
-39c7bbc5ff84d6331d204adf577f3bbe  system-config-control-1.0.tar.bz2
+16b6866bd808a706930a5dfffa47ccbd  system-config-control-1.0.tar.bz2


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system-config-control.spec	27 Jan 2006 07:59:45 -0000	1.6
+++ system-config-control.spec	27 Jan 2006 08:14:16 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base
@@ -47,8 +47,8 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
-* Fri Jan 27 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-5
-- Modified the GUI and the some tools inside it.
+* Fri Jan 27 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-6
+- Modified the GUI.
 - This is done by Tejas Dinkar.
 
 * Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4



From fedora-extras-commits at redhat.com  Fri Jan 27 09:08:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Jan 2006 04:08:02 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.12, 1.13 rxvt-unicode.spec,
	1.14, 1.15 sources, 1.12, 1.13
Message-ID: <200601270909.k0R99ADD011138@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11070/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Jan 2006 07:57:34 -0000	1.12
+++ .cvsignore	27 Jan 2006 09:08:02 -0000	1.13
@@ -1 +1 @@
-rxvt-unicode-7.2.tar.bz2
+rxvt-unicode-7.3a.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rxvt-unicode.spec	23 Jan 2006 07:57:34 -0000	1.14
+++ rxvt-unicode.spec	27 Jan 2006 09:08:02 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.2
+Version:        7.3a
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.3a-1
+- version upgrade
+
 * Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.2-1
 - version upgrade (should resolve #178561)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Jan 2006 07:57:34 -0000	1.12
+++ sources	27 Jan 2006 09:08:02 -0000	1.13
@@ -1 +1 @@
-8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2
+832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 27 09:08:11 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Jan 2006 04:08:11 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.12, 1.13 rxvt-unicode.spec,
	1.14, 1.15 sources, 1.12, 1.13
Message-ID: <200601270909.k0R99SAu011146@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11070/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Jan 2006 07:57:39 -0000	1.12
+++ .cvsignore	27 Jan 2006 09:08:10 -0000	1.13
@@ -1 +1 @@
-rxvt-unicode-7.2.tar.bz2
+rxvt-unicode-7.3a.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rxvt-unicode.spec	23 Jan 2006 07:57:39 -0000	1.14
+++ rxvt-unicode.spec	27 Jan 2006 09:08:10 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.2
+Version:        7.3a
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.3a-1
+- version upgrade
+
 * Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.2-1
 - version upgrade (should resolve #178561)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Jan 2006 07:57:39 -0000	1.12
+++ sources	27 Jan 2006 09:08:10 -0000	1.13
@@ -1 +1 @@
-8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2
+832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 27 09:08:41 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Jan 2006 04:08:41 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.12, 1.13 rxvt-unicode.spec,
	1.18, 1.19 sources, 1.12, 1.13
Message-ID: <200601270909.k0R99Ssx011147@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11070/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Jan 2006 07:57:45 -0000	1.12
+++ .cvsignore	27 Jan 2006 09:08:41 -0000	1.13
@@ -1 +1 @@
-rxvt-unicode-7.2.tar.bz2
+rxvt-unicode-7.3a.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rxvt-unicode.spec	23 Jan 2006 07:57:45 -0000	1.18
+++ rxvt-unicode.spec	27 Jan 2006 09:08:41 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.2
+Version:        7.3a
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.3a-1
+- version upgrade
+
 * Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.2-1
 - version upgrade (should resolve #178561)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Jan 2006 07:57:45 -0000	1.12
+++ sources	27 Jan 2006 09:08:41 -0000	1.13
@@ -1 +1 @@
-8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2
+832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 27 10:10:12 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 27 Jan 2006 05:10:12 -0500
Subject: rpms/alltray/devel alltray-0.65-preload.patch, NONE,
	1.1 alltray.spec, 1.4, 1.5
Message-ID: <200601271010.k0RAAitf013365@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13345

Modified Files:
	alltray.spec 
Added Files:
	alltray-0.65-preload.patch 
Log Message:
Ooone mooore tiiime!

alltray-0.65-preload.patch:

--- NEW FILE alltray-0.65-preload.patch ---
--- alltray-0.65/configure.orig	2006-01-27 05:01:01.000000000 -0500
+++ alltray-0.65/configure	2006-01-27 05:05:48.000000000 -0500
@@ -21425,19 +21425,19 @@
 
 _HAVE_LD_PRELOAD=no
 
-if { ac_try='$CC -c ./ld_preload.c'
+if { ac_try='$CC $CFLAGS -c ./ld_preload.c'
   { (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_try='$CC -shared -o ./ld_preload_lib1.so ./ld_preload_lib1.c'
+ if { ac_try='$CC $CFLAGS -shared -o ./ld_preload_lib1.so ./ld_preload_lib1.c'
   { (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_try='$CC -shared -o ./ld_preload_lib2.so ./ld_preload_lib2.c'
+  if { ac_try='$CC $CFLAGS -shared -o ./ld_preload_lib2.so ./ld_preload_lib2.c'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alltray.spec	19 Jan 2006 23:12:41 -0000	1.4
+++ alltray.spec	27 Jan 2006 10:10:11 -0000	1.5
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://alltray.sourceforge.net/
 Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
+Patch:          alltray-0.65-preload.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel desktop-file-utils
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .preload
 
 %build
 export CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -50,6 +52,7 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu Jan 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
+* Thu Jan 27 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
 - Added -fPIC to CFLAGS
+- Added preload patch
 - Initial RPM release



From fedora-extras-commits at redhat.com  Fri Jan 27 15:02:13 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 27 Jan 2006 10:02:13 -0500
Subject: rpms/azureus/devel azureus.script,1.3,1.4 azureus.spec,1.8,1.9
Message-ID: <200601271503.k0RF32Tl022886@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22848

Modified Files:
	azureus.script azureus.spec 
Log Message:
-20 release.
Remove junit reference from startup script.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus.script	26 Jan 2006 07:34:09 -0000	1.3
+++ azureus.script	27 Jan 2006 15:02:12 -0000	1.4
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
+CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- azureus.spec	26 Jan 2006 07:35:54 -0000	1.8
+++ azureus.spec	27 Jan 2006 15:02:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -146,6 +146,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-20
+- Remove junit reference from startup script.
+
 * Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-19
 - Theme CoolBar icons with azureus-themed.patch.
 - Add libgtk-java and glib-java dependencies to spec file.



From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:10 -0500
Subject: rpms/xfce4-quicklauncher-plugin - New directory
Message-ID: <200601271756.k0RHuCLu026984@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26976/xfce4-quicklauncher-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-quicklauncher-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:16 -0500
Subject: rpms/xfce4-quicklauncher-plugin/devel - New directory
Message-ID: <200601271756.k0RHuI5M026999@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26976/xfce4-quicklauncher-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:36 -0500
Subject: rpms/xfce4-quicklauncher-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601271756.k0RHuciA027033@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27021

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-quicklauncher-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-quicklauncher-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:41 -0500
Subject: rpms/xfce4-quicklauncher-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601271756.k0RHuipN027053@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27021/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-quicklauncher-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 27 17:57:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:57:53 -0500
Subject: rpms/xfce4-quicklauncher-plugin import.log,1.1,1.2
Message-ID: <200601271758.k0RHwQNC027189@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27155

Modified Files:
	import.log 
Log Message:
auto-import xfce4-quicklauncher-plugin-0.81-2.fc4 on branch devel from xfce4-quicklauncher-plugin-0.81-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Jan 2006 17:56:35 -0000	1.1
+++ import.log	27 Jan 2006 17:57:53 -0000	1.2
@@ -0,0 +1 @@
+xfce4-quicklauncher-plugin-0_81-2_fc4:HEAD:xfce4-quicklauncher-plugin-0.81-2.fc4.src.rpm:1138384665



From fedora-extras-commits at redhat.com  Fri Jan 27 17:57:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:57:59 -0500
Subject: rpms/xfce4-quicklauncher-plugin/devel
	xfce4-quicklauncher-plugin.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601271758.k0RHwVmV027193@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27155/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
auto-import xfce4-quicklauncher-plugin-0.81-2.fc4 on branch devel from xfce4-quicklauncher-plugin-0.81-2.fc4.src.rpm


--- NEW FILE xfce4-quicklauncher-plugin.spec ---
Name:		xfce4-quicklauncher-plugin
Version:	0.81
Release:	2%{?dist}
Summary:	Quicklauncher plugin for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
This plugin allows you to have lots of launchers in the Xfce panel, displaying 
them on several lines.

%prep
%setup -q
# fix permission of AUTHORS and COPYING
%__chmod 0664 {AUTHORS,COPYING}

%build
%configure --disable-static
make %{?_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 {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Fri Nov 18 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-1
- Initial Fedora Extras release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Jan 2006 17:56:41 -0000	1.1
+++ .cvsignore	27 Jan 2006 17:57:59 -0000	1.2
@@ -0,0 +1 @@
+xfce4-quicklauncher-plugin-0.81.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Jan 2006 17:56:41 -0000	1.1
+++ sources	27 Jan 2006 17:57:59 -0000	1.2
@@ -0,0 +1 @@
+98231ea7afe226ca7cbdc5c51ea3d16e  xfce4-quicklauncher-plugin-0.81.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 19:36:32 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 27 Jan 2006 14:36:32 -0500
Subject: rpms/tclhttpd/FC-3 tclhttpd.spec, 1.3, 1.4 tclhttpd_fedora.1.patch, 
	1.2, 1.3
Message-ID: <200601271937.k0RJb4ds031534@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31478/FC-3

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Start server as root, then let it switch itself to the tclhttpd user.  This
will allow the server to listen on privileged ports.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclhttpd.spec	21 Jan 2006 05:18:23 -0000	1.3
+++ tclhttpd.spec	27 Jan 2006 19:36:31 -0000	1.4
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -131,6 +131,12 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
+- Updated patch so that tclhttpd starts as root and then switches to
+  the tclhttpd user.  This is necessary if tclhttpd is to listen
+  on port 80.
+* Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
+- Check if the tclhttpd user exists before trying to create it
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd_fedora.1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd_fedora.1.patch	16 Jan 2006 01:48:31 -0000	1.2
+++ tclhttpd_fedora.1.patch	27 Jan 2006 19:36:31 -0000	1.3
@@ -201,7 +201,7 @@
 +'start')
 +        echo -n $"Starting $prog: "
 +        ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-+	daemon --user tclhttpd $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
++	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
 +        RETVAL=$?
 +        echo
 +        [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd



From fedora-extras-commits at redhat.com  Fri Jan 27 19:36:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 27 Jan 2006 14:36:38 -0500
Subject: rpms/tclhttpd/FC-4 tclhttpd.spec, 1.3, 1.4 tclhttpd_fedora.1.patch, 
	1.2, 1.3
Message-ID: <200601271937.k0RJbAct031544@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31478/FC-4

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Start server as root, then let it switch itself to the tclhttpd user.  This
will allow the server to listen on privileged ports.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclhttpd.spec	21 Jan 2006 05:18:28 -0000	1.3
+++ tclhttpd.spec	27 Jan 2006 19:36:38 -0000	1.4
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -131,6 +131,12 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
+- Updated patch so that tclhttpd starts as root and then switches to
+  the tclhttpd user.  This is necessary if tclhttpd is to listen
+  on port 80.
+* Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
+- Check if the tclhttpd user exists before trying to create it
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd_fedora.1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd_fedora.1.patch	16 Jan 2006 01:48:37 -0000	1.2
+++ tclhttpd_fedora.1.patch	27 Jan 2006 19:36:38 -0000	1.3
@@ -201,7 +201,7 @@
 +'start')
 +        echo -n $"Starting $prog: "
 +        ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-+	daemon --user tclhttpd $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
++	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
 +        RETVAL=$?
 +        echo
 +        [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd



From fedora-extras-commits at redhat.com  Fri Jan 27 19:36:44 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 27 Jan 2006 14:36:44 -0500
Subject: rpms/tclhttpd/devel tclhttpd.spec, 1.3, 1.4 tclhttpd_fedora.1.patch,
	1.2, 1.3
Message-ID: <200601271937.k0RJbGxH031551@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31478/devel

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Start server as root, then let it switch itself to the tclhttpd user.  This
will allow the server to listen on privileged ports.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclhttpd.spec	21 Jan 2006 05:18:34 -0000	1.3
+++ tclhttpd.spec	27 Jan 2006 19:36:43 -0000	1.4
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -131,6 +131,12 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
+- Updated patch so that tclhttpd starts as root and then switches to
+  the tclhttpd user.  This is necessary if tclhttpd is to listen
+  on port 80.
+* Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
+- Check if the tclhttpd user exists before trying to create it
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd_fedora.1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd_fedora.1.patch	16 Jan 2006 01:35:32 -0000	1.2
+++ tclhttpd_fedora.1.patch	27 Jan 2006 19:36:43 -0000	1.3
@@ -201,7 +201,7 @@
 +'start')
 +        echo -n $"Starting $prog: "
 +        ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-+	daemon --user tclhttpd $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
++	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
 +        RETVAL=$?
 +        echo
 +        [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd



From fedora-extras-commits at redhat.com  Fri Jan 27 20:10:12 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:10:12 -0500
Subject: rpms/nagios/devel nagios.htaccess, NONE, 1.1 .cvsignore, 1.2,
	1.3 nagios.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601272010.k0RKAjw3001120@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1083/devel

Modified Files:
	.cvsignore nagios.spec sources 
Added Files:
	nagios.htaccess 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch devel from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


--- NEW FILE nagios.htaccess ---
ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
<Directory /usr/lib/nagios/cgi-bin/>
   Options ExecCGI
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

Alias /nagios/ /usr/share/nagios/html/
<Directory /usr/share/nagios/html/>
   Options None
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

# For SSL-servers
#ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
#<Directory /usr/lib/nagios/cgi-bin/>
#   Options ExecCGI
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>
#
#Alias /nagios/ /usr/share/nagios/html/
#<Directory /usr/share/nagios/html/>
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
+++ .cvsignore	27 Jan 2006 20:10:12 -0000	1.3
@@ -1 +1 @@
-nagios-1.3.tar.gz
+nagios-2.0rc2.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nagios.spec	26 Jan 2006 21:28:27 -0000	1.3
+++ nagios.spec	27 Jan 2006 20:10:12 -0000	1.4
@@ -1,13 +1,14 @@
 Name: nagios
-Version: 1.3
-Release: 15%{?dist}
+Version: 2.0
+Release: 0.1.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPL
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz
 Source1: nagios.logrotate
+Source2: nagios.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8
@@ -49,7 +50,7 @@
 may compile against.
 
 %prep
-%setup -q
+%setup -q -n nagios-2.0rc2
 
 %build
 ./configure \
@@ -79,8 +80,7 @@
 %{__sed} -e "s|resource.cfg|private/resource.cfg|" \
 	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
 %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
-%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
-	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora
+echo >> html/stylesheets/common.css
 
 %install
 rm -rf %{buildroot}
@@ -94,8 +94,8 @@
 %{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
+%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
 %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
 %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
@@ -133,7 +133,7 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
-%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
+%doc Changelog INSTALLING LICENSE README UPGRADING 
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_libdir}/%{name}/cgi-bin/*cgi
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Jan 27 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.1.rc2
+- Using 2.0rc2 tarball
+
 * Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
 - Fixed usermod -a issue, Bugzilla #49609
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 22:47:20 -0000	1.2
+++ sources	27 Jan 2006 20:10:12 -0000	1.3
@@ -1 +1 @@
-2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz
+373124639093919dc8858a243d760f84  nagios-2.0rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 20:09:56 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:09:56 -0500
Subject: rpms/nagios import.log,1.2,1.3
Message-ID: <200601272011.k0RKB0FJ001123@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1083

Modified Files:
	import.log 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch devel from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	19 Jan 2006 22:47:14 -0000	1.2
+++ import.log	27 Jan 2006 20:09:55 -0000	1.3
@@ -1 +1,2 @@
 nagios-1_3-14:HEAD:nagios-1.3-14.src.rpm:1137710827
+nagios-2_0-0_1_rc2:HEAD:nagios-2.0-0.1.rc2.src.rpm:1138392575



From fedora-extras-commits at redhat.com  Fri Jan 27 20:47:57 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:47:57 -0500
Subject: rpms/nagios import.log,1.3,1.4
Message-ID: <200601272048.k0RKmTMn001421@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386

Modified Files:
	import.log 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch FC-4 from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	27 Jan 2006 20:09:55 -0000	1.3
+++ import.log	27 Jan 2006 20:47:56 -0000	1.4
@@ -1,2 +1,3 @@
 nagios-1_3-14:HEAD:nagios-1.3-14.src.rpm:1137710827
 nagios-2_0-0_1_rc2:HEAD:nagios-2.0-0.1.rc2.src.rpm:1138392575
+nagios-2_0-0_1_rc2:FC-4:nagios-2.0-0.1.rc2.src.rpm:1138394872



From fedora-extras-commits at redhat.com  Fri Jan 27 20:48:02 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:48:02 -0500
Subject: rpms/nagios/FC-4 nagios.htaccess, NONE, 1.1 .cvsignore, 1.2,
	1.3 nagios.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601272048.k0RKmZoi001427@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/FC-4

Modified Files:
	.cvsignore nagios.spec sources 
Added Files:
	nagios.htaccess 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch FC-4 from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


--- NEW FILE nagios.htaccess ---
ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
<Directory /usr/lib/nagios/cgi-bin/>
   Options ExecCGI
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

Alias /nagios/ /usr/share/nagios/html/
<Directory /usr/share/nagios/html/>
   Options None
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

# For SSL-servers
#ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
#<Directory /usr/lib/nagios/cgi-bin/>
#   Options ExecCGI
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>
#
#Alias /nagios/ /usr/share/nagios/html/
#<Directory /usr/share/nagios/html/>
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
+++ .cvsignore	27 Jan 2006 20:48:02 -0000	1.3
@@ -1 +1 @@
-nagios-1.3.tar.gz
+nagios-2.0rc2.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nagios.spec	26 Jan 2006 22:16:20 -0000	1.3
+++ nagios.spec	27 Jan 2006 20:48:02 -0000	1.4
@@ -1,13 +1,14 @@
 Name: nagios
-Version: 1.3
-Release: 15%{?dist}
+Version: 2.0
+Release: 0.1.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPL
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz
 Source1: nagios.logrotate
+Source2: nagios.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8
@@ -49,7 +50,7 @@
 may compile against.
 
 %prep
-%setup -q
+%setup -q -n nagios-2.0rc2
 
 %build
 ./configure \
@@ -79,8 +80,7 @@
 %{__sed} -e "s|resource.cfg|private/resource.cfg|" \
 	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
 %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
-%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
-	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora
+echo >> html/stylesheets/common.css
 
 %install
 rm -rf %{buildroot}
@@ -94,8 +94,8 @@
 %{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
+%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
 %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
 %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
@@ -133,7 +133,7 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
-%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
+%doc Changelog INSTALLING LICENSE README UPGRADING 
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_libdir}/%{name}/cgi-bin/*cgi
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Jan 27 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.1.rc2
+- Using 2.0rc2 tarball
+
 * Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
 - Fixed usermod -a issue, Bugzilla #49609
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 22:47:20 -0000	1.2
+++ sources	27 Jan 2006 20:48:02 -0000	1.3
@@ -1 +1 @@
-2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz
+373124639093919dc8858a243d760f84  nagios-2.0rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 23:57:40 2006
From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb))
Date: Fri, 27 Jan 2006 18:57:40 -0500
Subject: rpms/istanbul/devel istanbul.spec,1.3,1.4
Message-ID: <200601272358.k0RNwCED007503@cvs-int.fedora.redhat.com>

Author: jrb

Update of /cvs/extras/rpms/istanbul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7486/devel

Modified Files:
	istanbul.spec 
Log Message:
now require gstreamer08-python



Index: istanbul.spec
===================================================================
RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- istanbul.spec	7 Jan 2006 21:09:29 -0000	1.3
+++ istanbul.spec	27 Jan 2006 23:57:39 -0000	1.4
@@ -8,7 +8,7 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.1.1 
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
@@ -19,7 +19,7 @@
 Requires: gnome-desktop >= 2.6.0
 Requires: gstreamer08 >= %gstreamer_version
 Requires: gstreamer08-plugins >= %gstreamer_plugins_version
-Requires: gstreamer-python
+Requires: gstreamer08-python
 
 BuildRequires: python, python-devel
 BuildRequires: desktop-file-utils
@@ -92,6 +92,9 @@
 %{python_sitelib}/%{name}/configure/*.py*
 
 %changelog
+* Fri Jan 27 2006 Jonathan Blandford <jrb at redhat.com> - 0.1.1-6
+- change gstreamer-python to gstreamer08-python
+
 * Sat Jan 07 2006 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-6
 - Change requirements to gstreamer08* to match rawhide change
 



From fedora-extras-commits at redhat.com  Sat Jan 28 00:19:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:19:33 -0500
Subject: rpms/xfce4-diskperf-plugin - New directory
Message-ID: <200601280019.k0S0JZZb009412@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9404/xfce4-diskperf-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-diskperf-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 28 00:19:38 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:19:38 -0500
Subject: rpms/xfce4-diskperf-plugin/devel - New directory
Message-ID: <200601280019.k0S0JeJo009427@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9404/xfce4-diskperf-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-diskperf-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 28 00:19:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:19:58 -0500
Subject: rpms/xfce4-diskperf-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601280020.k0S0K0xi009461@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9449

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-diskperf-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-diskperf-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 28 00:20:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:20:04 -0500
Subject: rpms/xfce4-diskperf-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601280020.k0S0K6tH009481@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9449/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-diskperf-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 28 00:20:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:20:59 -0500
Subject: rpms/xfce4-diskperf-plugin import.log,1.1,1.2
Message-ID: <200601280021.k0S0LVad009551@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517

Modified Files:
	import.log 
Log Message:
auto-import xfce4-diskperf-plugin-1.5-4.fc4 on branch devel from xfce4-diskperf-plugin-1.5-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Jan 2006 00:19:58 -0000	1.1
+++ import.log	28 Jan 2006 00:20:58 -0000	1.2
@@ -0,0 +1 @@
+xfce4-diskperf-plugin-1_5-4_fc4:HEAD:xfce4-diskperf-plugin-1.5-4.fc4.src.rpm:1138407650



From fedora-extras-commits at redhat.com  Sat Jan 28 00:21:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:21:04 -0500
Subject: rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601280021.k0S0LbZ7009555@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-diskperf-plugin.spec 
Log Message:
auto-import xfce4-diskperf-plugin-1.5-4.fc4 on branch devel from xfce4-diskperf-plugin-1.5-4.fc4.src.rpm


--- NEW FILE xfce4-diskperf-plugin.spec ---
Name:		xfce4-diskperf-plugin
Version:	1.5
Release:	4%{?dist}
Summary:	Disk performance plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
The DiskPerf plugin displays disk/partition performance (bytes transfered per
second) based on data provided by the kernel.

%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 -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2006 00:20:03 -0000	1.1
+++ .cvsignore	28 Jan 2006 00:21:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-diskperf-plugin-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2006 00:20:03 -0000	1.1
+++ sources	28 Jan 2006 00:21:04 -0000	1.2
@@ -0,0 +1 @@
+cb1b2637166b8a4355b3df85e593640f  xfce4-diskperf-plugin-1.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 00:29:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 19:29:15 -0500
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.5,
	1.6 perl-Config-Tiny.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200601280029.k0S0Tlhm009647@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9626

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Update to 2.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Dec 2005 16:25:37 -0000	1.5
+++ .cvsignore	28 Jan 2006 00:29:14 -0000	1.6
@@ -1 +1 @@
-Config-Tiny-2.03.tar.gz
+Config-Tiny-2.04.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Config-Tiny.spec	30 Dec 2005 16:25:37 -0000	1.9
+++ perl-Config-Tiny.spec	28 Jan 2006 00:29:14 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.03
+Version:        2.04
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.04-1
+- Updated to 2.04.
+
 * Fri Dec 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.03-1
 - Updated to 2.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Dec 2005 16:25:37 -0000	1.5
+++ sources	28 Jan 2006 00:29:14 -0000	1.6
@@ -1 +1 @@
-14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz
+d14e3691a3fc357daa7ebe3af018c6b4  Config-Tiny-2.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 00:47:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 19:47:06 -0500
Subject: rpms/perl-WWW-Mechanize/FC-3 .cvsignore, 1.3,
	1.4 perl-WWW-Mechanize.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601280047.k0S0lcI5009946@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-WWW-Mechanize/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/FC-3

Modified Files:
	.cvsignore perl-WWW-Mechanize.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2005 19:17:50 -0000	1.3
+++ .cvsignore	28 Jan 2006 00:47:06 -0000	1.4
@@ -1 +1 @@
-WWW-Mechanize-1.14.tar.gz
+WWW-Mechanize-1.16.tar.gz


Index: perl-WWW-Mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-3/perl-WWW-Mechanize.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-WWW-Mechanize.spec	31 Aug 2005 19:46:21 -0000	1.4
+++ perl-WWW-Mechanize.spec	28 Jan 2006 00:47:06 -0000	1.5
@@ -3,8 +3,8 @@
 #  --with livetests          enable live tests
 #
 Name:           perl-WWW-Mechanize
-Version:        1.14
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Automates web page form & link interaction
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Nov 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Wed Aug 31 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-2
 - Added Test::LongString to the live tests build requirements.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2005 19:17:50 -0000	1.3
+++ sources	28 Jan 2006 00:47:06 -0000	1.4
@@ -1 +1 @@
-47e8b334967da901899672cfcf279f14  WWW-Mechanize-1.14.tar.gz
+1fda15f7c031105cd0e2b9bbdafb647f  WWW-Mechanize-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 00:47:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 19:47:12 -0500
Subject: rpms/perl-WWW-Mechanize/FC-4 .cvsignore, 1.3,
	1.4 perl-WWW-Mechanize.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601280047.k0S0liLb009951@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-WWW-Mechanize/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/FC-4

Modified Files:
	.cvsignore perl-WWW-Mechanize.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2005 19:17:51 -0000	1.3
+++ .cvsignore	28 Jan 2006 00:47:12 -0000	1.4
@@ -1 +1 @@
-WWW-Mechanize-1.14.tar.gz
+WWW-Mechanize-1.16.tar.gz


Index: perl-WWW-Mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-4/perl-WWW-Mechanize.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-WWW-Mechanize.spec	31 Aug 2005 19:46:22 -0000	1.4
+++ perl-WWW-Mechanize.spec	28 Jan 2006 00:47:12 -0000	1.5
@@ -3,8 +3,8 @@
 #  --with livetests          enable live tests
 #
 Name:           perl-WWW-Mechanize
-Version:        1.14
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Automates web page form & link interaction
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Nov 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Wed Aug 31 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-2
 - Added Test::LongString to the live tests build requirements.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2005 19:17:51 -0000	1.3
+++ sources	28 Jan 2006 00:47:12 -0000	1.4
@@ -1 +1 @@
-47e8b334967da901899672cfcf279f14  WWW-Mechanize-1.14.tar.gz
+1fda15f7c031105cd0e2b9bbdafb647f  WWW-Mechanize-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 01:00:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 20:00:14 -0500
Subject: rpms/perl-XML-Simple/devel .cvsignore, 1.4, NONE Makefile, 1.2,
	NONE perl-XML-Simple.spec, 1.7, NONE sources, 1.4, NONE
Message-ID: <200601280100.k0S10GOD010215@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-XML-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10203

Removed Files:
	.cvsignore Makefile perl-XML-Simple.spec sources 
Log Message:
perl-XML-Simple is a FC-5 core package


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-XML-Simple.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 28 01:27:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 20:27:35 -0500
Subject: owners owners.list,1.568,1.569
Message-ID: <200601280128.k0S1S7tb012154@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12135

Modified Files:
	owners.list 
Log Message:
add xfce4-diskperf-plugin & xfce4-quicklauncher-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- owners.list	26 Jan 2006 22:33:39 -0000	1.568
+++ owners.list	28 Jan 2006 01:27:35 -0000	1.569
@@ -1327,6 +1327,7 @@
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1338,6 +1339,7 @@
 Fedora Extras|xfce4-netload-plugin|Network-load monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-quicklauncher-plugin|Quicklauncher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 28 02:07:57 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 21:07:57 -0500
Subject: rpms/perl-Net-SSLeay/devel
	perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch, 
	NONE, 1.1 perl-Net-SSLeay.spec, 1.6, 1.7
Message-ID: <200601280208.k0S28T1J014028@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Net-SSLeay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13993

Modified Files:
	perl-Net-SSLeay.spec 
Added Files:
	perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch 
Log Message:
- CVE-2005-0106: patch from Mandriva
  http://wwwnew.mandriva.com/security/advisories?name=MDKSA-2006:023
- Other references:
  http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-0106
  http://www.ubuntu.com/usn/usn-113-1


perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch:

--- NEW FILE perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch ---
--- Net_SSLeay.pm-1.25/SSLeay.pm.cve-2005-0106	2006-01-25 12:37:11.540102265 -0700
+++ Net_SSLeay.pm-1.25/SSLeay.pm	2006-01-25 12:38:16.994260984 -0700
@@ -1853,8 +1853,8 @@
     my ($rn_seed_file, $seed, $egd_path) = @_;
     my $rnsf = defined($rn_seed_file) && -r $rn_seed_file;
 
+    $egd_path = '';
     $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'};
-    $egd_path = '/tmp/entropy'   unless $egd_path;
     
     RAND_seed(rand() + $$);  # Stir it with time and pid
     
@@ -1865,7 +1865,7 @@
     RAND_load_file($rn_seed_file, -s _) if $rnsf;
     RAND_seed($seed) if $seed;
     RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED};
-    RAND_egd($egd_path) if -S $egd_path;
+    RAND_egd($egd_path) if -e $egd_path && -S $egd_path;
     RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8)
 	if -r $Net::SSLeay::random_device;
 }


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-SSLeay.spec	15 Jan 2006 12:25:16 -0000	1.6
+++ perl-Net-SSLeay.spec	28 Jan 2006 02:07:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSLeay
 Version:        1.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries
@@ -8,11 +8,12 @@
 URL:            http://search.cpan.org/dist/Net_SSLeay.pm/
 Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Net_SSLeay.pm-%{version}.tar.gz
 Patch0:         %{name}-test14.patch
+Patch1:          perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl
 BuildRequires:  openssl-devel
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Provides:       perl-Net_SSLeay = %{version}-%{release}
 
 %description
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n Net_SSLeay.pm-%{version}
 %patch0 -p0
+%patch1 -p1
 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle
 chmod -c 644 examples/*
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl
@@ -65,6 +67,10 @@
 
 
 %changelog
+* Fri Jan 27 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.30-2
+- CVE-2005-0106: patch from Mandriva
+  http://wwwnew.mandriva.com/security/advisories?name=MDKSA-2006:023
+
 * Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.30-1
 - 1.30.
 - Optionally run the test suite during build with "--with tests".



From fedora-extras-commits at redhat.com  Sat Jan 28 04:39:51 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 23:39:51 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.2, 1.3
Message-ID: <200601280440.k0S4eOTu018248@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18229

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
add libXt-devel for modular X, replace libX11-devel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-modemlights-plugin.spec	30 Dec 2005 13:45:26 -0000	1.2
+++ xfce4-modemlights-plugin.spec	28 Jan 2006 04:39:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	libX11-devel
+BuildRequires:	libXt-devel
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -39,6 +39,10 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Sat Jan 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-5
+- Add libXt-devel BuildReqs.
+- Drop libX11-devel.
+
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-4
 - Add libX11-devel BuildReqs for modular X.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 04:41:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 23:41:23 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.3, 1.4
Message-ID: <200601280441.k0S4ftYf018294@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18277

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
fix date in changelog


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-modemlights-plugin.spec	28 Jan 2006 04:39:51 -0000	1.3
+++ xfce4-modemlights-plugin.spec	28 Jan 2006 04:41:23 -0000	1.4
@@ -39,7 +39,7 @@
 %{_datadir}/xfce4/*
 
 %changelog
-* Sat Jan 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-5
+* Sat Jan 28 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-5
 - Add libXt-devel BuildReqs.
 - Drop libX11-devel.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 07:46:47 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Sat, 28 Jan 2006 02:46:47 -0500
Subject: rpms/irssi/devel irssi.spec,1.12,1.13
Message-ID: <200601280747.k0S7lJSg023987@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23970

Modified Files:
	irssi.spec 
Log Message:
irssi/devel: disabled gc support..


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- irssi.spec	21 Dec 2005 08:09:33 -0000	1.12
+++ irssi.spec	28 Jan 2006 07:46:46 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
@@ -11,7 +11,8 @@
 Source0:	http://irssi.org/files/irssi-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
-BuildRequires:	pkgconfig gc-devel glib2-devel
+BuildRequires:	pkgconfig glib2-devel
+# BuildRequires:	gc-devel 
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -41,7 +42,8 @@
 	--with-proxy			\
 	--with-bot			\
 	--with-perl=module		\
-	--with-perl-lib=vendor --with-gc
+	--with-perl-lib=vendor 
+# --with-gc
 make %{?_smp_mflags}
 
 
@@ -81,6 +83,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-2perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)?dist}
+- Disabled gc support
+
 * Sun Dec 11 2005 Dams <anvil[AT]livna.org> - 0.8.10-1
 - Updated to final 0.8.10
 



From fedora-extras-commits at redhat.com  Sat Jan 28 11:44:58 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 28 Jan 2006 06:44:58 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.11,1.12
Message-ID: <200601281145.k0SBjUbb032202@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32183

Modified Files:
	autotrace.spec 
Log Message:
* Sat Jan 28 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-11
- rebuild




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- autotrace.spec	17 Jan 2006 12:26:49 -0000	1.11
+++ autotrace.spec	28 Jan 2006 11:44:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-11
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-10
 - add BuildRequires on freetype-devel
 



From fedora-extras-commits at redhat.com  Sat Jan 28 12:50:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Jan 2006 07:50:41 -0500
Subject: rpms/lirc-kmod/devel kmodtool,1.1,1.2 lirc-kmod.spec,1.1,1.2
Message-ID: <200601281251.k0SCpD7q001895@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1861

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool	26 Jan 2006 22:35:23 -0000	1.1
+++ kmodtool	28 Jan 2006 12:50:41 -0000	1.2
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.3"
+myver="0.10.4"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
 kmod_name=
 kver=
@@ -59,13 +59,17 @@
 {
     local variant="${1}"
     local dashvariant="${variant:+-${variant}}"
+    case "$verrel" in
+        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
+        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
+    esac
     cat <<EOF
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
 Provides:         kernel-module = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{version}-%{release}
-Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
+Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-kmod.spec	26 Jan 2006 22:35:23 -0000	1.1
+++ lirc-kmod.spec	28 Jan 2006 12:50:41 -0000	1.2
@@ -11,7 +11,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        1.%(echo %{kverrel} | tr - _)
+Release:        2.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
+- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.
+
 * Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-1
 - 0.8.0.
 - Hopefully fix lirc_{it87,serial,sir} on PPC, thanks to upstream.



From fedora-extras-commits at redhat.com  Sat Jan 28 12:51:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Jan 2006 07:51:09 -0500
Subject: rpms/thinkpad-kmod/devel kmodtool, 1.1, 1.2 thinkpad-kmod.spec, 1.1,
	1.2
Message-ID: <200601281251.k0SCpf9O001905@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1882

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-10
- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool	26 Jan 2006 22:21:45 -0000	1.1
+++ kmodtool	28 Jan 2006 12:51:08 -0000	1.2
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.3"
+myver="0.10.4"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
 kmod_name=
 kver=
@@ -59,13 +59,17 @@
 {
     local variant="${1}"
     local dashvariant="${variant:+-${variant}}"
+    case "$verrel" in
+        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
+        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
+    esac
     cat <<EOF
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
 Provides:         kernel-module = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{version}-%{release}
-Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
+Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkpad-kmod.spec	26 Jan 2006 22:21:45 -0000	1.1
+++ thinkpad-kmod.spec	28 Jan 2006 12:51:08 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.8
-Release:        9.%(echo %{kverrel} | tr - _)
+Release:        10.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-10
+- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.
+
 * Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-9
 - Remove "up" == "" support, related cleanups.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 13:37:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 08:37:03 -0500
Subject: rpms/plt-scheme/FC-4 .cvsignore, 1.5, 1.6 plt-scheme.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200601281337.k0SDbZXT003877@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3856

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2005 21:21:34 -0000	1.5
+++ .cvsignore	28 Jan 2006 13:37:03 -0000	1.6
@@ -1 +1 @@
-plt-300-src-unix.tgz
+plt-301-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plt-scheme.spec	19 Dec 2005 21:21:34 -0000	1.13
+++ plt-scheme.spec	28 Jan 2006 13:37:03 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        300
+Version:        301
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/301/plt/plt-301-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 301-1
+- new version 301
+
 * Mon Dec 19 2005 Gerard Milmeister <gemi at bluewin.ch> - 300-1
 - New Version 300
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2005 21:21:34 -0000	1.5
+++ sources	28 Jan 2006 13:37:03 -0000	1.6
@@ -1 +1 @@
-0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz
+61f43172460bb297edcf3e0c3599a5e2  plt-301-src-unix.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 13:39:30 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 08:39:30 -0500
Subject: rpms/plt-scheme/FC-3 .cvsignore, 1.4, 1.5 plt-scheme.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200601281340.k0SDe3V6003923@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3885/FC-3

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 21:28:35 -0000	1.4
+++ .cvsignore	28 Jan 2006 13:39:30 -0000	1.5
@@ -1 +1 @@
-plt-300-src-unix.tgz
+plt-301-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plt-scheme.spec	19 Dec 2005 21:28:35 -0000	1.8
+++ plt-scheme.spec	28 Jan 2006 13:39:30 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        300
+Version:        301
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/301/plt/plt-301-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,7 @@
 drawing toolbox for drawing to windows, bitmaps, and printer devices;
 and an editor toolbox for creating multimedia editors.
 
+
 %prep
 %setup -q -n plt
 %ifarch x86_64
@@ -56,6 +57,7 @@
 %configure --enable-gl --enable-xrender --enable-xft
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt
@@ -81,6 +83,7 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+
 # get-base.ss causes error during install
 find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
@@ -127,6 +130,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 301-1
+- new version 301
+
 * Mon Dec 19 2005 Gerard Milmeister <gemi at bluewin.ch> - 300-1
 - New Version 300
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2005 21:28:35 -0000	1.5
+++ sources	28 Jan 2006 13:39:30 -0000	1.6
@@ -1 +1 @@
-0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz
+61f43172460bb297edcf3e0c3599a5e2  plt-301-src-unix.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 13:39:36 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 08:39:36 -0500
Subject: rpms/plt-scheme/devel .cvsignore, 1.4, 1.5 plt-scheme.spec, 1.21,
	1.22 sources, 1.5, 1.6
Message-ID: <200601281340.k0SDe8T2003930@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3885/devel

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 21:28:40 -0000	1.4
+++ .cvsignore	28 Jan 2006 13:39:36 -0000	1.5
@@ -1 +1 @@
-plt-300-src-unix.tgz
+plt-301-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plt-scheme.spec	2 Jan 2006 23:14:23 -0000	1.21
+++ plt-scheme.spec	28 Jan 2006 13:39:36 -0000	1.22
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        300
-Release:        3%{?dist}
+Version:        301
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/301/plt/plt-301-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +96,7 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+
 # get-base.ss causes error during install
 find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
@@ -142,6 +143,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 301-1
+- new version 301
+
 * Wed Dec 21 2005 Gerard Milmeister <gemi at bluewin.ch> - 300-2
 - xft patch no longer necessary
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2005 21:28:40 -0000	1.5
+++ sources	28 Jan 2006 13:39:36 -0000	1.6
@@ -1 +1 @@
-0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz
+61f43172460bb297edcf3e0c3599a5e2  plt-301-src-unix.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 13:44:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sat, 28 Jan 2006 08:44:15 -0500
Subject: owners owners.list,1.569,1.570
Message-ID: <200601281344.k0SDimtu004074@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4057

Modified Files:
	owners.list 
Log Message:
Taking orphaned bluefish package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- owners.list	28 Jan 2006 01:27:35 -0000	1.569
+++ owners.list	28 Jan 2006 13:44:15 -0000	1.570
@@ -75,7 +75,7 @@
 Fedora Extras|blender|3D modeling, animation, rendering and post-production|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|bluefish|A GTK2 web development application for experienced users|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|bluefish|A GTK2 web development application for experienced users|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 28 14:52:56 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Jan 2006 09:52:56 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.13, 
	1.14
Message-ID: <200601281453.k0SErStc006212@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6193

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-6
- rebuild against new e-d-s.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- contact-lookup-applet.spec	17 Jan 2006 15:25:22 -0000	1.13
+++ contact-lookup-applet.spec	28 Jan 2006 14:52:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-6
+- rebuild against new e-d-s.
+
 * Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-5
 - Rebuild for evolution-data-server dep.
 - Bump.



From fedora-extras-commits at redhat.com  Sat Jan 28 14:55:04 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Jan 2006 09:55:04 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.14, 
	1.15
Message-ID: <200601281455.k0SEtabX006298@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6276

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-7
- Bump.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- contact-lookup-applet.spec	28 Jan 2006 14:52:55 -0000	1.14
+++ contact-lookup-applet.spec	28 Jan 2006 14:55:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-7
+- Bump.
+
 * Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-6
 - rebuild against new e-d-s.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 15:05:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 28 Jan 2006 10:05:39 -0500
Subject: rpms/grads/FC-3 grads.spec,1.6,1.7
Message-ID: <200601281506.k0SF6FsD008129@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8111

Modified Files:
	grads.spec 
Log Message:
* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
- add BR on readline-devel close #178285



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grads.spec	23 Dec 2005 09:37:04 -0000	1.6
+++ grads.spec	28 Jan 2006 15:05:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.3
+Release:        6%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -30,12 +30,14 @@
 ExcludeArch:    x86_64
 
 # no hdf on ppc
+%ifnarch ppc
+BuildRequires:  hdf-devel 
+%endif
 BuildRequires:  udunits-devel netcdf-devel 
-#BuildRequires:  opendap-devel
+BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-#Requires:       
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -68,7 +70,7 @@
 
 %build
 ./bootstrap
-# pass the -L and -I flags for hdf even though there is no hdf
+# pass the -L and -I flags for hdf on ppc even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -90,6 +92,9 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
+%ifnarch ppc
+%{_bindir}/gradshdf
+%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -103,7 +108,10 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5.3
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+- add BR on readline-devel close #178285
+
+* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-4



From fedora-extras-commits at redhat.com  Sat Jan 28 15:17:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 28 Jan 2006 10:17:40 -0500
Subject: rpms/grads/FC-3 grads.spec,1.7,1.8
Message-ID: <200601281518.k0SFID88008264@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8247

Modified Files:
	grads.spec 
Log Message:
no hdf on FC-3



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grads.spec	28 Jan 2006 15:05:39 -0000	1.7
+++ grads.spec	28 Jan 2006 15:17:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        6%{?dist}
+Release:        6%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -29,10 +29,7 @@
 # configure fails on x86_64
 ExcludeArch:    x86_64
 
-# no hdf on ppc
-%ifnarch ppc
-BuildRequires:  hdf-devel 
-%endif
+# no hdf on FC-3
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
@@ -92,9 +89,6 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
-%ifnarch ppc
-%{_bindir}/gradshdf
-%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -108,7 +102,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6.1
 - add BR on readline-devel close #178285
 
 * Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5



From fedora-extras-commits at redhat.com  Sat Jan 28 18:45:44 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 28 Jan 2006 13:45:44 -0500
Subject: rpms/exo/devel exo.spec,1.10,1.11
Message-ID: <200601281846.k0SIkGGA014335@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14315

Modified Files:
	exo.spec 
Log Message:
Add imake and libXt-devel to BR to allow detection of modular xorg



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- exo.spec	17 Aug 2005 17:00:03 -0000	1.10
+++ exo.spec	28 Jan 2006 18:45:43 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPL
 URL: http://libexo.os-cillation.com/
 Source0: http://download.berlios.de/xfce-goodies/exo-0.3.0.tar.bz2
@@ -18,6 +18,8 @@
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
 BuildRequires: python-devel
+BuildRequires: imake
+BuildRequires: libXt-devel
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -71,6 +73,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Jan 28 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.0-11.fc5
+- Add imake and libXt-devel to BR to allow detection of modular xorg
+
 * Wed Aug 17 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-10.fc5
 - Rebuild for new libcairo and libpixman
 



From fedora-extras-commits at redhat.com  Sat Jan 28 19:35:07 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 14:35:07 -0500
Subject: rpms/pl/FC-3 .cvsignore,1.4,1.5 pl.spec,1.14,1.15 sources,1.4,1.5
Message-ID: <200601281935.k0SJZed4016418@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16363/FC-3

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2006 22:25:57 -0000	1.4
+++ .cvsignore	28 Jan 2006 19:35:07 -0000	1.5
@@ -1,3 +1,3 @@
+pl-5.6.3.tar.gz
 HTMLmanual.tar.gz
-pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/pl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pl.spec	2 Jan 2006 22:25:57 -0000	1.14
+++ pl.spec	28 Jan 2006 19:35:07 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.0
+Version:	5.6.3
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -28,6 +28,7 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
@@ -39,6 +40,7 @@
    tar zxf %{SOURCE2}
 )
 
+
 %build
 %configure
 make COFLAGS="$RPM_OPT_FLAGS"
@@ -48,6 +50,7 @@
 make COFLAGS="$RPM_OPT_FLAGS"
 cd ..
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
@@ -64,9 +67,11 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
@@ -76,7 +81,11 @@
 %{_libdir}/pl*
 %{_bindir}/*
 
+
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.3-1
+- new version 5.6.3
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
 - new version 5.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 22:25:57 -0000	1.4
+++ sources	28 Jan 2006 19:35:07 -0000	1.5
@@ -1,3 +1,3 @@
+6b83cbe448a6d2b0655a426d2e9cdcad  pl-5.6.3.tar.gz
 6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
-ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 19:35:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 14:35:13 -0500
Subject: rpms/pl/FC-4 .cvsignore,1.5,1.6 pl.spec,1.17,1.18 sources,1.5,1.6
Message-ID: <200601281935.k0SJZjvY016423@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16363/FC-4

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:10:54 -0000	1.5
+++ .cvsignore	28 Jan 2006 19:35:13 -0000	1.6
@@ -1,3 +1,3 @@
+pl-5.6.3.tar.gz
 HTMLmanual.tar.gz
-pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pl.spec	2 Jan 2006 22:10:54 -0000	1.17
+++ pl.spec	28 Jan 2006 19:35:13 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.0
+Version:	5.6.3
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.3-1
+- new version 5.6.3
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
 - new version 5.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 22:10:54 -0000	1.5
+++ sources	28 Jan 2006 19:35:13 -0000	1.6
@@ -1,3 +1,3 @@
+6b83cbe448a6d2b0655a426d2e9cdcad  pl-5.6.3.tar.gz
 6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
-ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 19:35:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 14:35:19 -0500
Subject: rpms/pl/devel .cvsignore,1.5,1.6 pl.spec,1.20,1.21 sources,1.5,1.6
Message-ID: <200601281935.k0SJZpAB016428@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16363/devel

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:29:20 -0000	1.5
+++ .cvsignore	28 Jan 2006 19:35:19 -0000	1.6
@@ -1,3 +1,3 @@
+pl-5.6.3.tar.gz
 HTMLmanual.tar.gz
-pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pl.spec	2 Jan 2006 22:53:37 -0000	1.20
+++ pl.spec	28 Jan 2006 19:35:19 -0000	1.21
@@ -1,13 +1,13 @@
 Name:		pl
-Version:	5.6.0
-Release:	2%{?dist}
+Version:	5.6.3
+Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -38,6 +38,7 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
@@ -49,6 +50,7 @@
    tar zxf %{SOURCE2}
 )
 
+
 %build
 %configure
 make COFLAGS="$RPM_OPT_FLAGS"
@@ -58,6 +60,7 @@
 make COFLAGS="$RPM_OPT_FLAGS"
 cd ..
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
@@ -74,9 +77,11 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
@@ -86,7 +91,11 @@
 %{_libdir}/pl*
 %{_bindir}/*
 
+
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.3-1
+- new version 5.6.3
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
 - new version 5.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 22:29:20 -0000	1.5
+++ sources	28 Jan 2006 19:35:19 -0000	1.6
@@ -1,3 +1,3 @@
+6b83cbe448a6d2b0655a426d2e9cdcad  pl-5.6.3.tar.gz
 6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
-ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 20:10:50 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Sat, 28 Jan 2006 15:10:50 -0500
Subject: rpms/irssi/devel irssi.spec,1.13,1.14
Message-ID: <200601282011.k0SKBMUa018401@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18384

Modified Files:
	irssi.spec 
Log Message:
devel/irssi: emacs rpm-mode borked changelog in previous commit


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- irssi.spec	28 Jan 2006 07:46:46 -0000	1.13
+++ irssi.spec	28 Jan 2006 20:10:50 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
@@ -83,7 +83,10 @@
 %{_includedir}/irssi
 
 %changelog
-* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-2perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)?dist}
+* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-3
+- Fixed changelog -_-
+
+* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-2
 - Disabled gc support
 
 * Sun Dec 11 2005 Dams <anvil[AT]livna.org> - 0.8.10-1



From fedora-extras-commits at redhat.com  Sat Jan 28 20:48:42 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 15:48:42 -0500
Subject: rpms/xmldiff/FC-4 xmldiff.spec,1.3,1.4
Message-ID: <200601282049.k0SKnEcT018671@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18639/FC-4

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch: x86_64 (#177083)


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmldiff.spec	25 Jan 2006 06:19:19 -0000	1.3
+++ xmldiff.spec	28 Jan 2006 20:48:42 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,6 +24,7 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
+ExcludeArch:	x86_64  # see bug #177083
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
+- ExcludeArch: x86_64 (#177083)
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
 - Prevent temp file logjam (#177800)
 



From fedora-extras-commits at redhat.com  Sat Jan 28 20:48:48 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 15:48:48 -0500
Subject: rpms/xmldiff/devel xmldiff.spec,1.3,1.4
Message-ID: <200601282049.k0SKnKex018674@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18639/devel

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch: x86_64 (#177083)


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmldiff.spec	25 Jan 2006 06:20:05 -0000	1.3
+++ xmldiff.spec	28 Jan 2006 20:48:47 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,6 +24,7 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
+ExcludeArch:	x86_64  # see bug #177083
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
+- ExcludeArch: x86_64 (#177083)
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
 - Prevent temp file logjam (#177800)
 



From fedora-extras-commits at redhat.com  Sat Jan 28 21:35:57 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 28 Jan 2006 16:35:57 -0500
Subject: rpms/azureus/devel azureus-no-shared-plugins.patch, NONE,
	1.1 azureus-no-shared-plugins2.patch, NONE, 1.1 azureus.spec,
	1.9, 1.10
Message-ID: <200601282136.k0SLaTx8020722@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20695

Modified Files:
	azureus.spec 
Added Files:
	azureus-no-shared-plugins.patch 
	azureus-no-shared-plugins2.patch 
Log Message:
Rev to -21.  Patches to remove ability to install "shared" plugins.


azureus-no-shared-plugins.patch:

--- NEW FILE azureus-no-shared-plugins.patch ---
--- org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java~	2005-11-22 14:28:02.000000000 -0500
+++ org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java	2006-01-27 23:12:16.000000000 -0500
@@ -237,21 +237,15 @@
   	}
   
 	public boolean 
-	isNextEnabled() 
+	isFinishEnabled() 
 	{
 		return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
 	}
 	
-	public boolean 
-	isFinishEnabled() 
-	{
-	   return false ;
+	public IWizardPanel getFinishPanel() {
+	    return new IPWFinishPanel(wizard,this);
 	}
 	
-  public IWizardPanel getNextPanel() {
-    return new IPWInstallModePanel(wizard,this);
-  }
-	
   public void updateList() {
     ArrayList list = new ArrayList();
     TableItem[] items = pluginList.getItems();
@@ -261,7 +255,7 @@
       }
     }
     ((InstallPluginWizard)wizard).setPluginList(list);
-    ((InstallPluginWizard)wizard).setNextEnabled( isNextEnabled() );
+    ((InstallPluginWizard)wizard).setFinishEnabled( isFinishEnabled() );
     
   }
 }

azureus-no-shared-plugins2.patch:

--- NEW FILE azureus-no-shared-plugins2.patch ---
--- org/gudy/azureus2/ui/swt/views/ConfigView.java~	2005-11-20 14:43:58.000000000 -0500
+++ org/gudy/azureus2/ui/swt/views/ConfigView.java	2006-01-28 13:17:26.000000000 -0500
@@ -539,37 +539,6 @@
       }
     });
 
-    label = new Label(infoGroup, SWT.WRAP);
-    label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    Messages.setLanguageText(label, "ConfigView.pluginlist.whereToPutOr");
-
-    label = new Label(infoGroup, SWT.WRAP);
-    gridData = new GridData(GridData.FILL_HORIZONTAL);
-    gridData.horizontalIndent = 10;
-    label.setLayoutData(gridData);
-    label.setText(sAppPluginDir);
-    label.setForeground(Colors.blue);
-    label.setCursor(Cursors.handCursor);
-    
- 
-    final String _sAppPluginDir = sAppPluginDir;
-    
-    //TODO : Fix it for windows
-    label.addMouseListener(new MouseAdapter() {
-      public void mouseUp(MouseEvent arg0) {
-        if(_sAppPluginDir.endsWith("/plugins/") || _sAppPluginDir.endsWith("\\plugins\\")) {
-          File f = new File(_sAppPluginDir);
-          if(f.exists() && f.isDirectory()) {
-            Program.launch(_sAppPluginDir);
-          } else {
-            String azureusDir = _sAppPluginDir.substring(0,_sAppPluginDir.length() - 9);
-            System.out.println(azureusDir);
-            Program.launch(azureusDir);
-          }
-        }
-      }
-    });
-    
     List pluginIFs = Arrays.asList( azureus_core.getPluginManager().getPlugins());
     
     Collections.sort( 
@@ -609,10 +578,6 @@
       
       	user_plugin = true;
       	
-      }else if (sDirName.length() > sAppPluginDir.length() && 
-            sDirName.substring(0, sAppPluginDir.length()).equals(sAppPluginDir)){
-      	
-      	sDirName = sDirName.substring(sAppPluginDir.length());
       }
       
       // Blank means it's internal


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azureus.spec	27 Jan 2006 15:02:12 -0000	1.9
+++ azureus.spec	28 Jan 2006 21:35:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -30,6 +30,8 @@
 Patch10:        azureus-cache-size.patch
 Patch11:        azureus-remove-manifest-classpath.patch
 Patch12:        azureus-themed.patch
+Patch13:        azureus-no-shared-plugins.patch
+Patch14:        azureus-no-shared-plugins2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
@@ -63,6 +65,8 @@
 %patch10 -p0
 %patch11 -p0
 %patch12 -p0
+%patch13 -p0
+%patch14 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
@@ -146,6 +150,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-21
+- Add azureus-no-shared-plugins.patch.
+- Add azureus-no-shared-plugins2.patch.
+
 * Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-20
 - Remove junit reference from startup script.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 21:44:30 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 28 Jan 2006 16:44:30 -0500
Subject: rpms/scmxx/devel scmxx.spec, 1.2, 1.3 sources, 1.2, 1.3 .cvsignore, 
	1.2, 1.3
Message-ID: <200601282145.k0SLj28E020852@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/scmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20829

Modified Files:
	scmxx.spec sources .cvsignore 
Log Message:
Updated to 0.8.2



Index: scmxx.spec
===================================================================
RCS file: /cvs/extras/rpms/scmxx/devel/scmxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scmxx.spec	26 Jul 2005 12:13:04 -0000	1.2
+++ scmxx.spec	28 Jan 2006 21:44:30 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Exchange data with Siemens mobile phones
 Name: scmxx
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Group: Applications/Communications
 License: GPL
@@ -35,7 +35,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS LICENSE CHANGELOG README
+%doc AUTHORS BUGS LICENSE CHANGELOG README docs/gsmcharset.txt
 %{_bindir}/scmxx
 %{_mandir}/man1/scmxx.1.gz
 %lang(de) %{_mandir}/de/man1/scmxx.1.gz
@@ -43,5 +43,9 @@
 %lang(ru) %{_mandir}/ru/man1/scmxx.1.gz
 
 %changelog
+* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
+- Updated to 0.8.2
+
 * Tue Jul 14 2005 Andreas Thienemann <andreas at bawue.net> 0.8.0-1
 - Initial specfile
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scmxx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2005 12:09:45 -0000	1.2
+++ sources	28 Jan 2006 21:44:30 -0000	1.3
@@ -1 +1 @@
-21de1f98864e296da2cb6b424112361c  scmxx-0.8.0.tar.bz2
+a9cf309ae87a6ecde49cfcc8c456cec7  scmxx-0.8.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scmxx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2005 12:09:45 -0000	1.2
+++ .cvsignore	28 Jan 2006 21:44:30 -0000	1.3
@@ -1 +1 @@
-scmxx-0.8.0.tar.bz2
+scmxx-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:05:44 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 28 Jan 2006 17:05:44 -0500
Subject: rpms/scmxx/FC-4 .cvsignore, 1.2, 1.3 scmxx.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601282206.k0SM6ZdJ022751@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/scmxx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22729

Modified Files:
	.cvsignore scmxx.spec sources 
Log Message:
* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
- Updated to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2005 12:09:45 -0000	1.2
+++ .cvsignore	28 Jan 2006 22:05:43 -0000	1.3
@@ -1 +1 @@
-scmxx-0.8.0.tar.bz2
+scmxx-0.8.2.tar.bz2


Index: scmxx.spec
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-4/scmxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scmxx.spec	26 Jul 2005 12:13:04 -0000	1.2
+++ scmxx.spec	28 Jan 2006 22:05:43 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Exchange data with Siemens mobile phones
 Name: scmxx
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Group: Applications/Communications
 License: GPL
@@ -35,7 +35,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS LICENSE CHANGELOG README
+%doc AUTHORS BUGS LICENSE CHANGELOG README docs/gsmcharset.txt
 %{_bindir}/scmxx
 %{_mandir}/man1/scmxx.1.gz
 %lang(de) %{_mandir}/de/man1/scmxx.1.gz
@@ -43,5 +43,9 @@
 %lang(ru) %{_mandir}/ru/man1/scmxx.1.gz
 
 %changelog
+* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
+- Updated to 0.8.2
+
 * Tue Jul 14 2005 Andreas Thienemann <andreas at bawue.net> 0.8.0-1
 - Initial specfile
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2005 12:09:45 -0000	1.2
+++ sources	28 Jan 2006 22:05:43 -0000	1.3
@@ -1 +1 @@
-21de1f98864e296da2cb6b424112361c  scmxx-0.8.0.tar.bz2
+a9cf309ae87a6ecde49cfcc8c456cec7  scmxx-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:09:20 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 28 Jan 2006 17:09:20 -0500
Subject: rpms/scmxx/FC-3 .cvsignore, 1.2, 1.3 scmxx.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601282209.k0SM9rMa022823@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/scmxx/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22799

Modified Files:
	.cvsignore scmxx.spec sources 
Log Message:
* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
- Updated to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2005 12:09:45 -0000	1.2
+++ .cvsignore	28 Jan 2006 22:09:20 -0000	1.3
@@ -1 +1 @@
-scmxx-0.8.0.tar.bz2
+scmxx-0.8.2.tar.bz2


Index: scmxx.spec
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-3/scmxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scmxx.spec	26 Jul 2005 12:13:04 -0000	1.2
+++ scmxx.spec	28 Jan 2006 22:09:20 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Exchange data with Siemens mobile phones
 Name: scmxx
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Group: Applications/Communications
 License: GPL
@@ -35,7 +35,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS LICENSE CHANGELOG README
+%doc AUTHORS BUGS LICENSE CHANGELOG README docs/gsmcharset.txt
 %{_bindir}/scmxx
 %{_mandir}/man1/scmxx.1.gz
 %lang(de) %{_mandir}/de/man1/scmxx.1.gz
@@ -43,5 +43,9 @@
 %lang(ru) %{_mandir}/ru/man1/scmxx.1.gz
 
 %changelog
+* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
+- Updated to 0.8.2
+
 * Tue Jul 14 2005 Andreas Thienemann <andreas at bawue.net> 0.8.0-1
 - Initial specfile
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2005 12:09:45 -0000	1.2
+++ sources	28 Jan 2006 22:09:20 -0000	1.3
@@ -1 +1 @@
-21de1f98864e296da2cb6b424112361c  scmxx-0.8.0.tar.bz2
+a9cf309ae87a6ecde49cfcc8c456cec7  scmxx-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:22:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 28 Jan 2006 17:22:45 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.13, 1.14 rxvt-unicode.spec,
	1.15, 1.16 sources, 1.13, 1.14
Message-ID: <200601282223.k0SMNHeg022978@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Jan 2006 09:08:02 -0000	1.13
+++ .cvsignore	28 Jan 2006 22:22:45 -0000	1.14
@@ -1 +1 @@
-rxvt-unicode-7.3a.tar.bz2
+rxvt-unicode-7.4.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rxvt-unicode.spec	27 Jan 2006 09:08:02 -0000	1.15
+++ rxvt-unicode.spec	28 Jan 2006 22:22:45 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.3a
+Version:        7.4
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.4-1
+- version upgrade
+
 * Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.3a-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jan 2006 09:08:02 -0000	1.13
+++ sources	28 Jan 2006 22:22:45 -0000	1.14
@@ -1 +1 @@
-832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2
+553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:22:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 28 Jan 2006 17:22:51 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.13, 1.14 rxvt-unicode.spec,
	1.15, 1.16 sources, 1.13, 1.14
Message-ID: <200601282223.k0SMNN0f022983@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Jan 2006 09:08:10 -0000	1.13
+++ .cvsignore	28 Jan 2006 22:22:51 -0000	1.14
@@ -1 +1 @@
-rxvt-unicode-7.3a.tar.bz2
+rxvt-unicode-7.4.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rxvt-unicode.spec	27 Jan 2006 09:08:10 -0000	1.15
+++ rxvt-unicode.spec	28 Jan 2006 22:22:51 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.3a
+Version:        7.4
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.4-1
+- version upgrade
+
 * Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.3a-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jan 2006 09:08:10 -0000	1.13
+++ sources	28 Jan 2006 22:22:51 -0000	1.14
@@ -1 +1 @@
-832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2
+553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:22:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 28 Jan 2006 17:22:59 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.13, 1.14 rxvt-unicode.spec,
	1.19, 1.20 sources, 1.13, 1.14
Message-ID: <200601282223.k0SMNVMa022988@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Jan 2006 09:08:41 -0000	1.13
+++ .cvsignore	28 Jan 2006 22:22:59 -0000	1.14
@@ -1 +1 @@
-rxvt-unicode-7.3a.tar.bz2
+rxvt-unicode-7.4.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rxvt-unicode.spec	27 Jan 2006 09:08:41 -0000	1.19
+++ rxvt-unicode.spec	28 Jan 2006 22:22:59 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.3a
+Version:        7.4
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.4-1
+- version upgrade
+
 * Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.3a-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jan 2006 09:08:41 -0000	1.13
+++ sources	28 Jan 2006 22:22:59 -0000	1.14
@@ -1 +1 @@
-832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2
+553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:30:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 17:30:19 -0500
Subject: rpms/xmldiff/FC-4 xmldiff.spec,1.4,1.5
Message-ID: <200601282230.k0SMUxa9023168@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23134/FC-4

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch includes spurious values from misplaced comment


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmldiff.spec	28 Jan 2006 20:48:42 -0000	1.4
+++ xmldiff.spec	28 Jan 2006 22:30:19 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,7 +24,8 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
-ExcludeArch:	x86_64  # see bug #177083
+# see bug #177083
+ExcludeArch:	x86_64
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-8
+- ExcludeArch includes spurious values from misplaced comment
+
 * Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
 - ExcludeArch: x86_64 (#177083)
 



From fedora-extras-commits at redhat.com  Sat Jan 28 22:30:36 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 17:30:36 -0500
Subject: rpms/xmldiff/devel xmldiff.spec,1.4,1.5
Message-ID: <200601282231.k0SMV9FD023172@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23134/devel

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch includes spurious values from misplaced comment


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmldiff.spec	28 Jan 2006 20:48:47 -0000	1.4
+++ xmldiff.spec	28 Jan 2006 22:30:36 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,7 +24,8 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
-ExcludeArch:	x86_64  # see bug #177083
+# see bug #177083
+ExcludeArch:	x86_64
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-8
+- ExcludeArch includes spurious values from misplaced comment
+
 * Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
 - ExcludeArch: x86_64 (#177083)
 



From fedora-extras-commits at redhat.com  Sun Jan 29 03:30:59 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:30:59 -0500
Subject: rpms/tclsoap - New directory
Message-ID: <200601290331.k0T3V1mJ032683@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/tclsoap

Log Message:
Directory /cvs/extras/rpms/tclsoap added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:05 -0500
Subject: rpms/tclsoap/devel - New directory
Message-ID: <200601290331.k0T3V7xc032698@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/tclsoap/devel

Log Message:
Directory /cvs/extras/rpms/tclsoap/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:17 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:17 -0500
Subject: rpms/tclsoap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601290331.k0T3VJqE032734@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32722

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclsoap


--- NEW FILE Makefile ---
# Top level Makefile for module tclsoap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:23 -0500
Subject: rpms/tclsoap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601290331.k0T3VP11032754@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32722/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclsoap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:46 -0500
Subject: rpms/tclsoap import.log,1.1,1.2
Message-ID: <200601290332.k0T3WIMw000363@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv325

Modified Files:
	import.log 
Log Message:
auto-import tclsoap-1.6.7-1 on branch devel from tclsoap-1.6.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclsoap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 03:31:17 -0000	1.1
+++ import.log	29 Jan 2006 03:31:45 -0000	1.2
@@ -0,0 +1 @@
+tclsoap-1_6_7-1:HEAD:tclsoap-1.6.7-1.src.rpm:1138505502



From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:51 -0500
Subject: rpms/tclsoap/devel tclsoap.patch, NONE, 1.1 tclsoap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601290332.k0T3WOhC000367@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv325/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclsoap.patch tclsoap.spec 
Log Message:
auto-import tclsoap-1.6.7-1 on branch devel from tclsoap-1.6.7-1.src.rpm

tclsoap.patch:

--- NEW FILE tclsoap.patch ---
diff -Naur --exclude '*.swp' tclsoap1.6.7/Makefile.in tclsoap1.6.7.new/Makefile.in
--- tclsoap1.6.7/Makefile.in	2003-09-06 10:08:46.000000000 -0700
+++ tclsoap1.6.7.new/Makefile.in	2004-11-06 13:07:03.000000000 -0800
@@ -150,7 +150,16 @@
 install-doc: doc
 
 test:
-	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/tests/all.tcl`
+	if test -f pkgIndex.tcl ; then \
+	    cp -f pkgIndex.tcl pkgIndex.tcl.bak ; \
+	fi
+	sed -e "s#\\\$$dir#$(srcdir)/\\\$$dir#" < $(srcdir)/pkgIndex.tcl > pkgIndex.tcl.new
+	mv pkgIndex.tcl.new pkgIndex.tcl
+	TCLLIBPATH=. \
+	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/tests/all.tcl` $(TESTFLAGS)
+	if test -f pkgIndex.tcl.bak ; then \
+	    mv -f pkgIndex.tcl.bak pkgIndex.tcl ; \
+	fi
 
 depend:
 
diff -Naur --exclude '*.swp' tclsoap1.6.7/SOAP.tcl tclsoap1.6.7.new/SOAP.tcl
--- tclsoap1.6.7/SOAP.tcl	2003-09-06 10:08:46.000000000 -0700
+++ tclsoap1.6.7.new/SOAP.tcl	2004-11-06 08:24:09.000000000 -0800
@@ -17,16 +17,19 @@
 catch {package require uri::urn};       # tcllib 1.2
 package require SOAP::Utils;            # TclSOAP
 package require rpcvar;                 # TclSOAP 
+catch {package require xml};            # Needed for dom 3.0
 
 # -------------------------------------------------------------------------
 
 namespace eval ::SOAP {variable domVersion}
 if {[catch {package require SOAP::dom 1.0} ::SOAP::domVersion]} {
-    if { [catch {package require dom 2.0} ::SOAP::domVersion]} {
-        if { [catch {package require dom 1.6} ::SOAP::domVersion]} {
-            error "require dom package greater than 1.6"
-        }
-        package require SOAP::xpath;    # TclSOAP
+    if { [catch {package require dom 3.0} ::SOAP::domVersion]} {
+	if { [catch {package require dom 2.0} ::SOAP::domVersion]} {
+	    if { [catch {package require dom 1.6} ::SOAP::domVersion]} {
+		error "require dom package greater than 1.6"
+	    }
+	    package require SOAP::xpath;    # TclSOAP
+	}
     }
     proc ::SOAP::createDocument {name} {
         set doc [dom::DOMImplementation create]
diff -Naur --exclude '*.swp' tclsoap1.6.7/xpath.tcl tclsoap1.6.7.new/xpath.tcl
--- tclsoap1.6.7/xpath.tcl	2003-09-06 10:08:46.000000000 -0700
+++ tclsoap1.6.7.new/xpath.tcl	2004-11-06 08:34:31.000000000 -0800
@@ -14,9 +14,13 @@
 # for more details.
 # -------------------------------------------------------------------------
 
-if { [catch {package require dom 2.0}] } {
-    if { [catch {package require dom 1.6}] } {
-        error "require dom package greater than 1.6"
+catch {package require xml};            # Needed for dom 3.0
+
+if { [catch {package require dom 3.0}] } {
+    if { [catch {package require dom 2.0}] } {
+        if { [catch {package require dom 1.6}] } {
+            error "require dom package greater than 1.6"
+        }
     }
 }
 


--- NEW FILE tclsoap.spec ---
Summary:  Tcl commands for SOAP remote procedure calls
Name: tclsoap
Version: 1.6.7
Release: 1%{?dist}
License: MIT
URL: http://tclsoap.sourceforge.net/
Group: Development/Libraries
Source0:        http://download.sourceforge.net/tclsoap/TclSOAP-1.6.7.tar.gz
Patch0: tclsoap.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: tcl
Requires: tcl tcldom

%description
Provides support for building clients and servers for the
SOAP remote procedure call protocol from Tcl. SOAP is an 
XML based RPC mechanism which provides cross-platform
cross language compatibility.

%prep
%setup -q -n %{name}%{version}
%patch0 -p1
chmod a-x doc/*

%build
%configure --libdir=%{_datadir}
# Nothing to build.  Don't run 'make'

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/%{name}%{version}
%doc CHANGES LICENSE DESCRIPTION.txt TclSOAP.ANN
%doc doc/*

%changelog
* Sat Dec 10 2005 Wart <wart at kobold.org> - 1.6.7-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclsoap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 03:31:23 -0000	1.1
+++ .cvsignore	29 Jan 2006 03:31:51 -0000	1.2
@@ -0,0 +1 @@
+TclSOAP-1.6.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclsoap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 03:31:23 -0000	1.1
+++ sources	29 Jan 2006 03:31:51 -0000	1.2
@@ -0,0 +1 @@
+6e07a5dad13233851fc9eecd9f7319e1  TclSOAP-1.6.7.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 03:42:52 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:42:52 -0500
Subject: owners owners.list,1.570,1.571
Message-ID: <200601290343.k0T3hOhs000482@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv465

Modified Files:
	owners.list 
Log Message:
Added tclsoap




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- owners.list	28 Jan 2006 13:44:15 -0000	1.570
+++ owners.list	29 Jan 2006 03:42:52 -0000	1.571
@@ -1212,6 +1212,7 @@
 Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 03:57:44 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 28 Jan 2006 22:57:44 -0500
Subject: rpms/foremost/FC-4 .cvsignore, 1.2, 1.3 foremost.spec, 1.1,
	1.2 sources, 1.2, 1.3 foremost-config.patch, 1.1, NONE
Message-ID: <200601290358.k0T3wGYU000558@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/foremost/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv537

Modified Files:
	.cvsignore foremost.spec sources 
Removed Files:
	foremost-config.patch 
Log Message:
* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
- Upgrade to 1.1.
- Rework the config patch as a sed replacement.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/foremost/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2005 19:43:50 -0000	1.2
+++ .cvsignore	29 Jan 2006 03:57:43 -0000	1.3
@@ -1 +1 @@
-foremost-1.0.tar.gz
+foremost-1.1.tar.gz


Index: foremost.spec
===================================================================
RCS file: /cvs/extras/rpms/foremost/FC-4/foremost.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foremost.spec	30 Sep 2005 19:43:50 -0000	1.1
+++ foremost.spec	29 Jan 2006 03:57:43 -0000	1.2
@@ -1,19 +1,16 @@
 Name:           foremost
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Recover files by "carving" them from a raw disk
 
 Group:          Applications/File
 License:        GPL
 URL:            http://foremost.sf.net
-# Upstream isn't versioning their tarballs!  They list the md5sum of their
-# present tarball on the web page so this should make it easier to decide if
-# they've updated without me noticing.
-# MD5Sum:
-# 6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
-Source0:        http://foremost.sourceforge.net/pkg/foremost-1.0.tar.gz
+# Upstream wasn't versioning their tarballs.  Record of the latest md5sum in
+# case that happens again.
+# b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz
+Source0:        http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
 Source1:       COPYING
-Patch0:		foremost-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,13 +24,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
+sed -i 's!/usr/local/etc/foremost.conf!%{_sysconfdir}/foremost.conf!' config.c
 sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile
 cp %{SOURCE1} .
 
 %build
-# Binary files were left in the distributed tarball.
-make clean
 make %{?_smp_mflags} CONF=%{_sysconfdir}
 
 %install
@@ -45,6 +40,7 @@
     CONF=$RPM_BUILD_ROOT%{_sysconfdir}
 
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/foremost.conf
+chmod 0644 CHANGES README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,9 +50,13 @@
 %doc README CHANGES COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/*
+%config(noreplace) %{_sysconfdir}/foremost.conf
 
 %changelog
+* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
+- Upgrade to 1.1.
+- Rework the config patch as a sed replacement.
+
 * Thu Sep 29 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.0-4
 - Fix permissions on installed foremost.conf file.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/foremost/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2005 19:43:50 -0000	1.2
+++ sources	29 Jan 2006 03:57:43 -0000	1.3
@@ -1 +1 @@
-6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
+b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz


--- foremost-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 29 04:23:56 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 28 Jan 2006 23:23:56 -0500
Subject: rpms/foremost/devel .cvsignore, 1.2, 1.3 foremost.spec, 1.1,
	1.2 sources, 1.2, 1.3 foremost-config.patch, 1.1, NONE
Message-ID: <200601290424.k0T4OTFh002497@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/foremost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2454

Modified Files:
	.cvsignore foremost.spec sources 
Removed Files:
	foremost-config.patch 
Log Message:
* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
- Upgrade to 1.1.
- Rework the config patch as a sed replacement.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/foremost/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2005 19:43:50 -0000	1.2
+++ .cvsignore	29 Jan 2006 04:23:56 -0000	1.3
@@ -1 +1 @@
-foremost-1.0.tar.gz
+foremost-1.1.tar.gz


Index: foremost.spec
===================================================================
RCS file: /cvs/extras/rpms/foremost/devel/foremost.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foremost.spec	30 Sep 2005 19:43:50 -0000	1.1
+++ foremost.spec	29 Jan 2006 04:23:56 -0000	1.2
@@ -1,19 +1,16 @@
 Name:           foremost
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Recover files by "carving" them from a raw disk
 
 Group:          Applications/File
 License:        GPL
 URL:            http://foremost.sf.net
-# Upstream isn't versioning their tarballs!  They list the md5sum of their
-# present tarball on the web page so this should make it easier to decide if
-# they've updated without me noticing.
-# MD5Sum:
-# 6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
-Source0:        http://foremost.sourceforge.net/pkg/foremost-1.0.tar.gz
+# Upstream wasn't versioning their tarballs.  Record of the latest md5sum in
+# case that happens again.
+# b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz
+Source0:        http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
 Source1:       COPYING
-Patch0:		foremost-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,13 +24,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
+sed -i 's!/usr/local/etc/foremost.conf!%{_sysconfdir}/foremost.conf!' config.c
 sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile
 cp %{SOURCE1} .
 
 %build
-# Binary files were left in the distributed tarball.
-make clean
 make %{?_smp_mflags} CONF=%{_sysconfdir}
 
 %install
@@ -45,6 +40,7 @@
     CONF=$RPM_BUILD_ROOT%{_sysconfdir}
 
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/foremost.conf
+chmod 0644 CHANGES README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,9 +50,13 @@
 %doc README CHANGES COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/*
+%config(noreplace) %{_sysconfdir}/foremost.conf
 
 %changelog
+* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
+- Upgrade to 1.1.
+- Rework the config patch as a sed replacement.
+
 * Thu Sep 29 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.0-4
 - Fix permissions on installed foremost.conf file.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/foremost/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2005 19:43:50 -0000	1.2
+++ sources	29 Jan 2006 04:23:56 -0000	1.3
@@ -1 +1 @@
-6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
+b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz


--- foremost-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 29 04:24:04 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 28 Jan 2006 23:24:04 -0500
Subject: rpms/gquilt/devel .cvsignore, 1.6, 1.7 gquilt.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200601290424.k0T4Oafc002503@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2476

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Dec 2005 01:11:42 -0000	1.6
+++ .cvsignore	29 Jan 2006 04:24:04 -0000	1.7
@@ -1 +1 @@
-gquilt-0.15.tar.gz
+gquilt-0.16.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/gquilt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gquilt.spec	7 Dec 2005 01:11:42 -0000	1.5
+++ gquilt.spec	29 Jan 2006 04:24:04 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.15
+Version:	0.16
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	pygtk2, quilt
+Requires:	pygtk2 >= 2.6, quilt
 
 %description
 quilt is a tool for managing a series of patches by keeping track
@@ -51,6 +51,10 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Sat Jan 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 0.16-1
+- Update to latest release
+- Require pygtk2 >= 2.6
+
 * Mon Dec 5 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 0.15-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Dec 2005 01:11:42 -0000	1.6
+++ sources	29 Jan 2006 04:24:04 -0000	1.7
@@ -1 +1 @@
-b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz
+4d1b5e44130b0a55f8ec25f22780b272  gquilt-0.16.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 04:25:54 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 28 Jan 2006 23:25:54 -0500
Subject: rpms/gquilt/FC-4 .cvsignore, 1.6, 1.7 gquilt.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200601290426.k0T4QZFn002613@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2591

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Dec 2005 01:31:41 -0000	1.6
+++ .cvsignore	29 Jan 2006 04:25:53 -0000	1.7
@@ -1 +1 @@
-gquilt-0.15.tar.gz
+gquilt-0.16.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/gquilt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gquilt.spec	7 Dec 2005 01:31:41 -0000	1.5
+++ gquilt.spec	29 Jan 2006 04:25:53 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.15
+Version:	0.16
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	pygtk2, quilt
+Requires:	pygtk2 >= 2.6, quilt
 
 %description
 quilt is a tool for managing a series of patches by keeping track
@@ -51,6 +51,10 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Sat Jan 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 0.16-1
+- Update to latest release
+- Require pygtk2 >= 2.6
+
 * Mon Dec 5 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 0.15-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Dec 2005 01:31:41 -0000	1.6
+++ sources	29 Jan 2006 04:25:53 -0000	1.7
@@ -1 +1 @@
-b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz
+4d1b5e44130b0a55f8ec25f22780b272  gquilt-0.16.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 05:03:38 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 29 Jan 2006 00:03:38 -0500
Subject: owners owners.list,1.571,1.572
Message-ID: <200601290504.k0T54EFS004502@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4481

Modified Files:
	owners.list 
Log Message:
taking ownership of firestarter



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- owners.list	29 Jan 2006 03:42:52 -0000	1.571
+++ owners.list	29 Jan 2006 05:03:38 -0000	1.572
@@ -214,7 +214,7 @@
 Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 05:29:35 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 29 Jan 2006 00:29:35 -0500
Subject: rpms/firestarter/devel firestarter-1.0.3-nobrowser.patch, NONE,
	1.1 firestarter-1.0.3-services.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 firestarter.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <200601290530.k0T5U8rY004698@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658

Modified Files:
	.cvsignore firestarter.spec sources 
Added Files:
	firestarter-1.0.3-nobrowser.patch 
	firestarter-1.0.3-services.patch 
Log Message:
fixes bug #178040
I'm not going to request build until bug #160431 is fixed and #179248
has been looked at (and maybe fixed)


firestarter-1.0.3-nobrowser.patch:

--- NEW FILE firestarter-1.0.3-nobrowser.patch ---
diff -ur firestarter-1.0.3/src/menus.c firestarter-1.0.3-patched/src/menus.c
--- firestarter-1.0.3/src/menus.c	2005-01-29 07:32:08.000000000 -0500
+++ firestarter-1.0.3-patched/src/menus.c	2006-01-17 11:12:06.000000000 -0500
@@ -34,8 +34,6 @@
 
 static GtkUIManager *ui_manager;
 
-static void open_homepage (void);
-static void open_manual (void);
 static void copy_selected (void);
 
 /* Normal items */
@@ -67,8 +65,6 @@
 	{ "EditRule", FIRESTARTER_STOCK_EDIT, N_("_Edit Rule"), NULL, N_("Edit the selected rule"), policyview_edit_rule },
 	{ "ApplyPolicy", GTK_STOCK_APPLY, N_("A_pply Policy"), NULL, N_("Apply the changes made the policy"), policyview_apply },
 
-	{ "OpenManual", GTK_STOCK_HELP, N_("Online Users' _Manual"), NULL, N_("Open the online users' manual in a browser"), open_manual },
-	{ "OpenHomepage", GTK_STOCK_HOME, N_("Firestarter _Homepage"), NULL, N_("Open the Firestarter homepage in a browser"), open_homepage },
 	{ "ShowAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL, N_("About Firestarter"), G_CALLBACK (show_about) },
 
 	{ "AllowInboundFrom", NULL, N_("Allow Connections From Source"), NULL, N_("Allow all connections from this source"), hitview_allow_host },
@@ -146,8 +142,6 @@
 	"      <menuitem action='ApplyPolicy'/>"
 	"    </menu>"
 	"    <menu action='HelpMenu'>"
-	"      <menuitem action='OpenManual'/>"
-	"      <menuitem action='OpenHomepage'/>"
 	"      <separator/>"
 	"      <menuitem action='ShowAbout'/>"
 	"    </menu>"
@@ -538,18 +532,6 @@
 	g_object_set (G_OBJECT (action), "sensitive", enabled, NULL);
 }
 
-static void
-open_homepage (void)
-{
-	gnome_url_show ("http://www.fs-security.com", NULL);
-}
-
-static void
-open_manual (void)
-{
-	gnome_url_show ("http://www.fs-security.com/docs/", NULL);
-}
-
 /* [ copy_selected ]
  * Copy the selection in the active view to the clipboard
  */

firestarter-1.0.3-services.patch:

--- NEW FILE firestarter-1.0.3-services.patch ---
diff -ur firestarter-1.0.3/src/service.c firestarter-1.0.3.patched/src/service.c
--- firestarter-1.0.3/src/service.c	2005-01-29 04:32:08.000000000 -0800
+++ firestarter-1.0.3.patched/src/service.c	2006-01-17 04:34:43.000000000 -0800
@@ -22,7 +22,9 @@
 } Service;
 
 Service user_services[] = {
+        {"APCUPSD", "3551"},
 	{"BitTorrent", "6881-6889"},
+        {"CUPS", "631"},
 	{"DHCP", "67-68"},
 	{"DNS", "53"},
 	{"FTP", "20-21"},


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jun 2005 14:46:10 -0000	1.8
+++ .cvsignore	29 Jan 2006 05:29:35 -0000	1.9
@@ -1 +1,2 @@
 firestarter-1.0.3.tar.gz
+20050107-fs-manual.pdf


Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- firestarter.spec	18 Aug 2005 20:07:21 -0000	1.15
+++ firestarter.spec	29 Jan 2006 05:29:35 -0000	1.16
@@ -1,13 +1,17 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://firestarter.sourceforge.net
 Source0:	http://download.sourceforge.net/firestarter/firestarter-1.0.3.tar.gz
+Source1:	20050107-fs-manual.pdf
+#Source1:	http://www.fs-security.com/docs/fs-manual.pdf
 Patch0:		firestarter-1.0.3-pam.patch
+Patch1:		firestarter-1.0.3-services.patch
+Patch2:		firestarter-1.0.3-nobrowser.patch      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -34,7 +38,9 @@
 %prep
 %setup -q
 %patch0 -p1 -b .pam
-
+%patch1 -p1 -b .services
+%patch2 -p1 -b .nobrowser
+cp %{SOURCE1} ./fs-manual.pdf
 
 %build
 %configure
@@ -52,7 +58,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 
 mv ${RPM_BUILD_ROOT}/%{_bindir}/firestarter ${RPM_BUILD_ROOT}/%{_sbindir}
-ln -s %{_bindir}/consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter
+ln -s consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter
 
 touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/configuration
 touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/events-filter-hosts
@@ -115,34 +121,37 @@
 %postun
 if [ "$1" = "0" ]; then
     if [ -e /etc/dhclient-exit-hooks ]; then
-        grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > /etc/dhclient-exit-hooks.tmp
-        mv /etc/dhclient-exit-hooks.tmp /etc/dhclient-exit-hooks
+        NEW_CONF=`mktemp -t firestarter.XXXXXX`
+        grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF}
+        cat ${NEW_CONF} > /etc/dhclient-exit-hooks
     fi
 fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README ChangeLog AUTHORS TODO COPYING CREDITS
+%doc README ChangeLog AUTHORS TODO COPYING CREDITS fs-manual.pdf
 %attr(755,root,root) %{_sbindir}/firestarter
 %{_bindir}/firestarter
-%config %{_initrddir}/firestarter
+%{_initrddir}/firestarter
 %{_sysconfdir}/gconf/schemas/firestarter.schemas
 %{_sysconfdir}/pam.d/firestarter
 %{_sysconfdir}/security/console.apps/%{name}
 %dir %attr(700,root,root) %{_sysconfdir}/firestarter
 %dir %attr(700,root,root) %{_sysconfdir}/firestarter/inbound
 %dir %attr(700,root,root) %{_sysconfdir}/firestarter/outbound
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports
-%config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/*
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/*
+# ghosted
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports
+%ghost %config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/*
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/*
+# end ghosted
 %{_sysconfdir}/firestarter/non-routables
 %{_datadir}/applications/fedora-firestarter.desktop
 %{_datadir}/pixmaps/*
@@ -150,6 +159,12 @@
 
 
 %changelog
+* Tue Jan 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-7
+- add CUPS and APCUPSD to services
+- don't open browser window since it runs as root (bug #178040)
+- add PDF documentation
+- some spec file cleanup
+
 * Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-6
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Jun 2005 14:46:10 -0000	1.8
+++ sources	29 Jan 2006 05:29:35 -0000	1.9
@@ -1 +1,2 @@
 f46860a9e16dac4b693bd05f16370b03  firestarter-1.0.3.tar.gz
+61b03e662802b885d5305bd225038010  20050107-fs-manual.pdf



From fedora-extras-commits at redhat.com  Sun Jan 29 07:02:02 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Sun, 29 Jan 2006 02:02:02 -0500
Subject: rpms/octave/FC-4 octave-2.1.72-freqz.patch, NONE, 1.1 octave.spec, 
	1.23, 1.24
Message-ID: <200601290702.k0T72YeR008406@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8386

Modified Files:
	octave.spec 
Added Files:
	octave-2.1.72-freqz.patch 
Log Message:
Fix bug #179242. The patch is taken from octave CVS, where it's already fixed.

octave-2.1.72-freqz.patch:

--- NEW FILE octave-2.1.72-freqz.patch ---
Index: scripts/signal/freqz.m
--- scripts/signal/freqz.m	2006-01-29 00:46:27.000000000 -0600
+++ scripts/signal/freqz.m	2006-01-29 00:53:57.000000000 -0600
@@ -84,7 +84,7 @@
     region = Fs = [];
   elseif (nargin == 4)
     Fs = [];
-    if (! isstr (region) && ! isempty (region))
+    if (! ischar (region) && ! isempty (region))
       Fs = region; 
       region = [];
     endif
@@ -114,26 +114,27 @@
     endif
   endif
 
-  a = a(:).';
-  b = b(:).';
+  a = a(:);
+  b = b(:);
 
   if (! isscalar (n)) ## Explicit frequency vector given
     w = f = n;
     if (nargin == 4)  ## Sampling rate Fs was specified
       w = 2*pi*f/Fs;
     endif
-    hb = polyval (fliplr(b), exp(-j*w));
-    ha = polyval (fliplr(a), exp(-j*w));
+    hb = polyval (fliplr(b), exp(j*w));
+    ha = polyval (fliplr(a), exp(j*w));
   elseif (strcmp (region, "whole"))
-    f = Fs * (0:n-1) / n;
-    ## polyval(fliplr(P),exp(-jw)) is O(p n) and fft(x) is O(n log(n)), where p is the 
-    ## order of the the polynomial P.  For small p it would be faster to use polyval  
-    ## but in practice the overhead for polyval is much higher and the little bit of
-    ## time saved isn't worth the extra code.
+    f = Fs * (0:n-1)' / n;
+    ## polyval(fliplr(P),exp(jw)) is O(p n) and fft(x) is O(n log(n)),
+    ## where p is the order of the the polynomial P.  For small p it
+    ## would be faster to use polyval but in practice the overhead for
+    ## polyval is much higher and the little bit of time saved isn't
+    ## worth the extra code.
     hb = fft (postpad (b, n));
     ha = fft (postpad (a, n));
   else
-    f = Fs/2 * (0:n-1) / n;
+    f = Fs/2 * (0:n-1)' / n;
     hb = fft (postpad (b, 2*n))(1:n);
     ha = fft (postpad (a, 2*n))(1:n);
   endif
@@ -169,9 +170,9 @@
 %!test # Sampling frequency properly interpreted
 %! b = [1 1 1]/3;
 %! [h,f] = freqz(b,1,16,320);
-%! assert(f,[0:15]*10,10*eps);
+%! assert(f,[0:15]'*10,10*eps);
 %! [h2,f2] = freqz(b,1,[0:15]*10,320);
 %! assert(f2,[0:15]*10,10*eps);
-%! assert(h,h2,20*eps);
+%! assert(h,h2',20*eps);
 %! [h3,f3] = freqz(b,1,32,'whole',320);
-%! assert(f3,[0:31]*10,10*eps);
+%! assert(f3,[0:31]'*10,10*eps);


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- octave.spec	26 Jan 2006 22:47:33 -0000	1.23
+++ octave.spec	29 Jan 2006 07:02:01 -0000	1.24
@@ -1,12 +1,13 @@
 Name:           octave
 Version:        2.1.72
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch0:         octave-2.1.72-freqz.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-3
+- Patch to fix bug #179242.
+
 * Thu Jan 26 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-2
 - Rebuild for new release of hdf5.
 



From fedora-extras-commits at redhat.com  Sun Jan 29 07:09:05 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:09:05 -0500
Subject: rpms/bidiv - New directory
Message-ID: <200601290709.k0T79Btq008486@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8477/bidiv

Log Message:
Directory /cvs/extras/rpms/bidiv added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 07:09:16 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:09:16 -0500
Subject: rpms/bidiv/devel - New directory
Message-ID: <200601290709.k0T79I0n008500@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8477/bidiv/devel

Log Message:
Directory /cvs/extras/rpms/bidiv/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 07:10:25 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:10:25 -0500
Subject: rpms/bidiv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601290710.k0T7AS45008557@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8525/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bidiv


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 07:10:06 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:10:06 -0500
Subject: rpms/bidiv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601290710.k0T7AP0O008540@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8525

Added Files:
	Makefile import.log 
Log Message:
Setup of module bidiv


--- NEW FILE Makefile ---
# Top level Makefile for module bidiv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 07:12:39 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:12:39 -0500
Subject: rpms/bidiv import.log,1.1,1.2
Message-ID: <200601290713.k0T7DBcP008660@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8611

Modified Files:
	import.log 
Log Message:
auto-import bidiv-1.5-1 on branch devel from bidiv-1.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bidiv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 07:10:06 -0000	1.1
+++ import.log	29 Jan 2006 07:12:38 -0000	1.2
@@ -0,0 +1 @@
+bidiv-1_5-1:HEAD:bidiv-1.5-1.src.rpm:1138525944



From fedora-extras-commits at redhat.com  Sun Jan 29 07:13:01 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:13:01 -0500
Subject: rpms/bidiv/devel bidiv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601290713.k0T7DXk8008664@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8611/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bidiv.spec 
Log Message:
auto-import bidiv-1.5-1 on branch devel from bidiv-1.5-1.src.rpm


--- NEW FILE bidiv.spec ---
Summary: Display logical Hebrew on unidirectional terminals
Name: bidiv
Version: 1.5
Release: 1%{?dist}
URL: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/
Source: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/%{name}-%{version}.tgz
License: GPL
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fribidi-devel

%description
Bidiv (BiDirectional Viewer) is a simple utility for converting logical-Hebrew
input to visual-Hebrew output. This is useful for reading Hebrew mail messages,
viewing Hebrew texts, etc.

%prep
%setup -q -n bidiv

%build
make PREFIX=%{buildroot} CC_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_mandir}/man1
make PREFIX=%{buildroot}%{_prefix} \
     MAN_PATH=%{buildroot}%{_mandir} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README COPYING
%{_prefix}/bin/bidiv
%{_mandir}/man1/bidiv.1*
# and what about %{_mandir}/he/man1/bidiv.1 ? ;)

%changelog
* Sat Jan  7 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.5-1
- new upstream version.
* Mon Dec 26 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 1.4-3
- smp_flags and GPL text added, Provides removed
* Thu Nov 17 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 1.4-2
- beautification for Fedora Extras
* Mon Feb 19 2001 Tzafrir Cohen <tzafrir at technion.ac.il> 1.4-1
- initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bidiv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 07:10:25 -0000	1.1
+++ .cvsignore	29 Jan 2006 07:12:58 -0000	1.2
@@ -0,0 +1 @@
+bidiv-1.5.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bidiv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 07:10:25 -0000	1.1
+++ sources	29 Jan 2006 07:12:58 -0000	1.2
@@ -0,0 +1 @@
+e1a951dac153c3998e6276e11f681ac4  bidiv-1.5.tgz



From fedora-extras-commits at redhat.com  Sun Jan 29 07:18:27 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:18:27 -0500
Subject: owners owners.list,1.572,1.573
Message-ID: <200601290719.k0T7IxBd008723@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8706/owners

Modified Files:
	owners.list 
Log Message:
add entry for bidiv (bidirectional text filter)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- owners.list	29 Jan 2006 05:03:38 -0000	1.572
+++ owners.list	29 Jan 2006 07:18:27 -0000	1.573
@@ -67,6 +67,7 @@
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|bin2iso|Convert ".bin" files into ISO or WAV|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 09:29:01 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 04:29:01 -0500
Subject: rpms/themes-backgrounds-gnome import.log,1.4,1.5
Message-ID: <200601290929.k0T9TdYu018601@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18566

Modified Files:
	import.log 
Log Message:
auto-import themes-backgrounds-gnome-0.4-1 on branch devel from themes-backgrounds-gnome-0.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:27:35 -0000	1.4
+++ import.log	29 Jan 2006 09:29:00 -0000	1.5
@@ -1,3 +1,4 @@
 themes-backgrounds-gnome-0_3-0_fdr_2:HEAD:themes-backgrounds-gnome-0.3-0.fdr.2.src.rpm:1099891601
 themes-backgrounds-gnome-0_3-0_fdr_2_1:HEAD:themes-backgrounds-gnome-0.3-0.fdr.2.1.src.rpm:1099891649
 themes-backgrounds-gnome-0_3-0_fdr_2_1_90:HEAD:themes-backgrounds-gnome-0.3-0.fdr.2.1.90.src.rpm:1099891655
+themes-backgrounds-gnome-0_4-1:HEAD:themes-backgrounds-gnome-0.4-1.src.rpm:1138526930



From fedora-extras-commits at redhat.com  Sun Jan 29 09:29:07 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 04:29:07 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.xml,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 themes-backgrounds-gnome.spec, 1.6, 1.7
Message-ID: <200601290929.k0T9Tgaf018606@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18566/devel

Modified Files:
	.cvsignore sources themes-backgrounds-gnome.spec 
Added Files:
	themes-backgrounds-gnome.xml 
Log Message:
auto-import themes-backgrounds-gnome-0.4-1 on branch devel from themes-backgrounds-gnome-0.4-1.src.rpm


--- NEW FILE themes-backgrounds-gnome.xml ---
<?xml version="1.0"?>
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
<wallpapers>
  <wallpaper>
    <name>GNOME-Dagg_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Dagg_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Brazil.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Brazil.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-RedFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-RedFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-ThePeninsula_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-ThePeninsula_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-H2gnOme.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-H2gnOme.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PoppySeed_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PoppySeed_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-TreeFace_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-TreeFace_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-GettingBusy_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-GettingBusy_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Diken_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Diken_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-LiquidAmethyst.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-LiquidAmethyst.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Petrklic_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Petrklic_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GreenThirst_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GreenThirst_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FlowerMacro1_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FlowerMacro1_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Orangenavy.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Orangenavy.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Iceland_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Iceland_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMELand_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMELand_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Sand_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Sand_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Superclean_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Superclean_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Transparent_1280x1024.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Transparent_1280x1024.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MnchenBotanischerGarten_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MnchenBotanischerGarten_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-CityPlosion_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-CityPlosion_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-OrangeGnomeMail_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-OrangeGnomeMail_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>Penguingang_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/Penguingang_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-YellowCosmos.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-YellowCosmos.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PebbleBeach_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PebbleBeach_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-RightFoot_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-RightFoot_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MarigoldMacro_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MarigoldMacro_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MolvenoFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MolvenoFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-RustyPipes_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-RustyPipes_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-November_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-November_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SunsetOverCoalOil_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SunsetOverCoalOil_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Sella_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Sella_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Blue_Motion_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Blue_Motion_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GnomeOrb_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GnomeOrb_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Heaven-CampD_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Heaven-CampD_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-WinterInFinland_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-WinterInFinland_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-WaspOn_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WaspOn_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMEInXalapaVeracruzMexico_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMEInXalapaVeracruzMexico_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GnomeGallery_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GnomeGallery_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PieceOfSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PieceOfSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Glassy_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Glassy_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-CloudsInTheSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-CloudsInTheSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-RealShoot_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-RealShoot_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-DrinkItClean02_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-DrinkItClean02_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Nature_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Nature_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-ForMilk01_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-ForMilk01_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-DesktopForNuts_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-DesktopForNuts_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-MykonosSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-MykonosSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-ColorfulLines_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-ColorfulLines_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Mountains_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Mountains_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MauiView1_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MauiView1_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SouthwestSunset_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SouthwestSunset_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-Mraky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-Mraky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-OrangeMoss_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-OrangeMoss_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Simple.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Simple.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FlowerBlueScan_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FlowerBlueScan_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMESomewhere_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMESomewhere_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Happygnome_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Happygnome_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FlowerMacro2_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FlowerMacro2_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-HeronIslandSunset_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-HeronIslandSunset_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Orange.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Orange.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FencedView_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FencedView_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Moss_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Moss_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Gel.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Gel.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMERisingSun_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMERisingSun_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FreshFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FreshFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Waterlily_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Waterlily_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-GreenField_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-GreenField_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-MetallicBall_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-MetallicBall_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-RensowFenster_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-RensowFenster_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Crob_1024x768.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Crob_1024x768.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-IceChapel_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-IceChapel_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Lava.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Lava.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Grass_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Grass_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Stone_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Stone_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-GaloppingHorses_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-GaloppingHorses_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SmallDuckie_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SmallDuckie_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SunsetNearPocinovice_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SunsetNearPocinovice_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Smoer_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Smoer_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-ReindeerFur_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-ReindeerFur_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Leaves_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Leaves_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-WinterAlsaceFrance_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WinterAlsaceFrance_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-ChatsworthFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-ChatsworthFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-LonelyTree_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-LonelyTree_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-AutumnTree_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-AutumnTree_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-TreeFern_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-TreeFern_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FluidCode_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FluidCode_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-BlueScape_1024x768.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-BlueScape_1024x768.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FloridaFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FloridaFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-YellowLichen_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-YellowLichen_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-NesstovRectimn_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-NesstovRectimn_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMEFlowers_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMEFlowers_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-NearSmrzovice_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-NearSmrzovice_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SnowBench_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SnowBench_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
</wallpapers>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:26:41 -0000	1.2
+++ .cvsignore	29 Jan 2006 09:29:07 -0000	1.3
@@ -1 +1 @@
-themes-backgrounds-gnome-0.3.tar.bz2
+themes-backgrounds-gnome-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:26:41 -0000	1.2
+++ sources	29 Jan 2006 09:29:07 -0000	1.3
@@ -1 +1 @@
-d0d1ef5ef309b91be322f6c5d3ed4833  themes-backgrounds-gnome-0.3.tar.bz2
+be0978e025cbf6a2a60f55eadcaf30cf  themes-backgrounds-gnome-0.4.tar.bz2


Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- themes-backgrounds-gnome.spec	6 Apr 2005 22:13:33 -0000	1.6
+++ themes-backgrounds-gnome.spec	29 Jan 2006 09:29:07 -0000	1.7
@@ -1,44 +1,46 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
-Version:        0.3
-Release:        3
-
+Version:        0.4
+Release:        1
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
-Source0:        themes-backgrounds-gnome-0.3.tar.bz2
+Source0:        themes-backgrounds-gnome-0.4.tar.bz2
+Source1:        themes-backgrounds-gnome.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 %description
 Assorted Backgrounds from art.gnome.org.
 
-
 %prep
 %setup -q
 
-
 %build
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/backgrounds/images/art.gnome.org
-cp *.* ${RPM_BUILD_ROOT}/%{_datadir}/backgrounds/images/art.gnome.org/
-
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/themes-backgrounds-gnome
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
+install -m644 * $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/themes-backgrounds-gnome
+install -m664 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/backgrounds/
-%dir %{_datadir}/backgrounds/images/
-%{_datadir}/backgrounds/images/art.gnome.org/
-
+%{_datadir}/backgrounds/images/themes-backgrounds-gnome/*
+%{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Tue Jan 17 2006 Chris Chabot <chabotc at xs4all.nl> - 0.4-1
+- Upped major version, many new goodies present
+- Changed ownership of this package to me
+- Changed 'cp' into 'install -m 644'
+- Removed %dir ownership of _datadir/backgrounds/images
+- Added themes-backgrounds-gnome.xml so gnome picks up the new backgrounds
+ 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Jan 29 09:53:30 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 04:53:30 -0500
Subject: owners owners.list,1.573,1.574
Message-ID: <200601290954.k0T9s20C018787@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18770

Modified Files:
	owners.list 
Log Message:
Took ownership of themes-backgrounds-gnome


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- owners.list	29 Jan 2006 07:18:27 -0000	1.573
+++ owners.list	29 Jan 2006 09:53:30 -0000	1.574
@@ -1236,7 +1236,7 @@
 Fedora Extras|tetex-xcolor|Driver-independent color extensions for LaTeX and pdfLaTeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 10:00:28 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 05:00:28 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.spec,
	1.7, 1.8
Message-ID: <200601291001.k0TA1011018833@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18816

Modified Files:
	themes-backgrounds-gnome.spec 
Log Message:
Minor fixes


Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- themes-backgrounds-gnome.spec	29 Jan 2006 09:29:07 -0000	1.7
+++ themes-backgrounds-gnome.spec	29 Jan 2006 10:00:27 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
 Version:        0.4
-Release:        1
+Release:        2%{?dist}
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
@@ -30,10 +30,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/backgrounds/images/themes-backgrounds-gnome/*
+%{_datadir}/backgrounds/images/themes-backgrounds-gnome
 %{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Sun Jan 29 2006 Chris Chabot <chabotc at xs4all.nl> - 0.4-2
+- Added dist tag to release field
+- Fixed dir ownership of themes-backgrounds-gnome
+
 * Tue Jan 17 2006 Chris Chabot <chabotc at xs4all.nl> - 0.4-1
 - Upped major version, many new goodies present
 - Changed ownership of this package to me



From fedora-extras-commits at redhat.com  Sun Jan 29 12:21:15 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:21:15 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.8, 1.9 abcm2ps.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200601291221.k0TCLlrZ024490@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24432/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Dec 2005 18:25:43 -0000	1.8
+++ .cvsignore	29 Jan 2006 12:21:14 -0000	1.9
@@ -1,2 +1,2 @@
-abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip
+abcm2ps-4.12.5.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcm2ps.spec	31 Dec 2005 18:25:43 -0000	1.8
+++ abcm2ps.spec	29 Jan 2006 12:21:14 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.3
+Version:        4.12.5
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
+- new version 4.12.5
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.12.3-1
 - New Version 4.12.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2005 18:25:43 -0000	1.8
+++ sources	29 Jan 2006 12:21:14 -0000	1.9
@@ -1,2 +1,2 @@
-dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
+582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 12:21:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:21:21 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.8, 1.9 abcm2ps.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200601291221.k0TCLsxe024495@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24432/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Dec 2005 18:25:50 -0000	1.8
+++ .cvsignore	29 Jan 2006 12:21:21 -0000	1.9
@@ -1,2 +1,2 @@
-abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip
+abcm2ps-4.12.5.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcm2ps.spec	31 Dec 2005 18:25:50 -0000	1.8
+++ abcm2ps.spec	29 Jan 2006 12:21:21 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.3
+Version:        4.12.5
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
+- new version 4.12.5
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.12.3-1
 - New Version 4.12.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2005 18:25:50 -0000	1.8
+++ sources	29 Jan 2006 12:21:21 -0000	1.9
@@ -1,2 +1,2 @@
-dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
+582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 12:21:27 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:21:27 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.8, 1.9 abcm2ps.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200601291222.k0TCM00F024500@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24432/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Dec 2005 19:54:33 -0000	1.8
+++ .cvsignore	29 Jan 2006 12:21:27 -0000	1.9
@@ -1,2 +1,2 @@
-abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip
+abcm2ps-4.12.5.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcm2ps.spec	28 Dec 2005 19:54:33 -0000	1.8
+++ abcm2ps.spec	29 Jan 2006 12:21:27 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.3
+Version:        4.12.5
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
+- new version 4.12.5
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.12.3-1
 - New Version 4.12.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Dec 2005 19:54:33 -0000	1.8
+++ sources	29 Jan 2006 12:21:27 -0000	1.9
@@ -1,2 +1,2 @@
-dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
+582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 12:37:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:37:13 -0500
Subject: rpms/clisp/FC-3 .cvsignore, 1.4, 1.5 clisp.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200601291237.k0TCbjPH024738@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683/FC-3

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.38


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 19:40:14 -0000	1.4
+++ .cvsignore	29 Jan 2006 12:37:13 -0000	1.5
@@ -1 +1 @@
-clisp-2.37.tar.bz2
+clisp-2.38.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clisp.spec	3 Jan 2006 19:40:14 -0000	1.11
+++ clisp.spec	29 Jan 2006 12:37:13 -0000	1.12
@@ -1,18 +1,19 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.37
-Release: 	2%{?dist}
+Version:	2.38
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.38.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-BuildRequires:	XFree86-devel
+BuildRequires:  xorg-x11-devel
 ExcludeArch:	ppc ppc64
 
+
 %description
 ANSI Common Lisp is a high-level, general-purpose programming
 language.  GNU CLISP is a Common Lisp implementation by Bruno Haible
@@ -43,6 +44,7 @@
 %description devel
 Files necessary for linking CLISP.
 
+
 %prep
 %setup -q
 
@@ -111,6 +113,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.38-1
+- new version 2.38
+
 * Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
 - new version 2.37
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 19:40:14 -0000	1.5
+++ sources	29 Jan 2006 12:37:13 -0000	1.6
@@ -1 +1 @@
-f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2
+960e1f6e232415c59b6978f92e62f30b  clisp-2.38.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 12:37:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:37:19 -0500
Subject: rpms/clisp/FC-4 .cvsignore, 1.5, 1.6 clisp.spec, 1.15, 1.16 sources,
	1.5, 1.6
Message-ID: <200601291237.k0TCbphr024743@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683/FC-4

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.38


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2006 18:13:19 -0000	1.5
+++ .cvsignore	29 Jan 2006 12:37:19 -0000	1.6
@@ -1 +1 @@
-clisp-2.37.tar.bz2
+clisp-2.38.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- clisp.spec	3 Jan 2006 18:41:20 -0000	1.15
+++ clisp.spec	29 Jan 2006 12:37:19 -0000	1.16
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.37
-Release: 	2%{?dist}
+Version:	2.38
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.38.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.38-1
+- new version 2.38
+
 * Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
 - new version 2.37
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 18:13:19 -0000	1.5
+++ sources	29 Jan 2006 12:37:19 -0000	1.6
@@ -1 +1 @@
-f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2
+960e1f6e232415c59b6978f92e62f30b  clisp-2.38.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 12:37:25 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:37:25 -0500
Subject: rpms/clisp/devel .cvsignore, 1.4, 1.5 clisp.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200601291237.k0TCbvnY024748@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683/devel

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.38


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 19:41:16 -0000	1.4
+++ .cvsignore	29 Jan 2006 12:37:24 -0000	1.5
@@ -1 +1 @@
-clisp-2.37.tar.bz2
+clisp-2.38.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clisp.spec	3 Jan 2006 19:55:26 -0000	1.11
+++ clisp.spec	29 Jan 2006 12:37:24 -0000	1.12
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.37
-Release: 	3%{?dist}
+Version:	2.38
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.38.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -53,6 +53,7 @@
 %description devel
 Files necessary for linking CLISP.
 
+
 %prep
 %setup -q
 
@@ -122,6 +123,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.38-1
+- new version 2.38
+
 * Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
 - new version 2.37
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 19:41:16 -0000	1.5
+++ sources	29 Jan 2006 12:37:24 -0000	1.6
@@ -1 +1 @@
-f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2
+960e1f6e232415c59b6978f92e62f30b  clisp-2.38.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 13:45:29 2006
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun, 29 Jan 2006 08:45:29 -0500
Subject: rpms/balsa/devel .cvsignore, 1.10, 1.11 balsa.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <200601291346.k0TDk1UU026789@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26765

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.3.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Jan 2006 23:07:17 -0000	1.10
+++ .cvsignore	29 Jan 2006 13:45:29 -0000	1.11
@@ -1,2 +1,2 @@
 gmime-2.1.17.tar.bz2
-balsa-2.3.9.tar.bz2
+balsa-2.3.10.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- balsa.spec	6 Jan 2006 23:07:17 -0000	1.13
+++ balsa.spec	29 Jan 2006 13:45:29 -0000	1.14
@@ -2,7 +2,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.9
+Version:        2.3.10
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.10-1
+- update to upstream 2.3.10
+
 * Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
 - update to 2.3.9.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Jan 2006 23:07:17 -0000	1.10
+++ sources	29 Jan 2006 13:45:29 -0000	1.11
@@ -1,2 +1,2 @@
 4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
-65872d953f0c3c7d2dc50bb09f800629  balsa-2.3.9.tar.bz2
+55900922195886be867cd5060548ff7f  balsa-2.3.10.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 17:10:59 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 29 Jan 2006 12:10:59 -0500
Subject: rpms/gweled/devel gweled.spec,1.11,1.12
Message-ID: <200601291711.k0THBW1w001936@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gweled/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1916

Modified Files:
	gweled.spec 
Log Message:
Fix build in devel (mv behaviour changed)


Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gweled.spec	5 Oct 2005 17:46:44 -0000	1.11
+++ gweled.spec	29 Jan 2006 17:10:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gweled
 Version:        0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Swapping gem game
 
@@ -47,7 +47,7 @@
   --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 mkdir $RPM_BUILD_ROOT%{_localstatedir}/lib/
-mv $RPM_BUILD_ROOT%{_localstatedir}/games/ $RPM_BUILD_ROOT%{_localstatedir}/lib/games/
+mv $RPM_BUILD_ROOT%{_localstatedir}/games/ $RPM_BUILD_ROOT%{_localstatedir}/lib/
 
 
 %clean
@@ -66,6 +66,9 @@
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Sun Jan 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-3
+- Fix build in devel (mv behaviour changed)
+
 * Tue Oct 05 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-2
 - Use dist
 



From fedora-extras-commits at redhat.com  Sun Jan 29 18:31:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 29 Jan 2006 13:31:18 -0500
Subject: rpms/w3c-markup-validator/devel
	w3c-markup-validator-0.7.1-cg231.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 w3c-markup-validator.spec, 1.5, 1.6
Message-ID: <200601291831.k0TIVpeT004079@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4055

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.1-cg231.patch 
Log Message:
(build still disabled)

* Sun Jan 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.1-1
- Require opensp >= 1.5, not openjade.
- Patch to work with Config::General 2.31.

* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi>
- 0.7.1.

* Fri Sep 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-1
- 0.7.0.


w3c-markup-validator-0.7.1-cg231.patch:

--- NEW FILE w3c-markup-validator-0.7.1-cg231.patch ---
--- validator/httpd/cgi-bin/check	2005/10/13 05:35:17	1.432.2.5
+++ validator/httpd/cgi-bin/check	2006/01/26 20:21:41	1.432.2.6
@@ -306,9 +306,17 @@
 $File->{H} = $H;
 
 # Read friendly error message file
-my $error_messages_list =  File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'error_messages.cfg');
-my %config_opts = (-ConfigFile => $error_messages_list);
-my %rsrc = Config::General->new(%config_opts)->getall();
+my %rsrc = Config::General->new(
+  -MergeDuplicateBlocks => 1,
+  -ConfigFile           => File::Spec->catfile($CFG->{Paths}->{Templates},
+                                               $lang, 'error_messages.cfg'),
+  )->getall();
+# Config::General workarounds for <msg 0> issues:
+$rsrc{msg}{0} ||=
+  delete($rsrc{'msg 0'}) ||                   # < 2.31
+  { original => delete($rsrc{msg}{original}), #   2.31
+    verbose  => delete($rsrc{msg}{verbose}),
+  };
 $RSRC = \%rsrc;
 
 $T->param(cfg_home_page => $CFG->{'Home Page'});


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:31:31 -0000	1.2
+++ .cvsignore	29 Jan 2006 18:31:17 -0000	1.3
@@ -1,2 +1,2 @@
-sgml-lib-0_6_7.tar.gz
-validator-0_6_7.tar.gz
+sgml-lib-0_7_1.tar.gz
+validator-0_7_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:31:31 -0000	1.2
+++ sources	29 Jan 2006 18:31:17 -0000	1.3
@@ -1,2 +1,2 @@
-db6088a83583a33b902d52c2d499acea  sgml-lib-0_6_7.tar.gz
-5322f884eb75ddb7b27e56154d74452f  validator-0_6_7.tar.gz
+9bb2e4a04730dec300922bd9a92b622e  sgml-lib-0_7_1.tar.gz
+c4336201cf8ea48fce809d716bdc0d9d  validator-0_7_1.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- w3c-markup-validator.spec	10 Jun 2005 06:37:45 -0000	1.5
+++ w3c-markup-validator.spec	29 Jan 2006 18:31:17 -0000	1.6
@@ -1,19 +1,23 @@
-Name:           w3c-markup-validator
-Version:        0.6.7
-Release:        2
+%{expand: %%define tbver %(echo %{version} | tr . _)}
 
+Name:           w3c-markup-validator
+Version:        0.7.1
+Release:        1
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
 License:        W3C Software License
 URL:            http://validator.w3.org/
-Source0:        http://validator.w3.org/dist/validator-0_6_7.tar.gz
-Source1:        http://validator.w3.org/dist/sgml-lib-0_6_7.tar.gz
+Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
+Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
+Patch0:         %{name}-0.7.1-cg231.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
-Requires:       httpd, openjade >= 1.3.2, %{name}-libs = %{version}
+BuildRequires:  %{__perl}
+Requires:       httpd
+Requires:       opensp >= 1.5
+Requires:       %{name}-libs = %{version}
 Obsoletes:      w3c-validator
 
 %description
@@ -50,56 +54,42 @@
 
 %setup -q -a 1 -n validator-%{version}
 mv validator-%{version}/htdocs/sgml-lib .
+%patch0 -p1
 
-# Localize config files
-perl -pi -e \
-  's|\bwww-validator\@w3\.org\b|root\@localhost| ;
-   s|/validator\.w3\.org/|/localhost/%{name}/| ;
-   s|/usr/local/validator/htdocs/config/|%{_sysconfdir}/w3c/| ;
-   s|/usr/local/validator/htdocs/|%{_datadir}/%{name}/| ;
-   s|^(SGML\s+Library\s+).*|${1}%{_datadir}/sgml/%{name}|' \
+# Localize configs.
+%{__perl} -pi -e \
+  's|/usr/local/validator\b|%{_datadir}/%{name}|' \
+  htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/*
+%{__perl} -pi -e \
+  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}| ;
+   s|\bwww-validator\@w3\.org\b|root\@localhost| ;
+   s|/validator\.w3\.org/|/localhost/w3c-validator/|' \
   htdocs/config/validator.conf
-perl -pi -e \
-  's|/usr/share/w3c-markup-validator|%{_datadir}/%{name}|g' \
-  httpd/conf/httpd.conf
-
-# Cleanup of unused files
-rm -f htdocs/config/verbosemsg.rc
 
 # Move config out of the way
 mv htdocs/config __config
 
-# Fixup permissions
-find . -type d | xargs chmod 755
-find . -type f | xargs chmod 644
-chmod 755 httpd/cgi-bin/check
-
 
 %build
-# Not
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# Script
-cp -p httpd/cgi-bin/check $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # Config files
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c
-cp -p __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-cp -p httpd/conf/httpd.conf \
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c
+install -pm 644 __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c
+install -Dpm 644 httpd/conf/httpd.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
-# HTML and stuff
-cp -pR htdocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+# Scripts, HTML, etc.
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pR httpd/cgi-bin htdocs share $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # SGML library
-mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/sgml
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/sgml
 cp -pR sgml-lib $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml
 touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat
 
 
@@ -108,22 +98,20 @@
 
 
 %post
-if [ $1 -eq 1 ] ; then
-  %{_initrddir}/httpd reload &>/dev/null || :
-fi
+[ $1 -eq 1 ] && %{_initrddir}/httpd reload &>/dev/null || :
 
 %postun
 %{_initrddir}/httpd reload &>/dev/null || :
 
 %post libs
-for catalog in "mathml.soc sgml.soc svg.soc xhtml.soc xml.soc"; do
+for catalog in sgml.soc xml.soc ; do
   install-catalog --add \
     %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
     %{_datadir}/sgml/%{name}/$catalog >/dev/null 2>&1 || :
 done
 
 %preun libs
-for catalog in "mathml.soc sgml.soc svg.soc xhtml.soc xml.soc"; do
+for catalog in sgml.soc xml.soc ; do
   install-catalog --remove \
     %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
     %{_datadir}/sgml/%{name}/$catalog >/dev/null 2>&1 || :
@@ -132,18 +120,29 @@
 
 %files
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%config(noreplace) %{_sysconfdir}/w3c
-%{_datadir}/%{name}
+# Configs not "noreplace", they're incompatible in 0.6.7 vs 0.7.x.
+%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config %{_sysconfdir}/w3c/
+%{_datadir}/%{name}/
 
 %files libs
 %defattr(-,root,root,-)
 %ghost %config %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat
-%{_datadir}/sgml/%{name}
+%{_datadir}/sgml/%{name}/
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sun Jan 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.1-1
+- Require opensp >= 1.5, not openjade.
+- Patch to work with Config::General 2.31.
+
+* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- 0.7.1.
+
+* Fri Sep 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-1
+- 0.7.0.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.7-2
 - rebuilt
 
 * Sun Jul 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.7-0.fdr.1



From fedora-extras-commits at redhat.com  Sun Jan 29 18:55:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 29 Jan 2006 13:55:11 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.9,1.10
Message-ID: <200601291855.k0TIth4C004205@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4176

Modified Files:
	libxfcegui4.spec 
Log Message:
Add BuildRequires for modular xorg



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxfcegui4.spec	11 Nov 2005 16:43:29 -0000	1.9
+++ libxfcegui4.spec	29 Jan 2006 18:55:11 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/libxfcegui4-4.2.3.tar.gz
@@ -14,6 +14,8 @@
 BuildRequires: libxfce4util-devel >= %{version}
 BuildRequires: dbh-devel
 BuildRequires: libxml2-devel >= 2.4.0
+BuildRequires: imake
+BuildRequires: libXt-devel
 
 %description
 The package includes various gtk widgets for Xfce.
@@ -67,6 +69,9 @@
 %{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Sun Jan 29 2006 Kevin Fenzi <kevin at scrye.com> - 4.2.3-3.fc5
+- Add BuildRequires for modular xorg
+
 * Thu Nov 10 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc4
 - disable-static instead of removing .a files
 



From fedora-extras-commits at redhat.com  Sun Jan 29 19:34:46 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 14:34:46 -0500
Subject: owners owners.list,1.574,1.575
Message-ID: <200601291935.k0TJZIld006122@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6105

Modified Files:
	owners.list 
Log Message:

  Description:
    Take ownership of blender




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- owners.list	29 Jan 2006 09:53:30 -0000	1.574
+++ owners.list	29 Jan 2006 19:34:45 -0000	1.575
@@ -73,7 +73,7 @@
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|blender|3D modeling, animation, rendering and post-production|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|blender|3D modeling, animation, rendering and post-production|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bluefish|A GTK2 web development application for experienced users|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 19:40:18 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 14:40:18 -0500
Subject: owners owners.list,1.575,1.576
Message-ID: <200601291940.k0TJeolJ006149@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6130

Modified Files:
	owners.list 
Log Message:

  Description:
    Take ownership of openal.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- owners.list	29 Jan 2006 19:34:45 -0000	1.575
+++ owners.list	29 Jan 2006 19:40:18 -0000	1.576
@@ -690,7 +690,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|Jochen at herr-schmitt.de|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 19:59:33 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 14:59:33 -0500
Subject: rpms/blender/FC-4 .cvsignore, 1.7, 1.8 blender.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <200601292000.k0TK06Ui006221@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6187

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    Update to new upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Jan 2006 19:45:51 -0000	1.7
+++ .cvsignore	29 Jan 2006 19:59:33 -0000	1.8
@@ -1 +1 @@
-blender-2.40.tar.gz
+blender-2.41.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blender.spec	19 Jan 2006 20:03:10 -0000	1.15
+++ blender.spec	29 Jan 2006 19:59:33 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           blender
-Version:        2.40
+Version:        2.41
 Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
@@ -46,7 +46,7 @@
 
 
 %prep
-%setup -q 
+%setup -q -n blender
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Sun Jan 30 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.41-1
+_ Update to new upstream relase.
+
 * Thu Jan 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
 - Add libtiff-devel as BuildRequire2.
 - Update to new upstream release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Jan 2006 19:45:51 -0000	1.7
+++ sources	29 Jan 2006 19:59:33 -0000	1.8
@@ -1 +1 @@
-3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz
+f6b54ff73c37aaca4d3f5babdd156fbf  blender-2.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 20:14:39 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 29 Jan 2006 15:14:39 -0500
Subject: rpms/gnotime/devel gnotime.spec,1.13,1.14
Message-ID: <200601292015.k0TKFFxZ008078@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036

Modified Files:
	gnotime.spec 
Log Message:
* Sun Jan 29 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-2
- Modular xorg BuildRequires.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnotime.spec	17 Jan 2006 17:49:46 -0000	1.13
+++ gnotime.spec	29 Jan 2006 20:14:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -16,6 +16,8 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  qof-devel >= 0.6.0
+BuildRequires:	libSM-devel
+BuildRequires:	libX11-devel
 # Patch0 modifies configure.in so we need autoconf
 BuildRequires: autoconf
 # To get rid of rpath, we need to use a fedora libtool
@@ -111,10 +113,13 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Jan 29 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-2
+- Modular xorg BuildRequires.
+
 * Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
 - Rebuild against new qof-0.6.1.
 - Patch to fix the build for the qof-0.6 series.
-
+ 
 * Fri Sep 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-0
 - Update to 2.2.2.
 - Remove all patches as they've been merged upstream.



From fedora-extras-commits at redhat.com  Sun Jan 29 20:41:17 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 15:41:17 -0500
Subject: owners owners.list,1.576,1.577
Message-ID: <200601292041.k0TKfnLo008259@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8240

Modified Files:
	owners.list 
Log Message:

  Description:
    revoke erronous edition of openal. revoke taking ownership.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- owners.list	29 Jan 2006 19:40:18 -0000	1.576
+++ owners.list	29 Jan 2006 20:41:17 -0000	1.577
@@ -690,7 +690,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|Jochen at herr-schmitt.de|
+Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 20:42:58 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 15:42:58 -0500
Subject: rpms/blender/devel .cvsignore, 1.7, 1.8 blender.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <200601292043.k0TKhUZ7008286@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8265

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    Update to new upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Jan 2006 16:24:33 -0000	1.7
+++ .cvsignore	29 Jan 2006 20:42:58 -0000	1.8
@@ -1 +1 @@
-blender-2.40.tar.gz
+blender-2.41.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blender.spec	19 Jan 2006 22:10:08 -0000	1.15
+++ blender.spec	29 Jan 2006 20:42:58 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           blender
-Version:        2.40
-Release:        2%{?dist}
+Version:        2.41
+Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q 
+%setup -q -n blender
 # %patch0 -p1 -b .x86_64
 
 %build
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Sun Jan 30 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.41-1
+- Update to new upstream release.
+
 * Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-2
 - New upstream release.
 - adapting to mudular X.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Jan 2006 16:24:33 -0000	1.7
+++ sources	29 Jan 2006 20:42:58 -0000	1.8
@@ -1 +1 @@
-3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz
+f6b54ff73c37aaca4d3f5babdd156fbf  blender-2.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 20:59:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 15:59:53 -0500
Subject: rpms/asa - New directory
Message-ID: <200601292059.k0TKxtXf008408@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/asa

Log Message:
Directory /cvs/extras/rpms/asa added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 20:59:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 15:59:58 -0500
Subject: rpms/asa/devel - New directory
Message-ID: <200601292100.k0TL00IZ008423@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/asa/devel

Log Message:
Directory /cvs/extras/rpms/asa/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 21:00:20 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:00:20 -0500
Subject: rpms/asa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601292100.k0TL0M5D008466@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454

Added Files:
	Makefile import.log 
Log Message:
Setup of module asa


--- NEW FILE Makefile ---
# Top level Makefile for module asa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 21:00:25 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:00:25 -0500
Subject: rpms/asa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601292100.k0TL0ShY008486@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module asa


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 21:00:59 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:00:59 -0500
Subject: rpms/asa import.log,1.1,1.2
Message-ID: <200601292101.k0TL1WdR010261@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8522

Modified Files:
	import.log 
Log Message:
auto-import asa-1.2-1 on branch devel from asa-1.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/asa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 21:00:20 -0000	1.1
+++ import.log	29 Jan 2006 21:00:59 -0000	1.2
@@ -0,0 +1 @@
+asa-1_2-1:HEAD:asa-1.2-1.src.rpm:1138568410



From fedora-extras-commits at redhat.com  Sun Jan 29 21:01:06 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:01:06 -0500
Subject: rpms/asa/devel asa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200601292101.k0TL1cqB010265@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8522/devel

Modified Files:
	.cvsignore sources 
Added Files:
	asa.spec 
Log Message:
auto-import asa-1.2-1 on branch devel from asa-1.2-1.src.rpm


--- NEW FILE asa.spec ---
Name:           asa
Version:        1.2
Release:        1
Summary:        Convert Fortran carriage control characters

Group:          Development/Tools
License:        GPL
# version 1.1 is at that url.
URL:            http://www.ibiblio.org/pub/Linux/devel/lang/fortran/!INDEX.short.html
Source0:        http://archive.debian.org/debian-archive/dists/slink/main/source/text/asa_1.2.orig.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description

A POSIX.2 compliant asa(1), for converting Fortran carriage control
characters to line printer control characters.


%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT

%{__install} -d -m755 $RPM_BUILD_ROOT%{_bindir}/
%{__install} -d -m755 $RPM_BUILD_ROOT%{_mandir}/man1
%{__install} -m755 asa $RPM_BUILD_ROOT%{_bindir}/
%{__install} -m644 asa.1 $RPM_BUILD_ROOT%{_mandir}/man1/ 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING asa-example.doc
%{_bindir}/asa
%{_mandir}/*/asa*


%changelog
* Mon Dec 12 2005 Patrice Dumas <dumas at centre-cired.fr> - 1.2-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 21:00:25 -0000	1.1
+++ .cvsignore	29 Jan 2006 21:01:06 -0000	1.2
@@ -0,0 +1 @@
+asa_1.2.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 21:00:25 -0000	1.1
+++ sources	29 Jan 2006 21:01:06 -0000	1.2
@@ -0,0 +1 @@
+07c5951b7f893a46f014ff7ca9948dca  asa_1.2.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:06:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:06:39 -0500
Subject: rpms/asa/devel asa.spec,1.1,1.2
Message-ID: <200601292107.k0TL7FGk010351@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10332

Modified Files:
	asa.spec 
Log Message:
Add dist tag



Index: asa.spec
===================================================================
RCS file: /cvs/extras/rpms/asa/devel/asa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asa.spec	29 Jan 2006 21:01:06 -0000	1.1
+++ asa.spec	29 Jan 2006 21:06:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           asa
 Version:        1.2
-Release:        1
+Release:        1%{?dist}
 Summary:        Convert Fortran carriage control characters
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sun Jan 29 21:17:38 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun, 29 Jan 2006 16:17:38 -0500
Subject: rpms/libnjb/devel .cvsignore, 1.5, 1.6 libnjb.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200601292118.k0TLIA5I010484@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10463

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2005 18:46:48 -0000	1.5
+++ .cvsignore	29 Jan 2006 21:17:38 -0000	1.6
@@ -1 +1 @@
-libnjb-2.2.4.tar.gz
+libnjb-2.2.5.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnjb.spec	25 Jan 2006 21:12:33 -0000	1.5
+++ libnjb.spec	29 Jan 2006 21:17:38 -0000	1.6
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.4
-Release:	2%{?dist}
+Version:	2.2.5
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -105,6 +105,8 @@
 
 
 %changelog
+* Sun Jan 29 2006 Linus Walleij <triad at df.lth.se> 2.2.5-1
+- New upstream release.
 * Wed Jan 25 2006 Linus Walleij <triad at df.lth.se> 2.2.4-2
 - Fix udev problem, let go of hotplug, fix console perms.
 - Still working on libusb vs udev issues.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2005 18:46:48 -0000	1.5
+++ sources	29 Jan 2006 21:17:38 -0000	1.6
@@ -1 +1 @@
-2c61a997cd781e45bcb78e3469a0f0f0  libnjb-2.2.4.tar.gz
+f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:19:46 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun, 29 Jan 2006 16:19:46 -0500
Subject: rpms/libnjb/FC-4 .cvsignore, 1.5, 1.6 libnjb.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200601292120.k0TLKIT4010551@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10528

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2005 18:47:37 -0000	1.5
+++ .cvsignore	29 Jan 2006 21:19:46 -0000	1.6
@@ -1 +1 @@
-libnjb-2.2.4.tar.gz
+libnjb-2.2.5.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/libnjb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnjb.spec	12 Oct 2005 18:47:37 -0000	1.4
+++ libnjb.spec	29 Jan 2006 21:19:46 -0000	1.5
@@ -11,7 +11,7 @@
 #
 
 Name:		libnjb
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Sun Jan 29 2006 Linus Walleij <triad at df.lth.se> 2.2.5-1
+- New upstream release.
 * Wed Oct 12 2005 Linus Walleij <triad at df.lth.se> 2.2.4-1
 - New upstream release.
 * Mon Sep 19 2005 Linus Walleij <triad at df.lth.se> 2.2.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2005 18:47:37 -0000	1.5
+++ sources	29 Jan 2006 21:19:46 -0000	1.6
@@ -1 +1 @@
-2c61a997cd781e45bcb78e3469a0f0f0  libnjb-2.2.4.tar.gz
+f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:20:59 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun, 29 Jan 2006 16:20:59 -0500
Subject: rpms/libnjb/FC-3 .cvsignore, 1.5, 1.6 libnjb.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200601292121.k0TLLVoc010616@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10595

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2005 18:48:32 -0000	1.5
+++ .cvsignore	29 Jan 2006 21:20:59 -0000	1.6
@@ -1 +1 @@
-libnjb-2.2.4.tar.gz
+libnjb-2.2.5.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/libnjb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnjb.spec	12 Oct 2005 18:48:32 -0000	1.4
+++ libnjb.spec	29 Jan 2006 21:20:59 -0000	1.5
@@ -11,7 +11,7 @@
 #
 
 Name:		libnjb
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Sun Jan 29 2006 Linus Walleij <triad at df.lth.se> 2.2.5-1
+- New upstream release.
 * Wed Oct 12 2005 Linus Walleij <triad at df.lth.se> 2.2.4-1
 - New upstream release.
 * Mon Sep 19 2005 Linus Walleij <triad at df.lth.se> 2.2.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2005 18:48:32 -0000	1.5
+++ sources	29 Jan 2006 21:20:59 -0000	1.6
@@ -1 +1 @@
-2c61a997cd781e45bcb78e3469a0f0f0  libnjb-2.2.4.tar.gz
+f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:41:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 29 Jan 2006 16:41:06 -0500
Subject: rpms/fbdesk/devel fbdesk.spec,1.8,1.9
Message-ID: <200601292141.k0TLfcOJ010702@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fbdesk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10685

Modified Files:
	fbdesk.spec 
Log Message:
- modular X



Index: fbdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fbdesk.spec	6 Apr 2005 22:11:37 -0000	1.8
+++ fbdesk.spec	29 Jan 2006 21:41:06 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fbdesk
 Version:        1.2.1
-Release:        2
+Release:        3
 
 Summary:        Icon Manager for Fluxbox
 
@@ -9,10 +9,11 @@
 URL:            http://fluxbox.sourceforge.net/fbdesk/
 Source0:        http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:  XFree86-devel
 BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  pkgconfig
+BuildRequires:  libICE-devel libSM-devel libX11-devel libXext-devel
+BuildRequires:  libXft-devel libXpm-devel libXrender-devel
 Requires:       fluxbox
 
 %description
@@ -47,6 +48,10 @@
 
 
 %changelog
+* Sun Jan 29 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.1-3
+- modular X
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Jan 29 21:54:31 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:54:31 -0500
Subject: owners owners.list,1.577,1.578
Message-ID: <200601292155.k0TLt3gs010860@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10837

Modified Files:
	owners.list 
Log Message:
add asa



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- owners.list	29 Jan 2006 20:41:17 -0000	1.577
+++ owners.list	29 Jan 2006 21:54:30 -0000	1.578
@@ -46,6 +46,7 @@
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 21:56:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 29 Jan 2006 16:56:44 -0500
Subject: rpms/fbdesk/devel fbdesk.spec,1.9,1.10
Message-ID: <200601292157.k0TLvGY0010883@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fbdesk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10841

Modified Files:
	fbdesk.spec 
Log Message:
- more modular x fixes



Index: fbdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fbdesk.spec	29 Jan 2006 21:41:06 -0000	1.9
+++ fbdesk.spec	29 Jan 2006 21:56:44 -0000	1.10
@@ -26,7 +26,7 @@
 
 
 %build
-%configure
+%configure --x-includes=%{_includedir} --x-libraries=%{_libdir}
 %{__make} %{?_smp_mflags}
 
 %{__make} check



From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:03 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:03 -0500
Subject: rpms/xfce4-screenshooter-plugin - New directory
Message-ID: <200601292356.k0TNu5To016292@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16275/xfce4-screenshooter-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-screenshooter-plugin added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:08 -0500
Subject: rpms/xfce4-screenshooter-plugin/devel - New directory
Message-ID: <200601292356.k0TNuAt8016323@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16275/xfce4-screenshooter-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-screenshooter-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:27 -0500
Subject: rpms/xfce4-screenshooter-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601292356.k0TNuT5r016409@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16389

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-screenshooter-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-screenshooter-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:32 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:32 -0500
Subject: rpms/xfce4-screenshooter-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601292356.k0TNuY07016445@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16389/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-screenshooter-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 23:57:25 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:57:25 -0500
Subject: rpms/xfce4-screenshooter-plugin import.log,1.1,1.2
Message-ID: <200601292357.k0TNvv7N016748@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16619

Modified Files:
	import.log 
Log Message:
auto-import xfce4-screenshooter-plugin-0.0.8-1.fc4 on branch devel from xfce4-screenshooter-plugin-0.0.8-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 23:56:26 -0000	1.1
+++ import.log	29 Jan 2006 23:57:24 -0000	1.2
@@ -0,0 +1 @@
+xfce4-screenshooter-plugin-0_0_8-1_fc4:HEAD:xfce4-screenshooter-plugin-0.0.8-1.fc4.src.rpm:1138579037



From fedora-extras-commits at redhat.com  Sun Jan 29 23:57:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:57:30 -0500
Subject: rpms/xfce4-screenshooter-plugin/devel
	xfce4-screenshooter-plugin.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601292358.k0TNw3Jp016768@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16619/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
auto-import xfce4-screenshooter-plugin-0.0.8-1.fc4 on branch devel from xfce4-screenshooter-plugin-0.0.8-1.fc4.src.rpm


--- NEW FILE xfce4-screenshooter-plugin.spec ---
Name:		xfce4-screenshooter-plugin
Version:	0.0.8
Release:	1%{?dist}
Summary:	Screenshot utility for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
The Screenshooter plugin allows you to take screenshots from the Xfce panel.

%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 -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 23:56:32 -0000	1.1
+++ .cvsignore	29 Jan 2006 23:57:30 -0000	1.2
@@ -0,0 +1 @@
+xfce4-screenshooter-plugin-0.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 23:56:32 -0000	1.1
+++ sources	29 Jan 2006 23:57:30 -0000	1.2
@@ -0,0 +1 @@
+b9195d25ae587ae3f48cd2b215cd45d3  xfce4-screenshooter-plugin-0.0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 00:14:52 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:14:52 -0500
Subject: rpms/lagan - New directory
Message-ID: <200601300014.k0U0EscZ019207@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19189/lagan

Log Message:
Directory /cvs/extras/rpms/lagan added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 00:14:57 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:14:57 -0500
Subject: rpms/lagan/devel - New directory
Message-ID: <200601300014.k0U0ExWc019222@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19189/lagan/devel

Log Message:
Directory /cvs/extras/rpms/lagan/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 00:15:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:15:17 -0500
Subject: rpms/lagan Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601300015.k0U0FJXI019258@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19246

Added Files:
	Makefile import.log 
Log Message:
Setup of module lagan


--- NEW FILE Makefile ---
# Top level Makefile for module lagan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 30 00:15:28 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:15:28 -0500
Subject: rpms/lagan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601300015.k0U0FUfA019278@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19246/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lagan


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 30 00:16:15 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:16:15 -0500
Subject: rpms/lagan import.log,1.1,1.2
Message-ID: <200601300016.k0U0GlqQ019361@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321

Modified Files:
	import.log 
Log Message:
auto-import lagan-1.21-1 on branch devel from lagan-1.21-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lagan/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Jan 2006 00:15:17 -0000	1.1
+++ import.log	30 Jan 2006 00:16:15 -0000	1.2
@@ -0,0 +1 @@
+lagan-1_21-1:HEAD:lagan-1.21-1.src.rpm:1138580166



From fedora-extras-commits at redhat.com  Mon Jan 30 00:16:21 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:16:21 -0500
Subject: rpms/lagan/devel lagan.spec, NONE, 1.1 lagan12-chris.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601300016.k0U0Gr5w019365@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lagan.spec lagan12-chris.patch 
Log Message:
auto-import lagan-1.21-1 on branch devel from lagan-1.21-1.src.rpm


--- NEW FILE lagan.spec ---
Name:           lagan
Version:        1.21
Release:        1%{?dist}
Summary:        Local, global, and multiple alignment of DNA sequences

Group:          Applications/Engineering
License:        GPL
URL:            http://lagan.stanford.edu
Source0:        http://lagan.stanford.edu/lagan_web/lagan12.tar.gz
Patch0:         lagan12-chris.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
LAGAN toolkit is a set of tools for local, global, and multiple alignment of
DNA sequences.  Please visit http://lagan.stanford.edu for publications
describing LAGAN and its components.

The 4 main parts of LAGAN are:

1. CHAOS local alignment tool
2. LAGAN pairwise global alignment tool
3. MLAGAN multiple global alignment tool.
4. Shuffle-LAGAN pairwise glocal alignment


%prep
%setup -q -n lagan12
%patch0 -p1 -b .chris
sed -i 's/^CC .*$/CC = gcc $(RPM_OPT_FLAGS)/;
	s/^CPP .*$/CPP = g++ $(RPM_OPT_FLAGS)/' Makefile
sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' *.c* utils/*.c*
sed -i 's|$ENV{LAGAN_DIR}|"%_libdir/lagan"|g' *.pl utils/*.pl
sed -i 's|$LAGAN_DIR|%_libdir/lagan|g' Readmes/README.shuffle


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%_bindir $RPM_BUILD_ROOT/%_libdir/lagan/utils
install -m755 chaos ${RPM_BUILD_ROOT}%{_bindir}
install -m755 mlagan ${RPM_BUILD_ROOT}%{_bindir}
install -m755 lagan.pl ${RPM_BUILD_ROOT}%{_bindir}/lagan
install -m755 slagan.pl ${RPM_BUILD_ROOT}%{_bindir}/slagan
for f in anal_gloc.pl anchors glocal order rechaos.pl; do
  install -m755 $f $RPM_BUILD_ROOT/%_libdir/lagan
done
for f in bin2bl bin2mf cextract cmerge2.pl contigorder cstat dotplot \
  draft.pl fa2xfa getbounds getcontigpos getlength getoverlap Glue \
  mextract.pl mf2bin.pl mpretty.pl mproject.pl mrunfile.pl mrunpairs.pl \
  mrun.pl mviz.pl rc scorealign scorecontigs seqmerge; do
  install -m755 utils/$f $RPM_BUILD_ROOT/%_libdir/lagan/utils
done
install -m644 *.txt $RPM_BUILD_ROOT/%_libdir/lagan
rm -f Readmes/*.chris


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Readmes/* sample.*
%_bindir/chaos
%_bindir/lagan
%_bindir/mlagan
%_bindir/slagan
%_libdir/lagan/



%changelog
* Mon Jan 30 2006 Christian Iseli <Christian.Iseli at licr.org> 1.21-1
 - Use _libdir instead of _libexecdir and kill all LAGAN_DIR refs.

* Thu Nov 17 2005 Christian Iseli <Christian.Iseli at licr.org> 1.21-0
 - Create spec file.

lagan12-chris.patch:

--- NEW FILE lagan12-chris.patch ---
--- lagan12/utils/scorecontigs.c.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/scorecontigs.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <assert.h>
@@ -234,6 +235,13 @@
   return r;
 }
 
+inline int getdata (rangelist **ranges, int *offs, int j, int i){
+  i -= offs[j];
+  if (i >= 0 && i < ranges[j]->seqlen)
+    return ranges[j]->score[i];
+  return 0;
+}
+
 inline int match (rangelist **ranges, int numContigs, int i, int j, int *offs){
   int k;
   for (k = 0; k < numContigs; k++)
@@ -257,13 +265,6 @@
   printf ("\n");
 }
 
-inline int getdata (rangelist **ranges, int *offs, int j, int i){
-  i -= offs[j];
-  if (i >= 0 && i < ranges[j]->seqlen)
-    return ranges[j]->score[i];
-  return 0;
-}
-
 void printRanges (rangelist **ranges, int numContigs, int seqLen, int *offs){
   int i, j, start = 0, end;
   int *score = (int *) malloc (sizeof (int) * numContigs);
--- lagan12/utils/getbounds.c.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/getbounds.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
--- lagan12/utils/mrunpairs.pl.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/mrunpairs.pl	2006-01-30 01:05:25.000000000 +0100
@@ -5,7 +5,7 @@
 
 # VISTA .plotfile defaults
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +87,6 @@
     @params[++$j] = "\"()\"";
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -189,7 +184,7 @@
 	$mparams = "$mparams $s";
     }
     
-    $mlagan = "$lagandir/mlagan$mfiles$mparams > $outprefix.out";
+    $mlagan = "mlagan$mfiles$mparams > $outprefix.out";
     print "\n$mlagan\n\n";
     if(`$mlagan`) { print "\n\n"; exit(1); }
 
--- lagan12/utils/draft.pl.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/draft.pl	2006-01-30 01:05:25.000000000 +0100
@@ -109,7 +109,7 @@
     $skip1 = $skip2 = 0;
     # make alignments
     if (!$lazyflag || !(-e "$contigs[$i].mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
@@ -128,7 +128,7 @@
     }
 
     if (!$lazyflag || !(-e "$contigs[$i].rc.mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
--- lagan12/utils/mrunfile.pl.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/mrunfile.pl	2006-01-30 01:05:25.000000000 +0100
@@ -8,7 +8,7 @@
     exit(1);
 }
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 
 $filename = $ARGV[0];
@@ -48,11 +48,6 @@
     }
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 if ($pairwise) {
     $mexecs = "mrunpairs.pl";
 } else {
--- lagan12/utils/getlength.c.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/getlength.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <assert.h>
--- lagan12/utils/mviz.pl.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/mviz.pl	2006-01-30 01:05:25.000000000 +0100
@@ -4,7 +4,7 @@
 # This script requires the environment variables:
 # LAGAN_DIR and VISTA_DIR
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -57,11 +57,6 @@
 
 $seqfile = @ARGV[0];
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 for ($i=0; $i<@vparams; $i+=2) {
     if (@vparams[$i] eq "--regmin") { $paregmin = @vparams[$i+1]; }
     elsif (@vparams[$i] eq "--regmax") { $paregmax = @vparams[$i+1]; }
--- lagan12/utils/scorealign.c.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/scorealign.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <assert.h>
 #include <math.h>
@@ -401,10 +402,6 @@
   char *lagan_dir;
 
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir){
-    fprintf (stderr, "Error: $LAGAN_DIR not set.\n");
-    exit (1);
-  }
 
   sprintf (line, "%s/%s", lagan_dir, filename);
   fprintf (stderr, "%s\n", line);
--- lagan12/utils/seqmerge.c.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/seqmerge.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
--- lagan12/utils/mrun.pl.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/mrun.pl	2006-01-30 01:05:25.000000000 +0100
@@ -5,7 +5,7 @@
 
 # VISTA .plotfile defaults
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +87,6 @@
     exit(1);
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/utils/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -169,7 +164,7 @@
     $mparams = "$mparams $s";
 }
 
-$mlagan = "$lagandir/mlagan$mfiles$mparams > $prefix.out";
+$mlagan = "mlagan$mfiles$mparams > $prefix.out";
 print STDERR "\n$mlagan\n\n";
 if(`$mlagan`) { print "\n\n"; exit(1); }
 
--- lagan12/slagan.pl.chris	2003-10-20 13:29:56.000000000 +0200
+++ lagan12/slagan.pl	2006-01-30 01:05:25.000000000 +0100
@@ -84,7 +84,7 @@
 chomp $seq1len;
 chomp $seq2len;
 
-`$lagandir/chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
+`chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
 if ($?) { exit(1); }
 `$lagandir/glocal chaos.$$ $glocal_fl > out.$$`;
 @regs = `$lagandir/anal_gloc.pl < out.$$`;
@@ -138,7 +138,7 @@
     if ($extra2) {
        `$lagandir/utils/fa2xfa $seq2 $startreg2 $endreg2 2 $rcf > seq2$k.$$.masked\n`;
     }
-   `$lagandir/lagan.pl seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
+   `lagan seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
     $suff = "";
     if ($outfile) {
 	$suff = " >> $outfile";
--- lagan12/mlagan.c.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/mlagan.c	2006-01-30 01:05:25.000000000 +0100
@@ -824,10 +824,6 @@
 
   outfile = stdout;
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir) {
-    fprintf(stderr, "Environment variable LAGAN_DIR not set\n");
-    exit(1);
-  }
 
   buildcache();
   initLib();
--- lagan12/translate.c.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/translate.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "fchaos.h"
 #include "translate.h"
 #include "assert.h"
--- lagan12/lagan.pl.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/lagan.pl	2006-01-30 01:05:25.000000000 +0100
@@ -105,13 +105,13 @@
 	$rundraft = 1;
     }
     elsif ($ARGV[$i] =~ /-cons/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-draftskipfr/){
-	$draftparams = $draftparams." -skipfr $ARGV[$++i]";
+	$draftparams = $draftparams." -skipfr ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-lazy/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
 
     else {
@@ -233,7 +233,7 @@
 #    `$lagandir/utils/rm $infofilename` if ($binfile);
 }
 
-`rm $secondName` if ($rcflag);
+`rm $secondName` if ($rcFlag);
 `rm $$.*`;
 if ($?) { exit(1); }
 
--- lagan12/Readmes/README.FIRST.chris	2003-11-10 11:30:28.000000000 +0100
+++ lagan12/Readmes/README.FIRST	2006-01-30 01:05:25.000000000 +0100
@@ -30,8 +30,7 @@
 glocal as well as many tools in the utils directory. 
 
 You may also need to go into all the .pl file, and change the first line
-to call your perl interpreter. You must also specify an environment
-variable $LAGAN_DIR to point to the directory where you installed LAGAN.
+to call your perl interpreter.
 
 Because LAGAN uses no system-dependent or implementation dependent 
 libraries it should compile on all platforms and ANSI C compilers. 
--- lagan12/Readmes/README.shuffle.chris	2003-09-23 13:08:17.000000000 +0200
+++ lagan12/Readmes/README.shuffle	2006-01-30 01:05:25.000000000 +0100
@@ -13,14 +13,13 @@
 If you received Shuffle-LAGAN as part of the LAGAN toolkit it is installed 
 automatically with the rest of the package. If you got it seperately, you 
 should merge the included files into the directories used by CHAOS and 
-LAGAN (i.e. contents of the utils subdirectory should go into 
-$LAGAN_DIR/utils). The code assumes $LAGAN_DIR has been set. 
+LAGAN.
 
 
 2. Running
 Just give it two sequences and let it roll:
 
-#slagan.pl seq1.fa seq2.fa 
+#slagan seq1.fa seq2.fa 
 
 3. Input
 
--- lagan12/Readmes/README.chaos.chris	2003-11-10 11:32:58.000000000 +0100
+++ lagan12/Readmes/README.chaos	2006-01-30 01:05:25.000000000 +0100
@@ -29,13 +29,7 @@
 
 Because CHAOS uses no system-dependent or implementation dependent libraries
 it should compile on all platforms and ANSI C compilers. If you have problems
-compiling the sources please e-mail the author. You will need to also set the
-environment variable LAGAN_DIR to the directory where you installed CHAOS. in
-c-shell this can be done by executing
-
-% setenv LAGAN_DIR `pwd`
-
-on the prompt. For other shells the command differs.
+compiling the sources please e-mail the author.
 
 II Description
    CHAOS is a heuristic local alignment tool optimized for non-coding 
--- lagan12/Readmes/README.lagan.chris	2003-09-23 14:35:27.000000000 +0200
+++ lagan12/Readmes/README.lagan	2006-01-30 01:05:25.000000000 +0100
@@ -20,7 +20,7 @@
 3. Doing global alignment in a limited area of thw NW matrix given the set of 
 anchors (order tool).
 
-lagan.pl is the main executable that calls the three steps.
+lagan is the main executable that calls the three steps.
 
 II Usage
 
--- lagan12/rechaos.pl.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/rechaos.pl	2006-01-30 01:05:25.000000000 +0100
@@ -181,11 +181,11 @@
 #    print STDERR "-----------------\n";
 #    print STDERR `cat $$.anchs.pairs`;
 #    print STDERR "-----------------\n";
-#    print STDERR "$lagandir/chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
+#    print STDERR "chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
 
 # PERFORM THE ALIGNMENTS USING CHAOS
 
-    `$lagandir/chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
+    `chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
     if ($?) { exit(1); }
 
 # ADD IN BOUNDARIES
@@ -238,7 +238,6 @@
     @b2new = 0;
     @e1new = 0;
     @e2new = 0;
-    @scores = 0;
 
     $app_str = "";
     
--- lagan12/global.c.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/global.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,5 +1,6 @@
 #include "global.h"
 #include <stdlib.h>
+#include <stdio.h>
 
 extern int indeces[256];
 
--- lagan12/glocal.c.chris	2006-01-30 01:05:40.000000000 +0100
+++ lagan12/glocal.c	2006-01-30 01:06:36.000000000 +0100
@@ -123,9 +123,9 @@
     
     /* Put -infinity in cBound and dBound and rightCBound */
     
-    cBound * c = createCBound ( LONG_MIN / 2, dummyownerLeft );
-    dBound * d = createDBound ( LONG_MIN / 2, dummyownerLeft );
-    dBound * rightC = createDBound ( LONG_MIN / 2, dummyownerRight );
+    cBound * c = createCBound ( INT_MIN / 2, dummyownerLeft );
+    dBound * d = createDBound ( INT_MIN / 2, dummyownerLeft );
+    dBound * rightC = createDBound ( INT_MIN / 2, dummyownerRight );
 
     insertCBound ( cBoundTreeRoot[i], c, i );
     insertDBound ( dBoundTreeRoot[i], d, i );
@@ -1680,7 +1680,7 @@
 	    
 	if ( ( cSucc != NULL ) && 
 	     ( cSucc->intpoint == NULL ) &&
-	     ( cSucc->column != LONG_MIN / 2 ) ){
+	     ( cSucc->column != INT_MIN / 2 ) ){
 
 	  point * intpt = createPoint ( ( cSucc->column - ( curpoint->y - curpoint->x ) ),
 					( cSucc->column ),
@@ -1848,7 +1848,7 @@
 	    
 	// Add intersection of d->diagonal and curpoint->column.
 	
-	if ( d->diagonal != LONG_MIN / 2 ){
+	if ( d->diagonal != INT_MIN / 2 ){
 	  
 	  point * intpt = createPoint ( ( curpoint->y - d->diagonal ),
 					( curpoint->y ),
@@ -1905,7 +1905,7 @@
 	      
 	  if ( ( dPred != NULL ) && 
 	       ( dPred->intpoint == NULL ) &&
-	       ( dPred->diagonal != LONG_MIN / 2 ) ){
+	       ( dPred->diagonal != INT_MIN / 2 ) ){
 	    
 	    point * intpt = createPoint ( ( curpoint->y - dPred->diagonal ),
 					  ( curpoint->y ),
@@ -2279,7 +2279,7 @@
     
     if ( ( dPred != NULL ) && 
 	 ( dPred->intpoint == NULL ) &&
-	 ( dPred->diagonal !=  LONG_MIN / 2 ) ){
+	 ( dPred->diagonal !=  INT_MIN / 2 ) ){
       
       point * intpt = createPoint ( ( curpoint->y - dPred->diagonal ),
 				    ( curpoint->y ),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2006 00:15:28 -0000	1.1
+++ .cvsignore	30 Jan 2006 00:16:20 -0000	1.2
@@ -0,0 +1 @@
+lagan12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2006 00:15:28 -0000	1.1
+++ sources	30 Jan 2006 00:16:20 -0000	1.2
@@ -0,0 +1 @@
+e45c9287d04b31924115869588f1fb61  lagan12.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 00:32:02 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 19:32:02 -0500
Subject: owners owners.list,1.578,1.579
Message-ID: <200601300032.k0U0WZ89019510@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19491

Modified Files:
	owners.list 
Log Message:
add xfce4-screenshooter-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- owners.list	29 Jan 2006 21:54:30 -0000	1.578
+++ owners.list	30 Jan 2006 00:32:02 -0000	1.579
@@ -1343,6 +1343,7 @@
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-quicklauncher-plugin|Quicklauncher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-screenshooter-plugin|Screenshot utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 30 00:34:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:34:58 -0500
Subject: owners owners.list,1.579,1.580
Message-ID: <200601300035.k0U0ZU1O019547@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19528

Modified Files:
	owners.list 
Log Message:
Add lagan


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- owners.list	30 Jan 2006 00:32:02 -0000	1.579
+++ owners.list	30 Jan 2006 00:34:58 -0000	1.580
@@ -480,6 +480,7 @@
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 30 09:58:33 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 30 Jan 2006 04:58:33 -0500
Subject: rpms/js/devel js.spec,1.8,1.9
Message-ID: <200601300959.k0U9x6L9006167@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6148

Modified Files:
	js.spec 
Log Message:
Fix .pc file.



Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- js.spec	26 Jan 2006 14:59:14 -0000	1.8
+++ js.spec	30 Jan 2006 09:58:33 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -48,7 +48,7 @@
 %{__cp} src/perlconnect/README.html src/README.perlconnect.html
 
 # Create pkgconfig file
-%{__cat} > libjs.pc << EOF
+%{__cat} > libjs.pc << 'EOF'
 prefix=%{_prefix}
 exec_prefix=${_prefix}
 libdir=${_libdir}
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-2
+- Fix .pc file.
+
 * Thu Jan 26 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-1
 - Update to 1.5.0 final.
 - Spec file cleanups.



From fedora-extras-commits at redhat.com  Mon Jan 30 10:16:08 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 30 Jan 2006 05:16:08 -0500
Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.8, 1.9 scim-anthy.spec, 1.23,
	1.24 sources, 1.10, 1.11 scim-anthy-wide-latin.diff, 1.1, NONE
Message-ID: <200601301016.k0UAGek5008114@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088

Modified Files:
	.cvsignore scim-anthy.spec sources 
Removed Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
- New upstream release.
- scim-anthy-wide-latin.diff: removed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Dec 2005 11:48:41 -0000	1.8
+++ .cvsignore	30 Jan 2006 10:16:07 -0000	1.9
@@ -1,3 +1,4 @@
 scim-anthy-0.6.1.tar.gz
 scim-anthy-0.7.1.tar.gz
 scim-anthy-0.8.0.tar.gz
+scim-anthy-0.9.0.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scim-anthy.spec	24 Jan 2006 03:39:30 -0000	1.23
+++ scim-anthy.spec	30 Jan 2006 10:16:07 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           scim-anthy
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,7 +8,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
-Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -48,6 +46,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
+- New upstream release.
+- scim-anthy-wide-latin.diff: removed.
+
 * Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
 - scim-anthy-wide-latin.diff: applied to fix a problem that the input character
   appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2005 11:48:41 -0000	1.10
+++ sources	30 Jan 2006 10:16:07 -0000	1.11
@@ -1 +1 @@
-869df30ecbbbfe43b0758f3b074ed0c9  scim-anthy-0.8.0.tar.gz
+5e4742d011cdbf3554cc276f74a11ea9  scim-anthy-0.9.0.tar.gz


--- scim-anthy-wide-latin.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 30 10:21:32 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 30 Jan 2006 05:21:32 -0500
Subject: rpms/scim-anthy/FC-3 .cvsignore, 1.7, 1.8 scim-anthy.spec, 1.16,
	1.17 sources, 1.8, 1.9 scim-anthy-wide-latin.diff, 1.1, NONE
Message-ID: <200601301022.k0UAM43R008243@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8215

Modified Files:
	.cvsignore scim-anthy.spec sources 
Removed Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
- New upstream release.
- scim-anthy-wide-latin.diff: removed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Dec 2005 11:39:47 -0000	1.7
+++ .cvsignore	30 Jan 2006 10:21:32 -0000	1.8
@@ -1,3 +1,4 @@
 scim-anthy-0.6.1.tar.gz
 scim-anthy-0.7.1.tar.gz
 scim-anthy-0.8.0.tar.gz
+scim-anthy-0.9.0.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-anthy.spec	24 Jan 2006 04:21:22 -0000	1.16
+++ scim-anthy.spec	30 Jan 2006 10:21:32 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           scim-anthy
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,7 +8,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
-Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -48,6 +46,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
+- New upstream release.
+- scim-anthy-wide-latin.diff: removed.
+
 * Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
 - scim-anthy-wide-latin.diff: applied to fix a problem that the input character
   appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Dec 2005 11:39:47 -0000	1.8
+++ sources	30 Jan 2006 10:21:32 -0000	1.9
@@ -1 +1 @@
-869df30ecbbbfe43b0758f3b074ed0c9  scim-anthy-0.8.0.tar.gz
+5e4742d011cdbf3554cc276f74a11ea9  scim-anthy-0.9.0.tar.gz


--- scim-anthy-wide-latin.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 30 10:58:28 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 30 Jan 2006 05:58:28 -0500
Subject: rpms/mail-notification/devel mail-notification.spec,1.15,1.16
Message-ID: <200601301059.k0UAx1XW008556@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8535

Modified Files:
	mail-notification.spec 
Log Message:
rebuild


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mail-notification.spec	17 Jan 2006 18:07:27 -0000	1.15
+++ mail-notification.spec	30 Jan 2006 10:58:28 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-10
+- rebuild
+
 * Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-9
 - fixes for evolution >= 2.5
 



From fedora-extras-commits at redhat.com  Mon Jan 30 13:42:32 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Jan 2006 08:42:32 -0500
Subject: rpms/tinyerp/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tinyerp-client.patch, 1.3, 1.4 tinyerp-server.patch, 1.4,
	1.5 tinyerp.spec, 1.10, 1.11
Message-ID: <200601301343.k0UDh4Bd014675@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14637

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream tinyerp 3.2.1
- fixed filename for the czech translation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2006 09:14:04 -0000	1.5
+++ .cvsignore	30 Jan 2006 13:42:31 -0000	1.6
@@ -1,2 +1,2 @@
-tinyerp-client-3.2.0.tar.gz
-tinyerp-server-3.2.0.tar.gz
+tinyerp-client-3.2.1.tgz
+tinyerp-server-3.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2006 09:14:04 -0000	1.5
+++ sources	30 Jan 2006 13:42:31 -0000	1.6
@@ -1,2 +1,2 @@
-e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
-6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz
+5e588d39d139f6b66c9f66e59e089d4c  tinyerp-client-3.2.1.tgz
+4acbbd8e8fac798ea3e9da08e076b465  tinyerp-server-3.2.1.tgz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-client.patch	25 Jan 2006 09:14:04 -0000	1.3
+++ tinyerp-client.patch	30 Jan 2006 13:42:31 -0000	1.4
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
---- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
-+++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py
+--- client.orig/bin/tinyerp-client.py	2006-01-27 11:50:28.000000000 +0100
++++ client/bin/tinyerp-client.py	2006-01-30 14:22:52.000000000 +0100
 @@ -73,14 +73,13 @@
  import pango
  
@@ -20,3 +20,15 @@
  
  import options
  
+diff -Nru client.orig/setup.py client/setup.py
+--- client.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ client/setup.py	2006-01-30 14:22:58.000000000 +0100
+@@ -18,7 +18,7 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-client'
+-version = '3.2.0'
++version = '3.2.1'
+ 
+ # get python short version
+ py_short_version = '%s.%s' % sys.version_info[:2]

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp-server.patch	25 Jan 2006 09:14:04 -0000	1.4
+++ tinyerp-server.patch	30 Jan 2006 13:42:31 -0000	1.5
@@ -1,7 +1,13 @@
-diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
---- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
-+++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
-@@ -26,9 +26,11 @@
+diff -Nru server.orig/setup.py server/setup.py
+--- server.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ server/setup.py	2006-01-30 14:23:25.000000000 +0100
+@@ -21,14 +21,16 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-server'
+-version = '3.2.0'
++version = '3.2.1'
+ 
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec	25 Jan 2006 09:14:04 -0000	1.10
+++ tinyerp.spec	30 Jan 2006 13:42:31 -0000	1.11
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.2.0
+Version:	3.2.1
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz
-Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
+Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz
+Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -51,18 +51,20 @@
 %patch1
 
 %build
-cd tinyerp-client-%{version}
+cd client
+# fix filename for the czech translation
+mv bin/po/cz.po bin/po/cs.po
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd client
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ..
 %find_lang tinyerp-client
@@ -135,6 +137,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dan Horak <dan at danny.cz> 3.2.1-1
+- update to upstream tinyerp 3.2.1
+- fixed filename for the czech translation
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script



From fedora-extras-commits at redhat.com  Mon Jan 30 13:52:51 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Jan 2006 08:52:51 -0500
Subject: rpms/tinyerp/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tinyerp-client.patch, 1.3, 1.4 tinyerp-server.patch, 1.4,
	1.5 tinyerp.spec, 1.12, 1.13
Message-ID: <200601301353.k0UDrO6s014785@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14752

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream tinyerp 3.2.1
- fixed filename for the czech translation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2006 08:40:27 -0000	1.5
+++ .cvsignore	30 Jan 2006 13:52:51 -0000	1.6
@@ -1,2 +1,2 @@
-tinyerp-client-3.2.0.tar.gz
-tinyerp-server-3.2.0.tar.gz
+tinyerp-client-3.2.1.tgz
+tinyerp-server-3.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2006 08:40:27 -0000	1.5
+++ sources	30 Jan 2006 13:52:51 -0000	1.6
@@ -1,2 +1,2 @@
-e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
-6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz
+5e588d39d139f6b66c9f66e59e089d4c  tinyerp-client-3.2.1.tgz
+4acbbd8e8fac798ea3e9da08e076b465  tinyerp-server-3.2.1.tgz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-client.patch	25 Jan 2006 08:40:27 -0000	1.3
+++ tinyerp-client.patch	30 Jan 2006 13:52:51 -0000	1.4
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
---- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
-+++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py
+--- client.orig/bin/tinyerp-client.py	2006-01-27 11:50:28.000000000 +0100
++++ client/bin/tinyerp-client.py	2006-01-30 14:22:52.000000000 +0100
 @@ -73,14 +73,13 @@
  import pango
  
@@ -20,3 +20,15 @@
  
  import options
  
+diff -Nru client.orig/setup.py client/setup.py
+--- client.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ client/setup.py	2006-01-30 14:22:58.000000000 +0100
+@@ -18,7 +18,7 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-client'
+-version = '3.2.0'
++version = '3.2.1'
+ 
+ # get python short version
+ py_short_version = '%s.%s' % sys.version_info[:2]

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp-server.patch	25 Jan 2006 08:40:27 -0000	1.4
+++ tinyerp-server.patch	30 Jan 2006 13:52:51 -0000	1.5
@@ -1,7 +1,13 @@
-diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
---- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
-+++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
-@@ -26,9 +26,11 @@
+diff -Nru server.orig/setup.py server/setup.py
+--- server.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ server/setup.py	2006-01-30 14:23:25.000000000 +0100
+@@ -21,14 +21,16 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-server'
+-version = '3.2.0'
++version = '3.2.1'
+ 
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tinyerp.spec	25 Jan 2006 08:40:27 -0000	1.12
+++ tinyerp.spec	30 Jan 2006 13:52:51 -0000	1.13
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.2.0
+Version:	3.2.1
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz
-Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
+Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz
+Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -51,18 +51,20 @@
 %patch1
 
 %build
-cd tinyerp-client-%{version}
+cd client
+# fix filename for the czech translation
+mv bin/po/cz.po bin/po/cs.po
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd client
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ..
 %find_lang tinyerp-client
@@ -135,6 +137,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dan Horak <dan at danny.cz> 3.2.1-1
+- update to upstream tinyerp 3.2.1
+- fixed filename for the czech translation
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script



From fedora-extras-commits at redhat.com  Mon Jan 30 13:56:00 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Jan 2006 08:56:00 -0500
Subject: rpms/tinyerp/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tinyerp-client.patch, 1.3, 1.4 tinyerp-server.patch, 1.3,
	1.4 tinyerp.spec, 1.13, 1.14
Message-ID: <200601301356.k0UDuXoX014878@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14843

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream tinyerp 3.2.1
- fixed filename for the czech translation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2006 09:24:24 -0000	1.5
+++ .cvsignore	30 Jan 2006 13:56:00 -0000	1.6
@@ -1,2 +1,2 @@
-tinyerp-client-3.2.0.tar.gz
-tinyerp-server-3.2.0.tar.gz
+tinyerp-client-3.2.1.tgz
+tinyerp-server-3.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2006 09:24:24 -0000	1.5
+++ sources	30 Jan 2006 13:56:00 -0000	1.6
@@ -1,2 +1,2 @@
-e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
-6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz
+5e588d39d139f6b66c9f66e59e089d4c  tinyerp-client-3.2.1.tgz
+4acbbd8e8fac798ea3e9da08e076b465  tinyerp-server-3.2.1.tgz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-client.patch	25 Jan 2006 09:22:50 -0000	1.3
+++ tinyerp-client.patch	30 Jan 2006 13:56:00 -0000	1.4
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
---- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
-+++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py
+--- client.orig/bin/tinyerp-client.py	2006-01-27 11:50:28.000000000 +0100
++++ client/bin/tinyerp-client.py	2006-01-30 14:22:52.000000000 +0100
 @@ -73,14 +73,13 @@
  import pango
  
@@ -20,3 +20,15 @@
  
  import options
  
+diff -Nru client.orig/setup.py client/setup.py
+--- client.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ client/setup.py	2006-01-30 14:22:58.000000000 +0100
+@@ -18,7 +18,7 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-client'
+-version = '3.2.0'
++version = '3.2.1'
+ 
+ # get python short version
+ py_short_version = '%s.%s' % sys.version_info[:2]

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server.patch	25 Jan 2006 09:40:10 -0000	1.3
+++ tinyerp-server.patch	30 Jan 2006 13:56:00 -0000	1.4
@@ -1,7 +1,13 @@
-diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
---- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
-+++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
-@@ -26,9 +26,11 @@
+diff -Nru server.orig/setup.py server/setup.py
+--- server.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ server/setup.py	2006-01-30 14:23:25.000000000 +0100
+@@ -21,14 +21,16 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-server'
+-version = '3.2.0'
++version = '3.2.1'
+ 
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tinyerp.spec	25 Jan 2006 09:40:10 -0000	1.13
+++ tinyerp.spec	30 Jan 2006 13:56:00 -0000	1.14
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.2.0
-Release:	2%{?dist}
+Version:	3.2.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz
-Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
+Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz
+Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -52,18 +52,19 @@
 %patch1
 
 %build
-cd tinyerp-client-%{version}
+cd client
+mv bin/po/cz.po bin/po/cs.po
 /usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd client
 /usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ..
 %find_lang tinyerp-client
@@ -136,6 +137,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dan Horak <dan at danny.cz> 3.2.1-1
+- update to upstream tinyerp 3.2.1
+- fixed filename for the czech translation
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-2
 - add updated server patch
 



From fedora-extras-commits at redhat.com  Mon Jan 30 16:00:43 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 30 Jan 2006 11:00:43 -0500
Subject: rpms/octave-forge/FC-4 .cvsignore, 1.4, 1.5 octave-forge.spec, 1.19,
	1.20 sources, 1.4, 1.5 octave-forge-2005.06.13-legend.patch, 1.1, NONE
Message-ID: <200601301601.k0UG1F7l020542@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18821

Modified Files:
	.cvsignore octave-forge.spec sources 
Removed Files:
	octave-forge-2005.06.13-legend.patch 
Log Message:
New upstream release & various specfile changes.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 14:25:54 -0000	1.4
+++ .cvsignore	30 Jan 2006 16:00:43 -0000	1.5
@@ -1 +1 @@
-octave-forge-2005.06.13.patched.tar.gz
+octave-forge-2006.01.28.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- octave-forge.spec	12 Nov 2005 01:53:50 -0000	1.19
+++ octave-forge.spec	30 Jan 2006 16:00:43 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           octave-forge
-Version:        2005.06.13
-Release:        11%{?dist}
+Version:        2006.01.28
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,15 +15,9 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
-Patch0:         %{name}-2005.06.13-legend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
-## Octave-forge installs in a directory tree specific to the installed
-## version of octave, so the following version dependency is necessary.
-%define octave_ep  6
-%define octave_ver %(echo "disp(octave_config_info.version)" | octave -qf)
-Requires:	octave = %{octave_ep}:%{octave_ver} ImageMagick
+Requires:       octave >= 2.1.69 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel
 BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel pcre-devel
 BuildRequires:  ncurses-devel libtermcap-devel gsl-devel qhull-devel
@@ -38,8 +32,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
-echo %{octave_ver}
+
 
 %build
 %configure
@@ -47,17 +40,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%define host_type %(echo "disp(octave_config_info.canonical_host_type)" | octave -qf)
-%define site_dir octave/%{octave_ver}/site
-make install prefix=$RPM_BUILD_ROOT%{_prefix} \
-	bindir=$RPM_BUILD_ROOT%{_bindir} \
-	mandir=$RPM_BUILD_ROOT%{_mandir} \
-	MPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/m/octave-forge \
-	OPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/oct/%{host_type}/octave-forge \
-	XPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/exec/%{host_type} \
-	ALTPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m \
-	ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m/octave-forge \
-	ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/octave-forge-alternative/oct/%{host_type}
+ALTPATHNAME=octave/site/octave-forge-alternative
+HOSTTYPE=`octave-config -p CANONICAL_HOST_TYPE`
+%makeinstall \
+  MPATH=$RPM_BUILD_ROOT`octave-config -p LOCALFCNFILEDIR`/octave-forge \
+  OPATH=$RPM_BUILD_ROOT`octave-config -p LOCALAPIOCTFILEDIR`/octave-forge \
+  XPATH=$RPM_BUILD_ROOT`octave-config -p LOCALARCHLIBDIR`/octave-forge \
+  ALTPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m \
+  ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m/octave-forge \
+  ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/$ALTPATHNAME/oct/$HOSTTYPE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +65,11 @@
 
 
 %changelog
+* Mon Jan 30 2006 Quentin Spencer <qspencer at users.sf.net> 2001.01.28-1
+- New release. Remove old patch.
+- Change installation paths so they now depend on the octave API version
+  rather than the octave version, which will make updates less frequent.
+
 * Fri Nov 11 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-11
 - Rebuild for new version of octave (2.1.72).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jun 2005 14:25:54 -0000	1.4
+++ sources	30 Jan 2006 16:00:43 -0000	1.5
@@ -1 +1 @@
-460aecb7aa96689901bd96a04e55fb40  octave-forge-2005.06.13.patched.tar.gz
+8192ee6bc3784e35180623592de4303f  octave-forge-2006.01.28.patched.tar.gz


--- octave-forge-2005.06.13-legend.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 30 16:22:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 30 Jan 2006 11:22:52 -0500
Subject: rpms/dxpc/devel dxpc.spec,1.6,1.7
Message-ID: <200601301623.k0UGNeuc020800@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dxpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20781

Modified Files:
	dxpc.spec 
Log Message:
* Mon Jan 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-3
- drop BR: XFree86-devel
- add BR: xorg-x11-devel/libXt-devel



Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dxpc.spec	6 Apr 2005 22:11:37 -0000	1.6
+++ dxpc.spec	30 Jan 2006 16:22:52 -0000	1.7
@@ -1,19 +1,23 @@
+
 Summary: Differential X Protocol Compressor
 Name:    dxpc
 Version: 3.8.2
-Release: 2
+Release: 3%{?dist} 
 
-Source:  http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
 License: BSD
-Group:   User Interface/X
+Group:	 User Interface/X
 URL:     http://www.vigor.nu/dxpc/
+Source:  http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: lzo-devel >= 1.08
-BuildRequires: XFree86-devel
-Requires:      lzo >= 1.08
+Patch1: dxpc-3.8.2-mandir.patch
 
-Patch1:  dxpc-3.8.2-mandir.patch
+BuildRequires: lzo-devel >= 1.08
+%if "%{?fedora}" > "4"
+BuildRequires: libXt-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 dxpc is an X protocol compressor designed to improve the
@@ -28,7 +32,8 @@
 
 
 %build
-%configure %{?configure_opts}
+%configure 
+
 make %{?_smp_mflags}
 
 
@@ -49,6 +54,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-3
+- drop BR: XFree86-devel
+- add BR: xorg-x11-devel/libXt-devel
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
@@ -57,3 +66,4 @@
 
 * Tue Jun 17 2003 Rex Dieter <rexdieter at sf.net> 0:3.8.2-0.fdr.0
 - 3.8.2
+



From fedora-extras-commits at redhat.com  Mon Jan 30 16:26:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 30 Jan 2006 11:26:48 -0500
Subject: rpms/dxpc/devel dxpc.spec,1.7,1.8
Message-ID: <200601301627.k0UGRLdx020888@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dxpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20811

Modified Files:
	dxpc.spec 
Log Message:
include bugzilla reference



Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dxpc.spec	30 Jan 2006 16:22:52 -0000	1.7
+++ dxpc.spec	30 Jan 2006 16:26:48 -0000	1.8
@@ -55,8 +55,8 @@
 
 %changelog
 * Mon Jan 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-3
-- drop BR: XFree86-devel
-- add BR: xorg-x11-devel/libXt-devel
+- drop BR: XFree86-devel (#179283)
+- add BR: xorg-x11-devel/libXt-devel (#179283)
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan 30 16:37:15 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 30 Jan 2006 11:37:15 -0500
Subject: rpms/gparted/devel .cvsignore, 1.3, 1.4 gparted.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601301637.k0UGbmNU020966@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Mon Jan 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2-1
- New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jan 2006 01:12:59 -0000	1.3
+++ .cvsignore	30 Jan 2006 16:37:15 -0000	1.4
@@ -1 +1 @@
-gparted-0.1.tar.bz2
+gparted-0.2.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gparted.spec	12 Jan 2006 01:12:59 -0000	1.3
+++ gparted.spec	30 Jan 2006 16:37:15 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.1
+Version: 0.2
 Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Jan 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2-1
+- New release
+
 * Wed Jan 11 2006 Deji Akingunola <dakingun at gmail.com> - 0.1-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jan 2006 01:12:59 -0000	1.3
+++ sources	30 Jan 2006 16:37:15 -0000	1.4
@@ -1 +1 @@
-f0e212b8f03918b320ca6b4ad86d4afb  gparted-0.1.tar.bz2
+250008cfbb87ef78298951bc999c6621  gparted-0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:44:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:44:28 -0500
Subject: rpms/konversation/devel konversation-gcc41.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 konversation.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601301645.k0UGj06k021072@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21047

Modified Files:
	.cvsignore konversation.spec sources 
Added Files:
	konversation-gcc41.patch 
Log Message:
Update to 0.19



konversation-gcc41.patch:

--- NEW FILE konversation-gcc41.patch ---
--- konversation-0.19-orig/konversation/src/searchbar.h	2006-01-30 02:43:47.000000000 -0600
+++ konversation-0.19/konversation/src/searchbar.h	2006-01-30 09:44:39.000000000 -0600
@@ -55,7 +55,7 @@
 
         void focusInEvent(QFocusEvent* e);
         virtual void showEvent(QShowEvent* e);
-        bool SearchBar::focusedChild();
+        bool focusedChild();
     public slots:
 
         virtual void hide();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2005 19:44:46 -0000	1.2
+++ .cvsignore	30 Jan 2006 16:44:28 -0000	1.3
@@ -1 +1 @@
-konversation-0.18.tar.bz2
+konversation-0.19.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- konversation.spec	22 Dec 2005 15:08:48 -0000	1.4
+++ konversation.spec	30 Jan 2006 16:44:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           konversation
-Version:        0.18
-Release:        6%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,10 +9,10 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.2, desktop-file-utils
-Requires:       kdebase >= 3.2
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+Requires:       kdebase >= 3.4
 
-patch0: kdegcc4.patch
+patch0: konversation-gcc41.patch
 
 %description
 A simple and easy to use IRC client for KDE with support for
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+%patch0 -p1 -b .gcc41
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -83,9 +83,11 @@
 
 
 %changelog
+<<<<<<< konversation.spec
+* Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
+- update to 0.19
 * Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6
 - Rebuild for gcc 4.1
-
 * Sat Oct 20 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-5
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist 
 - add %post and %postun scriptlets  to notify of new icons per


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2005 19:44:46 -0000	1.2
+++ sources	30 Jan 2006 16:44:28 -0000	1.3
@@ -1 +1 @@
-87eceaaad4223d17380cd1f8dfe8123f  konversation-0.18.tar.bz2
+2194967b21276315a29258ccc557c429  konversation-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:45:52 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:45:52 -0500
Subject: rpms/konversation/devel konversation.spec,1.5,1.6
Message-ID: <200601301646.k0UGkO07021120@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21101

Modified Files:
	konversation.spec 
Log Message:
fix changelog



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- konversation.spec	30 Jan 2006 16:44:28 -0000	1.5
+++ konversation.spec	30 Jan 2006 16:45:52 -0000	1.6
@@ -83,7 +83,6 @@
 
 
 %changelog
-<<<<<<< konversation.spec
 * Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
 - update to 0.19
 * Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6



From fedora-extras-commits at redhat.com  Mon Jan 30 16:47:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:47:28 -0500
Subject: rpms/konversation/FC-3 konversation-gcc41.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 konversation.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601301648.k0UGm0jS021193@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21169

Modified Files:
	.cvsignore konversation.spec sources 
Added Files:
	konversation-gcc41.patch 
Log Message:
Update to 0.19


konversation-gcc41.patch:

--- NEW FILE konversation-gcc41.patch ---
--- konversation-0.19-orig/konversation/src/searchbar.h	2006-01-30 02:43:47.000000000 -0600
+++ konversation-0.19/konversation/src/searchbar.h	2006-01-30 09:44:39.000000000 -0600
@@ -55,7 +55,7 @@
 
         void focusInEvent(QFocusEvent* e);
         virtual void showEvent(QShowEvent* e);
-        bool SearchBar::focusedChild();
+        bool focusedChild();
     public slots:
 
         virtual void hide();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2005 19:44:46 -0000	1.2
+++ .cvsignore	30 Jan 2006 16:47:28 -0000	1.3
@@ -1 +1 @@
-konversation-0.18.tar.bz2
+konversation-0.19.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-3/konversation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- konversation.spec	23 Oct 2005 04:56:07 -0000	1.3
+++ konversation.spec	30 Jan 2006 16:47:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           konversation
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,10 +9,10 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.2, desktop-file-utils
-Requires:       kdebase >= 3.2
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+Requires:       kdebase >= 3.4
 
-patch0: kdegcc4.patch
+patch0: konversation-gcc41.patch
 
 %description
 A simple and easy to use IRC client for KDE with support for
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+%patch0 -p1 -b .gcc41
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -83,18 +83,25 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
+- update to 0.19
+* Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6
+- Rebuild for gcc 4.1
 * Sat Oct 20 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-5
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist 
 - add %post and %postun scriptlets  to notify of new icons per
-touch --no-create %{_datadir}/icons/hicolor || :
 - http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#implementation_notes
+
 * Sun Jul 03 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-4
 - Explicly export QT lib and include dirs  for x86_64 build issue
+
 * Tue Jun 28 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-3
 - Destop-file-install,  change gcc4 patch  to configure  
   remove unneeded build deps.
+
 * Mon Jun 27 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-2
 - Fix build requires,set QT, %%lang'ify LOCALE bits and HTML docs
   move automake to prep
+
 * Sat Jun 25 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2005 19:44:46 -0000	1.2
+++ sources	30 Jan 2006 16:47:28 -0000	1.3
@@ -1 +1 @@
-87eceaaad4223d17380cd1f8dfe8123f  konversation-0.18.tar.bz2
+2194967b21276315a29258ccc557c429  konversation-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:50:03 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:50:03 -0500
Subject: rpms/konversation/FC-4 konversation-gcc41.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 konversation.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601301650.k0UGoZIj021266@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21242

Modified Files:
	.cvsignore konversation.spec sources 
Added Files:
	konversation-gcc41.patch 
Log Message:
Update to 0.19


konversation-gcc41.patch:

--- NEW FILE konversation-gcc41.patch ---
--- konversation-0.19-orig/konversation/src/searchbar.h	2006-01-30 02:43:47.000000000 -0600
+++ konversation-0.19/konversation/src/searchbar.h	2006-01-30 09:44:39.000000000 -0600
@@ -55,7 +55,7 @@
 
         void focusInEvent(QFocusEvent* e);
         virtual void showEvent(QShowEvent* e);
-        bool SearchBar::focusedChild();
+        bool focusedChild();
     public slots:
 
         virtual void hide();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2005 19:44:46 -0000	1.2
+++ .cvsignore	30 Jan 2006 16:50:03 -0000	1.3
@@ -1 +1 @@
-konversation-0.18.tar.bz2
+konversation-0.19.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-4/konversation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- konversation.spec	23 Oct 2005 04:56:08 -0000	1.3
+++ konversation.spec	30 Jan 2006 16:50:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           konversation
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,10 +9,10 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.2, desktop-file-utils
-Requires:       kdebase >= 3.2
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+Requires:       kdebase >= 3.4
 
-patch0: kdegcc4.patch
+patch0: konversation-gcc41.patch
 
 %description
 A simple and easy to use IRC client for KDE with support for
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+%patch0 -p1 -b .gcc41
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -83,18 +83,25 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
+- update to 0.19
+* Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6
+- Rebuild for gcc 4.1
 * Sat Oct 20 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-5
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist 
 - add %post and %postun scriptlets  to notify of new icons per
-touch --no-create %{_datadir}/icons/hicolor || :
 - http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#implementation_notes
+
 * Sun Jul 03 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-4
 - Explicly export QT lib and include dirs  for x86_64 build issue
+
 * Tue Jun 28 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-3
 - Destop-file-install,  change gcc4 patch  to configure  
   remove unneeded build deps.
+
 * Mon Jun 27 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-2
 - Fix build requires,set QT, %%lang'ify LOCALE bits and HTML docs
   move automake to prep
+
 * Sat Jun 25 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2005 19:44:46 -0000	1.2
+++ sources	30 Jan 2006 16:50:03 -0000	1.3
@@ -1 +1 @@
-87eceaaad4223d17380cd1f8dfe8123f  konversation-0.18.tar.bz2
+2194967b21276315a29258ccc557c429  konversation-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:54:55 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 30 Jan 2006 11:54:55 -0500
Subject: rpms/mercurial/devel .cvsignore, 1.5, 1.6 mercurial.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200601301655.k0UGtRQh021423@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21402

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
- update to 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 21:07:51 -0000	1.5
+++ .cvsignore	30 Jan 2006 16:54:55 -0000	1.6
@@ -1 +1 @@
-mercurial-0.7.tar.gz
+mercurial-0.8.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mercurial.spec	22 Sep 2005 18:45:44 -0000	1.5
+++ mercurial.spec	30 Jan 2006 16:54:55 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.7
+Version: 0.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -34,6 +34,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
+- update to 0.8
+
 * Thu Sep 22 2005 Jeremy Katz <katzj at redhat.com> 
 - add contributors to %%doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 21:07:51 -0000	1.5
+++ sources	30 Jan 2006 16:54:55 -0000	1.6
@@ -1 +1 @@
-c024ca9ed3ef35af8c5618316b6ab00a  mercurial-0.7.tar.gz
+4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 16:56:30 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 30 Jan 2006 11:56:30 -0500
Subject: rpms/mercurial/FC-4 mercurial.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200601301657.k0UGv2uC021491@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/mercurial/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21472

Modified Files:
	mercurial.spec sources 
Log Message:
* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
- update to 0.8



Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mercurial.spec	20 Sep 2005 21:31:23 -0000	1.4
+++ mercurial.spec	30 Jan 2006 16:56:30 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.7
+Version: 0.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -30,10 +30,16 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
 
 
 %changelog
+* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
+- update to 0.8
+
+* Thu Sep 22 2005 Jeremy Katz <katzj at redhat.com> 
+- add contributors to %%doc
+
 * Tue Sep 20 2005 Jeremy Katz <katzj at redhat.com> - 0.7
 - update to 0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 21:31:23 -0000	1.5
+++ sources	30 Jan 2006 16:56:30 -0000	1.6
@@ -1 +1 @@
-c024ca9ed3ef35af8c5618316b6ab00a  mercurial-0.7.tar.gz
+4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 19:27:19 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 30 Jan 2006 14:27:19 -0500
Subject: rpms/enchant/devel .cvsignore, 1.5, 1.6 enchant.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601301927.k0UJRq9S027433@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27408

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.2.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2005 21:02:27 -0000	1.5
+++ .cvsignore	30 Jan 2006 19:27:19 -0000	1.6
@@ -1 +1 @@
-enchant-1.2.0.tar.gz
+enchant-1.2.1.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- enchant.spec	22 Oct 2005 21:02:27 -0000	1.6
+++ enchant.spec	30 Jan 2006 19:27:19 -0000	1.7
@@ -1,13 +1,12 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
 URL: http://www.abisource.com/
-Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -62,6 +61,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan 30 2006 Marc Maurer <uwog at abisource.com> 1:1.2.1-1.fc5
+- Update to 1.2.1
+- Drop glib Require
+
 * Sat Oct 22 2005 Marc Maurer <uwog at abisource.com> 1:1.2.0-1.fc5
 - Update to 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2005 21:02:27 -0000	1.5
+++ sources	30 Jan 2006 19:27:19 -0000	1.6
@@ -1 +1 @@
-e44a734a85fbbadf898fb935ac346f31  enchant-1.2.0.tar.gz
+841542c0bf89b5c7b8a85f4bc682f70b  enchant-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 20:02:54 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:02:54 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.9, 1.10 abcm2ps.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200601302003.k0UK3Qib029435@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29404

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jan 2006 12:21:21 -0000	1.9
+++ .cvsignore	30 Jan 2006 20:02:54 -0000	1.10
@@ -1,2 +1,2 @@
-abcplus_en-1.0.4.zip
 abcm2ps-4.12.5.tar.gz
+abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcm2ps.spec	29 Jan 2006 12:21:21 -0000	1.9
+++ abcm2ps.spec	30 Jan 2006 20:02:54 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.5
+Version:        4.12.6
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.6.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.6-1
+- new version 4.12.6
+
 * Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
 - new version 4.12.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jan 2006 12:21:21 -0000	1.9
+++ sources	30 Jan 2006 20:02:54 -0000	1.10
@@ -1,2 +1,2 @@
-99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
 582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:05:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:05:13 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.9, 1.10 abcm2ps.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200601302005.k0UK5kVH029495@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29452/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jan 2006 12:21:27 -0000	1.9
+++ .cvsignore	30 Jan 2006 20:05:13 -0000	1.10
@@ -1,2 +1,2 @@
-abcplus_en-1.0.4.zip
 abcm2ps-4.12.5.tar.gz
+abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcm2ps.spec	29 Jan 2006 12:21:27 -0000	1.9
+++ abcm2ps.spec	30 Jan 2006 20:05:13 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.5
+Version:        4.12.6
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.6.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.6-1
+- new version 4.12.6
+
 * Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
 - new version 4.12.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jan 2006 12:21:27 -0000	1.9
+++ sources	30 Jan 2006 20:05:13 -0000	1.10
@@ -1,2 +1,2 @@
-99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
 582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:04:53 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:04:53 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.9, 1.10 abcm2ps.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200601302005.k0UK5hwI029490@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29452/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jan 2006 12:21:14 -0000	1.9
+++ .cvsignore	30 Jan 2006 20:04:53 -0000	1.10
@@ -1,2 +1,2 @@
-abcplus_en-1.0.4.zip
 abcm2ps-4.12.5.tar.gz
+abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcm2ps.spec	29 Jan 2006 12:21:14 -0000	1.9
+++ abcm2ps.spec	30 Jan 2006 20:04:53 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.5
+Version:        4.12.6
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.6.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.6-1
+- new version 4.12.6
+
 * Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
 - new version 4.12.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jan 2006 12:21:14 -0000	1.9
+++ sources	30 Jan 2006 20:04:53 -0000	1.10
@@ -1,2 +1,2 @@
-99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
 582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:11:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:11:03 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.10, 1.11 abcm2ps.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200601302012.k0UKCBeO029680@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Jan 2006 20:04:53 -0000	1.10
+++ .cvsignore	30 Jan 2006 20:11:02 -0000	1.11
@@ -1,2 +1,2 @@
-abcm2ps-4.12.5.tar.gz
+abcm2ps-4.12.6.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcm2ps.spec	30 Jan 2006 20:04:53 -0000	1.10
+++ abcm2ps.spec	30 Jan 2006 20:11:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           abcm2ps
 Version:        4.12.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jan 2006 20:04:53 -0000	1.10
+++ sources	30 Jan 2006 20:11:02 -0000	1.11
@@ -1,2 +1,2 @@
-582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:11:42 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:11:42 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.10, 1.11 abcm2ps.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200601302012.k0UKCEDn029685@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Jan 2006 20:05:13 -0000	1.10
+++ .cvsignore	30 Jan 2006 20:11:41 -0000	1.11
@@ -1,2 +1,2 @@
-abcm2ps-4.12.5.tar.gz
+abcm2ps-4.12.6.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcm2ps.spec	30 Jan 2006 20:05:13 -0000	1.10
+++ abcm2ps.spec	30 Jan 2006 20:11:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           abcm2ps
 Version:        4.12.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jan 2006 20:05:13 -0000	1.10
+++ sources	30 Jan 2006 20:11:41 -0000	1.11
@@ -1,2 +1,2 @@
-582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:11:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:11:21 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.10, 1.11 abcm2ps.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200601302012.k0UKCQ75029690@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Jan 2006 20:02:54 -0000	1.10
+++ .cvsignore	30 Jan 2006 20:11:20 -0000	1.11
@@ -1,2 +1,2 @@
-abcm2ps-4.12.5.tar.gz
+abcm2ps-4.12.6.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcm2ps.spec	30 Jan 2006 20:02:54 -0000	1.10
+++ abcm2ps.spec	30 Jan 2006 20:11:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           abcm2ps
 Version:        4.12.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jan 2006 20:02:54 -0000	1.10
+++ sources	30 Jan 2006 20:11:20 -0000	1.11
@@ -1,2 +1,2 @@
-582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:16:41 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 30 Jan 2006 15:16:41 -0500
Subject: rpms/fftw3/devel .cvsignore, 1.2, 1.3 fftw3.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <200601302017.k0UKHDFw029888@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fftw3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29861

Modified Files:
	.cvsignore fftw3.spec sources 
Log Message:
New release and specfile bugfix.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fftw3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Apr 2005 18:30:22 -0000	1.2
+++ .cvsignore	30 Jan 2006 20:16:40 -0000	1.3
@@ -1 +1 @@
-fftw-3.0.1.tar.gz
+fftw-3.1.tar.gz


Index: fftw3.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw3/devel/fftw3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fftw3.spec	22 Apr 2005 15:56:01 -0000	1.2
+++ fftw3.spec	30 Jan 2006 20:16:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fftw3
-Version:        3.0.1
-Release:        3
+Version:        3.1
+Release:        1
 Summary:        Fast Fourier Transform library
 %define real_name fftw
 
@@ -109,6 +109,7 @@
 %doc %{_mandir}/man?/*
 %doc %{_infodir}/*.info*
 %exclude %{_libdir}/*.la
+%exclude %{_infodir}/dir
 %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
@@ -116,6 +117,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Jan 30 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-1
+- New release.
+- Exclude /usr/share/info/dir from package (bug 179295).
+
 * Fri Apr 22 2005 Quentin Spencer <qspencer at users.sf.net> 3.0.1-3
 - Changed gcc-g77 to gcc-gfortran
 - replaced file removal at install with %exclude


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fftw3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Apr 2005 18:30:22 -0000	1.2
+++ sources	30 Jan 2006 20:16:40 -0000	1.3
@@ -1 +1 @@
-76cd21ecc9a7bed6343566c473c36477  fftw-3.0.1.tar.gz
+911515569a8abdc7dbb207d53f34e60b  fftw-3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 21:21:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 30 Jan 2006 16:21:07 -0500
Subject: rpms/cln/devel cln.spec,1.16,1.17
Message-ID: <200601302121.k0ULLdqm000673@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656

Modified Files:
	cln.spec 
Log Message:
Fix build error due to unpackaged file


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cln.spec	16 Jan 2006 21:40:26 -0000	1.16
+++ cln.spec	30 Jan 2006 21:21:06 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -76,8 +76,12 @@
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
 %exclude %{_libdir}/*.la
+%exclude %{_infodir}/dir
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-3
+- Exclude /usr/share/info/dir from package (bug 178660).
+
 * Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-2
 - Update source URL.
 



From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:21 -0500
Subject: rpms/lacewing - New directory
Message-ID: <200601302132.k0ULWN5p000745@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv737/lacewing

Log Message:
Directory /cvs/extras/rpms/lacewing added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:27 -0500
Subject: rpms/lacewing/devel - New directory
Message-ID: <200601302132.k0ULWTIZ000761@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv737/lacewing/devel

Log Message:
Directory /cvs/extras/rpms/lacewing/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:46 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:46 -0500
Subject: rpms/lacewing Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601302132.k0ULWm2a000796@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv784

Added Files:
	Makefile import.log 
Log Message:
Setup of module lacewing


--- NEW FILE Makefile ---
# Top level Makefile for module lacewing
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:52 -0500
Subject: rpms/lacewing/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601302132.k0ULWsWB000816@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv784/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lacewing


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 30 21:34:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:34:05 -0500
Subject: rpms/lacewing import.log,1.1,1.2
Message-ID: <200601302134.k0ULYbLf000941@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv889

Modified Files:
	import.log 
Log Message:
auto-import lacewing-1.10-3 on branch devel from lacewing-1.10-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lacewing/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Jan 2006 21:32:46 -0000	1.1
+++ import.log	30 Jan 2006 21:34:05 -0000	1.2
@@ -0,0 +1 @@
+lacewing-1_10-3:HEAD:lacewing-1.10-3.src.rpm:1138657598



From fedora-extras-commits at redhat.com  Mon Jan 30 21:34:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:34:11 -0500
Subject: rpms/lacewing/devel lacewing-fullscreen.patch, NONE,
	1.1 lacewing-nicecpu.patch, NONE, 1.1 lacewing.desktop, NONE,
	1.1 lacewing.patch, NONE, 1.1 lacewing.png, NONE,
	1.1 lacewing.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601302134.k0ULYhMH000945@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv889/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lacewing-fullscreen.patch lacewing-nicecpu.patch 
	lacewing.desktop lacewing.patch lacewing.png lacewing.spec 
Log Message:
auto-import lacewing-1.10-3 on branch devel from lacewing-1.10-3.src.rpm

lacewing-fullscreen.patch:

--- NEW FILE lacewing-fullscreen.patch ---
diff -ur lacewing.orig/config.h lacewing/config.h
--- lacewing.orig/config.h	2006-01-21 13:00:59.000000000 +0100
+++ lacewing/config.h	2006-01-21 11:19:54.000000000 +0100
@@ -792,6 +792,7 @@
  int run_vsync; // on or off
  int sound_volume; // sound fx volume; if 0 sound effects not played
  int ambience_volume; // if 0 ambience not played
+ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED
 };
 
 struct starstruct
diff -ur lacewing.orig/main.c lacewing/main.c
--- lacewing.orig/main.c	2006-01-21 13:00:59.000000000 +0100
+++ lacewing/main.c	2006-01-21 11:20:18.000000000 +0100
@@ -245,7 +245,7 @@
 
    set_color_depth(8);
 
-   if (set_gfx_mode(GFX_AUTODETECT, 640, 480, 0, 0) != 0)
+   if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0)
    {
       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
       allegro_message("Unable to set 640x480 mode\n%s\n", allegro_error);
diff -ur lacewing.orig/menu.c lacewing/menu.c
--- lacewing.orig/menu.c	2006-01-21 13:00:59.000000000 +0100
+++ lacewing/menu.c	2006-01-21 11:54:18.000000000 +0100
@@ -61,6 +61,7 @@
 #define KP_WAIT_SHORT 5
 
 extern struct optionstruct options;
+extern RGB palet [256];
 
 enum
 {
@@ -604,7 +605,7 @@
   char ostr [50];
   char istr [10];
 
-  for (i = 0; i < 32; i ++)
+  for (i = 0; i < 33; i ++)
   {
 
    col = COLOUR_GREEN6;
@@ -663,114 +664,121 @@
        strcat(ostr, itoa(options.ambience_volume, istr, 10));
      break;
     case 4:
+     strcpy(ostr, "Full Screen - ");
+     if (options.windowed == GFX_AUTODETECT_WINDOWED)
+      strcat(ostr, "Off");
+       else
+        strcat(ostr, "On");
+     break;
+    case 5:
      strcpy(ostr, "Video Sync - ");
      if (options.run_vsync == 0)
       strcat(ostr, "Off");
        else
         strcat(ostr, "On");
      break;
-    case 5:
+    case 6:
      strcpy(ostr, "Test Speakers");
      break;
-    case 6:
+    case 7:
      strcpy(ostr, "Test Keys");
      break;
-    case 7:
+    case 8:
      strcpy(ostr, "");
      break;
-    case 8:
+    case 9:
      col = COLOUR_GREY6;
      strcpy(ostr, "Player 1 Keys");
      break;
-    case 9:
+    case 10:
      strcpy(ostr, "Forwards - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_THRUST]));
      break;
-    case 10:
+    case 11:
      strcpy(ostr, "Left - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_LEFT]));
      break;
-    case 11:
+    case 12:
      strcpy(ostr, "Right - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_RIGHT]));
      break;
-    case 12:
+    case 13:
      strcpy(ostr, "Brake - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_BRAKE]));
      break;
-    case 13:
+    case 14:
      strcpy(ostr, "Fire Cannon - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_FIRE1]));
      break;
-    case 14:
+    case 15:
      strcpy(ostr, "Fire Secondary - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_FIRE2]));
      break;
-    case 15:
+    case 16:
      strcpy(ostr, "Upgrade - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_UPGRADE]));
      break;
-    case 16:
+    case 17:
      strcpy(ostr, "Slide Left - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_LEFT1]));
      break;
-    case 17:
+    case 18:
      strcpy(ostr, "Slide Right - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_RIGHT1]));
      break;
-    case 18:
+    case 19:
      strcpy(ostr, "Toggle Linked Fire - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_LINK]));
      break;
-    case 19:
+    case 20:
      col = COLOUR_GREY6;
      strcpy(ostr, "Player 2 Keys");
      break;
-    case 20:
+    case 21:
      strcpy(ostr, "Forwards - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_THRUST]));
      break;
-    case 21:
+    case 22:
      strcpy(ostr, "Left - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LEFT]));
      break;
-    case 22:
+    case 23:
      strcpy(ostr, "Right - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_RIGHT]));
      break;
-    case 23:
+    case 24:
      strcpy(ostr, "Brake - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_BRAKE]));
      break;
-    case 24:
+    case 25:
      strcpy(ostr, "Fire Cannon - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_FIRE1]));
      break;
-    case 25:
+    case 26:
      strcpy(ostr, "Fire Secondary - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_FIRE2]));
      break;
-    case 26:
+    case 27:
      strcpy(ostr, "Upgrade - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_UPGRADE]));
      break;
-    case 27:
+    case 28:
      strcpy(ostr, "Slide Left - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LEFT1]));
      break;
-    case 28:
+    case 29:
      strcpy(ostr, "Slide Right - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_RIGHT1]));
      break;
-    case 29:
+    case 30:
      strcpy(ostr, "Toggle Linked Fire - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LINK]));
      break;
-    case 30:
+    case 31:
      strcpy(ostr, "");
 //     strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LINK])
      break;
-    case 31:
+    case 32:
      strcpy(ostr, "Exit");
      break;
 
@@ -798,10 +806,10 @@
  {
 //  case 5:
 //  case 6:
-  case 7:
   case 8:
-  case 19:
-  case 30:
+  case 9:
+  case 20:
+  case 31:
    return 1;
  }
 
@@ -1116,13 +1124,13 @@
    }
    break;
   case MENU_OPTIONS:
-   if (menu_index == 31)
+   if (menu_index == 32)
    {
     play_sound(WAV_MENU2);
     change_menu(MENU_MAIN);
     break;
    }
-   if (menu_index < 9)
+   if (menu_index < 10)
    {
     switch(menu_index)
     {
@@ -1148,18 +1156,33 @@
       play_sound(WAV_MENU1);
       return;
      case 4:
+      if (options.windowed == GFX_AUTODETECT_WINDOWED)
+       options.windowed = GFX_AUTODETECT_FULLSCREEN;
+        else
+         options.windowed = GFX_AUTODETECT_WINDOWED;
+      play_sound(WAV_MENU1);
+      if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0)
+      {
+       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
+       allegro_message("Error switching fullscreen / windowed mode\n%s\n",
+        allegro_error);
+       exit(1);
+      }
+      set_palette(palet);
+      return;
+     case 5:
       if (options.run_vsync == 1)
        options.run_vsync = 0;
         else
          options.run_vsync = 1;
       play_sound(WAV_MENU1);
       return;
-     case 5:
+     case 6:
       test_speakers();
       ticked = 0;
 // test speakers
       return;
-     case 6:
+     case 7:
       play_sound(WAV_MENU2);
       jam_keys();
       return;
@@ -1268,7 +1291,7 @@
   if (option_index() == -1)
    return;
 
-  if (menu_index < 20)
+  if (menu_index < 21)
    player[0].keys [option_index()] = inputted;
     else
      player[1].keys [option_index()] = inputted;
@@ -1282,35 +1305,35 @@
 {
   switch(menu_index)
   {
-   case 9:
-   case 20:
-    return CMD_THRUST;
    case 10:
    case 21:
-    return CMD_LEFT;
+    return CMD_THRUST;
    case 11:
    case 22:
-    return CMD_RIGHT;
+    return CMD_LEFT;
    case 12:
    case 23:
-    return CMD_BRAKE;
+    return CMD_RIGHT;
    case 13:
    case 24:
-    return CMD_FIRE1;
+    return CMD_BRAKE;
    case 14:
    case 25:
-    return CMD_FIRE2;
+    return CMD_FIRE1;
    case 15:
    case 26:
-    return CMD_UPGRADE;
+    return CMD_FIRE2;
    case 16:
    case 27:
-    return CMD_LEFT1;
+    return CMD_UPGRADE;
    case 17:
    case 28:
-    return CMD_RIGHT1;
+    return CMD_LEFT1;
    case 18:
    case 29:
+    return CMD_RIGHT1;
+   case 19:
+   case 30:
     return CMD_LINK;
   }
 
@@ -1391,7 +1414,7 @@
   case MENU_OPTIONS:
     which_menu = MENU_OPTIONS;
     menu_index = 1;
-    menu_index_max = 31;
+    menu_index_max = 32;
     menu_index_min = 1;
     break;
   case MENU_DUEL:
@@ -2827,6 +2850,7 @@
  options.run_vsync = get_config_int("Options", "Run_vsync", 0);
  options.sound_volume = get_config_int("Options", "Sound_volume", 100);
  options.ambience_volume = get_config_int("Options", "Ambience_volume", 100);
+ options.windowed = get_config_int("Options", "Windowed", GFX_AUTODETECT_FULLSCREEN);
 
  for (i = 0; i < NO_CMDS; i ++)
  {
@@ -2905,6 +2929,7 @@
  set_config_int("Options", "Run_vsync", options.run_vsync);
  set_config_int("Options", "Sound_volume", options.sound_volume);
  set_config_int("Options", "Ambience_volume", options.ambience_volume);
+ set_config_int("Options", "Windowed", options.windowed);
 
  for (i = 0; i < NO_CMDS; i ++)
  {

lacewing-nicecpu.patch:

--- NEW FILE lacewing-nicecpu.patch ---
diff -ur lacewing.orig/display.c lacewing/display.c
--- lacewing.orig/display.c	2006-01-21 13:31:40.000000000 +0100
+++ lacewing/display.c	2006-01-21 13:21:34.000000000 +0100
@@ -3140,7 +3140,7 @@
  do
  {
   while(ticked == 0)
-   rest(0);
+   rest(1);
     
   waiting--;
   ticked--;
diff -ur lacewing.orig/game.c lacewing/game.c
--- lacewing.orig/game.c	2006-01-21 13:31:40.000000000 +0100
+++ lacewing/game.c	2006-01-21 13:21:37.000000000 +0100
@@ -180,7 +180,7 @@
    frames_skipped++;
 
   while(ticked == 0)
-   rest(0);
+   rest(1);
 
   ticked --;
 
diff -ur lacewing.orig/menu.c lacewing/menu.c
--- lacewing.orig/menu.c	2006-01-21 13:32:08.000000000 +0100
+++ lacewing/menu.c	2006-01-21 13:29:55.000000000 +0100
@@ -361,7 +361,7 @@
   menu_input();
 
   while(ticked == 0)
-   rest(0);
+   rest(1);
   ticked --;
 
  } while(TRUE);
@@ -403,7 +403,8 @@
 
   text_mode(-1);
 
-  vsync();
+  if (options.run_vsync > 0)
+   vsync();
 
   RGB title_colour [1];
 
@@ -1375,7 +1376,9 @@
 
  game.type = game_type;
 
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
+ 
  clear_bitmap(screen);
 
  begin_game();
@@ -1599,7 +1602,7 @@
   }
 
   while (ticked == 0)
-   rest(0);
+   rest(1);
 
   ticked --;
 
@@ -3203,12 +3206,13 @@
 //   textprintf_centre(menu_bmp, small_font, 320, 305, COLOUR_YELLOW8, "your time, like ");
    if (county2 > 99)
     textprintf_centre(menu_bmp, small_font, 320, 380, COLOUR_YELLOW5, "Press Space to continue.");
-   vsync();
+   if (options.run_vsync > 0)
+    vsync();
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
   }
 
   while (ticked == 0)
-   rest(0);
+   rest(1);
   ticked --;
 
   county2 ++;


--- NEW FILE lacewing.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Lacewing
GenericName=Asteroid like game
Comment=A cross between Spacewar and Centipede
Exec=lacewing
Icon=lacewing.png
Terminal=false
Type=Application
Categories=Game;ArcadeGame
Version=1.10


lacewing.patch:

--- NEW FILE lacewing.patch ---
diff -urN lacewing.orig/Makefile lacewing/Makefile
--- lacewing.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ lacewing/Makefile	2006-01-20 13:14:27.000000000 +0100
@@ -0,0 +1,28 @@
+PREFIX  = /home/opt
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS  = -g -Wall -O2
+LDFLAGS = `allegro-config --libs`
+DEFINES = -DDATADIR=\"$(DATADIR)/\"
+OBJS    = actor.o bullet.o cloud.o cmds.o displ_in.o display.o eclass.o \
+          enemy.o game.o input.o levels.o main.o menu.o palette.o pickup.o \
+          score.o ships.o sound.o stars.o stuff.o upgrades.o
+TARGET  = lacewing
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(DATADIR)/gfx
+	mkdir -p $(DATADIR)/sound/ambi
+	install -p -m 755 $(TARGET) $(PREFIX)/bin
+	install -p -m 644 lacew.cfg $(DATADIR)
+	install -p -m 644 gfx/* $(DATADIR)/gfx
+	install -p -m 644 sound/*.wav $(DATADIR)/sound
+	install -p -m 644 sound/ambi/* $(DATADIR)/sound/ambi
+	
+clean:
+	rm -f $(OBJS) $(TARGET) *~
diff -urN lacewing.orig/config.h lacewing/config.h
--- lacewing.orig/config.h	2003-11-24 21:54:40.000000000 +0100
+++ lacewing/config.h	2006-01-20 14:34:10.000000000 +0100
@@ -37,6 +37,8 @@
 
 #define ATTACK_NONE -1
 
+#define MAX_FRAMESKIP 4
+
 struct armoury
 {
  char *name;
@@ -1067,3 +1069,13 @@
 
 
 
+/* compat defines */
+#include <stdio.h>
+
+#ifndef DATADIR
+#define DATADIR
+#endif
+
+#define PI M_PI
+#define itoa(integer, buf, bufsize) \
+ (snprintf(buf, bufsize, "%d", integer), buf)
diff -urN lacewing.orig/displ_in.c lacewing/displ_in.c
--- lacewing.orig/displ_in.c	2003-11-25 01:25:16.000000000 +0100
+++ lacewing/displ_in.c	2006-01-20 00:28:03.000000000 +0100
@@ -89,7 +89,7 @@
  RGB temp_palette [256];
  RGB temp_palette3 [1024];
 
- DATAFILE *datf = load_datafile("gfx\\data.dat");
+ DATAFILE *datf = load_datafile(DATADIR "gfx/data.dat");
  if (datf == NULL)
  {
   set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
@@ -107,7 +107,7 @@
  textprintf_centre(screen, font, 320, 200, COLOUR_GREEN8, "Loading}...");
  textprintf_centre(screen, font2, 320, 200, COLOUR_YELLOW8, "Loading}...");
 
- BITMAP *temp_bitmap = load_bitmap("gfx\\ship8_i.bmp", temp_palette);
+ BITMAP *temp_bitmap = load_bitmap(DATADIR "gfx/ship8_i.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap");
@@ -205,7 +205,7 @@
 
 // Load in enemy bitmaps:
 
- temp_bitmap = load_bitmap("gfx\\enemy1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy1.bmp not loaded correctly?)");
@@ -251,7 +251,7 @@
 
  destroy_bitmap(temp_bitmap);
 
- temp_bitmap = load_bitmap("gfx\\enemy3.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy3.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy3.bmp not loaded correctly?)");
@@ -273,7 +273,7 @@
  destroy_bitmap(temp_bitmap);
 // destroy_bitmap(temp_bitmap2);
 
- temp_bitmap = load_bitmap("gfx\\small1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small1.bmp not loaded correctly?)");
@@ -287,7 +287,7 @@
  destroy_bitmap(temp_bitmap);
 
 
- temp_bitmap = load_bitmap("gfx\\small2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small2.bmp not loaded correctly?)");
@@ -300,7 +300,7 @@
 
  destroy_bitmap(temp_bitmap);
 
- temp_bitmap = load_bitmap("gfx\\enemy2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy2.bmp not loaded correctly?)");
@@ -313,7 +313,7 @@
 
  destroy_bitmap(temp_bitmap);
  
- temp_bitmap = load_bitmap("gfx\\lships.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/lships.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (lships.bmp not loaded correctly?)");
diff -urN lacewing.orig/display.c lacewing/display.c
--- lacewing.orig/display.c	2003-11-25 01:27:20.000000000 +0100
+++ lacewing/display.c	2006-01-20 14:32:31.000000000 +0100
@@ -53,7 +53,6 @@
 BITMAP *player2;
 //extern volatile int frames_per_second;
 extern volatile int ticked;
-extern int slacktime;
 
 extern struct optionstruct options;
 
@@ -3093,12 +3092,10 @@
 // textprintf(bmp, small_font, 20, 110, 5, "Xs %i  Ys %i  TS %f  DS %f  Drag %i",
 //  actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed), hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed) * game.drag, actor[player[play].actor_controlled].drag_amount);
 // textprintf(bmp, small_font, 20, 60, 5, "Stack %i", stackavail());
-// textprintf(bmp, small_font, 20, 90, 5, "Slack %i", slacktime);
 // textprintf(bmp, small_font, 20, 100, 5, "Lock %i", actor[0].lock);
 //textprintf(bmp, smallfont, 20, 50, 5, "Fps} %i", frames_per_second);
 /* textprintf(bmp, font, 20, 50, 5, "Fps} %i", frames_per_second);
  textprintf(bmp, font2, 20, 50, 5, "Fps} %i", frames_per_second);
- textprintf(bmp, font, 20, 80, 5, "Slack} %i", slacktime);
  textprintf(bmp, font, 20, 110, 5, "Xs} %i  Ys} %i  Drag} %i",
   actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, actor[player[play].actor_controlled].drag_amount);
  textprintf(bmp, font, 20, 140, 5, "X} %i  Y} %i ",
@@ -3107,7 +3104,6 @@
   enemy[0].angle, enemy[0].attribute [ATTRIB_SWERVER_ANGLE], enemy[0].attacking, enemy[0].recycle);
  textprintf(bmp, font, 20, 200, 5, "Lock} %i ", actor[0].lock);*/
 /* textprintf(bmp, small_font, 20, 50, 5, "FPS %i", frames_per_second);
- textprintf(bmp, small_font, 20, 60, 5, "SLACK %i", slacktime);
  textprintf(bmp, small_font, 20, 70, 5, "XS %i  YS %i  DRAG %i",
   actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, actor[player[play].actor_controlled].drag_amount);
  textprintf(bmp, small_font, 20, 80, 5, "X %i  Y %i ",
@@ -3128,10 +3124,11 @@
 
 void level_announcement(void)
 {
+ int frames_skipped = 0;
+ int waiting = 30;
 
  clear_bitmap(screen);
 
- int waiting = 30;
 
  if (arena.level == 1)
   waiting = 60;
@@ -3142,11 +3139,20 @@
 
  do
  {
-  while(ticked > 0)
+  while(ticked == 0)
+   rest(0);
+    
+  waiting--;
+  ticked--;
+
+  /* skip drawing if we can't keep up */
+  if (ticked && (frames_skipped < MAX_FRAMESKIP))
   {
-   waiting --;
-   ticked --;
-  };
+   frames_skipped++;
+   continue;
+  }
+  frames_skipped = 0;
+
   if ((waiting / 5) % 2 == 0)
   {
    textprintf_centre(screen, font, 320, 240, COLOUR_GREEN4 + (waiting / 2) % 4, "Get}  Ready}");
diff -urN lacewing.orig/game.c lacewing/game.c
--- lacewing.orig/game.c	2003-10-06 00:35:54.000000000 +0200
+++ lacewing/game.c	2006-01-20 14:32:11.000000000 +0100
@@ -64,12 +64,12 @@
 
 extern volatile unsigned char ticked;
 extern volatile int framecounter;
-extern int slacktime;
 
 
 void game_loop(void)
 {
  int playing = 1;
+ int frames_skipped = 0;
  
  counter = 0;
 
@@ -168,19 +168,20 @@
 
      
    }
-   
-  if (ticked == 0)
+
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    run_display();
+   frames_skipped = 0;
 //   framecounter++;
   }
+  else
+   frames_skipped++;
+
+  while(ticked == 0)
+   rest(0);
 
-  slacktime = 0;
-  
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
   ticked --;
 
   counter ++;
diff -urN lacewing.orig/main.c lacewing/main.c
--- lacewing.orig/main.c	2003-11-22 13:33:22.000000000 +0100
+++ lacewing/main.c	2006-01-20 14:03:49.000000000 +0100
@@ -96,11 +96,10 @@
 
 #include "allegro.h"
 
-#include <conio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pc.h>
 #include <math.h>
+#include <stdio.h>
 
 #include "config.h"
 
@@ -150,17 +149,16 @@
 //volatile int framecounter;
 //volatile int frames_per_second;
 
-volatile int inputcounter = 0;
-volatile int inputs_per_second = 0;
+//volatile int inputcounter = 0;
+//volatile int inputs_per_second = 0;
 
-volatile int turncounter = 0;
-volatile int turns_per_second = 0;
+//volatile int turncounter = 0;
+//volatile int turns_per_second = 0;
 
 void tickover(void);
 
 volatile unsigned char ticked;
 //volatile unsigned char tick_counter;
-int slacktime;
 // --- end timer interupt
 
 
@@ -199,33 +197,13 @@
 
 int main(void)
 {
-
- cprintf("\n\rHello and welcome to Lacewing version 1.10!");
- cprintf("\n\rCopyright 2003 by Linley Henzell & Captain Pork.\n\r");
- cprintf("\n\rLacewing is free software published under the");
- cprintf("\n\rGeneral Public Licence. It can be modified and");
- cprintf("\n\rredistributed under certain conditions and comes");
- cprintf("\n\rwith no warranties of any kind.");
- cprintf("\n\rPlease read the LICENCE.TXT file for more information.\n\r");
- cprintf("\n\rPress Q to Quit, or any other key to continue...\n\r");
-
- char rkey;
-
- int randcount; // doesn't matter if it's not initialised - better, actually
-
- do
- {
-   randcount ++;
- }
-  while(kbhit() == 0);
-  
- rkey = getch();
- if (rkey == 'q' || rkey == 'Q')
-  return 0;
- if (rkey == 0)
-  getch();
-
- srandom(randcount);
+ printf("Hello and welcome to Lacewing version 1.10!");
+ printf("\nCopyright 2003 by Linley Henzell & Captain Pork.\n");
+ printf("\nLacewing is free software published under the");
+ printf("\nGeneral Public Licence. It can be modified and");
+ printf("\nredistributed under certain conditions and comes");
+ printf("\nwith no warranties of any kind.");
+ printf("\nPlease read the LICENCE.TXT file for more information.\n");
 
  init_at_startup();
 
@@ -242,9 +220,9 @@
 {
 
    allegro_init();
-
-   set_config_file("lacew.cfg");
    
+   init_config();
+
    install_keyboard();
    install_timer();
 
@@ -257,8 +235,8 @@
 //   LOCK_VARIABLE (tick_counter);
 //   LOCK_VARIABLE (frames_per_second);
 //   LOCK_VARIABLE (framecounter);
-   LOCK_VARIABLE (turns_per_second);
-   LOCK_VARIABLE (turncounter);
+//   LOCK_VARIABLE (turns_per_second);
+//   LOCK_VARIABLE (turncounter);
 //   LOCK_VARIABLE (inputs_per_second);
 //   LOCK_VARIABLE (inputcounter);
 
diff -urN lacewing.orig/menu.c lacewing/menu.c
--- lacewing.orig/menu.c	2003-11-25 01:53:04.000000000 +0100
+++ lacewing/menu.c	2006-01-20 14:33:30.000000000 +0100
@@ -138,7 +138,6 @@
 int option_index(void);
 void enter_keystroke(void);
 int option_jump(int direction);
-void init_config(void);
 void save_config(void);
 
 void choose_ships(void);
@@ -205,7 +204,6 @@
 void init_menus_once_only(void)
 {
  text_mode(-1);
- init_config();
 
  menu_bmp = create_bitmap(640, 480);
 
@@ -226,7 +224,7 @@
 
  RGB temp_palette [256];
 
- BITMAP *temp_bmp = load_bitmap("gfx\\title_i.bmp", temp_palette);
+ BITMAP *temp_bmp = load_bitmap(DATADIR "gfx/title_i.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -246,7 +244,7 @@
 
  destroy_bitmap(temp_bmp);
 
- temp_bmp = load_bitmap("gfx\\title_o.bmp", temp_palette);
+ temp_bmp = load_bitmap(DATADIR "gfx/title_o.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -266,7 +264,7 @@
 
  destroy_bitmap(temp_bmp);
 
- temp_bmp = load_bitmap("gfx\\title_s.bmp", temp_palette);
+ temp_bmp = load_bitmap(DATADIR "gfx/title_s.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -286,7 +284,7 @@
 
  destroy_bitmap(temp_bmp);
 
- upgrade_box1 = load_bitmap("gfx\\upg_box.bmp", temp_palette);
+ upgrade_box1 = load_bitmap(DATADIR "gfx/upg_box.bmp", temp_palette);
 
  if (!upgrade_box1)
  {
@@ -295,7 +293,7 @@
       exit(1);
  }
 
- upgrade_box2 = load_bitmap("gfx\\upg_box2.bmp", temp_palette);
+ upgrade_box2 = load_bitmap(DATADIR "gfx/upg_box2.bmp", temp_palette);
 
  if (!upgrade_box2)
  {
@@ -304,7 +302,7 @@
       exit(1);
  }
 
- upgrade_box3 = load_bitmap("gfx\\upg_box3.bmp", temp_palette);
+ upgrade_box3 = load_bitmap(DATADIR "gfx/upg_box3.bmp", temp_palette);
 
  if (!upgrade_box3)
  {
@@ -324,7 +322,8 @@
 
 void menu_loop(void)
 {
-
+ int frames_skipped = 0;
+ 
  which_menu = MENU_MAIN;
  menu_index_max = 4;
  menu_index_min = 0;
@@ -347,20 +346,21 @@
   if (which_menu == MENU_SCORES || which_menu == MENU_ENTER_SCORES)
    make_bouncies_move();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    menu_display();
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
   menu_input();
 
-  slacktime = 0;
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
+  while(ticked == 0)
+   rest(0);
   ticked --;
 
  } while(TRUE);
@@ -1431,8 +1431,6 @@
  game.single_player = 0;
  game.users = 1;
 
- int county = 0;
-
  int keypress_wait1 = KP_WAIT_SHORT;
  int keypress_wait2 = KP_WAIT_SHORT;
  int waiting = 5;
@@ -1577,10 +1575,8 @@
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
   }
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
+  while (ticked == 0)
+   rest(0);
 
   ticked --;
 
@@ -2451,7 +2447,7 @@
 
       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
 //      clrscr();
-      allegro_message("\n\rBye bye!                           ");
+//      allegro_message("\n\rBye bye!                           ");
 //      free(palet);
       exit(0);
 
@@ -2762,17 +2758,69 @@
 
 }
 
+/* Function(s) to find the homedir of a user under Unix */
+#ifdef __unix__
+#include <pwd.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(__DECC) && defined(VMS)
+#include <unixlib.h>
+static char *vms_to_unix_buffer = NULL;
+static int convert_vms_to_unix(char *vms_dir_name)
+{
+	vms_to_unix_buffer = vms_dir_name;
+}
+#endif
+
+/* 
+ * Locate user's home directory.
+ */
+char *get_home_dir(void)
+{
+	struct passwd *pw;
+
+	if (!(pw = getpwuid(getuid())))
+	{ 
+		fprintf(stderr, "Who are you? Not found in passwd database!!\n");
+		return NULL;
+	}
+
+#if defined(__DECC) && defined(VMS)
+	/* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix
+	   Format. */
+	decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1);
+	return vms_to_unix_buffer;
+#else
+	return pw->pw_dir;
+#endif
+}
+#endif /* defined __unix__ */
+
 void init_config(void)
 {
-
-set_config_file("lacew.cfg");
-
-
  char miscstring [40];
  char wstring [40];
  char itstring [40];
  int i;
-
+#ifdef __unix__   
+ char config_file_name[512];
+ char *home_dir = get_home_dir();
+ int using_global_cfg = 1;
+   
+ snprintf(config_file_name, sizeof(config_file_name)/sizeof(char), "%s/.%s",
+  home_dir? home_dir:".", "lacew.cfg");
+      
+ /* does the cfg file exist? */
+ if (access(config_file_name, R_OK) == 0)
+ {
+  override_config_file(config_file_name);
+  using_global_cfg = 0;
+ }
+ else
+#endif   
+  override_config_file(DATADIR "lacew.cfg");
+  
+ srandom(get_config_int("Misc", "Seed", 0));
 
  options.sound_init = get_config_int("Options", "Sound_init", 1);
  options.sound_mode = get_config_int("Options", "Sound_mode", SOUNDMODE_STEREO);
@@ -2835,7 +2883,12 @@
   strcat(miscstring, itoa(i, itstring, 10));
   strcpy(hs_coop[i].name, get_config_string(wstring, miscstring, "CaptainP"));
  }
-
+#ifdef __unix__
+ /* make sure any changes get written to the per user file and not to
+    the global file */
+ if (using_global_cfg)
+  override_config_file(config_file_name);
+#endif
 }
 
 void save_config(void)
@@ -2845,6 +2898,8 @@
  char itstring [40];
  int i;
 
+ set_config_int("Misc", "Seed", random());
+
 // options.sound_init = get_config_int("Options", "Sound_init", 1);
  set_config_int("Options", "Sound_mode", options.sound_mode);
  set_config_int("Options", "Run_vsync", options.run_vsync);
@@ -3102,7 +3157,6 @@
 void display_victory_screen(void)
 {
 
- int county = 0;
  int county2 = 0;
 
  do
@@ -3128,11 +3182,8 @@
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
   }
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
-
+  while (ticked == 0)
+   rest(0);
   ticked --;
 
   county2 ++;
diff -urN lacewing.orig/menu.h lacewing/menu.h
--- lacewing.orig/menu.h	2003-09-04 19:28:36.000000000 +0200
+++ lacewing/menu.h	2006-01-20 13:10:33.000000000 +0100
@@ -1,3 +1,5 @@
 void init_menus_once_only(void);
 
 void menu_loop(void);
+
+void init_config(void);
diff -urN lacewing.orig/ships.c lacewing/ships.c
--- lacewing.orig/ships.c	2003-09-04 20:51:46.000000000 +0200
+++ lacewing/ships.c	2006-01-18 22:10:54.000000000 +0100
@@ -55,7 +55,8 @@
 0, // system 3 status 2
 BRAKES_DRAG, // brake type
 5, // brake strength
-1000 // armour                   },
+1000 // armour
+},
 {
 "Arrow",
 6000, // radius
diff -urN lacewing.orig/sound.c lacewing/sound.c
--- lacewing.orig/sound.c	2003-10-06 22:22:16.000000000 +0200
+++ lacewing/sound.c	2006-01-20 00:33:01.000000000 +0100
@@ -41,7 +41,6 @@
 #include "config.h"
 #include "globvars.h"
 
-#include "conio.h"
 #include "math.h"
 //DATAFILE *soundf;
 
@@ -114,7 +113,7 @@
 
    
    sound_active = 1;
-
+   
    if (options.sound_init == 0)
    {
 //    cprintf("\n\r\n\rSound disabled in proj.cfg.");
@@ -128,12 +127,8 @@
    reserve_voices(10, 0);
    if (install_sound (DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) == -1)
    {
-//    allegro_message("\n\r\n\rSound autodetect failed.");
+    printf("Warning: %s, sound disabled\n", allegro_error);
     sound_active = 0;
-    rest(300);
-    do
-    {
-    } while (keypressed() == 0);
    }
    set_volume(255, 0);
 
@@ -263,7 +258,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".\\sound\\");
+ strcpy(sfile_name, DATADIR "sound/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
@@ -678,7 +673,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".\\sound\\ambi\\");
+ strcpy(sfile_name, DATADIR "sound/ambi/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
diff -urN lacewing.orig/stars.c lacewing/stars.c
--- lacewing.orig/stars.c	2003-08-06 01:32:04.000000000 +0200
+++ lacewing/stars.c	2006-01-18 22:13:12.000000000 +0100
@@ -56,7 +56,7 @@
  int j = 0;
  int k = 1;
 
- if (game[0].users == 2)
+ if (game.users == 2)
   k = 2;
 
  for (j = 0; j < k; j ++)


--- NEW FILE lacewing.spec ---
Name:           lacewing
Version:        1.10
Release:        3%{?dist}
Summary:        Asteroid like game with many different ships
Group:          Amusements/Games
License:        GPL
URL:            http://users.olis.net.au/zel/
Source0:        http://users.olis.net.au/zel/lwsrc.zip
Source1:        http://users.olis.net.au/zel/lwdata.zip
Source2:        lacewing.desktop
Source3:        lacewing.png
Patch0:         lacewing.patch
Patch1:         lacewing-fullscreen.patch
Patch2:         lacewing-nicecpu.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel desktop-file-utils

%description
Asteroid like game where you can choose a type of ship and depending on the
type of ship can pickup a number of upgrades during the game.

Lacewing is an arcade-style shoot-em-up which plays a little bit like a cross
between Spacewar and Centipede. It has a decidedly retro style to it. It has
a single-player mode, and also co-operative and duel modes for two players
(split-screen).


%prep
%setup -q -c
unzip -qqo %{SOURCE1}
%patch0 -p1 -z .unix
%patch1 -p1 -z .fullscreen
%patch2 -p1 -z .nicecpu
%{__sed} -i 's/\r//' readme.txt licence.txt
chmod 644 readme.txt licence.txt


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix}


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc readme.txt licence.txt
%{_bindir}/lacewing
%{_datadir}/lacewing
%{_datadir}/applications/fedora-lacewing.desktop
%{_datadir}/icons/hicolor/48x48/apps/lacewing.png

%changelog
* Mon Jan 30 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-3
- Summary and Description text fixes (bz 178568)

* Sun Jan 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-2
- Some minor spec file cleanups (bz 178568):
  - use %%{_prefix} instead of /usr
  - use advised scriplets from the Wiki (use %%{_bindir}, || : )
  - run sed on doc files to convert DOS line-ends to UNIX ones
  - don't mark the default default settings file %%config as suggested
    in comment 5

* Sat Jan 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2006 21:32:51 -0000	1.1
+++ .cvsignore	30 Jan 2006 21:34:11 -0000	1.2
@@ -0,0 +1,2 @@
+lwdata.zip
+lwsrc.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2006 21:32:51 -0000	1.1
+++ sources	30 Jan 2006 21:34:11 -0000	1.2
@@ -0,0 +1,2 @@
+70040f8882414057a6243d8fb568a72f  lwdata.zip
+2de183840c0ec3603cc324c0b64fd856  lwsrc.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 21:37:02 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 30 Jan 2006 16:37:02 -0500
Subject: rpms/gramps/devel gramps.spec,1.14,1.15
Message-ID: <200601302137.k0ULbYmt000999@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv982

Modified Files:
	gramps.spec 
Log Message:
* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-4
- Add require for shared-mime-info.
- Remove mime.cache.
- Use python-abi.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gramps.spec	14 Dec 2005 22:08:45 -0000	1.14
+++ gramps.spec	30 Jan 2006 21:37:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -19,7 +19,7 @@
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  pygtk2
 BuildRequires:  pygtk2-libglade
-BuildRequires:  python-devel >= 2.3
+BuildRequires:  python-devel
 BuildRequires:  scrollkeeper
 BuildRequires:	GConf2
 
@@ -31,12 +31,14 @@
 Requires:       ImageMagick
 Requires:       pygtk2
 Requires:       pygtk2-libglade
-Requires:       python >= 2.3
+Requires:   	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:       rcs
 Requires:	python-reportlab >= 1.20
 Requires:	graphviz
+Requires(post): shared-mime-info
 Requires(post):   scrollkeeper
 Requires(post):   GConf2
+Requires(postun): shared-mime-info
 Requires(postun): scrollkeeper
 Requires(postun): GConf2
 
@@ -62,7 +64,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -rf ${RPM_BUILD_ROOT}%{_localstatedir}/scrollkeeper
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome/
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/application
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{application,mime.cache}
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses}
 mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 cp -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
@@ -83,17 +85,16 @@
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`	\
 	gconftool-2 --makefile-install-rule 		\
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
-update-desktop-database %{_datadir}/applications &> /dev/null
-update-mime-database %{_datadir}/mime &> /dev/null
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
-/usr/bin/pkill gconfd || /bin/true
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
 
 %postun
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
+scrollkeeper-update -q || :
 if [ "$1" = "0" ]; then
-  update-desktop-database %{_datadir}/applications &> /dev/null
-  update-mime-database %{_datadir}/mime &> /dev/null
+  update-desktop-database &> /dev/null ||:
+  update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
 
 
@@ -114,6 +115,11 @@
 
 
 %changelog
+* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-4
+- Add require for shared-mime-info.
+- Remove mime.cache.
+- Use python-abi.
+
 * Wed Dec 14 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-3
 - Add requires for gnome-python2-gnomeprint.
 



From fedora-extras-commits at redhat.com  Mon Jan 30 21:48:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 16:48:31 -0500
Subject: rpms/openal/FC-4 openal-arch.patch,NONE,1.1 openal.spec,1.11,1.12
Message-ID: <200601302149.k0ULn3ch001185@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1165

Modified Files:
	openal.spec 
Added Files:
	openal-arch.patch 
Log Message:
- add arch patch from Jochen Schmitt


openal-arch.patch:

--- NEW FILE openal-arch.patch ---
--- openal-0.0.8/src/Makefile.in.org	2006-01-30 17:52:29.000000000 +0100
+++ openal-0.0.8/src/Makefile.in	2006-01-30 17:53:40.000000000 +0100
@@ -327,7 +327,7 @@
 
 
 # Add compiler flags.
-libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
+libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS) $(ARCH_INCLUDES)
 
 # The -no-undefined flag is neccessary for building DLLs on Windows.
 libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openal.spec	20 Jan 2006 08:23:19 -0000	1.11
+++ openal.spec	30 Jan 2006 21:48:30 -0000	1.12
@@ -8,6 +8,7 @@
 URL:            http://www.openal.org/
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
+Patch0:         openal-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 21:55:01 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 30 Jan 2006 16:55:01 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.20,1.21
Message-ID: <200601302155.k0ULtYVx001343@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1323

Modified Files:
	denyhosts.spec 
Log Message:
* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-3
- Delete stray .pyo and .pyc files that appear for no reason.



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- denyhosts.spec	14 Jan 2006 17:49:50 -0000	1.20
+++ denyhosts.spec	30 Jan 2006 21:55:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	2%{?dist}
+release:	3%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -73,6 +73,10 @@
   touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
 done
 
+find $RPM_BUILD_ROOT -name \*.pyo -exec rm {} \;
+[-f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc ] && \
+  rm $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,6 +123,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-3
+- Delete stray .pyo and .pyc files that appear for no reason.
+
 * Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
 - Clean up %post script; just call condrestart and don't bother with
   the call to --upgrade099.



From fedora-extras-commits at redhat.com  Mon Jan 30 22:15:57 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 30 Jan 2006 17:15:57 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.21,1.22
Message-ID: <200601302216.k0UMGTdT003444@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3427

Modified Files:
	denyhosts.spec 
Log Message:
* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
- Simplify "[ -f ... ] && rm" to "rm -f".



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- denyhosts.spec	30 Jan 2006 21:55:01 -0000	1.21
+++ denyhosts.spec	30 Jan 2006 22:15:56 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	3%{?dist}
+release:	4%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -74,8 +74,7 @@
 done
 
 find $RPM_BUILD_ROOT -name \*.pyo -exec rm {} \;
-[-f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc ] && \
-  rm $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
+rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
 
 
 %clean
@@ -123,6 +122,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
+- Simplify "[ -f ... ] && rm" to "rm -f".
+
 * Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-3
 - Delete stray .pyo and .pyc files that appear for no reason.
 



From fedora-extras-commits at redhat.com  Mon Jan 30 22:33:44 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 30 Jan 2006 17:33:44 -0500
Subject: rpms/firestarter/devel firestarter.spec,1.16,1.17
Message-ID: <200601302234.k0UMYGIk003518@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3500

Modified Files:
	firestarter.spec 
Log Message:
fixed post scriptlet



Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- firestarter.spec	29 Jan 2006 05:29:35 -0000	1.16
+++ firestarter.spec	30 Jan 2006 22:33:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
@@ -122,7 +122,7 @@
 if [ "$1" = "0" ]; then
     if [ -e /etc/dhclient-exit-hooks ]; then
         NEW_CONF=`mktemp -t firestarter.XXXXXX`
-        grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF}
+        grep -v 'sh %{_sysconfdir}/firestarter/firestarter.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF}
         cat ${NEW_CONF} > /etc/dhclient-exit-hooks
     fi
 fi
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-8
+- fixed %post script for dhcp exit script (bug #160431)
+
 * Tue Jan 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-7
 - add CUPS and APCUPSD to services
 - don't open browser window since it runs as root (bug #178040)



From fedora-extras-commits at redhat.com  Mon Jan 30 22:47:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 17:47:20 -0500
Subject: rpms/openal/FC-4 openal-pkgconfig.patch, NONE, 1.1 openal.spec, 1.12,
	1.13
Message-ID: <200601302247.k0UMlq7B003737@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3699

Modified Files:
	openal.spec 
Added Files:
	openal-pkgconfig.patch 
Log Message:
- pkgconfig patch


openal-pkgconfig.patch:

--- NEW FILE openal-pkgconfig.patch ---
--- admin/pkgconfig/Makefile.am.orig	2006-01-30 23:41:34.000000000 +0100
+++ admin/pkgconfig/Makefile.am	2006-01-30 23:41:44.000000000 +0100
@@ -1,3 +1,3 @@
-pkgconfigdir   = $(prefix)/lib/pkgconfig
+pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS    = openal-config
--- admin/pkgconfig/Makefile.in.orig	2006-01-30 23:45:01.000000000 +0100
+++ admin/pkgconfig/Makefile.in	2006-01-30 23:45:42.000000000 +0100
@@ -192,7 +192,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS = openal-config
 all: all-am


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openal.spec	30 Jan 2006 21:48:30 -0000	1.12
+++ openal.spec	30 Jan 2006 22:47:20 -0000	1.13
@@ -9,6 +9,7 @@
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
 Patch0:         openal-arch.patch
+Patch1:         openal-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -45,6 +46,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 23:05:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 18:05:25 -0500
Subject: rpms/openal/FC-3 openal-arch.patch, NONE, 1.1 openal-pkgconfig.patch,
	NONE, 1.1 openal.spec, 1.7, 1.8
Message-ID: <200601302306.k0UN63t4005983@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5911/FC-3

Modified Files:
	openal.spec 
Added Files:
	openal-arch.patch openal-pkgconfig.patch 
Log Message:
- build patches from fc4


openal-arch.patch:

--- NEW FILE openal-arch.patch ---
--- openal-0.0.8/src/Makefile.in.org	2006-01-30 17:52:29.000000000 +0100
+++ openal-0.0.8/src/Makefile.in	2006-01-30 17:53:40.000000000 +0100
@@ -327,7 +327,7 @@
 
 
 # Add compiler flags.
-libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
+libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS) $(ARCH_INCLUDES)
 
 # The -no-undefined flag is neccessary for building DLLs on Windows.
 libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)

openal-pkgconfig.patch:

--- NEW FILE openal-pkgconfig.patch ---
--- admin/pkgconfig/Makefile.am.orig	2006-01-30 23:41:34.000000000 +0100
+++ admin/pkgconfig/Makefile.am	2006-01-30 23:41:44.000000000 +0100
@@ -1,3 +1,3 @@
-pkgconfigdir   = $(prefix)/lib/pkgconfig
+pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS    = openal-config
--- admin/pkgconfig/Makefile.in.orig	2006-01-30 23:45:01.000000000 +0100
+++ admin/pkgconfig/Makefile.in	2006-01-30 23:45:42.000000000 +0100
@@ -192,7 +192,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS = openal-config
 all: all-am


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openal.spec	19 Jan 2006 08:43:25 -0000	1.7
+++ openal.spec	30 Jan 2006 23:05:24 -0000	1.8
@@ -8,6 +8,8 @@
 URL:            http://www.openal.org/
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
+Patch0:         openal-arch.patch
+Patch1:         openal-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -43,6 +45,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 23:05:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 18:05:32 -0500
Subject: rpms/openal/devel openal-arch.patch, NONE,
	1.1 openal-pkgconfig.patch, NONE, 1.1 openal.spec, 1.11, 1.12
Message-ID: <200601302306.k0UN64r6005986@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5911/devel

Modified Files:
	openal.spec 
Added Files:
	openal-arch.patch openal-pkgconfig.patch 
Log Message:
- build patches from fc4


openal-arch.patch:

--- NEW FILE openal-arch.patch ---
--- openal-0.0.8/src/Makefile.in.org	2006-01-30 17:52:29.000000000 +0100
+++ openal-0.0.8/src/Makefile.in	2006-01-30 17:53:40.000000000 +0100
@@ -327,7 +327,7 @@
 
 
 # Add compiler flags.
-libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
+libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS) $(ARCH_INCLUDES)
 
 # The -no-undefined flag is neccessary for building DLLs on Windows.
 libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)

openal-pkgconfig.patch:

--- NEW FILE openal-pkgconfig.patch ---
--- admin/pkgconfig/Makefile.am.orig	2006-01-30 23:41:34.000000000 +0100
+++ admin/pkgconfig/Makefile.am	2006-01-30 23:41:44.000000000 +0100
@@ -1,3 +1,3 @@
-pkgconfigdir   = $(prefix)/lib/pkgconfig
+pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS    = openal-config
--- admin/pkgconfig/Makefile.in.orig	2006-01-30 23:45:01.000000000 +0100
+++ admin/pkgconfig/Makefile.in	2006-01-30 23:45:42.000000000 +0100
@@ -192,7 +192,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS = openal-config
 all: all-am


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openal.spec	19 Jan 2006 08:43:37 -0000	1.11
+++ openal.spec	30 Jan 2006 23:05:31 -0000	1.12
@@ -8,6 +8,8 @@
 URL:            http://www.openal.org/
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
+Patch0:         openal-arch.patch
+Patch1:         openal-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -43,6 +45,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 23:22:30 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 30 Jan 2006 18:22:30 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.22,1.23
Message-ID: <200601302323.k0UNN2EL006893@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6874

Modified Files:
	denyhosts.spec 
Log Message:
* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-5
- Redo installation to match current Python packaging guidelines.



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- denyhosts.spec	30 Jan 2006 22:15:56 -0000	1.22
+++ denyhosts.spec	30 Jan 2006 23:22:30 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	4%{?dist}
+release:	5%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -22,6 +22,9 @@
 BuildRequires:  python-devel
 Requires:       openssh-server
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+
 %description
 DenyHosts is a Python script that analyzes the sshd server log
 messages to determine which hosts are attempting to hack into your
@@ -41,15 +44,14 @@
 
 
 %build
-python ./setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
-
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -73,7 +75,6 @@
   touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
 done
 
-find $RPM_BUILD_ROOT -name \*.pyo -exec rm {} \;
 rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
 
 
@@ -97,10 +98,17 @@
 exit 0
 
 
-%files -f %{name}.files
+%files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
 %doc README.fedora README.txt setup.py
+
+%{_bindir}/denyhosts.py
+%{_bindir}/denyhosts-control
+%{python_sitelib}/DenyHosts/*.py
+%{python_sitelib}/DenyHosts/*.pyc
+%ghost %{python_sitelib}/DenyHosts/*.pyo
+
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts
@@ -119,9 +127,13 @@
 %dir %{_localstatedir}/lib/denyhosts
 
 %{_initrddir}/denyhosts
-%{_bindir}/denyhosts-control
+
+
 
 %changelog
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-5
+- Redo installation to match current Python packaging guidelines.
+
 * Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
 - Simplify "[ -f ... ] && rm" to "rm -f".
 



From fedora-extras-commits at redhat.com  Mon Jan 30 23:46:58 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:46:58 -0500
Subject: rpms/ipython/FC-3 .cvsignore, 1.6, 1.7 ipython.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200601302347.k0UNlUxd007210@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7154/FC-3

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to upstream 0.7.1.fix1 fixing KeyboardInterrupt problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Jan 2006 15:31:42 -0000	1.6
+++ .cvsignore	30 Jan 2006 23:46:58 -0000	1.7
@@ -1 +1 @@
-ipython-0.7.1.tar.gz
+ipython-0.7.1.fix1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ipython.spec	24 Jan 2006 15:31:42 -0000	1.6
+++ ipython.spec	30 Jan 2006 23:46:58 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.1
+Version:        0.7.1.fix1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 0.7.1.fix1-1
+- New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
+
 * Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
 - Update to new upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jan 2006 15:31:42 -0000	1.7
+++ sources	30 Jan 2006 23:46:58 -0000	1.8
@@ -1 +1 @@
-ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz
+ac762aa9480822fff49e08475456fb12  ipython-0.7.1.fix1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:47:04 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:47:04 -0500
Subject: rpms/ipython/FC-4 .cvsignore, 1.7, 1.8 ipython.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200601302347.k0UNlaaH007216@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7154/FC-4

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to upstream 0.7.1.fix1 fixing KeyboardInterrupt problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jan 2006 15:31:48 -0000	1.7
+++ .cvsignore	30 Jan 2006 23:47:03 -0000	1.8
@@ -1 +1 @@
-ipython-0.7.1.tar.gz
+ipython-0.7.1.fix1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/ipython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ipython.spec	24 Jan 2006 15:31:48 -0000	1.8
+++ ipython.spec	30 Jan 2006 23:47:03 -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:           ipython
-Version:        0.7.1
+Version:        0.7.1.fix1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 0.7.1.fix1-1
+- New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
+
 * Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
 - Update to new upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jan 2006 15:31:48 -0000	1.7
+++ sources	30 Jan 2006 23:47:03 -0000	1.8
@@ -1 +1 @@
-ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz
+ac762aa9480822fff49e08475456fb12  ipython-0.7.1.fix1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:47:09 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:47:09 -0500
Subject: rpms/ipython/devel .cvsignore, 1.7, 1.8 ipython.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200601302347.k0UNlfnH007224@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7154/devel

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to upstream 0.7.1.fix1 fixing KeyboardInterrupt problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jan 2006 15:31:54 -0000	1.7
+++ .cvsignore	30 Jan 2006 23:47:09 -0000	1.8
@@ -1 +1 @@
-ipython-0.7.1.tar.gz
+ipython-0.7.1.fix1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ipython.spec	24 Jan 2006 15:31:54 -0000	1.8
+++ ipython.spec	30 Jan 2006 23:47:09 -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:           ipython
-Version:        0.7.1
+Version:        0.7.1.fix1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 0.7.1.fix1-1
+- New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
+
 * Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
 - Update to new upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jan 2006 15:31:54 -0000	1.7
+++ sources	30 Jan 2006 23:47:09 -0000	1.8
@@ -1 +1 @@
-ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz
+ac762aa9480822fff49e08475456fb12  ipython-0.7.1.fix1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:54:32 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:54:32 -0500
Subject: rpms/python-tpg/FC-3 .cvsignore, 1.2, 1.3 python-tpg.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601302355.k0UNt5QC007462@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7399/FC-3

Modified Files:
	.cvsignore python-tpg.spec sources 
Log Message:
updated to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
+++ .cvsignore	30 Jan 2006 23:54:32 -0000	1.3
@@ -1 +1 @@
-TPG-3.0.5.tar.gz
+TPG-3.0.6.tar.gz


Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-3/python-tpg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-tpg.spec	12 May 2005 14:58:34 -0000	1.3
+++ python-tpg.spec	30 Jan 2006 23:54:32 -0000	1.4
@@ -3,14 +3,14 @@
 %define srcname TPG
 
 Name:           python-tpg
-Version:        3.0.5
-Release:        4%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://christophe.delord.free.fr/en/tpg/
-Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.5.tar.gz
+Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 3.0.6-1
+- update to upstream 3.0.6
+
 * Thu May 12 2005 Shahms E. King <shahms at shahms.com> 3.0.5-4
 - rebuilt, add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:44:50 -0000	1.2
+++ sources	30 Jan 2006 23:54:32 -0000	1.3
@@ -1 +1 @@
-4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz
+b5a7cb77a5ad7a5861fcecb74d6e9646  TPG-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:54:38 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:54:38 -0500
Subject: rpms/python-tpg/FC-4 .cvsignore, 1.2, 1.3 python-tpg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601302355.k0UNtAgt007472@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7399/FC-4

Modified Files:
	.cvsignore python-tpg.spec sources 
Log Message:
updated to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
+++ .cvsignore	30 Jan 2006 23:54:38 -0000	1.3
@@ -1 +1 @@
-TPG-3.0.5.tar.gz
+TPG-3.0.6.tar.gz


Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-4/python-tpg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tpg.spec	12 May 2005 14:56:24 -0000	1.4
+++ python-tpg.spec	30 Jan 2006 23:54:38 -0000	1.5
@@ -3,14 +3,14 @@
 %define srcname TPG
 
 Name:           python-tpg
-Version:        3.0.5
-Release:        4%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://christophe.delord.free.fr/en/tpg/
-Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.5.tar.gz
+Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 3.0.6-1
+- update to upstream 3.0.6
+
 * Thu May 12 2005 Shahms E. King <shahms at shahms.com> 3.0.5-4
 - rebuilt, add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:44:50 -0000	1.2
+++ sources	30 Jan 2006 23:54:38 -0000	1.3
@@ -1 +1 @@
-4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz
+b5a7cb77a5ad7a5861fcecb74d6e9646  TPG-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:54:44 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:54:44 -0500
Subject: rpms/python-tpg/devel .cvsignore, 1.2, 1.3 python-tpg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601302355.k0UNtG9i007477@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7399/devel

Modified Files:
	.cvsignore python-tpg.spec sources 
Log Message:
updated to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
+++ .cvsignore	30 Jan 2006 23:54:44 -0000	1.3
@@ -1 +1 @@
-TPG-3.0.5.tar.gz
+TPG-3.0.6.tar.gz


Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/python-tpg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tpg.spec	12 May 2005 14:56:24 -0000	1.4
+++ python-tpg.spec	30 Jan 2006 23:54:44 -0000	1.5
@@ -3,14 +3,14 @@
 %define srcname TPG
 
 Name:           python-tpg
-Version:        3.0.5
-Release:        4%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://christophe.delord.free.fr/en/tpg/
-Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.5.tar.gz
+Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 3.0.6-1
+- update to upstream 3.0.6
+
 * Thu May 12 2005 Shahms E. King <shahms at shahms.com> 3.0.5-4
 - rebuilt, add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:44:50 -0000	1.2
+++ sources	30 Jan 2006 23:54:44 -0000	1.3
@@ -1 +1 @@
-4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz
+b5a7cb77a5ad7a5861fcecb74d6e9646  TPG-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:56:53 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:56:53 -0500
Subject: rpms/smb4k - New directory
Message-ID: <200601302356.k0UNutxU007657@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643/smb4k

Log Message:
Directory /cvs/extras/rpms/smb4k added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 23:56:58 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:56:58 -0500
Subject: rpms/smb4k/devel - New directory
Message-ID: <200601302357.k0UNv15d007672@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643/smb4k/devel

Log Message:
Directory /cvs/extras/rpms/smb4k/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 23:57:18 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:57:18 -0500
Subject: rpms/smb4k Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601302357.k0UNvK9q007706@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7694

Added Files:
	Makefile import.log 
Log Message:
Setup of module smb4k


--- NEW FILE Makefile ---
# Top level Makefile for module smb4k
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 30 23:57:24 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:57:24 -0500
Subject: rpms/smb4k/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601302357.k0UNvQ3w007728@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7694/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module smb4k


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 30 23:58:11 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:58:11 -0500
Subject: rpms/smb4k import.log,1.1,1.2
Message-ID: <200601302358.k0UNwh9e007804@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7767

Modified Files:
	import.log 
Log Message:
auto-import smb4k-0.6.5-4 on branch devel from smb4k-0.6.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/smb4k/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Jan 2006 23:57:17 -0000	1.1
+++ import.log	30 Jan 2006 23:58:11 -0000	1.2
@@ -0,0 +1 @@
+smb4k-0_6_5-4:HEAD:smb4k-0.6.5-4.src.rpm:1138665507



From fedora-extras-commits at redhat.com  Mon Jan 30 23:58:16 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:58:16 -0500
Subject: rpms/smb4k/devel smb4k-0.6.5-desktop.patch, NONE, 1.1 smb4k.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601302358.k0UNwnUw007808@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7767/devel

Modified Files:
	.cvsignore sources 
Added Files:
	smb4k-0.6.5-desktop.patch smb4k.spec 
Log Message:
auto-import smb4k-0.6.5-4 on branch devel from smb4k-0.6.5-4.src.rpm

smb4k-0.6.5-desktop.patch:

--- NEW FILE smb4k-0.6.5-desktop.patch ---
diff -ur smb4k-0.6.5-orig/smb4k/smb4k.desktop smb4k-0.6.5/smb4k/smb4k.desktop
--- smb4k-0.6.5-orig/smb4k/smb4k.desktop	2005-06-16 12:19:55.000000000 +0200
+++ smb4k-0.6.5/smb4k/smb4k.desktop	2006-01-11 21:17:05.000000000 +0100
@@ -77,5 +77,5 @@
 Icon=smb4k
 DocPath=smb4k/index.html
 Type=Application
-Terminal=0
-Categories=Qt;KDE;Utility
\ Brak znaku nowej linii na ko??cu pliku
+Terminal=false
+Categories=Qt;KDE;Utility;


--- NEW FILE smb4k.spec ---
Name:		smb4k
Version:	0.6.5
Release:	4%{?dist}
Summary:	The SMB/CIFS Share Browser for KDE

Group:		Applications/Internet
License:	GPL
URL:		http://smb4k.berlios.de/
Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
Patch0:		smb4k-0.6.5-desktop.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	kdelibs-devel kdebase-devel gettext
Requires:	samba-client

%description
Smb4K is an SMB/CIFS share browser for KDE. It uses the Samba software suite to
access the SMB/CIFS shares of the local network neighborhood. Its purpose is to
provide a program that's easy to use and has as many features as possible.

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

%description devel
This package contains the libraries, include files and other resources
needed to develop applications using %{name}.

%prep
%setup -q
%patch0 -p1

%build
unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
	--disable-rpath \
	--disable-debug \
	--disable-dependency-tracking \
	--enable-final
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--add-category Application \
	--add-category Network \
	--add-category FileManager \
	$RPM_BUILD_ROOT%{_datadir}/applications/kde/smb4k.desktop

# Make symlink relative
pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/smb4k/
ln -s -f ../common
popd

# Ugly workaround for broken libtool archive
sed -i -e "s:-L%{_builddir}/%{name}-%{version}/smb4k/core ::" \
	$RPM_BUILD_ROOT%{_libdir}/kde3/konqsidebar_smb4k.la
sed -i -e "s:-L%{_builddir}/%{name}-%{version}/smb4k/widgets ::" \
	$RPM_BUILD_ROOT%{_libdir}/kde3/konqsidebar_smb4k.la

%find_lang %{name}

rm -f $RPM_BUILD_ROOT%{_libdir}/libsmb4k*.la

%post
/sbin/ldconfig

touch --no-create %{_datadir}/icons/crystalsvg || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
fi

%postun
/sbin/ldconfig

touch --no-create %{_datadir}/icons/crystalsvg || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
fi
	
%clean
rm -rf $RPM_BUILD_ROOT

%files -f %name.lang
%defattr(-, root, root)
%doc AUTHORS BUGS ChangeLog COPYING FAQ README TODO
%{_bindir}/*
%{_libdir}/kde3/konqsidebar_smb4k.la
%{_libdir}/kde3/konqsidebar_smb4k.so
%{_libdir}/libsmb4k*.so.*
%{_datadir}/applications/*smb4k.desktop
%{_datadir}/apps/konqsidebartng/
%{_datadir}/apps/smb4k/
%{_datadir}/doc/HTML/en/smb4k/
%{_datadir}/icons/crystalsvg/*

%files devel
%defattr(-, root, root)
%{_includedir}/smb4k*.h
%{_libdir}/*.so

%changelog
* Wed Jan 18 2006 Marcin Garski <mgarski at post.pl> 0.6.5-4
- Remove libxml2 from BR
- Add workaround for broken libtool archive (made by Dawid Gajownik)

* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.6.5-3
- Get rid of desktop-file-utils
- Add --disable-dependency-tracking & --enable-final

* Thu Jan 12 2006 Marcin Garski <mgarski at post.pl> 0.6.5-2
- Add kdebase-devel to BuildRequires

* Wed Jan 11 2006 Marcin Garski <mgarski at post.pl> 0.6.5-1
- Updated to version 0.6.5 && spec cleanup for FE

* Sun Sep 05 2004 Marcin Garski <mgarski at post.pl> 0.4.1a-1.fc2
- Updated to version 0.4.1a

* Thu Aug 31 2004 Marcin Garski <mgarski at post.pl> 0.4.1-1.fc2
- Updated to version 0.4.1

* Wed Jun 02 2004 Marcin Garski <mgarski at post.pl> 0.4.0-3.fc2
- Rebuild for Fedora Core 2

* Thu May 06 2004 Marcin Garski <mgarski at post.pl> 0.4.0-2
- Convert pl.po to UTF-8

* Thu May 06 2004 Marcin Garski <mgarski at post.pl> 0.4.0-1
- Update to 0.4.0

* Wed Jan 21 2004 Marcin Garski <mgarski at post.pl> 0.3.2-1
- Rebuild for Fedora Core 1

* Thu Dec 18 2003 Marcin Garski <mgarski at post.pl> 0.3.1-3
- Cleanup specfile

* Fri Nov 27 2003 Marcin Garski <mgarski at post.pl> 0.3.1-2
- Initial specfile based on specfile by Ian Geiser <geiseri at msoe.edu>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2006 23:57:24 -0000	1.1
+++ .cvsignore	30 Jan 2006 23:58:16 -0000	1.2
@@ -0,0 +1 @@
+smb4k-0.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2006 23:57:24 -0000	1.1
+++ sources	30 Jan 2006 23:58:16 -0000	1.2
@@ -0,0 +1 @@
+6483086faa286db4ffe4de97643b4cf2  smb4k-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:59:13 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:59:13 -0500
Subject: rpms/python-simpletal/FC-3 .cvsignore, 1.3,
	1.4 python-simpletal.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601302359.k0UNxjO7007923@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7853/FC-3

Modified Files:
	.cvsignore python-simpletal.spec sources 
Log Message:
Update to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 19:54:57 -0000	1.3
+++ .cvsignore	30 Jan 2006 23:59:13 -0000	1.4
@@ -1 +1 @@
-SimpleTAL-3.13.tar.gz
+SimpleTAL-4.1.tar.gz


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-3/python-simpletal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-simpletal.spec	6 Oct 2005 19:54:57 -0000	1.4
+++ python-simpletal.spec	30 Jan 2006 23:59:13 -0000	1.5
@@ -3,7 +3,7 @@
 %define srcname SimpleTAL
 
 Name:           python-simpletal
-Version:        3.13
+Version:        4.1
 Release:        1%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 4.1-1
+- Update to new upstream version 4.1
+
 * Thu Oct 06 2005 Shahms E. King <shahms at shahms.com> 3.13-1
 - use srcname and version in Source URL
 - update to new upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 19:54:57 -0000	1.3
+++ sources	30 Jan 2006 23:59:13 -0000	1.4
@@ -1 +1 @@
-2099be1bb59b5d608aa95cf7c8d077a1  SimpleTAL-3.13.tar.gz
+16c5673382967310b336c68591ae6786  SimpleTAL-4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:59:19 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:59:19 -0500
Subject: rpms/python-simpletal/FC-4 .cvsignore, 1.3,
	1.4 python-simpletal.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601302359.k0UNxpbW007928@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7853/FC-4

Modified Files:
	.cvsignore python-simpletal.spec sources 
Log Message:
Update to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 19:54:58 -0000	1.3
+++ .cvsignore	30 Jan 2006 23:59:18 -0000	1.4
@@ -1 +1 @@
-SimpleTAL-3.13.tar.gz
+SimpleTAL-4.1.tar.gz


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-4/python-simpletal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-simpletal.spec	6 Oct 2005 19:54:58 -0000	1.5
+++ python-simpletal.spec	30 Jan 2006 23:59:18 -0000	1.6
@@ -3,7 +3,7 @@
 %define srcname SimpleTAL
 
 Name:           python-simpletal
-Version:        3.13
+Version:        4.1
 Release:        1%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 4.1-1
+- Update to new upstream version 4.1
+
 * Thu Oct 06 2005 Shahms E. King <shahms at shahms.com> 3.13-1
 - use srcname and version in Source URL
 - update to new upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 19:54:58 -0000	1.3
+++ sources	30 Jan 2006 23:59:18 -0000	1.4
@@ -1 +1 @@
-2099be1bb59b5d608aa95cf7c8d077a1  SimpleTAL-3.13.tar.gz
+16c5673382967310b336c68591ae6786  SimpleTAL-4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:59:25 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:59:25 -0500
Subject: rpms/python-simpletal/devel .cvsignore, 1.3,
	1.4 python-simpletal.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601302359.k0UNxwuO007933@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7853/devel

Modified Files:
	.cvsignore python-simpletal.spec sources 
Log Message:
Update to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 19:54:58 -0000	1.3
+++ .cvsignore	30 Jan 2006 23:59:25 -0000	1.4
@@ -1 +1 @@
-SimpleTAL-3.13.tar.gz
+SimpleTAL-4.1.tar.gz


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/python-simpletal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-simpletal.spec	6 Oct 2005 19:54:58 -0000	1.5
+++ python-simpletal.spec	30 Jan 2006 23:59:25 -0000	1.6
@@ -3,7 +3,7 @@
 %define srcname SimpleTAL
 
 Name:           python-simpletal
-Version:        3.13
+Version:        4.1
 Release:        1%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 4.1-1
+- Update to new upstream version 4.1
+
 * Thu Oct 06 2005 Shahms E. King <shahms at shahms.com> 3.13-1
 - use srcname and version in Source URL
 - update to new upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 19:54:58 -0000	1.3
+++ sources	30 Jan 2006 23:59:25 -0000	1.4
@@ -1 +1 @@
-2099be1bb59b5d608aa95cf7c8d077a1  SimpleTAL-3.13.tar.gz
+16c5673382967310b336c68591ae6786  SimpleTAL-4.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 00:02:00 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 19:02:00 -0500
Subject: owners owners.list,1.580,1.581
Message-ID: <200601310002.k0V02XQ8009808@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9775

Modified Files:
	owners.list 
Log Message:
- Add smb4k



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- owners.list	30 Jan 2006 00:34:58 -0000	1.580
+++ owners.list	31 Jan 2006 00:02:00 -0000	1.581
@@ -1165,6 +1165,7 @@
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|snort|An intrusion detection system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 08:16:17 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 31 Jan 2006 03:16:17 -0500
Subject: fedora-security/audit fc4,1.137,1.138 fc5,1.47,1.48
Message-ID: <200601310816.k0V8GHBU026272@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26242

Modified Files:
	fc4 fc5 
Log Message:
Updates from the last week



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- fc4	24 Jan 2006 09:30:55 -0000	1.137
+++ fc4	31 Jan 2006 08:16:08 -0000	1.138
@@ -1,10 +1,13 @@
-Up to date CVE as of CVE email 20060122
+Up to date CVE as of CVE email 20060130
 Up to date FC4 as of 20060122
 
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
+CVE-2006-0301 VULNERABLE (xpdf) bz#179047
+CVE-2006-0301 VULNERABLE (poppler) bz#179054
+CVE-2006-0301 VULNERABLE (kdegraphics) bz#179056
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
@@ -1308,6 +1311,8 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1573 version (kernel, not 2.6)
+CVE-2002-1572 version (kernel, not 2.6)
 CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- fc5	24 Jan 2006 09:30:55 -0000	1.47
+++ fc5	31 Jan 2006 08:16:08 -0000	1.48
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060122
+Up to date CVE as of CVE email 20060130
 Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -17,6 +17,9 @@
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724
+CVE-2006-0301 VULNERABLE (xpdf)
+CVE-2006-0301 VULNERABLE (poppler)
+CVE-2006-0301 VULNERABLE (kdegraphics)
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 VULNERABLE (openssh)
@@ -1361,6 +1364,8 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1573 version (kernel, not 2.6)
+CVE-2002-1572 version (kernel, not 2.6)
 CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)



From fedora-extras-commits at redhat.com  Tue Jan 31 08:26:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 03:26:05 -0500
Subject: owners owners.list,1.581,1.582
Message-ID: <200601310826.k0V8QbH9026311@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26294

Modified Files:
	owners.list 
Log Message:
add lacewing


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- owners.list	31 Jan 2006 00:02:00 -0000	1.581
+++ owners.list	31 Jan 2006 08:26:04 -0000	1.582
@@ -479,6 +479,7 @@
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|lacewing|Asteroid like game with many different ships|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 08:33:07 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 31 Jan 2006 03:33:07 -0500
Subject: fedora-security/audit fc4,1.138,1.139 fc5,1.48,1.49
Message-ID: <200601310833.k0V8X7Cr026354@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26334

Modified Files:
	fc4 fc5 
Log Message:
Catch up with FC5 bugzilla issues and mark those that are fixed in
rawhide (and hence will be in FC5test3)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- fc4	31 Jan 2006 08:16:08 -0000	1.138
+++ fc4	31 Jan 2006 08:32:59 -0000	1.139
@@ -11,7 +11,7 @@
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
-CVE-2006-0208 VULNERALBE (php) bz#178036
+CVE-2006-0208 VULNERABLE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
 CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
 CVE-2006-0197 ** xorg-x11


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- fc5	31 Jan 2006 08:16:08 -0000	1.48
+++ fc5	31 Jan 2006 08:32:59 -0000	1.49
@@ -16,10 +16,10 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
-CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724
-CVE-2006-0301 VULNERABLE (xpdf)
-CVE-2006-0301 VULNERABLE (poppler)
-CVE-2006-0301 VULNERABLE (kdegraphics)
+CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724:rawhide
+CVE-2006-0301 VULNERABLE (xpdf) bz#179423
+CVE-2006-0301 VULNERABLE (poppler) bz#179424
+CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 VULNERABLE (openssh)
@@ -79,30 +79,30 @@
 CVE-2005-3651 version (ethereal, fixed 0.10.14)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
-CVE-2005-3628 VULNERABLE (xpdf) bz#177911
+CVE-2005-3628 VULNERABLE (xpdf) bz#177911:rawhide
 CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch
-CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3628 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3628 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3627 VULNERABLE (xpdf) bz#177911
-CVE-2005-3627 VULNERABLE (tetex) bz#177912
-CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3627 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3627 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3627 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3627 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3626 VULNERABLE (xpdf) bz#177911
-CVE-2005-3626 VULNERABLE (tetex) bz#177912
-CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3626 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3626 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3626 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3626 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3625 VULNERABLE (xpdf) bz#177911
-CVE-2005-3625 VULNERABLE (tetex) bz#177912
-CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3625 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3625 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3625 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3625 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3624 VULNERABLE (xpdf) bz#177911
-CVE-2005-3624 VULNERABLE (tetex) bz#177912
-CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3624 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3624 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3624 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3624 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch
 CVE-2005-3623 version (kernel, fixed 2.6.14.5)
 CVE-2005-3582 version (ImageMagick) gentoo only
@@ -140,21 +140,21 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13)
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
-CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide
 CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3193 VULNERABLE (kdegraphics) bz#177908
-CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3193 VULNERABLE (kdegraphics) bz#177908:rawhide
+CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide
 CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3192 VULNERABLE (kdegraphics) bz#177908
-CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3192 VULNERABLE (kdegraphics) bz#177908:rawhide
+CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide
 CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3191 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3191 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
@@ -847,7 +847,7 @@
 CVE-2004-0956 version (mysql, fixed 4.0.20)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 VULNERABLE (gd) bz#177907
+CVE-2004-0941 VULNERABLE (gd) bz#177907:rawhide
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)



From fedora-extras-commits at redhat.com  Tue Jan 31 09:28:26 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Tue, 31 Jan 2006 04:28:26 -0500
Subject: rpms/feh/devel feh.spec,1.6,1.7
Message-ID: <200601310928.k0V9Swrn028793@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28774

Modified Files:
	feh.spec 
Log Message:
* Tue Jan 31 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 1.3.4-2
- change to new modular X devel BuildReqs



Index: feh.spec
===================================================================
RCS file: /cvs/extras/rpms/feh/devel/feh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- feh.spec	1 Sep 2005 02:33:30 -0000	1.6
+++ feh.spec	31 Jan 2006 09:28:25 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:         	feh 
 Version:        1.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast command line image viewer using Imlib2
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: giblib-devel imlib2-devel libjpeg-devel libpng-devel
+BuildRequires: libXt-devel
 
 %description
 feh is a versatile and fast image viewer using imlib2, the
@@ -47,6 +48,9 @@
 %{_mandir}/man[^3]/*
 
 %changelog
+* Tue Jan 31 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 1.3.4-2
+- change to new modular X devel BuildReqs
+
 * Wed Aug 31 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 1.3.4-1
 - bump to 1.3.4
 



From fedora-extras-commits at redhat.com  Tue Jan 31 10:05:56 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:05:56 -0500
Subject: rpms/perl-Text-Unidecode - New directory
Message-ID: <200601311005.k0VA5wXb030794@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/perl-Text-Unidecode

Log Message:
Directory /cvs/extras/rpms/perl-Text-Unidecode added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 10:06:18 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:06:18 -0500
Subject: rpms/perl-Text-Unidecode/devel - New directory
Message-ID: <200601311006.k0VA6LeC030809@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/perl-Text-Unidecode/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-Unidecode/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 10:07:09 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:07:09 -0500
Subject: rpms/perl-Text-Unidecode Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311007.k0VA7Brf030843@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30831

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-Unidecode


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-Unidecode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 10:07:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:07:27 -0500
Subject: rpms/perl-Text-Unidecode/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601311007.k0VA7To5030861@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30831/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-Unidecode


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 10:09:03 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:09:03 -0500
Subject: rpms/perl-Text-Unidecode import.log,1.1,1.2
Message-ID: <200601311009.k0VA9ZDZ030940@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30897

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-Unidecode-0.04-1 on branch devel from perl-Text-Unidecode-0.04-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Unidecode/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 10:07:08 -0000	1.1
+++ import.log	31 Jan 2006 10:09:02 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-Unidecode-0_04-1:HEAD:perl-Text-Unidecode-0.04-1.src.rpm:1138702063



From fedora-extras-commits at redhat.com  Tue Jan 31 10:09:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:09:27 -0500
Subject: rpms/perl-Text-Unidecode/devel perl-Text-Unidecode.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601311009.k0VA9xFW030955@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30897/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-Unidecode.spec 
Log Message:
auto-import perl-Text-Unidecode-0.04-1 on branch devel from perl-Text-Unidecode-0.04-1.src.rpm


--- NEW FILE perl-Text-Unidecode.spec ---
Name:           perl-Text-Unidecode
Version:        0.04
Release:        1%{?dist}
Summary:        US-ASCII transliterations of Unicode text

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Text-Unidecode/
Source0:        http://www.cpan.org/modules/by-module/Text/Text-Unidecode-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description

Text::Unidecode provides a function, `unidecode(...)' that
takes Unicode data and tries to represent it in US-ASCII
characters (i.e., the universally displayable characters between
0x00 and 0x7F). The representation is almost always an attempt at
*transliteration* -- i.e., conveying, in Roman letters, the
pronunciation expressed by the text in some other writing
system. 


%prep
%setup -q -n Text-Unidecode-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README TODO.txt ChangeLog
%{perl_vendorlib}/Text/
%{_mandir}/man3/*.3*


%changelog
* Sun Jan 29 2006 Patrice Dumas <pertusus at free.fr> - 0.04-1
- fedora extras submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Unidecode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 10:07:27 -0000	1.1
+++ .cvsignore	31 Jan 2006 10:09:26 -0000	1.2
@@ -0,0 +1 @@
+Text-Unidecode-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Unidecode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 10:07:27 -0000	1.1
+++ sources	31 Jan 2006 10:09:26 -0000	1.2
@@ -0,0 +1 @@
+06f6bddb396ab386aa66a2bc8a04df76  Text-Unidecode-0.04.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 10:31:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Jan 2006 05:31:42 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.4, 1.5 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200601311032.k0VAWEDL031183@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31162

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 1.3.83



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkwave.spec	19 Jan 2006 11:27:23 -0000	1.4
+++ gtkwave.spec	31 Jan 2006 10:31:30 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.82
+Version:		1.3.83
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Jan 31 2006 Paul Howarth <paul at city-fan.org> 1.3.83-1
+- update to 1.3.83
+
 * Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
 - update to 1.3.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 11:27:23 -0000	1.5
+++ sources	31 Jan 2006 10:31:31 -0000	1.6
@@ -1 +1 @@
-0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz
+46655d05fc68437883157313979dac5f  gtkwave-1.3.83.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 11:27:23 -0000	1.5
+++ .cvsignore	31 Jan 2006 10:31:31 -0000	1.6
@@ -1 +1 @@
-gtkwave-1.3.82.tgz
+gtkwave-1.3.83.tgz



From fedora-extras-commits at redhat.com  Tue Jan 31 10:34:37 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Jan 2006 05:34:37 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.4, 1.5 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200601311035.k0VAZ9XB031260@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31239

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkwave.spec	19 Jan 2006 11:30:03 -0000	1.4
+++ gtkwave.spec	31 Jan 2006 10:34:37 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.82
+Version:		1.3.83
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Jan 31 2006 Paul Howarth <paul at city-fan.org> 1.3.83-1
+- update to 1.3.83
+
 * Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
 - update to 1.3.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 11:30:03 -0000	1.5
+++ sources	31 Jan 2006 10:34:37 -0000	1.6
@@ -1 +1 @@
-0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz
+46655d05fc68437883157313979dac5f  gtkwave-1.3.83.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 11:30:03 -0000	1.5
+++ .cvsignore	31 Jan 2006 10:34:37 -0000	1.6
@@ -1 +1 @@
-gtkwave-1.3.82.tgz
+gtkwave-1.3.83.tgz



From fedora-extras-commits at redhat.com  Tue Jan 31 10:37:12 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Jan 2006 05:37:12 -0500
Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.4, 1.5 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200601311037.k0VAbjR1031343@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31322

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkwave.spec	19 Jan 2006 11:32:28 -0000	1.4
+++ gtkwave.spec	31 Jan 2006 10:37:12 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.82
+Version:		1.3.83
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Jan 31 2006 Paul Howarth <paul at city-fan.org> 1.3.83-1
+- update to 1.3.83
+
 * Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
 - update to 1.3.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 11:32:28 -0000	1.5
+++ sources	31 Jan 2006 10:37:12 -0000	1.6
@@ -1 +1 @@
-0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz
+46655d05fc68437883157313979dac5f  gtkwave-1.3.83.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 11:32:28 -0000	1.5
+++ .cvsignore	31 Jan 2006 10:37:12 -0000	1.6
@@ -1 +1 @@
-gtkwave-1.3.82.tgz
+gtkwave-1.3.83.tgz



From fedora-extras-commits at redhat.com  Tue Jan 31 13:22:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 08:22:31 -0500
Subject: rpms/lyx/devel .cvsignore, 1.5, 1.6 lyx.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200601311323.k0VDN3FW004727@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
- 1.4.0pre4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Jan 2006 18:06:33 -0000	1.5
+++ .cvsignore	31 Jan 2006 13:22:30 -0000	1.6
@@ -1 +1 @@
-lyx-1.4.0pre3.tar.bz2
+lyx-1.4.0pre4.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lyx.spec	26 Jan 2006 18:01:08 -0000	1.17
+++ lyx.spec	31 Jan 2006 13:22:30 -0000	1.18
@@ -1,15 +1,15 @@
 
-%define beta pre3
+%define beta pre4
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.1.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:  ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-1.4.0pre3.tar.bz2
+Source:  ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
@@ -32,10 +32,6 @@
 BuildRequires: qt-devel
 # xforms frontend
 BuildRequires: xforms-devel
-BuildRequires: libjpeg-devel
-%if "%{?fedora}" > "4"
-BuildRequires: libXpm-devel
-%endif
 
 BuildRequires: desktop-file-utils
 BuildRequires: python
@@ -118,8 +114,6 @@
   --with-aspell \
   --without-warnings --disable-debug --disable-dependency-tracking
 
-#--with-included-boost
-
 # Intermediate cleanup
 # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
 make -C src/frontends clean
@@ -145,10 +139,6 @@
 mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
    $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
 
-# KDE already has a nice builtin crystalsvg icon, 
-# but this is for gnome's benefit (gtk2 < 2.6)
-#install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -157,8 +147,6 @@
 
 %find_lang %{name} || touch %{name}.lang
 
-#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
-
 
 %post
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
@@ -191,8 +179,6 @@
 %{_bindir}/lyx
 %{_bindir}/lyxclient
 %{_bindir}/tex2lyx
-#{_datadir}/applications/*-lyx.desktop
-#{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 %{_datadir}/lyx/
 %{_datadir}/texmf/tex/latex/lyx/
@@ -212,6 +198,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
+- 1.4.0pre4
+
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
 - 1.4.0pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Jan 2006 18:06:33 -0000	1.6
+++ sources	31 Jan 2006 13:22:30 -0000	1.7
@@ -1 +1 @@
-d1e83cf590c2682b37cea2729608ac77  lyx-1.4.0pre3.tar.bz2
+dbf4af105ce244dbe2b931cb27b4a5c9  lyx-1.4.0pre4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:24 -0500
Subject: rpms/perl-DBD-CSV - New directory
Message-ID: <200601311342.k0VDgQvp004841@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4833/perl-DBD-CSV

Log Message:
Directory /cvs/extras/rpms/perl-DBD-CSV added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:30 -0500
Subject: rpms/perl-DBD-CSV/devel - New directory
Message-ID: <200601311342.k0VDgWxe004856@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4833/perl-DBD-CSV/devel

Log Message:
Directory /cvs/extras/rpms/perl-DBD-CSV/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:49 -0500
Subject: rpms/perl-DBD-CSV Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311342.k0VDgpOs004890@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4878

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DBD-CSV


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBD-CSV
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:54 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:54 -0500
Subject: rpms/perl-DBD-CSV/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601311342.k0VDgu4Y004910@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4878/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBD-CSV


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 13:43:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:43:26 -0500
Subject: rpms/perl-DBD-CSV import.log,1.1,1.2
Message-ID: <200601311343.k0VDhwTC004978@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4944

Modified Files:
	import.log 
Log Message:
auto-import perl-DBD-CSV-0.22-2 on branch devel from perl-DBD-CSV-0.22-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-CSV/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 13:42:48 -0000	1.1
+++ import.log	31 Jan 2006 13:43:26 -0000	1.2
@@ -0,0 +1 @@
+perl-DBD-CSV-0_22-2:HEAD:perl-DBD-CSV-0.22-2.src.rpm:1138714998



From fedora-extras-commits at redhat.com  Tue Jan 31 13:43:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:43:32 -0500
Subject: rpms/perl-DBD-CSV/devel perl-DBD-CSV.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601311344.k0VDi4mr004982@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4944/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBD-CSV.spec 
Log Message:
auto-import perl-DBD-CSV-0.22-2 on branch devel from perl-DBD-CSV-0.22-2.src.rpm


--- NEW FILE perl-DBD-CSV.spec ---
Name:           perl-DBD-CSV
Version:        0.22
Release:        2%{?dist}
Summary:        DBI driver for CSV files

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/DBD-CSV/
Source0:        http://www.cpan.org/authors/id/J/JZ/JZUCKER/DBD-CSV-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(DBI) >= 1.00
BuildRequires:  perl(DBD::File) >= 0.30
BuildRequires:  perl(SQL::Statement) >= 0.1011
BuildRequires:  perl(Text::CSV_XS) >= 0.16
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The DBD::CSV module is yet another driver for the DBI (Database
independent interface for Perl). This one is based on the SQL
"engine" SQL::Statement and the abstract DBI driver DBD::File
and implements access to so-called CSV files (Comma separated
values). Such files are mostly used for exporting MS Access and
MS Excel data.


%prep
%setup -q -n DBD-CSV-%{version}
chmod a-x ChangeLog README lib/DBD/*.pm lib/Bundle/DBD/*.pm


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorlib}/Bundle/
%{perl_vendorlib}/DBD/
%{_mandir}/man3/*.3*


%changelog
* Sat Dec 17 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-2
- Missing build requirement: DBD::File >= 0.30.

* Sun Sep 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-CSV/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 13:42:54 -0000	1.1
+++ .cvsignore	31 Jan 2006 13:43:32 -0000	1.2
@@ -0,0 +1 @@
+DBD-CSV-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-CSV/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 13:42:54 -0000	1.1
+++ sources	31 Jan 2006 13:43:32 -0000	1.2
@@ -0,0 +1 @@
+365517fb2e0f565b16613eac01046d85  DBD-CSV-0.22.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 13:51:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:51:16 -0500
Subject: owners owners.list,1.582,1.583
Message-ID: <200601311351.k0VDpm4F005094@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5077

Modified Files:
	owners.list 
Log Message:
New package: perl-DBD-CSV (#175899).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- owners.list	31 Jan 2006 08:26:04 -0000	1.582
+++ owners.list	31 Jan 2006 13:51:16 -0000	1.583
@@ -791,6 +791,7 @@
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 31 14:02:40 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:02:40 -0500
Subject: rpms/dvdisaster/devel .cvsignore, 1.2, 1.3 dvdisaster.spec, 1.4,
	1.5 sources, 1.2, 1.3 dvdisaster-0.64.2-browser.patch, 1.1, NONE
Message-ID: <200601311403.k0VE3CMK006898@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6863

Modified Files:
	.cvsignore dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.64.2-browser.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 12:24:13 -0000	1.2
+++ .cvsignore	31 Jan 2006 14:02:39 -0000	1.3
@@ -1 +1 @@
-dvdisaster-0.64.2.tar.bz2
+dvdisaster-0.65.tar.bz2


Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdisaster.spec	3 Nov 2005 15:25:55 -0000	1.4
+++ dvdisaster.spec	31 Jan 2006 14:02:39 -0000	1.5
@@ -1,13 +1,12 @@
 Name: dvdisaster
 Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.64.2
-Release: 2%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
 Source1: dvdisaster.desktop
-Patch0: dvdisaster-0.64.2-browser.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +32,15 @@
 degli errori che saranno poi utilizzati per recuperare i settori illeggibili
 se il supporto dovesse danneggiarsi col tempo.
 
+%description -l cs
+%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat
+na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m.
+Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch
+sektor??, pokud se disk pozd??ji po??kod??.
+
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -53,14 +57,6 @@
 	DOCSUBDIR=%{_docdir}/%{name}-%{version}
 
 
-pushd documentation
-for man in *.1
-do
-    iconv -f ISO8859-1 -t UTF8 <$man >$man.new && mv -f $man.new $man
-done
-popd
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,7 +68,7 @@
 
 for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
 do
-    sed -i "s:$RPM_BUILD_ROOT::g" $man
+    sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
 done
 
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -102,17 +98,26 @@
 %{_docdir}/%{name}-%{version}/COPYING
 %{_docdir}/%{name}-%{version}/CREDITS.en
 %lang(de) %{_docdir}/%{name}-%{version}/CREDITS.de
+%lang(cs) %{_docdir}/%{name}-%{version}/CREDITS.cs
 %{_docdir}/%{name}-%{version}/TODO
 %{_docdir}/%{name}-%{version}/en
 %lang(de) %{_docdir}/%{name}-%{version}/de
+%lang(cs) %{_docdir}/%{name}-%{version}/cs
 %{_docdir}/%{name}-%{version}/images
 
 %{_mandir}/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(it) %{_mandir}/it/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.65-1
+- upgrade to 0.65
+- drop browser patch (no more needed)
+- drop manual convertations to utf8 -- already in good encodings.
+- handle new locale (czech)
+
 * Thu Nov  3 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64.2-2
 - use user preferred browser to view manuals online (patch0)
 - Accepted for Fedora Extra (review by Ville Skytta <ville.skytta at iki.fi>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 12:24:13 -0000	1.2
+++ sources	31 Jan 2006 14:02:39 -0000	1.3
@@ -1 +1 @@
-166b0efa724da90fd38212eda2ed352e  dvdisaster-0.64.2.tar.bz2
+bcab797d77656ca6c672cb646b9c7971  dvdisaster-0.65.tar.bz2


--- dvdisaster-0.64.2-browser.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:05:16 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:05:16 -0500
Subject: rpms/dvdisaster/FC-4 dvdisaster.spec, 1.4, 1.5 sources, 1.2,
	1.3 dvdisaster-0.64.2-browser.patch, 1.1, NONE
Message-ID: <200601311405.k0VE5m7H006971@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6952

Modified Files:
	dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.64.2-browser.patch 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdisaster.spec	3 Nov 2005 15:25:55 -0000	1.4
+++ dvdisaster.spec	31 Jan 2006 14:05:15 -0000	1.5
@@ -1,13 +1,12 @@
 Name: dvdisaster
 Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.64.2
-Release: 2%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
 Source1: dvdisaster.desktop
-Patch0: dvdisaster-0.64.2-browser.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +32,15 @@
 degli errori che saranno poi utilizzati per recuperare i settori illeggibili
 se il supporto dovesse danneggiarsi col tempo.
 
+%description -l cs
+%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat
+na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m.
+Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch
+sektor??, pokud se disk pozd??ji po??kod??.
+
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -53,14 +57,6 @@
 	DOCSUBDIR=%{_docdir}/%{name}-%{version}
 
 
-pushd documentation
-for man in *.1
-do
-    iconv -f ISO8859-1 -t UTF8 <$man >$man.new && mv -f $man.new $man
-done
-popd
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,7 +68,7 @@
 
 for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
 do
-    sed -i "s:$RPM_BUILD_ROOT::g" $man
+    sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
 done
 
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -102,17 +98,26 @@
 %{_docdir}/%{name}-%{version}/COPYING
 %{_docdir}/%{name}-%{version}/CREDITS.en
 %lang(de) %{_docdir}/%{name}-%{version}/CREDITS.de
+%lang(cs) %{_docdir}/%{name}-%{version}/CREDITS.cs
 %{_docdir}/%{name}-%{version}/TODO
 %{_docdir}/%{name}-%{version}/en
 %lang(de) %{_docdir}/%{name}-%{version}/de
+%lang(cs) %{_docdir}/%{name}-%{version}/cs
 %{_docdir}/%{name}-%{version}/images
 
 %{_mandir}/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(it) %{_mandir}/it/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.65-1
+- upgrade to 0.65
+- drop browser patch (no more needed)
+- drop manual convertations to utf8 -- already in good encodings.
+- handle new locale (czech)
+
 * Thu Nov  3 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64.2-2
 - use user preferred browser to view manuals online (patch0)
 - Accepted for Fedora Extra (review by Ville Skytta <ville.skytta at iki.fi>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 12:24:13 -0000	1.2
+++ sources	31 Jan 2006 14:05:15 -0000	1.3
@@ -1 +1 @@
-166b0efa724da90fd38212eda2ed352e  dvdisaster-0.64.2.tar.bz2
+bcab797d77656ca6c672cb646b9c7971  dvdisaster-0.65.tar.bz2


--- dvdisaster-0.64.2-browser.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:08:12 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:08:12 -0500
Subject: rpms/dvdisaster/FC-3 dvdisaster.spec, 1.4, 1.5 sources, 1.2,
	1.3 dvdisaster-0.64.2-browser.patch, 1.1, NONE
Message-ID: <200601311408.k0VE8xSk007039@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7020

Modified Files:
	dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.64.2-browser.patch 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdisaster.spec	3 Nov 2005 15:25:55 -0000	1.4
+++ dvdisaster.spec	31 Jan 2006 14:08:12 -0000	1.5
@@ -1,13 +1,12 @@
 Name: dvdisaster
 Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.64.2
-Release: 2%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
 Source1: dvdisaster.desktop
-Patch0: dvdisaster-0.64.2-browser.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +32,15 @@
 degli errori che saranno poi utilizzati per recuperare i settori illeggibili
 se il supporto dovesse danneggiarsi col tempo.
 
+%description -l cs
+%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat
+na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m.
+Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch
+sektor??, pokud se disk pozd??ji po??kod??.
+
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -53,14 +57,6 @@
 	DOCSUBDIR=%{_docdir}/%{name}-%{version}
 
 
-pushd documentation
-for man in *.1
-do
-    iconv -f ISO8859-1 -t UTF8 <$man >$man.new && mv -f $man.new $man
-done
-popd
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,7 +68,7 @@
 
 for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
 do
-    sed -i "s:$RPM_BUILD_ROOT::g" $man
+    sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
 done
 
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -102,17 +98,26 @@
 %{_docdir}/%{name}-%{version}/COPYING
 %{_docdir}/%{name}-%{version}/CREDITS.en
 %lang(de) %{_docdir}/%{name}-%{version}/CREDITS.de
+%lang(cs) %{_docdir}/%{name}-%{version}/CREDITS.cs
 %{_docdir}/%{name}-%{version}/TODO
 %{_docdir}/%{name}-%{version}/en
 %lang(de) %{_docdir}/%{name}-%{version}/de
+%lang(cs) %{_docdir}/%{name}-%{version}/cs
 %{_docdir}/%{name}-%{version}/images
 
 %{_mandir}/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(it) %{_mandir}/it/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.65-1
+- upgrade to 0.65
+- drop browser patch (no more needed)
+- drop manual convertations to utf8 -- already in good encodings.
+- handle new locale (czech)
+
 * Thu Nov  3 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64.2-2
 - use user preferred browser to view manuals online (patch0)
 - Accepted for Fedora Extra (review by Ville Skytta <ville.skytta at iki.fi>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 12:24:13 -0000	1.2
+++ sources	31 Jan 2006 14:08:12 -0000	1.3
@@ -1 +1 @@
-166b0efa724da90fd38212eda2ed352e  dvdisaster-0.64.2.tar.bz2
+bcab797d77656ca6c672cb646b9c7971  dvdisaster-0.65.tar.bz2


--- dvdisaster-0.64.2-browser.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:14:27 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:14:27 -0500
Subject: rpms/dvdisaster/devel dvdisaster.spec,1.5,1.6
Message-ID: <200601311414.k0VEExQb007113@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7096

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdisaster.spec	31 Jan 2006 14:02:39 -0000	1.5
+++ dvdisaster.spec	31 Jan 2006 14:14:27 -0000	1.6
@@ -12,6 +12,7 @@
 
 BuildRequires: gtk2-devel
 BuildRequires: gettext, desktop-file-utils
+BuildRequires: bzip2-devel, libpng-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan 31 14:18:05 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:18:05 -0500
Subject: rpms/dvdisaster/FC-4 dvdisaster.spec,1.5,1.6
Message-ID: <200601311418.k0VEIbC9007204@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7166

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdisaster.spec	31 Jan 2006 14:05:15 -0000	1.5
+++ dvdisaster.spec	31 Jan 2006 14:18:05 -0000	1.6
@@ -12,6 +12,7 @@
 
 BuildRequires: gtk2-devel
 BuildRequires: gettext, desktop-file-utils
+BuildRequires: bzip2-devel, libpng-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan 31 14:19:10 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:19:10 -0500
Subject: rpms/dvdisaster/FC-3 dvdisaster.spec,1.5,1.6
Message-ID: <200601311419.k0VEJgMt007262@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7245

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdisaster.spec	31 Jan 2006 14:08:12 -0000	1.5
+++ dvdisaster.spec	31 Jan 2006 14:19:10 -0000	1.6
@@ -12,6 +12,7 @@
 
 BuildRequires: gtk2-devel
 BuildRequires: gettext, desktop-file-utils
+BuildRequires: bzip2-devel, libpng-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan 31 14:26:44 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:26:44 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tkcvs.spec, 
	1.11, 1.12
Message-ID: <200601311427.k0VERGwN007374@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/FC-3

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jan 2006 19:28:18 -0000	1.6
+++ .cvsignore	31 Jan 2006 14:26:43 -0000	1.7
@@ -1 +1 @@
-tkcvs_8_0_1.tar.gz
+tkcvs_8_0_2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2006 19:28:18 -0000	1.6
+++ sources	31 Jan 2006 14:26:43 -0000	1.7
@@ -1 +1 @@
-cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz
+aaeaa34a9e1d309baee9fcf7cbba9799  tkcvs_8_0_2.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tkcvs.spec	15 Jan 2006 19:28:18 -0000	1.11
+++ tkcvs.spec	31 Jan 2006 14:26:43 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	8.0.1
+Version:	8.0.2
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,7 +7,7 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
+Source:		http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -40,6 +40,7 @@
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
 perl -pi -e 's|\[file join \$TclRoot tkcvs bitmaps\]|\[file join \$TCDIR bitmaps\]|' tkcvs/tkcvs.tcl
 
+
 %install
 install -d ${RPM_BUILD_ROOT}%{_datadir}
 install -d ${RPM_BUILD_ROOT}%{_bindir}
@@ -53,9 +54,11 @@
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
@@ -63,7 +66,11 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Tue Jan 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.2-1
+- new version 8.0.2
+
 * Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
 - new version 8.0.1
 



From fedora-extras-commits at redhat.com  Tue Jan 31 14:26:50 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:26:50 -0500
Subject: rpms/tkcvs/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tkcvs.spec, 
	1.14, 1.15
Message-ID: <200601311427.k0VERMPb007379@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/FC-4

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Jan 2006 19:28:24 -0000	1.7
+++ .cvsignore	31 Jan 2006 14:26:49 -0000	1.8
@@ -1 +1 @@
-tkcvs_8_0_1.tar.gz
+tkcvs_8_0_2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Jan 2006 19:28:24 -0000	1.7
+++ sources	31 Jan 2006 14:26:49 -0000	1.8
@@ -1 +1 @@
-cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz
+aaeaa34a9e1d309baee9fcf7cbba9799  tkcvs_8_0_2.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tkcvs.spec	15 Jan 2006 19:28:24 -0000	1.14
+++ tkcvs.spec	31 Jan 2006 14:26:49 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	8.0.1
+Version:	8.0.2
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,7 +7,7 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
+Source:		http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.2-1
+- new version 8.0.2
+
 * Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
 - new version 8.0.1
 



From fedora-extras-commits at redhat.com  Tue Jan 31 14:27:00 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:27:00 -0500
Subject: rpms/tkcvs/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tkcvs.spec, 
	1.14, 1.15
Message-ID: <200601311427.k0VERZH1007382@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/devel

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Jan 2006 19:28:30 -0000	1.7
+++ .cvsignore	31 Jan 2006 14:27:00 -0000	1.8
@@ -1 +1 @@
-tkcvs_8_0_1.tar.gz
+tkcvs_8_0_2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Jan 2006 19:28:30 -0000	1.7
+++ sources	31 Jan 2006 14:27:00 -0000	1.8
@@ -1 +1 @@
-cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz
+aaeaa34a9e1d309baee9fcf7cbba9799  tkcvs_8_0_2.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tkcvs.spec	15 Jan 2006 19:28:30 -0000	1.14
+++ tkcvs.spec	31 Jan 2006 14:27:00 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	8.0.1
+Version:	8.0.2
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,7 +7,7 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
+Source:		http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.2-1
+- new version 8.0.2
+
 * Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
 - new version 8.0.1
 



From fedora-extras-commits at redhat.com  Tue Jan 31 14:34:08 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:34:08 -0500
Subject: rpms/tkcvs/FC-3 tkcvs.spec,1.12,1.13
Message-ID: <200601311434.k0VEYexh007440@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-3

Modified Files:
	tkcvs.spec 
Log Message:



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tkcvs.spec	31 Jan 2006 14:26:43 -0000	1.12
+++ tkcvs.spec	31 Jan 2006 14:34:07 -0000	1.13
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0_1
+%setup -q -n tkcvs_8_0_2
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 31 14:34:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:34:13 -0500
Subject: rpms/tkcvs/FC-4 tkcvs.spec,1.15,1.16
Message-ID: <200601311434.k0VEYkIT007443@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-4

Modified Files:
	tkcvs.spec 
Log Message:



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tkcvs.spec	31 Jan 2006 14:26:49 -0000	1.15
+++ tkcvs.spec	31 Jan 2006 14:34:13 -0000	1.16
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0_1
+%setup -q -n tkcvs_8_0_2
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 31 14:34:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:34:19 -0500
Subject: rpms/tkcvs/devel tkcvs.spec,1.15,1.16
Message-ID: <200601311434.k0VEYqlC007446@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/devel

Modified Files:
	tkcvs.spec 
Log Message:



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tkcvs.spec	31 Jan 2006 14:27:00 -0000	1.15
+++ tkcvs.spec	31 Jan 2006 14:34:19 -0000	1.16
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0_1
+%setup -q -n tkcvs_8_0_2
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 31 14:51:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:51:46 -0500
Subject: rpms/perl-UNIVERSAL-isa - New directory
Message-ID: <200601311451.k0VEpmsO007703@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7695/perl-UNIVERSAL-isa

Log Message:
Directory /cvs/extras/rpms/perl-UNIVERSAL-isa added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 14:51:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:51:52 -0500
Subject: rpms/perl-UNIVERSAL-isa/devel - New directory
Message-ID: <200601311451.k0VEps82007718@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7695/perl-UNIVERSAL-isa/devel

Log Message:
Directory /cvs/extras/rpms/perl-UNIVERSAL-isa/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:11 -0500
Subject: rpms/perl-UNIVERSAL-isa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311452.k0VEqDGR007762@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7750

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-UNIVERSAL-isa


--- NEW FILE Makefile ---
# Top level Makefile for module perl-UNIVERSAL-isa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:16 -0500
Subject: rpms/perl-UNIVERSAL-isa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601311452.k0VEqI9h007782@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7750/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-UNIVERSAL-isa


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:47 -0500
Subject: rpms/perl-UNIVERSAL-isa import.log,1.1,1.2
Message-ID: <200601311453.k0VErKK4007850@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816

Modified Files:
	import.log 
Log Message:
auto-import perl-UNIVERSAL-isa-0.05-2 on branch devel from perl-UNIVERSAL-isa-0.05-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 14:52:10 -0000	1.1
+++ import.log	31 Jan 2006 14:52:47 -0000	1.2
@@ -0,0 +1 @@
+perl-UNIVERSAL-isa-0_05-2:HEAD:perl-UNIVERSAL-isa-0.05-2.src.rpm:1138719160



From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:53 -0500
Subject: rpms/perl-UNIVERSAL-isa/devel perl-UNIVERSAL-isa.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601311453.k0VErPxa007854@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-UNIVERSAL-isa.spec 
Log Message:
auto-import perl-UNIVERSAL-isa-0.05-2 on branch devel from perl-UNIVERSAL-isa-0.05-2.src.rpm


--- NEW FILE perl-UNIVERSAL-isa.spec ---
Name:           perl-UNIVERSAL-isa
Version:        0.05
Release:        2%{?dist}
Summary:        Hack around module authors using UNIVERSAL::isa as a function

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/UNIVERSAL-isa/
Source0:        http://www.cpan.org/authors/id/N/NU/NUFFIN/UNIVERSAL-isa-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Module::Build)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Whenever you use "isa" in UNIVERSAL as a function, a kitten using
Test::MockObject dies. Normally, the kittens would be helpless, but
if they use UNIVERSAL::isa (the module whose docs you are reading),
the kittens can live long and prosper.

This module replaces UNIVERSAL::isa with a version that makes sure
that if it's called as a function on objects which override isa,
isa will be called on those objects as a method.

In all other cases the real UNIVERSAL::isa is just called directly.


%prep
%setup -q -n UNIVERSAL-isa-%{version}
%{__perl} -pi -e 's{^#!%{__perl}\b}{##!%{__perl}}' lib/UNIVERSAL/isa.pm


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
chmod -R u+w $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{perl_vendorlib}/UNIVERSAL/
%{_mandir}/man3/*.3*


%changelog
* Tue Jan 31 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.05-2
- Source URL correction.

* Tue Dec 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.05-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 14:52:16 -0000	1.1
+++ .cvsignore	31 Jan 2006 14:52:53 -0000	1.2
@@ -0,0 +1 @@
+UNIVERSAL-isa-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 14:52:16 -0000	1.1
+++ sources	31 Jan 2006 14:52:53 -0000	1.2
@@ -0,0 +1 @@
+15df976064b0b3d21b2fb8808fe9c471  UNIVERSAL-isa-0.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 14:56:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:56:46 -0500
Subject: owners owners.list,1.583,1.584
Message-ID: <200601311457.k0VEvIl0007957@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7940

Modified Files:
	owners.list 
Log Message:
New package: perl-UNIVERSAL-isa (#177168).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- owners.list	31 Jan 2006 13:51:16 -0000	1.583
+++ owners.list	31 Jan 2006 14:56:46 -0000	1.584
@@ -966,6 +966,7 @@
 Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-exports|Lightweight, universal exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-UNIVERSAL-isa|Hack around module authors using UNIVERSAL::isa as a function|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Statgrab|Perl extension for collecting information about the machine|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 31 15:13:47 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 31 Jan 2006 10:13:47 -0500
Subject: rpms/foobillard/devel foobillard.spec,1.8,1.9
Message-ID: <200601311514.k0VFEJhU009758@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/foobillard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9741

Modified Files:
	foobillard.spec 
Log Message:
* Tue Jan 31 2006 Miloslav Trmac <mitr at volny.cz> - 3.0a-3
- Update BuildRequires for modular X



Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- foobillard.spec	6 Apr 2005 22:11:37 -0000	1.8
+++ foobillard.spec	31 Jan 2006 15:13:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           foobillard
 Version:        3.0a
-Release:        2
+Release:        3
 
 Summary:        OpenGL billard game
 
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  SDL-devel ImageMagick alsa-lib-devel
 BuildRequires:  freetype-devel libpng-devel perl zlib-devel
-BuildRequires:  xorg-x11-devel libGL.so.1 libGLU.so.1
+BuildRequires:  libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel
 
 %description
 FooBillard is an attempt to create a free OpenGL-billard for Linux.
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Miloslav Trmac <mitr at volny.cz> - 3.0a-3
+- Update BuildRequires for modular X
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Jan 31 16:11:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 11:11:36 -0500
Subject: rpms/jasper/devel jasper-1.701.0-GL.patch, 1.1, 1.2 jasper.spec, 1.7,
	1.8
Message-ID: <200601311612.k0VGC8lp011691@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11666

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper-1.701.0-GL.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper-1.701.0-GL.patch	18 Oct 2005 13:10:42 -0000	1.1
+++ jasper-1.701.0-GL.patch	31 Jan 2006 16:11:35 -0000	1.2
@@ -1,14 +1,3 @@
---- jasper-1.701.0/configure.ac.GL	2004-02-08 19:41:29.000000000 -0600
-+++ jasper-1.701.0/configure.ac	2005-10-18 08:09:24.000000000 -0500
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- 	if test $HAVE_OPENGL = no; then
--		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
- 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- 	fi
 --- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
 +++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
 @@ -9465,7 +9465,7 @@
@@ -16,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
++		TMPLIBS="-lglut"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jasper.spec	18 Oct 2005 13:10:42 -0000	1.7
+++ jasper.spec	31 Jan 2006 16:11:35 -0000	1.8
@@ -1,4 +1,3 @@
-# $Id$
 
 # NOTE: packages can use jasper:
 # ImageMagick
@@ -10,13 +9,15 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: jasper-1.701.0-GL.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
 
@@ -37,6 +38,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .GL
+
 
 %build
 %configure \
@@ -46,7 +49,7 @@
 make %{?_smp_mflags}
 
 
-%check
+%check ||:
 make check
 
 
@@ -61,13 +64,17 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
+# not needed anymore, see bz #176773
+# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT LICENSE NEWS README
-%{_bindir}/*
+%{_bindir}/imgcmp
+%{_bindir}/jiv
+%{_bindir}/imginfo
+%{_bindir}/jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -87,6 +94,10 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
+- revert jasper to jaspertool rename (#176773)
+- actually use/apply GL patch
+
 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
 - GL patch to remove libGL dependancy (using only freeglut)
 



From fedora-extras-commits at redhat.com  Tue Jan 31 16:43:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 11:43:47 -0500
Subject: rpms/jasper/devel jasper.spec,1.8,1.9
Message-ID: <200601311644.k0VGiQTh011859@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842

Modified Files:
	jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
  (#179464)



Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jasper.spec	31 Jan 2006 16:11:35 -0000	1.8
+++ jasper.spec	31 Jan 2006 16:43:46 -0000	1.9
@@ -9,7 +9,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -20,6 +20,10 @@
 
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
+# workaround: 
+#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+#  http://bugzilla.redhat.com/bugzilla/179464
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -94,6 +98,10 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
+- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+  (#179464)
+
 * Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
 - revert jasper to jaspertool rename (#176773)
 - actually use/apply GL patch



From fedora-extras-commits at redhat.com  Tue Jan 31 17:01:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 12:01:33 -0500
Subject: rpms/jasper/FC-4 jasper-1.701.0-GL.patch, 1.1, 1.2 jasper.spec, 1.6,
	1.7
Message-ID: <200601311702.k0VH28O7013700@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13663

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
  (#179464)

* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper-1.701.0-GL.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper-1.701.0-GL.patch	18 Oct 2005 13:10:33 -0000	1.1
+++ jasper-1.701.0-GL.patch	31 Jan 2006 17:01:33 -0000	1.2
@@ -1,14 +1,3 @@
---- jasper-1.701.0/configure.ac.GL	2004-02-08 19:41:29.000000000 -0600
-+++ jasper-1.701.0/configure.ac	2005-10-18 08:09:24.000000000 -0500
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- 	if test $HAVE_OPENGL = no; then
--		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
- 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- 	fi
 --- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
 +++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
 @@ -9465,7 +9465,7 @@
@@ -16,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
++		TMPLIBS="-lglut"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jasper.spec	18 Oct 2005 13:10:33 -0000	1.6
+++ jasper.spec	31 Jan 2006 17:01:33 -0000	1.7
@@ -1,4 +1,3 @@
-# $Id$
 
 # NOTE: packages can use jasper:
 # ImageMagick
@@ -10,15 +9,21 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 7%{?dist}
+Release: 9%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: jasper-1.701.0-GL.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
+# workaround: 
+#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+#  http://bugzilla.redhat.com/bugzilla/179464
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -37,6 +42,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .GL
+
 
 %build
 %configure \
@@ -46,7 +53,7 @@
 make %{?_smp_mflags}
 
 
-%check
+%check ||:
 make check
 
 
@@ -61,13 +68,17 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
+# not needed anymore, see bz #176773
+# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT LICENSE NEWS README
-%{_bindir}/*
+%{_bindir}/imgcmp
+%{_bindir}/jiv
+%{_bindir}/imginfo
+%{_bindir}/jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -87,6 +98,14 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
+- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+  (#179464)
+
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
+- revert jasper to jaspertool rename (#176773)
+- actually use/apply GL patch
+
 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
 - GL patch to remove libGL dependancy (using only freeglut)
 



From fedora-extras-commits at redhat.com  Tue Jan 31 17:19:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 31 Jan 2006 12:19:00 -0500
Subject: owners owners.list,1.584,1.585
Message-ID: <200601311719.k0VHJXWA013844@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13822

Modified Files:
	owners.list 
Log Message:
Catching up on package submissions.  Adding the following:
  amavisd-new
  perl-Convert-ASCII-Armour
  perl-Convert-PEM
  perl-CPAN-DistnameInfo
  perl-Crypt-DES_EDE3
  perl-Parse-CPAN-Packages
  perl-Text-Levenshtein



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- owners.list	31 Jan 2006 14:56:46 -0000	1.584
+++ owners.list	31 Jan 2006 17:19:00 -0000	1.585
@@ -32,6 +32,7 @@
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|altermime|Alter MIME-encoded mailpacks|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|amavisd-new|Email filter with virus scanner and spamassassin support|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|anjuta|GNOME IDE for C and C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
@@ -780,11 +781,15 @@
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Convert-ASCII-Armour|Convert::ASCII::Armour Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Convert-PEM|Convert::PEM Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-CPAN-DistnameInfo|CPAN::DistnameInfo Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-DES_EDE3|Crypt::DES_EDE3 Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -898,6 +903,7 @@
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Parse-CPAN-Packages|Parse::CPAN::Packages Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -946,6 +952,7 @@
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 31 17:28:43 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:28:43 -0500
Subject: rpms/gtk-gnutella/devel gtk-gnutella-0.96-install.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 gtk-gnutella.spec, 1.2, 1.3 sources,
	1.2, 1.3 gtk-gnutella-0.95.4-install.patch, 1.1, NONE
Message-ID: <200601311729.k0VHTFmb013948@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13924

Modified Files:
	.cvsignore gtk-gnutella.spec sources 
Added Files:
	gtk-gnutella-0.96-install.patch 
Removed Files:
	gtk-gnutella-0.95.4-install.patch 
Log Message:


gtk-gnutella-0.96-install.patch:

--- NEW FILE gtk-gnutella-0.96-install.patch ---
diff -Nrbu gtk-gnutella-0.96/src/Makefile.SH gtk-gnutella-0.96-OK/src/Makefile.SH
--- gtk-gnutella-0.96/src/Makefile.SH	2006-01-25 00:18:39.000000000 +0300
+++ gtk-gnutella-0.96-OK/src/Makefile.SH	2006-01-31 19:42:18.000000000 +0300
@@ -231,7 +231,7 @@
 	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
-	$(INSTALL) -c -s -m 555  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
+	$(INSTALL) -c -m 755  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
 
 local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(BINDIR)/gtk-gnutella$(_EXE)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2005 14:39:17 -0000	1.2
+++ .cvsignore	31 Jan 2006 17:28:43 -0000	1.3
@@ -1 +1 @@
-gtk-gnutella-0.95.4.tar.bz2
+gtk-gnutella-0.96.tar.bz2


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-gnutella.spec	28 Oct 2005 11:10:58 -0000	1.2
+++ gtk-gnutella.spec	31 Jan 2006 17:28:43 -0000	1.3
@@ -1,13 +1,13 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.95.4
-Release: 2%{?dist}
+Version: 0.96
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gtk-gnutella-0.95.4-install.patch
+Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
@@ -44,8 +44,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install INSTALL_PREFIX=$RPM_BUILD_ROOT
+make install.man INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-install -p -m 644 gtk-gnutella*.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
+install -D -m 644 extra_files/gtk-gnutella.16.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.32.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.svg \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -62,14 +71,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
+%{_mandir}/*/*
 %{_datadir}/gtk-gnutella
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96-1
+- upgrade to 0.96
+
 * Fri Oct 28 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.95.4-2
 - patch0: don't pre-strip binary on makeinstall (#171922)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2005 14:39:17 -0000	1.2
+++ sources	31 Jan 2006 17:28:43 -0000	1.3
@@ -1 +1 @@
-4e6ea65149100c882f9b2c4ff7ca8dc1  gtk-gnutella-0.95.4.tar.bz2
+4e1cd518ac2995f29952274e880cd6ec  gtk-gnutella-0.96.tar.bz2


--- gtk-gnutella-0.95.4-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 17:30:59 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:30:59 -0500
Subject: rpms/gtk-gnutella/FC-4 gtk-gnutella-0.96-install.patch, NONE,
	1.1 gtk-gnutella.spec, 1.2, 1.3 sources, 1.2,
	1.3 gtk-gnutella-0.95.4-install.patch, 1.1, NONE
Message-ID: <200601311731.k0VHVViC014051@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14012

Modified Files:
	gtk-gnutella.spec sources 
Added Files:
	gtk-gnutella-0.96-install.patch 
Removed Files:
	gtk-gnutella-0.95.4-install.patch 
Log Message:


gtk-gnutella-0.96-install.patch:

--- NEW FILE gtk-gnutella-0.96-install.patch ---
diff -Nrbu gtk-gnutella-0.96/src/Makefile.SH gtk-gnutella-0.96-OK/src/Makefile.SH
--- gtk-gnutella-0.96/src/Makefile.SH	2006-01-25 00:18:39.000000000 +0300
+++ gtk-gnutella-0.96-OK/src/Makefile.SH	2006-01-31 19:42:18.000000000 +0300
@@ -231,7 +231,7 @@
 	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
-	$(INSTALL) -c -s -m 555  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
+	$(INSTALL) -c -m 755  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
 
 local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(BINDIR)/gtk-gnutella$(_EXE)


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-4/gtk-gnutella.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-gnutella.spec	28 Oct 2005 11:12:46 -0000	1.2
+++ gtk-gnutella.spec	31 Jan 2006 17:30:59 -0000	1.3
@@ -1,13 +1,13 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.95.4
-Release: 2%{?dist}
+Version: 0.96
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gtk-gnutella-0.95.4-install.patch
+Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
@@ -44,8 +44,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install INSTALL_PREFIX=$RPM_BUILD_ROOT
+make install.man INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-install -p -m 644 gtk-gnutella*.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
+install -D -m 644 extra_files/gtk-gnutella.16.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.32.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.svg \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -62,14 +71,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
+%{_mandir}/*/*
 %{_datadir}/gtk-gnutella
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96-1
+- upgrade to 0.96
+
 * Fri Oct 28 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.95.4-2
 - patch0: don't pre-strip binary on makeinstall (#171922)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2005 14:39:17 -0000	1.2
+++ sources	31 Jan 2006 17:30:59 -0000	1.3
@@ -1 +1 @@
-4e6ea65149100c882f9b2c4ff7ca8dc1  gtk-gnutella-0.95.4.tar.bz2
+4e1cd518ac2995f29952274e880cd6ec  gtk-gnutella-0.96.tar.bz2


--- gtk-gnutella-0.95.4-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 17:31:56 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 31 Jan 2006 12:31:56 -0500
Subject: rpms/enchant/FC-4 .cvsignore, 1.5, 1.6 enchant.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601311732.k0VHWS0A014144@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14089

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.2.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2005 21:06:15 -0000	1.5
+++ .cvsignore	31 Jan 2006 17:31:56 -0000	1.6
@@ -1 +1 @@
-enchant-1.2.0.tar.gz
+enchant-1.2.1.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/enchant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- enchant.spec	22 Oct 2005 21:06:15 -0000	1.6
+++ enchant.spec	31 Jan 2006 17:31:56 -0000	1.7
@@ -1,13 +1,12 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
 URL: http://www.abisource.com/
-Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -62,6 +61,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan 31 2006 Marc Maurer <uwog at abisource.com> 1:1.2.1-1.fc4
+- Update to 1.2.1
+- Drop glib Require
+
 * Sat Oct 22 2005 Marc Maurer <uwog at abisource.com> 1:1.2.0-1.fc4
 - Update to 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2005 21:06:15 -0000	1.5
+++ sources	31 Jan 2006 17:31:56 -0000	1.6
@@ -1 +1 @@
-e44a734a85fbbadf898fb935ac346f31  enchant-1.2.0.tar.gz
+841542c0bf89b5c7b8a85f4bc682f70b  enchant-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 17:32:25 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:32:25 -0500
Subject: rpms/gtk-gnutella/FC-3 gtk-gnutella-0.96-install.patch, NONE,
	1.1 gtk-gnutella.spec, 1.2, 1.3 sources, 1.2,
	1.3 gtk-gnutella-0.95.4-install.patch, 1.1, NONE
Message-ID: <200601311732.k0VHWvBo014187@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14127

Modified Files:
	gtk-gnutella.spec sources 
Added Files:
	gtk-gnutella-0.96-install.patch 
Removed Files:
	gtk-gnutella-0.95.4-install.patch 
Log Message:


gtk-gnutella-0.96-install.patch:

--- NEW FILE gtk-gnutella-0.96-install.patch ---
diff -Nrbu gtk-gnutella-0.96/src/Makefile.SH gtk-gnutella-0.96-OK/src/Makefile.SH
--- gtk-gnutella-0.96/src/Makefile.SH	2006-01-25 00:18:39.000000000 +0300
+++ gtk-gnutella-0.96-OK/src/Makefile.SH	2006-01-31 19:42:18.000000000 +0300
@@ -231,7 +231,7 @@
 	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
-	$(INSTALL) -c -s -m 555  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
+	$(INSTALL) -c -m 755  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
 
 local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(BINDIR)/gtk-gnutella$(_EXE)


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-3/gtk-gnutella.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-gnutella.spec	28 Oct 2005 11:13:43 -0000	1.2
+++ gtk-gnutella.spec	31 Jan 2006 17:32:25 -0000	1.3
@@ -1,13 +1,13 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.95.4
-Release: 2%{?dist}
+Version: 0.96
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gtk-gnutella-0.95.4-install.patch
+Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
@@ -44,8 +44,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install INSTALL_PREFIX=$RPM_BUILD_ROOT
+make install.man INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-install -p -m 644 gtk-gnutella*.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
+install -D -m 644 extra_files/gtk-gnutella.16.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.32.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.svg \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -62,14 +71,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
+%{_mandir}/*/*
 %{_datadir}/gtk-gnutella
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96-1
+- upgrade to 0.96
+
 * Fri Oct 28 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.95.4-2
 - patch0: don't pre-strip binary on makeinstall (#171922)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2005 14:39:17 -0000	1.2
+++ sources	31 Jan 2006 17:32:25 -0000	1.3
@@ -1 +1 @@
-4e6ea65149100c882f9b2c4ff7ca8dc1  gtk-gnutella-0.95.4.tar.bz2
+4e1cd518ac2995f29952274e880cd6ec  gtk-gnutella-0.96.tar.bz2


--- gtk-gnutella-0.95.4-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 17:54:19 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:54:19 -0500
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.3,1.4
Message-ID: <200601311754.k0VHsp53014279@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14262

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-gnutella.spec	31 Jan 2006 17:28:43 -0000	1.3
+++ gtk-gnutella.spec	31 Jan 2006 17:54:19 -0000	1.4
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc
+BuildRequires: libxml2-devel, byacc, groff
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:18:06 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 13:18:06 -0500
Subject: rpms/gtk-gnutella/FC-4 gtk-gnutella.spec,1.3,1.4
Message-ID: <200601311818.k0VIIcpq016223@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16206

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-4/gtk-gnutella.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-gnutella.spec	31 Jan 2006 17:30:59 -0000	1.3
+++ gtk-gnutella.spec	31 Jan 2006 18:18:06 -0000	1.4
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc
+BuildRequires: libxml2-devel, byacc, groff
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:19:53 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 13:19:53 -0500
Subject: rpms/gtk-gnutella/FC-3 gtk-gnutella.spec,1.3,1.4
Message-ID: <200601311820.k0VIKP0u016282@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16264

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-3/gtk-gnutella.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-gnutella.spec	31 Jan 2006 17:32:25 -0000	1.3
+++ gtk-gnutella.spec	31 Jan 2006 18:19:52 -0000	1.4
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc
+BuildRequires: libxml2-devel, byacc, groff
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:27:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 13:27:58 -0500
Subject: rpms/jasper/FC-3 jasper-1.701.0-GL.patch, 1.1, 1.2 jasper.spec, 1.5,
	1.6
Message-ID: <200601311828.k0VISVHV016383@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
  (#179464)

* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper-1.701.0-GL.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper-1.701.0-GL.patch	18 Oct 2005 13:10:32 -0000	1.1
+++ jasper-1.701.0-GL.patch	31 Jan 2006 18:27:57 -0000	1.2
@@ -1,14 +1,3 @@
---- jasper-1.701.0/configure.ac.GL	2004-02-08 19:41:29.000000000 -0600
-+++ jasper-1.701.0/configure.ac	2005-10-18 08:09:24.000000000 -0500
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- 	if test $HAVE_OPENGL = no; then
--		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
- 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- 	fi
 --- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
 +++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
 @@ -9465,7 +9465,7 @@
@@ -16,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
++		TMPLIBS="-lglut"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jasper.spec	18 Oct 2005 13:10:32 -0000	1.5
+++ jasper.spec	31 Jan 2006 18:27:57 -0000	1.6
@@ -1,4 +1,3 @@
-# $Id$
 
 # NOTE: packages can use jasper:
 # ImageMagick
@@ -10,15 +9,21 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 7%{?dist}
+Release: 9%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: jasper-1.701.0-GL.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
+# workaround: 
+#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+#  http://bugzilla.redhat.com/bugzilla/179464
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -37,6 +42,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .GL
+
 
 %build
 %configure \
@@ -46,7 +53,7 @@
 make %{?_smp_mflags}
 
 
-%check
+%check ||:
 make check
 
 
@@ -61,13 +68,17 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
+# not needed anymore, see bz #176773
+# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT LICENSE NEWS README
-%{_bindir}/*
+%{_bindir}/imgcmp
+%{_bindir}/jiv
+%{_bindir}/imginfo
+%{_bindir}/jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -87,6 +98,14 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
+- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+  (#179464)
+
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
+- revert jasper to jaspertool rename (#176773)
+- actually use/apply GL patch
+
 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
 - GL patch to remove libGL dependancy (using only freeglut)
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:33:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 31 Jan 2006 13:33:07 -0500
Subject: rpms/cln/FC-4 cln.spec,1.11,1.12
Message-ID: <200601311833.k0VIXeMM016467@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16450

Modified Files:
	cln.spec 
Log Message:
Specfile bugfix.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cln.spec	16 Jan 2006 22:19:06 -0000	1.11
+++ cln.spec	31 Jan 2006 18:33:06 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -76,8 +76,12 @@
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
 %exclude %{_libdir}/*.la
+%exclude %{_infodir}/dir
 
 %changelog
+* Tue Jan 31 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-2
+- Exclude /usr/share/info/dir from package.
+
 * Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
 - New upstream release.
 - Updated source URL.



From fedora-extras-commits at redhat.com  Tue Jan 31 18:49:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:49:53 -0500
Subject: owners owners.list,1.585,1.586
Message-ID: <200601311850.k0VIoPxL016528@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16511

Modified Files:
	owners.list 
Log Message:
Taking fontforge with the permission of previous owner.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- owners.list	31 Jan 2006 17:19:00 -0000	1.585
+++ owners.list	31 Jan 2006 18:49:53 -0000	1.586
@@ -226,7 +226,7 @@
 Fedora Extras|fluxbox|Fluxbox is a windowmanager that is based on Blackbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fluxconf|Configuration utility for fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|fontforge|An outline and bitmap font editor|otaylor at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|fontforge|An outline and bitmap font editor|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|fonts-hebrew-fancy|Fancy Hebrew fonts|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|foremost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 18:55:09 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:55:09 -0500
Subject: owners owners.list,1.586,1.587
Message-ID: <200601311855.k0VItgVP016564@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16546

Modified Files:
	owners.list 
Log Message:
+spicctrl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- owners.list	31 Jan 2006 18:49:53 -0000	1.586
+++ owners.list	31 Jan 2006 18:55:09 -0000	1.587
@@ -1187,6 +1187,7 @@
 Fedora Extras|soundtracker|Sound module composer/player|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
+Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 18:59:44 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:59:44 -0500
Subject: rpms/spicctrl - New directory
Message-ID: <200601311859.k0VIxkAk016635@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16627/spicctrl

Log Message:
Directory /cvs/extras/rpms/spicctrl added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 18:59:50 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:59:50 -0500
Subject: rpms/spicctrl/devel - New directory
Message-ID: <200601311859.k0VIxquO016653@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16627/spicctrl/devel

Log Message:
Directory /cvs/extras/rpms/spicctrl/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 19:00:43 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:00:43 -0500
Subject: rpms/spicctrl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311900.k0VJ0jT2016695@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16683

Added Files:
	Makefile import.log 
Log Message:
Setup of module spicctrl


--- NEW FILE Makefile ---
# Top level Makefile for module spicctrl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 19:00:49 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:00:49 -0500
Subject: rpms/spicctrl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601311900.k0VJ0pjA016715@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16683/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module spicctrl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: spicctrl
# $Id$
NAME := spicctrl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 19:03:38 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:03:38 -0500
Subject: rpms/spicctrl/devel spicctrl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601311904.k0VJ4AJr018542@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504/devel

Modified Files:
	.cvsignore sources 
Added Files:
	spicctrl.spec 
Log Message:
auto-import spicctrl-1.9-2 on branch devel from spicctrl-1.9-2.src.rpm


--- NEW FILE spicctrl.spec ---
Name:           spicctrl
Version:        1.9
Release:        2%{?dist}
Summary:        Sony Vaio laptop SPIC control program

Group:          Applications/System
License:        GPL
URL:            http://popies.net/sonypi/
Source0:        http://popies.net/sonypi/spicctrl-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExclusiveArch:	%{ix86}

%description
spicctrl queries and sets a variety of parameters on Sony Vaio laptop
computers, including AC Power status, battery status, screen brightness,
and bluetooth device power status


%prep
%setup -q


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install spicctrl $RPM_BUILD_ROOT%{_sbindir}
install spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ ! -c /dev/sonypi ]; then
	rm -f /dev/sonypi
	mknod /dev/sonypi c 10 250
fi
if [ -e /etc/modprobe.conf ]; then
	grep 'alias char-major-10-250 sonypi' /etc/modprobe.conf > /dev/null
	RETVAL=$?
	if [ $RETVAL -ne 0 ]; then
		echo 'alias char-major-10-250 sonypi' >> /etc/modprobe.conf
		echo 'options sonypi minor=250' >> /etc/modprobe.conf
	fi
fi


%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE
%{_mandir}/man1/spicctrl.1.gz
%attr(0755,root,root) /usr/sbin/spicctrl

%changelog
* Tue Jan 31 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-2
- Bumped release to a proper integer

* Sun Jan 08 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.4
- Add %%{?dist} tag

* Mon Dec 26 2005 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.3
- Change ExclusiveArch to %%{ix86}

* Mon Dec 26 2005 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.2
- Add ExclusiveArch

* Thu Dec 22 2005 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.1
- First revision, based on upstream spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 19:00:49 -0000	1.1
+++ .cvsignore	31 Jan 2006 19:03:38 -0000	1.2
@@ -0,0 +1 @@
+spicctrl-1.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 19:00:49 -0000	1.1
+++ sources	31 Jan 2006 19:03:38 -0000	1.2
@@ -0,0 +1 @@
+775a1959c03e59830303b8320ca379d2  spicctrl-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 19:03:32 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:03:32 -0500
Subject: rpms/spicctrl import.log,1.1,1.2
Message-ID: <200601311904.k0VJ44sZ018538@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504

Modified Files:
	import.log 
Log Message:
auto-import spicctrl-1.9-2 on branch devel from spicctrl-1.9-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 19:00:43 -0000	1.1
+++ import.log	31 Jan 2006 19:03:32 -0000	1.2
@@ -0,0 +1 @@
+spicctrl-1_9-2:HEAD:spicctrl-1.9-2.src.rpm:1138734153



From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:14 -0500
Subject: rpms/overgod - New directory
Message-ID: <200601312116.k0VLGGe5022806@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798/overgod

Log Message:
Directory /cvs/extras/rpms/overgod added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:20 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:20 -0500
Subject: rpms/overgod/devel - New directory
Message-ID: <200601312116.k0VLGMc8022821@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798/overgod/devel

Log Message:
Directory /cvs/extras/rpms/overgod/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:37 -0500
Subject: rpms/overgod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601312116.k0VLGdm2022855@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22843

Added Files:
	Makefile import.log 
Log Message:
Setup of module overgod


--- NEW FILE Makefile ---
# Top level Makefile for module overgod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:42 -0500
Subject: rpms/overgod/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601312116.k0VLGj2x022873@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22843/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module overgod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:17:28 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:17:28 -0500
Subject: rpms/overgod import.log,1.1,1.2
Message-ID: <200601312118.k0VLI0rf022961@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22922

Modified Files:
	import.log 
Log Message:
auto-import overgod-1.0-2 on branch devel from overgod-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/overgod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 21:16:37 -0000	1.1
+++ import.log	31 Jan 2006 21:17:27 -0000	1.2
@@ -0,0 +1 @@
+overgod-1_0-2:HEAD:overgod-1.0-2.src.rpm:1138742456



From fedora-extras-commits at redhat.com  Tue Jan 31 21:17:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:17:33 -0500
Subject: rpms/overgod/devel overgod-1.0.patch, NONE, 1.1 overgod.desktop,
	NONE, 
	1.1 overgod.png, NONE, 1.1 overgod.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601312118.k0VLI6Wo022965@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22922/devel

Modified Files:
	.cvsignore sources 
Added Files:
	overgod-1.0.patch overgod.desktop overgod.png overgod.spec 
Log Message:
auto-import overgod-1.0-2 on branch devel from overgod-1.0-2.src.rpm

overgod-1.0.patch:

--- NEW FILE overgod-1.0.patch ---
diff -urN overgod-1.0.orig/Makefile overgod-1.0/Makefile
--- overgod-1.0.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ overgod-1.0/Makefile	2006-01-21 10:36:02.000000000 +0100
@@ -0,0 +1,28 @@
+PREFIX  = /home/opt
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS  = -g -Wall -O2
+LDFLAGS = `allegro-config --libs`
+DEFINES = -DDATADIR=\"$(DATADIR)/\"
+OBJS    = actor.o bullet.o cloud.o cmds.o displ_in.o display.o eclass.o \
+          enemy.o game.o input.o levels.o light.o main.o menu.o palette.o \
+          pickup.o score.o sound.o stuff.o tile.o
+TARGET  = overgod
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(DATADIR)/gfx
+	mkdir -p $(DATADIR)/wavs/beat
+	install -p -m 755 $(TARGET) $(PREFIX)/bin
+	install -p -m 644 overgod.cfg $(DATADIR)
+	install -p -m 644 gfx/* $(DATADIR)/gfx
+	install -p -m 644 wavs/*.wav $(DATADIR)/wavs
+	install -p -m 644 wavs/beat/* $(DATADIR)/wavs/beat
+	
+clean:
+	rm -f $(OBJS) $(TARGET) *~
diff -urN overgod-1.0.orig/actor.c overgod-1.0/actor.c
--- overgod-1.0.orig/actor.c	2005-09-11 11:32:08.000000000 +0200
+++ overgod-1.0/actor.c	2006-01-21 10:40:31.000000000 +0100
@@ -608,7 +608,7 @@
 //  ysin2 = sin(angle_to_radians(actor[a].angle)) * GRAIN;
 // }
  
- int target_x, target_y;
+ int target_x = 0, target_y = 0;
  float speed_mult;
  int accel = 0;
 
diff -urN overgod-1.0.orig/bullet.c overgod-1.0/bullet.c
--- overgod-1.0.orig/bullet.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/bullet.c	2006-01-21 10:41:54.000000000 +0100
@@ -264,7 +264,7 @@
 //   int y_gain = 0;
 //   char angle_change;
 
-   int cx, cy, xa, ya, xb;
+   int cx = 0, cy = 0, xa, ya, xb;
    int c2x, c2y;
 
    int passing_colour [5];
diff -urN overgod-1.0.orig/cmds.c overgod-1.0/cmds.c
--- overgod-1.0.orig/cmds.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/cmds.c	2006-01-21 10:45:53.000000000 +0100
@@ -2638,9 +2638,6 @@
 {
  int special1;
  int special2;
- int special3;
- int special4;
- int special5;
 
  timer += grand(4);
 
@@ -2694,11 +2691,11 @@
  if (angle == 0)
   angle = 1;
 
+ /* note bombs don't use special3 - 5 */
  create_bullet(btype, x, y,
   xs, ys, sactor,
   damage, timer, mass, angle,
-  status, seed, colours, 1, special1, special2, special3, special4, special5);
-
+  status, seed, colours, 1, special1, special2, 0, 0, 0);
 
 }
 
diff -urN overgod-1.0.orig/config.h overgod-1.0/config.h
--- overgod-1.0.orig/config.h	2005-09-11 15:17:06.000000000 +0200
+++ overgod-1.0/config.h	2006-01-21 10:38:15.000000000 +0100
@@ -68,6 +68,8 @@
 #define ARMOUR_UPGRADE 200
 
 
+#define MAX_FRAMESKIP 4
+
 struct armoury
 {
  char *name;
@@ -1293,3 +1295,12 @@
 PITCH_HEAVY
 };
 
+/* compat defines */
+#include <stdio.h>
+
+#ifndef DATADIR
+#define DATADIR
+#endif
+
+#define itoa(integer, buf, bufsize) \
+ (snprintf(buf, bufsize, "%d", integer), buf)
diff -urN overgod-1.0.orig/displ_in.c overgod-1.0/displ_in.c
--- overgod-1.0.orig/displ_in.c	2005-09-12 17:07:32.000000000 +0200
+++ overgod-1.0/displ_in.c	2006-01-21 10:51:37.000000000 +0100
@@ -139,11 +139,9 @@
  player2 = NULL;
 
  level_bmp = NULL;
- RGB temp_palette2 [1024]; // these seem to serve as a buffer against strange random corruptions of temp_palette. I don't understand this at all.
  RGB temp_palette [256];
- RGB temp_palette3 [1024];
 
- DATAFILE *datf = load_datafile("gfx//data.dat");
+ DATAFILE *datf = load_datafile(DATADIR "gfx/data.dat");
  if (datf == NULL)
  {
   set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
@@ -166,7 +164,7 @@
 
 //rest(1000);
 
- BITMAP *temp_bitmap = load_bitmap("gfx//gb_si.bmp", temp_palette);
+ BITMAP *temp_bitmap = load_bitmap(DATADIR "gfx/gb_si.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (ships)");
@@ -321,8 +319,8 @@
 #ifdef FIX_FONT
 
  RGB font_palette [256];
-// BITMAP *fbmp = load_bitmap("gfx//font_cel.bmp", font_palette);
- BITMAP *fbmp = load_bitmap("gfx//font_oc.bmp", font_palette);
+// BITMAP *fbmp = load_bitmap(DATADIR "gfx/font_cel.bmp", font_palette);
+ BITMAP *fbmp = load_bitmap(DATADIR "gfx/font_oc.bmp", font_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (font_cel)");
@@ -395,7 +393,7 @@
 #ifdef GENERATE_SHIPS
 
 
- temp_bitmap = load_bitmap("gfx//gb_ship.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_ship.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("gb_ship");
@@ -472,7 +470,7 @@
 
 // Load in enemy bitmaps:
 
- temp_bitmap = load_bitmap("gfx//gb_nme1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_nme1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_nme1.bmp not loaded correctly?)");
@@ -496,7 +494,7 @@
  progress_update("Enemies 1");
 
 
- temp_bitmap = load_bitmap("gfx//gb_nme2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_nme2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_nme2.bmp not loaded correctly?)");
@@ -519,7 +517,7 @@
 //extern BITMAP *enemy_bmps [ENEMY_BMPS];
 
 
- temp_bitmap = load_bitmap("gfx//gb_nmebm.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_nmebm.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_nmebm.bmp not loaded correctly?)");
@@ -533,7 +531,7 @@
 
  progress_update("Enemies 3");
 
- temp_bitmap = load_bitmap("gfx//gb_big1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_big1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_big1.bmp not loaded correctly?)");
@@ -548,7 +546,7 @@
 
  progress_update("Enemies 4");
 
- temp_bitmap = load_bitmap("gfx//gb_big2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_big2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_big2.bmp not loaded correctly?)");
@@ -564,7 +562,7 @@
 
  progress_update("Enemies 5");
 
- temp_bitmap = load_bitmap("gfx//gb_big3.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_big3.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_big3.bmp not loaded correctly?)");
@@ -580,7 +578,7 @@
  progress_update("Enemies 6");
 
 
- temp_bitmap = load_bitmap("gfx//gb_med1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_med1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_med1.bmp not loaded correctly?)");
@@ -597,7 +595,7 @@
 
  progress_update("Enemies 7");
 
-/* temp_bitmap = load_bitmap("gfx//enemy3.bmp", temp_palette);
+/* temp_bitmap = load_bitmap(DATADIR "gfx/enemy3.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy3.bmp not loaded correctly?)");
@@ -621,7 +619,7 @@
 
 /* progress_update("Enemy3 Loaded");
 
- temp_bitmap = load_bitmap("gfx//small1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small1.bmp not loaded correctly?)");
@@ -635,7 +633,7 @@
  
  progress_update("Small1 Loaded");
 */
- temp_bitmap = load_bitmap("gfx//gb_small.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_small.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gm_small.bmp not loaded correctly?)");
@@ -682,7 +680,7 @@
 
  progress_update("Small Things");
 
- temp_bitmap = load_bitmap("gfx//gb_small2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_small2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gm_small2.bmp not loaded correctly?)");
@@ -733,7 +731,7 @@
 
 
 /*
- temp_bitmap = load_bitmap("gfx//small2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small2.bmp not loaded correctly?)");
@@ -748,7 +746,7 @@
 
  progress_update("Small3 Loaded");
 
- temp_bitmap = load_bitmap("gfx//enemy2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy2.bmp not loaded correctly?)");
@@ -763,7 +761,7 @@
  
  progress_update("Enemy2 Loaded");
 */
- temp_bitmap = load_bitmap("gfx//gb_lsh.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_lsh.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_lsh.bmp not loaded correctly?)");
@@ -1089,7 +1087,7 @@
 //  else
    blit(source_bmp, temp_bmp, which_ship * 51 + 1, 1, 0, 0, 49, 49);
 
- int i, x, y, px, base_col;
+ int i, x, y, px, base_col = 0;
 
  for (i = 0; i < 5; i ++)
  {
@@ -1138,7 +1136,7 @@
  RGB temp_palette [256];
 // RGB temp_palette3 [1024];
  
- BITMAP *temp_bitmap = load_bitmap("gfx//gb_tiles.bmp", temp_palette);
+ BITMAP *temp_bitmap = load_bitmap(DATADIR "gfx/gb_tiles.bmp", temp_palette);
 
  if (temp_bitmap == NULL)
  {
@@ -1164,7 +1162,7 @@
 
  destroy_bitmap(temp_bitmap);
 
- temp_bitmap = load_bitmap("gfx//gb_maze.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_maze.bmp", temp_palette);
 
  if (temp_bitmap == NULL)
  {
diff -urN overgod-1.0.orig/display.c overgod-1.0/display.c
--- overgod-1.0.orig/display.c	2005-09-11 11:42:46.000000000 +0200
+++ overgod-1.0/display.c	2006-01-21 10:23:29.000000000 +0100
@@ -64,13 +64,7 @@
 #include <stdlib.h>
 // for itoa, used in the screenshot code but not needed for ports etc
 extern volatile int frames_per_second;
-extern volatile int ticked;
-extern int slacktime;
-extern int long_slacktime_store;
 extern int debug_sound [5];
-
-int slack_graph [100];
-int slack_graph_pos;
 int fps_graph [100];
 int fps_graph_pos;
 #endif
@@ -7266,14 +7260,11 @@
 // textprintf_ex(bmp, small_font, 20, 110, 5, "Xs %i  Ys %i  TS %f  DS %f  Drag %i",
 //  actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed), hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed) * game.drag, actor[player[play].actor_controlled].drag_amount);
 // textprintf_ex(bmp, small_font, 20, 60, 5, "Stack %i", stackavail());
-// textprintf(bmp, small_font, 20, 90, 5, "Slack %i", slacktime);
 // textprintf(bmp, small_font, 20, 100, 5, "Lock %i", actor[0].lock);
 //textprintf_ex(bmp, small_font, 20, 100, COLOUR_GREY5, -1, "Fps %i", frames_per_second);
 // textprintf_ex(bmp, small_font, 20, 50, 5, -1, "Fps} %i", frames_per_second);
 #ifdef DEBUG_DISPLAY
  textprintf_ex(bmp, small_font, 20, 90, 5, -1, "Fps %i", frames_per_second);
- textprintf_ex(bmp, small_font, 20, 100, 5, -1, "Slack %i", slacktime);
- textprintf_ex(bmp, small_font, 20, 110, 5, -1, "LSlack %i", long_slacktime_store);
  int i, c = 0;
  for (i = 0; i < NO_ENEMIES; i ++)
  {
@@ -7298,31 +7289,6 @@
  
  textprintf_ex(bmp, small_font, 20, 150, 5, -1, "%i %i %i %i", debug_sound [0], debug_sound [1], debug_sound [2], debug_sound [3]);
 
-
- if (slack_graph_pos < 0 || slack_graph_pos > 99)
-  slack_graph_pos = 0;
-  
- slack_graph [slack_graph_pos] = slacktime;
-
- c = slack_graph_pos;
- for (i = 0; i < 100; i ++)
- {
-  if (slack_graph [c] <= 5)
-   vline(bmp, 110 - i, 300, 160, COLOUR_RED5);
-    else
-     vline(bmp, 110 - i, 300, 300 - (slack_graph [c] / 6000), COLOUR_YELLOW8);
-  c --;
-  if (c < 0)
-   c = 99;   
- }
-
- slack_graph_pos ++;
-
-
-
-
-
-
  if (fps_graph_pos < 0 || fps_graph_pos > 99)
   fps_graph_pos = 0;
   
@@ -7359,7 +7325,6 @@
   enemy[0].angle, enemy[0].attribute [ATTRIB_SWERVER_ANGLE], enemy[0].attacking, enemy[0].recycle);
  textprintf(bmp, font, 20, 200, 5, "Lock} %i ", actor[0].lock);*/
 /* textprintf(bmp, small_font, 20, 50, 5, "FPS %i", frames_per_second);
- textprintf(bmp, small_font, 20, 60, 5, "SLACK %i", slacktime);
  textprintf(bmp, small_font, 20, 70, 5, "XS %i  YS %i  DRAG %i",
   actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, actor[player[play].actor_controlled].drag_amount);
  textprintf(bmp, small_font, 20, 80, 5, "X %i  Y %i ",
diff -urN overgod-1.0.orig/enemy.c overgod-1.0/enemy.c
--- overgod-1.0.orig/enemy.c	2005-09-11 10:46:04.000000000 +0200
+++ overgod-1.0/enemy.c	2006-01-21 10:53:31.000000000 +0100
@@ -195,7 +195,7 @@
 // REMEMBER: enemies are also created in create_turret()
 
    int e = 0;
-   int i, j;
+   int i, j = 0;
 
 
    for (e = 0; e < NO_ENEMIES; e++)
diff -urN overgod-1.0.orig/game.c overgod-1.0/game.c
--- overgod-1.0.orig/game.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/game.c	2006-01-21 13:51:09.000000000 +0100
@@ -68,13 +68,10 @@
 
 extern volatile unsigned char ticked;
 extern volatile int framecounter;
-extern int slacktime;
-int long_slacktime;
-int long_slacktime_store;
-
 
 void game_loop(void)
 {
+ int frames_skipped = 0;
  int playing = 1;
  
  counter = 0;
@@ -191,33 +188,24 @@
      
    }
    
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    run_display();
    framecounter++;
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
   
   init_effects();
 
-  slacktime = 0;
-  
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
+  while(ticked == 0)
+   rest(1);
   ticked --;
 
   counter ++;
   
-  if (counter % 32 == 0)
-  {
-   long_slacktime_store = long_slacktime;
-   long_slacktime = 0;
-  } 
-   
-   long_slacktime += slacktime / 100;
-  
-
   if (key [KEY_ESC])
    quit_query();
   
@@ -259,12 +247,8 @@
 
   play_beats();
 
-  do
-  {
-   slacktime ++;
-   slacktime = 0;
-  } while(ticked == 0);
-
+  while(ticked == 0)
+   rest(1);
   ticked = 0;
 
  }
@@ -429,7 +413,6 @@
 
  init_level();
 
- long_slacktime = 0;
  arena.waver_on_level = 0;
 
 }
diff -urN overgod-1.0.orig/main.c overgod-1.0/main.c
--- overgod-1.0.orig/main.c	2005-09-13 22:58:27.000000000 +0200
+++ overgod-1.0/main.c	2006-01-21 10:29:42.000000000 +0100
@@ -155,17 +155,16 @@
 volatile int framecounter;
 volatile int frames_per_second;
 
-volatile int inputcounter = 0;
-volatile int inputs_per_second = 0;
+//volatile int inputcounter = 0;
+//volatile int inputs_per_second = 0;
 
-volatile int turncounter = 0;
-volatile int turns_per_second = 0;
+//volatile int turncounter = 0;
+//volatile int turns_per_second = 0;
 
 void tickover(void);
 
 volatile unsigned char ticked;
 //volatile unsigned char tick_counter;
-int slacktime;
 // --- end timer interupt
 
 extern int grid_offset_x_2p_finetune;
@@ -214,8 +213,6 @@
       exit(1);
    }
 
-   set_config_file("lacew.cfg");
-   
    install_keyboard();
    install_timer();
 
@@ -244,8 +241,8 @@
 //   LOCK_VARIABLE (tick_counter);
    LOCK_VARIABLE (frames_per_second);
    LOCK_VARIABLE (framecounter);
-   LOCK_VARIABLE (turns_per_second);
-   LOCK_VARIABLE (turncounter);
+//   LOCK_VARIABLE (turns_per_second);
+//   LOCK_VARIABLE (turncounter);
 //   LOCK_VARIABLE (inputs_per_second);
 //   LOCK_VARIABLE (inputcounter);
 
@@ -254,7 +251,7 @@
 
    set_color_depth(8);
 
-   set_config_file("overgod.cfg");
+   init_config();
 
    options.resolution = get_config_int("Options", "Resolution", 0);
    
diff -urN overgod-1.0.orig/menu.c overgod-1.0/menu.c
--- overgod-1.0.orig/menu.c	2005-09-12 20:23:14.000000000 +0200
+++ overgod-1.0/menu.c	2006-01-21 13:52:41.000000000 +0100
@@ -229,7 +229,6 @@
 void enter_keystroke(void);
 int option_jump(int direction);
 int special_jump(int direction);
-void init_config(void);
 void save_config(void);
 
 void choose_ships(void);
@@ -373,7 +372,6 @@
 void init_menus_once_only(void)
 {
 // text_mode(-1);
- init_config();
 
  menu_bmp = create_bitmap(640, 480);
 
@@ -394,7 +392,7 @@
 
  RGB temp_palette [256];
 
-/* BITMAP *temp_bmp = load_bitmap("gfx\\title_i.bmp", temp_palette);
+/* BITMAP *temp_bmp = load_bitmap(DATADIR "gfx/title_i.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -414,7 +412,7 @@
 
  destroy_bitmap(temp_bmp);
 */
- BITMAP *temp_bmp = load_bitmap("gfx//gb_title.bmp", temp_palette);
+ BITMAP *temp_bmp = load_bitmap(DATADIR "gfx/gb_title.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -464,7 +462,7 @@
  destroy_bitmap(temp_bmp);*/
  
 /*
- temp_bmp = load_bitmap("gfx//title_s.bmp", temp_palette);
+ temp_bmp = load_bitmap(DATADIR "gfx/title_s.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -484,7 +482,7 @@
 
  destroy_bitmap(temp_bmp);
 */
-/* upgrade_box1 = load_bitmap("gfx//upg_box.bmp", temp_palette);
+/* upgrade_box1 = load_bitmap(DATADIR "gfx/upg_box.bmp", temp_palette);
 
  if (!upgrade_box1)
  {
@@ -493,7 +491,7 @@
       exit(1);
  }
 
- upgrade_box2 = load_bitmap("gfx//upg_box2.bmp", temp_palette);
+ upgrade_box2 = load_bitmap(DATADIR "gfx/upg_box2.bmp", temp_palette);
 
  if (!upgrade_box2)
  {
@@ -502,7 +500,7 @@
       exit(1);
  }
 
- upgrade_box3 = load_bitmap("gfx//upg_box3.bmp", temp_palette);
+ upgrade_box3 = load_bitmap(DATADIR "gfx/upg_box3.bmp", temp_palette);
 
  if (!upgrade_box3)
  {
@@ -523,7 +521,8 @@
 
 void menu_loop(void)
 {
-
+ int frames_skipped = 0;
+ 
  which_menu = MENU_MAIN;
  menu_index_max = 4;
  menu_index_min = 0;
@@ -551,20 +550,21 @@
   if (which_menu == MENU_SCORES || which_menu == MENU_ENTER_SCORES)
    make_ms_move();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    menu_display();
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
   menu_input();
 
-  slacktime = 0;
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
+  while(ticked == 0)
+   rest(1);
   ticked --;
 
  } while(TRUE);
@@ -2042,7 +2042,8 @@
 
  game.type = game_type;
 
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
  clear_bitmap(screen);
 
  begin_game();
@@ -2143,14 +2144,13 @@
 
 void choose_ships(void)
 {
+ int frames_skipped = 0;
 
  player[0].ship = 0;
  player[1].ship = 0;
  game.single_player = 0;
  game.users = 1;
 
- int county = 0;
-
  int keypress_wait1 = KP_WAIT_SHORT;
  int keypress_wait2 = KP_WAIT_SHORT;
  int waiting = 5;
@@ -2289,16 +2289,18 @@
 
   make_grid_scroll();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    display_ship_choice(0, p1_active, p2_active, p1_chosen, p2_chosen);
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
+  while (ticked == 0)
+   rest(1);
 
   ticked --;
 
@@ -3853,17 +3855,69 @@
 
 }
 
+/* Function(s) to find the homedir of a user under Unix */
+#ifdef __unix__
+#include <pwd.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(__DECC) && defined(VMS)
+#include <unixlib.h>
+static char *vms_to_unix_buffer = NULL;
+static int convert_vms_to_unix(char *vms_dir_name)
+{
+	vms_to_unix_buffer = vms_dir_name;
+}
+#endif
+
+/* 
+ * Locate user's home directory.
+ */
+char *get_home_dir(void)
+{
+	struct passwd *pw;
+
+	if (!(pw = getpwuid(getuid())))
+	{ 
+		fprintf(stderr, "Who are you? Not found in passwd database!!\n");
+		return NULL;
+	}
+
+#if defined(__DECC) && defined(VMS)
+	/* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix
+	   Format. */
+	decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1);
+	return vms_to_unix_buffer;
+#else
+	return pw->pw_dir;
+#endif
+}
+#endif /* defined __unix__ */
+
 void init_config(void)
 {
-
-// set_config is in main.c
-
  char miscstring [40];
  char wstring [40];
  char itstring [40];
  int i;
 
-
+#ifdef __unix__   
+ char config_file_name[512];
+ char *home_dir = get_home_dir();
+ int using_global_cfg = 1;
+   
+ snprintf(config_file_name, sizeof(config_file_name)/sizeof(char), "%s/.%s",
+  home_dir? home_dir:".", "overgod.cfg");
+      
+ /* does the cfg file exist? */
+ if (access(config_file_name, R_OK) == 0)
+ {
+  override_config_file(config_file_name);
+  using_global_cfg = 0;
+ }
+ else
+#endif   
+  override_config_file(DATADIR "overgod.cfg");
+  
  options.sound_init = get_config_int("Options", "Sound_init", 1);
  options.sound_mode = get_config_int("Options", "Sound_mode", SOUNDMODE_STEREO);
  options.run_vsync = get_config_int("Options", "Run_vsync", 0);
@@ -3945,6 +3999,12 @@
  best_ta_time = get_config_int("Highscores_TA", "best_time", 1000);
  strcpy(best_ta_name, get_config_string("Highscores_TA", "best_name", "Nobody"));
 
+#ifdef __unix__
+ /* make sure any changes get written to the per user file and not to
+    the global file */
+ if (using_global_cfg)
+  override_config_file(config_file_name);
+#endif
 }
 
 void save_config(void)
@@ -4127,8 +4187,7 @@
 
 void display_victory_screen(void)
 {
-
- int county = 0;
+ int frames_skipped = 0;
  int county2 = 0;
 
  init_ms();
@@ -4142,7 +4201,8 @@
   run_sparkles();
   make_ms_move();
   
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    show_grid(COLOUR_PURPLE3, COLOUR_PURPLE8);
@@ -4157,15 +4217,16 @@
 
    if (county2 > 99)
     textprintf_centre_ex(menu_bmp, small_font, 320, 420, COLOUR_YELLOW5, -1, "Press Space to continue.");
-   vsync();
+   if (options.run_vsync > 0)
+    vsync();
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
-
+  while (ticked == 0)
+   rest(1);
   ticked --;
 
   county2 ++;
@@ -4527,8 +4588,7 @@
 
 void unlock_screen(int which)
 {
-
- int county = 0;
+ int frames_skipped = 0;
  int county2 = 0;
 
  do
@@ -4536,7 +4596,8 @@
   menu_counter ++;
   make_grid_scroll();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    show_grid(COLOUR_PURPLE3, COLOUR_PURPLE8);
@@ -4560,15 +4621,16 @@
 //   textprintf_centre_ex(menu_bmp, small_font, 320, 305, COLOUR_YELLOW8, "your time, like ");
    if (county2 > 99)
     textprintf_centre_ex(menu_bmp, small_font, 320, 380, COLOUR_YELLOW5, -1, "Press Space to continue.");
-   vsync();
+   if (options.run_vsync > 0)
+    vsync();
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+    frames_skipped++;
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
-
+  while(ticked == 0)
+   rest(1);
   ticked --;
 
   county2 ++;
diff -urN overgod-1.0.orig/menu.h overgod-1.0/menu.h
--- overgod-1.0.orig/menu.h	2003-09-04 19:28:36.000000000 +0200
+++ overgod-1.0/menu.h	2006-01-21 09:32:09.000000000 +0100
@@ -1,3 +1,5 @@
 void init_menus_once_only(void);
 
 void menu_loop(void);
+
+void init_config(void);
diff -urN overgod-1.0.orig/overgod.cfg overgod-1.0/overgod.cfg
--- overgod-1.0.orig/overgod.cfg	2005-09-13 22:59:15.000000000 +0200
+++ overgod-1.0/overgod.cfg	2006-01-21 16:37:38.000000000 +0100
@@ -3,7 +3,7 @@
 
 [Options]
 Sound_mode = 2
-Run_vsync = 1
+Run_vsync = 0
 Sound_volume = 100
 Ambience_volume = 100
 Resolution = 2
diff -urN overgod-1.0.orig/palette.c overgod-1.0/palette.c
--- overgod-1.0.orig/palette.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/palette.c	2006-01-21 13:54:07.000000000 +0100
@@ -74,6 +74,8 @@
 #include "palette.h"
 #include "globvars.h"
 
+extern struct optionstruct options;
+
 COLOR_MAP trans_table;
 int blend_function(int x, int y, RGB *rgbl);
 int limit_colour(int colour_input);
@@ -957,13 +959,14 @@
 
 void set_dark_palette(void)
 {
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
  set_palette(dark_palet);
 }
 
 void set_light_palette(void)
 {
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
  set_palette(light_palet);
 }
-
diff -urN overgod-1.0.orig/sound.c overgod-1.0/sound.c
--- overgod-1.0.orig/sound.c	2005-09-11 14:44:18.000000000 +0200
+++ overgod-1.0/sound.c	2006-01-21 10:18:59.000000000 +0100
@@ -311,7 +311,7 @@
    }
    
    sound_active = 1;
-
+   
    if (options.sound_init == 0)
    {
 //    cprintf("\n\r\n\rSound disabled in proj.cfg.");
@@ -326,6 +326,7 @@
    if (install_sound (DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) == -1)
    {
 //    allegro_message("\n\r\n\rSound autodetect failed.");
+    printf("Warning: %s, sound disabled\n", allegro_error);
     sound_active = 0;
 //    rest(300);
 //    do
@@ -448,7 +449,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".//wavs//");
+ strcpy(sfile_name, DATADIR "wavs/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
@@ -467,7 +468,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".//sound//");
+ strcpy(sfile_name, DATADIR "sound/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
@@ -1547,7 +1548,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".//wavs//beat//");
+ strcpy(sfile_name, DATADIR "wavs/beat/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
diff -urN overgod-1.0.orig/tile.c overgod-1.0/tile.c
--- overgod-1.0.orig/tile.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/tile.c	2006-01-21 10:55:45.000000000 +0100
@@ -316,7 +316,7 @@
  
  tile_rle [MAZE_NOTHING] = make_tile(back_tile, -1, bcol1, bcol2, 0);
 
- int tmaze;
+ int tmaze = 0;
 
  if (arena.level <= 4)
  {


--- NEW FILE overgod.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Overgod
GenericName=Another Asteroid like game
Comment=Like asteroids, but the asteroids move independently and shoot back
Exec=overgod
Icon=overgod.png
Terminal=false
Type=Application
Categories=Game;ArcadeGame
Version=1.0


--- NEW FILE overgod.spec ---
Name:           overgod
Version:        1.0
Release:        2%{?dist}
Summary:        Another Asteroid like game
Group:          Amusements/Games
License:        GPL
URL:            http://www.allegro.cc/depot/Overgod
Source0:        http://dl.sourceforge.net/sourceforge/overgod/overgod.tar.gz
Source1:        overgod.desktop
Source2:        overgod.png
Patch0:         overgod-1.0.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel desktop-file-utils

%description
For too long has humanity been ruled by cruel and disputatious gods!
Fly through the various layers of the Celestial Oversphere to unseat
those who control the universe.

In Overgod you control a little vehicle in the middle of the screen and fly
around and shoot things - a bit like asteroids, but the asteroids move
independently and shoot back. You can also upgrade your vehicle in various
ways.


%prep
%setup -q
%patch0 -p1 -z .unix
%{__sed} -i 's/\r//' readme.txt licence.txt

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix}


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc readme.txt licence.txt
%{_bindir}/overgod
%{_datadir}/overgod
%{_datadir}/applications/fedora-overgod.desktop
%{_datadir}/icons/hicolor/48x48/apps/overgod.png

%changelog
* Tue Jan 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-2
- Fixup description (bz 178625)

* Sun Jan 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/overgod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 21:16:42 -0000	1.1
+++ .cvsignore	31 Jan 2006 21:17:33 -0000	1.2
@@ -0,0 +1 @@
+overgod.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/overgod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 21:16:42 -0000	1.1
+++ sources	31 Jan 2006 21:17:33 -0000	1.2
@@ -0,0 +1 @@
+3bddd8d4e96c5e69ec07236de145799a  overgod.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:07 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:07 -0500
Subject: rpms/sblim-cmpi-base - New directory
Message-ID: <200601312119.k0VLJ9fV023105@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23093/sblim-cmpi-base

Log Message:
Directory /cvs/extras/rpms/sblim-cmpi-base added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:13 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:13 -0500
Subject: rpms/sblim-cmpi-base/devel - New directory
Message-ID: <200601312119.k0VLJFMQ023126@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23093/sblim-cmpi-base/devel

Log Message:
Directory /cvs/extras/rpms/sblim-cmpi-base/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:29 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:29 -0500
Subject: rpms/sblim-cmpi-base Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601312119.k0VLJVmZ023160@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23148

Added Files:
	Makefile import.log 
Log Message:
Setup of module sblim-cmpi-base


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:35 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:35 -0500
Subject: rpms/sblim-cmpi-base/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601312119.k0VLJb0H023180@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-base


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:59 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:59 -0500
Subject: rpms/sblim-cmpi-base import.log,1.1,1.2
Message-ID: <200601312120.k0VLKV0w023262@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214

Modified Files:
	import.log 
Log Message:
auto-import sblim-cmpi-base-1.5.4-3 on branch devel from sblim-cmpi-base-1.5.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 21:19:29 -0000	1.1
+++ import.log	31 Jan 2006 21:19:58 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-base-1_5_4-3:HEAD:sblim-cmpi-base-1.5.4-3.src.rpm:1138742327



From fedora-extras-commits at redhat.com  Tue Jan 31 21:20:04 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:20:04 -0500
Subject: rpms/sblim-cmpi-base/devel sblim-cmpi-base.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601312120.k0VLKbx9023272@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sblim-cmpi-base.spec 
Log Message:
auto-import sblim-cmpi-base-1.5.4-3 on branch devel from sblim-cmpi-base-1.5.4-3.src.rpm


--- NEW FILE sblim-cmpi-base.spec ---
#
# $Id: sblim-cmpi-base.rh.spec,v 1.3 2005/11/10 12:01:06 mihajlov Exp $
#
# Package spec for sblim-cmpi-base - RedHat/Fedora Flavor
#
# Use this SPEC if building for a RH/Fedora System for usage with
# OpenPegasus
#

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

Summary: SBLIM Base Providers
Name: sblim-cmpi-base
Version: 1.5.4
Release: 3
Group: Systems Management/Base
URL: http://www.sblim.org
License: CPL

Source0: http://download.sourceforge.net/pub/sourceforge/s/sb/sblim/%{name}-%{version}.tar.bz2

BuildRequires: tog-pegasus-devel >= 2.5
Requires: tog-pegasus >= 2.5.1

%Description
Standards Based Linux Instrumentation Base CMPI Providers for
System-related CIM classes

%Package devel
Summary: SBLIM Base Instrumentation Header Development Files
Group: Systems Management/Base
Requires: %{name} = %{version}-%{release}

%Description devel
SBLIM Base Provider Development Package contains header files and 
link libraries for dependent provider packages

%Package test
Summary: SBLIM Base Instrumentation Testcase Files
Group: Systems Management/Base
Requires: %{name} = %{version}-%{release}
Requires: sblim-testsuite

%Description test
SBLIM Base Provider Testcase Files for the SBLIM Testsuite

%prep

%setup -q

%build

%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
	CIMSERVER=pegasus
make %{?_smp_mflags}

%install

rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a

%pre

%define SCHEMA %{_datadir}/%{name}/Linux_Base.mof
%define REGISTRATION %{_datadir}/%{name}/Linux_Base.registration

# If upgrading, deregister old version
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1
fi

%post
# Register Schema and Provider - this is higly provider specific

%{_datadir}/%{name}/provider-register.sh -t pegasus \
	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null  2>&1

/sbin/ldconfig

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1
fi

%postun -p /sbin/ldconfig

%clean

rm -rf $RPM_BUILD_ROOT

%files

%defattr(-,root,root) 
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{_libdir}/cmpi/*.so

%files devel

%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/*.so

%files test

%defattr(-,root,root)
%{_datadir}/sblim-testsuite

%changelog

* Thu Nov 10 2005  <mihajlov at de.ibm.com> - 1.5.4-3
- suppress error output in post scriptlets

* Wed Oct 27 2005  <mihajlov at de.ibm.com> - 1.5.4-2
- went back to original provider dir location as FC5 pegasus 2.5.1 support
  /usr/lib[64]/cmpi

* Wed Oct 12 2005  <mihajlov at de.ibm.com> - 1.5.4-1
- new spec file specifically for Fedora/RedHat

* Wed Jul 20 2005 Mark Hamzy <hamzy at us.ibm.com>	1.5.3-1
- initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 21:19:35 -0000	1.1
+++ .cvsignore	31 Jan 2006 21:20:04 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-base-1.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 21:19:35 -0000	1.1
+++ sources	31 Jan 2006 21:20:04 -0000	1.2
@@ -0,0 +1 @@
+10d9959925e9a416928dce18532855dc  sblim-cmpi-base-1.5.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:20:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:20:26 -0500
Subject: owners owners.list,1.587,1.588
Message-ID: <200601312120.k0VLKwnn023301@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251

Modified Files:
	owners.list 
Log Message:
add overgod


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- owners.list	31 Jan 2006 18:55:09 -0000	1.587
+++ owners.list	31 Jan 2006 21:20:26 -0000	1.588
@@ -709,6 +709,7 @@
 Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 21:29:39 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:29:39 -0500
Subject: owners owners.list,1.588,1.589
Message-ID: <200601312130.k0VLUCF9023432@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23415

Modified Files:
	owners.list 
Log Message:
Added sblim-cmpi-base



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.588
retrieving revision 1.589
diff -u -r1.588 -r1.589
--- owners.list	31 Jan 2006 21:20:26 -0000	1.588
+++ owners.list	31 Jan 2006 21:29:39 -0000	1.589
@@ -1139,6 +1139,7 @@
 Fedora Extras|s3switch|Manage the output device on S3 Savage chips|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|sblim-cmpi-base|Standards Based Linux Instrumentation Base CMPI Providers for System-related CIM classes|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 21:46:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:46:02 -0500
Subject: rpms/fuse-utils Makefile,1.1,NONE import.log,1.2,NONE
Message-ID: <200601312146.k0VLk4v0024067@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24057

Removed Files:
	Makefile import.log 
Log Message:



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:46:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:46:08 -0500
Subject: rpms/fuse-utils/devel Makefile, 1.1, NONE fuse-utils-0.7.0.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200601312146.k0VLkALV024084@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24057/devel

Removed Files:
	Makefile fuse-utils-0.7.0.spec sources 
Log Message:



--- Makefile DELETED ---


--- fuse-utils-0.7.0.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:47:00 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:47:00 -0500
Subject: rpms/fuse-utils/devel .cvsignore,1.2,NONE
Message-ID: <200601312147.k0VLl2ok024122@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24113/devel

Removed Files:
	.cvsignore 
Log Message:

FLUSH!



--- .cvsignore DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:48:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 31 Jan 2006 16:48:54 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.14, 1.15 rxvt-unicode.spec,
	1.16, 1.17 sources, 1.14, 1.15
Message-ID: <200601312149.k0VLnRuY024249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24173/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Jan 2006 22:22:45 -0000	1.14
+++ .cvsignore	31 Jan 2006 21:48:54 -0000	1.15
@@ -1 +1 @@
-rxvt-unicode-7.4.tar.bz2
+rxvt-unicode-7.5.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rxvt-unicode.spec	28 Jan 2006 22:22:45 -0000	1.16
+++ rxvt-unicode.spec	31 Jan 2006 21:48:54 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.4
+Version:        7.5
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Tue Jan 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.5-1
+- version upgrade
+
 * Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jan 2006 22:22:45 -0000	1.14
+++ sources	31 Jan 2006 21:48:54 -0000	1.15
@@ -1 +1 @@
-553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2
+41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:49:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 31 Jan 2006 16:49:00 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.14, 1.15 rxvt-unicode.spec,
	1.16, 1.17 sources, 1.14, 1.15
Message-ID: <200601312149.k0VLnXUk024254@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24173/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Jan 2006 22:22:51 -0000	1.14
+++ .cvsignore	31 Jan 2006 21:49:00 -0000	1.15
@@ -1 +1 @@
-rxvt-unicode-7.4.tar.bz2
+rxvt-unicode-7.5.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rxvt-unicode.spec	28 Jan 2006 22:22:51 -0000	1.16
+++ rxvt-unicode.spec	31 Jan 2006 21:49:00 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.4
+Version:        7.5
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Tue Jan 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.5-1
+- version upgrade
+
 * Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jan 2006 22:22:51 -0000	1.14
+++ sources	31 Jan 2006 21:49:00 -0000	1.15
@@ -1 +1 @@
-553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2
+41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:49:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 31 Jan 2006 16:49:06 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.14, 1.15 rxvt-unicode.spec,
	1.20, 1.21 sources, 1.14, 1.15
Message-ID: <200601312149.k0VLncPF024259@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24173/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Jan 2006 22:22:59 -0000	1.14
+++ .cvsignore	31 Jan 2006 21:49:06 -0000	1.15
@@ -1 +1 @@
-rxvt-unicode-7.4.tar.bz2
+rxvt-unicode-7.5.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rxvt-unicode.spec	28 Jan 2006 22:22:59 -0000	1.20
+++ rxvt-unicode.spec	31 Jan 2006 21:49:06 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.4
+Version:        7.5
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Tue Jan 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.5-1
+- version upgrade
+
 * Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jan 2006 22:22:59 -0000	1.14
+++ sources	31 Jan 2006 21:49:06 -0000	1.15
@@ -1 +1 @@
-553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2
+41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:51:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:51:35 -0500
Subject: rpms/sqlite2/devel Makefile, 1.1, NONE sources, 1.2,
	NONE sqlite-2.8.15-arch-double-differences.patch, 1.1,
	NONE sqlite-2.8.15-makefile.patch, 1.1,
	NONE sqlite-2.8.15.rpath.patch, 1.1,
	NONE sqlite-2.8.3.test.rh9.patch, 1.1,
	NONE sqlite-64bit-fixes.patch, 1.1, NONE sqlite2.spec, 1.3, NONE
Message-ID: <200601312151.k0VLpbNj024352@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24341

Removed Files:
	Makefile sources sqlite-2.8.15-arch-double-differences.patch 
	sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch 
	sqlite-2.8.3.test.rh9.patch sqlite-64bit-fixes.patch 
	sqlite2.spec 
Log Message:

FLUSH!



--- Makefile DELETED ---


--- sources DELETED ---


--- sqlite-2.8.15-arch-double-differences.patch DELETED ---


--- sqlite-2.8.15-makefile.patch DELETED ---


--- sqlite-2.8.15.rpath.patch DELETED ---


--- sqlite-2.8.3.test.rh9.patch DELETED ---


--- sqlite-64bit-fixes.patch DELETED ---


--- sqlite2.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:51:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Jan 2006 16:51:54 -0500
Subject: rpms/perl-Net-Patricia/devel .cvsignore, 1.2,
	1.3 perl-Net-Patricia.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601312152.k0VLqQOg024397@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-Net-Patricia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24372

Modified Files:
	.cvsignore perl-Net-Patricia.spec sources 
Log Message:
Update to 1.014



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Patricia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 15:11:40 -0000	1.2
+++ .cvsignore	31 Jan 2006 21:51:53 -0000	1.3
@@ -1 +1 @@
-Net-Patricia-1.010.tar.gz
+Net-Patricia-1.014.tar.gz


Index: perl-Net-Patricia.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Patricia/devel/perl-Net-Patricia.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-Patricia.spec	24 Oct 2005 15:11:40 -0000	1.1
+++ perl-Net-Patricia.spec	31 Jan 2006 21:51:53 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Net-Patricia
-Version:        1.010
+Version:        1.014
 Release:        1%{?dist}
 Summary:        Patricia Trie perl module for fast IP address lookups
 License:        GPL
@@ -53,5 +53,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 31 2006 Orion Poplawski 1.014-1
+- Update to 1.014
+
 * Tue Oct 11 2005 Orion Poplawski 1.010-1
 - Initial Fedora Extras release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Patricia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 15:11:40 -0000	1.2
+++ sources	31 Jan 2006 21:51:53 -0000	1.3
@@ -1 +1 @@
-19f0c6944769daba64694ee3c72cf286  Net-Patricia-1.010.tar.gz
+16ec73b5b514dbe4275e349fca236c49  Net-Patricia-1.014.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 21:53:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:53:55 -0500
Subject: rpms/sqlite2/devel .cvsignore,1.2,NONE
Message-ID: <200601312153.k0VLrvEY024505@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24496

Removed Files:
	.cvsignore 
Log Message:

FLUSH



--- .cvsignore DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 23:46:16 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 18:46:16 -0500
Subject: rpms/sblim-cmpi-base/devel sblim-cmpi-base.spec,1.1,1.2
Message-ID: <200601312346.k0VNkmxc028844@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827

Modified Files:
	sblim-cmpi-base.spec 
Log Message:
Changing release to 3.fc5



Index: sblim-cmpi-base.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sblim-cmpi-base.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sblim-cmpi-base.spec	31 Jan 2006 21:20:04 -0000	1.1
+++ sblim-cmpi-base.spec	31 Jan 2006 23:46:15 -0000	1.2
@@ -12,7 +12,7 @@
 Summary: SBLIM Base Providers
 Name: sblim-cmpi-base
 Version: 1.5.4
-Release: 3
+Release: 3.fc5
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL



From fedora-extras-commits at redhat.com  Sun Jan  1 00:01:59 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:01:59 -0500
Subject: rpms/ocaml/FC-4 .cvsignore, 1.5, 1.6 ocaml.spec, 1.17, 1.18 sources,
	1.5, 1.6
Message-ID: <200601010002.k0102q95028350@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28325

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Sep 2005 10:10:01 -0000	1.5
+++ .cvsignore	1 Jan 2006 00:01:59 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.08.4.tar.bz2
-ocaml-3.08-refman.html.tar.gz
-ocaml-3.08-refman.info.tar.gz
-ocaml-3.08-refman.ps.gz
+ocaml-3.09.0.tar.bz2
+ocaml-3.09-refman.html.tar.gz
+ocaml-3.09-refman.info.tar.gz
+ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ocaml.spec	11 Sep 2005 10:10:01 -0000	1.17
+++ ocaml.spec	1 Jan 2006 00:01:59 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.08.4
+Version:	3.09.0
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,19 +7,22 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
-Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
-Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
+BuildRequires:	ncurses-devel
+BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  xorg-x11-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
+
 %description
 Objective Caml is a high-level, strongly-typed, functional and
 object-oriented programming language from the ML family of languages.
@@ -29,6 +32,7 @@
 parsing tools (Lex,Yacc,Camlp4), a replay debugger, a documentation generator,
 and a comprehensive library.
 
+
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
@@ -38,6 +42,7 @@
 A library for interfacing Objective Caml with the scripting language
 Tcl/Tk. It include the OCamlBrowser code editor / library browser.
 
+
 %package -n camlp4
 Group:		Development/Languages
 Summary:	Pre-Processor-Pretty-Printer for OCaml
@@ -47,6 +52,7 @@
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
 file and printing some result on standard output.
 
+
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
@@ -55,6 +61,7 @@
 %description ocamldoc
 Documentation generator for Objective Caml.
 
+
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
@@ -64,6 +71,7 @@
 %description emacs
 Emacs mode for Objective Caml.
 
+
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
@@ -72,6 +80,7 @@
 %description docs
 Documentation for Objective Caml.
 
+
 %prep
 %setup -q -T -b 0
 %setup -q -T -D -a 1
@@ -81,6 +90,7 @@
 
 cp %{SOURCE2} refman.ps.gz
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
@@ -91,6 +101,7 @@
 # %{?_smp_mflags} breaks the build
 (cd emacs; make ocamltags)
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml MANDIR=$RPM_BUILD_ROOT%{_mandir}
@@ -105,9 +116,11 @@
     cd infoman; cp ocaml*.gz $RPM_BUILD_ROOT%{_infodir}
 )
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/install-info \
     --entry "* ocaml: (ocaml).	 The Objective Caml compiler and programming environment" \
@@ -115,11 +128,13 @@
     %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 
+
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -143,6 +158,7 @@
 %exclude %{_libdir}/ocaml/stublibs/dlltkanim.so
 %doc README LICENSE Changes
 
+
 %files -n labltk
 %defattr(-,root,root,-)
 %{_bindir}/labltk
@@ -153,6 +169,7 @@
 %doc otherlibs/labltk/examples_labltk
 %doc otherlibs/labltk/examples_camltk
 
+
 %files -n camlp4
 %defattr(-,root,root,-)
 %{_bindir}/camlp4*
@@ -162,22 +179,26 @@
 %{_mandir}/man1/camlp4*
 %{_mandir}/man1/mkcamlp4*
 
+
 %files ocamldoc
 %defattr(-,root,root,-)
 %{_bindir}/ocamldoc*
 %{_libdir}/ocaml/ocamldoc
 %doc ocamldoc/Changes.txt
 
+
 %files docs
 %defattr(-,root,root,-)
 %doc refman.ps.gz htmlman
 
+
 %files emacs
 %defattr(-,root,root,-)
 %{_datadir}/emacs/site-lisp/*
 %{_bindir}/ocamltags
 %doc emacs/README
 
+
 %changelog
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2005 10:10:01 -0000	1.5
+++ sources	1 Jan 2006 00:01:59 -0000	1.6
@@ -1,4 +1,4 @@
-96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
-0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
-49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
-35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz
+834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
+280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
+598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 00:05:17 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:05:17 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.17,1.18 sources,1.5,1.6
Message-ID: <200601010005.k0105x1q028417@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28398

Modified Files:
	ocaml.spec sources 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ocaml.spec	11 Sep 2005 10:11:22 -0000	1.17
+++ ocaml.spec	1 Jan 2006 00:05:17 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.08.4
+Version:	3.09.0
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,16 +7,18 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
-Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
-Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
+BuildRequires:	ncurses-devel
+BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  libX11-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -179,6 +181,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
+- new version 3.09.0
+
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2005 10:11:22 -0000	1.5
+++ sources	1 Jan 2006 00:05:17 -0000	1.6
@@ -1,4 +1,4 @@
-96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
-0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
-49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
-35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz
+834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
+280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
+598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 00:07:22 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:07:22 -0500
Subject: rpms/ocaml/FC-4 ocaml.spec,1.18,1.19
Message-ID: <200601010008.k0108ImJ028465@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28423/FC-4

Modified Files:
	ocaml.spec 
Log Message:
new version 3.09.0


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ocaml.spec	1 Jan 2006 00:01:59 -0000	1.18
+++ ocaml.spec	1 Jan 2006 00:07:21 -0000	1.19
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
+- new version 3.09.0
+
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4
 



From fedora-extras-commits at redhat.com  Sun Jan  1 00:07:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:07:03 -0500
Subject: rpms/ocaml/FC-3 .cvsignore, 1.4, 1.5 ocaml.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200601010008.k0108ITd028464@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28423/FC-3

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2005 19:28:02 -0000	1.4
+++ .cvsignore	1 Jan 2006 00:07:03 -0000	1.5
@@ -1,4 +1,4 @@
-ocaml-3.08.3.tar.bz2
-ocaml-3.08-refman.html.tar.gz
-ocaml-3.08-refman.info.tar.gz
-ocaml-3.08-refman.ps.gz
+ocaml-3.09.0.tar.bz2
+ocaml-3.09-refman.html.tar.gz
+ocaml-3.09-refman.info.tar.gz
+ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ocaml.spec	11 Sep 2005 10:18:26 -0000	1.12
+++ ocaml.spec	1 Jan 2006 00:07:03 -0000	1.13
@@ -1,20 +1,21 @@
 Name:		ocaml
-Version:	3.08.4
-Release: 	2%{?dist}
+Version:	3.09.0
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08.4.tar.bz2
-Source1:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.ps.gz
-Source3:	http://caml.inria.fr/distrib/ocaml-3.08/ocaml-3.08-refman.info.tar.gz
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ncurses-devel, gdbm-devel, xorg-x11-devel
+BuildRequires:	ncurses-devel
+BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
 Requires(post):	/sbin/install-info
@@ -179,6 +180,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
+- new version 3.09.0
+
 * Sun Sep 11 2005 Gerard Milmeister <gemi at bluewin.ch> - 3.08.4-1
 - New Version 3.08.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Sep 2005 10:13:14 -0000	1.5
+++ sources	1 Jan 2006 00:07:03 -0000	1.6
@@ -1,4 +1,4 @@
-96b8edeb6190d9f15c086c7decd277a9  ocaml-3.08.4.tar.bz2
-0daee5643db6960682c1a7d84467885f  ocaml-3.08-refman.html.tar.gz
-49b68ec07ccd7ce45eb6bd3f3fdee140  ocaml-3.08-refman.info.tar.gz
-35a5d4318456c0982e72ee3f33364bf5  ocaml-3.08-refman.ps.gz
+834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
+280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
+598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 00:12:35 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 31 Dec 2005 19:12:35 -0500
Subject: rpms/kmymoney2/devel kmymoney2-0.8.1-gcc41.patch, 1.1,
	NONE kmymoney2-0.8.1-qt335.patch, 1.1, NONE
Message-ID: <200601010012.k010CfSV028616@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28605

Removed Files:
	kmymoney2-0.8.1-gcc41.patch kmymoney2-0.8.1-qt335.patch 
Log Message:
drop old patches



--- kmymoney2-0.8.1-gcc41.patch DELETED ---


--- kmymoney2-0.8.1-qt335.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan  1 00:22:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:22:18 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.18,1.19
Message-ID: <200601010023.k010NBGh028690@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28663

Modified Files:
	ocaml.spec 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ocaml.spec	1 Jan 2006 00:05:17 -0000	1.18
+++ ocaml.spec	1 Jan 2006 00:22:18 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.09.0
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -18,7 +18,17 @@
 BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
 BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -31,6 +41,7 @@
 parsing tools (Lex,Yacc,Camlp4), a replay debugger, a documentation generator,
 and a comprehensive library.
 
+
 %package -n labltk
 Group:		Development/Languages
 Summary:	Tk bindings for Objective Caml
@@ -40,6 +51,7 @@
 A library for interfacing Objective Caml with the scripting language
 Tcl/Tk. It include the OCamlBrowser code editor / library browser.
 
+
 %package -n camlp4
 Group:		Development/Languages
 Summary:	Pre-Processor-Pretty-Printer for OCaml
@@ -49,6 +61,7 @@
 Camlp4 is a Pre-Processor-Pretty-Printer for OCaml, parsing a source
 file and printing some result on standard output.
 
+
 %package ocamldoc
 Group:		Development/Languages
 Summary:	Documentation generator for OCaml
@@ -57,6 +70,7 @@
 %description ocamldoc
 Documentation generator for Objective Caml.
 
+
 %package emacs
 Group:		Development/Languages
 Summary:	Emacs mode for Objective Caml
@@ -66,6 +80,7 @@
 %description emacs
 Emacs mode for Objective Caml.
 
+
 %package docs
 Group:		Development/Languages
 Summary:	Documentation for OCaml
@@ -74,6 +89,7 @@
 %description docs
 Documentation for Objective Caml.
 
+
 %prep
 %setup -q -T -b 0
 %setup -q -T -D -a 1
@@ -83,6 +99,7 @@
 
 cp %{SOURCE2} refman.ps.gz
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
@@ -93,6 +110,7 @@
 # %{?_smp_mflags} breaks the build
 (cd emacs; make ocamltags)
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall BINDIR=$RPM_BUILD_ROOT%{_bindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml MANDIR=$RPM_BUILD_ROOT%{_mandir}
@@ -107,9 +125,11 @@
     cd infoman; cp ocaml*.gz $RPM_BUILD_ROOT%{_infodir}
 )
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post
 /sbin/install-info \
     --entry "* ocaml: (ocaml).	 The Objective Caml compiler and programming environment" \
@@ -117,11 +137,13 @@
     %{_infodir}/%{name}.info \
     %{_infodir}/dir 2>/dev/null || :
 
+
 %preun
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -145,6 +167,7 @@
 %exclude %{_libdir}/ocaml/stublibs/dlltkanim.so
 %doc README LICENSE Changes
 
+
 %files -n labltk
 %defattr(-,root,root,-)
 %{_bindir}/labltk
@@ -155,6 +178,7 @@
 %doc otherlibs/labltk/examples_labltk
 %doc otherlibs/labltk/examples_camltk
 
+
 %files -n camlp4
 %defattr(-,root,root,-)
 %{_bindir}/camlp4*
@@ -164,22 +188,26 @@
 %{_mandir}/man1/camlp4*
 %{_mandir}/man1/mkcamlp4*
 
+
 %files ocamldoc
 %defattr(-,root,root,-)
 %{_bindir}/ocamldoc*
 %{_libdir}/ocaml/ocamldoc
 %doc ocamldoc/Changes.txt
 
+
 %files docs
 %defattr(-,root,root,-)
 %doc refman.ps.gz htmlman
 
+
 %files emacs
 %defattr(-,root,root,-)
 %{_datadir}/emacs/site-lisp/*
 %{_bindir}/ocamltags
 %doc emacs/README
 
+
 %changelog
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0



From fedora-extras-commits at redhat.com  Sun Jan  1 00:24:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:24:20 -0500
Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.10,1.11
Message-ID: <200601010024.k010OquQ028754@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gtkglarea2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28736

Modified Files:
	gtkglarea2.spec 
Log Message:



Index: gtkglarea2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gtkglarea2.spec	31 Dec 2005 23:58:15 -0000	1.10
+++ gtkglarea2.spec	1 Jan 2006 00:24:20 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:	OpenGL GTK widget
 Name:		gtkglarea2
 Version:	1.99.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -18,10 +18,9 @@
 Summary:	Development package for gtkglarea2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	xorg-x11-devel
 Requires:	gtk2-devel
-BuildRequires:  mesa-libGL-devel
-BuildRequires:  mesa-libGLU-devel
+Requires:       mesa-libGL-devel
+Requires:       mesa-libGLU-devel
 
 %description
 GtkGLArea is a GTK widget that makes it easy to use OpenGL or Mesa



From fedora-extras-commits at redhat.com  Sun Jan  1 00:43:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 19:43:24 -0500
Subject: rpms/lablgtk/devel lablgtk.spec,1.11,1.12
Message-ID: <200601010043.k010huLH028825@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/lablgtk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28808

Modified Files:
	lablgtk.spec 
Log Message:



Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/devel/lablgtk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lablgtk.spec	31 Dec 2005 23:45:56 -0000	1.11
+++ lablgtk.spec	1 Jan 2006 00:43:24 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           lablgtk
 Version:        2.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
@@ -24,6 +24,7 @@
 BuildRequires:  libgnomecanvas-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:  gtkspell-devel
+BuildRequires:  libXmu-devel
 
 Requires:       ocaml >= 3.08
 Requires:       lablgl >= 1.02



From fedora-extras-commits at redhat.com  Sun Jan  1 01:16:16 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 20:16:16 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.19,1.20
Message-ID: <200601010116.k011Gm1W030657@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30640

Modified Files:
	ocaml.spec 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ocaml.spec	1 Jan 2006 00:22:18 -0000	1.19
+++ ocaml.spec	1 Jan 2006 01:16:16 -0000	1.20
@@ -104,7 +104,8 @@
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
     -bindir %{_bindir} \
     -libdir %{_libdir}/ocaml \
-    -x11lib %{_prefix}/X11R6/%{_lib} \
+    -x11lib %{_libdir} \
+    -x11include %{_includedir} \
     -mandir %{_mandir}/man1
 make world opt opt.opt
 # %{?_smp_mflags} breaks the build



From fedora-extras-commits at redhat.com  Sun Jan  1 01:17:07 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 31 Dec 2005 20:17:07 -0500
Subject: rpms/ocaml/devel ocaml.spec,1.20,1.21
Message-ID: <200601010117.k011HdE1030710@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30693

Modified Files:
	ocaml.spec 
Log Message:



Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ocaml.spec	1 Jan 2006 01:16:16 -0000	1.20
+++ ocaml.spec	1 Jan 2006 01:17:07 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.09.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 



From fedora-extras-commits at redhat.com  Sun Jan  1 10:39:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:39:42 -0500
Subject: rpms/kmymoney2/FC-3 .cvsignore, 1.2, 1.3 kmymoney2.spec, 1.4,
	1.5 sources, 1.2, 1.3 kmymoney2-0.8.1-qt335.patch, 1.1, NONE
Message-ID: <200601011040.k01AeFpY017807@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17775

Modified Files:
	.cvsignore kmymoney2.spec sources 
Removed Files:
	kmymoney2-0.8.1-qt335.patch 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Nov 2005 20:23:11 -0000	1.2
+++ .cvsignore	1 Jan 2006 10:39:42 -0000	1.3
@@ -1 +1 @@
-kmymoney2-0.8.1.tar.bz2
+kmymoney2-0.8.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmymoney2.spec	15 Dec 2005 15:08:28 -0000	1.4
+++ kmymoney2.spec	1 Jan 2006 10:39:42 -0000	1.5
@@ -1,35 +1,38 @@
 
 %if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
+%endif
+
+%if "%{?fedora}" > "4"
+%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel opensp-devel
 %endif
 
 %if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.1
-Release: 4%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-0.8.1.tar.bz2
+Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
-Patch1: kmymoney2-0.8.1-qt335.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: automake
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel >= 6:3.3
+%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_with_ofxbanking:BuildRequires: openjade-devel >= 1.3.2, libofx-devel}
-## TODO
-#define _with_kbanking --with-kbanking
+## FIXME/TODO
 %{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
 
 
@@ -49,8 +52,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .qt335
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -58,7 +59,8 @@
 
 %configure \
   --disable-rpath \
-  --disable-debug --disable-warnings --disable-dependency-tracking --enable-final \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
   %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
   %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
   %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -109,18 +111,18 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 %postun
 /sbin/ldconfig 
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 
@@ -130,8 +132,8 @@
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
-%{_datadir}/icons/locolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*
@@ -152,6 +154,19 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-7
+- gcc41 patch
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-6
+- cleanup ofx deps
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- cleanup %%post
+- fc5 respin for new(er) libofx
+
 * Mon Nov 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
 - relax BR: kdelibs-devel to 3.3 (for aurora/sparc, #173133)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Nov 2005 20:23:11 -0000	1.2
+++ sources	1 Jan 2006 10:39:42 -0000	1.3
@@ -1 +1 @@
-266fd411098cdce53d7db202960f07d5  kmymoney2-0.8.1.tar.bz2
+ffb09eaba4f93cd47e9600a2cb6b02c5  kmymoney2-0.8.2.tar.bz2


--- kmymoney2-0.8.1-qt335.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan  1 10:39:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:39:38 -0500
Subject: rpms/kmymoney2/FC-4 .cvsignore, 1.2, 1.3 kmymoney2.spec, 1.4,
	1.5 sources, 1.2, 1.3 kmymoney2-0.8.1-qt335.patch, 1.1, NONE
Message-ID: <200601011040.k01AeA3a017802@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17759

Modified Files:
	.cvsignore kmymoney2.spec sources 
Removed Files:
	kmymoney2-0.8.1-qt335.patch 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Nov 2005 20:23:11 -0000	1.2
+++ .cvsignore	1 Jan 2006 10:39:37 -0000	1.3
@@ -1 +1 @@
-kmymoney2-0.8.1.tar.bz2
+kmymoney2-0.8.2.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmymoney2.spec	15 Dec 2005 15:08:35 -0000	1.4
+++ kmymoney2.spec	1 Jan 2006 10:39:37 -0000	1.5
@@ -1,35 +1,38 @@
 
 %if "%{?fedora}" > "2"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
+%endif
+
+%if "%{?fedora}" > "4"
+%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel opensp-devel
 %endif
 
 %if "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.1
-Release: 4%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-0.8.1.tar.bz2
+Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# inspired by http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
-Patch1: kmymoney2-0.8.1-qt335.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: automake
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel >= 6:3.3
+%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_with_ofxbanking:BuildRequires: openjade-devel >= 1.3.2, libofx-devel}
-## TODO
-#define _with_kbanking --with-kbanking
+## FIXME/TODO
 %{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
 
 
@@ -49,8 +52,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .qt335
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -58,7 +59,8 @@
 
 %configure \
   --disable-rpath \
-  --disable-debug --disable-warnings --disable-dependency-tracking --enable-final \
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final \
   %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
   %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
   %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -109,18 +111,18 @@
 
 %post
 /sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 %postun
 /sbin/ldconfig 
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 || :
 
 
@@ -130,8 +132,8 @@
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
-%{_datadir}/icons/locolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*
@@ -152,6 +154,19 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-7
+- gcc41 patch
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-6
+- cleanup ofx deps
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- cleanup %%post
+- fc5 respin for new(er) libofx
+
 * Mon Nov 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
 - relax BR: kdelibs-devel to 3.3 (for aurora/sparc, #173133)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Nov 2005 20:23:11 -0000	1.2
+++ sources	1 Jan 2006 10:39:37 -0000	1.3
@@ -1 +1 @@
-266fd411098cdce53d7db202960f07d5  kmymoney2-0.8.1.tar.bz2
+ffb09eaba4f93cd47e9600a2cb6b02c5  kmymoney2-0.8.2.tar.bz2


--- kmymoney2-0.8.1-qt335.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan  1 10:42:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:42:22 -0500
Subject: rpms/sbcl/FC-3 .cvsignore, 1.6, 1.7 sbcl.spec, 1.26, 1.27 sources,
	1.6, 1.7
Message-ID: <200601011042.k01Agsfm017937@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17894

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
- 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Dec 2005 18:59:35 -0000	1.6
+++ .cvsignore	1 Jan 2006 10:42:22 -0000	1.7
@@ -1,6 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-sbcl-0.9.5-source.tar.bz2
-sbcl-0.9.5-x86-linux-binary.tar.bz2
-sbcl-0.9.6-source.tar.bz2
-sbcl-0.9.7-source.tar.bz2
+sbcl-0.9.8-source.tar.bz2
+sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+sbcl-0.9.8-x86-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sbcl.spec	6 Dec 2005 19:03:50 -0000	1.26
+++ sbcl.spec	1 Jan 2006 10:42:22 -0000	1.27
@@ -12,8 +12,8 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.7
-Release: 1%{?dist}.1
+Version: 0.9.8
+Release: 1%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
+- 0.9.8
+
 * Mon Nov 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.7-1
 - 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Dec 2005 18:59:35 -0000	1.6
+++ sources	1 Jan 2006 10:42:22 -0000	1.7
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2
+4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
+294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  1 10:42:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sun,  1 Jan 2006 05:42:49 -0500
Subject: rpms/sbcl/FC-4 .cvsignore, 1.6, 1.7 sbcl.spec, 1.30, 1.31 sources,
	1.6, 1.7
Message-ID: <200601011043.k01AhLvq017942@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17916

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
- 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Dec 2005 15:33:23 -0000	1.6
+++ .cvsignore	1 Jan 2006 10:42:48 -0000	1.7
@@ -1,6 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-sbcl-0.9.5-source.tar.bz2
-sbcl-0.9.5-x86-linux-binary.tar.bz2
-sbcl-0.9.6-source.tar.bz2
-sbcl-0.9.7-source.tar.bz2
+sbcl-0.9.8-source.tar.bz2
+sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+sbcl-0.9.8-x86-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sbcl.spec	5 Dec 2005 15:33:23 -0000	1.30
+++ sbcl.spec	1 Jan 2006 10:42:48 -0000	1.31
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.7
+Version: 0.9.8
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
+- 0.9.8
+
 * Mon Nov 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.7-1
 - 0.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Dec 2005 15:33:23 -0000	1.6
+++ sources	1 Jan 2006 10:42:48 -0000	1.7
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-67ec41e624a3f2ad7f6f3cde1bd001d3  sbcl-0.9.4-x86-64-linux-binary.tar.bz2
-cb01b462b517889723eeaf63b5474c70  sbcl-0.9.5-x86-linux-binary.tar.bz2
-d5e5e4ae500f12b7523989222cb4cc88  sbcl-0.9.7-source.tar.bz2
+4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
+294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
+900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  1 15:24:13 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  1 Jan 2006 10:24:13 -0500
Subject: rpms/baobab/devel baobab.spec,1.7,1.8
Message-ID: <200601011524.k01FOjED027382@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27365

Modified Files:
	baobab.spec 
Log Message:
Rebuild to test ExclusiveArch behaviour in the buildsys


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- baobab.spec	28 Dec 2005 17:12:19 -0000	1.7
+++ baobab.spec	1 Jan 2006 15:24:12 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        2.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -17,6 +17,8 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
+ExclusiveArch: %{ix86}
+
 %description
 Baobab is able to scan either specific directories or the whole filesystem, 
 in order to give the user a graphical tree representation including 
@@ -56,6 +58,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-3
+- Rebuild to test ExclusiveArch behaviour in the buildsys
+
 * Wed Dec 28 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Sun Jan  1 15:29:39 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  1 Jan 2006 10:29:39 -0500
Subject: rpms/baobab/FC-4 .cvsignore, 1.6, 1.7 baobab.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <200601011530.k01FUCot027509@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471/FC-4

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
Update to 2.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Dec 2005 16:56:05 -0000	1.6
+++ .cvsignore	1 Jan 2006 15:29:39 -0000	1.7
@@ -1 +1 @@
-baobab-2.2.2.tar.gz
+baobab-2.3.0.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- baobab.spec	8 Dec 2005 16:56:05 -0000	1.6
+++ baobab.spec	1 Jan 2006 15:29:39 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.2
+Version:        2.3.0
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -57,6 +57,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
+- Update to 2.3.0
+
 * Thu Dec 08 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-1
 - Update to 2.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Dec 2005 16:56:05 -0000	1.6
+++ sources	1 Jan 2006 15:29:39 -0000	1.7
@@ -1 +1 @@
-2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz
+b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 15:29:45 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  1 Jan 2006 10:29:45 -0500
Subject: rpms/baobab/devel .cvsignore, 1.6, 1.7 baobab.spec, 1.8, 1.9 sources,
	1.6, 1.7
Message-ID: <200601011530.k01FUH5u027514@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27471/devel

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
Update to 2.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Dec 2005 16:43:15 -0000	1.6
+++ .cvsignore	1 Jan 2006 15:29:45 -0000	1.7
@@ -1 +1 @@
-baobab-2.2.2.tar.gz
+baobab-2.3.0.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- baobab.spec	1 Jan 2006 15:24:12 -0000	1.8
+++ baobab.spec	1 Jan 2006 15:29:45 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.2.2
-Release:        3%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.2.2.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -17,8 +17,6 @@
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-ExclusiveArch: %{ix86}
-
 %description
 Baobab is able to scan either specific directories or the whole filesystem, 
 in order to give the user a graphical tree representation including 
@@ -58,6 +56,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
+- Update to 2.3.0
+
 * Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.2.2-3
 - Rebuild to test ExclusiveArch behaviour in the buildsys
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Dec 2005 16:43:15 -0000	1.6
+++ sources	1 Jan 2006 15:29:45 -0000	1.7
@@ -1 +1 @@
-2a4911a28c27752e1c92f6505b39cc60  baobab-2.2.2.tar.gz
+b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  1 17:53:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Jan 2006 12:53:18 -0500
Subject: owners owners.list,1.494,1.495
Message-ID: <200601011753.k01HroJD031170@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31137

Modified Files:
	owners.list 
Log Message:
+scponly


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -r1.494 -r1.495
--- owners.list	31 Dec 2005 15:12:32 -0000	1.494
+++ owners.list	1 Jan 2006 17:53:17 -0000	1.495
@@ -1097,6 +1097,7 @@
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|scribus|DeskTop Publishing app in QT|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan  1 18:42:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  1 Jan 2006 13:42:40 -0500
Subject: rpms/lirc/devel .cvsignore, 1.7, 1.8 lirc.spec, 1.11, 1.12 sources, 
	1.7, 1.8
Message-ID: <200601011843.k01IhCg4000435@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv414

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
- 0.8.0pre3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	14 Dec 2005 21:07:23 -0000	1.7
+++ .cvsignore	1 Jan 2006 18:42:40 -0000	1.8
@@ -1 +1 @@
-lirc-0.8.0pre2.tar.bz2
+lirc-0.8.0pre3.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- lirc.spec	27 Dec 2005 20:13:13 -0000	1.11
+++ lirc.spec	1 Jan 2006 18:42:40 -0000	1.12
@@ -10,14 +10,14 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre2.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre3.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
+- 0.8.0pre3.
+
 * Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi>
 - Split kernel modules into separate package.
 - Disable debugging features.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	14 Dec 2005 21:07:23 -0000	1.7
+++ sources	1 Jan 2006 18:42:40 -0000	1.8
@@ -1 +1 @@
-80aaee5c1b5815f115b1e14d49f36cd5  lirc-0.8.0pre2.tar.bz2
+c20cf756b0b5cad96437bc25e81b166a  lirc-0.8.0pre3.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan  2 04:53:24 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  1 Jan 2006 23:53:24 -0500
Subject: rpms/pam_mount import.log,1.13,1.14
Message-ID: <200601020453.k024ruxG018863@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807

Modified Files:
	import.log 
Log Message:
auto-import pam_mount-0.11.0-1 on branch devel from pam_mount-0.11.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	24 Nov 2005 03:48:04 -0000	1.13
+++ import.log	2 Jan 2006 04:53:23 -0000	1.14
@@ -10,3 +10,4 @@
 pam_mount-0_9_25-3:FC-4:pam_mount-0.9.25-3.src.rpm:1118332645
 pam_mount-0_9_25-4:HEAD:pam_mount-0.9.25-4.src.rpm:1118332757
 pam_mount-0_9_25-5:HEAD:pam_mount-0.9.25-5.src.rpm:1132804079
+pam_mount-0_11_0-1:HEAD:pam_mount-0.11.0-1.src.rpm:1136177590



From fedora-extras-commits at redhat.com  Mon Jan  2 04:53:30 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  1 Jan 2006 23:53:30 -0500
Subject: rpms/pam_mount/devel pam_mount-0.11.0.tbz2, NONE, 1.1 .cvsignore,
	1.5, 1.6 pam_mount.spec, 1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200601020454.k024s3iG018869@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18807/devel

Modified Files:
	.cvsignore pam_mount.spec sources 
Added Files:
	pam_mount-0.11.0.tbz2 
Log Message:
auto-import pam_mount-0.11.0-1 on branch devel from pam_mount-0.11.0-1.src.rpm


--- NEW FILE pam_mount-0.11.0.tbz2 ---
BZh91AY&SY??
?s??????????????????
?tPt?????:
9?>}n?X???????????I??g?x?[???{???
V?wZ?E??????PA?m?AU??=;??t?????f??g?Ovo{?z??)??????cZ?Z????s???=Z?mh{?????+????w??;v?????????(/??]??]n??4e?J?mUzaK?{4S?T?}?????>??l6
????w}????9:v?w?{???????k?u
m?B]?kW??z???kM?v???????o?(?k?g??????:?c>????
?????Y????R??d?J?v?????q??}????t?I???}????3??d?r\??9|5??G????Y?{4$?e

?k??m??v4?????]???y?n??x??`?z??jv??????f-???c[mCv?????[?}??;nf.|???p}?l?h=
??=???C??jz??[?w?W?v?????/??m?
 d?!"?b?B%?E;?
?????U???p?T??
?D?6?*???`b??P???
jF??
@??*"h?Gb@(&???PV?+R(?:?*T???A
"0?N
$????#?#D??D??R?R?#?U???CXBD??>?4???h?????
????9?????PDr?&??)?????????t~.????????y! ?D*I???9
??6?p??P???)"???-?s
?? 
?d[E?UJ?
??;3E?@?ZI??????R?RL4	@???q??Q?Ap%b at 0?r?%??hT?E?)?|?	?y? ?Q?_[ ?G??0d8?????h
*??{+?????g????;??k?V]???g??%?)M4	??H@,????tP??6j??????Hv????????T!??????
d?b>.?&>?Y?*?y??/g??????:?????????;pu??????<~??i?a?2????$?:?Bj?66?x????w?)?d?o
x???-C???A9?CO?9????1??Y??????(??g??!P??BF04?uB???eSW?h??y??^?C???????? 8???f?g??*???9aLI??{F??K??6-MS?iE?f??<?(Y?f`?*?P??A?c?i??0?}fB?r????7??#??q???
?!???s?0&fs?"^99??)r?????X?!@<?#????wF|??|??% ??P?Q??????G?*'?,W???#?<???z?d???\&F*i?,E???v?Q5'G?t9???d}?????Q????$?????D?;
G???M`XX?g<??z???m42?????
???b??*??q?0NlO??xp?????V?Q??_dZ`??8????Vq???&q?H???]W???G?Xt??\???d0?? ei2??????????p?p?j??l?`e?AsbNs|??n??n??M&??????????Z?Q???z?hvu?r???I9????}???C?_?I??z?@??D????S8*?Be??h?	?D??>lu?}e$???Z!?\?8<f@???-?????J??,5?(??]???3???<???9?j
pr<?%?`zvk??b???<&????,b=?)vpmT???2{??7?Ug?~7?)?9?Bg&?????M???z?u????F???????$z?s;M?uIR@???T???????q(?XgN?y??$"??.
??e??5??r??5m?/wn???f?8?????f"@?Y??H?Q?t(->?A?<*??`?P??h????io?S4?huH>???8?K?{?u?z`?D?v????o???La????M?????????????????i;f?H;1???eU!$?#6??????=g)????wH(?<x?j????,u?j$??T???!?'????CH?(?4?x?Lnb? ?|?b??
?=Nu???[?6??Q??????W?????,?J'U`?:??TK?#??+??????p??wvgww???L?`"p???V5`!?7?Co??kw??K`??\VG????g3?Q??:?L,?.*(?????N8????????e*???.?C ????}#?f$?/?????@r?C???G?L?:?I??!%??(|G&?>^?R??:???????uF?8_W?t???????{<??w????;{??C|?M???7???x,>z*?/???A7G?^=?[x{&??O7???????dq???W??<;??T?G??Z~l?=?c???????????????G??m?S??,8??W?w?
?9?5?(8Zs?Y?x?????c?}??	?U?????i????????!xRRj?\9??}9?%&~s?%pR??r??N~O????????????:???hC??X???????5?h|?9????g??X??U??\
?Z??(???E?)ow?$?#T{*9X\E????,1?????h??NP???]^????^?q??R^?L??H?J?????????hN?8?,?<??E?Y???g5_???\so????/ d|????;?J?l.?w?UTjWv????v?C?h?????y?VLf??<J1??F?L?U??O{N?Q????z6????l??o?~?Z?MU[?\??)?)?}c??????g???????????E????Q??j??E?MD??b?????r?Y?7??J5?A?3?????????)?j4J?YP???e
J?C???[????y????)??qV???>?B??D?i?JUK#?????Y?S???I?????????{???[Un?
?s?8?o:&??+?Q??l??'??e?*YGo!???C?K?b ??G?DNE?;?{.<?[@c???5?|n/????~>g?U"7?i=???n?S
????6???oD???h??C'?
??d??M(;??$u???M+S??????%_??A?PD;+?7G+aV? t?U<??3???aW?|(????????????dm???A?cO?Iq???y??????~?V3??}(?+??)????????J????|%L?9)????F??vQD
?5??? ?}??????;w????u%??&TSBvL??3????xp|?[+?3????"????M?'?P?jRS
?"?d?F?T???F??4????????0N??fy???nt??1J'5cl?>jY????;zXG?Z??J??v?t?HL????K??`????????k?m8?M4??D????}????]G?&??-0?v??TMo?9?F?LEw+????cY?7?: H?<e*#?&???e$G>c?s????R????k,
K.&vL??]??N???VQ1???J??!?;~??????
?rT???S???#h????c+C}?^??D??'<???)?ZI-?fbQ0W??m?Eh`????????#?<?
?O+E+$?G??^?5$Y????????a???x??>?S?|Y?x?q0?????"??t?????!??&?g??o??q?	????S?0??0?;?a??1???f}???m}???
?i??T33?u~)???1?~5?????>????|~??,??{??KC*?2Z?`"De??Bp?????79'6?LL??!v
{L??>??O????t???i*???????rL?-C?Pfe?J????????(/??2)??%baS???????!?)"r???????/n?^
:?????21I?????bn??i!0?"???=??_%(?&?'??38R?S???A6?NQ????????R????Fa??j??m?^??M?[?
*3?rs??K?@{??Y?????
??Z??v??>:?:8N2N8a??I?????1???P??PgtW
?BbHZ%?????F?????
?v????d??s??X?????N?Z?sw9?CX=?I?!A9??)???#?b?~?V?&5???bb?R?df??+3?E?>??G??9???c?tlq?
?????????xjD?P?	??Q?????#4-?E??x???_2??t
????,v?AW??['&??zVBfG??z7??8o??????8
???NGs
^???
????[meau_???=|Gs?<???[??	6???2\??Kd?S
%?8???O??=?2?\R???/e|1???Fz?Si????&?????*?q,(g???&t??#?Y?B?\???*l?z???y)?7?c?C?i8|?zlW??||e?????q?16?{?v???h?$\z}?????y??T????BeJ?O|T???\?O]??
MF???re??yn?6?rj?JpYBV??'?f]????a5#?ARH???	??
9?Y`j`?Q???]?OrG?????>??'A????????(D8?
??Ne1?8???? ??B?%%0??i??????)?( ?@T???UJ???}-?U?D???
??P'??sg?eLd???Ir??ie?Q???oF?|?lU?C???>???hi-?b
wd?????31?rfg?7?o?2????Tj?!???
??FQ??u??????7>??V?????&????"?{???X???5V[g)?? 9?S?A?
?h2:?C????H'rC$q???8U??[?\???LSPQ1?aXg[X??Pb
J?i)???*?)??mN???9?? ?"/??G?Ps????k?m????2?{?@?Ta?|??l?$H`??IKf?G?0*fQG?w??

8????????K2?GL??s(?n??_?e?Ct???N??t????1#?,?qRB???R??M
(?GhHI???t????	y	O?????T	??????d??,?Q?^[Ya'???[?zm?-a`????c?8???}<xb????z???Cl?TH???a??lL??}?iG??9X?
?8???c?8z:????9}??
O????????t2#oZ#?LLF#'?<?;WOM??X???\??gX]???1?r??(Zd??
l??_35d??9
????qAy??g??pb{z??e@?????^?[???(b??x,?j?Y?NW'?4x?H????F??kU?Qau???j3*iU`?:y?L?Qtp??7)???R??|?+e??uC??~??50??^p??Er+f/U
Y?????aD???pL?L?U?&?~K??U???T?7?A?ZNS?|
L???JpPv?Po??0?P?,5??b
??
g??:W??n"?z
PPR7?K??2	/J^??9?W???i5H????#`3)N?a?gA:3???5?y0m>B???b?q??????2
??7|? ?C'y?=???y?{????&?F??:????D?4???e??S??"/?????%*"???s?
??)??????
?????eUU?YUU?e?]{??????O?4?????s????Y??}?????????\h?S??r[g??F??10G&T??2?aY?L:?r?QkCy????Vf?L#??j?w??5c??? 8?<4?(?[???T?e?T??}?v????;g:Z??B????????t??+??????2G)$?q???K????>R^???	&
??A??]f}.\??G?BNy?{9?#???Z?@???gw
C?0v-zIJ?W@???lz?C#0???c??"f?z??@rb&?n?y?T?/y"wTN?A???7?L/???l=d???W?!?sg?r?V?9??Bl?[??r?jN?1G???i???m????
?2u
?h8^?kI?+??1F?
???b???????????Q~g?phM????vx?<X>H?????`?$g?H
??q?c??
=????Z@????6?i<Q????????c????.???x??Wj????3w??s??x2/?C&???:??BD)
??O]F?1????U??F?!}`?6=v?J?9??s???h?_??@?(M??3?i?????)jZ[%N?{?
M?1m??	?????Cm??;k????????u???V???
?b?J?tT_?L??
#7??Ho?C?h`?NB????	m???'????`???t3??????B??o???6;????Y~G0??u|???!?C??N??R`???|??j???U? 0??>3?@?0pPEQ??f???ae8?"???s?*p?x?+]C???n?@???G?z?~????~?egh??N
?????w??9???;??cp?Q??????????T?????s??e?Z??GS???????P???30i??Oo	
?????8,VOo?FO at AN?P}?_???n??8O????fl???2??Q8?1?????????,?>???|??>?L?	\2
?
?O????<S+?0J??K!?RC/+/F?-??(f???!"??p8????%&???Q?{i>?U
?4fX4?^??'?g??.%h{Kop~? ?????Y??NN!dl???K??z$??a?r?a?c??#)?a??}???]}?
????5???q?Qu??Ma??y??n????'?q?{??#Ls	????????<?t???I6????I2aW???2?#B?R?;?K???"???)??%???S?2T'S!?4?3,?,?????11<?W3?:v???D?????&i?*S?B
???M?R??dr?Bc????|??OU?7?N?(??8?.??	????*?I?C&? ???????Rz%a?j???U?UA??mc??,,?ns??r7d:~&?ZW???I0^?k???J????i??wq?8?C???=?PU0wI?w)A7>??Lh???X???f?A6???Gq?????.????7???W??M????a?B?fW????>?G??d?tf"??U??(0?aA?b\o6??*U??Nw???@???3?pnt"E???:
&x|?~?????uf=?Q?7p?S?
?KD????a????#???&?s??	????????f`?AP??J?<$?
???X)-dxmT?j.lG8?3p?*0??????.??g?????S?}?{,??{??????d?%^7)?.?P????Am?????<.??&???4?{w?:?sO?Q?1??9???4?& 4T???#???2??$?.};?A??$?B??d)?i&?x??\.?q?U?rF??+T,?]??s?v???V???yf,???wM?T?g
K@?4?Y9B.Mzz??&^??#6
nUo??????}E?n!??ci?bX@?5??:Y??Ye?r????-?^????q
;[??X@>|??h?Y;'???kJ?b?GF?n???????.??????v???????4??CE?D?O=???(N?|S??4U?#:??}?M*??X=4?<K??5LtT???+?qh0?d??;????D?G??bv?z??@?E??1?o????	??R??v???M,??????jH1?"j4HB???A?P?,0D at Gd??DDw???p&N?H????????b????`?
???qf?x?+??Y?PUR?`? ?j???A1?b"(?
?J???Hh??!??!?$??$i ????Z???!?`?"????i?!bd%?(hV "H?x????)?eVE???SR1?#?	???{ 2???A???	??)?
)$
i???JR???jS?T?;? ?O?^RQ'2?x?????S
???{?D???
??? {???:@??9IG!F?OV?????????????
?}?G???`?0C?c??;p?pz????{gaQ
?p*	? ??
????,????"2	Px??t???????6?H}}z?)D!?J???
?`?@m?w???
??|?u?a?WR!??U	?Vj?`??????g?H?kJ	"_???K
b R!H? z ????"}??? B		?SBC?h2?~rx#a???Q:5?0? ???hSN`=???^??		
???x?
bD?aG?Q??A>1???????$O???:???2?P)P????Y????$P?P?
J)j??????D	?u??????(_/=????A=l)???fwf
?#9?4????0??O?????????????|5?\#????k?2A?JBBc???L)1??-??e?D?a??j-?$R??)????G_????
l?*li?????E8????"?????\'
?(P?A!n?3?
??8b??B_???4????
q??b?e?q?B????q?~???z????o?? ?????O?????$?,Q?p?pHA??#/??4
???c??H{?bo
?D???2c??n?t,(???????;??vKLH"[I,???*?H?VTVB?sB
?*?*?_???H
?j?9tY
??9?Z?oI	0?j?????_????????4?? S??36N?X??iq?",?xyo???e(???;??XJ_??
g??{
??{8c???O?{P)(
?$!????)+3RT+????keb?h4??af???[uHYE?
?D???????a?D!??!??=?????LT{?x??ND
???b?7x?R?D??????R?C?A???B?6C???0t$O?.??U??~??#??????#*????&?2???G?X?P?P7?9?N????1?@?Xm?
+?My7??P

?????@?Hc?`??Y	?(
?p??%?GG?p???Po????m?

`??
?(
?^?w????3??D?Y?.Gr???10? ??&?D?\??S????8l-	??H|?
1?????|
??;
???!1RQ?l0b
??^???q?
????K?|f?#???.fK??c??n?????????v??	?$?)??r??s??{???x?'????{x<??0/3n?I?Q????L!?q?Xr?M?D? L2@/??C?g???!?P4P5????.????=N<?N=KZ>??eq4?????????	????
d??b?_?.?h*??}?E/??U}Z????Jg|??va??}??V/}?H?$?C?<?"???CtD?xI????r?)LJj???f?[{'?${8???ZG_?=??
#???
??!??????!9????o
%,????3?qt??L2]c?
`??!?t??@y??=>y???wA???T??n?9l??/a at eP???~?y'???????9
?R??u???-??A2#PlM_????w????? ?2???O????X- at bq?PV ?`???
??=???-?A?c???C?c0????&`y??X?	 ?,????}?\?M?PjP???!?Z?`?H4?????#K??

FS?%?2*????$A????Z? O?????0?b???@???????HY?!?tT??H\D?Q??????_~=7?64???*
??1???"]ER\?8D?K???R,??\??OS?#???JOppy3??u?x????Q?8?|ON)???????1DN???????OP?ER\9-;?&jB?[UFC????Z)"`0!v??#?
?
n????6?x??^??$?????w?N??????NCI?Q?v??>?????I??
????4???/??o?B?:????:`SGv?a????M??S2b??2cW??[ "s0"???>?
?D?????)D?d?y?!???%?n?	???
	W??z????T?E???l??H?????N?:?[??t?? 1???H?12?@?:?T)$6po??????4?`?_a?>?P?O????????fc??N???'?2??r??5??vOP?\?Eg????8???o6??R?(P???Y6????Q	?
A?????v5D~???5????'?y??J???E|???+V?J?J?5p???Du.?????b?X???p???Wg?imL9??b?e??QQ?7?M97??o??}?w=}??YF????52(/>?W???????s??V??:?A?
????%f?jQ???+"???
????????O7?w?8|?ND??a??3????R?%??'K??????????q?B?(B??|??6?????{????h?&?{S?Q
?&2???2??yZ?????
?(U?_1?w?K
N[H?[)V?A8#?E#??:?c??J?{w}z?J????s????,?3??)G?'?_a?Z?????j'^Y?????04?N?OYu?a??f??IQ?
w?4\???Fh9-??!??I2?O6?4k
?|???0?Q;zR?l?fu??8?A^{+??+@}MC$???!C??
??hfpY?XN????x?B{W???3?{p?;[????D?B?C<????y?.?G?`???????????????Y???$z???t?8?y!???9`;?{Z???????}bW?
?s??????1??@??A???'4?9H1h???8N"q?
#%cc???:??$??fL?sF

???ny??F"?!#?`7LP8}#??????'yOa??n?q-q???w???????
Q?@?r?>????+?H?? ?X?Y????C>?q??K
CA?????XN????8??>????C^?
?????Y#????R?K?j@??~???/????R!?
0??`!????}???r?DV?z?;?5?A?????O]n%V??6p???S?-?e?Q?`?l??t???E??0/( N????I?F&???????????3D?rzI?A???????K???e???;??M$<?H??????
??p??	B1$??Z?gg^?98?????????H?2J\???&9C?X@&ZE?0?J0=~[?C???8?%p?9S?$5?D?BG??7z??z^~??????2oP????
U???.X?U?~d$2B?S?????f???E/=?'?A???_?9???+?l??]3?M|???]?@???x???????#?@P?g????j??:???@??a????{(?J?????????????~o??YE??R???B6??H????*?F?{G??uUU?g???0X^n???$?3[?}J??q?.?????e???o???bm????s??S??k?????o[?&?I???m;L?I?
??RS!?.?2P??Z?B?0
?P?Y?C??f?b?UA????
\?L?i ?e???p??D?5??????	???D?t??>R?[a??6H?;????4??F????v??r?E???v-??R?z?l?|?]t??
??xM?+!hi5??[.?3?????[$6'??+?eE?b????)?>???g$?H??4???B???????@???????4?(?}I(?@??9??B??b????9?S?0??xf???Bc??
Sq?
????hxs?@w??Qt	?!?????????|???
#b-??B??D???h??@?X??)e??ndRk?Vg?r??+;M?????`M

D?aB@?a:?!??#??h?s??gB?Hb? ?????D?`?9O%f??3?+?
??u?o??
?_I?Qe????????&W?????b?yq4?md}?n?????J?
@8???{?@A???z?u?`?s_??i&/??7?}
????D$m,?4??cM??1	?(I%?A?????d?w,.P???????O??M?V??	??????n?uF0?B@!???w?0=e??=?????"??~?S?y?G?k-)??8vfO?s?8P?xr??r?
O+?}H??M?????I( ?aZ?oW?6?%1?????#L?2^?ew?z?e?bj???=D`ClPY?X0?g??????!????f??9?U??9H?????????2??\f?9:?i??m\g??{????2M???Y?'!??4?(E?a??D?.?)?u;?t???O{??=??+?1?????Aw?<N????????4?X????x_??|"???X???=j???UUUUL??8????1??kx?1?`?3E?e??q??????+???J??????e?z?????M5?ki???>?????????????T?W%??-???X?US??_???N?G?z{???tV? ?? *
?7???4????{jh?P?U~?U???y?wj?r?????yN?????????@?0??
?[+O?r at D?X
Z??o"|C+?>N?s?z?v????
 ??	??LEb ??8?5.xAN??Pr	?VE?`?Vp?r?:;???J??1??:0|$vs??@?	h\p`??K???| ?C??3z??0?R\???????t|?{[?O?'4j	???D????)"?????????/?RC????!S??
@?l?E0????K?"???i?IN???p+QY0??"*??
???Q*9"u???P??Ns??6s?4??:?????`=??(??
Q#H!???upRm????????;H????u??n?h8!B?1???T?i0?+eE?K?????N? ?f?p~o????{?p???:
bl??	????{??H??Ims\??ps?mN?fe?_K?????!z???i??q?]s\?c+<,??4a=?pX?N2:?6???2??d?2??c??y???S?&s???@T10!?r;????p?????f?#^0,i{!???:N@ H??1???8?^?V???`???Qx?{???k?=Yu;Li??
???}k?????-			??7?}3<??2??=?<M?X??Z%??????wNs1QDUSK ?U?k??N?X?x3K??:??#!????
??*???)?En?"?>??????i??i?RQ??\$?+?<G???j?y?<O70N^/_?b??Faj+^_??9???????}c?&????????^. ??j?u?_S
??9?rIy?m7?91???w?.fG?x??6??$?=$??=??????)??d>^/+}??W?????D?'?
???G??{'??`g????;???SV?-C??h?u????????????[?p?????F|??$?????BW?z??H?-??Pqh??u[W??;g?c?$5v???-d^D??f}?{$?????<??6??Tj?e-?5@?X??G????H?88?d??+S-#X????????2???6?R?????>??\[.p7W??????X?!'?cF????????c?R??OE?
?V?@???lC7?_?Oy??3w?!?yXw???ov???O??@??v?|??a??v?!A?a??o
y?z_?????????=?rf?dP6?gMTp????s?]?L?????>G??c?)+??1?2n??
???????Lp??m]
???\g?v?H??`???9V???a???2???+I?b?!??????Z
~?v)3?y???????%Q???
>*???O?{?I??d???'?w?k?_*?#?4????`??d??n'?^Sl?%?!??*??Iz?F#Wi\N?1K??bg??K??5???Uo?y	6Z*QP?9?a??nW??R???7
z?au??gJ?[?%????H/?u?j??w??h?|$y;N?????Ah????1???Q?a??'wO3??R/q??@???d???H?U??@?O*A?????0?B???E?<???Q<??X????9?r}??N??????9?5????W???e????Yk??Uf?Ep
???PPB=???6??$???CL`<??.?(??????X?????%?d@????v?.o?%?)??s?_<????I[?:e????SA?ZF??(??????L",q?!)
??s??%Gyii?L?
????pNN??&4_)????????rE????e?e?d??0??????"??9??X}drc??D??u????Y?.??0?u?{???2??D???4??f
?????<*??vv????	?A????4(????I?????5I??^?3	
?aV?ca???6?Yd?{?;0C?}
v)7???]??
?u??????,F??N?????L??\??z?!?K:d?YQ??l?{9??????gy?s??hC$????$5;m?a\7???h????*?#??????I7?!XH?a?o?:???u?2?CL?%1?&??gBc	?%N7?=[??A#?????r?AN??H?????a??r4
?-?(n??Rg.?j??m4*?(?8???LjO???W8???!?~??Y????$Hv93???56?r?~I?Opb?rc0?Sp?;^.?????Z?	??nP&3:??;?
?I_?????G53V?Giq???X?M?H?n;N7?????6?d<??T?;??????DK&???"??
Ik^????
7????????N?;I?
???& e1^
?????R???@??[`?F???C?j k???JA-?7!????k?r????Z??b???G?D???e??$]??H?!T??|??=7?5????aT?C?/???'xhj?D#7a?_??g?s<YS^?*	??x??i?D??G+Rr?@yuvg?'(?+??i????ES?0U7X}??r2q	?>?+?
???P?JmW?????j?X????Q?>i
?#??h????!??_??@l!C2)???J?>>??t<!?i<?m??"9?*?7??????icE?7?=V~??j???+?p??Pf?t?@F?O?
W?/??1?Fr?????t??l?o??,??A:Wz?K?r???e??F??>?PF??????Gt???f?????e? #i????QO:J0Y??????S???&"A??UV??????T?V%]U?a?[6e?J
hzW???%?>z????&&???4nq?jQ?????X*EP(@J?!:???6??d?????!?;7<?\
%4.?
c?m^LrXG????]?-?^KAxa`?=?r?????PLji]?]r?m?;??[$@?fr??A?wq??2Tg???0??????M???;XH&-??SOoP?z????y???K????Az4??fa??=?
?09)?   ???g???`^@??Xe?????{6?"?????Y??d?c?Q
V@??Q&o
?????A????D??x?9IP~???J`?Vrz?>#? ?T???xQ?q?jy?`?

c?F??Sb????D?<D?!?I?$???7b?

??6??J/?F?5?T????9???T????[??s??LW?????1?????5??{?C2f???B?%{{?<z?/?????stl??P????$W=p????ea1(??s?
?;?0?K~???g????????r9	??d?
:????*=Ox???I??,??? ??p54????4n&???1?p????????`Y<:6wNi?J??????T~1~ ?2m??]
??'-????n????
FU/?w:#?"????>{??~D??V?Z?x??52?u'Pb2+$sFn?E????????/???m1:>?f??V?*??????Y?????u??;CG???O??????0B??=Zee??o?,?uO;?2?8?S??>??I??[?
c#A(3A?Jxq??6P&???????IP>0?t??j?? ?9?,?4??h<09??Dxp(????{??u?V?+?????????5??a^3??L?|?????Bb1eAJu??d??H?T?L9sc?/??/q??=?z??kBD?Ez.q?mT???K?n?E?b????-??q?I?????g
[??? ?=??e?bR?BH.?q?vB	R??Q!0??M?aZ???8{k??J?4k^?S+C??H,???W?{|??????8?e???I??r??7?F?a???? 'hX?? ??iz??L???.??y?}?NK?#
$?????:U
??:???s2/'?5??!?`???c???K??p??$(?$Ca??[??F, ???Q("?-t??????#???-?K?&?E9??O^????t??)???)?y?|E?)??c/??
?	???4?p?"?"?*-6?#???(>?)??_?Z/??q??\???Ev?
??~J?66zmT??3n+??7/??R???
?^6E?~????F??/	?0}????P)?9BJ?????	?????+S,?C?\?A??"???[??0?U?????????F8BCL??,?L/?NZ'j?I?g	 ??W?eB??"??&jO???R/
R?p<????n?q????a9jt+r?G?*Y?g?????u?Ug??Ok??Y?k??P?8?Z5?r?? 3?'=4C)???5]???^??Z???b??G	?S????????=`D???o?{WE?vK??h?$??l?!?M[\?5???M?v+?	5?7??8?n?~??&P???Z?????fl-?'}-F8?&j1??274?Q ?c?@??NU??1S?h
&?2???t3??}!???uz?'????D??~???5,????l??????F?~???v????"?? Lw?;????e-?|af??(2?>??e!H?#????????(???o??osY??	?A?W??%(&/???x???RlG???????i??S??6?P"Mr??1V?@?}?-?Z?4??C at L?;Lvzke??7B?S????
b}?{?????f9?O!?#???????1??p?d?P ???o?,w1??????K?Mhd?'?I?;??)????~?NN??a?m
?Bt????#2-?bmS??Tcv?R?W
???<????????/???,????J?l???P,??a?b?~?8??.)?Hy;??Nz??????????????b!~?????l?x:7?????}?m?0dS??#??????-?r{a@???3??B????
?/??D.V????
?";?aV5?%]?	????w?of?q??9b??k????ph???t????	d???YQJ?/_??????:@????????K??<?K?????/??8??&#???U?4J?,???0Z???????7??<???}d?`???&?????<?\?)??m!?1???>???(??bsM
?
?$z??R?QT&]?5?8`??$??"?Ch??????v?'???L0X?8|Fi????????u?s7??l6??????CX}????8LP?,@?9?E?}???G??Z
?????r??%???|)????0
` 8????????t?HkL?
?C?e??#?f=g??'t???g?pz?q??v?6???t??6)???#???	?F????F?@??`i%F???8z?\|?t'??=OC???_#
?u?W???j?L??
?+?k5???X??J??)?f;4p???????7?_I??y$:??????(?G?Lt???|?k?q??{0?%?1#%??,W????
p??N
???g??a???<?(??D?8`?/'?`?m9!f\?O?0?l??Q?$u??,RAg?=???e?8??K????N?}1??A?}???B??P?8;???^1-???]??)N5????^?Q<???XL?	
/ ?[??d"s?Lq\???1?"
?6X?7l???c?\??????????????C???
???
v:?3????/AK??)?n?????I?}??m?#!Bd?(^??????9??D??M???b??aUD?D/w%\/???U??d^?
?P8?????9?|t?I??<?%)"??m???G?6???????X;J?l?	????k,??????A???}
?D??9??\*s??"\??"?"P?my??????f?:????S?=xO-???3-????????xyt?NB#???R?f_??Unb?f5^.?j??????????h~?Z??4????dL82??	??$?:h:??d???&
>i???q??_Dg?e?L???p?T?S???*???/|r???p?%W??J?p?8B??????????w?Z
??Hu???e???m????B??6??u?????????,i7???%Xq?9??*?L?????s??w??d{J????????Xo
B`??.?a??
????
?	??d%6?B?z
????b??<?8}C??J?H)`;@>E???>b;-??|@??}d0H???o$ hc??????1?4??]?M*1????<iu???Z?]??????j??*1??<p??U?????c6?
Zm?ih?j??#???Dvf?L?9???7<?\??^???60"?WI???bp_s?????????!?????F?{???Q??0r9??*???????n????????w)w9???q?;
R?0?????8iv?r?r6?Cgv???M??????a?A???w?????7.~9R??z?T5?X?:`??L`9r?]???yJJ}CJ?+bTv???-D??{b6d?YH?????"G???po&??sjD???A??R?;r?????%KL?<t????[??;T^-PI
???W??G?T??u8?vL`???/?zB?n?-z????	\????D,?W:?\?]%JvV*L?
|*^?????a?r?89????gu??9'???5f?yP'?e?q??p)_!?2Aa?!???%+??N1?o?k?[>???L?????w;???9??#"?????r???oZ`?f^}???.??|Jt]p??s?
?nA??????/?N???Nd??=O?P??y??:?4#m????E?8?A?LIX?l?F????E?P???!?4>Fy?D??^??aq?CO?n???4?Q?????
0???5??J?)??T???'?i?G??}[??!c?
?"m_??K[
`>??-?^VG0??|???L?N- Kn?/	????~9??tCv????/?S??hjc???(?uB?K?\?8????}?4?Aza???????Hr{VF`w?????q??t(?+4:??9M
?B?{?\b<2vZ??<`?(????c?@:??S?c????Q?????S?g ?2?e??m?DJ!?i??????"??GG????w???7D?
?????AU??T;??'8?S1PO??{x<[d599???tjSMf??s????4??T??n??[5?!?????+???}????LJ??? ?U?3#????=?.??5?????.Dy?d?}%:??-?f?*r?<i;???L??}:?%???W?????N??M]s

8?:???I?T????dx(?????%?????8;?&??D?.???7Ql?Z?,??9!d?WD??vOSo?n?r?9??g-OyY4d?''S??}?W??Tl???p???
?,<?r?F
=?
E???~??\?+????A????9r??&??&??z????P(????J,k(-y???A?????*?c#Zs??u????%??Xp???????b8m???1??Y?~???U????b
e?rI?;?'?-8`?k{u/Y???mT?9L8??[_V??0?.=??1?3?`?0u?x?????M??=?-2???h???????=??x3?7<I
U&
??FG;.?-ml?K?\?'#?v?4d=x????????e?`JXv?p?? ????f-?xv??l??1??s?'P???m????a???????AO??(?????????H????Y??XG<Q~R
?CPD
?p????L?8?f?????`n<????p?O?GC$Y
??(?`?3??>??????????[o?{MS?bZ3?0O(?mG?6????(3+???s?=SF{$?#d?7 *????2Ld?gt?0?M?Q?-??8??\????z?1!?#???x0\?*??????? ????C?u<
?I&k1
&P??R?~`?O?R?J???H?u<@?WR15*??<?\?&U??(8 ??X1??/)y}jy??f???P,J???????)?LY
?18?D#)?z???5???F?!xitV	?k??c?Ft????4 at c!?FbrI???@s ???
L4{]&A??W?????o8JJP!???9CK?$!2av=`????????h*?WV??w?u?N?DN<Zt?QSqd??h??F?J?,?,??u
??5Q,9?????]?$vE?!?;?{??YYn*?d??8$?????VG"?????dNg?<?}??6d?9?%?%z9?jAPz????}?N(?>?)B???E???[??
??-G?J0
]<C??	iV?[???????A%@?A?x?O?	??O????)`?HfA?VUZ?SJ?2?/??9??3?E!?\???c?????????????
?????~??D_U?]??$1!m?w???9G?d?Y`u4=??Q ?(/?~3??{+???Q]f???RT*?/=|?&&&???[???????t?????&|?\???7^??q?&???????'???????V
?????~??u3<.??6???,????????f??????K??i4?fkoF???????s?Z??9?{;s??4???kn?>???[?Kxfk-??????ijz?l7v??????~??;???x?????%?fnZ???-?????L;4???5^7;??W[???v3????/]?wU?;{?:?????y??:]j?z??e????(0?(/??D??<?~??M?19?mi????h%<????u???:c?????
??Z1??~,x??zI?a?Z\5l7?3??7?X??^
??uK?????~?
?-??S???g
%?(?g]???Z??U????nrl>?????????\f_K?&;????^??M??c?l??#?'?HM?	%R?=k#??5???'U?,???>???f???tS?n????[??a?,????YyZ
???LHs??8???S?Qd<z????
???v9?????????
???V?|U?l<xj??ZP?M11=Jb??:??I?q*:WdY??
??a?.?
??<p-+?S4???q?????"(kX<?q_??????????5u?????.?_??????6???????????#?9????WN???T??2?;9v??ZT???????g???1?????z>??D??6?6???q?2q|j???zi?Xt? ?z??2?L:?mQ?ms//H??[I???^??Wx???|]???R??a???1??:??7?#T?#,O dn;?i?8
98?J?$9u?-?GP&N??enm??????[?a%?*??I???*A??'?]EUf?u?|9?~???y???????f?D???[???"???A[?@!?????_
??H?c??h?;??G?~o??o???OI????7nk???i???? ??Rp?~/?,z??1??;??????8?q??*?}???[??l????J????
?A??????`?(g^????&???H???????:??Jm_?I
?p0e0????&U?|?1e?Ei4?g&1???waA?-???b?+ ?		m??(????????G?bS?y?aUgk?????:?Mo%?S/?|??F???2????A??u??7??????X??uP???a	???
??n_??{D??O1?ICf qF
???5I??q????"fT??tI?????i*?R???)?B^'?	?~V??&??d
??<?y??{VI4??L?0f]???0???P?????m:h.Q?t??8,?5?VV?U^2?i??:?4??}?B???W? ????c<?;?N??\?A???zhL?gG?=?(5,?	??J ?Y??+Bm??6?1@#C?????`*ME(???1=^9?????????y= ?5?'?5'+G????hT????????L??V???m??f|????[??yuLc?-?u1???
E1P?-}?0??$?
O?????
h?j"?D?.?`?iFq??	 I?8U?@??b?J7?`??t?4?B?j??ZRE`?6A?xB???
b$6`??tD??
?(?0
?H????%' ?8??a??Hj????I=a??s
A
?JWG?F?cm?)U| ?Y?T??,O?????A8i??i?????^??&	??bi)JR+????j?????{	?SM)k*?m?'<??"???}?<?8>q???T??K at A?	%?o?VB???Pl$?v??
???	?x???B?????a???????JA??????????	Zb??L#Y1???4B'H?pZ????x??#?`T???_?{~?>?|?d?O???c??d/r???dHb!?`C???%w
A?F??a?????xW?5?6?????|F`d?=e???J?)E'D?#???W??C?M10?+??Z?F@??HN(J?!??<MB???6??uo!(?^2?????q?|0Q>?A?T??qZ8??7?3??da ?P???)?1J=
b?6??L?1????. ?????N??Q^???
26%"?4-?t???Zq????x??J??V?![??G8???(fqH?dC2!
??d?UUUUUF?V???b??????*?)?JD?hqL????,??HW????@??w???)?9???D??
??7
 9??c1?!)Oa????:?2??54re"F`?91d?(?#?;??1???P??"W??????0??L?q9?\??(????4?J??K????F
??1C??q1???bXxpf? ?R?s?o???3|1???9??j??;??/??>???????gz`Z?Q?\??Fa[w?\?0???|"x?0??=?g>?s?`??3??C????B&??|#P?P??O???y??#
'?x??S?=????????@`??X???,???`j`~?????t?Q?	7???U?Pp%\	{1??R@ E??R
=W+?m?????~??U?:??`??RJ;<
h<#???Q??Hc?T@}?
??????o?p?????Od?C?
?!??/>
uA?eTHa/??!?Ga'qv!?A???????9?J?['?Mb?~??????????2|&?@P???N/?????H?%??_?0?$@G
??$???cZ?????SQ?AK&?UX?9=???????????
]?Hq?GH??
?E???C???nK???k??iE#?FT{
?
@>?V? ?????=)?
T}!F??yLb!
?????`x????_?@koLI?#_?~~>(BB?????@A??0???H?5V9@6q`XH*???"d????"?:b14???`?9????u?Rj	?.1l???2?
???XP??+YQ?#%h?)Ab??`??"?SV??'??B?&??Q3???YF?^,F??^7?_O?o??
??)??x??G?N?????????^?d?-???????????y??!?????L?{?CA?H??????????%?
?#*L????g}?E???????IE39???t6??S?(l??5KY?????? B?.?a?B?@?o??<MA?$D
????????4G?hQ??]/FZ??A$`kUP8?
~????B??????b????s?q???m-????[m???q?T????;????I$??g???????{>?p?j???????ll???H?Rz$??????????y^?#Qd&Z??[?ad!	?u???U??6?OT0?#?9?8??Am4???wg??[$2*!?Cb
?@??[ac?) P??'?????6????A??I??H;#G?E?}-???`4@?@??D{????(
???
??8=?????N?	??%PB?`X%?,
B?]>?
???HI?%y
?%`?a?i?=0???$?#???d?;
!n?????@l7B?6?u?????e?????lw>	??g?0?2)78?r?????'?;?k???d???|?J?d??????hTp???:??
`?z????b?%	*??_G?9$'??J????G}??a???@q??k??w*?0?! p?q:ed V`?`fC????]?W?
??	-??>??V?????W)??0p?'4???????(P??@??a8???`??6????ya?e???L?b2u8t?l???_9????K
???n=????32??O??????L?Y??A
???lZW?k?J?%D?UQ?v?????9???????4??je????p????T1?w?????X}??G?????d?????:??`s&
~???(?Y?K???G?a??????
??X???????:zR??"f

L42?bC??e?,;=?4:????;J??p???????`???)?I?ON?#?(`?}?
@X??Q,?h??!b}?~e?RRS"1 at V??w??^s??wW
???>???	$H?C?G??y?<	???fG?BFb\6?S?????Z}??*??	>???????????Q???G???????c???A	?J??'0?u?A?LC?O??<4(H?B?D??)??
??;e????d?	'P???t???;.?????5?
J??"?i??3300_\?x??O???Z
?{^}??X??F D??*?????S?
&?????
??0???33x???8?????Z.????<???T?rK5<P/?R?~|n?U?'4?g??o??0?????1S.?p/?D?>??????j??qm(?g??*?G?????_??????~????????(4???p????J?????u?3?cA??cY???dv???\!??~H<??d:DM`??G??|`??&??P?"??{?'????+3?>?6?????i?0??6L????T???U<3??????B'?~?5?Z!????#,?g?=^??fc?d??&J?<?????0??????????l+????n?zp|???%WV??@?EN?}(#?S?Q?<?E????@
9f?^?PL%?f3?]u?lGi?,???y?}?9?!?g?
??7???????6?&8:2???C?}???eI?p???-8FGB?????"!"?W?????>????7????D????|????i????u?(??bn'>?Gy??
>Yy?y?$Yv?????D?E^?G???HLzY#????j??aB???k ??h??Wz?Gl?s?`?(???C+qvb???G?-??r/?]?????F????d{Dmd%??I???E??C?{???clA?|????8?y}?+???%?rp?8?H1??D??~B?U
--V/??hQ?Z?>@???2???E)?:????C*?J???Q?/?F51?b????? 6???d??R???
??&+C6??/??????o?
??{d??1l?]?ShT??-????@?Y?5????)-?38?	???`?pp???;Of??B@`1??y???t???B???? ???]A?T?o??O??Ie
?z=8???bxy??yU`?h?
????g??V??q????%???@"?i?48??
q?8????F_????	??????p???NzEgVIZ+N`"?J???@?u9??*?;dXZ?D/>
9?E"`:z????????~?&GS
????x?
z?ZW???c?@?7??????oOhy?h?A/?4^?oG?|???d?W????^3~hC?q?????M??z????????*??}g+_&?Y>?~???mGo?[	Qd
??i???R?<pA?	9???nCh?/H?F????ab?&???s!?????? ?r2d??????????? ?|D?A
???^M?9(\????????	?	N????K??9???R????|bB([s??:a?)??(???cLL??a???HG?D|?<????q?3
??#?????????/?7???d4<?#??q???0%?8?l?)MR|?,???~?(2w???L???3???hX?1O???$)TK???? ?H?C?d????
w????E??dA?q?????*?L????d??GM)???%P8?~???????????q???0??_?;d8??????d|?6g?a?6?????ba?hl??n
??,~GB3SJ???N??P??????\?l?@?????^.w???l??.o?.?B?S6?+??o???????<?nX?3?wKsH ????5?F?Nc???E?;??U??q?????????????Q??A?H?EL!H????CH????kN>b7?[f?uCtC'?,?(u{K?
???~??????srhg(^??K???f9??
h8???d?dww??h%?
Z
?,?]???&?#????${??\????
????}cvz\???????d?=?>?Q??????????Dq??????????(9??
A?W??dO2?iH?`W??m??,?J30?n??A?*5??????]???}t2XP?o???HBY?~9? r?H????M???T?I??&G|????k?:?Q??????`1.<j?PBI?Ud?1??????_?z|>??*??~?I?[??$?<V]???{??L?
?;E?????????6???GS?F???zK.?????=???fj?kf?N?m?W??y?`o???8??`??/???3?-??d3!?|??l???)?)??'??_L??3L?rGq?$??tR?g?????n???_?_?3D?
E? ?!(??p(?p?b??jm?%??s???	??"2)+,? ?a?wbI???N??????$?H???"}w{??M????]????L?4HA??P?34????I?+0????z?Vj??~`?Om
?d??SGp?9?;??1P~?}
4???@??Q????u???o?z?u????(?s??P???BP???z?=nC?v??mGA?Cc????^x``????c}lm?????
??!???>+?X?Y?????N????????g???I?ZZ? ??b??N?w??y?0)?tJ??:;?d1???9>.?%???uQ?nA???zkQ&z=&)i}??x??>?Mm?x?&|?g??f?H???y?5F???N?}c??9??x ????K???9u?f?t??`???&c?v????i?????W??
?6??-?4/?1?b????ED??F??W8??q'???$S?+?C:?? ????
??~l??{??:7Pgt??? B?:??m#?yC?f?J?j?n??6??&??6=?k??xR??s???k{@?? ?EIV?<?UZ?Eu???????EV2l?u}?V???o??7??D??4Lf{?M???<? p?q?????1???9??X???
?$??P(>?>?D??7?~`6???;?+?p??hL???p
???#??ZF?>???N???}Jr??iP ?0????A?0??~-6 at S??fL7C??tv??????|_C?O?????????yp?????`??>.D}_???,!? qOc??????Y
?_/????Z?;~4???}@???i???/???EV?????=	?yf|\z^b??b??p?"
L??????W<u?u?4???D??o??id?~?i?}???!???i?V???l?Seg?Eq????Da??I
?J?%URxX??s6\+????}
??3???????h????d??pWq??????L`???,&????"I?
?L??O?	?e)C???i
?????M??b?CxB?
?????52??n??????y at 4???K???>>??
??Qo;????? ?&8
?!??+K??E?
?
?
????????!B$a??
?????~??f??<L?
?qg?Ps??F??
f'4??????:???~u??&=u????????L=???Ff?????ADen?P"?r'?G?
??d?
?5????????*???A???9/??C??????
?i%?wD?ZmhS?SH?3$0???M?m?6q?2p??B
??Z????W??.????/??h?d!??J?94?Bq? 6p??Q???3}e6]P?_S?????[!??o???{????5 bX?e2?~%?D??mLT?
!?-Z
??A@?v?j?CC#?]W??dHV??w????ms?2V034?oA????N??1?t9?F????(w???k???r($M??=??S??i?2L??x????S?}?U|??_??|?E????_?A?0????8TcE?????]i????
ptaG%???"??u??????v??????***??3?ubz???wT}???'@?????#;|#t????
?%????M?p?@?????A
???????P?JVq?`???G??????n??R&c?:?_V:????f??mI??+?ZTQ?zX???V|wH???H??
I'???spa??i??\
?1%W??;?????????????u???g?A?D
,*
DO?/?=I?<??????Mi??_???r?X?o??\??????????
r?
??0j???????A0b??i?u<f??EI?(xOS?[U????T?:????
*???T\`?."??i?&kq??=QR":A??kv?????R????QI 3?????????<)?/???????N?????-??I?/N'q?Re_?~???????Y???n???^???>)?????}? ?sC?R???f?8??z6?B!?LW?vK?{1????C=o\Lg.??3g?C?i{???H?$@?`oO<?Z
.???)Q???l??5???1???
?????Y?2c??f??3?????o?}??O>kU?5?&??{??X???L?P'r????	???P??~E??MZ???%Yy,EX??????????L?iF?J?EW_X?eX
?s??W??V?FL?4??N*)???v1?kI@????S)???$x????[I????(!X??
?????plm+$A?(???"??q??`??_p?6???e2`?P ?I
??~?	$??g\?m\??Q#??Tf.TA?}+	m?????????Ig?fj=?t?k????
[q?]?;?{'$@y??F???1($Eu4??@.??W7)?%?$?N6?<um???S;?6(?!R?	??9A3NO?GB+?L??V
?8?_???1?????x????n????n1pz&L???ji%?[?:??sN??e???\??????JJ?:???vnS??v?19??{?.H?4?}?wrBo?k?2?1???P???????w??{u??af?i
eS+??"I1???y?\?????????]s?D70L?
?MU?dBtL{4????2?4??? ?????N??mV??4i?`M+??%B???)???6?O??????????*???l]???!~j??*?q??<??M?]1??&,?,?w????1??Xb??????]???Y??>,q?a"v???:??2???<??i{x8w|????????e??
$???????eg??9?m???WQi?????geg???B???|??f??^::?T?d?V?F?n????}5?????O?[
d????Ia=9??Qm^?m?\??Wg???`??????d????M????Jl?`??x???
?%"??5}?~?l[??????????~??7K??4w5P?%??#?+???
?MQ??=??w?N?f:@?8??w?rM>31
??>?=?{??4??'|??@????8,??b??F?T?rd?94
?? BS??@JJ???)??T?t??;??
!"|R
?C0H?!??A?=B
%D??%4JL?.???
C?{~
r???????[1?0???#??R
#?o#{???a?s? Xj?'?`?},
????
??~???z?c??Lc??????m?\6????q??[@Gg?$Cs.???VD?R?0?KY??????Dtq?E1???L"???U@??????-???0?>a? ?^?????oY ??p/???????????A?k6H?7??????O?>??y??!?R~??QDv???'4^b
gQAJ?/?4@?
??????g^???Ru????x??????N?z?q?$??[?????r!?UDK????""??h"??;?>?(???
?s,>B???????3????????f?KaqG?_??Cm??????9f??h??nG??	??.????0?p ???&??A? _??z^?Nd?,????b?l42??C??o +????)?P?????&Ca_G?Pu??????=?w1]????w?^X??[
?"?@;m?????<?????H???e6????=K?"0?2dA????g????]?O???????=ME???J? 0???????uT$P<
iRC?????????L???1M1D@2??Qw?? ?+?$z?????
?^:?Bf?u??KA?q???!i??]??(gm???y?S??f??T?h?-]wU???i??
c?????@????2?C? ??9>pt??$?-&??Zeyl???(A?b?Xyo AG)??g???!?w<?g??z??Tp??~x?}????)?
????0ON?`???rj@???o@??7n03hE)???????r??<?&??{???x???"?_c??@?W?a??B
~"?h@5??0??33J?h?\?d?W??]s?P!?V?
T?%??JA??O???;????A??p?{??)???A ??0??x?p&$w?=??|??9a????s~????!9b5"'?4w>	k???R?~	??s	1?V?d?
??T?X???o??U0y?FD??1?c???R??7J|????????c??Jf??pY?N?
?XRI???f?z[??	[?3E?k??B??_O/????^?*@??@?^????F??T?oBe?N
?H?)?09a"=?y0?&?N?J?Jp:???(?P???^9????ru[???xn_\?=??=H|????kv?W?}???z#?????E?
?p+j
??A:w<?`F?^AC EhN?F?
???U?R?
???	]????	???????3	o0?8a?[EB==_?~???[?E???HfV??l[??o?FM?/;G??VC???
?<??~????????a?P???^qww?'?????9??D ??????rr:??F,????y????8d5??$?`FD???f5????Sp~?(4???TD =?4h,!p??N??u??????r?V?}7?=?H???D??"??A???G
?????
&????8????W?T?v??[?3?!??v??>&?~???ms???q????]k?,???2%????.???c??]|_??8L????????)?(+???k?Y???
?`?d?%&?l?3???a/%?6 ???C?uA?y???+??A}?&?}???{?f??]?m???fuV7B?>)(W????(?'`??:9S??@?3-????????o>a??A??????L??k??Y?q?(???3`? ??5???r?-lv??s?`?6L???M
???{Hn???:_`?n%?%K?????s????@r?r?t1?????L2(*:????t0.f?a??3
?????olRr?A?$i*?
???,R??$JB??*??????c[???
nK???2L??	??
B??'????????/\?f%?(!	?Ga?L?Mdx2sg_?3
,(?^vRb???.??g
?>??2?<9g_[?!???p/"?????v?y?&?^'????pF?v??l.F???B???POld\? ???=????1???G??.??f??~?????v??????a?~???%???G??X??Z
???t?T
.?|F?eSK????? ?4?{?????q??x????o8??9??????]^?%?b?Ks????Y5???&
	?3??4fv?????????f?q?'b.If??`???????Q
?0??J??I??N????/?????+??`??'?Oe?A??xAl?H???}?t?????h???e?'????k?2o?5?%?q|?9`63????u?q-\?~W??$
??!?	A
??????w+u
bu?.'????53n?"H??Z?????r>?????j?j??B at h\\m??$$)?????0?.T???w?Q?|??g?????=Bn??t??????_???=??+??w{?-UUUUEUR?EQ?2???
q<?!???D???)I?%.??;???bI?????'?r???tv??g??g???s3??qE?n(??bN:b????/??$??<??.??4??O???W???}???????cf??4???????? ????'????D? (K??
??G?A???
s7????4F>C???ro%B?%???$?????Jf{fp?g+_ec??w]??\K??k?????s?????? ,?x?;w???n?MT??5?o??"J???O
??7?.?x~P??rx@???>@
????'?d??????$*`??r??2?`??2*?????.cb?Bh??C???????_???P.??i
?Da???
?X?/Ie??U?&?a??7
|JJ???B???g]?2v-?+e??1?%?76?V@???y??n??46IG<??_D??0?@?T?Z?"??Ev?o?P?????1?1??e`?????x???X?"??g???ex??`?#]1?caS???
P~?(@??2???mf????4d?hC$???b??q????J???1 0?G?b\??Y0DS}"?[??
''@?,dd=?&n?BUX&	?	FH????D?Q
??	?
?
9U"	T ???oB?S????!??
u?U????Rc
?A?????w???9??bz????????333gm??W?q?.??f?k??????????x
A??
Dmp ?
I
Vf?9??|??v??p?r???<
?	NU????9?'???,????w?
x?/???@R5Aj5?R?a?/??#&??"S???r??????pj??6*?z???vkZt?y)???J?!?V?+?J?F7?????Y??%8??9x???????:N??l????s,??2????????????lA.i[7?????<
l????z???6?+54???Z??A
He?d?XEGJ? ????????????????9?	-?U?P?MsTf?2[*TT?
y"'	
?_??)#p^vC??J2??
???????hq????K??Z`??HT #??I????CmA??QwwmOUY??
fE?2??????h??F?i
R87H???????1?
1???'??????
p??A??n???9????S?Nf???
/?j???Y?Z-??
???7??k-?UUJ?*M?????g??_	?q??;~[?Oo??W3w????07?????s?1?l???7?????h?D@?gs2s??~3??S&b&9?U??9&fq??|?mo?????DP?h??;???o????}W????G???<w?<?|?????????e?Fd?????$?&
a?????}yA?[???>1UX
?>?6rR??]f??IAW?i
??mQ????????O????)g?L0??L?:S????Z??y??%t?$??
X,&18?y)?Ts??#?G?!??D??q???6?=>\R(??
?w??GB>???,?J????l??P??{X??=b|??????"??>G2"??I=K??I,83??=:n???????????7n?m????????}DY?a?????y???gsq?)?8???V??????????????r?p?UR?me??????????*t???nS???
?g?0p[s??9omG?G?
???Q??Fc,??g
*?-ua??81???3G33VWe??-???8?s??s???y??X??N#?n?@??	?-?"`??8J????
t(?????
?%?m
???Pb?N??X-Z18'??:??Q?V???f?;???d1x????M7?wD7??j????2?&?K?lw????V?????'?a?;?<?&????a?"?NuP?c????gt7/??T?[??w?[?G??6%?Q?pf??_:??=.?;???u?W??m??>?}KF?p? sj????	???ff?O=?Y?j)*+-a???5U????]???I?60?c???(e?A??s?D????
??p0??HBI!?N+?$A>?]?rM??h`?? ???@????
r}?:??@??????$
XCEA??Y?2????{9??$M?M??C?'????I??XBaj
c??????i???F
?D?x???"???b??,???z<?1??'??F????}????????G?2HA?w+?iV???s???????l?>?od7W/??!!?!|&/??w%Z???w?????Ab????????????-??????_*Z????|??l??c??
?c? }CR}e?y
K?RV^0}??}?$T0l?`?#`???d?Y??J?E@r?*a??? d???|O?`?????a?d#???|?Q?>E???V?=!6h?3?/?_
0?`H?a(?g??	??????f?>"zQ?T%0??
??@?Z?F?
H?W
g?0Jvp???A?/??_??
?????0(d<@??}e???O?
??????`T
?+N?qEw???@X{????
("??yt
'???????E?r??j?(???.2BB`"H????????N??fXfX? ?*?a??h??1j??&?S??V?s?W??8?<$$8?TLDc?A0Ff4???a???K,?,??-?%?%??--?%?F??@????u??75?
?G?GX-q?????{??Se?#?l?+6S?A??eQQF3?#X?ac???3#?"??jIb*??????`?PK&
{??A??z?/a?'???h????W?fQrB???B?0??
@?~????????A?%6@?d	4??u}?c??g?[?v?(x?{'0????3&,wm?{
+&G???v8-=K/??M$m?Kkcc????!?Rd???;{Ni??\xlZwV?9
?????:??mq'=MX??yxryF???f?E??Y??I'??#P;?????o)??'??b?? p??Y??'?E8
?en4
?
?S?q;?'???z??Dw??????#?)?:j??????*'x???P(?/?#?
??*[HD?u?9?
=O??P~????
[??F?6=&?+?????g0?m?M?bQ?O?(?d???l???%???????H_???
R?y???1L?!??,*4?!?
???hRyd????`?iZ???l4h?????%?HH%(???=vy????M????=?^?wC?
?m	$?
?iJN?5U?0?/-\[??85(r3
????l:?X?e?vE@";HBf&Ji??y8????{??]?C?A???_?S??A????P?????K?vv?)???9D??9 ???$???????0'?0
?a?$???l??B:?9	?`
_P??B??Z|?;? ?0????w?(?????"B?????>?v??E?p???%L?P)?|yJ???R?th ?e?!e:?S?d??????s???hc!(
(?N?%?\?w1?@???a?	W??vYUI?nK?F?n?*??g?r?M?bY@??PAc??A????B?B$X????}??>?*???a|?&?y?4(,~h?]?_"?!H
E?K???s?
Y1k 
ETG????/?4?>??yH0??N?kS??I??eD?4????3??y??????>W?[?`?x!9K$H??6?hY?e???Xy??"??n.?B"?H?&m?4 H?
D{??x???
??4M6^Ms?3?(?x?K?21?hk:?.??????i?*!!???+?T?XRdm??F8?????????h???l4f?"#K0`.D??"?ra??6z?C??d??~????E??U7??r?b????a?????rm???2o?0BT
{?y???"2?????E????????1f}?Yy???
?~?f??q??
????;?????c!?DR??<??I?/?B
?1????z$?
?x)??9R???@?K
??
A
7?o?????X?
yE??W~E&GN??U?FSe????Zu??j?????????
*u
KH?
??~????2?????l-?r
A[??i??s
2????;3???5S?)}G!?( >?.???
???Fx??<?p2?q=???	?n????>??_p0????ks331??0_???}??_??J5?)?}m???l;??D?F,??(bI$?I$?NPho:??????1'4??B?43D?	q???$@??M? O??{??3of???c
??cM??????!o.???V<?????2?????z??D	?6j?????????}??UT]???vD0X?G?????y
YR_Q?	?PRP?? D~???e???
?c???F???#????????????
??v????S?\!?????3?v?L??em??4??jjW@L?B3h?78??u?????s?ew???a??????uY"?????"?	2I1&V?@???>OC??;?9??4$!#M at IE	R0$?)M?????@??X?
???T?@
????]l&?%#`~?!?b???E?%???O??e9??O?J'"?d
=?|??$????q???^T??"a
5!??`?*?0&K?j?$???F???????]??jB~??ab`40/?6?<0>?	?y!???2??9??;???y:e#?(W at O??JWR%??i
??????m?+??%!H?!
$"?????%y????L??]?G???Ch`?6?&?Ha???q?L???$?D	O??K????G`*??$x?o`R`??+?
U??Z'?vB??7??>?, l?X?Q>?v?]?!????8????*??L?4???4?B#D???
??r#??x?8??!????Pc?1`??(??0??N?Y ?C?*?1?X??)??????	j;T??(?
4J`F(D??XD???@{?x?q?(@?
C?~f4??JZw
X`9
X,)Q?6??)0????p
??K?G?pM?B?Hf?Pj&????????F????f{?z\?=?r9??3?eG$X`??#E??????ts????t?2Y0??^??4??)??@9<??}C?????0=??g8p?9?"e???Kj?&?????+t9 f?dA
???=???D??y?<?'?3@?5??,K??{~&W??????b?b???ttHy??9??P7???w?/u???rx{G???u??jby7:Z??!:?y]?
m- 4???sPOL?W???D-0/oN<??????n?{??.?!]
??$P??????:`y?\*{$??%?!??a?M???I?5?#3??????2O??N????`c?????f??!G????0J$?J?B?????????O%??{&?1?"?? ??o?$?{J?!0?!I
??*??B~,???XA?]?_??[? ?k?
??????!????p?w????-????B?}??o~?e?(??????
?B>p4?k??"kH?????)Tz?l?cpqXQ?'L
Y?
<:?
?`z?v?2
??	w?8?M
??jB?V??????H0?<?&???(??Lt
?#`?!\)#'???????x??e?,X??????H}??=?>?p?O??$?? c4{]????0?z{]
fQQ%Sl.?F??????S?o^(!?;????~??]??q????;?
MF"0??0o?D@g?%A??NdP?+Pt8?3p?|	?%?
.????xtP??j !??>?Z??????@?t6??;???;A?P:#+???q!IQ???
???"?)IL?? 	??"?#T???R??t1?9'F3he?)??<????? ?/2%j?Z??$??`??!?????F????$j@??aXah??9??:?j?J/K

??d8?!?QJe1,?,M2??F??1?Kp??l<??w+??n????J??<????E??????a?|#?B??????s?????z?4	pH8B???@V?E?HL?Q?DB	]?kLzD??60d??CB???,9>?z?=B??q???Bh!??m????@? q<?g?&????;?W,(?!?&??9
?????9>?6*??f??!?
Z;S]?r????????O???W??|???,}mhs)^?????[?H>e ???AY*?1?}??/???yw??j`????)?,?}?[6J_A2???nc at OZ???(P5?7??????#?d?R+I?S???
?????? tG?#pvr?i	*????	??9??x????^?}??+d?
?A????R???? }???!??e??@?IH?#????I?
f??3$tj=????Vb1H?t*?? ? ?????N	tD?
9?M??j>???
??O?
?P/?>?z??<??c??)
?zg?"?Z?????"9<{?[???\??>b???f-????Dt8????
???"
?????<N?????Q?h=
?3????jp???nb?5$p????0?M	??????x?????d?]}????6?q?????{b??md?8~???
q?-?\??TuL?,?zA?qG3Dz??????]_?c)tV??E?1?????*,?&H?|???F?>?)?G???	??r?'$L1b?i???rr????T?%???$?????-'\???????Vj
??????s??y?),?]?y?3d?s
!?F??EYbxD??AT?
?g%v???G8R??S???`P`7~C?????-JW?????!???e??????Fx?ao?jZ?^46.J
(?L}3???I$???G_G?$\%B??U?d?@?(1*?????G?.?{<"D???$__
kK?X:]?????1>??;dus?9'`A2dK3??L!BC??[??J??>D?????)agW[???`%V?;J?
?~ p??6?I?
y9?^n??Pp??A???3?"?????h?c0?b???q???in2kR??Y??2???[?c?I
?O?
{?Q=
G?4?d
?????X?	?Y??L??h??/???A????0??+??9I????H??$?s$??Ah????>K?????|@??w?r?F?@tp??)p??'!???#?????a?^~????O?0 ?}`???d8vhy?.* v?????:RT?oi?????`d?<(D??s@????
Vv>A?08?9?ZF?*?d`C??+M??6??M`Sq?XpQ????x??;?i?????.???P
!dZ???BTF?(Z?+S?X?d??????
????P|P??c?(??<?w??!?:?il???hL??W?a??
??l 

O_h??8z at h????8?q?0o???$???^???0Y??|???McuB8,?5?y????0???C?H??\?C6?
??O)?E????k??g????*?o?.@?i??ry???wtz???U????".9??.???}~kV?<?g????a???N??'??????>7?????????_EG??w7??SV?????nl?????????i?x?y????;_?~M?c????N??+?f?#??e???rD??eo9U?3+J??B?3%F-p?
?|'???|???|???	]%??S??????4??1?????m0?3???t?????_s?h????{????????z?????DU??u?oj??q???rB$???;?X?3Iz???^??=Q??s??=??????#jEh?.-???FR???J.?l????ELWyt?N??o??????1Tf??O?3h$?????????????X????\#<?;?m=??7?????I?*??v???U?M??)Wg}?)?=|D?z??????????o/????'?P?42????T??F???y?6?=V?[[
????o?v?l??2?????}??fh{^5a?????3Y?u?"??Q???????9?/??^hb?P?=??;)2??????????+?gy?E?
i6?4?n~~r?5???g6???????Ad?t?>??L?u?dm??M??_y??I???l??2'[7????C7/5)}*?|?XfcTw?????C
B???f
B?9?|????eW?ET?U%UUUQBSPADDAW5_?"??-p7A?t~CY??&?4\??`t?!F0Q?G?`??0??;?~??@8T??Of??9f?BZ<T>???????v`??h???
??;l ;?o*??
j4?8??B4B???	??u???????85??}?2z?????!=jH? P?<
??D>+???????%?-?'d????0? ?%J?k,?`h?@y ?j8??B!*hG0C??`? C??8??d????Kd???QT7
DP?z?????
?N???0
??;`???N?(?x??
?6??)?xB
Z??,%??4#J?iY*????*RaV?????
D????X?
B?)?h(N?68?????G???y??????
AB1??C?
???"????Q??r?
?????+???zu6H???? *u
????/?C?<}?OA:??^q???Qp0?FMWaE^???D?^b??"??
???????[?(?B1???=???/{?\?????y?qGE?"
?tU?6??I????9w?DK
0;????	@?[V?G?
?aH'BH?AX	.B????
???:F??<??}?=?1???""<??2HI!LD0'C???<?B"b!?
?8pA?s???D??D?W1?????b.*?&??=?;??|??983?A`??????HC |?v?`???HR(`eQ'v? ?'A?q?"i?{H,)3?H?;?c ?
????a8??????5LDh??T?????O?A	???,?)#E?DQE'??D?????????Gh?:??{n??%?????
???1?
????`!?1]???<H=(Z5c?M?q?r??????j??????(????9?z?}?????0?Y??!?:?QdL???a?0;?!O8?MG???
???????\&?Vbn????e4=??????K??mp?kA??v1K&e0?YF??????RmTn??t_???f
?u??<???9?E2?ho???`?J+X?AS?Z>E?A??
,'G?8;??x?:??{yn???:?Zk??o?'=
??*???p??!?y????Y?cV??
	??8?!?#kL?!3?_???y?C?,jlv?#Z?1a$????????6??\?:?Zur
??????(??J ?(?:?'???(?E$?<??S?9??R?(HB50?D
?i4}?????m")??????????7??z???9?K?Q1?\???!?2
=? /?Z?}?3b`H?$E=4!H???????mBI
??j?;??$"?"??H?@ B?}0?r????h?pA
{??"????W8`???9x??G?
??.??,???S&?{y?t?x??C???"~?F???AWa6??gW?????:?}???%?L??Hv??i????? %a??Jj^p|?kBC????tB$Gx?
	??e??	=jb(R???2
h?O"T?u2G?GE>P????G?;???S???Ca?????hb"???>?	4?b????W?
H?[???????n1?
?/?5?r??5Tx?`??^?3+	?)???)?U
?a???cD4??,??7*-}??:1?g?????sgQ)??
???&d1?-2????q?ZQy??d?
7?\p?j7Y
\?X???[??F?"?????"A?|?Zi??A???L!????N8??9????
/????:??1?3?r???l?????lgP??&?&#?riC?(???????X??
 ?"j$i?"????M??O???{?p4?'??E?P?
???	??$??1%2?,???xQ]t?3?CTUUQ<|?H????\|k??3 f0?|,????!	?1?!?d?:C?X??s?h???V9?	?s5?????????L.V?,???#1@???v?????|?{???a77???: ??Q?h??J?3??#?6?x?i??
??#?#??H?3{??????&??\??????BD?(x??0$??3R??z?^??|6 
~I?d???@@AJ)D???bj??$Q.??????V?1?D7?%O?DQ2(+???8??,N????C???r	?? ?h??t?j}?V*l?V?0?d??N?};;?n???a#D?*
$A(??C>z??Y??o??o????C??ZOJR?u??h?}?p(??????@N?
?Y y?eW?E??????D?JM??|??V
?i??u!?4:u}?aa???Q?DJ?t?ML????X?*?A???w??rVF1?I?m?@???P???$G????5<K?t?????P??=x-?TH=???h?G ???<O?>&?n??-iNF???M?h~?
?"??+ n:e?J??????1???T!??>?8???c????F?.-}?Q?\?????????L??^??
??	L???>??"0 z}????0(??$9?<
x |??")?C??%???????Jb???B?@zo???d b$?)?_????k_%T0RP!H?:?h?D?????05?(??e?U,???a??m?:??}?@?!???
???SO5??@??3?-,sa?? "??`?3C?0]1r?9o-o??{@<}???^0#??,n*
?'!???1?????K?6N)?A0dA&????XZ??#b?q?u(??L(
??l??P???a!?
@??O???ys??.?
;??:?????G?C$"?,$(?
??3????01}??!%4????P*??>????l{t?57?v??1WX???|G1??Az<8?K????l
?"????`
?F??`2??????F???I?@?P}??r42a?
???R$$"0R??????%??YrI?9?50Q?1,?:?7????BF?<?n?b
?
z??}oRT?G????*r?
|??%S?($??
CH?i?*???t??g?IBR???3???>%11???
5i????????K?!?'GU

???o??..7?Ta09+?X-6??"???
???2u?????????c???|?$?????L?A?????!?Xt8C??(?$ ??????
H??????M?y?<????gi??k?
????4n???G0?F?[?`9wA???1,Q$???X?E???????[C? '???H@???, ?W&??
R?.?]!?????o?e??^8y	???E?8LI??D?D+)4H-5)??$!?[w
(J?J8
@??,?0B
y	@?@a?
r42)B	?	YY9??L
?@O0V
??^r?
A#?H??xCHG??2`??""??
A?w?s?f???af?F?S?H??????Jw?4h?f:vB?PY?????A?&&?????a??;?? ?#???4?>4!????~???AR at g????k??,?s<?3`P6b>??R_z?#???????p???a
?J?????|?!K?=???{?"??????l?:??d?A??????h??F?9>l0p2????/uT???^??U??ll`???;?{??	p$&?"?<?pz???????o?k???Q	?Y?Q%?W?ly??=_f?"}???D?C(?
J???1?

?u?%Fv?????U;?,*$G??%??????I?:???*qy?CJB????v??d?[f?a<???;?]2??S??,?
??H,Q?d?"	???*?????a??3????5??
 ?`????$3$7	????[?3??m?r?W?N?U?K???s?(0???k?q?H??0kV?;???????>?#X???I?w8?qJ,"B?
?/??p]?#i?0??|????#?D??
6????c??I%??j?""?f?&j??""? ?""?""?"*?(????????????""*? ??""??=?}!????A!'??!???%1E???????&I?P!??E?%?1`?Lqk?a?0`??
?A?0??b?X)????7???Vq?JjMs????
?'A?O??k?]???7??
#"
?:?bZ=
g0?9hMC?f

O???0????9WQ?)?'7??1?#??)(?<?? ?	
0K ??
C???3??????UD? BJ???Ai??[u???(c0SF?)6?DI"????
$??pQ?*(??T`?L?f????@BL; 0??c???	7Fa z?<?5???5"?R??
??>????!)??D7?
?Z?>
Q??%??0:M$?D?4??C(?
q"?????????d??	=?)?O?(s??_?9@?????v?oJr;e?
{???$????*3?q???R@>Fg C?PH???P?B
]?=`??R~?GK??????@%??pJ?i=????D??o<y??A@????Y,?+?????r?,?H1 ??}?$????F?????I???*xFHO??J???F??C\N??RxF?Al?D`?yZJFR?Q??`H9?????y?Fc8&ftb?]a?t???21[)c0???0CV???m?? H?????G??d???F?
:????? r?
????c}??M#?=????C4:?Lh??c??e?r?c???0???????Ap????`?KF?????D?CN&??&?1??_2w?*?????8?a
??????k
0,j	:'N????D?B????\??|G??#A?
V C?B&Z?B ????????F?
?YFxg?xx P??l+l@???3F???)g?Y???Kf:4pI?w$A3B???vFt?0x	??G0?=?5?@B?yva??8?j?q?7D?+I?J$?i[?aqT??5<8l???? y^c??X????? s#YJP?B????fK?Zo???????l|k??+???
??`??Y??`?C?"21???Cb????0I?/???L????P-???=QM?uV????F
?l
"?D?????????<	;???{?U{_Pjgt?2??
 )???d8??,f??%1?m?M??a???????B?&???v?#?k?h9OY?
???$v"??`8?#	?????lD?????7???a|????? q?HK??>?BW?|??f?SW?ZW??A??=???-B@???s??	??*V??? ????s?5?M|????????Z?I??}??@?)0?J????W???????S???cK?H	K?4
?d?8*0'``??e`
$"A??a?A
1(???4R

!@?uZ=?P9?p
??qT??
Y?fB????y?^?~#??P<c???9??????5-t??(?aJt?C??|?b}	??
>??p????H?#???,?H
$X{e?)@%??U???
 ????fHBn8???kT?&?????K?aC??9"B]?f???1	X?)j_???J6?#?I<??	??S$??ns?l?n
%
px?
?A??0?tB??L?,?	?QqC&???b???y??%?=}]]7?y?WH<?iF??>0??G#q$?Q?$0?d??L??N9I????k????G??s??	4rpttQ8?7C?Hz?]8+	?s?P?h?	_&0?????C?>????}+?!X-?????B@?=?&??????????<????????????
?????????j??2?Ay?????v???Q?
"P??)??Q????
Hm?!?
???????
?Fc?E??7??1?d<b??
?c?8?f?20?a?6U?Z?}???I?ga????i#	???&?.???"N??7?w?Ddfw-??V,hr:??2??p,`?????zqk??s??ui?l???HV`??	?4????????L?@)?aV9;S/????#Y? ?4w
)Jr????a at w????:??@?tP:#D???k?#??
???O?T28??9*
???
?.6?F
??1U??J?]e]Q???????p??96?E?s????nsL?E	??D??n?d??s?,???
i0HHuGA??3???? ??X?]?V??SsL??\??????A?F???[??l?????kW???????$??
?z??
???2>???%,???y?I???(?u?6?o6??;14Bt! ??v??"
??_
'y?<??????
??`?,$?G!????j??6?????<,u?
Y?%?(??1??{_?LF?;??y???YCI??[ai?uXn?1,?(????iP??1:b&:????d??l?N?[?0^:v?????,(j)Jp??O????????a??0??h??a????????E??d??$a??b?4h?xM=?'0??_????J5?Wk?7??BWM???x?0U:a??N?
0[????#f??N?I#??%z????????c??a?\?Z?	??J,?F?????$R???`??@:??!??
+??V?d?
T?}?	<u?a?g?3??p?W|?=??kX?~h<?iA??@i????x??\;ds?ZoX ??r?i??2d?N0@m?z]?S-Y?y	Sl8?????)?X?zMX?yY????V???X?=Q??[r??Hs84<?
G?:5??{?Z???)?t)???0?MM??D?pL
v?#?nY??4?E:?%??%?c??
`2???$?x????<????????A?c?d?T$l??/]?CI?z)
??I1?vq???7W???9^?r???2?;??4?w?ad???7G?(Dk????dv?@!???v.vv?:??????h!<K?v1?SU??b????&]?Cil^?.?9(??-???^z?X??6>e??k?:Fp8g????t?p???????O|K?40cw{?Z!?#@4$?R
??K P?lr??T1.?<??d?
?C|??J????N?64?g&D5??-??2<
E)H??t?	?FF????8???%_n?I??O0????M?????Mq?tJIG?]t?b{??.?
?`??'??;?2?K???E????]a????#???8`G ??d2??? ???y??81z-?????B??O?2?9??k????pO?]?\???[,??????m?s??y???:??l:	D	`?o?Uy???*?YU?x^m??+?zY7???,??NT??08??0pFa?{?)41?6t3??,?T%?0?$,`b??xN?\`??h?(sK????l?p4??c&z??G6^?* ?\O?????]?
?????????????Y:1h?2Ec?????n??
???O~?rf???

?_M?O???4?????0??]?y?:R????
????|g#p???q$t?D?jpu-6??<??B,?????????6V\?9t0?([Re??C>??0?7R?NV?1???'???|?NPh?K?????$?(??t??=??IU&h??C!?!???0bn(?9????mwZh[!!??b??A?C?B??=?k??f?~.??i????<??'9?????/yc?????a?y4?Z??]?2c??s?.????t?Q?Rim?1J???
?B?b???C??2i?????!??*??E?O.KKs????
?az???^?&????U\?<	0
`??C???E??CB?n
C?.??y???8?M(????f?????Nu???Y???T=~??)?t???)2??"???E	{????l??`?X?`f??x?Kg+9.@?W

??w?a86?'?D?[d??G?
?P??#?[????v??????d4?D?
???
4?*"2??@???T1??Q1?
%)TUQZ?
?	??U4??(???y*?iB??
?(
 p
???!???&?J?P'zp??n&M???????g2TY 9??h?K0&?
?B?s
?R0la?"?????xM92????fYo?B?x??Hlr+?????h[]?@?0??8G??`@`?
??@?M? 
{????[1
W$?
\dI d#"??8qp%3??r??)f?hY?e??? j????t0`
dn>
??
?
G?@?0
?k?H??????;??0??8YG???,??|(
??@5???E2?r??? ?s?*D????V??????7EcE?v??2!????
????X(eD2?H???$E?????pc#?m???2???Yd3H??l?fTm???7?@???$Q???????<?8t?0n??Z??a?Q
G?d??? D?,??%?kD???p?/??d?q???<???W??_?{???Q?FS8+tw?'?*A?^Cy???P[
}?
,??:rS	T??1????g ?b?w
r??@)_?-Q???? TaH??c??=?;?Pq?'
???F*J?????? ???pu~???d?b;;O?v<w???Uo??Q"?4T`?'I????
i]?CE??:0???=??????A?PO7F
??Uxl?<=?E?h?&(8??/?1??? ??>??T?('??J!KP??	?P?\@?p?
???B??s? ^?4.?i?R	R6???h????
?????b??P?P:??S?sN??8ee	;9%\?L ?tz?1A??F;?T?>?)?Q;?7X??(??I??T?L?|A3&?N~?
?;
F32?HA??
?h?z???70??F??:??R
0
??n\??htw?7e??q???f???	??[????RKc3	?@?
?	G9??]?????TFV?????b? At ?#??}s??*?XS?>Q
$?:??????7?xb4VD?j? ?J??`????C??jm
G?	i??[?D
?G??7D???>??q%?&R?D?w??*o
a??1~????zF?"JQ=??????u???P?q>!??r??oG!???B?????
O_M]D_??}?/????px?;P=?1?	???EY^V?\?x+B?-?F$?1N?8?8?R<?
?|+?%M at IhXv?6??????](1@?{?;????x?GF;?%??8?D??
???M?W
v??p?j????q?Bw????5V????]?????&?6?<?9=???b{??!(?{?X??[0a?0???;h?????@e??e?
D!AD??P??n`?lZP????Z???????).?.Fv?4$0??0K
0y?t?k|?L6Jiy????;eU????e"v?B?2	?	[??????????MJp??d???y?k?c??????7?4?P%??I??jG?	????).
$???N????`r?I????n??????#?????\?.&8ZP-?R????yu?????7%`3??R????TB5???M??D?O????;{7?1?p????P?	L?'

??U?HUU?U?D?0?3
??eGr??XA`u?w???h+?>?6@?I2H?c0?????????9(???!l?riZ0"?x:/L|?)??@u? ?gL?r%???????U&??,?"???Jj???1A??Rv?
R??+J'?"T|B"n?
???<????tC?????L?!
?!
?6?p?A??)?D?Cv??4p?P?K????l?0z??v?I?&??e???????%A0?6Z??P}?????qpGY@=??P?DD?@?(*RUM at C0?B?f?(??T?d4~R/8??}??4-???yqr(|? x?/y<?
'?e$(???^n?m???4?u? ???R?<?9Ry*? ?C?8?9>????K????u??=???E3?n?l?GR
??4?s?-??e?X?c??ZY??????+~Q3?izIF^?d??d5
5??????Wh??5??=?6?kj;N]D?????P?;?a??]?`?1???M;?K??Qn?*?3?
aZ??2;G?),?P?Pl??Odx?
?5??????????@?N!??@a???]n?N??%b???{?_??2?+??Q??60/N???\?#?]?ZXC>	???9t????F??0?????? ??c?i??[+R?P?w	XP???D?????	??Z?!f????3?|???Mj???9D?I;JC?V?T????,?TL8m????Y
????(?V?6pT"?D\?a?BP!? ??,>???H
??M)BM?????r??#?1?
A??`????7U5?H(dF
??6???pt?V??5??!?G???0i>?????P'??>?????[1?Q?2^?O??>i?v??
?Gw???
'?????????;????^?O?K:ibh?Y_)d<G??(?=?xf\b???&??J???
?!?1?P`?????h???d???2?U?q?E??s?
 0??>Ht????=X???`'kc0?1D:b?????X?i?B??i?@??8?&LC@?
H?*d??o????#?7???
?Q??n?M0??p?X[????????:??p!P?????@;???0?M??9U?MAO???nF????	?XCi??*?9Os5`d?
G??~?B?n"b??`"?W???l??
?u??82A
Pq?:??q????l??#a????I?A?'
uRA?J?#
u?0h? X???(??"???LB2?0?E
???S????6CQu'?6?j??
?
?{{UT-? ?=????PD?8??????-?SRj?K?`k
??3R?|p?hN'|??B*W at An02????$;#?2
?
????????k??Pe?f?L??a?g???:????kh>I$T??*
?$D???H$??JFXd$@!???o???`???5`C?y:????????@?*{?

iF?b?????*ar????J??1?4g??CYM??X!????@?1N?3?
G??D
????-?Ma??^??? i?lV?!S
ZCh?T????"?
?|??iP!??LD?+??dx$4Q=IQw?wj at 5(??eu???8"Bg?PHD??~??@u_??????f@
??2?
$@[?r(R?IQ*?? 
??WSU[Z ??????
4?j????k;!?:???!?)????^???B?>(??dGK? P?G?????%?a_;?88?d???K(Y???5?lS??%???(B6g\](>n?b??????.???
?l?%?$#JQ9?B????!		@??lJ???Cj?JD?e???????PD?????L?????7rpr|<?g?j?/?p?"?b??y???\0??c?\@7X??????Y?C?A???C?????}???n0$?"??C???Mh at j
4?;?
?<?O?@?k??7E?;-
b???D?????Mb|?????]L1[?
??#?b???Y?A%?x>cRq??@~?R???j??P0?|??9X??#C*?2"?x?I?c??F?#/????K????bpG?WC???Y??????<P??;???R?U4
????/C1:?$c?A)
W?|}???????a????j????{1?uP?\`
L`??ZR+??H??>?????'?????3)s??Z??C8????E#E??>? 5R?@?e"(1?Ic????
?T>6????x?5<2?M1"i??H????,H?uE?s??L^??U?kB`?WL?F????X$7??<f?
dL?? j?$?Y_1?F4????????R\3HJR?244?Z???%`6
%_?\?x?-#??v?3\b?H??4?4&????c??2a??E%??v?S???V?g?qKy???`>???;?D!5?	??0a^?v;S?????N!???"T"(?-y
$?_?Z??4T?Z?'?2fALh?p???"\???@?O?9?)?"I??i??
Rd?h?W?
8C????tge
4	QBa
????4?R?0??JI?????BL
??:sx1????7?i$??`??u-%5?e???
?(??D ?BP?DH?A< 0??_I?k	0pF[?V????a?(?(?F??'?1?"`?R??oB n*
??
??a?}?(v????A???Q,=???>??P6???s???	2S!I.?J)h)?FJ ?(%?eb?b???*?jV	?&"?????b?p?"
Vf?H(#???4@?`4?}???? *??????m??2**<X?? H??Z"8?i>2
(??5?>?v??
0??=?7???
bvBa/}?'bB???a??X?J0?E?????^??4?C?"?K?z?(?E???8????48???uO?K???H$BD
??Odt3%D??h??	?&
1]???:?Fi?~s?i?X??5??ZR?5?a??1????P?????la@?*R9?9??D%Q?#???Aa>??@????h??9???I???,?=??>???|?w??X?D????d
??????B??j??h??H???EC`(??=Ixp??E:Qd??S?bD??U??_?Q$?3?xm?au>??b0!J?:s?g
??a?SD?Es0????!`?????*???``	??Xb????W?3e0??I16???Q0	?&?)(b ??d?$)*B$???*H?
~
+???H???"?????r???D	?'A???>????@????Y`??x!?`=??sk	???{L~T;`H?	??(??H?? ?iRRa?l??q?	p??rD?"??!??
?
?hd2D??&??*??hp?x??]??'?ZBO?+?M?`??(???(???&,Hmf?
a???????%i?c?<|zKz,????.?jb?'jGy-???@??@?4$??i?????h???S?>d??\??aE?G?#???:????xT
:!?"hP=???\@|?S???
??Y[pA?lZc?S????.X???x24@??/(???!
b???)?)??BeL?(LP~?=a?X????? ??x??#<!?B3?ew_????I???h??s?LN?3UQ
t?)???h?????????M?????
`?f?d??????J%?O???r?<>??bAN%[?>????"l??p?l?P???uT?;6??I????v?m?r?F???/??
~1??J???????4?!?P$P??
f?c???YY??Q?0??_	g?#? 
1
,???C??V?.?dfp?\?$?=f
?(???0Fu?o?
K?-?=????"?????C
E
?ps??m??A??h?SbX>?????C?6bDa8A0?rp???L0M???8<q?{?B?	@8?h~~px?V3d!P?@?Ap???
?-f1)?2&@?
 B??^
?T)>???1$??/?LBm-??????)wT????i?<
???(U??a1M[g?/`??????U>2?????Z@$I?S???%~??????l??0PEC0-
?
+1 at Q-?AQ ?D1@?2?QJD??????D%EKG~d????`????P?QAI?X`??<D5?j	? ???F???RE'Wd?D&bhZX???!?J?"F?Q? ?!O?4?T3?H???#?|k??????[qJ@?QDC????x
~?[?:,IDN?$?X0?4?
???W ????H%J!(??8?
	?c32BD?H?? D?-D?0R-w?
??
??e
O8?dP?f
X??[??j8?{??
`?!???\
D????<?(w???????o&??
???F??????	?????L?	'?x?}?D?P?@??,??:?A???!???T-???d??
??4?c?????@<}x??????TI??q????hyE??gc =g``????<????????%?o??????4&???>XF??\???I:???2"???SI?H?+???%odhh T ??XT?!	H+???X??P?$???z2?V???x??w???q?????EN?-?:D??y??!#M?d"?;????(?=3???F?bj????fn?qJb[?O"???R
+'He?b?t2Ag#w???Cc?$%0?l?:??&?	AJdE-
"?S?b?!u	?45??4?HHO?%M???? ?,7oS?d?????9?#
#??`f	???
t?
????c??^?hb??;\
??1Dg??G?g%?WK?:??6??L?z? A?s?9??mX0&?nR@???L??H?
IC?? }e4j????7?C????q?8??!?b*	?O?#?#;?	>(9?k?.???
(?g]g?SHd+G?9???|??b??m|,&?7?
"O?(??=?D63J?<M???m?U?A6??A????&ZW???????!???)????FC?D????;
fS????$?d????Aw?u%kUNC?0????!?_
Z???$Y
u`?9?y/???/
``???C?d?9??
80D?<?D?????u?p?????c?8Lp@?^?H?????

0a??D??L??b?b)?G?oa?
c???????f<:???S	?P?r?	""?%0GM?!?n=;i?H?x(o???S??SRLA??ws???@}?:??? ?AF&X??????4
WB??
?!?cZ?W???*eD;a??!?
(??2W??P???!
?)A????H????<C???:f|???M?S????d????&?hqT??#?=??:(n?i!M"X	??G?~????2
???9?ABl^P?2C?m?
p??S)?$??R?S?#?C
h??IH ?
?)??
|&?pO?p
j
?F?	H?R$????/?
PU1I????N|?d:	???$	 ???baT1?=????8=??,A?H?!?#qFq??a??:??? 6A????Zuh??B??p1Z??B,I??BD??= Y?0AAr\@C"t*L`??*U)??c0@???}5*???o}???3????i??b1?\???x}?s?[nk?C?)???? @???$??I
0???:a?`/PDX??M?Y?M_???m?&?b?????(-f???????????X?B`-?f?qh ?y??3?1???x?T?B??5
???b?2?e??2?(?H2??+z????hK?6???g9?0?5??(v???07#?r??B?1?l?t??#1
a?=RA?\?.???X???dO2???l?<?X???ijbc??
aY#?d
?????=6
???1f!C????4??#h%S0@??L?PRuB?b@?ZR???P?=?lJkR??B?????Ni?hS?	?F???5?!?a???f?2???GN+?Z??RCh???kN?f?5???m<%??95D??G???Rn??v??e?w?9k1
?Q?9?N???&i?~]???@???????d:???=???k??????*?_??#~S???????}?9L???%?M????rH@??I$???zN????4|?;*muo??X?F???Q???Q!??z?
?v?W?\???!K?
C?X>	>p??	?a?.????O)?$l????VM??
]
|B?-'D?K??0v???!M>???????????B"o?wt
<u?'??N?}x???"A??Tv
??A$-?U?)j?Y?P????H?d>w? ??
??h??IL5????	i???A???I???b?%e?
r?L?K*!UC?9?H: ;????/I1:????90;rk?????t_ ????O????;??V?"??=?l??{??j??k????x?y?$???n????I
?UPf1??
C?^x![?O??~??i6??0?]?&
k?Cl?`D?K
v?=??0????*a~,???I??.???f?????)erd-`??h?"?@t."'?Xa?zK??}HyC??k??C?^??Bo???]??WV?k*?X=?????
zX9!??}h????P?$I7?3????????oe~?????.???$N???J0???????)?E?7D???????m??@?,:????	pJ?b?Ci??e30-??!?!??@!4?(H,D?&???X???oq?r???Y??;M'???xvVb???y?????d???????)=5OH?K
??i~??[
??|m?%?HJ[k$+
?
??f?2??H?X?Z?*R?
?j????VmH?i
?%,?Yl??,??!m?c??j?@??H??d?????&???1'L??G6c??;??YY?>???*?f????(???1l+???G??4?i??%j??gJsT??^#uF??{?????B}??%
????? ??g}kCaL??9!?:=??<??_??>>?D??
?????????????????^?H????l????";I<?{?Py??@??i,vY?l#????q?o?^???????4a?!X&cg-?????BbEa?	?	????e??$?q0y?@?$??~?xo.?$C??$?J?"El?y?"???^"????^?M$H*
E:{?Y?C 2??)5k?Xf???????v?*??}??????
X?M??$?? ???LDB:f?
C???& ?$?
?	k?5fB??'??l?t?q???&!@E????D?H?.
<???#??S?i?<01 #?O?
??f??????\???
??p?4??m??:??7	??l??????dX?C??g(?AzD???D???w???2??O{yw?jMax?$E?P?
?X?
?8Zo?"Y?????????????x@<???i22???d?C`?)c?h?o?"?R	????H2?
4"????
,J?D at HP???"??	^?R at a???H5
,
$=????u????HI{?w:???r?A????I??8B??$P?
w?8L???b???R??"x?{?E????|h?
?x
S)!"???#?]{?V>c???T???N:<6	????$?sm??S6?g???qbX
<
S?1B?
?&???x?G
l?l9@?d}?l?b??
???j????3???G?eW?E]?'W?a\$?0L\A"??l?FD???$?
??m9H~V?]??????C
]??????k
?B???
?	T?Q?j?8jP$),O0]@???????,A???a?Y*`}?????JQ!?
?J?9?	??6EZ4????A@@?A?(DRlP?e?JQ?
)?~??{????!?8?aM?B???Dm?-??[[B$?LdR?Z??Pu#?t?(Z???"zD?(,o?-?lGTpSG?A?\
??^????+ ?@d??E???>???O?aH??s??`$??h?)P\???!?6L?B???_i???D??H???o???Ih?x??a
?)????L
TD??I???JJt(?tT?-:?
h??9?}????_?%?H??
?????L??QFJ????*?
???":?D??}z ?	?????????Q??????5}
%??=\x??q???~?2!?????sFi?
ZU,<?W
?X@?&&?ad8?	!!#8Q???"?
T??!z
???B??p?!MQJ???T?l`
??S
N?=??d??I?~d??
?YE!{HQ?
??y??X?
()22("t=As0??!jh?j.?q?{?!d@?A[
?	$???9?{?;L!??G?0???o(???????b????  ?d??'??D???8F????
?;O?9?????W ????8?,D`R???@?'????????|v?'?e0?L?9?#?+????l???a
R??A????'h!?3???6?.?C????Q
Sp at W?gn????RB??q`b?38?t?.88?3~?
*???aPR{q0?`??|??'f?`pp?A?
??(??P:h?T(A???_??;??G??: ??FD?c?t??c??????ot?????V??????v?k?4?R#L	
,*TG4??i?}O???:??~??E(??
V??H??'J)M0??	??????????zD!?????h (i?????J?$????????BT??:a?p???L?1?
)i"??0?~?A??<?{H ????
?
R????#d@?2?OG?*u?H ?~??y?R??
 4?R?
Y?
c??\??Ea?G??0?C???????n!?%C?P?(???GO??c
R???????D
?????#^?8???qg?A?B-?;X

?eT?
?yNP
?J??=???#??2S??^?;p?]??'?'???~	q???????:?????????????????????????u???|??w7A??	??-?3?p?`???????x??*\?ut|?<???)hE~k(]?XjD>?
?*6\???T???1??(???P?!?????w?)??e?:???
R???T?
?i
E*lb&a<AD???????????A?sG??7?d!2?JsJ??2=???0f??`??<??WH
?b????????C??D??L?y??????$9??
?????(h?<k&y??{??z??84S?y?E/? s??s?t??SB
8d?$	?HD??AT??%5?*?&\LBA:????S???h????r?zI?7a????q??2fI}????ZFFq?A???/8?^L!? ??	o18L1@?H?!A??b????Q??
B??U??K?(???C??`?A?	4?YbJli?>??5??????H0(?Z???B????2(??E???G???? JJb??WB,
4.?4NbP@?Z%??N?fH?a#??Jl??Nj???D/"?`+4ch??B????$?8??? x00s
f&
u??SS?ej.M(y?/??$H?-?	?H?1?
K?s*SB?????1?x?B?	F?????%?h?a?
???
~
mlc?
C3
??I1

P??IH?0I?????4,?????M7???(?? (&?`f?S0B6X??HP??0?^e?	?a?????f?r
8???y?;?d?^????e??l?i)?`d|?K??luJ?? ??G!?G???'q??a? o3	?w?OI$?w?+??p'?{l??Xg?2 cB??D?	???????4???
?|?l??????a&	??A{t?M??h? ??i??V???h?W??????c??0????????&????'?(?|? 4W?U?! ????MF?*"? "F?B??*!?8???%?$H?v???u$tB!D3?}??E?hq?????'?e3??g!H??"?kX?n??A???
~S????(?@d~A?IL_?????}C
?(????!1?^#H??" r?`!?v???j?$?$?,,?-?-(?C#<<8l'?!?B??
!Nb??d ??X???_\?h????C????w????6L?'Y:
w$?2 at .	<???
?I?D
`??
"????	j`f?????)????S????N????aa at S?s?<?1 ??:"?#?zE;!r??B??v?oMn??	???
-NY!??8c at 4I*fZ?h?hY?E???z?	?/bh{?>]

B?@??7??$???E???TH???_
T?1?, +'?b?????g??+?L???M'????s0D?RY ?!Ri??????i$?Oo1???$`@?6??T?
7??
??
??C????A???dz	SC???D?:Z????Zx?r?`?!?$
????L?????:=??\#?

??
>?
?	???
??P??4w?8=???	??a(?M???ln???xp?NE/????a	??U?a?|<
sou?0?r???0W^QD?
????
N"~?????
???Z^T?}g?
??~_q?F??=m.????*???F??"?????>j?b??T-L??0?????k&2?96????
NSz??.0l?CS:??1????#F"Wal????????????	??
??WR????b??L???3,d)]Jd??D1?NhP2LDXv>?Fv?> &B?`~_?????~?Lm?a?1???????.?C
????P?8Mc!??~&
p?Z?B??YM????1M?C9]?]??@?V???m??j~??N057?l??'`?{`[(??a6h?T??8???!I|?`?KphP}??!??"??
?X:?U9c9?f&4Dhb?I??H?????wP_Q?????&g??Q??=??<????M???
??f?? ?r?-?$e?}
??? D??????&9?e/?????Y???y????k????A????b?f:]ad9p#?d???I??JXV?0????C?FF@G??
j??)?H??0I???@?
F???6{1|
!??M?a???????z_NU???,?^2	??h??E0H??Oi?I?-??#???????kGQ???w?,?&?S[0?????n???zN?1?H?????d??P???S>??s??}xpsF????*U?\
Dz?D??L?7??3???Y'??b???W(???:?cu)???;=y?A*????b??;4??,????;?g?t?s?g%?;j?s<?q???
?i??2??8?l0??C??&	?t82-6??
vJ??%??|d?VSf??\(\???	w????&?1r!??
???:?F??K1v???i??'?^????.??B;??Cr????????8???#?Xw??????JGKl?(?t???j?R?????&?#?#??z^????Z?T@
lK?Tp??=?e??T?o?2??????J.@? ;|?	?h+4?8?xZq????s??r????!?HA?B;?q?
???2<?p?xgJ;A
?CpGE,?axe?"?1~L?z?t???g,?^??kq5????2?A??`h=+?Si pI??88??*?Fg??a???????6???b?n??[?$?

?&i
^:(e??W??l?fQr?p?3?Pi?7??X??T?C?iF({??)q
?
??%?l??`???aD;*:?2??X)??]?????(????=!?h?
'??o????Ozq?	T?????d???cjuIN"?+^FKq]z???/?`?9pu???[9?:????gx$aZ^	??/J%???h?U!?RS"J/?=r.pz?Sx?S?x?????u?p_8??
?u"u?
??,"??????`??{u???
?YA.?????????7???`?t?;?.???	:M????pplL?b(	4v??%?Z?3D`??X?A??af??il?50??w???????t????z???tU?OH?2
kXB?????R??0?????:???+?b>?h?.G?<?v??I?~?(V??F?@T?|Y??2?=??sT???A???r???B??4??[?fO1?2<V!1TE?;?E?{8r???V??-??fM0???
?D???q??c?????}O??5????=?????]?d?f??[??1zw?z?[rwP8}
q?A????c)5?????f???t(?wCS;?e?b{5N?x%H????,?44?6?Z}ukh?1.???y???l?Hs???g?65???$c5
????X???5b??E???Np?/0???kR?oXy?Z?H????@???Q?w?????0?(?	R??:;'??&?x?0l:?????Ia<?-.?1mBc???)
}?????.?{??'?yT:??C!zg???

????H*?h??!?G???v?9
h=
`?????D?P?
`?????????_?G?@d????,?????i??5+?$?g
)=S?@\HL*???w#G4?T??8?????A,t'3?????	????6?7"??H|P?e?D?$???@?A(D!??~(
?Ju?2?)?+??$?'?????????i?)
?	=??:??|???_}??
??;R??
??!bO??'i_??????o?w?????]?|~?X??<??!?S?!LL!;$??*h?t?,)?'RJZ?
U)
?84d?????????DH?????? ?"?s!2????333"m???d
?'??j?b????6?g?4?3<?B
?c?[8???~????L??????????
_?! k
?Z?/@??,]??>#?t??B?M*`?	??d?A
"?=?Ai??& ????H
?3?????u8?6?4??Cy?gU???|???:XQJx?6	?????4Z??;5?}b??)(![	Mh????`


W??>_?????
?????4??@}Xz?????H???zOQvB????4?	?????g??}???2z????jo=tA???????
??????CdE<?z?;H???B8??"D?T'?
??
??~R??z???q?R???
??M?&J%cm??P??R??L*?*?Rd?*??A?

??? ???w??@?
??E!?????[n???=?`??F??????Q??y? Q$O=??kt??Q??!?>Hb?!?.??^??8????}??????R??g?6h?c???dhh".?&B?i?4D,?????H???n?s?????#?L?e}h<???`?-???;]??v???S?*q??????|?
?
"8??^?O?P???N?h_???]h????;??????????L???????
??\4P?P??? ?l1?N
?Rh;kk?G<?62Ee??????????*??X(?w?5#:
?4?@Y?ct?????eH????=?+@?
v????????? ???M???K2???a??@v2??`?0%??+???ef?NR?<?	c?:I??i?W? ?x?b%?????a4?RX?K	
I2H???a?
??_??p`>?"+???=7p?+?????Dp?#		?bk???????wPH2*A????u&?
C=@?c9/b;?`x?@7????K??q???????A???@x?
??U???P?N??.?n?t?:ml?m???e`1?I,&?%?OCKsSMA(g	?4??V?(;??>???(???>?<' a?H?S^???????m???????|???}KLW??8+li????k?/??)?r?S???6:{????C=I??(???2?=??=(f?????$??
????Ld?????:F??Ju??G6IX7O*Q?
????-j?rq!?U(*??m`fB?q????C???D0??!???Q\???,1?9?[??Y?Yh?M"?fc?????]?df???<?7R?HFA<Op?????y????	6?H? 79?e??\????)4Z?*C???SES?:E?
??????^['??XC????~U(8?
?V??!s
;T??9??,??[~Vf?&???N???%???Ca????$bK?Z
dK?cE?A??????9?J?R?Pf7ykp1?a8W??r??oZ???Q?;p?*?&'u?g?*n????5?0??C??\Z4?	?????28B?((`)_?
(?e=3???z?$#g????n???????p!??ywl?R??ws??O
F? ??p?J?i?6?
??B^????e??A???!mra 1?????%<?~J\?p?;?e??)&|?9U
!????B?&?S?y??<(?
????? v?FH8?v?Pa?cy2meV????4+Zk???????g@ ?_?(???????LP?!r?`??'?
T?
e_?Z????f? 	7`?6?r??R??"?N?????ig#y?Dh??]?@A?????O?e?u??0E?	??l/??Q_??9??q???H?]FI??t?/zjm
?7?N}*??????g?)???????Vjb#g?s^a?:??M?#?`~$ ??;?Ov}???>???0D????h???r??@??D;??0HD?DXv
????HD?
pD
?$F??A?j?
???@?>!?????
h?]0???????O3?>?p`??

?m????Y*?L)|???4???H ?Rh%??tex??@???S(?GB0??`?
u?L??~? ?!9L???. at RQB?4?@??:????	?x?x?	H?q????@??BCLG`F?*#+?
????????B"?????????,}??8DB?c??M
??
?T?)?)A2!? ??
]??di??#rJ??K?e?T??
(?8?\dS?!?M?
*EL?F?!????Bt???"???H$?+!
5?Bld?@?!B?)ID(-(??b?$?

?? ??C????9*??%??i?`h?h?;$)??	I?
?z}?10 ??$?)?-2?H?(??ye??:?h?
{???????=?%?>???????&?8???HDN?N?OE8?????y???D? ?_.ffdiU?2(v
7?	d2?J???ke9T?c?}?=Z?0&	??tA????(]?,????I
??r
?j{?BOa??1$G??GRV?????!Q??"????#??y???a???D,?2S?if?"X??g?O|8??S(y?H??? @:?
?%]?S????hhv??^4?????I?LBql	;?a:?,hZ?
j?P?d?zw??^??)Bpf??@???m??8HR?0???`N??l?R??R??+
????8????
?i7?B?h??(?F`?M????a???2?MA?+?????N?N at i??KH?Ib2
&G?'"???????
???%?? D??\?hC@?????2!H??l4?
???6JC???H2
j&????9?
0<Pk??
?K?"?@?X\????#?)???????e/4?
?w?????N?C?2?P77H
5??N?=???4&?(?O$??F??6:J
??'aX???E!%(bTy??
????????l?=???1G?'?E???i! ?_K???S??(u??%`;Z$+^?30
@D#??=?????x?1??4???i
[??)!?UB\	IbI????????6
8?T,?V??t4???p?;?"?f?!84?<?PKa??I?.?
&KqD?SV???OAC???V?
Q{b?p
??p??p?{d??S?C?I?6V7?.??B?ITU??1Ax????3S?+?5??/O????????F?????2b,?"?h&8&????
???=PF?(??A[
???F??hQP?	???+a?|H??""Va?
?Z?????H? [?4
4?2J?"a???q
?&A???x?2?CF5?j*???????B?8YU??C??S!$??=???A1??C????,u,EU?u?????iMP]Ca???|??M
yz1&,?bh?b#\????p0??g0"? ?U??@?RL54?A?2"&ZV??????????9Hv?????8??P??4#????O????????2C&?9~_.?6
????=???????? %?(y????,??U?Z?"??`???B&]??#?>??h??????$~??DCXI?A%?3???@j???qO?)?G??????)?(?0???b
H-b?j!IZ?v??BT??-B I ?@b
Dh??'????~???K??y?(?g?#???+?_???j???3????<??????????Hb?I(???8???qW??M???r??r??????S?????N?P??%?A?_?X>???Et???;????`(9?EV????rA;u??"b"I?0B????b?h?-???C"?????'

???!M?t
F????!??d?7$ D0n1(d&????!?}i???ire?alQ???(R??6@?:?8??&	????P!????*=?bl???9g?
?f????R????"?$?F?????1???	q?2?a?&??	010*?,?,A-)+IN??o1-??`??rT4R?IB???&P?,(???!
Uy^????????????BR??7d
O
P???P2????@l?P@????J????
????&t???P???????ze({?g????????<Uib(?z?|?@?4??uQ???"???*F*?
?}?l
?j$?}x;!C?!?p#??2?E???Ql?%?$E D(	SR;????2&???V
KA!??????p???b?;?? x?r
`?????
-!?z; ?j	GQ???=?`?T??`$E?rd?XK??
?1?*c?a?S????
b??i E*?*)">??G|@??:??????!?8}???>?}T?;????~?Q?)??C?J?{?t(-
,`:8????
ll??/??f@??tq?[??(u4?E??
????*?4???c?????/??*?7?}??W?M????b????}"i$????1??d?|?????????{??>??G?6??a?HT8???T?
f*??u??k?30??`??KBU"?????G??"dvC???n????r????^>?o?f
L??Bk??21?D?????sb`??7@?
?7????
wy?P?
???????N8?
?\?$(L?!2?=r?NM???3???????#????(???? y7Q?R&??????#?X4/??:%??????SN'??)??Jv?F???F??0??I?t??f?uL?
?&
]?H??p }?09?\Y????z?(#z5=L?H?f#??#F?|??[Mt???$,?????c????8?# ~_?1?y????:???*????h( ?T ?VR?U??:e??????1K!o;?y?@X??xA?Z?PzD??N$?}qd	
?
???,
)P?


hj????? ?~?"W?B?(?/???y _?C!,?p/(X  |?tq^	R(@)Z?RXQ)
~q???)NK??Z?????"?1`??HY0Cxh?z{tS?a
_3??????w?m\r???k`hx?y??????!	?`	?N8I???F?]a?%?O?Y??
J??a?O;?7?\?b????
?l?Pl?*zC"?*?i^	PSP
??!E%?AJU4?
??`?G????}???5???ZfXH
?????&?G??p????,??5"????>'

???	?2_RI?o??{?E????/????X?
%J??u???h?3
??0?@^??E:`w?
????B2!)
??C:?????O?x?8??"@c????????{`SM?N
?_n????
??>?
D???B??pEA???yO?]w???_r?

	?????3????3?T.?????|?%
??
|???????F?r$?hr{?G??????{????S??{x???????;??g???m??}s?_/?n?m?;Mn???v=su???mnW????n???2U?QN??
{??D??t??????ki?????yn?a????????q???#?9?????%OhJW6?K??M*?P?M 4
??>`?<	(??)?(;??#?^?m6???Fvf?????b????o1%Ev?j)??pF????c?&nb??j"B
p('??@+`
Ia``?e?????"&???$%)5?G

!?
R?L??	@SL?K?i]???QJ??D?@???GZm?????cj??G ??#t?4??ME?Fi ????(X
??h( ??"`?)?j"f?I(?@????&`&?`?X???*?h
??`? &%"&
?&???h??h?B`JfT?%)N??S???Z??J??F?????
??Z"?h?

?"
JN?3??H???i(??V B?%? is
?
R?bD?f???"?D(J???&"??
Z?H?!J)J*????(???i??B???()&B????J`???R??i2"V*R?@???????Q)0??PV??V ((???0B!\	C L "L?iH????Tb?0?(
B??i??
??

?b"?U??r@????A?Y	C?A2S$"??????)???" ??j?B??????(j*?H!?$?%????JD?cC?
??ELLHTQh???&X
 ?O?Q7`j?(Hd???J!@??4?KSAAI at ad????	h??H:??C?IZ??4a????,&??
P@?R?F?H??q*?`L3???"?????
J ???
?j?)$&?sh?A0???`5T??2k"(??xQ?Y5??????A??6
????cm??~?K!??????0?I?????4AUA???? ?j	?"????????l????$L?A
PP?)
?P????@???b1A@??M#A$?@????))?"?+1???f ZB`S#??J`?d?
X`??!`(???RJ	B??CD?1 C!
I?(??i??h??d
`?????i????b( )h&H$????
?i?"J"d ??*"?b
?*D?dM
*UDAAE	I?D?4?QLAPSQMDJ?- ?R??R?DC,CL?%???\?!??Z?????# tIK???GY?S??k
?		FeH??
?????UU?E!C@? LD??8T??E?	CE	?d???T?	00?Q?DF??????f??&??fBa???[1\?UUQ?%-!KED+?(B???????
!?????="?????????n9!?A???\i??Unr?????????j???????????????`?Bd)0?)8???mIn?1????Cg?????9$?????i`???????L???$??J????
??P??)?s?80??0???~o?}zCw?????????\??a?L??LfPh??????o?X?Gf??&Z\???co????wU86????Z?}\o_a?"??
???PS$9??a?P???H???q??1??????????{???????8????"?H9???//9q??E?MCL??{l?QY[?;?V??????EYP???w???m??U6r#?k%????K?K%???[?O(3????)????J???-??j9????`?3R]W^?2
ZbS??:y??**V=??Zg??+?3????E???]???????&~?u??k\?+?i?f??1.?Z_L???M_-44?j??*?????x7???c?@???mwk?X?M?X?>c????A???????F?? ?/?
/7?????m?<?o??c?cV???6}n?????kz<?????????????h?Q???}??+????>???V??j f???x???c?=?????q???_??????????lU?s???U+|??Y????Mke???M??????h?h??+I?2A??$6?:z;??5?m???"s
d?8Zm2d???~??????3???+??J;?(i?????5??R???	???1?y??n'}n??fu??=G>3??0?1?l"??"D?%M;0???v?o???a2??E????? ''c;?2???!?E??
?????_,?F?wc4?? ???E??_????hE<2"BU??xQ8???n?d?*??|v?*k?l}?gg?????w??b??|?E??A??!???<???{???t#?2%?BC??z?u???????7 u
?4 at y3qy;?v???3??h??eu??P??^????H???Wh?q???eT??????q?`????U
9?k?j?g0t???r?mWi?t?WQ??????????x?g?^??,y'?h?`??~!?????`?=?????Nc1V???^?'u??(a??????????{???++?g????^??<????^????F?_g???{??????m?9P;`??(a_??q??5???F?l?<qQ?????O?k{??S?u????"??%????wL??M?}?????????[????z?K?//#??j=]RZ&??Q?H????g???G?f???]?????=R?g?yI?c?sr???o??y?????N?rf??`???}_????dN8??Z=J????&oh???v?t????y6M`??????p???8?\?y"?Tw??c????q??^$uw?L~
f??A???'??8#v?}\??$n?2S%?K?1????????Qc?uf?Q"?
(?E?^-O?????D9?????4???c>?m?????^?:'4y0YD???s???*L??q?-Jn
N?z??T?I?^S?XF???f\5q?q#|U???1??g5?D7???u?a?1???
?8????u?0}?:??1?!?/???l*????L?BR?q?zx???29 ?X???
*BI?lq??|![?W?75??s?????????Am???.d???G?"S?R?"?h8@????p???r?TT???????????Dv?a?}??3{G???{?}t(bl??D]?Dv06??h2M?,?N,?????}1?p?x????h??1<)??ce?Dz1H????2c?Yw??_'??<?????$?yb?Zv3?#????t8D'??4?q?l??9???????w	?)H??sP!?U2"#+???????}?~?a?????u?n;:??>tL?MG?\?N?????2????U3?.u????????????????????Y??/#???????7??6?o????]l>?Q??&??w???(??vF6c?w$???)S?????	??k??V#??G?d??;V???q???9???&???Y??"	??}????W]Q?sN?de?ttn??5
F??F,??E???8N:?yLm???#\-???eX??UA_c?1?_???4?U%
??d}???z*???*???4??54??U?-??~???g?????GE???!c???O?8
+#2M???D?D??s??S???gD+>?9s??a???z?v??er5?j{_??????Y??A??YI??-K???u?W???|?N??#??z_.?w?L??YwI?t?O??????!??
?????W??<[?f?r??????????sH0?H"?q7?/??>7?p7C??????8???l?????s?$?/>C?R]???	??U?Y,3!U?Ih?eU??crIU????????y3??A???~?V?y]???<???_&j??n??'??yC?4c?a$??W?????????5??}?<??M????90???W%??_??gOg????qH?=m?X?L???????L??I???r"??n?

Ru?#??+???-??@??"????#??b???^??F??p??b?2??Pk>???3??k#<?b?9t??W?~^????=????hf_.i??????`????????'??7Y?$Y
!??f>?G?k?e?????6?u?s?#Z???66?(je?f???>?r'?
??+cbd%???[????2N?>_???#Tm4?s??4???h?(????1????[/?????"7?????=/<z}???=O$?]}x???????8?_??z?a?pk?Wveo?\???3?_I8?|j??d????v?;?>:J?v??????c??8jp??x?d????9???-???????-_???X??X??&5????6dH??C1???VU?V?t?????j?{4Vdt?dAd???(?BE?JtI??9?eI????x??f?K???
??"!??Z?q,h?EaMp?6?sV?%5k6T@??f1????z???g;:??????HTg??f	?h???c?8?\???>??7?D??}?P???
H????*???4FV???E?3??6??N
???9??????29?O????l5Ug?vU???9`r???5Vc?d?[g@?L}uM??=?5??????c??cJ?F????"?+?F??k/???fL?6?????????L?Oh ???:I#??v????/q?????&?f??????x?~??6?
HzYU????w?]?/n?Q?q?Y>O}3??e?8[??Ra??%\C?a??	vPt%?z?-???n??f?+?-nv????_??x?????gE?????????	?]??????????{?p???Z??@??<???????????????n???V?$?I$???_???Z?}?]??P?.??+?c%gO?j???{??????????T???x?W?b??:Mz?)T?^?mw?M4??_C?????~???<???[-e?<J?????^???O?9??????{??
??w|??UQ?X+?E{!?Am+?Z??^????????\??U-+??VYc???????df?3n??m##????c??%?Q??hS9?Rf??
??!??4=????/O???_??_????P?r??3??f}>??x?\#<Tl? ('????2??>??r????wzBgG???p?F????9???????6??#?????????|u????_|??j??|
W??????????s???^?????G???3????????I??k??;?y??4.?3??m????I??z?OO?)????XYk??h-?$? X??dv????{??S???<?9DU?v'??
?7??UAT/K????h??????C?r???/?9
~{?!??YjM?}?3N?R
?O? >??E?????`?|??Ai???V2?zj??I?3?9????
???R??O??K???aUumd??????L?^?s?34???P?????h0?!$???????????L]?w??9[???]?=???z?k??????Z?????q???F????iI???
.?#?????45???]?Ok?r?M?$?OoCA~??????????	?;<s??e??w

?4?????#??Nr?Q???C???????(?Sd ?&4?Bq?D6T:4??
*?????Qe??????2??8=~???)?(???d??s?T?l????YCU3????sI6???'A[??9?,wUDJ?
???>??w??=?=????}???s????& 1?D?CL
a??|?hP??????@?2W?v=?_v?u?M?h???:?????%)2k:u?rqs??[I?d?w?l????Dx,??=?<\???H?????,y^?y|?i??4?G'?T??????2=A???SIW^?h"?????#??t?}??g\
?f>???w??,?4w$+????Y?3??a??-
a2???v?????'????F?????5V?=h???????????1?	r)	"???h~q{?u[????????}W#O??Mr?????r&H"@??9!dh@?0z?Q?V1

V???F.?8PM???FYYGI??2?k?
?)???LV7?u?U?w+??QY????)a? C?????2fE???Fae(?X???[?n????uh?/??DY??????s??(x????!B??!???t}G?????1?q?U??{????>r?m????0?]5??Tz?,m9?g?R`T8?G#y?V12???_?-Q.??[j?I~?p3
?p\T?q??m???j??|3?qz?9%A???X@??}?`?D?e??????%???~????P???????E{4?????4?J??????\\?]?q?6;Q??????h????m?)????>?????U;??1?vJ|??????2Z_8??b	?????q???????	
0??P?PT[?????????)U-?CT!<?wI??[n?????4??&2h???
?G?????L?=??!?3???t~0???}???I?O??d????n??a=?}&????:*-?????q????~??]P??2?F2??????'{_2???8?0I?"???$[Q??OO?v?????~?-s????T??p?
\<????r ?s)C?n-?8@???UQ;Y?????G?>??C?%??
K???M(??????;(????g?????-?????'??MVE?Z?CW?????????R[5}???;????n?e?MM???W?????4?w?qc?7?W???????L??3???!??}W?g???????1w?scd??3?&]a?E??d?0 at C7?g?????=W??6????G's???????s????Zft???_???6N??'o??N
t?:J.??+\?[3%?0c???????'?A?,??G2?s,?U?EE?z?(6?t?N??9??A???v???W?4m?L>?H1N?'??(n????D>^????5??,??b?w?9?&-0?????'
???????@???
?.?????)?gbi????c????j;???S?qVJ?c???!T$O???T??P???C?>O54??|[???)??,l??j7P1?idh.??Q ??*?13?eF?	'?b?o\??/TG?p??1?Gz??h??,_A??????eR??"v?=???H?j????Z???a???|R?	?1	.??}??>P??*?s
e??E?_l=n???(??L?y}???u?|????B N\????ni?g}??E.QD*?gH??c?v???]3$?a?[??'?2?[?/C	?????0?*( I?($L???\??>$%???K??}????o?^???????????????}??~t^???b"?D]?a&??????|???E?L??:g??????? ??n~>Ms????N?PB'??!??3C????t?`?\?p??F`??P"o$w8?o6?z??)P??
? ??_2??j???c???/yG????l???oH?????@'???D?P>k??
??K?
?w?9
??j????_n?j?[5Cd??EWHs??=Gae??BZ%????k}U&?????b???p???Q??????]????S?)?%?a?m7?p?t??y?C#Q??????Y
,vYh{y??B???]??bjA??t9?Y?r?I13}?@????i??s??@?l??9?U?<?O:?j?d?"tB]?2Y}$}??^??j|?????#?s??0?G$aOw?/????????+pv)??Q??#?0?Nr??
??1cj?y?{????]??.??ui?B???????
J|????D'??qVO??i???}4O?UQ???1???q??:f?3?l
r???aA{'?zi??B?
0~2,???tm?tn???9?E?D&?h??b???????'?t
?=GqSYw??$>?7u_0<???/??!??????w{?c=??tC??Wt???\????????o?a?}???<???0???cl???XRR@??)@?Iy?c???c??Z??_?_?/???}???[@?X?:???M????u?oo)?	?8Vw&?mI???"-????!*
b??9
???=b9`~7?x#???j??uy?<?O???	E???(q?x?:Xyz'?p?I??&????????5.`?Q?t?N??f???5??H??? ?a1???TT??
??'?tx@<?Jb?%??Jb???j?lfj?$pSm]???gu?*WhR?a	???b[?J??F??`?(o?a?$??2??8n???:?z5<????G???w
???S??uq_?J?%Nj?<?S??e?Yh?G8?*?b???]V?U%#???d?2z?N?f???\?\K|???????RTk??\?iC?'3nt?yX-:?9 at 87??.^&Q???{??%??o??su?H>?|S???A?B??Q?`????3????m?G`??)??x??_4??N?a3a???>???;qv?????5y????e????`}??o?Z?E??e??????o?Zs?'u1??>|{n??i??_*?????ctx{>SBBr??E???=/??8l?P?3]?????m?E1b7??2??u??IG??@?li??<x\w]
lM{i?9-~?P???K????{??????s?U???z Dk???Zk4HY?
?/??Gb
T?ih????2h????8
T ??|x??'???@$?b??vnO??C ?B?"?
,$CIDC at J$?T???K4???1??<?1??#????	" d?((???0&?%"`?i?4K?	?D?A2??3??IKPC?!??$MRR???"??`?,??,DAS1M0ACQP?CS$0Q#H?`R?&$?M0?
D?/?????_??WS?=???5?b+?!??]Y??v?^?Z?d?N?ghvW??Td!??f?#??????cq?
???Cm;,n?$"z3?x{x?D?;?3?QN?2?PR5@|??D?, at R??
%RL?I?A@?D?4?U!1L2?DHJ?ST%$D1?p? )"*???????Z4??C??X=E?[???5??-EB?E
I?I2CI0Q$???0????	b?x?: R+??8
PQP(S$
2???DQ$?B?B!???????d?????
???L1x??X???a?,C!&???5
??U?P?f{??=s????	q?x??R?h??#pA?)??e*?l?-?P?????HJh??g??g-B1??!?$?xd?I??o?
?|?xc??F~W2`?l? %?5?Zl{f?e?c
???NnQ????y`?b??(K?s????L*x? ????@}??L?DD????}??????J	??ed???F???>??o???[???[0\?__??g?{?M	??C?????PIHQ$f`????%b?>?V???$????9????B?'|?U?q???G?O????0??=F!??,#* ??,??$?%2???S????je?a?4?`RD at YcI?cdEX?`?D??u?r:??0*I?????NIAELI1e?AA?aY?1RMRV89??p5?????????}??u????)F??Is*???{?????"?
?z??[B?L(?
tfNFg??u?2?b?D??&0p??????????
B????94????
?:??????
5?Pl???
??s??H5k????[????E????G1??d??h??	?7?m??|p??????]?T]?U{w??a?V72?;Q ??&(t????o,,?MA????f?F?{?; ??,??b?7??????D??,?R???m
R???N?)#&??x??QQ??<?n}4?D?|qib??$`?y???.?!?m????Cs???fN$?o4?+??	8?PI`c+?#tP???L??d????KOPG%?qEWUi????X?????s??<&:?e???#3?;??M??P?Hg
??e??
k?>PM??ac????M???????????H???]8l?g'?	Cj
+?
"L??=RixiG??6?z?Q??\d?'n??mA??1??
n?MF/o>u?/?Hr
?????%??F??????.??
?`2
?y~?E??6g??O0?a?1?`8p??????F?G9?p?n`k??/???w??????f????m??^Kh??r??"Ha????Aq???o,?4?4FJ????l????L3?`R?(j?^??0??Xr+??P??-27?(?`{ X?J????? s???Gg?0t
??????=?c???!?
f8R??S?3????`??????7?B?Q0? 0?t?LM??V??????*2B??/?t?g???7???????????~????
R????3?l=G@???5?W?hh?0D??n?]j?y?xy? ???W???y????^M?9l??`?i?pq??&?gHi?)??1?Z???c?9'CA??2??6?????	R??	?3$????@{1	?Y????????M*?^x???\?g?)????????!H???i?-??A?jB?# IE&@???????f}8l??I($G??
E?Q?
Hd????/?>?z?????("?"9?
???-#z?j?r<??I?~R?Ob? ?v3??p??????Z?????P|,pJ?*OO??5?F????????**ma@?kH0LlQ^??4Y?I#?gw???1?^??>????5???x^???4?$?l#,??&?y?(??oL??z?p??wn??
b?:?^p??????B?yDj??????????y?w????-?j????????_???rR?j8|YN\ra?2???C?N:?????p~T?uk?wA?.??G9H?????h,?O?s3P??O?7@?:y???J??u?B??-b?I#E????????)S'R?m???3?#!???????m(31.??????I??B?h?jH_???i???KY???5?G. ???E??tDz?y?$r=???????N}?k$????m????g?????
???_???h???:(dLD??*c??
?$????L?>????	T????fp ?~cQ???>?PEQQ??Q???wc?nz????I???$?EKA]????2?D?@-;pb?D?*$8Af?.%pX0??N??Tp3?;_Q???????? ????x??????????K;5???@?X])?M???C??
C???2?e?#jj?9??"??{4?&??l?82N0????
T????????j?@?q}?Zfh??l??lqN
?u??
??j6W???3????t1?w?sk#?qc???dN?;??L6?????T;0l????????0?LDZ?ia^?s `6*Q??	!?,??????v
n7?7)???
vI&??
Ff]bup?N?*????[??????1??0??%U5`???V?????
Fg?>????S??"??a?JqP???Qb??~?-+t?;`S????jCF??G????????$$?g??r?
??4??H\
?*}?????~???3?p?5????j??-F?????l<C????
|??HL?Gh??>xQ0??k?U-????">???El'1]??B<???A?%????W?mD??)5?h???/???E??r?B???????s8?????;?F?A8N?N???????????=+?
??\??????A
X?]?W??8??Q????
??j??=?q"cv`??o0?1h?3?<?v?I?+?x?????z?X???1"??
?????pp??f1+??k]???#Qq?Y?>????k??0??`TM]?????????M????M?cEo<	VYKMz???????"?????l?D(?a
????
hy????/?!W?????U)?w
??
??&????`?l!????9??Lm?Sc?G1LJ%P?????Ks)G*P2?*X??\D?;??D??ARQ????_1?W??????b?????1MqS`?Ww9$?{??l?#?Dy? ????-\Gm??]???<?????NX??$M2??tBQ?
@@????R?H?4
?????gJw???:?$]?I?a??Qa???
d?)?S ????!U}??????S??"Ahv??zdur?????v??,?bPv????j?C?\??#??3??aiD?|?C
??	??/?1?[?>?-$'???N???Q?G.n$
???h?KG??kD???\?,L?<??5???x??????=?mB:v??f?a??????AY???3,0?*??p?W?E<{??}F?T??9?on??m?????R??<????e{g?8?+jX?
???_?A?z??v??	??`??`?g??m?
????a
e/?a?GvC
?????d?P????x
??@??"p??HX
HZ?B?+?2?i?????l?F?	???j&????("/?.DQ?"?q? ??>{ ?????d;??c?M???
s??C?2X"D?&???1j"?*??'
???
?
A???1??5.8?	$y?gg?F???Kz7?????Tno;???P?/?t?M?????={q??U??W?3?UD?orE?ScxC?MT|?}??P1wC?5P?j????}8??Q???m?????zI]?????f??}?Q??w]??i?9????4q?t????????[??????m3?A?|>?e?^:?????????o???x:??t?T]+??????f??{?=???????9?T?8??t??!|?H`?????j?????B??????????O?_??-?,?ySk?KN???O?????p?~?'?}v)???W??Sj??TEo,go?-?5?9>5U??,?U???????U?KG????W?_?D?????e?t??=???3Gla?U[??a|9?o???-????????????3zp??3>O???T??`J?Q?
?5???]???~<?8

??
?`@????????????`HB??g??&h>#?G?/$	t?`??Z??k???Z??G???Ej???HYA?'_?'????hmQ??J??iY?a?K???J
????"I???:~d?*-??}G????1
??`?????p@)?o??~F???d??d ZC?A?hA??G\???B?A???n
&?1?$??e&R??xyF???.?`? ?.1H?t??2@?q2???fX
f?0??Y?!?9H?	h??n?&o?{F??{!????:????.?$????e??Y???U1	????3	???a??)?????=??
?n?NV?????d???????!??r????a??5??M?
}??r???z,???XQQ?????`(A?"??Ec??????f%?k<???f??P=?A????;??5???<?j?n?1???L?bm?????p??{???e/????!?Y??x?m<?P16?~GB??2?????V+j??1??????9W?4?8Y
i&nf?od??!^y?,o?kR???????Bf??yt?????!&69?????"$2N&.6
??L??fN?????)?(.?<??????r}dr_???%????p???H??0?qa??'???@?:G?[w??<????????xGJG?-??:s<?1??q???\?'??o???????X?d>'?T+O???nzW?j?????I#[?^a?????J/???II??Q=	)_??[?h*}`?T?????
U&?7???????????0??x????C?R?w??r|???w??U @R?4
24TK?t?"?)??	??????q????c????s???/??rI????`??$????AY?|?y|??k>??_?U????????<mE?!???yl?,??77}??7?????<??5?O?u|?]?????V??+/??????c?<!K??;?ps,?s>:?]?m??C??p?n????PbH?R???W?^??BDI?8p??q?_kc??0[?
????????z??~X?/??T?x?I??0?M?C?RU??%????HO????=?[V???{??y????t?q????~?wa??????1??????????TV7I??3h?G???='77^?"?)?????????W??zC????$?A??.?	h?u?2S????!??AV?????????? ???????1?????`?!Cj?;????>?k9?U}???dQ?-?%P?azn?{t???????Pl?-?QP$????
c'??(<{E?????w8?5?8??u??????????8????IxY?$@?????3?+???????????A`??
???3$???J(3?k??z??i?v???E!??P?-??5???*?!*?.??k?y?>O?D:k?????E?Y??
????Fa??ZBA?8?>??????????????????????s??\??q???PH?c??U
?_???r??%O???(?>?*????AA????????p?e??!F???5O?%sE???R_z??? ?d{??S~??|?????4???;?????m??????`?M?q???r?;??1?????y?????uw:?'??w:?????;?6|??|????v?c??B?
i?J<???%??D???m??{P?R?_?g1??L?x???o?p??E2(????6?s<F?CO?V?????%:-??m>?m????????^???4m?m?L????e6?5L????$S???-?FW[={>w_<???VY|??(Q???
r???![?M?Z%?"?>?)HU???Z?6Z?\9?N??+\?W?.5?	??&?7W?????Z?3????[????;?S???!$??????s????$???Xs?U=MY,h?J?0?????O?Z??H?}z????*dp`????CJ???)?Hh4??
???9???????0??????????q$??Qy??&&???j?>X???B?F?????%r?qC0Y??1e?????2??(>???wH???oN?!??Lk?v???z??Z5?{???O?????????5+?#7????^x??W
??5??1$???H
?ow??T?a????54`??? .?8????M?%#?
H?3f?T?Z??H,u??|?#4???F??q??
/??w???????????v8Eb+J5?!?@^???8?+?/?????}[4??L???0_???&???yt`PW??,?7H0?????RU??`v???d@?C!?cB??`?@u???4?/.F???a??j185k?????d~PU???I?&??E!|???R)??b??`??P?m!???C?^????>?P??D~9????Z???????&7??j????}n5?????]?8Ub?-?M????_??J???~h?K?????????>{GJ?>d}????\I????????WT?4???c?????MPY?%.8???r?F????????5Q??+????-jQ????OZ???????M	??i<A8??,i?)?a?;????"[??
3?L???7??? Qe??l3?)"P? ?=V??????<???P6?????:????{d
m<?.?Z????
WP????9?2???cB?j?????9???n??/0??@??????>5??????4?M??!???i???Q??????Z*,8?U0m:dA??????R????3L??bL8???A*C?J?h??:,z????>???3???X?-W???#?(\T_!??
T???R??????-?? a???n??"B! ??	+???0y????[??s.?|?g????a?0sI`dA??
e??_?)?;???4???????<?h??"y?z7????Q?
?H?`=?;?J:|?bAS??DK??&_;!D??I$n?4??A?I???5
???I????uT?h??&?C?)?bp<??M???AbX?dQw,g???}t{?s????DX?a??T'???EJXB??a^??:"jQN??8?r??>?v?I???w!??>]?9???6???Xk??qL??0???a?E????~X??V}K?^	? !y???%aCb???[?&?dM??0??2?i?c_????
4K$??Hl(??V<C$_??/??-? o(
?
?
??&?W????????h*9&e??f?H??w???????Q???z???P5????????	!$?????????=????<??	??Y=Gwv~??
$???? ?UMA"@w??
|???o?????????k???@?>v?j&<???8???*???X???C?hF0??1??Z3v?ZZi??#dQ??R?t?D?n??N??3y???B???va?`?;??/??=6S?}\)HEK?????u?????
??.??|.?????C??$?nZ?`i?1??M/???%
Y???7????C?3<~?;??tk?? @P$RE$R????p?CO???w?7?Kq ??]??
????????'2N??J|Y?tYp\?8(??J?7??????Wv(???6?????W>????"c~BH?????????g?m???&?:z??s??v?:?Q?&DDpaA1?^0v?[??e??`????
Q????.;??)gk>"?og?????[<???G}??nuW???????^?|?F?]k?j??	???i?????????;+]???X?s??8>?cVk?c?|q?}?)I|???:????	?>?h?-Z8? SZ??W?/>%#??A??C???3??Z%??>?????M??N???????w?
eY?uY?O]<??Yk?J*K???a???n,?4?!M5KH??%LKi?#?Zg?eI??Q??P]V??#N?Nsy\??l??W??????+??(??}F??4???.[y??????0cC???0?*???sz?%?*??*?\?+L?h}MH?4G&k?@6MV??$?O#??(??( 5?AH:???'???}O?????I???2_??c?]C<((#^?;uMH?Y
?lT5C/n?jrn5j+Q???=*K??%\47???[?~????U?)?/;=6|d??FM?94?bY??%W9y:	??e?D?UE??????:
??? ?]A??Q??h?r??>??Y?W?t????j?{???nS??-h?#??&?5n????[?)?
J????????z?&6?b?Z?uYt]?s5g??2?%??Zg?M??F?\?<??+2?~?>?j?????v????N
????i??m??$????#|?k??[i?*?????!?R???q?*6PN????4x?
?t????H0???l??,? ??gC???66?K?E?"?k???8?>???s??0???d????L
Dz`??F?oI>p}??W?????66668??(??(??(?=3????O?sU
u???R??O5	?	~???QL
R?V?	??1J??`h?r??????LI?k??O?????4[?;?t???p?H????c??o pg;q?M4?CRg?*??'?d=?i??	U.?q??????????&k?QL?j?Fj?d??s???uq?#?????;????????D?5j??*X{?????g^A)?_????????????????Bj?.TIC?\1???*?I??????J??Y?}??Y?%C?????hL?????????c?G??k??	rwv!e;!?Y{?j}?^P[??!?*???K}R??;?c?tW???t+^/??b{??4\SeZ??i_*~|???M?
?d??
?3{??j7?l?1CPo?;tM??C?ct?d??x3[?????$??%??`H?=SS?d?#?n??????????_G?=?i???????O?????4B01
e????W???j	a?+??L?)??w?+
boa???;?&??%?/?R?G?^?0 ?e'PP?u????i*?????????4{??????*??G???7=??4?|?Z?????S??L>????????\??hsKX???`f?M?u??(45?t5?nd^?k???W?/?H?????u?^?:?b+})??s9????X'??O?Z[tk2o??lS?^????mI???ok/?????\????8h?*j)2?.?<n9?yF?o-\&???S^??b???????
?????a????????l?:?=b?2?'?6sV'???????s!$?33y?/+I?M????|??i??n$??ue?
??~???????$?????????
&IS"C$??U?q??-???*????c????8?????`???X?????D,x?????^8m7f?F?*????3")?[?!b
?@????i&I1:MX.J?S?}=Y?|??A??????;???i????n???y????
y_?ut???-??BL?m?L??Nbo4?????k???)v??PN66????????I????Ju???1?R??|L?U?:bJT??D?rO???!:????9?l??3d?p???B????;y? $?L??????o'%d?	?0?ml?&s?#????>F??_?.$#?e?@???|?????Vl???76?]?L???S?=d
h:
<Ex)L*
B????y?u9???U<\??W[?_??u ??3???h?????
??N7K???K?*?~????E?3??A??????1?????	?)?8???
;??d	??5(?[l?Zmo'c?<q?15?E?C?c??[Vr???B?j????;?*1}???N?8_e??>???UBQ?l??nS???????h???Hkg2??????t????M?C???????-?K?:S??xn7ga??U:r??rM
?dR??g??????????/H????M???o|8??I?s???????~??q?g\?CU'?3#??fnO????Qgf????Ai?Y?0??!P?w?r$cig?+7????WCP0r?q#r??i[?M^^_"?T?"????F?6???<PyR??4?+Ln?o?????{3{p?<?V?????"?9??'?_?~_wm??G*i?@&?8?'@??.6B9]?@?Q??!???+4Q?j$T'
?#-*??|???g????????
?g-|;M??h2?????S???J?C????????s????P?%-\e?~?????{ln???????W???5??0?(
?<?Q#????h??????J
???A?<?_?F??^
*?BB????I?????????0?/?m*?? j:?e=Yo?z_??'???K???Knh?????{????+?b??]!#??)Y?'????
\u?R0a?u
?<#??)???Xy#w?y
?'?1??????w???s;????@a????????:?%???N?q???h'l=??2D??? ?/V???\I?Q???}p{?????PY?m
?\?Q?p?pX"i???A???????cZ?????F?J2E?p?H?>??!?7?l???'??;#2'0"????J?uA?:???Q>#"t?q????\????a?}??????X????+	??}?>?D
%<???D??9??Ac ?+q?T at i~v?G?wQn??}8?Ii??0?kJ??H?2 1<?????0?T???n??N?nZ? ??
ec?S??z?

wjmZd???fw?!??yE?Z[7??-??M?????:?k3?|h??-???
Cu??T?A??V*?uR9s?I0?w7\????7_BmnDltB-?w?1{??Mo?O???g??_>?,*?y?PI?U{??g???m?c??S??v??????,?
b,?$V??t???T??{??I??????
!?%?n0c?YC?S?Zu??U(3??D?\]?B??a\>
v_?id??b?0j"9??3T?1?
o*}???k8yk?^????_??E???k??c?????Th5^B??VD-b???i??????=g	???????/n??^J??|Z,????C??9?????$?9
%3]<??t|????bf??o?D)d2N?y?nO??????J?@?"6P6???!??Q5?*???W???h??V~+7??ZT3R^=Y??????30(??gkm????????:?!??=k?4W<`l?0?+???(t?U'???????H at I??Y"?a???^_???7??2&^?}:w?4?+???bC?=m0f.?$?????+???R
?$FT
}?^?
??L???>????o??u?~??????0?????{?rj*d?G??V?F???n??%??????o???l??'bjO??-???"???z?0Y?@??f/??s1>5??FwRNZ????????(@.
?-JJ???I?%j??^?BG??9?\wX@??%???C?(?????@?_ at y?[?????1??L????????I?~9?x??g_??.?k??T? X?:?????ye??{n?(???????g
???]
x{??950?+?????k4????S????G?d?
?i?????i??e??? ?-Ps@???????'?N?S?pQ?n??A?%jN??1??I?3	????&?U????????????
?X????U???1-??G?\as?????_(bl???:?QK?? ????P???-??3l??????Z0???. ?A?f?&x?W??%b?<??`????8??-??6?n7????y+D@??[
?6????L?"??^?d??[{?&ZUw?????D?\?W=?-M;?T?????h(?????.o??/%K%??2y?6?}??F???d?.??j???????N?az??t?\?p???lST@????D???w???

X???[?1CC??g?]b?,?W.?%??ZhSuu?\-??|O?=?+^????(?~LE???>??U???Z3O}g???#??lp(Vh??????E(*~?)?U????Ta^??????k??Y?84?????a??e??L?
?]U??O=z]R??????W????=???!???3?}S%?<???/2??-/?a???Ro????????Y??a?)Ek(amC?????<??Qo*??.?p`Erj8&L%??T?}\6WC?????(??Vy?L?????`?55?AD?3????r,?k
???
??y
p??i
!G)??
fZ5??#?*?8?_?????['U\???Y?`???_????J?????j?$?JH3????YYH???8D?2$??<????'?{?????q.?l???G?Q`UNc???J]C????U54_Ix???|????6???m?Ba?$??~^?????E{??n4J?????)c?u??f??|/?V??	4P	??WI?y??????_???????7-?GI????#??7?O]?L?+?E?xdq?????????^?5??0???z!-a?
????8f3?????-o2c??????5p?Fp?N????#l??T,??%S\?5P9&!???[???????D??6_E?t?Yy/??m?h^??????Q'R???9R? ??c??/?????oX?J?
?(??yU??}7jb?'?Z9????aQHh??S?ITg(,?M?????8i?T9?d
d??f?}??%e~
v%C@?M*??V????8??????x?8????rS?S???Uv??+?C.a??.D??5?l??`}????"?O?a??j?o>~???9?/??R?q
?Zt????q?qy??????Z/??n~?:??#Z?????|-?s??&??h??????}?Q??c??=?????L)??0j?ER??F+l{?i???|?"ETW????q@??????????8?fpd3!???)??3	23[&?JC?yXD??????'}?x:??K??l?[???????PTL?;
j???5?2??>
e?3?G??p_???Q!c"?B?R?
????x????1):l%???-[J?????J??w(?$?7?U?k?f?]ji?/6??
????IXW?K?
?3&"??PVY???:?????
?x???u?????????TG
l?M?&j?	+???#80???M\R????V??^?zu????J?M?l`?-?cc??%?84???*?3|?&??Nu?j?s:{??h?.
s??????j`????:?A?????-?>X-Uq?????./?DgG??n?????cK?)Y;?P?????Xp?x??y)????]???^6?K??5?iVj
??]?Y?%3???%?D|??C2?f??A??=Y?t{??M?}N?6L????A??9?"???????Os?S|?,:3??|F?	??E?NL?+????}I?;?n1?$??fT? ]J?h????ga??????? ?[?S?	Y??u?r?[n?fH??Jz
?q?????????"?Q??=
?m2?kU]%|?&k??R?w$ai]?X??h?Y?i?(?
?$;??S???B?m?????xi??Y????ytT?m$z3{	?3??J3??\By?UPu(?W?g?/??TB?\j?????b??$@b???Hf;2??u???<?{??E????????{}>,???z???xB?E)?yi?N	{'?%??????i?V????n????` ??<V\???&>I????)4?'-P?bs9&???.????5?p??????is9f.1
1uH?H>/?
U0G???a?M:j?l?eW?b?? SS!4?8;??},ImdN?3u?Q?4??8??^atTj7?F?e???W?P,F?@H!?
l~??Z????i??t?"?M5?
???$??Wi6E?J?q(???i??I\YKr?X@??????P????
/|E?????=%;?????,}f?d?r?????
1????Q!?7?[W?eD????A????0`?"??}????????4??????3w_-??~?X????9????Q??x??[????zZ~???j??i??U??~<j?????92d?????T???e?h??W?a?1j??s,i??A?7?Z??B#r????I??X??b{3CSjH|%
"???X0??\?6bn?7???-????#??g?SX?n?"?T??r&?'?pzj???^???%qik]??tc??I??z?t?7C????@?"P0???mPr?????Q?$??<?ofi????1???"b?!?
??
?????Q+?+A??5????R??????<?L?E???=s(??Z??
??F?m2Z?P?#???{?{j?g>??????kC?i?\???]|~gN??? K5c?V
?2???&5ho1^?BJ%x?B??l~?H????4t???7b????)Z??,.i???Pq?X?o^??????O?
b?S>:/???x6?!??s?F???v?ao???/?#i???9H}<IV???????????h??	?
![??5????UYlO
??????$???w?Wu?Q???SRl?x??:n????$dp????T{o?e??,i?
????????????!	SN?Q??[J??LXH(G?1???[????M????????Y;?
&??????9`??aPh?z???]?c??$????q
?1Y?????Y?ZqY?{??
+?=?????????????.?m$?BQ?F???
SW?Y??
"??*un73-"???^?VNO?????Bk?@???	~]tD??N(-??H?`I?nk?l??Q??P?IP:f?i??'~x??W???:S?;dW???
?^???-J????Y!??'?j?Ye9=???0P?
:oQ&1d????b2(?0???aC?QZ?>A??z#??p??k?????`???????h?wZ9??N??5??N?-??`??9??Tf?v?c!??L?7?
????R(?bHn?m???)$??
}?????O2p?1??????W???)_`p??*??i\??????T2??+%?6x,k?	0_D?0???{?
??%{?b\?|?9eK?1?N?&7???
bF????j???????i<;??u????6G??YI??!r??#??f'y
?9??8???????0\??k\??????P)??????N???9???P????T"C???(???q??$w???:Y?S???"h
???GWEP??.?2?d???Us???????????p?A3?c[?3k@)_?????_?4?????1??????/@??Q
??}is?8???p????0X4?f???c???ll???m?P??^?u_?TxH?3k?[^.??I&|????(?????A????N5W0??*?j!?r?0+?Ua???????v????E?L+????PU??Ns?G???yO?????Fq|:?'???y????????%Z????r? ??P?V?o???????
?!f^?Y?1>??|:?
?w-?MX4)$`R?tdDUs\W????J1???T??????Z??	????d?`&0????o%?7z??zM??
??5???x??????????q	??E????????k????pW?Q?0??,?L?????^Y@?t?p???3o????5U??
?~=G??D??
[????i}?{??pbu?a??\?0ML4*???*(?28u?K????fQo??9?S?????Y????Ag???C?Cu??pU??Y?P ???4hd??E?S??Z?{?g?.?????Cl?I	???04??m???|>?#????4s}?}?!G-?:=p4?A?"o?6k-?>?????o???4m$?e;??Q??@?????z|?1?/?bze~???6???T.?z??*!MC*???%6Z?Tkm{?&?T?F????0TD??iV?*$GZ?VM??h???g???????XB???2??#??{a??,Vfe?-???\M?4?x?\????e"i???FKpN?+c???a!?n?CyV32a1???uJL?????????'?!\??H?OJ??|
|?7?96y?|r?2?7?5??b@?p=l?=Vv???9??7[????F?G*]?+???!?????w?c???FW?m??&O
??|~?p"g????M>m?@I
V6F??
???F?_^t?
???(????d4H?q????)??|z?Wgm[-?cz cy?im=?q?:W?5l??{I?.?n????7h
??T?r??J?)??p?@h?(1.-?'??\W????x?3??CNdc:?iV1H???????????5F??!T?????o??X?/c?w?V???!??&9??????0????+??A?d?26W?8_??VT???
?Z[???>,j???z???_~??[??6@?
s??'`v$?Ob??}?,???N?????k?Cc??K?z??CA*?9???g??<1T????{\.?Qy.?<g?75???2=?i???6?4*?z?]?i4??/????i?Dty?+>??+????:q??s? 4J??I???i+?t???aQ?`??X???X?
?f?????O+n6?_????????.??a???*????~/
9?#~P?|?3H?a?
ky?<?q???1IT?PjB??5??h??p???]@???tB\??a?S?p?#????L?
?:?#$C?,;B??"\???L?????v?Dq?E:?'X`?Y
Lf@?5?Y????Js;
???q??? Cb%?]Yd???a????>`(??W/K??????>??i?????i*?Z???6????????dB_??34]L?{??1?F6??N/?tU??3????Z??X??VBh4???x?i?9?????']y??S????>'?mF??!)??X?"?d???H?6??+???G~???_??,??
?q????}s?=zw-i?'-Z???????p??vc??:???LY???Gl`/???????P?1H?
?Xd% ?X &?BX]?dB!:r ?A*0/?nZs%|4a????l?????=????
?~?w????8??]?????\??\???????c-?#??3??,
r??s(?a??)	?Of???????U?_n?8????sY^D?
L?[,??Vt?M??????????/N??Qge?q??*~??U?\A??
a????=0x???y????x<
x&???c'?z,???A???+??*??????????,?e2nk??p?{??<?E{????<??k~<R?a}t;??a?1cd??;u?L??`!??B2??U?U?????L>??`??g??p5+??????C??<?????>?n??`??>?^S????:?Y:?F)>???G?Kf???7?!8??8?u?	???'S?qtP?'??'?u4z???0???T????????2??Z?<{=.???r???????/=??
?????Z*?~v?19?7???b

?@D?]??#??
?H?Q#?{u??1??????x/0*T?Q?}?6????x?9?????1??????5????????4???e??"??E??e?u?YJ????
1???'?
?^St
?z??p7`5)?j?PTh?X????mzQ}}?/??ad?????????S????Y?_?=	#?????<?????zgD?SDL!D?6R?ddTu?g??5?r??+TV???b#???2+?
B4?a??kV???y4i??/iy?0Lj?J\?1??6?T???M?(A??Bl? ??3P(??Xm)>????8Ebl???9m????b?s??J|??R????????^?R"???9_??a?Y?W??=?J??,?????????8???
?(???>U???N?mm?x?G:?1?%W?M?a??????}?{
k?5? d??l?k#Xd???????????? ????f???Z6???V?%\?H?T??-W7??5?8??-??6??u>2?iB?uI?????X???U?R?????Vu?????f?~?gmr???&+??$?????._???j??OF??c????kf4B???-p???.?O>???M/?~?*]_8?j)y??(?u
???y??q?]?e"???_??????aO+.?????ylu>z?%!?0?
I?;0?	???MqVtQ7?e>??4???)????z?7??5???'???wX*?j2??L?r?L??W??????????
xFsi???F*8??%?yJi?5?z
r?`|t??r+6Wa_0?E??6?W??S*??S'\?&?+T ????q???4T??d[?:???KG? j6????Z?$?.?5?T??<???Wg2.?
????37Y??????????n??(???
E?2#4cE,?ge???^???????l?????
????<??????O??X7??R??	R?gw;u?<?u???9??-?Z?W??=???????F????k????u?r??Y??m\'???^???????lp<??X???? l!?%?dce??0??p?n?????C;y?7R??j??x??;?1Vl??9\% ??}??s?(?.)????J????2k??AZ??
w??L??
G??=??????o9k??rsq??2]
u?454???
)??+???9/8?XQ?`?W'?
<`??????
?7>y_|?b!????ItH?G??u??
?	"? ??^(?????:9!Op??r??nQf???????PBT?E??cs)????? ?}?6????Y?%\?kf=??????????'t$?????x??&??N1?(???L???6?$Z?O?e???gN?cx?L1??R?faV?b?s?????G??????[.?B#J????u`7???
 ]??;??'N??&`?g+4-??x3(??`?4_?2??r???Q?z????;8?f]??t?Y??En!?c?y\?$xU	? ????N???4!M--?y?????i(h?JJ#??C?%*S??f?=1&	"??????
?dN?^#?
?;??
?`;?z-?I?8~???!~(??>.V>???
?hp7?'?7h???t??? #O'??=?!a???#w.???&? ?

?Q????

T?Ng??,?C??????X2?fUQ??E9???l??*^y
1???=A????}?????q??# z??? ?<?????+???????>K?W??D#?nw????=????t?_)lw?%@?5??6??hi?:X???_?E2?
M?"?0????? ???1(?r4I/?*
?,tR???~|y??'
??U????????{??#?8?8???\Y??f	??'??
?|vi???2-??????CYP??l?U<{!|ZJ???<??*}z????????????????8??????wl?'???Ac???t?#~wV?????qm/KkO??????:??????????O??????<???F??T???Y?1b%5?+????yb????????9?????UA???7?*Y??ymn?z+[y?!Y?????YB?????m3??d????U6[???H?p?g??%4???!?y0??^0?T1?]w????qn???a??C?X??HF?%{O?0=?N?^?t?Y??NY?o??????*R5?:?z8>/?{??(pK??K????m???^???=????????|~9?3By{??}?$??t?n??uG?E?Ko???P?L kWm????????slZ??]m ???c????G????-'?4zs?,l??r?e??{?Wko???y??3?%:Z?D?g????.i6??????a???>????OB*k?9??=??M?2?????Q?y??3??????t4???
????^?!?`??h?eBJ?.Q?d???]#$?
??=??\??R??hGj?O?U????3?O???IH?j???"8[Uu?-_-?!???>?b?E?????g?6W?U}n????,?G:????W$p????????dup?:??8j>?$'
?;???????'???S_???????=
???JS???(A??????<*?(`??]?????;?x????Fx:h$?????I??h????<k?4Y???N???fzY??[?
h$)	b!??D??w\_??????p??b?y[Q$[?Wd$??C??_???I	$D??Q
$??%#?I??????`??Z` ?YL? (??X??2?T?
!??i	@?hJ?cf&N??9OV/Xr!I2?(qc0??`??]*???H?BA???	??S?`??C? d??*)?$!????????&P?
8?H?K	4??D(T?1?ab at S?ffU?a???a?"|$E4?0F?L	x?0J??_??'?TD
???U??????1?}??w!%?H??p???;?ua3?z????C????????>i?K?_.[??????Ik???%?dV????
H????Z\??l??S?;??????M8|O???
&?!??$??jH??R??h)??i???n?z?%????????B???n??T????uW?b?n??9]?w??:x9?x??b?W
??u?????????????d??f?I????	~??cE?~????5
K!~????_??k?	I????6?'??TQ{}<}>???
?
/f~?I???$????&????????:	??[?im?"?yGI?A??d?+?0~????|~
????W??????????S?h??2lm?F?w??8?#-?)}Vh????(~?W???L@?&?:?1F?7?&??????b!w?v??}??W???$?k(??yU?????[??/?????T???????/??????i{l?_W=???????Z
?S???=-?z???9&^??PP;=NIq?>????0?j?(?l?1?]<?:??N???y{??O?t
:??O???<h?<]?Q?eYc??????Z^?1L?_[;Wg?h?;??o?q???N??S???X?????-????1??UC:?#??l6J????i?????$?d?SA?8F?!??????????}?K??_????9?w?'???????7??s)B?V???YL??\????]??*??W?FW??m?#sv?Z@?>?Y??vff?????\????b?4?,v?Q,?p?????????h?????Q???
C=?[??0?A??
??@9#`??l?N?`L?+x???8
?*??gl?Q??0??3?Ej?~?YW?@?C%x???ARG?p???q?x?h?X????<?OX???a? ~#???shQ0V0????_zW???A??l$?h??
?r?H?????)II?v?Bd??.T??)??
?KOiA at B}?9????#E?|???Q?_??????
C#l?1"?0??????????%???tK??z>???6?f???1?W?,??%!????9;	?4
?!?OqoO2b?)P)YY?+?Y????x?????0???2??#?#V?JU???D??+er?c????j??X?i?3?!??K&G^???Fk:H?NLl?C??M?n?
(???H?????W$W??fL1e1??V?
y?P???N?7????x4?`?????Z?-???!??MP???S&???3/33N?i??M&4T?Jk
L2??q???-??`8?%0???D?%x????i?$3r`H???5#e??=;HK??(E?@v*?#?{3N?4\
dU?@?uI?W ?%?6hf????Ff? ?	?UBgMhz<\???vB??U??fe??)Q
8???dF??????]c????B?1?pe?FA???T??5?6??1?j?L+!Rh)aA?A???0??M4?Ly?F",?U??4???????XZ???HPX?F?????p?D39(V?7?=H6j???k?????avb?1`>?aS?+
???X0a???j9$??],*LmjIp?????5???i?G???u?ts?????&?4?2????aXf2??1??k-.?a0t
??????<???????N?hn?jEwJ??L%e??Ha?+j?f?*??????1???2%?p]?Uj?"??
??uP	n?h??e,?B??y@??8??	?>?J`??]???
????@???&QzX???????-?
[pf'?A?h
??-?????gf??4????z??xz??v????xkX?????{vM????????z??:??1?(9l?-?q?9+?`??
:c?d??????Y?????3r??_?T']	Jm??bQ$??C????b?'?+??????Cf?1??`?i?:??#??ih?????
?l?!
C?RZ?p???&??G??jt????Ek->[?We?&??4?1xXL?diBD:????^}lM???FJ?iiR?%??3W?|_s?89?y=0M?T?S.?????{??????A5E?a?h????????AEZ??????W??R?????
a|?WKt?a]ID?C?F??????Y??B???SPC?.?<6zP@"2?2?S??K????OY?**?
?'???]??=?c
????E??o!?S??.j2????.Cz-??i???J???z??wI???:h?T<????[?9?{?N??llK????8?F?eP?2Q
U;b??zV?Mu?	????F???)?87F?w%'?9?8?A"?
]<I????
?>???%f??C??UB??e?=??|?)????????W???|? HB
?d??y9??????J+$	??<Ye1??K	m6Q???Ofb?9?%??lh?S$k,???4T?8]?v`??h??
?l???r`/
???c,????$7l???a????????.??{?]???h#?#`?1?)?????z???z?8???Bh[)R?5G??6;#???????? C?d?(??j??m#q?W2??y?=H? ????H????I+nRQ?QII??%?????	[@???k
B4?* o lAY???!?????r?I4X%??m?$?yW?????Hg?+?<?l:????
`?C?????<)???B???2"?O2X??????????8?M??5z??H? ?5|?]*,?R1?@?}?#l?{$(?4z
??4G/I
|4?1?
tK$????AQ?;???{a#n!??4,uMrS?N?]?A2?< {c?
?7?|?X at J?@d?4???]!?iPA?4U ??P??f<c#????K?S?U$4?
?j?h$????0????\f?H???F???J4@g?6?????A???????s???????n????)6?J?/fX?_iA?? ???4????? ?
?

'??k?XL?fa???#???
??|r????p??bRy bv?_-pB???!^k??)?E?5^?g???o?,Q[?R?e0??5?*MT?V???(?,???e?l?????90?p?~??????`?Y?
?J???????? ???9???C@?Bl?Q?xMA]?9?Mp);9?JsU??y?QNT??2!N??e?z?%x?
J???7:?%1???a?s2mr?a????u?O??X?Y?#,7?2?IP??2!???4YcG:GZ2(?<L-???i+?A??S?ul<??
1?J??'??		o?"??!?f?1?????Ia!??kF1???v?`??CZ4?????????f???????+??Q???N?i?e0????u?
???c<?FtR?rw?????(??#Q/]u?
???sHD4??p<???f?R?????7p?<1?h???
?H?????"rA?t?UA??L"???@?wF?7?<f??9??? ???.??%/?????????"??n??,??]? ?X??????h?I I$#HXX?(x
?m???_
O???A???!???,??P@????v[??T?1_}?b"}G?o6????;.????
ST??????C?aT
?1??4??6P???0?F??ha??????;???`%.#a>?AB??&?????f?/??)??Pt?t???(?1x???a?u?be`????R??T;t??f?T
????r???
?k??????$???'???F?????&
r?6)?6???!????Y?#???+??????*??????a?hR??lz?T?????bm?g?Y???b?/
??Sh`3#	?G????.s
PC??A?@??*?B????
~???D)A>?
%?``???????
???I??Q?j9??????c?FC"4?Z??/?%??
????
?CB`d?ZX9????M??>yw?;h=??s??? ?????l?j=S%????.??#??"???C?????C
P??\SaP9?a?z?
8?????,????a??"??4`!???84??s?im?????d???v??^A?a?s0?Y?[4??
?jsq??E??????-??2P??????e?W???&%?|{:%??i???`X]q?a???

E????P??8??}~?????-?t`??C????V?c?k????k^??+L2;k????	?sTy?*??,|?????+t??1Xf??????$W??)????VP?I?d`??????!
?rC	?y??wZFG?`?|??W???"?????y?zQx?2???z??30d????????w???O7??~??g`??O??! 1?????G???????~}?????? ?_??e3o?Q???W{}???????]K_?sS?k??????;m????<?xp????a?k??S?C?zi?n3?C5????(?+)???j?
e_??~???N?G?yq????U???4?????[??g4k??-9??L???8???<??#????D$?????Q??|?7tg?\dg?'?u??ecc3?pw{???R')=??/
G?8l#?:????????
??%?e??X??????m?%??Qq?^????
?E
??>?(o?@
/????O?>???8????|??E?,9?m??@???a????%??8??tl6lv?0??Q?? ?Q?X@\??
?_4}?s??	?"!?e?????<???6
?TC?$?52
??E*?"?&???DC????????"<?W???G???4m???OEg??m-?*S??$%p??/?9m??_Q?3???I????R??yb4D???d?
?_?r????CuT?[g?x[??,??"?B?Bg+?)???
65?p?u?=????k;??T?Jl5'??\#Y?A/5?iv?x?8????j5?L??6Z8??p?r??o???5mmV^D?6??Zi0??J??vBH??????[S??>?????%,x??tj??o?C?6??<?????\tD???Z??!?5??:?y?0|????l7?24????x?-??H ?o/?D?})&??w??????uT?4??YPO?+'??E??5???lg?c>PB???w?s??5????#???(2C????d8?E?M?
O?$?T?A???=??O[??p??7????D??T?]I??3?????_us~?}??????	'E?l?x?:?'
?q??7
?$?r?]9?dK[x????=7@????>?????1????Rw?KQ???;??q??o<w????????=q??o?HH??Pd???-??7??Gm???2?c????\w???09U??5??F?W?1???i#?Y,+?)????x?f?6??z?q?
H?????]n?f79??D???????'<?7Q9A???T?!??,?_???S{??:?&<g`?;?????oP?9?r?aL?????h?Z.p???=%??(??x] ?y?k{?????Pu??a?[>???%?nY?U?wg??Y?o?Af|??8{
???????j{uqk????k???????}|??+??S??[??f??????.B?
???(4?W4hL?dP???+h?\@0?{92?? ?	???H?????>^y??????}?uA??wRH?J
??????f???e?v?o????C????:$5?WV-?_???7?
??3(?K?*?yy`w????bLM??s???231c??
W&=1?	?U2%+e????76?????Z?x?}??S??+?N????:X??\?O??[?,?*?vvL???_??9?f}??E}A???MC/C(}Q?2?C??3+???&?'Ap?G??(?????;?H:?????/%Y?S?C$?_g???,1?c???[??2\a?7O1q?????{ ?y???>?}??6?o/5???S0????WMUW?w?2v?0|??????xm?o????<?=??>?-t?l|x?vb???,?]_Y?KVa;?N?[	???j9??c?????ZS`Jo	??w?=??r???mmMST?i?????=??i)`?p?^?????{z\n}???b8?????m???5?E??uXFYQ?bEG
???S?'?M?N;	D???u?]y?\HWZ?%?oIn	j?????g??l?L?]??hu????tT9??;??>%??U?Q9#?????q4???4??~l?70???~]??^p.??4&d
????????+?_g??f?D???9~3?/? ? v???!?B=?N??M??ps???????( ??y???L?'b????vF????[,?????|?YufY??~U???j+??Wf??????y?lh?~?????u?}?0?'2???4?p??x8?}??,3y?[
????????n9F?^???\c???6??
????4CuH
0????
?????????t??????-E?MK?[;W?5?"?+;=??K??q??;=u?g$?e?:&?u?Fj????TY??Mm?5??K??~???o:??????S?jqVU?/?}ytr?z.B??w85??t?X%??f?8?>??F{????`??L??,N?k=??F???T]??	:?H????D????4?K??q?CK???QIY?*???+????!?/????????Y?/??N(??!?L{??*a?GT??Z/??s{/?6??C?w??"?3
c
???PQ#"?~?????&???hOG*??i&?????v????d8?l??SP!6????? PH??@B??X??@??qJ ??X???uh?H?C?S????????0?MP?fj*??"?L?P??C??q??????0f??L?
q?,??#*???d?Ga?
t!?;G??WP??c?f?1???????V????|?eP??*yHW?~??VT?|???
????M??l\???{?T?
??@??h0??\O?q????l??,???*8J?u$W!f1	*F1?T)i?
+????3??b??>??V?M??,?M@???q???U??Uf????sT??U?f??6H????vk??c?]?_Y-,4????yj?z?Z9????aiVF0#??6?adN:?t?
???????F?x??,?|??e???+?|??F????????LugR#???q???b?!?????g?????n577??"???G?????????Z??\W?~???K??um????}??
CT|?v???H????? ;?-A???	K?h;??	??#??@>
??0??m(A?3?;??+???B?e???$???]???cN???F!?kT???????uE?Z??=i???m??}=???[?}
?=?}??????]_???-?I??????*c??>?f5 ???f7??i$um?R?8?\H??;?U
;?=?*k???e])?/yAJ???g?y?mG7
aV<??????9??"?Bj??*????????L/g>[?K?????5?vT98???r??v?k?@0?C???1hn&R???<?9?MJ????? /???9!?? ?t{t?6j??_mq?E??????S????mN@??h???h??[?a?zv????1?-RV??^??g??u"h?jO??????????";???(>?nmADn?????s}??????,?>]?b? ?P?(?q?SON?mA?-iFk??["=??R????????-5u?)?u?%???9???0`*?1u?b????[Jf??N
??????
:<	"?!?} ??oG?A??}????????????2??
????(?)?aa[}?v??{'R??.???\
?!?????\??P1?Vt??7?}9j???T?l?\??"?????????NLX???7???!??e??	}??
p?????????N??(???NZ#l?S/????)?j????w??????'???????oYA~????/L??J??u???%??0^?#?M9?>?)??%Z??"?;?.%RdaY?Y*?mel?dN???`u?Q??0???!??+J\?\y
?u;6U3?&??!r????(????(??????b???T?W???
?s?Y?
?*3Xq(%??
6<5
??????????c??T??e?cG-??3?5?3??x0eO?u??r?s'A???PiH??9*b-???t
}??k?ZC?>????8?	???????????y+??O>??6cR/~???:_f???i???}???b{?????@~`?f???y?
~UP??U!???#e??ZF8???ItA?????!?fA??
A???*??
|D??????????29&?aPR!???G??<?j??(	??3?ZV?@?
L{??????I???_?;D?`?^lF?Y`s?$?0:??
'?b?{Y6?>Qt?m?K???$??" ?7?>??E??r?iKS???Z?<??chq??mg?y?]??`5?X\??uUL?h?3?M,4??q^??????xw??8L?&????????_??U?h
?9uvm???
ttvv??l?<?rrp2???D????????v??????Z????2=??c?
????p????V|?~????a?#??2}??????B?9?t~??UV?lU?aN?:??%?lxY?X$Ev
???>?dO??y???C3]???Gn??rk?0UG??????|???C??<Zv-u?8?GX\.C>}???YU6????J&?????02??p??t???K?qG????@???H??G#
0?>??y@?i?z??D???u???,?u_?#?N[?XG[6?GN??&C?)L??NhY????????zh?!pCR:a]Ak>????w?l@?A|?"??2???G[g????
??0? ?^7&%??L??	\=??fu??M??$
?????w??O
>r:???|?Li?????<?<????_Cudvg?L?b???c9?w?>
3??C?,|?????c4s??^?6????,???Ty???7??_??z?? ?}@?????????*???h<??(??
?_:??M????~??S*eU?a??1A?F????[?
?2e?Y??3???J?Q??)?O??0?8??>'?3
?CJ%?N??[#?????DG	?FC?3/???r??????Y?z????????w\?????J??<? e?uo}Or??K??[??P??f?????????Z?[CY=??oF?5???????????????um?(x??????x?m??W?B?P??T(#Q?LV?????Gw???Kx?Z???;?U7q?:TgT?Q?4a?{\????g???=SN??;^JX??????	s??hi???e?0????f7?x?&b?????Q????AX??l"=gj?1??9Gn/,???+????2???8?4a?="?
J????M??Lk??I-?@??\:a?"???UT?g????4KsA???>???l??-y\????*.?$,??%????????1?????c???"W?
????5>??i??}X??x??Qu????8F?p ???7#^????Q?M??????,?r7*u??yQ?e???????e
'?????7??8?(?+VMj???_Z???c?O??{m?{??c?<?!i?G??IW?S?????2?@4?O??H+????~??Y?????+????9nFI??<e/??????/%x??????""#?~?_?_????'????"f4~?
?7??~??9&?????T?8S>?L?<D?Xe????R??0D?0??z?)#G??5?????"HHF
N???:C2?9?|,s?%?D?W?? ?4?????#L????????t????8????q
?????/|3???3?0??X]v?`a??vR???rWa?	!97E??=??)???????d????#??E#CDM#C0?X"????:y??f??x8S????????w?????DP?4???????y??-C?=?. 2???
??w?#Z??????Ev??B?T}8?????Lo??v???o
???z0????????????b5?tq??`j?o$?g??f???8j????M??c? i?5
?
o
?????U??
????????U?-??e@?8??1?~??+??}??F?

?????&E??U????????^??????`??6.?(v?.?<1?x()???N????B???1$L????F
?!e
<??????*n??4?????
?"$??~???V^n???*???tPLb????h.??[???W?`m??6 ????e1?=952?6>'?9Xr ??xU?6?????dAw?e??$?nG?'?????mM-~?d?h?<?j&v??Z?~g?	?v`=????W??eC?D???m?J???O??=?????q?$?????Oa?IY3???-N?6k????	????\?E????Qi0???s?????)T{???0??eH??8??u?~?0e??HG2B(??g?]??Ps???b??e?w???A?Ou???)D?Y???L???3?v@H&???S??d?19?@??????{?R?+??2N??????c_?????????w :_???'?c???Qh[8>??)J)?Bo?%??)??}Y?$5"X
??AAE='?&??B???????7??q??6?)@??


(?Y???B_4??}?>H???!??'(-??;Pm?"??&H?	Q?S??{?A?????<zP????
???? d?$t??\8iy????>z7e[?????Qd?%K???*zz]L@??%N??n)0?`?}?t?\<??0??|T?z+??????r?V?~M???szh??Nl?4?H?
??? d???&t??,t?8???<'??#??J?EY?D??e???y????bp????j?X????
?=?E??????
??M?W?Be?3?w?1|xm5?bG???E??$j	t??s?????9?@??d???n??????V?}g????f??????*?SE?P????f??q?????/??b?	??@?	?=???j&S?'?'P/???`*\?????@-z?"K?Z?H??T????6?aa:e???<???Jt3??B"???q"J????????!?????1	??h?{?w???J???w?D[?s??z???_ ????b+???1?G??M3F???&"?hx?DE??
:<s?!6q??Gt`h???%???????*???4
?{????Jaa
L?%A?k"?V??A?!???7x??%???cD???D"3?DHsR????~?????4??u?,K?X??Ggm????_??tV{[???W???????1??Z?U????Zg9?J?W??V???79?3L?cj????D??????l?{??;??>4-h>+???E?????+??O????c????[?2G?3??-?g&?:v?L4??g??>&OG?u1???#??????6???0?X?????? ?*?.5???L3Z
???E???>??p??rp>????6?l???H`p?????*??!P??|?n???a?(??c????Wz??e???]`???[??{??8X??a????I?????u?????{?z??????????q?{7}?Et??????DD?)?B????q?j??dA?%%????Z?Fd?;e???????V??????8o???.???a????M???n??K???hk0D????*?d??????~?jD???????M??????
?v??a???%R??z??51?Tn*
??
#1?T?H?KSY??)w\R?F???)?5??Z?SA??i??|?B???J?%??Q?2|H? s??@S"?g$????'?,?Ow#4?5	????G????yXY??<-?#IK?\	Z&w?{??@???f=??????|~?????????y???TR????????V????-/??t?;???inZ??-???i??\?2??????S???*?x??????V??uyk='?[??n???c??cMW??F?`Yx?A~???PXG?/E?w?~N??Ld~O34???;??????_f?~
,?&?fk8K??"?.	??Ls'q?????4v?\?b??1?eD??p!?|J?>z????????? V??\???'`$????(??X?0?L?C2Ut???A?/??u>cQ?Vg?l?k??A?????ZM??m?D
?????uf?????<>?X???c?7"????m???Z?.???pK?l??)?q???N??}???u?<??I?y???w;??]???<Py?5???x?7m@?hI??m7???H2?@?????9O????.?sn???]?4?(s6k?&??????.??m???:??tW?~f{oy?d)??F??#~4?GsH?????sIaH?[?!
?M'8P?3?????????v?????Z??s??1??k)b?i?m??~??f???????||l?de_h???Nq&
O4??rzhM#S?_?? ?D???eK?????1??O?Y?SXg?Y?????!?-?????c?S4b??bMI??=?/???XU??jyJL????Q???h??Fd??{|?B??o?&&???j??dE?
???Mq??????+??Z?$cr?Vs????|?8??CA??????f??>jW????>???j3,[??????????)?O]?fni??]%?}ww4????p?_f?s?c???+a?:(b]?????9???%D1?yw???d!
 S????9?Cll<$S 4.I??????o??wp??/?????('?#qdFI?4`??:e?;W????IF?y??e??i???????
???k?????+?R?????n??zHl8:	r??p??{?p??a??z?=?Mv/&?,???/?2???e^???]eA?*k??m3???Ehr????????u at D?*?^m?u????????J??D???R????Q???U*?8?(:?h.L????kT?????g????f???:?.?U?t???.v??{?r??"???m. ?3}s?C??G??;??q????eM???????s???????>????
S??ll??P?~??%:<@(?d?????s???1?????V#?T??Ge/?q+/G=?
#VRb	???&?9?=?[A?n?]?+??9
?}??/2?N?Q+?????r?Q???B???y???E???}I0	??b=???/???'???7:???v~*?4????O???r1??%.[k9I???u???????\F=?W,??k?,?'???N;?~???~?>?-????g?}&_W8????J?(=???|????'??|%
?Wm`?D?????":b??Fb?T?YU??????XT???2~g6?C??O1k?D6??? ??#R-]kuj?8y??A??O??h?:	76??zZ?
,p????7?????7?O?/i??l?6?Yw???G?`br??A?6zN??S@????,)0?C???}2?bH?\?????n?B????bO??????p,??`?_?P??k<w????)v???
??5??`?*??ott9??????k?????z????KD?4Cg??5?$z%^H[C??xKWX)[?V?fHn^???*???<RwD?Y??#??$?*??x2}:?/?W7?Du?????gA?l?;??/?M?\ii????k????3???q?h??0d=Zn??6?)e)?b?oFS???Y?c??Q??????V?F3+Q?J_?q???q??r?c?v!A?W???????i??c??????(?O?N???J?4?y!<bwCd#???Z?????JQ/????????w???C???v???'??V?,??Y#R~f??H?????a???A?:o?u?G?`?4AmI??M???????>??=
0gTn?0?S?????g?d
?????u_?l?C$??'zP???1?<?c???????;??????????y/?frs
?#4x???=p	????
>hPK?E?lUW?d???P3XH???
"
L,Y*?J?
??Lf??%] ????s?USE?!??@?J?VB??N)m%?66??l?h?v??!*!Sr&M?T(?)(??S7[1C??>?J???c?t?H??FiCt??d??#]4e?R?QRLUMJQLA5$5D4?@P??b
???JC??????p??Sy?P?HJZB?`????(?8?????mq??h??"????M?Q????$????a??p"`fZ??"b???$AE?O??g#???>o??c-?7j????9i?~??n????A? ????????]???q???????CSWQ??,????&?e??????o?:?I??K??R!????fV~9????gH/??kEs?:?)??c?k??9?\?t5?@82 ???7??D#??????F???4MIP?r-??%-??????s?????Zb
?t????Vc?(phe????M?"??f????. &D??"?+-????L?s?)??????@A???l=?
?!?>B?????????eE????iVD?X????;?Q?}G1??AuGI?0s??7?M \?,????yo?%????W?%?r???v??I?~?5?s
1ZN??N[U?????d$?p????\??%?v????????QKE???p????Tj?2`6[Ij4&}<???v)
???=??B?e???]?)wWC?V?n[lyz???w????>w??<??@??<9???'s?l??f?????????x0B?l?wf??r?????\?N????[?	?	FNo,Ra???eF?L?,?e7?
???????J???????I??\???\?b???O?t=G<#?`z?NZ?=??U?0?????????????eUTETDEUUUUUU5_/_???U{?qq?>?N?GN._??????j???????????????f?]?w?u?\?a???0?**&$??F? r?'/?tX'???;u???N??>?m?+H??70?00??#]c??I?@?????*?G}O??y??M?[?[?_nVtQ?2?_?2???^5???%????e??????Hg???Y??`??LSV?l-(??Y?	???r;?#H???????????????%{q???EQ?D(?(+??????.D??v'??u8<?T??<??H?U?L??K?KP(T??$???`c?l????e?????w??"i?ja?o?z??L?
lyA}????m??bu??i?(2/??LK???FmbX??????4??(?--`??kZ1?j?1?)???P?!?4?????>?p5@P??MV?P??97?i?W,??	??T???EkY\???Eo????T???"6?/U?O??B??
QNV0???`h???Y??????)?g?2?'_+??;Lz??????????????p?5????????2?????4H???	_}?9-????"??-C???y?j??;???v??????m???uUo2?<?3?????fUUo????d?m?I?N???m?,??A?,?	?r;??5?#?
??;?7???v;4@???8???J????~????????????6?m????"??????Zm??!?i???H?^?4?,xrkm?"???B???9 ?&s????n????5v?eUL?@Urfr?P??????TJ????aU??j?????iG???v[?1t,???mwZ?????????j??)?(a? %"H??f?????????">?^????????p?D4??w? ??????-"D!@D??
+-?=_u#?i????&?`gLroi?a6?F96c???1???@^???w1??OymR?G????
Q?i????????????D??y:??j'??????JHlAT?
$?
#?????jE??????Gc??<A!k";A>??O???O?$???????eR!?P*?I`@?0?a?????{????????????x???9?2Jc'I????#[???"):2+?>??;#???1c??!
B?! ?g???N????m???T!???tu?7?????]?$??
?O?YB'-?H?HgB??
P?e(8P{????C???????????Puww;(i??r?????M4:???F??A????
M??0,?*?
B?
?A?U?"????H????e??=zn??<??!???d??
L vf?C??x????}g??lA?_???
?;??x?n?!??(??U1~?J??)NK<??&?\-?>?? ???????T??cZ???~?H{?e#??_?J?$?????OI_?@?????:!??B??F%L??tw
?k`???f$?8??c??c??'???<?1
??????B??U(?r7<xW??????1???SK?TE??FwJc?
L10??O?,??uC??@?????:?6??????C$7?zK??D????<|fL??w??]?n?H??^y?|y?AT?a??????6?H?p???9.??A????8?qK??9??2P]?P5???n?/????*????Z????N??`?y?t??????hcE??TXj?7si?????)?68&?ps???4rr??c?B?Y(!?S????d `????0???kx?3
?? ???+
6?????G??^??[dC?????|???tX?	? ?zC??<?|<?%???
MD,???t?Qm
????5??a???q???Sd?u??????%x?Y?S?
?3?xGnZd??8?K^
??O?9j??=7?????r??_OY?5?*?(??G???@?:??
??
hE??Rl??`=s?
?U5y?}?>Q?! ??????EG?#???<C????4?d??b?+sT?0x?u|?S?N?`?z06??d?qP{I?
???iK?y]??{??l??
1/f????9?rA?|??N4?0h???3P???????|34?C??A?!o????
JM (?s????=???:u?LU??l!A??@?Wkz?N????_??.C ?GCWP}^??}?j?q??????n?fw>v???$@?H?A?6r?P"???lc?a'?u`?????#
0
h????U??ET??ab0?????-???0?1x??>w3??2u??*??L/?)>???5?
?6@???J`??.?~C???#?%b?V???30??##!??8u;????wp?w??pry*\cO?c?????
e????????B?"p *?"
??????|W???P??_p0Lt?f?L?,F?I?????`9?T?D:xl?d`??0?????`?
??>*???	???<?Q".?k?+;?XrG(Qy?I???s????S>????????????UPM'bwv?W7a???????p??4???=??&??%?B??s?v????&I????_?2??A;Q|`Xu??=????@$dD?R$J?*??p??t?^??'???/????f?lP?X?1??=????,l?J?p?J
NA?2?
f?????=?	QUC?bxyhP?\?C?????P?\I<?O??P?????(<w?????^?k???vxe?z????-22$Rf[b?G?????W??n*???????(?Z?48???B?
?}??28%H"H??H|OxD=?v??/??0c?B?x#??j?C???Hu??????)???J??sH?O???;?!??\[?R%3???)A??spE[=?Cs8q???!?.?J>?S?????.??????.`;??8??{?'A?K$??EP?!?
??D??U?>MC?P??kM?????????`	b?#??i?9;-AE`=?F??@????<3xN|?`???g?? r0?\{S???]4?p
u?A?
@???Gc? ?d?r??6S?@
%?
?*?'
?S??E!??8??b+???8??G??Z@?+&m(A?C?,?
?K?/????YL??$?p?????[p$n:h???Z?\
+C???/???^$"???T
)Y???'????^????{???????]4C??7c??]???>????'pfF?8?x@|???S?^;?nl???-Z?-?=F?qv?
`??"5????!???
|??B???N?w?R??????OOJ?
?d?(.??DAf?_ at A{????|]a?}U?!k??u#?
????'Azh?o?S??W?L????4f?c?li???%?Z({
?
????_h=?MHzB?)???"&G9??????EWapQ????r?H}G?oJ????????5>?D?????>?N?#L9??wH?????s?3MVt?0>tf???????}
????rCX=CA?? ??L!!$????c?5??r?Pb?E?d?"??&?~????<???	}???{?.????2j?Ca??zK??}(z???????")Ly?G???4<???(4?|?
?<?6<?		
?q??y_?&j?4?%?'?*#?
4??x???i???7?l?????????r??h??1vV?R???F??$?`??/82???wH?>?????o?????N??pw:?+????K??9???(???!|pT??J?Si?m?0;?{?/D?'
?G9?IoY???%?????F?t?MR??????.?61???UDkL,??	%?u2)?Yi`|,0,1?,a)]1?8n/?6V?b?k?s?T??[?W? rsg?%?ve?? 1=????	t?N/?zG????C|??L???JjI??h&i???+{??\??|S???????=?s????m?B?j?7	#?h9???
?>T??u??hRf?6?C??Aym??????B?L?>@????
??s8
?D?H???=29?]-?[gv?9I??-D?ku(	 ??0?Sp#Y??>?l?"
>#?q??c_??3???bhM??p$i?z$81?B?BkK)T??P?$
?=?& ?>S]?LTA?L???<?ot??
???qC????G@????C??D??????.??u5?;0???
F%T2?(;Oh??<???w?$?a????h
??[C???A?4;@???`>?"z
9r??"? k^?I???D???????Pq(Q??N
?QF?O_ ?07??hu????B-?H??N?????Q???'?%D?	?k??J?n?	;?)GsF??b&?ats?;??C{?
??u7????w?Z?\B?)?U?Xw@???
?KG????? ?]?eJ??-
39
c2.1h???,??(???
????0?N~F??D??'????{? W$`2/?h?A??1?,??zJ???F?
?D?T??????0G????;zw?Q?Ow,?7M?MW????-??w????u?S?S???i???f
?v	<?c?????+?K]E?I??\>
:?????????
????@}???k?Q?o?I?????8h?????th??D????M(0?????0^?=?????@G??gO??)??O????q??;>?Zo1"D?*?i=?/g????(O???fg*?2Z??%RJ?Oy?????=H?t????>'????H??N=??zxi?C??U}??L?????????yo?H_k]Px?sy?f?(???t??E??????{wD\u?????=?g??J?????G
[	?,?B?G?L?;?????E?<@????&????i?f$
Y??,p>?2'?O?????i?????@??n??f???FO??l?M??????
???/???I????=}zv;?
 ??h?w??G??f?z????2?+?v?o``y?7=?y?,?g$9t*a?wA4
?M???L??1?? ?z?m?@g?O?$[?/z??*??+???MEU??[@??`g????H~??d???D????(?!??aL?e???9?X??????%???
??
?o???0?????????
`?O??!$Y?w?C?C?R_8y??U?????????Q?|??b??{??>?`?1???32?L34v?rk?g???98%BHO~???7?
p??P?!??FP|f????(??a? ???*????-??I_?g????3??????z(h???A
!???| Sv???M??u?1?dId+g{?	a?0a???[?G?}?????????
4?mzD??:?
??#
!I???~,lNBD?? NA???(?H3?*???dE???L+??yCUXz???Yge???p?????]??:?V???*,???????L?!!?????lm??]T?E$]???c|W??Y?nL??????p)V?E?? ?Yi?efqfoU?yU?jq1??Z
?????#??dri???#hF?????????x???p??*GuQ?H??0b?`}???/#????EU?&	????xF?s01'?&??@??q?????????????
?z???a????
?n???Gxh?
???$Y#1?I??w?wv??Wc??a?
?LlM?s?&?C??S?P?i
?gE?&??)???R???'?-s??`???}G?????4???"???????d(????Q?,?j??1?SVIJ?59??/&I??????gl?m7?Z}?k?+?@?oP|????"?t??Zh?}SZ?m
? ]?u?/e??+?AP?s1???r??:?D?z?H0i??=? N??EF--?n?,5???X?r%????!??	;??)?C
RNQ	???C??????"??}lm???),??
?p???Ia???A
?6??@ ?? ?y	??*6?9?aB?BhC0????>!2??>LA??7??Wcxi?D`h?\?T?GX`9???:x????y??	??8c???????????*=??|???m??D??G?j4?u?*?%??M?B??????>w
(w?Z(???\t????0??????0?30")2???	?3?3Y?J??M?#??m,_6?^?j.?
@ ?4?`??#????&????V???v??.?!????cp??9??pa?tN[n(w??ty? ?ri	??????a?(???f???Bj????
??9???MqH?l?R??o??T?E2?v?0??	]?8Ux?x???0y??,"?a4=fk9???????r?(g-??
Q?D?Z h5^GX#?t???y|?p?N??C???@:??!?0JP?bw??
?????7????*?;AmAE???i???????((???(j?p;??pw?h?%??/Kfy????]xpw?\??tp'Q?//???^?HibR D`????
:$?~?-??=D???|N?CQLH P?
 ?-??!S4?=q]??x?^??
?EZ?.D??+???GA?hB?$?????nh?s????&?`L*Xx???W?!8?????_??;??d??t?w=\^???>??N??O??<?r?1??g>a??Y??e??,?g*?o???y?EW'{?e?v??`???:?NL?H??sDA:!
???f??8?w?Q`??Y?L??3?dK?$?y??N????&pI????MO?????uw?:|`?aT??"?0R2
I
?0???a\4???)?]??5

??i!??C?c??9???O??i:??r`$C??=F???????w
Q?x??y?a;M?_?h?n??Pq?4^
BFB	yp? ?6??!?Oy?GxF??????\8?	
?????V???DS???4E H???????0Z#?(?{?q?>s??p=?;?IL'?????8??n??&?C???.d?)yj?K????#X
j
$M:\???4??
Y?[??. ??r Q!:T??}?
??
B??t??1??????
@??
	??R"`?41???????p??
?@?F?]B???> ?1
??:U??????y9?C?????,?4????V?????b??<?_)
?!}?2?"?`?i?1?%?R,0I	P?	@!?_?????{?/??????OT??^??I?D??Q??2gJ]?????e]?+????$gi?s?R?CR?HR
?@ ? \220?lK???F???g??P???'??#DDf*d????B	2e?
?????&@??wFb??????;?47??n[D???cT????????z?>X:'?6?#?+w!9???#o?J?????"	
&%?)B???{???

?(F
F ??????/?U?PB<??????l?:?C???{	?_E
??r?@L??_???????????o
?A??????#??D?v?x???]?
???"??K2?tj(
mp
??A?,?(n^rQXb?#T??p??E??e?7??6????5??,??
??+?Y?2hE????:???!?????f<?J!_??w??B5?&

??
R!2?E"?h@?0?=TH????~V?s???y?d?7????~?<f3/?6?qp ????????E?L????1v'?f??a1y??4Bi
????LR?:??l?????mX}?>a?|??SL?B?A?????t.?#L????HhG??)??l??h?=fZ?"?????P&
J?????"?.N,$?vA?"?H??*$02j?q??0,?2??pr?H(?&??v??B????D0???r??F??(??>?c?@?03r?`?1?n$?"??	Z????)?O?|???S ?KL?%)L3,,??????;?44A&$$`???A??I???Q/???/??s?V??K?~?i?tN>e<!(h?O?}?@	?""YS!0???P??1??[??#??pi??a? ?L???i?t;?y????,R*0?1??{????O????0s????q:a????R?/?L?\J??J0??
??D?Rj	??<??*?y?l?A?B?tD<mbH????????]???3
?3j?????1v???p6;;?`?"@????????G?W?6?M??1P`??L?K?)?LC?{???????<z???2?dRc??m/I4???R??8?pf?b??dN?;?Nx"?=??W??, ]w?$)@????????AaLD?M`?9??dS?D?6??D??tl1XaZ0/h?)??L?H??P?????????z?H@?g1????S??~?S?????An???$????~?????D5_WHG?>r??XG:?P?:V;???????R?
NRJE?(0?3X?	q?	?j$SLo?L?"??!?
?KwF????`!??|#?hQ?B"??????0??(OT?B%?>c??*??2?(!?k???]????2???NB?????y???
U#@	?0??J
"?e
?dD??|????cE"% B????z???????I??
?#
?D~v
?&? ??????
????
?\?aF??	~"$??
XzR???s???????b?S??o&?????${A????O)1>?????????,?&X????p'0$Lw?}V:?|L???????w????R????W????^R"&?H at G?
~
?b??y?????c????R!??
?I;?7??? ?
?A?P?qULc%?kH*Q?.B??!?4&??Q4????q4E?U?h?X?$XX?+R??j(??*?h??\*P)
??b??????{d?i.f
??!?
Y?]5?
??A?F
?cbn???(??YlDRFB?Z?E???x
??L*?RE?????0"??(?@?Ea?h?:??g*&??d#d?:?IRJA5/Eq2{?{???{??o?gD?a`U&?S?B8??mtbH?T??5$x??????KC?1DG?t0????????rx??U?>?a?$?I	????~?2P????IT?%UL??B??$6?5?A???[K(?Q
?A?)?t.e???w?\oM??0	Y(aYlo??xS?C;??G??$nc+I??$Xok)?x9??$????uD???hC@4????*)??5??p? ???B?#b????
h?H!BHD?o??>?????d???{?466(?3$=??8F.?9?|K	V??????#_??kw
?UU?IL_LTM??\?$?s?n??'?????4??????G?9d??A?I??????>}i?V???^W
??")
?l[q]???2GJU??hU	??O^??a#?_?_??#V_*J???b??	aS????DR???$L2??P???FA?l1??????ct??Dl?!($??.???#

??MU@??3/2????L???????g???|qD?XR??#D?MP??'n?o??Q?F?G????N??68???S|D}??^b??I?<6?
8IX?/??f????&???=X??(b	Q_<???????Jj????
?+-??I??????2h?S?q$???J_???????.????
?????C?!?Z??h??
5??6???
??? ????????D:?q???v?l_KeL?aA@:?N	?
????h?V?H?<l0????1`???????(????j?b`?F?h??rQ??Ep?
??LB?e??b??e?3???w?l?.96X at 3*c?{X6??a??a?bM?8??CN>???ma?8?p?9?(??HFZ:??
(??#??")'???
:q6/K(?/U??+??}?J?
	??9RK???he?AmD?N?D??
?c?v?8?L6Gz1?????gB?Nk2?FI(b?a????4??0?h???K&K^Pn?WP?c?L?eM????l??ud??&
???D??UQ??1??L?$-?0?? -A?
Zi
0?4???aN??7=;Vk0?bf8p08????;?L?J0??????h?????6??AIf??<??2TJb!,b?????Ji?C?? ?0????`aV?,0?????\?&`7YD??
???Ieq:???)\|a?(?!?2?n+?I??Oy?/????8?d? ??d?B?Y???B??Z????????1??EM,U???0??#?f$????B ??J$?q???M????j?? r+"h??-m?E1??S?L?Vip???2?T?E?J???
???2@?X??
H??
R?b??Xb?eV:P?5,0?", (i???`?b?h-??0x??r?$rB'A?((??t?q?????
:}??JJ??,9?/?@?
???I?
=68/??hSc?g"A%@u#??.K?tH??x?n&w????j*???l??a??A? :???5?F??\?=???0Y1??*?mQ<??,X6???????_???J	?!?89?<????p???7<??}?E??
$?0?$??:?
	U?`?T??R4Q9&k0???2?CE?L?1???H?R??PR??D????!`?
`??->B??????C??.?????{???}??>?n?{9??!?q?0????12yQ
hkMj??
(\?h?m?C?<?)????.??M+B?!h????/??u?H??Y8:5p??????I??^?Ax??
???MI?
?
?
?1G??L????BoO????
T5???X ?)??2?A at I@???v?ZR?y??Ec?>?.N#??|???S??~Kx?8???;?Z(?!R????1vCp?c?z?UUKo?>@N??~???C_Ff??D?i*??C0Oo??M|?{$???w9?p?((?H
`???()!??3??8?R	C&2????5?	";d???R4?(QSB-?fI?U?S$3(???FA	<9?T?7rx???1??^`?c?[???t?F?&??*r?@?g?X7N$^????*t??7?<<.??1?~??M???????=aiL
???MK???u(?6?P?"y;??]?Yj??????
???????`q
?Z?E?1?[??????R?*+
??.???~!??O?B&??`yB5??/??M[`C?????
??c???W
???Q?p?g=?*RT????U? $??J??h?CAX????W4/$<-??m'a?:?#?'2~4?M_^y(0
q]?????A??????U???\0?	i)?SW0??F?iWd?TX?^?QA?p???????Iw?c????~??^KK?z.??V?B??JC????n??j?2M?c?T????#???
??? ????,??h`vH/?????T?BD?~??OQc=K?cS???>?Q??}S|?`_P????0??nTd#	]???!???/?4??
?	?? >???????p;?C??i????F?Ld?O*??H?
??p?!????hv??]aOA?[`m?S?c?O
O1?????j???7r??2??Q^?y???#\b????????
?i8?? A?#AC*F?6?&r6!??J?A?L?c0??R?????c<?C
?H\$x?
?T??????????]??SL??J]?zL?Y?R-EM?T`?-Fyt?M?.11?{
S?
??~UX?{
????u4?Y?K??a??b? H?qh7j??i]'#?/???x?&?(J?z?l??@A???5Q??T?&??Q?}?}e8R??<P:c`??D??9E$]A?C??;?????'?
}??*?AX?d8?h ?Y
C??y?i#???W?,.??????x?H??"??S?|i?j??Ka?
,????????%???,d?k???m??:???p???po????,?? ???'???w?QX`?P]@p??? $@?m?;[d?/hV??`q????#m?;???cX????19?S"???????@S2??h???F???;?ux?q?z;??????ym?j?K???{???[N2???????$??d
?<??Q????????
t?Q?S?x??ic?????{&?-?S$
?d???|??3rg?m?e??%M?R`?j]????#S??<y?!?
????????????jSGY??<??2????S^???k?;?!???v14???yw???7???q??o??$V?!??-???70o
????E??^?Z?:?
	????V6??T????B-???4~??9??Z????????gs\h??
(?ev?C?????j%?-s?h?7????F?O?>???-
?I"?K?? ?VR8/,?l5,R	=k/w1?P???4?v???:NT?7S??;
?P?%?GP?????? ??????zAGw???q?A#?D?	??
??;??p<K?<a[???I*'0???eI?U? ???.i?<??&`??M??"L??]??=d?N?Wv? ??OG???6r????}=?
?l?1?_?O[?N?x<???P?Y^?????H3??<?}dwM???H?^????0vj?3?1?4o>?;q????????:????l5?'??j;?
???tI?\????????H?3?1?R?0?X?"????WUB<Y???l2???????
?-l`@?|??M?}??N?Z at q?qg??<v???^???6bxQgME?K?"Q???'?<??}??T?~(?;w0t?w}3?a???f???,:e
+I#??;?????????a<]???$Y?C`K5?7Jek??H8X???mC(]0?9X!q9???j;?V{???
???F?4yT?L?????&X5??(]?/?1?fAa(k??z?)?????Gfyz????o???M?????H?9???9a?N??N<???qg????#?tu
????????????<th?(????q
g1p?$???`~??=????}2?#??$?X!{v?9?T?*;y??????Th??1???Vk???(:??pH?D?H???6?d??[??q?? ?n?d?????%?$\(;??2?4Ol?ux?y0LW?!?\??kS~n????"????k?B.?	??Xw!???+??2?$??"*d????T??Daf??RL?"????|??$?Y"???N?jY?!-??#?A???7?????BuY?	ii??&??0??3?L???Ir6C#$?$?8T??Y
y??b??, 0?ly??5j?
??kO???????<??5???u???????u??<q???d??3????l??5(k?s??A
?J??\:
a??w??1??????j"!3??.???:k??'L4653G1;>??27?h??h_4??,?B}?nu?w?vW??l+??m???????hb?????;?B???W?S?4?{k?????.??%{?&G??^????????Y^q???"???J2???N?l?j;?tiE??fmb??J??5?
??qmx?f??B??7\??
???GK\??5??????x??????`?U?60:?v?\E????+]?TY??.A?t??a,F?F?;.???\h???4??i#u?1k??1???????????^z}?$?m-????8??p2	?u
C?EK=q??TqF`?H??L,'??5???	??J
?}???8?#?Oi???y?
3f??;?F&0F??Q?????>]?
[<r?bq?)?$??
?6?EB?2g???Q?5??@Bp?#???|Pa????+???b????.*?\??{q???z9;????t?|??J3x/???]????h?????#?d?I/?????I??C{z????1{W?4I?Jj?H???k&aX ???z???n?~X^
p??C?na?6??s?^?"?A?E?w?J?v??N??????n?A????1???H??l?dgD??!?@??L3?zr?+Y\Au?}F?X?}?????8?L??%L????????[R????)$?C???R???], ???Ht??????{?1???\??6?g5;????qo??3
?oL
wa?a?PFP?d???Z?iB??y???2???D?
Eb?t???J,?%5?	???D????s	R?1?E?f??d?Ox?F??7??U??t?? +5?????a??@?@3?	$2J?AF??FK3?O,??:?0fnV?`gOD???=?^??SP??.??.?&?V at Q
?P?f+-????5+Fw???s????{q?{???FT???k?n,w?????m?
Nd????*!?????SO?:???n??~Y?s????9???*?wh?s?????h;ng???j???r?{??Y.a??I-I?NI?~$rw=?Y???Bc???i
a?+?w?9?q(r?1????p??$?J???z????????z????e?5???t"???????h"??x\^???1???umI?)???Z??]b`???Xt???f!AL?(??Wl?????]???e3d???4bXHT???[;ntSix???EW	?]j???????Hi?S|???}2?G#L$!?EZ7????
?
t?X??/mu? d"???5?;?:??"e?=?Q?[?}?3x
?x?-??#?`????wQ?39P?;dt??D ?z?)x?D??9Z????9???R??f???>????$???ha	??S??w?jc??8???G ?m6?s?V????Nc	Q?U4?.&???!H&?JY/Yxlba"?"?@?b?$?K???`?C3.s?B5k??
:?CRlshF? ???-??K?s?rI???SP
??3*?}?$#??Ap6?DZmt? ??)??%b*??[??????z?/T???EP??\?y?U?v?h???;!
?zr'FP?;??IN?"?a!CTP?c?/!?:?S
0?O??j??2???S?Q??Q?*??cb?5??!?Q??
W??EW???d??Lo???h?4
2

,e?jBp????b??ii??u???8oi\S????
?M2?D?0
)?N ?c???#??p^R????B!?;????? ???f??S?,a?,??7'?/??q???J??[<?S)???]P??? L
4h?????A?j?????\?I???B"P!?9
??S??r?z?*S2??>???io}?:@???J??h?g?|??{x??dIB???#?-?@n?,??P??4??|
?$???z?5?"BF??D?0??GB???yq?;5Hy9???;O?]??;?6?Y&{?p??????0??sk=?u???5?4?B?B/x?Kz!
?Q5???p?,???9????r??C?N@13?H!??i???OU??<?????????\q?	?KL+/$???m???p??A??9?~??7ET?|VC??^5??
???z? ^?c|d6?$C??xh}????m????R?Z$??L`?5gy:???7????0?r??Gl?:]?!r?l??
??j?<??!??|? ?L+??L?1?{4f???3?G?????6?(P?F5'\????w??5??????M???R??D???????R??x8??99D????@????vpBh??????U???????LU???J
?VIXVY??g\jM???-l"$????bk	.L?R??AL?>>@?f?y????pM[????7}?$????k?sQ?l?J????EE???????????e?
s1)b?c?h??zJa??G?X?Ka?8W??V0W&H;?Kr^?#T?h??m?=??E5??y0?Xe1,??Z?2bc
?>?:??
?
S????E^?\?????=?6??l?
H'g>???.????h0???h4#? ??=?!??|????=???k?*?{??J
v9??u?OB2!<??????4??)ZH5P??N`n??Dw???Lc??j0?(?f?t???j??0Q?4#????fF3C3y?#F?jFex??8
K*?j?#*???GvMJ9?;??pL/`7?!??P?P?????0?3
h?M????%?? ?09[??s?L?M:??i??E?\8?z?K?????-:4?5
?p?(r?p5"i??Z$l?L?W???Y"m??
	?b
24?????';:A??=-?p
?^????%"?mO????{???	M1?`C??K?/U--j??????????
m????79
}?##?8?"s?z?D3?!?s?a:b$h~?^?:#????;?fa??:??L|?gow?;????s"?Y? ???`?R?A??]?? E???S??c???!

?d?m??!??
?h???i&??????4?e?
h?$?*0o'&?X?r?2[-?????]?|P?F%?VkA_?e?,?o?T]???????K???Z??+t*	$|4???*?T?	$X?D?:(?R?????]5Z???u`?,?9?6$?F?9+?A?J?6`?afu?;,?5A???U,??????'&?|?L?,|??"
?????y????
?@6Nr????c?s?X^a?"??????F*???(?????D"L$?\?\??b?5?]H?2a_G\???B???
	??$?Ns?v@????7???????S??B???6,?????9k??{??O?
??????:"??@?u
%OD??=B@?x??!???,?'??Rj?Aa?rT	?|P?v[Fs$1??"|?O????-??o???;?t??2???D~(0i#??????5?N??H?${?$O$?M?
???C?^???}?l?????8=???0d1
??.?cM?C???T1??????)??	-????!??F2?t??u?h
Eo5R9??H'

????*w!t??@]???{??j ???}???W??O???5
?pxA`??n??
&?#??m?h:d+mbl?P	??4?<%??Ph???vh??????m
(zg*?
?9?c?4? ??<"??T??y??|?c,?????xR:??%~S
X].??d???8a#
h????%?????????j<?V?{))z?e_$,u#????>?,?E#?c?LQwS???B9???v:?+tQ?W??
q?-*P.??0?>?k-?f??s)?R?@?{=??%????AJA?
???L>?hl$??4??'C????????
??????D??u?Mg??????W??
1n???(Bh
<?|?-	;A?VGK??Bu?/?f,K?
??????
???Q??
D?*??7
3?a?H9? `D??IP"?07??l8?q??/C(a?]?+?????wa?0~?&rfF??A??n?v;NT.??]I
E??RB?2?NCB?-???R}??t??|???8?
CgP!
(????TH??A2ARd?'i??q???
`@@?C??A?
~H???+?=?ZeC%"?fd?p???3%hK?Y???Z?>1qC?)????"	
?L?d+R?v^??2%1?	?????9B?#??"?
6f????@??&0b?fc?$BD??j?I?&41?a!iuFXbF@?dKE	??$#?&BX???z???V}?'?8F?????X??a???+cl??jC???4b???AGtv`?"?=
	??`7s??CU",?????????????$0A???4Y?;A??
)??%?T??ln`????
?0%
9????1?D>s?d?}?;"?b?`???/?????H|????^KtWL??lJ"T
9r7?3N???J?t??9?
AJR1&i????X-??kZ
??}?;?Qn?zu??????	a=Wj?????3????m??j?3tR?5??@???z????=q?? ?]????T5R??b???n4|????
u?8L?!?hf&??`?1??0X??O?4b??????????m?jAB
?p?r??l???#???8@?%;B?N??u?*????
?? ?>?????uju$
g	? ???Xk8%5?H8&T??<JJE^(??n?`<???]??????48?7???A(
?X???
~
bI?AL"????'?"?e?*o??!????????q?OY7?UBv]f?,??#??????0???<??_qI?9?h|??{???????K<??z??!?U??
A???Q??>L?? ;R???,os?????}?
%)@?f????%6D??5?????????S????!EJy?<????	???31?z???u?}?>?nU??:?DX?C?????&?W???+?#?`??&?>???gJ?0 f??????????
?Z*la??????x@?&{???Xl??v???*=??]??;H??hj??/?|+???"q???)?2!?"?,`O#`F???%@???DD???E
s?c???B9b??<G????????V?`??????Y?
Q????B??C?,1@?????????W???????<?d
$(h???	a"f4?FNL??!?2????&G??@
?hhe"+R?Q
?)(??&)+???0*R	B?!?T???Q?f4D?5??+
%pc?V??T?tZ?0???PM?DA??fJ?i?h$26?J?3?0??n???u ?MD?A???&R?"??M???????#dn21??)?1?21???PH???????I?cId????Ff?}??1?6?-??Ft"A?U?x?$I#??b?A????X????????$d;@
??????}??v?dlGA?????G ???hi0K??E,??^
\O???!E0'ahZZ:?gYlF&C?????.??0?d~?@VZ^ZV?????V2!?????c???X??a7?????????n???iX?n?Y??h??-LPq6?0???5???V?-H?H!????2"'????5i??{#x?b??*???Ri? ?@??0???tC?PF@|????V?%????L?A@#2???@*??
 ??????=X?$m?;6^?
i?8?
???hqqA/??]T?k^???=?z+?$B"??c???piF0???.?`?	?	?4@????=??>?Q(LP:??B]??????pP?
T4


i
?
??Hd?4+?A?&?f?L??p?BT]?3d???"?2?XH=?k??h???T????UM? i???p???j?!4??u{?PaT
?`j???	?
>2????C????IfA??????6`b?Bji?@?f0.xhD??:H?5
?
?
)?j
? R`W??1eZAA??????/??@:%????zh?H???A?W?t*aD??4"dw?????&????5F? ?? 2?d4?4>?0??>
?N?<??t?(%W?w8Y. at d?P?????????
	k?e?7;?
pf??LKF?M??;Ev ?!#????T??????
G???N.?/??i?``a?K???Mt46&?;??4kIn????????4#V???u?H?c?%?7?J5??0??hY!?a???&L??&7`C?%?Y$?I????h?d2?+P??\-O&fL?B6?6??v??7&?5r?(?d???]L2B??????????Cp???-Z?j??????????Y?K?"?xq?+???aq???lq????P?@?m?jZ??M?????????6?$15?nW?e????$?f&????q??n8??]bf?????P!a?G?????F??????.X?S??f?2LS???D?? =???:~??7?:yU^{
???X?G??1MoQVA????????eR!???j?jMF?1h??Fh?rru?R:?u0`?dqBc?GbLh??N8PXo????`?	I???j???A???2]d?????+?>9?????Hw?@??P?B? ?JQ)h?e????M??0DT?Q?Ow?>?,?(b*??????uqH?o??(???@d2
???4?P?@x"???:5E?i`??@??q
?W?}e(??@?D?Ga
?SF h??B?????(?3?? ?iH??K? P&J
?????&&?aFe?$B
?5?!	????yj7?4??G???????(4??????????
i??n??L:<??}1;`??
??5?}E?k?W?5"?V??i??}DTZ_???T?Lzi7?n<?	$/???1?
???O?>?X??A?\)$??DtA?$??n(V?????U???d???$>/K????;?d?>?5??I?:?/?o?>r_?W??}?????xp0?vz?i6?}?G??X??)?bR
?&a???C0???~L?A???{J??^?K}

.?x0?J?'?#k[?e
?;#@$?]?9?5l???-6H?xk?X?P\?7YO;??Fbbi?I??,68???,??????'??b??P??@????
/z
M??la?)?kA????o?;u-??,k???R???`?4ki?Nd?Pu??s|?h???A??ubhjbI??j?X?=8|
?N4	??k??6?????Hb?*jn???lpbM?jQ?&-E?A?c???2	??M?v48"9-8???Ia??UC?/??Z|??k? )\?F0?`??&??X	]??}
'?????D
J`???Q<?|???"?I) fX??*?R?
j$??)iR(????F? ??????&J"BR?"?$?R
	bh?"?(?H?!??	"X?i??aF?d)B?a??e)????j????
C5~^B4??
???0$?????$???Roae2?????(??@?$)$???R??R#???" ??`$??f?HI?(Y "H	Q&?(?H?T	(%? fHJ)
Y??`?"
??)?(H????6?EF?
P???{??
???S??wy?M???F??
d?:?
h????7TW?E8D?*EM'?????(z??r??%$o^???L?^?[#~??p????vl?{???<?Lz???0!E?s???W@?dF.9??Q???????YF??BT?YP??11?cz?G?:L`:?i???OB?q,??z	?????Q?0???+LX3????-4?0?4????5
??<??JE???Vm?:A(?4X?n??lc\d/$A?C?@?`??? 5?4?%
?Y?o;?I???????`A<?????!??o?
?J???d2
J)H1?????N????????)?
??`|????t?j
??($???C????~7?2~Y?}.=??I
7????[?5??m:??????7ad?????&?5?????]??`?@w??P?@5????]????P?Q5gBT??????8Z???
??
??
?-?
`????$-kLAH?
H?A?Mf?8&(Gp?Mj?????ps0rn??????z=^}Fl??9D5???1??bD0?
?`L?ae??`
`??,???c	e?zR!???"???9m?h??
a?)???f??D?&F!????8???????m9?0`h?BmHK????W???t3y??Bd?MZb???;?h@???>???x?L?]??Y?$??????f4?7\?!(
 ??????F???,d?=??????daN???dS+?Q?L?s%?f??
9?bP?3????+?y??"??BT?(?d
??n0?Dd?a/???M?ny???"a???Hx?d????y????*???m?|&<???%?C??`cl
????>XD?1*~?\CL?,1-Q?"o?07`wG,A?`}A@??0??1e}|?EAPI??f?J?~??#
?*?&)??????????iQF4?!?????f	?MkN?$?y)B_??s?>D?*????@a?{c?????G?Hu?/d????Jh\A`X`!9?1?M?Hf\@.?b?
)F	Cp??c????s]D9?????q<?
h??`??D?G`???"-R???F???	?T????????(8?':?(kF???F????????_?E???????9lhP
?2????%N?2'???+?6YF(?d#Bq???`w?v??4?4??
???8@?[%?.?{Wp????P??B{a?xW8c:?h?;eEE??8?-BD???86Y???r`d?0?1RM\??m??:???W	
rI!0????"%l?Hv?
?????9=?????i?????k
Q?p8??z??8???4??f?
p@?+??.;??D
p$+??? 6i?)?&?qXB\pa?(? H$??1/?X??E(?fS??aJY?2(?Jy??Gu2"??y?z?5=???`a?Y????)Jd?s	 e?(?b?A????>?d???6?;?`??B?}?O; /??u?>Y??1??/;???}?j?Y????
?
P?$Z!?"?????[ET~s????W?????N=efTq??0'g????d?
_S`J?J????!?BCr?(??2?D?r0#V
LMa?t?(W?(r?????"?0??m? H?+???x??Q-
?????{???YU?!?u?`??4??0?R?}????}??'??P
????I=A??*?r???
)EB?
?1@??	l?????r/?&:8_?Cac???Ew?|?u???????!?p????-??????0????ax L{p8???M&?T?(??+T??zx?2e%i@??3?????R???????s0?Bl???5)???
??j?J??^????XoCAQ?I???%????C+?????	????????e`
??Zd?e???P{,
??X at lF???;?y?g	S?
?
{?}R
???????4?0?Q??*C? ???; ??2?(4?rl6??0y?i???K?f'??(?? ??A?B?8?*???d?D?J??s?&??"R?D&?"WPA)"L??20?q0 ?C?$FH?`1!+?????	$??f
d?
?&2A???
??e??"?W?tk???F?h?$d???L?et?;S?H????r?????????????5
???`???????~
?^)?/???&???N??]?{>?1???4({a???HY??)!?@???)M??7??????2?tE*A???>&?????*?CM@?	`]?>r?R<?vO???????@6?&??????KZLjI.d??
1*?
??k*???W?j?1?qF?A?=0?????.??
???;2???8TQ4Zw,-p??@h??DF???aFZ???Y\??S
X??7??<?8????
?
??!?}C?~?E|??Q?Y?g??|4)?????}????E??"f"SQ????u?????c?&??;P?E??????X?#0e??:2HY[D$?w?kUP??????????'1S
|.?rXi??	RV{w\????g??7?M?CM?1 .?*??R??4\RB??h
#???????)$:??`
?!@?4???%4H?( ?zt??"l*??I????hF???@?r?
0?)$?	?????g?A?
n[?Q?!`D
?G?P??b ???
?1
@??|?????]?e???d?#???r,??CPcB"i?Ia5*???GPHDPpY??f5?Z?! R6;P` ;???p D?#U?QE(?????L-?p?X?.?b??
`????f&?1?????r??Y?3M!E?+Q[??M	l;?x?L?8?P??p7?%	?B??"? Jahd?
?=j0?r	??????#
	$?J?T????f???]?c4??E?0?	
^??"?'??.(/ 3???"d
????0??q?????R?H@?=?&+?d???x?O?P?P????3???H%?!(?s????????X?|4???
?C??5+?*???B??uB$?K???K??u?&A?@??????@&<C>?k?m?H????!]?j$"?i(?/???T?
Q;H`??????>?v?H?nFC?'?????5E'????I??4'R?????C?p?3??i?LQ?"eb*%?:?Z?ZHb#><???h?/??$F?4Ib?C?H?9?????(??e`????H??
Hz???t?\?Tlx:8;????R?.II??L(????#YOX=?T?????	????2f??????[???+?4k:*?
 ??P??!
p
T
??hD?b??"N??*?0F?Q??T??2??^?%?ZL?T+?(B?M? LAJ?ZSa?a0??`?1?u	?SD^?,???lc???X?H???B?U?.?f??6{<1lCh85Ci??h"c?2h(@?????2f??)L?.???Z?f??Z,x?-?!D?A?8 ;?:?1?h??:@g???D.?i@?<W?R????[lw ?
(#3&????,?6.?Njf^AFGmQ?d4D?1?-
F????o.?k'?Q?A???niq?F?P?I&
???1??
M?R?*?Y??x??k0c"?
??U?ET????%?DS|K?{?[s????
???m????FL??? <?Y[??0????2+F??h? ?E?V??G`?5?<	??JP?Ad<K?$?lU??E??/{??
????`bL??$n??????"?????ys)??bJ??F?????.T??$?gq??4?\3??????uH??,T?v??J??f`?4D?%?Q?t ?
,?u?S????V?7u?F???#q?C9?D??s?[???*???9?%??^??HQ?;??J2:?
??3????
???0?Y??
N?bLb.???????G
0I?yuV0?
?
-?9?2Y!??&G??*?a??=Qf????h????FH???L&;?S?[??)??3?e???$?????d??R????d?;M??TX?}?x??/e?R\?>?????q????FOP??Y??s??? 7?	??V??k6??<?p???z,NF(1????M??7??l@{16
?A\????WI?W?V{?%9?I??????i???w???
eg???r?)NtF?E?????? p,???t?8???Q????.?30L??D???)?H???B??`%???L4?????
!??b#?d???m?=?,S?of??i?pRG??5!?#?5?GV?N?v

????BY>???N??w????G"???C?+??
gzj??$????2e??m??r????:7??\??	!?E:?Gs?
??"?~1\?d21??6c?2L$ ??c&Y??+a^B!???y`??VX???LT??????
?m???????F+
,?	E+??Q???A?LGPh1Ep??"?:f?
4??k?$

C??"Gx????
??4??C???4N4?0eU?*?1????J??????Z??0)??"Z?i??A?A?e1C0BS$?
% GN???LC??i2SD?/{*??p
D?$*0dD*A(0? R??K
A?y????h?&?
??<?\?NE???`q?
?A;????^?????

?:7BTxD??X
?
VDc????????J8?Gb???c?0?1?X?i???oQ??Y???t
b$J<?&????0??NN? 
????6/P?N(M
?d9???XH<I??	???tx?jE????
(?;?O?A??d??????7x???"?=;a?L$?N?(?C?
??R???bv$A??Q?O????w?????>K,??d??J'z?QV&??0:?l?O?oE
c?	bb%
b???zNh????s?q???e?wfQ?'???UD?U!?d?: ?P??4r???????t4?A????$??.?$%{X??&RV?5??-(??@?hm L?d???-93O?w?,???z?1???0?K?xPe????
?o@jT$8?VF?IcfY???R??~?lX8??X-~???J?q?WA\1???X@??C?!r~kW=d|L?iZDy??
?4?#?\?y0?=7???????P?y0?3F7?]??h8??F#x??R?1!5
?+??jig?>?????+D*??v7??????L}?>7????*???+??_???<?y|^
?X?
|????!??
 $??????O???
HAI?2????D?
???-
 ?G,??@?Q?'HQ???
a???Mp*?1AU15La??
??????P?*&xwJ?aM;?y?j?
???????(?@???
}>????? J:JH?(DD"?z?<tb?|???4?PC
4?!!!R?BP??c, Q??????(SR)?A@??_lFb?0?L??)????>9?yx/?
A?I??02??[3h?z?H?r???;?I`?B?H????|?yI??! M???W?1???
??
?yJ????jeDU????????,5#e;?y??*??1???Wt@??Nf?8j???T????????u?of?+$2d??G at K2f8??F`?@]????Rt??9?	R? ?&???i={??&??fty7?:ACfd?YQ@??h{???=!a???m?S,?'??.?9???i?%#??'/?L?o?!?
?`OY?U?????#?tr??[j?4?yO??9??r@?????=??'?CX??@8v??lM??G???>dJ'
?`???$I4d??H???a+?
????h??????4?w?Q?????r?????1???ye!?2???b
???rL??8???({??????
J???R?X?!R?'??*???s?(

=GOK??J=A? ?b?$T?fjX??dJ??2p)?????3??s???a#XA8XFa???dLR?!????P?????fD???I?? ??????T?T?0?2%%???Q?BDUJ?
?d6
?3cP?
?9??=?MD?~S*?"D2????????)v+????????h?E?HU????O@?T4????S	f????d?3LN??'?
??<?u?aVfW\1?b??(?????????????G6#??E?0?F???????|O?l?Zx,?}?
o?x?t???Ch???E?????ej??hd????
??????>5J??V?!??6?,c31;??|???|??H?f???Tk?C>t??~???t?????????<?l?Y?G??0?H??Y?v?'??Q?j23tK4Pc?mz ?q4i|!f@??u?<R ?Y?5/???}????i????,2f??????m??}5??????(?yd??w
??D??D???V/?w?????p?BQB?????|2?#?k
?cMET)?md??#
H??kN~?J?DCQ?M???D{?f&G??5?E`?SgJ???
 }?F0?u??@?!?P.Fhv????H?D?o?`???
?J
?	C
H(??A8????}bZ;G0t@????N?????%?L
??KRM$?D
v???????l??t}?GBv8(
?
?G??????b?`??
??
? D???F?d#P?
Ba?z??????0?=??{[???SN?U?q?t??p?N???3?gi?aL?sZ p?
je???^Q_[?N??L??E|????`?I? (?;?????H.????????[?tqMN???C??u???A??;/?[Q?w?I4R??$?pV?|???DM\Cg?????9?????;????|3yB???'$ON?A?????/?_R=?N
????y`h?????l$?0????"??Oi?
%?????	T`??~w???4?5U??'(???D=Z?Ht??-??a?D?h??? I4dI?[4??<???s???gy}?c:!?k??\?
!?]c?q?'??Z	?:?K.N???4?QW
?,[`?bZ6?????6???$j???1???<?'a???;?A??<??I??3?Nyh_9M?Pt?6?q:cpD?? R??P)?$0?
U??P???BE??O?`|?o??,???!!Dw
m
N?ki?? ?=?8?p??3A??3Tp????8???M?5"x??Q??B??5???3?Zr@?I?l???(J?83a??jdb?pt?c????e?E?n??????P?(?	??g?:?s???X??u?d?? 9??G????B?&S"1?????b%2iJ?a????i[x?l???p?AOkz"@??3??!*?V?S
E"?n$?ID??Adh%?a???HP?c??0???`d?*L?US???? 
<?[???`?``??
N?Vt???TC?	@l?L?	&,R??Ck???c'Q?A:`???(??l	?@aZI?&(i?(?
?"?3p???&?bGC>X<Z?b?F+?

?B?/M??? ?S)?????????l?n???HR?\??8?%6N?6?A????4?0~E?-??L?#sl0??z?./c$?b"??6?????l?L??=8i66?
?????I???la?i?+?B?????T??7
???SF?L?1?{????????bh?? oL?c1?LUk?
??C???%I??F6MCm,???o,f#$???????6?k\QaM"?BM4?&?q?
?(?R??k#2p?
???^f`????=Ej%?????????<p???b?aQQIN?!l`?1?O5t?h )TQP?y??J5??`L$d8BPITL?EAs??b@?q?	P??????c?1!p????i4BN*?Wlw\P?5??R?!??
)??&???t??(Z
Dp????>^?H??a"I?% i` ????"@?J??"IJ??`e`$eD\!????YiJA|?1??]??TQ?FZ??k??+X<p?4$?}???h
?@H??:?E??s?]8??+2
,??D?3xk5?i` A????TLM??V
H??!i%32??????|?}?j????\`$??P}$S$? 5E4SEDI2J+??dNd?
?+
_?n^?Q?
Nz?Q?FN
>?3?#???ER|j?
?>"=??0\ 2I?????S??Yvxb??_D h???h?P`4-{??????Ep?m???t?)-&A?)5J?7HXp??/????>?
|Z^?q??RC?????+
????X?r1?")4??
E?E>!
??^???????_?_?O?i%#??? h?\"?Hf??
C??9?
J??7???s?7?B??????A???%2????{???<{?)`A???=??????1???????i?n??????4?!~>???B???????????6q????x??Q'???L??
?4t?M7(??B?`f*???"C?
??q?&???A+???EIuQ??JYOP?	lA)"w	p??NyW?_F?b	u??#???J?Y?F?????#U????>
PP?t??v???uHD???????:?^???ET4???}U?0A
@@?l
??
??V?????AOD!U??KM l/??*H??Z	s?J?V???B,???i??? 

H?K??L$?`rG?JR?)??lA0
0?R??2P
?L
?*?????
??Pb??}??g???ClM??:??a	?}??4??@?{/h
?????`?$?P
?X?C3
R?@s??Z??!?
3%T??P??	L
???w@?&"?`x???4
?D??e{???8c??%?Gx??sv:??l?`h?B?q???????'?AI}?=P???Y3???k?????4\Hj??HcLB?FH+??DqdC???3Q4????1?	
???
Ea
A??	?k?@?@?.?D,???E???9?Z???)L?
	J )
F?,5?v-?!?\0?l"%???_???#?6G?_????F???sN 6??4B[???.??<???Pt???hA?????
t???B???hM??V/?5?%^|?x?|f?v??cl=??'i9??VXCXe?#??#???B??????-OD
??(?K?'???t????6?Y:?zQl?3][???^??????(???F????c?Tt???^??bVO{?E?C????]???????$Y???7?:??,?s?g?{?|]?G[?<tl??
????P?a?4L?(-F?dR?N&?=&{?\??^~5?4???Jg??Cl?c?8??x1?t?,B?_??r?f???~?pa???3m??c?>^?!M????Fs??kbw??E?-k2?zk??,??|=????I?PQ?B?KX?p?${????????H??b???)????? ?-??????^?E
2??????
????{?0???????0????????C?Nxy???(??p?GY???'A?!Y???%T?"?T???V???
??_Lsz?J?
????!
??
?H=???U?NZ????^?0?8?Bq????????h?>XR? ?x????q6BZ'S??2??U
?#?ZhF?h??vS? L??sPQ?S??N?
R?82?
a?Vtf????, ?$??`??y&T????}W1???I??V-?9Q??}?|???????se
<???	??HITA??
?pF?@%a?
<zPt?z9l?#+O????k???aeY?ft??x??
?/y???????\???=g?^F#8f?*?W??n???g< <-?E???S?K?M??`:S??b????h?j????y??q5?H8\??J???11+Z?L?aS?C)??C0D?6V?N???6?40V!??<?9gS?-f??nB??v?h???/?G??
?X??_?L?]?????=???zq]M?*oK??a?VD?61G	6? u)???????SW?e??????But?-k?M3?????{??x?v{?"???E??W=???yfO?M?d;?|4??`S???
"?wr?8??????F????T?K??@?P=??=$y?L???????????[??z?N????i%?n[???Ef!???F?M)^8??j?????Zp?Ll:1?r?]?t?=4](2?v??H?cJY-???:?m?Q?????????8pq????8S? ?D???1???}????t?a'?$h	?
	??TPK??ku??
???oK??3??7X???]5?????8?H}??xP(P??h0z??7A?L????V???@??@???a??X?a???z??g?a at Z??a	??Y'|??;H??????l??????W?{~5??X???]??w^?????as?&EJh>?????a+3=g??c??5?Q$?9$???P??m?;???i?6?A????3?w!U
?""]?G\???2?u??J?
??v?zx`?
??w??????
???;???@P`bA????@HB??m?NC??W? g7)l????/?A?e?????jSYr?-??8??z?,W?????]viA?C??t????t?,??fg\?N????d?T?I?a&?tL??8?;??{1??i??
???m????;??I'A3x?
????dC?????
??Y??9?=c??
0????I>??t?[??](?+5?F?a?!l?#y?z????<ef?(?l??????$\1g?[$|???????qEB??SPu/P???? ?Dw??a????
?????!??????L??????+
j??
????J???:????5??$:C?|?/?	??I??fl0\??;??r?????X&?`?
9???{????S
w=S?>?????R???7??0`??0?`B?x??y??????9,??????xA?????$?I??Q%?$iS??@??	8"?.????q3????Kn??Z?"??_?DC??
?;{?V_???f?}U?cm?jd?? &??????R??.?Oa??Sl??I??B?h???????8??Zc?Y?2?u?1q??%?Q????"k???AO??
?* i#?a#?Rs9
?}??v?n?g]??wR?R3?k?????U??|+??:?=
??J.&S?u$w?+???+???`????Q??8 `?Q??8??????8?
?09???LY?0 fLS?	??E???w	????M?K???A???'??~$??be?jc??-??????65G????=?? 0?
??`LF?????N??`C ?2???%'@?091?h8! ?9 Q.EIlN???S?"??"???? ????
*?:???Z??6!??0 `h??f$???????<GW&?Y??[?????Kh?p?lX, Ho?????F????'QZv??,b???i"&1$?tqa???b?b????h??A1k?H??xX2?f(??
A?4?????????C??KF???????G?????>K@?;&??+?p????B??~??????Y?????`2?C?<e???$?'0>~??????i?!!????B8??6?>.???rq!??AA?????)??7???I??|?????+?^??'?????A?D?B(Q	??y?????6?h^????AO}?N?D?????&0N!?G-)*u,?X????{?????[?f(<??|????G??}???O}p??`<?_$??@?T??A???;?ru&K hC?,? p??>E<~=w?C???2???c????H?w?oC??
o? I%"5?{-R?8*M?$???
n=09???J5??S??s?:L???jT??@xl?2?!) ?g?/@??f\}?&^?PWYic???? H?
?a?Q6??ox=	?U????
?1?n????)(Y1?p??????4????.$?O?s??n?? ?1??L^???Cpo?ow5??	b?$E =~U???;??k?J??9?iH????AH=%T
c ????v1x???(S|{0pnj????%??gC#XC?????>?+???d7?!?????I?X(!????x?7e?MF?yB8
K$??em?L#??_?t}e
(??2
??.?!???l2 qf??q?H*?????!70TGN?1?	???}??H|kG?l?7?????`:
?u????_?????g6??a;??]??	????iU2hn??FX??)??????vLc?e?m???(\v\???4D??i???{2?????m???h?1'Q???I?;???DnD?<?$?
9R$s@????{?~x?f?^T8?????n{<?X!??*{;?W?
y?w?W??!??e?b??@!S?6?R;??b??
B@[??B????n|?h?????Ce?3B?d(??0???(?t?_??>?-RD?
,cI	,?*?KX?????I???
h? ??M??D?J?"?A???
??4?%???K?-a;P?p???%d?????
??????l???+?fG???s?:??SV?s+tiFK???j?Z??U?JCp???Iwi?-?&????9m?;??????!p<??Ips	?l?mO???!???h?j
????0i??fK?4??,?BV
??????V?mG:??"Hp;?!??u??))Pk?rP???t3
???*q???5>VU(yq'
?.?I??????	C?o??)i?z????:?$??)`e?DN????xU5???L?|kO?h?a???a??kP??3LNM?ky]??s?!??d?9??:hB!9nB?D>??>xQH-?a?}@C-??}L?8a&???A8P3X? ?????|-???????Pq?$???x?????t\?f????1?4B???(2!??????????C?W?m???cvXB??b?c?M????
??????<O?k?L??+\??x]?`e
H?L????.U,k?52_b?!?.MG%??4[?k?c??)a?"|??H??5??9??????}k??I76<t5??Z??C@?9V????? u????w?SP<D?;v?+gs?#?hF??????n?qX???$Oy?v?D??:?J%.??G???
???jJ????pq??g)??d[??41:??.d47T6[????D6?w?
nqD`Rb?{?[P???U ???RyM)tQF???0????r??.h?e????y????6
6?N??ce???Z3?w??0H?37??J	P1$h?J??N??8pp?r??B0Tu0?b0>?L??	R:DpCP??r?
??p=??????????y??O?7???mU??h??\???
+`?FCGY?u????? ????T?KJiL??1h?k?
SX?
?6JM(E?p?J?gl?@v?c??a?w~????@F????A'
?????.???4<=?U-??Hl??FZ?7I??e5?P?????
9???IP?h?"???s?"F??K'`?
??)?4???p???E
?%?*???]??6:48'
?3?a1D????n???8?N?)I$m8%?????@U??B???T???jS???d4S_???Tblllm?a_?q??\I,V?"?"d??R??pCez?=?U?=R?s?'??d$@??K??????u?&?>$:
?X?
A???4?o?????a?A?gY+??Y1?F???d?B0?BH?A^?wR????????9????I???????E?J?BE(=??UUUUUUhNIc?@?(????p?	d
?e ?#b?ET{???W?wi?Q?)???)??[Ws??a1DF???!??,????i?SE?*??1$0j?Q?'XJ?!H8?N???-L?H at f*???d".1Sxi??
j1r	!?(???A??z???$6CI 2??!c??'
)?????N?????>?????<TQl(??La_'???I??{?
???d?,#bX???f???.P	?6(Z??	??cPJD?*???[%]?f??????>L??wN??{?!j??2V?D???F
B=??7D9?`Y?P4Z`????FN???g?PWu?U'??g?0??o???.?k?~?B?=?????j?1?p??????????$gA??F?("{R[??`{N=???8?(|[?????6b???]H????YP?m??W?W?8?D ???nM*Ha<DIP?H`@}(??l??h&)???t?7??}?m>??'?6??(?cm??!???
?H~?dMJ|f?I?U?Y?P!??w/0&H9*|????jY??!OI(??&o9%2?I?`????
S?
???9?sE??B????DO??##j?@<Js6?2Q?!?
@:??l??O-???T?="
i?????HG??l|?"H?$?I???4????u?????>o8c?#????	T>?????????$?8S&??? D@?Q?,I???*?},?X?a??@s)?M?+????6:??)4N?$P?M?@h????p"?d
?%2
?	?1
??2 ?*???C??^??RQG??#*?$)?0!?!y?%???"	?????C
q8??0E??a?)?!RpH39Dx??%b?B???}/>?}?j???@?: <???$4y.???{$?^mdU??Z????7zO9??"bK??]??????@?#!Q[H?%I ??????????s?c?B?"??o?????4B?C???6????'?????+IT?
??]?xQ?>vY??\????? q??e),J?f?dpIeL????a??"?%?%???:?vy??&??Cj?r?`)?C)?;b??6?a????,te?I ?d?B??WUM?4R???
?j?R???
E????d%L??1??u?XW?I;?h??f
`?)?H??0?S
??H???@???v%	?r6Js???v&
r???S?G	????l???>?0:?:'?5??v7?????".??4??D?LDs?~???}>??IAD10?????f???	??.?bp?B?c1TT?
?"Rl=Qz-C??C?!??0??
?I~??????????(\???r?v??
?????Q;?l
?=H???o??G?q<?j??BT???L???3??>????8?WL?rpJ????P?G?t???&Aq_\? $??G?R?@???k[v?L?&?&88???H !?O???@?
J???B???U?p?!??g??M?
;???S??d?wA&
 ?W#:
A?4??4?B=?R$???Ln?!?
??C4??{WgY:0Py?C?I
?PE??L?TJU?? nA:???i??vd??.???VJHV?l??"? ??*?? ??~?b4y???U~???&?^?}???F?E"
?@???u?XaNo ????????E
??8?0cP??-??9!?=?????5????P??J?$H?
DX|~??? ?dX
 6?P?`=?`???z<<?????xdJ:#???>??A????P d4???Q8??$??MG?"??-"?pW?
?S??B1?p(?v0?k1?Q]?z]??(??`??9yWz?d??????c?c?ff?@D
??D??,???S????????(}1??&!????;URT$~
?j??&??&H?h???#??u?
??w?	??B&O?"??k?Z5,?.???	????V?91??+4??f?z??0b???F???1???d0(?D?x???????:k???$?v%/1Z???$1"&????"??O???'?m#?`PDF2?????%?]????????g??????????????"d???"?

??Jx????g????????E???????J
0lk?S#????V
?8?^??V??|??G?hc?????O???!D
rZ0??dZQ???%OB0$}XPF
SkTN?/LfW??lD?W!T
${c?F?@m???Q???Z+$?G:.????
?-???!n?<0???I?B???#???????QX9Ef?1 ?&^v?/?C?G_??Whp?A?"?0N?
7??co??P,????w?.?g6F???&??s7M??1????4?C9???#??Za??;?7I0!?0{?????????i;f1M
+??P6?L????????NGe??xb?O?t?q???!?F???]4t:8????????? &"?/0p???4
S?D??(??
Gd5@;?
?Z?b?? ??bU
??????<
~?8F)????)e?w??????(??Y???# ?"=o_??u?]???W?R`??`*??????a`???$??"??n?Q;h"?@K?cP??????dad???#,??(Ry???{???r??>??z??#?D?8A?lq???RH???B????7_????a???0?d,?????'??-???(?D?(b????
jJB!?????j???
hJ?i? ?????"&??`??\!?$&?? ????j???? "??)h?
%????P~xS??i??6????t???p???R?H??T??jo1?
j?
?%?*(D?	a3H?>*%??$`?
3?2D?q??
J?#?D,????
M???u'?H??f????????.?g?_??C?P
??L<??l?4?ox????@?`?C??(l????-I?!BP?"0?4????/??????X{0??P???????????RR?,?YcS??????

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jun 2005 16:00:08 -0000	1.5
+++ .cvsignore	2 Jan 2006 04:53:30 -0000	1.6
@@ -1 +0,0 @@
-pam_mount-0.9.25.tar.gz


Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pam_mount.spec	24 Nov 2005 03:48:10 -0000	1.9
+++ pam_mount.spec	2 Jan 2006 04:53:30 -0000	1.10
@@ -1,14 +1,14 @@
 Summary: A PAM module that can mount volumes for a user session
 Name: pam_mount
-Version: 0.9.25
-Release: 5
+Version: 0.11.0
+Release: 1
 License: LGPL
 Group: System Environment/Base
-Source: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
+Source: http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL: http://www.flyn.org
+URL: http://pam-mount.sourceforge.net/
 Requires: pam
-BuildRequires: glib2-devel pam-devel openssl-devel zlib-devel
+BuildRequires: glib2-devel pam-devel openssl-devel zlib-devel kernel-devel
 
 %description
 This module is aimed at environments with SMB (Samba or Windows NT) 
@@ -53,6 +53,8 @@
 
 
 %build
+# See BZ 174190 for why this definition is required.
+export CFLAGS=-I/lib/modules/`uname -r`/build/include/
 %configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
@@ -95,8 +97,11 @@
 
 
 %changelog
-* Thu Jun 09 2005 W. Michael Petullo <mike[@]flyn.org> - 0.9.25-5
-   - Bump release to rebuild for devel.
+* Sun Jan 01 2006 W. Michael Petullo <mike[@]flyn.org> - 0.11.0-1
+   - Updated to pam_mount 0.11.0.
+   - Mike Petullo is no longer the up-stream maintainer.
+   - Change URL.
+   - Change Source.
 
 * Thu Jun 09 2005 W. Michael Petullo <mike[@]flyn.org> - 0.9.25-4
    - Bump release for devel.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Jun 2005 16:00:08 -0000	1.6
+++ sources	2 Jan 2006 04:53:30 -0000	1.7
@@ -1 +0,0 @@
-2f0e2cc0fa9a3cf5153c6f915aa1719e  pam_mount-0.9.25.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 07:39:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon,  2 Jan 2006 02:39:40 -0500
Subject: rpms/naim/FC-4 .cvsignore, 1.3, 1.4 naim.spec, 1.4, 1.5 sources, 1.3,
	1.4
Message-ID: <200601020740.k027eDlB024500@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/naim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24479

Modified Files:
	.cvsignore naim.spec sources 
Log Message:
0.11.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 23:21:10 -0000	1.3
+++ .cvsignore	2 Jan 2006 07:39:39 -0000	1.4
@@ -1 +1 @@
-naim-0.11.8.tar.bz2
+naim-0.11.8.1.tar.bz2


Index: naim.spec
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-4/naim.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- naim.spec	2 Oct 2005 23:21:10 -0000	1.4
+++ naim.spec	2 Jan 2006 07:39:39 -0000	1.5
@@ -1,5 +1,5 @@
 Name: naim
-Version: 0.11.8
+Version: 0.11.8.1
 Release: 1%{?dist}
 Summary: An ncurses-based console AIM, ICQ, IRC, and Lily client
 
@@ -38,6 +38,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Mon Jan 02 2006 Luke Macken <lmacken at redhat.com> 0.11.8.1-1
+- Bump to 0.11.8.1
+
 * Sun Oct 02 2005 Luke Macken <lmacken at redhat.com> 0.11.8-1
 - Bumped to 0.11.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/naim/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 23:21:10 -0000	1.3
+++ sources	2 Jan 2006 07:39:39 -0000	1.4
@@ -1 +1 @@
-e66f29057ffc4016e814134b8d1f8681  naim-0.11.8.tar.bz2
+beb0a3b2bcb45cfe9b84075dced494b8  naim-0.11.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan  2 08:55:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 03:55:16 -0500
Subject: rpms/wine/devel Makefile,1.3,1.4
Message-ID: <200601020855.k028tmfQ026317@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26300

Added Files:
	Makefile 
Log Message:
- add Makefile to devel branch



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	2 Jan 2006 08:55:16 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wine
+# $Id$
+NAME := wine
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Mon Jan  2 09:04:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:04:13 -0500
Subject: rpms/wine import.log,1.2,1.3
Message-ID: <200601020904.k0294kFo028359@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28314

Modified Files:
	import.log 
Log Message:
auto-import wine-0.9.4-3 on branch devel from wine-0.9.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Nov 2004 05:32:54 -0000	1.2
+++ import.log	2 Jan 2006 09:04:13 -0000	1.3
@@ -1 +1,2 @@
 wine-0_0-0_fdr_2_20030911_rh90:HEAD:wine-0.0-0.fdr.2.20030911.rh90.src.rpm:1099891974
+wine-0_9_4-3:HEAD:wine-0.9.4-3.src.rpm:1136192622



From fedora-extras-commits at redhat.com  Mon Jan  2 09:04:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:04:37 -0500
Subject: rpms/wine/devel sources, 1.3, 1.4 wine-20050524-generated.patch,
	NONE, 1.1 wine-32.conf, NONE, 1.1 wine-README-Fedora, NONE,
	1.1 wine-notepad.desktop, NONE, 1.1 wine-regedit.desktop, NONE,
	1.1 wine-uninstaller.desktop, NONE, 1.1 wine-winecfg.desktop,
	NONE, 1.1 wine-winefile.desktop, NONE, 1.1 wine-winemine.desktop,
	NONE, 1.1 wine-winhelp.desktop, NONE, 1.1 wine.init, 1.2,
	1.3 wine.spec, 1.3, 1.4
Message-ID: <200601020905.k02959Qt028368@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28314/devel

Added Files:
	sources wine-20050524-generated.patch wine-32.conf 
	wine-README-Fedora wine-notepad.desktop wine-regedit.desktop 
	wine-uninstaller.desktop wine-winecfg.desktop 
	wine-winefile.desktop wine-winemine.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
auto-import wine-0.9.4-3 on branch devel from wine-0.9.4-3.src.rpm


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	2 Jan 2006 09:04:37 -0000	1.4
@@ -0,0 +1,2 @@
+73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz

wine-20050524-generated.patch:

--- NEW FILE wine-20050524-generated.patch ---
Index: wine/tools/wineprefixcreate.in
===================================================================
RCS file: /home/wine/wine/tools/wineprefixcreate.in,v
retrieving revision 1.10
diff -u -r1.10 wineprefixcreate.in
--- wine/tools/wineprefixcreate.in	19 May 2005 11:12:34 -0000	1.10
+++ wine/tools/wineprefixcreate.in	29 May 2005 00:00:00 -0000
@@ -38,6 +38,7 @@
 
 dlldir="@dlldir@"
 datadir="@datadir@/wine"
+fontdir="@datadir@/fonts/wine"
 
 do_wait=0
 quiet=0
@@ -175,6 +176,11 @@
 link_app winhelp      "$CROOT/windows/winhelp.exe"
 link_app winhelp      "$CROOT/windows/winhlp32.exe"
 link_app winebrowser  "$CROOT/windows/winebrowser.exe"
+
+# Copy the generated fonts
+
+cp $fontdir/*.ttf "$CROOT/windows/fonts"
+cp $fontdir/*.fon "$CROOT/windows/fonts"
 
 # Copy the .inf script and run it
 


--- NEW FILE wine-32.conf ---
/usr/lib/wine/


--- NEW FILE wine-README-Fedora ---
Wine directory structure used in Fedora Core Linux:
===================================================

\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
default. It is created with (empty) C:\windows and C:\windows\system
directories, needed to operate Wine without an existing Windows
installation, if it doesn't already exists.

If you want to use Wine with an existing Windows installation that is
mounted, for example, in /mnt/windows-c, change the symlink
\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
defaults set by installation.

If you do this, you can safely remove \${HOME}/.wine/drive_c.
(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)


--- NEW FILE wine-notepad.desktop ---
[Desktop Entry]
Name=notepad
Comment=Text Editor
Exec=notepad
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-regedit.desktop ---
[Desktop Entry]
Name=regedit
Comment=Wine registry editor
Exec=regedit
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-uninstaller.desktop ---
[Desktop Entry]
Name=Wine Software Uninstaller
Comment=Interface to uninstall software
Exec=uninstaller
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winecfg.desktop ---
[Desktop Entry]
Name=Wine Configuration
Comment=Interface to set wine parameters
Exec=winecfg
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winefile.desktop ---
[Desktop Entry]
Name=Wine File
Comment=Wine File Browser
Exec=winefile
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winemine.desktop ---
[Desktop Entry]
Name=WineMine
Comment=Wine Minesweeper 
Exec=winemine
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winhelp.desktop ---
[Desktop Entry]
Name=winhelp
Comment=Windows Help Browser
Exec=winhelp
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


Index: wine.init
===================================================================
RCS file: wine.init
diff -N wine.init
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.init	2 Jan 2006 09:04:37 -0000	1.3
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# wine	Allow users to run Windows(tm) applications by just clicking on them
+#	(or typing ./file.exe)
+#
+# chkconfig: 35 98 10
+# description: Allow users to run Windows(tm) applications by just clicking \
+#	       on them (or typing ./file.exe)
+
+. /etc/rc.d/init.d/functions
+RETVAL=0
+
+start() {
+	echo -n $"Registering binary handler for Windows applications"
+	/sbin/modprobe binfmt_misc &>/dev/null
+	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+}
+
+stop() {
+	echo -n $"Unregistering binary handler for Windows applications"
+	echo "-1" >/proc/sys/fs/binfmt_misc/windows || :
+	echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE || :
+}
+
+reload() {
+	stop
+	start
+}
+
+wine_status() {
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+		echo $"Wine binary format handlers are registered."
+		return 0
+	else
+		echo $"Wine binary format handlers are not registered."
+		return 3
+	fi
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		wine_status
+		RETVAL=$?
+		;;
+	restart)
+		stop
+		start
+		;;
+	condrestart)
+		if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+			stop
+			start
+		fi
+		;;
+	*)
+		echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+		exit 1
+esac
+exit $RETVAL
+


Index: wine.spec
===================================================================
RCS file: wine.spec
diff -N wine.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.spec	2 Jan 2006 09:04:37 -0000	1.4
@@ -0,0 +1,1060 @@
+Name:		wine
+Version:	0.9.4
+Release:	3
+Summary:	A Windows 16/32/64 bit emulator
+
+Group:		Applications/Emulators
+License:	LGPL
+URL:		http://www.winehq.org/
+Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source1:	wine.init
+Source2:	wine-fonts-20050524.tar.gz
+Source3:        wine-README-Fedora
+Source4:        wine-32.conf
+Source100:      wine-notepad.desktop
+Source101:      wine-regedit.desktop
+Source102:      wine-uninstaller.desktop
+Source103:      wine-winecfg.desktop
+Source104:      wine-winefile.desktop
+Source105:      wine-winemine.desktop
+Source106:      wine-winhelp.desktop
+Patch2:		wine-20050524-generated.patch
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch: %{ix86}
+
+BuildRequires:  autoconf
+BuildRequires:	bison
+BuildRequires:	flex
+BuildRequires:  alsa-lib-devel
+BuildRequires:  arts-devel
+BuildRequires:  audiofile-devel
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  lcms-devel
+BuildRequires:  libieee1284-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openldap-devel
+BuildRequires:  sane-backends-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  fontforge
+# modular x
+BuildRequires:  libX11-devel
+BuildRequires:  mesa-libGL-devel mesa-libGLU-devel mesa-libGLw-devel
+BuildRequires:  libXxf86dga-devel libXxf86vm-devel
+BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
+
+Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
+Requires(post): /usr/bin/update-desktop-database
+Requires(preun): /sbin/chkconfig
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+
+%description
+While Wine is usually thought of as a Windows(TM) emulator, the Wine
+developers would prefer that users thought of Wine as a Windows
+compatibility layer for UNIX. This package includes a program loader,
+which allows unmodified Windows 3.x/9x/NT binaries to run on x86 and x86_64
+Unixes. Wine does not require MS Windows, but it can use native system
+.dll files if they are available.
+
+%package tools
+Summary:        Additional wine tools
+Group:		Applications/Emulators
+Requires:       %{name} = %{version}-%{release}
+
+%description tools
+Additional wine tools
+
+%package arts
+Summary: Arts sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description arts
+Arts sound support for wine
+
+%package esd
+Summary: ESD sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description esd
+ESD sound support for wine
+
+%package jack
+Summary: JACK sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description jack
+JACK sound support for wine
+
+%package nas
+Summary: NAS sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description nas
+JACK sound support for wine
+
+%package ldap
+Summary: LDAP support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description ldap
+LDAP support for wine
+
+%package cms
+Summary: Color Managment for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description cms
+Color Management for wine
+
+%package twain
+Summary: Twain support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description twain
+Twain support for wine
+
+%package capi
+Summary: ISDN support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description capi
+ISDN support for wine
+
+%package devel
+Summary: Wine development environment
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description devel
+Header, include files and library definition files for developing applications
+with the Wine Windows(TM) emulation libraries.
+
+%prep
+%setup -q
+%patch2 -p1 -b .generated
+autoconf
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure \
+	--sysconfdir=%{_sysconfdir}/wine --disable-static
+
+%{__make} depend
+%{__make}
+
+%install
+rm -rf %{buildroot}
+
+%makeinstall \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+%makeinstall \
+	-C dlls/wineps \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+
+mkdir -p %{buildroot}%{_sysconfdir}/wine
+
+# Allow users to launch Windows programs by just clicking on the .exe file...
+mkdir -p %{buildroot}%{_initrddir}
+install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
+
+# Install Wine's fonts
+mkdir -p %{buildroot}%{_datadir}/fonts/wine
+tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE100}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE101}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE102}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE103}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE104}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE105}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE106}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
+
+cp %{SOURCE3} README-Fedora
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add wine
+/sbin/chkconfig --level 2345 wine on
+/sbin/service wine start &>/dev/null || :
+update-desktop-database &>/dev/null || :
+
+%preun
+if test "$1" = "0"; then
+	/sbin/chkconfig --del wine
+fi
+
+%postun
+/sbin/ldconfig
+update-desktop-database &>/dev/null || :
+
+%post arts -p /sbin/ldconfig
+%postun arts -p /sbin/ldconfig
+
+%post esd -p /sbin/ldconfig
+%postun esd -p /sbin/ldconfig
+
+%post jack -p /sbin/ldconfig
+%postun jack -p /sbin/ldconfig
+
+%post nas -p /sbin/ldconfig
+%postun nas -p /sbin/ldconfig
+
+%post ldap -p /sbin/ldconfig
+%postun ldap -p /sbin/ldconfig
+
+%post cms -p /sbin/ldconfig
+%postun cms -p /sbin/ldconfig
+
+%post twain -p /sbin/ldconfig
+%postun twain -p /sbin/ldconfig
+
+%post capi -p /sbin/ldconfig
+%postun capi -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
+%doc AUTHORS README-Fedora README VERSION
+%doc documentation/*
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/winebrowser
+%{_bindir}/wineconsole
+%{_bindir}/wineprefixcreate
+%{_bindir}/wineshelllink
+%{_bindir}/winecfg
+%{_bindir}/uninstaller
+%{_initrddir}/wine
+%{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/msiexec.exe.so
+%{_libdir}/wine/regedit.exe.so
+%{_libdir}/wine/regsvr32.exe.so
+%{_libdir}/wine/rpcss.exe.so
+%{_libdir}/wine/rundll32.exe.so
+%{_libdir}/wine/start.exe.so
+%{_libdir}/wine/wineboot.exe.so
+%{_libdir}/wine/winebrowser.exe.so
+%{_libdir}/wine/wineconsole.exe.so
+%{_libdir}/wine/winemenubuilder.exe.so
+%{_libdir}/wine/winevdm.exe.so
+%{_datadir}/applications/fedora-wine.desktop
+%{_datadir}/applications/fedora-wine-regedit.desktop
+%{_datadir}/applications/fedora-wine-uninstaller.desktop
+%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_mandir}/man1/wine.1.gz
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+%{_bindir}/wine-kthread
+%{_bindir}/wine-preloader
+%{_bindir}/wine-pthread
+%{_bindir}/winelauncher
+%{_bindir}/wineserver
+%{_mandir}/man1/wineserver.1*
+%{_libdir}/libwine.so.1
+%{_libdir}/libwine_unicode.so.1
+%dir %{_libdir}/wine
+%{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/advapi32.dll.so
+%{_libdir}/wine/advpack.dll.so
+%{_libdir}/wine/amstream.dll.so
+%{_libdir}/wine/atl.dll.so
+%{_libdir}/wine/avicap32.dll.so
+%{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avifile.dll.so
+%{_libdir}/wine/aviinfo.exe.so
+%{_libdir}/wine/aviplay.exe.so
+%{_libdir}/wine/cabinet.dll.so
+%{_libdir}/wine/cards.dll.so
+%{_libdir}/wine/cfgmgr32.dll.so
+%{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/comcat.dll.so
+%{_libdir}/wine/comctl32.dll.so
+%{_libdir}/wine/comdlg32.dll.so
+%{_libdir}/wine/comm.drv.so
+%{_libdir}/wine/commdlg.dll.so
+%{_libdir}/wine/compobj.dll.so
+%{_libdir}/wine/crtdll.dll.so
+%{_libdir}/wine/crypt32.dll.so
+%{_libdir}/wine/cryptdll.dll.so
+%{_libdir}/wine/ctl3d.dll.so
+%{_libdir}/wine/ctl3d32.dll.so
+%{_libdir}/wine/ctl3dv2.dll.so
+%{_libdir}/wine/d3dim.dll.so
+%{_libdir}/wine/d3drm.dll.so
+%{_libdir}/wine/d3dxof.dll.so
+%{_libdir}/wine/dbghelp.dll.so
+%{_libdir}/wine/dciman32.dll.so
+%{_libdir}/wine/ddeml.dll.so
+%{_libdir}/wine/ddraw.dll.so
+%{_libdir}/wine/devenum.dll.so
+%{_libdir}/wine/dinput.dll.so
+%{_libdir}/wine/dinput8.dll.so
+%{_libdir}/wine/dispdib.dll.so
+%{_libdir}/wine/display.drv.so
+%{_libdir}/wine/dmband.dll.so
+%{_libdir}/wine/dmcompos.dll.so
+%{_libdir}/wine/dmime.dll.so
+%{_libdir}/wine/dmloader.dll.so
+%{_libdir}/wine/dmscript.dll.so
+%{_libdir}/wine/dmstyle.dll.so
+%{_libdir}/wine/dmsynth.dll.so
+%{_libdir}/wine/dmusic.dll.so
+%{_libdir}/wine/dmusic32.dll.so
+%{_libdir}/wine/dplay.dll.so
+%{_libdir}/wine/dplayx.dll.so
+%{_libdir}/wine/dpnet.dll.so
+%{_libdir}/wine/dpnhpast.dll.so
+%{_libdir}/wine/dsound.dll.so
+%{_libdir}/wine/dswave.dll.so
+%{_libdir}/wine/dxdiagn.dll.so
+%{_libdir}/wine/eject.exe.so
+%{_libdir}/wine/gdi.exe.so
+%{_libdir}/wine/gdi32.dll.so
+%{_libdir}/wine/hh.exe.so
+%{_libdir}/wine/hhctrl.ocx.so
+%{_libdir}/wine/iccvid.dll.so
+%{_libdir}/wine/icinfo.exe.so
+%{_libdir}/wine/icmp.dll.so
+%{_libdir}/wine/ifsmgr.vxd.so
+%{_libdir}/wine/imaadp32.acm.so
+%{_libdir}/wine/imagehlp.dll.so
+%{_libdir}/wine/imm.dll.so
+%{_libdir}/wine/imm32.dll.so
+%{_libdir}/wine/iphlpapi.dll.so
+%{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/joystick.drv.so
+%{_libdir}/wine/kernel32.dll.so
+%{_libdir}/wine/keyboard.drv.so
+%{_libdir}/wine/krnl386.exe.so
+%{_libdir}/wine/lz32.dll.so
+%{_libdir}/wine/lzexpand.dll.so
+%{_libdir}/wine/mapi32.dll.so
+%{_libdir}/wine/mciavi32.dll.so
+%{_libdir}/wine/mcicda.dll.so
+%{_libdir}/wine/mciseq.dll.so
+%{_libdir}/wine/mciwave.drv.so
+%{_libdir}/wine/midimap.dll.so
+%{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevldr.vxd.so
+%{_libdir}/wine/mmsystem.dll.so
+%{_libdir}/wine/monodebg.vxd.so
+%{_libdir}/wine/mouse.drv.so
+%{_libdir}/wine/mpr.dll.so
+%{_libdir}/wine/msacm.dll.so
+%{_libdir}/wine/msacm.drv.so
+%{_libdir}/wine/msacm32.dll.so
+%{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/msdmo.dll.so
+%{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/mshtml.dll.so
+%{_libdir}/wine/msi.dll.so
+%{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisys.ocx.so
+%{_libdir}/wine/msnet32.dll.so
+%{_libdir}/wine/msrle32.dll.so
+%{_libdir}/wine/msvcrt.dll.so
+%{_libdir}/wine/msvcrt20.dll.so
+%{_libdir}/wine/msvcrt40.dll.so
+%{_libdir}/wine/msvcrtd.dll.so
+%{_libdir}/wine/msvfw32.dll.so
+%{_libdir}/wine/msvidc32.dll.so
+%{_libdir}/wine/msvideo.dll.so
+%{_libdir}/wine/mswsock.dll.so
+%{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/netapi32.dll.so
+%{_libdir}/wine/newdev.dll.so
+%{_libdir}/wine/ntdll.dll.so
+%{_libdir}/wine/objsel.dll.so
+%{_libdir}/wine/odbc32.dll.so
+%{_libdir}/wine/odbccp32.dll.so
+%{_libdir}/wine/ole2.dll.so
+%{_libdir}/wine/ole2conv.dll.so
+%{_libdir}/wine/ole2disp.dll.so
+%{_libdir}/wine/ole2nls.dll.so
+%{_libdir}/wine/ole2prox.dll.so
+%{_libdir}/wine/ole2thk.dll.so
+%{_libdir}/wine/ole32.dll.so
+%{_libdir}/wine/oleacc.dll.so
+%{_libdir}/wine/oleaut32.dll.so
+%{_libdir}/wine/olecli.dll.so
+%{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledlg.dll.so
+%{_libdir}/wine/olepro32.dll.so
+%{_libdir}/wine/olesvr.dll.so
+%{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/powrprof.dll.so
+%{_libdir}/wine/psapi.dll.so
+%{_libdir}/wine/qcap.dll.so
+%{_libdir}/wine/quartz.dll.so
+%{_libdir}/wine/rasapi16.dll.so
+%{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/riched20.dll.so
+%{_libdir}/wine/riched32.dll.so
+%{_libdir}/wine/rpcrt4.dll.so
+%{_libdir}/wine/rsabase.dll.so
+%{_libdir}/wine/rsaenh.dll.so
+%{_libdir}/wine/secur32.dll.so
+%{_libdir}/wine/sensapi.dll.so
+%{_libdir}/wine/serialui.dll.so
+%{_libdir}/wine/setupapi.dll.so
+%{_libdir}/wine/setupx.dll.so
+%{_libdir}/wine/shdocvw.dll.so
+%{_libdir}/wine/shell.dll.so
+%{_libdir}/wine/shell32.dll.so
+%{_libdir}/wine/shfolder.dll.so
+%{_libdir}/wine/shlwapi.dll.so
+%{_libdir}/wine/snmpapi.dll.so
+%{_libdir}/wine/sound.drv.so
+%{_libdir}/wine/stdole2.tlb.so
+%{_libdir}/wine/stdole32.tlb.so
+%{_libdir}/wine/sti.dll.so
+%{_libdir}/wine/storage.dll.so
+%{_libdir}/wine/stress.dll.so
+%{_libdir}/wine/system.drv.so
+%{_libdir}/wine/tapi32.dll.so
+%{_libdir}/wine/toolhelp.dll.so
+%{_libdir}/wine/typelib.dll.so
+%{_libdir}/wine/unicows.dll.so
+%{_libdir}/wine/url.dll.so
+%{_libdir}/wine/urlmon.dll.so
+%{_libdir}/wine/user.exe.so
+%{_libdir}/wine/user32.dll.so
+%{_libdir}/wine/usp10.dll.so
+%{_libdir}/wine/uxtheme.dll.so
+%{_libdir}/wine/vdhcp.vxd.so
+%{_libdir}/wine/vdmdbg.dll.so
+%{_libdir}/wine/ver.dll.so
+%{_libdir}/wine/version.dll.so
+%{_libdir}/wine/vmm.vxd.so
+%{_libdir}/wine/vnbt.vxd.so
+%{_libdir}/wine/vnetbios.vxd.so
+%{_libdir}/wine/vtdapi.vxd.so
+%{_libdir}/wine/vwin32.vxd.so
+%{_libdir}/wine/w32skrnl.dll.so
+%{_libdir}/wine/w32sys.dll.so
+%{_libdir}/wine/win32s16.dll.so
+%{_libdir}/wine/win87em.dll.so
+%{_libdir}/wine/winaspi.dll.so
+%{_libdir}/wine/windebug.dll.so
+%{_libdir}/wine/wineaudioio.drv.so
+%{_libdir}/wine/winedos.dll.so
+%{_libdir}/wine/winemp3.acm.so
+%{_libdir}/wine/wineoss.drv.so
+#%{_libdir}/wine/winetty.drv.so
+%{_libdir}/wine/winex11.drv.so
+%{_libdir}/wine/wing.dll.so
+%{_libdir}/wine/wininet.dll.so
+%{_libdir}/wine/winmm.dll.so
+%{_libdir}/wine/winnls.dll.so
+%{_libdir}/wine/winnls32.dll.so
+%{_libdir}/wine/winsock.dll.so
+%{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/wintab.dll.so
+%{_libdir}/wine/wintab32.dll.so
+%{_libdir}/wine/wintrust.dll.so
+%{_libdir}/wine/wnaspi32.dll.so
+%{_libdir}/wine/wow32.dll.so
+%{_libdir}/wine/wprocs.dll.so
+%{_libdir}/wine/ws2_32.dll.so
+%{_libdir}/wine/wsock32.dll.so
+%{_libdir}/wine/wtsapi32.dll.so
+%dir %{_datadir}/fonts/wine
+%{_datadir}/fonts/wine/wine_coure.fon
+%{_datadir}/fonts/wine/wine_couree.fon
+%{_datadir}/fonts/wine/wine_courer.fon
+%{_datadir}/fonts/wine/wine_marlett.ttf
+%{_datadir}/fonts/wine/wine_sserife.fon
+%{_datadir}/fonts/wine/wine_sserifee.fon
+%{_datadir}/fonts/wine/wine_sserifer.fon
+%{_datadir}/fonts/wine/wine_vgasys.fon
+%{_datadir}/fonts/wine/wine_vgasyse.fon
+%{_datadir}/fonts/wine/wine_vgasysr.fon
+%{_datadir}/fonts/wine/coue1255.fon
+%{_datadir}/fonts/wine/coue1256.fon
+%{_datadir}/fonts/wine/coue1257.fon
+%{_datadir}/fonts/wine/coure.fon
+%{_datadir}/fonts/wine/couree.fon
+%{_datadir}/fonts/wine/coureg.fon
+%{_datadir}/fonts/wine/courer.fon
+%{_datadir}/fonts/wine/couret.fon
+%{_datadir}/fonts/wine/cvgasys.fon
+%{_datadir}/fonts/wine/hvgasys.fon
+%{_datadir}/fonts/wine/jvgasys.fon
+%{_datadir}/fonts/wine/marlett.ttf
+%{_datadir}/fonts/wine/ssee1255.fon
+%{_datadir}/fonts/wine/ssee1256.fon
+%{_datadir}/fonts/wine/ssee1257.fon
+%{_datadir}/fonts/wine/ssee874.fon
+%{_datadir}/fonts/wine/sserife.fon
+%{_datadir}/fonts/wine/sserifee.fon
+%{_datadir}/fonts/wine/sserifeg.fon
+%{_datadir}/fonts/wine/sserifer.fon
+%{_datadir}/fonts/wine/sserifet.fon
+%{_datadir}/fonts/wine/svgasys.fon
+%{_datadir}/fonts/wine/vgas1255.fon
+%{_datadir}/fonts/wine/vgas1256.fon
+%{_datadir}/fonts/wine/vgas1257.fon
+%{_datadir}/fonts/wine/vgas874.fon
+%{_datadir}/fonts/wine/vgasys.fon
+%{_datadir}/fonts/wine/vgasyse.fon
+%{_datadir}/fonts/wine/vgasysg.fon
+%{_datadir}/fonts/wine/vgasysr.fon
+%{_datadir}/fonts/wine/vgasyst.fon
+%{_libdir}/wine/winealsa.drv.so
+%{_libdir}/wine/wineps.drv.so
+%{_libdir}/wine/wineps16.drv.so
+%{_libdir}/wine/d3d8.dll.so
+%{_libdir}/wine/d3d9.dll.so
+%{_libdir}/wine/d3dx8.dll.so
+%{_libdir}/wine/glu32.dll.so
+%{_libdir}/wine/glut32.dll.so
+%{_libdir}/wine/opengl32.dll.so
+%{_libdir}/wine/wined3d.dll.so
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/notepad
+%{_bindir}/progman
+%{_bindir}/wcmd
+%{_bindir}/winedbg
+%{_bindir}/winedump
+%{_bindir}/winefile
+%{_bindir}/winemaker
+%{_bindir}/winemine
+%{_bindir}/winepath
+%{_bindir}/winhelp
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/uninstaller.exe.so
+%{_libdir}/wine/wcmd.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winhelp.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/winetest.exe.so
+%{_datadir}/applications/fedora-wine-notepad.desktop
+%{_datadir}/applications/fedora-wine-winefile.desktop
+%{_datadir}/applications/fedora-wine-winemine.desktop
+%{_datadir}/applications/fedora-wine-winhelp.desktop
+
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/wine/winearts.drv.so
+
+%files esd
+%defattr(-,root,root,-)
+%{_libdir}/wine/wineesd.drv.so
+
+%files jack
+%defattr(-,root,root,-)
+%{_libdir}/wine/winejack.drv.so
+
+%files nas
+%defattr(-,root,root,-)
+%{_libdir}/wine/winenas.drv.so
+
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/wine/wldap32.dll.so
+
+%files cms
+%defattr(-,root,root,-)
+%{_libdir}/wine/mscms.dll.so
+
+%files twain
+%defattr(-,root,root,-)
+%{_libdir}/wine/twain.dll.so
+%{_libdir}/wine/twain_32.dll.so
+
+%files capi
+%defattr(-,root,root,-)
+%{_libdir}/wine/capi2032.dll.so
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/function_grep.pl
+%{_bindir}/widl
+%{_bindir}/winebuild
+%{_bindir}/winecpp
+%{_bindir}/winedump
+%{_bindir}/wineg++
+%{_bindir}/winegcc
+%{_bindir}/winemaker
+%{_bindir}/wmc
+%{_bindir}/wrc
+%{_libdir}/*.so
+%{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.1*
+%{_mandir}/man1/winedump.1*
+%{_mandir}/man1/winegcc.1*
+%{_mandir}/man1/winemaker.1*
+%{_mandir}/man1/wmc.1*
+%{_mandir}/man1/wrc.1*
+%{_mandir}/man1/winedbg.1*
+%{_mandir}/man1/wineg++.1*
+%{_datadir}/aclocal/wine.m4
+%attr(0755, root, root) %dir %{_includedir}/wine
+%{_includedir}/wine/*
+%{_libdir}/wine/*.a
+%{_libdir}/wine/*.def
+
+%changelog
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-3
+- use ExclusiveArch instead of ExcludeArch
+
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-2
+- own font directory
+- fix devel summary
+- add ExcludeArch x86_64 for now
+
+* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-1
+- version upgrade
+- changed wine.init perissions to 0644
+- added autoconf BR
+
+* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.3-1
+- version upgrade
+
+* Thu Nov 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.2-1
+- version upgrade
+
+* Thu Nov 17 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
+0.9.1-3
+- fix typo in winefile desktop file
+- drop in ld config instead of editing ld.so.conf
+
+* Sun Nov 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-2
+- add fontforge BR and include generated fonts...
+
+* Sat Nov 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-1
+- version upgrade
+- move uninstaller and winecfg into wine main package...
+- drop wine suite
+
+* Sat Oct 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-3
+- s/libwine/wine/
+
+* Thu Oct 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-2
+- remerge some subpackages which should be defaults
+
+* Tue Oct 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-1
+- upgrade to new version
+- start splitting
+
+* Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0-1.20050930
+- add fedora readme
+- switch to new (old) versioning sheme
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-3
+- add desktop files
+- revisit summary and description
+- consistant use of %{buildroot}
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-2
+- some more spec tuneups...
+
+* Sat Oct 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-1
+- version upgrade
+
+* Sun Sep 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050925-1
+- upgrade to current cvs
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050830-1
+- version upgrade
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050524-2
+- fedorarized version
+
+* Mon May 30 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050524-1fc3
+- Update to 20050524
+- Remove pdf documentation build as it's no more included in the main archive
+- Workaround for generic.ppd installation
+
+* Tue Apr 19 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050419-1fc3
+- Update to 20050419
+
+* Thu Mar 10 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050310-1fc3
+- Update to 20050310
+
+* Sat Feb 12 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050211-1fc3
+- Update to 20050211
+
+* Tue Jan 11 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050111-1fc3
+- Update to 20050111
+
+* Wed Dec 1 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041201-1fc3
+- Recompile for FC3
+- Update to 20041201
+- Small reorganization:
+    - use the generic ICU static libs name;
+    - no more wine group;
+    - use Wine's generated stdole32.tlb file;
+    - use Wine's generated fonts.
+
+* Wed Oct 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041019-1fc2
+- Update to 20041019
+
+* Wed Sep 15 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040914-1fc2
+- Update to 20040914
+
+* Sat Aug 14 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040813-1fc2
+- Update to 20040813
+
+* Sat Jul 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040716-1fc2
+- Update to 20040716
+
+* Fri Jun 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc2
+- Recompile for FC2
+- Backport from current CVS some fixes to the preloader to prevent
+  a segfault on startup
+- Include a currently uncommitted patch from Alexandre Julliard regarding
+  further issues with the preloader
+
+* Sun Jun 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc1
+- Update to 20040615
+- Use of wineprefixcreate instead of old RedHat patches
+
+* Wed May 5 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040505-1fc1
+- Update to 20040505
+
+* Fri Apr 9 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040408-1fc1
+- Update to 20040408
+- Change the handling of paths to DOS drives in the installation process
+
+* Wed Mar 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040309-1fc1
+- Update to 20040309
+- Replaced winedefault.reg by wine.inf
+
+* Wed Feb 18 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040213-1fc1
+- Update to 20040213
+- Moved Wine dlls back to %{_libdir}/wine rather than %{_libdir}/wine/wine
+
+* Sun Jan 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040121-fc1
+- Update to 20040121
+
+* Sat Dec 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031212-fc1
+- Update to 20031212
+
+* Wed Nov 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031118-fc1
+- Update to 20031118
+
+* Thu Oct 16 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031016-1rh9
+- Update to 20031016
+
+* Tue Sep 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030911-1rh9
+- Fix of include location
+- Better separation of run-time and development files
+- Update to 20030911
+
+* Wed Aug 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030813-1rh9
+- Update to 20030813
+
+* Wed Jul 09 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030709-1rh9
+- Update to 20030709
+
+* Wed Jun 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030618-1rh9
+- Change the default C drive to ~/.wine/c, copied from /usr/share/wine
+  if non-existant (Thanks to Rudolf Kastl)
+- Updated to 20030618
+
+* Tue May 20 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1rh9
+- Adapted for RH9
+
+* Thu May 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1
+- Add libraries definition files to devel package
+- Update to 20030508
+
+* Tue Apr 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030408-1
+- Update to 20030408
+
+* Tue Mar 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030318-1
+- Update to 20030318
+
+* Thu Mar 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-2
+- Fix the symlinks in wine-c.
+
+* Wed Feb 19 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-1
+- Update to 20030129
+- Various fixes in RPM build process
+
+* Fri Jan 17 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030115-1
+- Update to 20030115
+- fix to build problem
+
+* Thu Nov  7 2002 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20021031-1
+- Update to 20021031
+- Tweaks here and there
+
+* Wed Sep  4 2002 Bill Nottingham <notting at redhat.com> 20020605-2
+- fix docs (#72923)
+
+* Wed Jul 10 2002 Karsten Hopp <karsten at redhat.de> 20020605-1
+- update
+- remove obsolete part of redhat patch
+- redo destdir patch
+- redo kde patch
+- redo defaultversion patch
+- fix 'my_perl unknown' error
+- work around name conflict with textutils 'expand'
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020327-1
+- Fix wineshelllink (#61761)
+- Fix up initscript (#53625)
+- Clean up spec file
+- Default to emulating Windoze ME rather than 3.1, nobody uses 3.1
+  applications anymore
+- Auto-generate default config if none exists (#61920)
+
+* Mon Mar 04 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020304-1
+- Assign gid 66 (closest to 666 [Microsoft number] we can get for a
+  system account ;) )
+- Don't use glibc private functions (__libc_fork)
+- Update
+
+* Tue Feb 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020226-1
+- Fix bug #60250
+- Update
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020221-1
+- Update
+- Don't try to launch winesetup in winelauncher, we aren't shipping it
+  (#59621)
+
+* Sun Jan 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020127-1
+- Update
+- Fix build in current environment
+
+* Wed Aug 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010822-1
+- Make sure the package can be cleanly uninstalled (#52007)
+- Add build dependencies
+
+* Thu Jul 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010726-1
+- Fix -devel package group (#49989)
+- remove internal CVS files
+- chkconfig deletion should be in %preun, not %postun
+- rename initscript ("Starting windows:" at startup does look off)
+
+* Thu May 03 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010503-1
+- Update
+- generate HTML documentation rather than shipping plain docbook text
+  (#38453)
+
+* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Update registry to mount "/" as drive "Z:", fixes winedbg (needs to be
+  accessible from 'doze drives)
+- Don't create KDE 1.x style desktop entries in wineshelllink
+- Be more tolerant on failing stuff in %%post
+
+* Thu Mar  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+
+* Thu Feb 15 2001 Tim Powers <timp at redhat.com>
+- fixed time.h build problems
+
+* Wed Jan 31 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add a patch to handle .exe and .com file permissions the way we want them
+
+* Thu Jan 18 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Restore wine's ability to use a global config file, it was removed
+  in CVS for whatever reason
+- Move libraries to %{_libdir}/wine to prevent conflicts with libuser
+  (Bug #24202)
+- Move include files to /usr/include/wine to prevent it from messing with
+  some autoconf scripts (some broken scripts assume they're running on windoze
+  if /usr/include/windows.h exists...)
+
+* Tue Dec 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix %%pre and %%postun scripts
+- --enable-opengl, glibc 2.2 should be safe
+- Update CVS
+
+* Mon Nov 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update CVS
+- Add a new (user) group wine that can write to the "C: drive"
+  %{_datadir}/wine-c
+- Fix up winedbg installation (registry entries)
+- Add "Program Files/Common Files" subdirectory to the "C: drive", it's
+  referenced in the registry
+
+* Wed Oct 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- rebuilt with new DGA
+
+* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- new snapshot
+- fix compilation with gcc 2.96
+
+* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Move init script back
+- new version
+- move man pages to FHS locations
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- move initscript
+- new snapshot
+
+* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Start the initscript on startup
+
+* Mon May  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- New version
+- new feature: You can now launch wine by just running a windows .exe file
+  (./some.exe or just click on it in kfm, gmc and the likes)
+- some spec file modifications
+
+* Sun Feb 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- newer version
+- Improve the system.ini file - all multimedia stuff should work now.
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- enable and fix up the urlmon/wininet patch
+- add: autoexec.bat, config.sys, windows/win.ini windows/system.ini
+  windows/Profiles/Administrator
+- allow i[456]86 arches
+- add some system.ini configuration
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update current
+- add urlmon and wininet patches from Corel (don't apply them for now though)
+- create empty shell*dll and winsock*dll files (as mentioned in the HOWTO)
+
+* Mon Jan 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update to current (lots of important fixes)
+- Fix up the default wine.conf file (We really don't want it to look
+  for CD-ROMs in /cdrom!)
+- create a "root filesystem" with everything required to run wine without
+  windows in %{_datadir}/wine-c (drive c:)
+- add RedHat file in /usr/doc/wine-%{version} explaining the new directory
+  layout
+- wine-devel requires wine
+
+* Tue Dec 14 1999 Preston Brown <pbrown at redhat.com>
+- updated source for Powertools 6.2
+- better files list
+
+* Fri Jul 23 1999 Tim Powers <timp at redhat.com>
+- updated source
+- built for 6.1
+
+* Tue Apr 13 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+- updated package and spec file
+
+* Mon Oct 26 1998 Preston Brown <pbrown at redhat.com>
+- updated to 10/25/98 version.  There is really no point in keeping the
+- older one, it is full of bugs and the newer one has fewer.
+- commented out building of texinfo manual, it is horrendously broken.
+
+* Mon Oct 12 1998 Michael Maher <mike at redhat.com>
+- built package for 5.2
+- pressured by QA, not updating.
+
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- repackaged for PowerTools



From fedora-extras-commits at redhat.com  Mon Jan  2 09:09:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:09:16 -0500
Subject: rpms/wine/devel wine.spec,1.4,1.5
Message-ID: <200601020910.k029A5Fx028424@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407

Modified Files:
	wine.spec 
Log Message:
- add dist



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine.spec	2 Jan 2006 09:04:37 -0000	1.4
+++ wine.spec	2 Jan 2006 09:09:15 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	3
+Release:	4%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -679,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-4
+- add dist
+
 * Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-3
 - use ExclusiveArch instead of ExcludeArch



From fedora-extras-commits at redhat.com  Mon Jan  2 09:16:48 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:16:48 -0500
Subject: rpms/wine/FC-3 wine-20030408-defaultcfg.patch, 1.1,
	NONE wine-20030408-initial.patch, 1.1,
	NONE wine-20030408-kde2.patch, 1.1,
	NONE wine-20030408-winelauncher.patch, 1.1, NONE
Message-ID: <200601020916.k029GoW6028715@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28546/FC-3

Removed Files:
	wine-20030408-defaultcfg.patch wine-20030408-initial.patch 
	wine-20030408-kde2.patch wine-20030408-winelauncher.patch 
Log Message:
- prep for import



--- wine-20030408-defaultcfg.patch DELETED ---


--- wine-20030408-initial.patch DELETED ---


--- wine-20030408-kde2.patch DELETED ---


--- wine-20030408-winelauncher.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan  2 09:17:04 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:17:04 -0500
Subject: rpms/wine/FC-4 Makefile,1.3,1.4
Message-ID: <200601020917.k029Hf5n028759@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28546/FC-4

Added Files:
	Makefile 
Log Message:
- prep for import



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	2 Jan 2006 09:17:02 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wine
+# $Id$
+NAME := wine
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Mon Jan  2 09:24:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:24:37 -0500
Subject: rpms/wine/FC-4 sources, 1.3, 1.4 wine-20050524-generated.patch, NONE,
	1.1 wine-32.conf, NONE, 1.1 wine-README-Fedora, NONE,
	1.1 wine-notepad.desktop, NONE, 1.1 wine-regedit.desktop, NONE,
	1.1 wine-uninstaller.desktop, NONE, 1.1 wine-winecfg.desktop,
	NONE, 1.1 wine-winefile.desktop, NONE, 1.1 wine-winemine.desktop,
	NONE, 1.1 wine-winhelp.desktop, NONE, 1.1 wine.init, 1.2,
	1.3 wine.spec, 1.3, 1.4
Message-ID: <200601020925.k029PAnu028948@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28897/FC-4

Added Files:
	sources wine-20050524-generated.patch wine-32.conf 
	wine-README-Fedora wine-notepad.desktop wine-regedit.desktop 
	wine-uninstaller.desktop wine-winecfg.desktop 
	wine-winefile.desktop wine-winemine.desktop 
	wine-winhelp.desktop wine.init wine.spec 
Log Message:
auto-import wine-0.9.4-3 on branch FC-4 from wine-0.9.4-3.src.rpm


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	2 Jan 2006 09:24:37 -0000	1.4
@@ -0,0 +1,2 @@
+73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz

wine-20050524-generated.patch:

--- NEW FILE wine-20050524-generated.patch ---
Index: wine/tools/wineprefixcreate.in
===================================================================
RCS file: /home/wine/wine/tools/wineprefixcreate.in,v
retrieving revision 1.10
diff -u -r1.10 wineprefixcreate.in
--- wine/tools/wineprefixcreate.in	19 May 2005 11:12:34 -0000	1.10
+++ wine/tools/wineprefixcreate.in	29 May 2005 00:00:00 -0000
@@ -38,6 +38,7 @@
 
 dlldir="@dlldir@"
 datadir="@datadir@/wine"
+fontdir="@datadir@/fonts/wine"
 
 do_wait=0
 quiet=0
@@ -175,6 +176,11 @@
 link_app winhelp      "$CROOT/windows/winhelp.exe"
 link_app winhelp      "$CROOT/windows/winhlp32.exe"
 link_app winebrowser  "$CROOT/windows/winebrowser.exe"
+
+# Copy the generated fonts
+
+cp $fontdir/*.ttf "$CROOT/windows/fonts"
+cp $fontdir/*.fon "$CROOT/windows/fonts"
 
 # Copy the .inf script and run it
 


--- NEW FILE wine-32.conf ---
/usr/lib/wine/


--- NEW FILE wine-README-Fedora ---
Wine directory structure used in Fedora Core Linux:
===================================================

\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
default. It is created with (empty) C:\windows and C:\windows\system
directories, needed to operate Wine without an existing Windows
installation, if it doesn't already exists.

If you want to use Wine with an existing Windows installation that is
mounted, for example, in /mnt/windows-c, change the symlink
\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
defaults set by installation.

If you do this, you can safely remove \${HOME}/.wine/drive_c.
(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)


--- NEW FILE wine-notepad.desktop ---
[Desktop Entry]
Name=notepad
Comment=Text Editor
Exec=notepad
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-regedit.desktop ---
[Desktop Entry]
Name=regedit
Comment=Wine registry editor
Exec=regedit
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-uninstaller.desktop ---
[Desktop Entry]
Name=Wine Software Uninstaller
Comment=Interface to uninstall software
Exec=uninstaller
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winecfg.desktop ---
[Desktop Entry]
Name=Wine Configuration
Comment=Interface to set wine parameters
Exec=winecfg
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winefile.desktop ---
[Desktop Entry]
Name=Wine File
Comment=Wine File Browser
Exec=winefile
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winemine.desktop ---
[Desktop Entry]
Name=WineMine
Comment=Wine Minesweeper 
Exec=winemine
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winhelp.desktop ---
[Desktop Entry]
Name=winhelp
Comment=Windows Help Browser
Exec=winhelp
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


Index: wine.init
===================================================================
RCS file: wine.init
diff -N wine.init
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.init	2 Jan 2006 09:24:37 -0000	1.3
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# wine	Allow users to run Windows(tm) applications by just clicking on them
+#	(or typing ./file.exe)
+#
+# chkconfig: 35 98 10
+# description: Allow users to run Windows(tm) applications by just clicking \
+#	       on them (or typing ./file.exe)
+
+. /etc/rc.d/init.d/functions
+RETVAL=0
+
+start() {
+	echo -n $"Registering binary handler for Windows applications"
+	/sbin/modprobe binfmt_misc &>/dev/null
+	echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+}
+
+stop() {
+	echo -n $"Unregistering binary handler for Windows applications"
+	echo "-1" >/proc/sys/fs/binfmt_misc/windows || :
+	echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE || :
+}
+
+reload() {
+	stop
+	start
+}
+
+wine_status() {
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+		echo $"Wine binary format handlers are registered."
+		return 0
+	else
+		echo $"Wine binary format handlers are not registered."
+		return 3
+	fi
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		wine_status
+		RETVAL=$?
+		;;
+	restart)
+		stop
+		start
+		;;
+	condrestart)
+		if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+			stop
+			start
+		fi
+		;;
+	*)
+		echo $"Usage: $prog {start|stop|status|restart|condrestart}"
+		exit 1
+esac
+exit $RETVAL
+


Index: wine.spec
===================================================================
RCS file: wine.spec
diff -N wine.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wine.spec	2 Jan 2006 09:24:37 -0000	1.4
@@ -0,0 +1,1056 @@
+Name:		wine
+Version:	0.9.4
+Release:	3%{?dist}
+Summary:	A Windows 16/32/64 bit emulator
+
+Group:		Applications/Emulators
+License:	LGPL
+URL:		http://www.winehq.org/
+Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source1:	wine.init
+Source2:	wine-fonts-20050524.tar.gz
+Source3:        wine-README-Fedora
+Source4:        wine-32.conf
+Source100:      wine-notepad.desktop
+Source101:      wine-regedit.desktop
+Source102:      wine-uninstaller.desktop
+Source103:      wine-winecfg.desktop
+Source104:      wine-winefile.desktop
+Source105:      wine-winemine.desktop
+Source106:      wine-winhelp.desktop
+Patch2:		wine-20050524-generated.patch
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:  %{ix86}
+
+BuildRequires:  autoconf
+BuildRequires:	bison
+BuildRequires:	flex
+BuildRequires:  alsa-lib-devel
+BuildRequires:  arts-devel
+BuildRequires:  audiofile-devel
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  lcms-devel
+BuildRequires:  libieee1284-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openldap-devel
+BuildRequires:  sane-backends-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  fontforge
+
+Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
+Requires(post): /usr/bin/update-desktop-database
+Requires(preun): /sbin/chkconfig
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+
+%description
+While Wine is usually thought of as a Windows(TM) emulator, the Wine
+developers would prefer that users thought of Wine as a Windows
+compatibility layer for UNIX. This package includes a program loader,
+which allows unmodified Windows 3.x/9x/NT binaries to run on x86 and x86_64
+Unixes. Wine does not require MS Windows, but it can use native system
+.dll files if they are available.
+
+%package tools
+Summary:        Additional wine tools
+Group:		Applications/Emulators
+Requires:       %{name} = %{version}-%{release}
+
+%description tools
+Additional wine tools
+
+%package arts
+Summary: Arts sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description arts
+Arts sound support for wine
+
+%package esd
+Summary: ESD sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description esd
+ESD sound support for wine
+
+%package jack
+Summary: JACK sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description jack
+JACK sound support for wine
+
+%package nas
+Summary: NAS sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description nas
+JACK sound support for wine
+
+%package ldap
+Summary: LDAP support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description ldap
+LDAP support for wine
+
+%package cms
+Summary: Color Managment for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description cms
+Color Management for wine
+
+%package twain
+Summary: Twain support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description twain
+Twain support for wine
+
+%package capi
+Summary: ISDN support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description capi
+ISDN support for wine
+
+%package devel
+Summary: Wine development environment
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description devel
+Header, include files and library definition files for developing applications
+with the Wine Windows(TM) emulation libraries.
+
+%prep
+%setup -q
+%patch2 -p1 -b .generated
+autoconf
+
+%build
+export CFLAGS="$RPM_OPT_FLAGS"
+%configure \
+	--sysconfdir=%{_sysconfdir}/wine --disable-static
+
+%{__make} depend
+%{__make}
+
+%install
+rm -rf %{buildroot}
+
+%makeinstall \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+%makeinstall \
+	-C dlls/wineps \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+
+mkdir -p %{buildroot}%{_sysconfdir}/wine
+
+# Allow users to launch Windows programs by just clicking on the .exe file...
+mkdir -p %{buildroot}%{_initrddir}
+install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
+
+# Install Wine's fonts
+mkdir -p %{buildroot}%{_datadir}/fonts/wine
+tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE100}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE101}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE102}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE103}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE104}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE105}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE106}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
+
+cp %{SOURCE3} README-Fedora
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+
+%clean
+rm -rf %{buildroot}
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add wine
+/sbin/chkconfig --level 2345 wine on
+/sbin/service wine start &>/dev/null || :
+update-desktop-database &>/dev/null || :
+
+%preun
+if test "$1" = "0"; then
+	/sbin/chkconfig --del wine
+fi
+
+%postun
+/sbin/ldconfig
+update-desktop-database &>/dev/null || :
+
+%post arts -p /sbin/ldconfig
+%postun arts -p /sbin/ldconfig
+
+%post esd -p /sbin/ldconfig
+%postun esd -p /sbin/ldconfig
+
+%post jack -p /sbin/ldconfig
+%postun jack -p /sbin/ldconfig
+
+%post nas -p /sbin/ldconfig
+%postun nas -p /sbin/ldconfig
+
+%post ldap -p /sbin/ldconfig
+%postun ldap -p /sbin/ldconfig
+
+%post cms -p /sbin/ldconfig
+%postun cms -p /sbin/ldconfig
+
+%post twain -p /sbin/ldconfig
+%postun twain -p /sbin/ldconfig
+
+%post capi -p /sbin/ldconfig
+%postun capi -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
+%doc AUTHORS README-Fedora README VERSION
+%doc documentation/*
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/winebrowser
+%{_bindir}/wineconsole
+%{_bindir}/wineprefixcreate
+%{_bindir}/wineshelllink
+%{_bindir}/winecfg
+%{_bindir}/uninstaller
+%{_initrddir}/wine
+%{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/msiexec.exe.so
+%{_libdir}/wine/regedit.exe.so
+%{_libdir}/wine/regsvr32.exe.so
+%{_libdir}/wine/rpcss.exe.so
+%{_libdir}/wine/rundll32.exe.so
+%{_libdir}/wine/start.exe.so
+%{_libdir}/wine/wineboot.exe.so
+%{_libdir}/wine/winebrowser.exe.so
+%{_libdir}/wine/wineconsole.exe.so
+%{_libdir}/wine/winemenubuilder.exe.so
+%{_libdir}/wine/winevdm.exe.so
+%{_datadir}/applications/fedora-wine.desktop
+%{_datadir}/applications/fedora-wine-regedit.desktop
+%{_datadir}/applications/fedora-wine-uninstaller.desktop
+%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_mandir}/man1/wine.1.gz
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+%{_bindir}/wine-kthread
+%{_bindir}/wine-preloader
+%{_bindir}/wine-pthread
+%{_bindir}/winelauncher
+%{_bindir}/wineserver
+%{_mandir}/man1/wineserver.1*
+%{_libdir}/libwine.so.1
+%{_libdir}/libwine_unicode.so.1
+%dir %{_libdir}/wine
+%{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/advapi32.dll.so
+%{_libdir}/wine/advpack.dll.so
+%{_libdir}/wine/amstream.dll.so
+%{_libdir}/wine/atl.dll.so
+%{_libdir}/wine/avicap32.dll.so
+%{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avifile.dll.so
+%{_libdir}/wine/aviinfo.exe.so
+%{_libdir}/wine/aviplay.exe.so
+%{_libdir}/wine/cabinet.dll.so
+%{_libdir}/wine/cards.dll.so
+%{_libdir}/wine/cfgmgr32.dll.so
+%{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/comcat.dll.so
+%{_libdir}/wine/comctl32.dll.so
+%{_libdir}/wine/comdlg32.dll.so
+%{_libdir}/wine/comm.drv.so
+%{_libdir}/wine/commdlg.dll.so
+%{_libdir}/wine/compobj.dll.so
+%{_libdir}/wine/crtdll.dll.so
+%{_libdir}/wine/crypt32.dll.so
+%{_libdir}/wine/cryptdll.dll.so
+%{_libdir}/wine/ctl3d.dll.so
+%{_libdir}/wine/ctl3d32.dll.so
+%{_libdir}/wine/ctl3dv2.dll.so
+%{_libdir}/wine/d3dim.dll.so
+%{_libdir}/wine/d3drm.dll.so
+%{_libdir}/wine/d3dxof.dll.so
+%{_libdir}/wine/dbghelp.dll.so
+%{_libdir}/wine/dciman32.dll.so
+%{_libdir}/wine/ddeml.dll.so
+%{_libdir}/wine/ddraw.dll.so
+%{_libdir}/wine/devenum.dll.so
+%{_libdir}/wine/dinput.dll.so
+%{_libdir}/wine/dinput8.dll.so
+%{_libdir}/wine/dispdib.dll.so
+%{_libdir}/wine/display.drv.so
+%{_libdir}/wine/dmband.dll.so
+%{_libdir}/wine/dmcompos.dll.so
+%{_libdir}/wine/dmime.dll.so
+%{_libdir}/wine/dmloader.dll.so
+%{_libdir}/wine/dmscript.dll.so
+%{_libdir}/wine/dmstyle.dll.so
+%{_libdir}/wine/dmsynth.dll.so
+%{_libdir}/wine/dmusic.dll.so
+%{_libdir}/wine/dmusic32.dll.so
+%{_libdir}/wine/dplay.dll.so
+%{_libdir}/wine/dplayx.dll.so
+%{_libdir}/wine/dpnet.dll.so
+%{_libdir}/wine/dpnhpast.dll.so
+%{_libdir}/wine/dsound.dll.so
+%{_libdir}/wine/dswave.dll.so
+%{_libdir}/wine/dxdiagn.dll.so
+%{_libdir}/wine/eject.exe.so
+%{_libdir}/wine/gdi.exe.so
+%{_libdir}/wine/gdi32.dll.so
+%{_libdir}/wine/hh.exe.so
+%{_libdir}/wine/hhctrl.ocx.so
+%{_libdir}/wine/iccvid.dll.so
+%{_libdir}/wine/icinfo.exe.so
+%{_libdir}/wine/icmp.dll.so
+%{_libdir}/wine/ifsmgr.vxd.so
+%{_libdir}/wine/imaadp32.acm.so
+%{_libdir}/wine/imagehlp.dll.so
+%{_libdir}/wine/imm.dll.so
+%{_libdir}/wine/imm32.dll.so
+%{_libdir}/wine/iphlpapi.dll.so
+%{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/joystick.drv.so
+%{_libdir}/wine/kernel32.dll.so
+%{_libdir}/wine/keyboard.drv.so
+%{_libdir}/wine/krnl386.exe.so
+%{_libdir}/wine/lz32.dll.so
+%{_libdir}/wine/lzexpand.dll.so
+%{_libdir}/wine/mapi32.dll.so
+%{_libdir}/wine/mciavi32.dll.so
+%{_libdir}/wine/mcicda.dll.so
+%{_libdir}/wine/mciseq.dll.so
+%{_libdir}/wine/mciwave.drv.so
+%{_libdir}/wine/midimap.dll.so
+%{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevldr.vxd.so
+%{_libdir}/wine/mmsystem.dll.so
+%{_libdir}/wine/monodebg.vxd.so
+%{_libdir}/wine/mouse.drv.so
+%{_libdir}/wine/mpr.dll.so
+%{_libdir}/wine/msacm.dll.so
+%{_libdir}/wine/msacm.drv.so
+%{_libdir}/wine/msacm32.dll.so
+%{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/msdmo.dll.so
+%{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/mshtml.dll.so
+%{_libdir}/wine/msi.dll.so
+%{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisys.ocx.so
+%{_libdir}/wine/msnet32.dll.so
+%{_libdir}/wine/msrle32.dll.so
+%{_libdir}/wine/msvcrt.dll.so
+%{_libdir}/wine/msvcrt20.dll.so
+%{_libdir}/wine/msvcrt40.dll.so
+%{_libdir}/wine/msvcrtd.dll.so
+%{_libdir}/wine/msvfw32.dll.so
+%{_libdir}/wine/msvidc32.dll.so
+%{_libdir}/wine/msvideo.dll.so
+%{_libdir}/wine/mswsock.dll.so
+%{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/netapi32.dll.so
+%{_libdir}/wine/newdev.dll.so
+%{_libdir}/wine/ntdll.dll.so
+%{_libdir}/wine/objsel.dll.so
+%{_libdir}/wine/odbc32.dll.so
+%{_libdir}/wine/odbccp32.dll.so
+%{_libdir}/wine/ole2.dll.so
+%{_libdir}/wine/ole2conv.dll.so
+%{_libdir}/wine/ole2disp.dll.so
+%{_libdir}/wine/ole2nls.dll.so
+%{_libdir}/wine/ole2prox.dll.so
+%{_libdir}/wine/ole2thk.dll.so
+%{_libdir}/wine/ole32.dll.so
+%{_libdir}/wine/oleacc.dll.so
+%{_libdir}/wine/oleaut32.dll.so
+%{_libdir}/wine/olecli.dll.so
+%{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledlg.dll.so
+%{_libdir}/wine/olepro32.dll.so
+%{_libdir}/wine/olesvr.dll.so
+%{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/powrprof.dll.so
+%{_libdir}/wine/psapi.dll.so
+%{_libdir}/wine/qcap.dll.so
+%{_libdir}/wine/quartz.dll.so
+%{_libdir}/wine/rasapi16.dll.so
+%{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/riched20.dll.so
+%{_libdir}/wine/riched32.dll.so
+%{_libdir}/wine/rpcrt4.dll.so
+%{_libdir}/wine/rsabase.dll.so
+%{_libdir}/wine/rsaenh.dll.so
+%{_libdir}/wine/secur32.dll.so
+%{_libdir}/wine/sensapi.dll.so
+%{_libdir}/wine/serialui.dll.so
+%{_libdir}/wine/setupapi.dll.so
+%{_libdir}/wine/setupx.dll.so
+%{_libdir}/wine/shdocvw.dll.so
+%{_libdir}/wine/shell.dll.so
+%{_libdir}/wine/shell32.dll.so
+%{_libdir}/wine/shfolder.dll.so
+%{_libdir}/wine/shlwapi.dll.so
+%{_libdir}/wine/snmpapi.dll.so
+%{_libdir}/wine/sound.drv.so
+%{_libdir}/wine/stdole2.tlb.so
+%{_libdir}/wine/stdole32.tlb.so
+%{_libdir}/wine/sti.dll.so
+%{_libdir}/wine/storage.dll.so
+%{_libdir}/wine/stress.dll.so
+%{_libdir}/wine/system.drv.so
+%{_libdir}/wine/tapi32.dll.so
+%{_libdir}/wine/toolhelp.dll.so
+%{_libdir}/wine/typelib.dll.so
+%{_libdir}/wine/unicows.dll.so
+%{_libdir}/wine/url.dll.so
+%{_libdir}/wine/urlmon.dll.so
+%{_libdir}/wine/user.exe.so
+%{_libdir}/wine/user32.dll.so
+%{_libdir}/wine/usp10.dll.so
+%{_libdir}/wine/uxtheme.dll.so
+%{_libdir}/wine/vdhcp.vxd.so
+%{_libdir}/wine/vdmdbg.dll.so
+%{_libdir}/wine/ver.dll.so
+%{_libdir}/wine/version.dll.so
+%{_libdir}/wine/vmm.vxd.so
+%{_libdir}/wine/vnbt.vxd.so
+%{_libdir}/wine/vnetbios.vxd.so
+%{_libdir}/wine/vtdapi.vxd.so
+%{_libdir}/wine/vwin32.vxd.so
+%{_libdir}/wine/w32skrnl.dll.so
+%{_libdir}/wine/w32sys.dll.so
+%{_libdir}/wine/win32s16.dll.so
+%{_libdir}/wine/win87em.dll.so
+%{_libdir}/wine/winaspi.dll.so
+%{_libdir}/wine/windebug.dll.so
+%{_libdir}/wine/wineaudioio.drv.so
+%{_libdir}/wine/winedos.dll.so
+%{_libdir}/wine/winemp3.acm.so
+%{_libdir}/wine/wineoss.drv.so
+#%{_libdir}/wine/winetty.drv.so
+%{_libdir}/wine/winex11.drv.so
+%{_libdir}/wine/wing.dll.so
+%{_libdir}/wine/wininet.dll.so
+%{_libdir}/wine/winmm.dll.so
+%{_libdir}/wine/winnls.dll.so
+%{_libdir}/wine/winnls32.dll.so
+%{_libdir}/wine/winsock.dll.so
+%{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/wintab.dll.so
+%{_libdir}/wine/wintab32.dll.so
+%{_libdir}/wine/wintrust.dll.so
+%{_libdir}/wine/wnaspi32.dll.so
+%{_libdir}/wine/wow32.dll.so
+%{_libdir}/wine/wprocs.dll.so
+%{_libdir}/wine/ws2_32.dll.so
+%{_libdir}/wine/wsock32.dll.so
+%{_libdir}/wine/wtsapi32.dll.so
+%dir %{_datadir}/fonts/wine
+%{_datadir}/fonts/wine/wine_coure.fon
+%{_datadir}/fonts/wine/wine_couree.fon
+%{_datadir}/fonts/wine/wine_courer.fon
+%{_datadir}/fonts/wine/wine_marlett.ttf
+%{_datadir}/fonts/wine/wine_sserife.fon
+%{_datadir}/fonts/wine/wine_sserifee.fon
+%{_datadir}/fonts/wine/wine_sserifer.fon
+%{_datadir}/fonts/wine/wine_vgasys.fon
+%{_datadir}/fonts/wine/wine_vgasyse.fon
+%{_datadir}/fonts/wine/wine_vgasysr.fon
+%{_datadir}/fonts/wine/coue1255.fon
+%{_datadir}/fonts/wine/coue1256.fon
+%{_datadir}/fonts/wine/coue1257.fon
+%{_datadir}/fonts/wine/coure.fon
+%{_datadir}/fonts/wine/couree.fon
+%{_datadir}/fonts/wine/coureg.fon
+%{_datadir}/fonts/wine/courer.fon
+%{_datadir}/fonts/wine/couret.fon
+%{_datadir}/fonts/wine/cvgasys.fon
+%{_datadir}/fonts/wine/hvgasys.fon
+%{_datadir}/fonts/wine/jvgasys.fon
+%{_datadir}/fonts/wine/marlett.ttf
+%{_datadir}/fonts/wine/ssee1255.fon
+%{_datadir}/fonts/wine/ssee1256.fon
+%{_datadir}/fonts/wine/ssee1257.fon
+%{_datadir}/fonts/wine/ssee874.fon
+%{_datadir}/fonts/wine/sserife.fon
+%{_datadir}/fonts/wine/sserifee.fon
+%{_datadir}/fonts/wine/sserifeg.fon
+%{_datadir}/fonts/wine/sserifer.fon
+%{_datadir}/fonts/wine/sserifet.fon
+%{_datadir}/fonts/wine/svgasys.fon
+%{_datadir}/fonts/wine/vgas1255.fon
+%{_datadir}/fonts/wine/vgas1256.fon
+%{_datadir}/fonts/wine/vgas1257.fon
+%{_datadir}/fonts/wine/vgas874.fon
+%{_datadir}/fonts/wine/vgasys.fon
+%{_datadir}/fonts/wine/vgasyse.fon
+%{_datadir}/fonts/wine/vgasysg.fon
+%{_datadir}/fonts/wine/vgasysr.fon
+%{_datadir}/fonts/wine/vgasyst.fon
+%{_libdir}/wine/winealsa.drv.so
+%{_libdir}/wine/wineps.drv.so
+%{_libdir}/wine/wineps16.drv.so
+%{_libdir}/wine/d3d8.dll.so
+%{_libdir}/wine/d3d9.dll.so
+%{_libdir}/wine/d3dx8.dll.so
+%{_libdir}/wine/glu32.dll.so
+%{_libdir}/wine/glut32.dll.so
+%{_libdir}/wine/opengl32.dll.so
+%{_libdir}/wine/wined3d.dll.so
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
+
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/notepad
+%{_bindir}/progman
+%{_bindir}/wcmd
+%{_bindir}/winedbg
+%{_bindir}/winedump
+%{_bindir}/winefile
+%{_bindir}/winemaker
+%{_bindir}/winemine
+%{_bindir}/winepath
+%{_bindir}/winhelp
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/uninstaller.exe.so
+%{_libdir}/wine/wcmd.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winhelp.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/winetest.exe.so
+%{_datadir}/applications/fedora-wine-notepad.desktop
+%{_datadir}/applications/fedora-wine-winefile.desktop
+%{_datadir}/applications/fedora-wine-winemine.desktop
+%{_datadir}/applications/fedora-wine-winhelp.desktop
+
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/wine/winearts.drv.so
+
+%files esd
+%defattr(-,root,root,-)
+%{_libdir}/wine/wineesd.drv.so
+
+%files jack
+%defattr(-,root,root,-)
+%{_libdir}/wine/winejack.drv.so
+
+%files nas
+%defattr(-,root,root,-)
+%{_libdir}/wine/winenas.drv.so
+
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/wine/wldap32.dll.so
+
+%files cms
+%defattr(-,root,root,-)
+%{_libdir}/wine/mscms.dll.so
+
+%files twain
+%defattr(-,root,root,-)
+%{_libdir}/wine/twain.dll.so
+%{_libdir}/wine/twain_32.dll.so
+
+%files capi
+%defattr(-,root,root,-)
+%{_libdir}/wine/capi2032.dll.so
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/function_grep.pl
+%{_bindir}/widl
+%{_bindir}/winebuild
+%{_bindir}/winecpp
+%{_bindir}/winedump
+%{_bindir}/wineg++
+%{_bindir}/winegcc
+%{_bindir}/winemaker
+%{_bindir}/wmc
+%{_bindir}/wrc
+%{_libdir}/*.so
+%{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.1*
+%{_mandir}/man1/winedump.1*
+%{_mandir}/man1/winegcc.1*
+%{_mandir}/man1/winemaker.1*
+%{_mandir}/man1/wmc.1*
+%{_mandir}/man1/wrc.1*
+%{_mandir}/man1/winedbg.1*
+%{_mandir}/man1/wineg++.1*
+%{_datadir}/aclocal/wine.m4
+%attr(0755, root, root) %dir %{_includedir}/wine
+%{_includedir}/wine/*
+%{_libdir}/wine/*.a
+%{_libdir}/wine/*.def
+
+%changelog
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-3       
+- use ExclusiveArch instead of ExcludeArch
+
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-2
+- own font directory
+- fix devel summary
+- add ExcludeArch x86_64 for now
+
+* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-1
+- version upgrade
+- changed wine.init perissions to 0644
+- added autoconf BR
+
+* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.3-1
+- version upgrade
+
+* Thu Nov 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.2-1
+- version upgrade
+
+* Thu Nov 17 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
+0.9.1-3
+- fix typo in winefile desktop file
+- drop in ld config instead of editing ld.so.conf
+
+* Sun Nov 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-2
+- add fontforge BR and include generated fonts...
+
+* Sat Nov 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-1
+- version upgrade
+- move uninstaller and winecfg into wine main package...
+- drop wine suite
+
+* Sat Oct 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-3
+- s/libwine/wine/
+
+* Thu Oct 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-2
+- remerge some subpackages which should be defaults
+
+* Tue Oct 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-1
+- upgrade to new version
+- start splitting
+
+* Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0-1.20050930
+- add fedora readme
+- switch to new (old) versioning sheme
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-3
+- add desktop files
+- revisit summary and description
+- consistant use of %{buildroot}
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-2
+- some more spec tuneups...
+
+* Sat Oct 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-1
+- version upgrade
+
+* Sun Sep 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050925-1
+- upgrade to current cvs
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050830-1
+- version upgrade
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050524-2
+- fedorarized version
+
+* Mon May 30 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050524-1fc3
+- Update to 20050524
+- Remove pdf documentation build as it's no more included in the main archive
+- Workaround for generic.ppd installation
+
+* Tue Apr 19 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050419-1fc3
+- Update to 20050419
+
+* Thu Mar 10 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050310-1fc3
+- Update to 20050310
+
+* Sat Feb 12 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050211-1fc3
+- Update to 20050211
+
+* Tue Jan 11 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050111-1fc3
+- Update to 20050111
+
+* Wed Dec 1 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041201-1fc3
+- Recompile for FC3
+- Update to 20041201
+- Small reorganization:
+    - use the generic ICU static libs name;
+    - no more wine group;
+    - use Wine's generated stdole32.tlb file;
+    - use Wine's generated fonts.
+
+* Wed Oct 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041019-1fc2
+- Update to 20041019
+
+* Wed Sep 15 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040914-1fc2
+- Update to 20040914
+
+* Sat Aug 14 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040813-1fc2
+- Update to 20040813
+
+* Sat Jul 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040716-1fc2
+- Update to 20040716
+
+* Fri Jun 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc2
+- Recompile for FC2
+- Backport from current CVS some fixes to the preloader to prevent
+  a segfault on startup
+- Include a currently uncommitted patch from Alexandre Julliard regarding
+  further issues with the preloader
+
+* Sun Jun 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc1
+- Update to 20040615
+- Use of wineprefixcreate instead of old RedHat patches
+
+* Wed May 5 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040505-1fc1
+- Update to 20040505
+
+* Fri Apr 9 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040408-1fc1
+- Update to 20040408
+- Change the handling of paths to DOS drives in the installation process
+
+* Wed Mar 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040309-1fc1
+- Update to 20040309
+- Replaced winedefault.reg by wine.inf
+
+* Wed Feb 18 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040213-1fc1
+- Update to 20040213
+- Moved Wine dlls back to %{_libdir}/wine rather than %{_libdir}/wine/wine
+
+* Sun Jan 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040121-fc1
+- Update to 20040121
+
+* Sat Dec 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031212-fc1
+- Update to 20031212
+
+* Wed Nov 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031118-fc1
+- Update to 20031118
+
+* Thu Oct 16 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031016-1rh9
+- Update to 20031016
+
+* Tue Sep 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030911-1rh9
+- Fix of include location
+- Better separation of run-time and development files
+- Update to 20030911
+
+* Wed Aug 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030813-1rh9
+- Update to 20030813
+
+* Wed Jul 09 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030709-1rh9
+- Update to 20030709
+
+* Wed Jun 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030618-1rh9
+- Change the default C drive to ~/.wine/c, copied from /usr/share/wine
+  if non-existant (Thanks to Rudolf Kastl)
+- Updated to 20030618
+
+* Tue May 20 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1rh9
+- Adapted for RH9
+
+* Thu May 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1
+- Add libraries definition files to devel package
+- Update to 20030508
+
+* Tue Apr 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030408-1
+- Update to 20030408
+
+* Tue Mar 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030318-1
+- Update to 20030318
+
+* Thu Mar 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-2
+- Fix the symlinks in wine-c.
+
+* Wed Feb 19 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-1
+- Update to 20030129
+- Various fixes in RPM build process
+
+* Fri Jan 17 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030115-1
+- Update to 20030115
+- fix to build problem
+
+* Thu Nov  7 2002 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20021031-1
+- Update to 20021031
+- Tweaks here and there
+
+* Wed Sep  4 2002 Bill Nottingham <notting at redhat.com> 20020605-2
+- fix docs (#72923)
+
+* Wed Jul 10 2002 Karsten Hopp <karsten at redhat.de> 20020605-1
+- update
+- remove obsolete part of redhat patch
+- redo destdir patch
+- redo kde patch
+- redo defaultversion patch
+- fix 'my_perl unknown' error
+- work around name conflict with textutils 'expand'
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020327-1
+- Fix wineshelllink (#61761)
+- Fix up initscript (#53625)
+- Clean up spec file
+- Default to emulating Windoze ME rather than 3.1, nobody uses 3.1
+  applications anymore
+- Auto-generate default config if none exists (#61920)
+
+* Mon Mar 04 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020304-1
+- Assign gid 66 (closest to 666 [Microsoft number] we can get for a
+  system account ;) )
+- Don't use glibc private functions (__libc_fork)
+- Update
+
+* Tue Feb 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020226-1
+- Fix bug #60250
+- Update
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020221-1
+- Update
+- Don't try to launch winesetup in winelauncher, we aren't shipping it
+  (#59621)
+
+* Sun Jan 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020127-1
+- Update
+- Fix build in current environment
+
+* Wed Aug 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010822-1
+- Make sure the package can be cleanly uninstalled (#52007)
+- Add build dependencies
+
+* Thu Jul 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010726-1
+- Fix -devel package group (#49989)
+- remove internal CVS files
+- chkconfig deletion should be in %preun, not %postun
+- rename initscript ("Starting windows:" at startup does look off)
+
+* Thu May 03 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010503-1
+- Update
+- generate HTML documentation rather than shipping plain docbook text
+  (#38453)
+
+* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Update registry to mount "/" as drive "Z:", fixes winedbg (needs to be
+  accessible from 'doze drives)
+- Don't create KDE 1.x style desktop entries in wineshelllink
+- Be more tolerant on failing stuff in %%post
+
+* Thu Mar  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+
+* Thu Feb 15 2001 Tim Powers <timp at redhat.com>
+- fixed time.h build problems
+
+* Wed Jan 31 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add a patch to handle .exe and .com file permissions the way we want them
+
+* Thu Jan 18 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Restore wine's ability to use a global config file, it was removed
+  in CVS for whatever reason
+- Move libraries to %{_libdir}/wine to prevent conflicts with libuser
+  (Bug #24202)
+- Move include files to /usr/include/wine to prevent it from messing with
+  some autoconf scripts (some broken scripts assume they're running on windoze
+  if /usr/include/windows.h exists...)
+
+* Tue Dec 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix %%pre and %%postun scripts
+- --enable-opengl, glibc 2.2 should be safe
+- Update CVS
+
+* Mon Nov 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update CVS
+- Add a new (user) group wine that can write to the "C: drive"
+  %{_datadir}/wine-c
+- Fix up winedbg installation (registry entries)
+- Add "Program Files/Common Files" subdirectory to the "C: drive", it's
+  referenced in the registry
+
+* Wed Oct 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- rebuilt with new DGA
+
+* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- new snapshot
+- fix compilation with gcc 2.96
+
+* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Move init script back
+- new version
+- move man pages to FHS locations
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- move initscript
+- new snapshot
+
+* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Start the initscript on startup
+
+* Mon May  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- New version
+- new feature: You can now launch wine by just running a windows .exe file
+  (./some.exe or just click on it in kfm, gmc and the likes)
+- some spec file modifications
+
+* Sun Feb 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- newer version
+- Improve the system.ini file - all multimedia stuff should work now.
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- enable and fix up the urlmon/wininet patch
+- add: autoexec.bat, config.sys, windows/win.ini windows/system.ini
+  windows/Profiles/Administrator
+- allow i[456]86 arches
+- add some system.ini configuration
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update current
+- add urlmon and wininet patches from Corel (don't apply them for now though)
+- create empty shell*dll and winsock*dll files (as mentioned in the HOWTO)
+
+* Mon Jan 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update to current (lots of important fixes)
+- Fix up the default wine.conf file (We really don't want it to look
+  for CD-ROMs in /cdrom!)
+- create a "root filesystem" with everything required to run wine without
+  windows in %{_datadir}/wine-c (drive c:)
+- add RedHat file in /usr/doc/wine-%{version} explaining the new directory
+  layout
+- wine-devel requires wine
+
+* Tue Dec 14 1999 Preston Brown <pbrown at redhat.com>
+- updated source for Powertools 6.2
+- better files list
+
+* Fri Jul 23 1999 Tim Powers <timp at redhat.com>
+- updated source
+- built for 6.1
+
+* Tue Apr 13 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+- updated package and spec file
+
+* Mon Oct 26 1998 Preston Brown <pbrown at redhat.com>
+- updated to 10/25/98 version.  There is really no point in keeping the
+- older one, it is full of bugs and the newer one has fewer.
+- commented out building of texinfo manual, it is horrendously broken.
+
+* Mon Oct 12 1998 Michael Maher <mike at redhat.com>
+- built package for 5.2
+- pressured by QA, not updating.
+
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- repackaged for PowerTools



From fedora-extras-commits at redhat.com  Mon Jan  2 09:24:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:24:31 -0500
Subject: rpms/wine import.log,1.3,1.4
Message-ID: <200601020925.k029P4Uc028941@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28897

Modified Files:
	import.log 
Log Message:
auto-import wine-0.9.4-3 on branch FC-4 from wine-0.9.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Jan 2006 09:04:13 -0000	1.3
+++ import.log	2 Jan 2006 09:24:31 -0000	1.4
@@ -1,2 +1,3 @@
 wine-0_0-0_fdr_2_20030911_rh90:HEAD:wine-0.0-0.fdr.2.20030911.rh90.src.rpm:1099891974
 wine-0_9_4-3:HEAD:wine-0.9.4-3.src.rpm:1136192622
+wine-0_9_4-3:FC-4:wine-0.9.4-3.src.rpm:1136193859



From fedora-extras-commits at redhat.com  Mon Jan  2 09:27:15 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:27:15 -0500
Subject: rpms/wine import.log,1.4,1.5
Message-ID: <200601020927.k029Rlv5029039@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29006

Modified Files:
	import.log 
Log Message:
auto-import wine-0.9.4-4 on branch FC-4 from wine-0.9.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	2 Jan 2006 09:24:31 -0000	1.4
+++ import.log	2 Jan 2006 09:27:15 -0000	1.5
@@ -1,3 +1,4 @@
 wine-0_0-0_fdr_2_20030911_rh90:HEAD:wine-0.0-0.fdr.2.20030911.rh90.src.rpm:1099891974
 wine-0_9_4-3:HEAD:wine-0.9.4-3.src.rpm:1136192622
 wine-0_9_4-3:FC-4:wine-0.9.4-3.src.rpm:1136193859
+wine-0_9_4-4:FC-4:wine-0.9.4-4.src.rpm:1136194022



From fedora-extras-commits at redhat.com  Mon Jan  2 09:27:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:27:21 -0500
Subject: rpms/wine/FC-4 wine.spec,1.4,1.5
Message-ID: <200601020927.k029RrWc029042@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29006/FC-4

Modified Files:
	wine.spec 
Log Message:
auto-import wine-0.9.4-4 on branch FC-4 from wine-0.9.4-4.src.rpm


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine.spec	2 Jan 2006 09:24:37 -0000	1.4
+++ wine.spec	2 Jan 2006 09:27:20 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -676,6 +676,10 @@
 
 %changelog
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-4
+- bump for import
+
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-3       
 - use ExclusiveArch instead of ExcludeArch
 



From fedora-extras-commits at redhat.com  Mon Jan  2 09:31:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:31:10 -0500
Subject: rpms/wine/FC-3 wine-20050524-generated.patch, NONE, 1.1 wine-32.conf,
	NONE, 1.1 wine-README-Fedora, NONE, 1.1 wine-notepad.desktop,
	NONE, 1.1 wine-regedit.desktop, NONE,
	1.1 wine-uninstaller.desktop, NONE, 1.1 wine-winecfg.desktop,
	NONE, 1.1 wine-winefile.desktop, NONE, 1.1 wine-winemine.desktop,
	NONE, 1.1 wine-winhelp.desktop, NONE, 1.1 Makefile, 1.2,
	1.3 branch, 1.1, 1.2 sources, 1.2, 1.3 wine.spec, 1.2, 1.3
Message-ID: <200601020931.k029Vg67029158@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29123

Modified Files:
	Makefile branch sources wine.spec 
Added Files:
	wine-20050524-generated.patch wine-32.conf wine-README-Fedora 
	wine-notepad.desktop wine-regedit.desktop 
	wine-uninstaller.desktop wine-winecfg.desktop 
	wine-winefile.desktop wine-winemine.desktop 
	wine-winhelp.desktop 
Log Message:
- update fc-3


wine-20050524-generated.patch:

--- NEW FILE wine-20050524-generated.patch ---
Index: wine/tools/wineprefixcreate.in
===================================================================
RCS file: /home/wine/wine/tools/wineprefixcreate.in,v
retrieving revision 1.10
diff -u -r1.10 wineprefixcreate.in
--- wine/tools/wineprefixcreate.in	19 May 2005 11:12:34 -0000	1.10
+++ wine/tools/wineprefixcreate.in	29 May 2005 00:00:00 -0000
@@ -38,6 +38,7 @@
 
 dlldir="@dlldir@"
 datadir="@datadir@/wine"
+fontdir="@datadir@/fonts/wine"
 
 do_wait=0
 quiet=0
@@ -175,6 +176,11 @@
 link_app winhelp      "$CROOT/windows/winhelp.exe"
 link_app winhelp      "$CROOT/windows/winhlp32.exe"
 link_app winebrowser  "$CROOT/windows/winebrowser.exe"
+
+# Copy the generated fonts
+
+cp $fontdir/*.ttf "$CROOT/windows/fonts"
+cp $fontdir/*.fon "$CROOT/windows/fonts"
 
 # Copy the .inf script and run it
 


--- NEW FILE wine-32.conf ---
/usr/lib/wine/


--- NEW FILE wine-README-Fedora ---
Wine directory structure used in Fedora Core Linux:
===================================================

\${HOME}/.wine/drive_c is the root directory (aka C: drive) wine looks for by
default. It is created with (empty) C:\windows and C:\windows\system
directories, needed to operate Wine without an existing Windows
installation, if it doesn't already exists.

If you want to use Wine with an existing Windows installation that is
mounted, for example, in /mnt/windows-c, change the symlink
\${HOME}/.wine/dosdevices/c: to point to /mnt/windows-c instead of the
defaults set by installation.

If you do this, you can safely remove \${HOME}/.wine/drive_c.
(Alternatively, just mount your Windows partition to \${HOME}/.wine/drive_c.)


--- NEW FILE wine-notepad.desktop ---
[Desktop Entry]
Name=notepad
Comment=Text Editor
Exec=notepad
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-regedit.desktop ---
[Desktop Entry]
Name=regedit
Comment=Wine registry editor
Exec=regedit
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-uninstaller.desktop ---
[Desktop Entry]
Name=Wine Software Uninstaller
Comment=Interface to uninstall software
Exec=uninstaller
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winecfg.desktop ---
[Desktop Entry]
Name=Wine Configuration
Comment=Interface to set wine parameters
Exec=winecfg
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winefile.desktop ---
[Desktop Entry]
Name=Wine File
Comment=Wine File Browser
Exec=winefile
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winemine.desktop ---
[Desktop Entry]
Name=WineMine
Comment=Wine Minesweeper 
Exec=winemine
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE wine-winhelp.desktop ---
[Desktop Entry]
Name=winhelp
Comment=Windows Help Browser
Exec=winhelp
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;




Index: branch
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/branch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- branch	25 Feb 2005 22:29:14 -0000	1.1
+++ branch	2 Jan 2006 09:31:09 -0000	1.2
@@ -1 +1 @@
-FC-3
+FC-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:32:54 -0000	1.2
+++ sources	2 Jan 2006 09:31:09 -0000	1.3
@@ -1 +1,2 @@
-81521fe47d540427183e88d02d5c5f88  Wine-20030911.tar.gz
+73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine.spec	12 Feb 2005 18:34:52 -0000	1.2
+++ wine.spec	2 Jan 2006 09:31:09 -0000	1.3
@@ -1,294 +1,1060 @@
-%define DATE 20030911
-%define with_valgrind %{?_with_valgrind:1}%{!?_with_valgrind:0}
-%define with_alsa     %{?_with_alsa:1}%{!?_with_alsa:0}
-
-Summary: A Windows 16/32 bit emulator.
-Name: wine
-Version: 0.0
-Release: 0.fdr.2.%{DATE}.rh90
-Epoch: 0
-Group: Applications/Emulators
-License: LGPL
-URL: http://www.winehq.com/
-Source0: ftp://metalab.unc.edu/pub/Linux/ALPHA/wine/development/Wine-%{DATE}.tar.gz
-Source1: wine.init
-Patch0: wine-20030408-initial.patch
-Patch1: wine-20030408-kde2.patch
-Patch2: wine-20030408-winelauncher.patch
-Patch3: wine-20030408-defaultcfg.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86}
-Prereq: shadow-utils
-Conflicts: kdebase < 0:2.0
-Requires: cups-libs >= 0:1.1.12, openssl
-# require NPTL-capable glibc
-Requires: /lib/tls
-Requires(pre,postun): shadow-utils
-BuildRequires: docbook-utils, cups-devel >= 0:1.1.12, perl
-BuildRequires: XFree86-devel, libjpeg-devel, libungif-devel, libstdc++-devel
-BuildRequires: bison, flex, autoconf >= 0:2.53, arts-devel, ncurses-devel
-BuildRequires: openssl-devel, sane-backends-devel
-%if %{with_valgrind}
-BuildRequires: valgrind-devel
-%else
-BuildConflicts: valgrind-devel
-%endif
-%if %{with_alsa}
-BuildRequires: alsa-libs-devel
-%else
-BuildConflicts: alsa-libs-devel
-%endif
-Provides: libntdll.dll.so
+Name:		wine
+Version:	0.9.4
+Release:	4%{?dist}
+Summary:	A Windows 16/32/64 bit emulator
+
+Group:		Applications/Emulators
+License:	LGPL
+URL:		http://www.winehq.org/
+Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source1:	wine.init
+Source2:	wine-fonts-20050524.tar.gz
+Source3:        wine-README-Fedora
+Source4:        wine-32.conf
+Source100:      wine-notepad.desktop
+Source101:      wine-regedit.desktop
+Source102:      wine-uninstaller.desktop
+Source103:      wine-winecfg.desktop
+Source104:      wine-winefile.desktop
+Source105:      wine-winemine.desktop
+Source106:      wine-winhelp.desktop
+Patch2:		wine-20050524-generated.patch
+Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+ExclusiveArch:  %{ix86}
+
+BuildRequires:  autoconf
+BuildRequires:	bison
+BuildRequires:	flex
+BuildRequires:  alsa-lib-devel
+BuildRequires:  arts-devel
+BuildRequires:  audiofile-devel
+BuildRequires:  esound-devel
+BuildRequires:  freeglut-devel
+BuildRequires:  lcms-devel
+BuildRequires:  libieee1284-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libstdc++-devel
+BuildRequires:  libusb-devel
+BuildRequires:  libxml2-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openldap-devel
+BuildRequires:  sane-backends-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  zlib-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  fontforge
+
+Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
+Requires(post): /usr/bin/update-desktop-database
+Requires(preun): /sbin/chkconfig
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
 developers would prefer that users thought of Wine as a Windows
 compatibility layer for UNIX. This package includes a program loader,
-which allows unmodified Windows 3.1/95/NT binaries to run under Intel
+which allows unmodified Windows 3.x/9x/NT binaries to run on x86 and x86_64
 Unixes. Wine does not require MS Windows, but it can use native system
 .dll files if they are available.
 
+%package tools
+Summary:        Additional wine tools
+Group:		Applications/Emulators
+Requires:       %{name} = %{version}-%{release}
+
+%description tools
+Additional wine tools
+
+%package arts
+Summary: Arts sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description arts
+Arts sound support for wine
+
+%package esd
+Summary: ESD sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description esd
+ESD sound support for wine
+
+%package jack
+Summary: JACK sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description jack
+JACK sound support for wine
+
+%package nas
+Summary: NAS sound support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description nas
+JACK sound support for wine
+
+%package ldap
+Summary: LDAP support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description ldap
+LDAP support for wine
+
+%package cms
+Summary: Color Managment for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description cms
+Color Management for wine
+
+%package twain
+Summary: Twain support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description twain
+Twain support for wine
+
+%package capi
+Summary: ISDN support for wine
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
+
+%description capi
+ISDN support for wine
+
 %package devel
-Summary: Wine development environment.
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Summary: Wine development environment
+Group: System Environment/Libraries
+Requires: wine = %{version}-%{release}
 
 %description devel
-Header and include files for developing applications with the Wine
-Windows(TM) emulation libraries.
-
+Header, include files and library definition files for developing applications
+with the Wine Windows(TM) emulation libraries.
 
 %prep
-echo "
---------------------------------------------------------------
-Unmaintained since RHL9. Maintainer needed.
---------------------------------------------------------------" > /dev/null
-exit 1
-
-%setup -q -n wine-%{DATE}
-find . -type d -name CVS |xargs rm -rf
-%patch -p1 -b .initial
-%patch1 -p1 -b .kde2
-%patch2 -p1 -b .wl
-%patch3 -p1 -b .defcfg
-
+%setup -q
+%patch2 -p1 -b .generated
+autoconf
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
-export CPPFLAGS="$(pkg-config openssl --cflags)" # fix ssl detection, need krb5
-autoconf || autoconf-2.53
 %configure \
-	--with-nptl \
-	--with-x \
-	--libdir=%{_libdir}/wine \
-	--includedir=%{_includedir}/wine \
-	--sysconfdir=%{_sysconfdir}/wine
-
-
-make depend
-make %{?_smp_mflags}
-#%{__make} -C documentation doc
+	--sysconfdir=%{_sysconfdir}/wine --disable-static
 
+%{__make} depend
+%{__make}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %makeinstall \
-	includedir=%{?buildroot:%{buildroot}}%{_includedir}/wine \
-	libdir=%{?buildroot:%{buildroot}}%{_libdir}/wine \
-	sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir}/wine \
-	dlldir=%{?buildroot:%{buildroot}}%{_libdir}/wine/wine \
-	LDCONFIG=/bin/true
-
-for i in system command "Start Menu/Programs/Startup" Profiles/Administrator Fonts \
-         Desktop Favorites NetHood Recent SendTo ShellNew; do
-	mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/windows/$i"
-done
-mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/My Documents"
-mkdir -p "$RPM_BUILD_ROOT%{_datadir}/wine-c/Program Files/Common Files"
-
-# Take care of wine and windows configuration files...
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/wine
-mv documentation/samples/config documentation/samples/config.orig
-sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"ttydrv\"/" documentation/samples/config.orig |\
-sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"$RPM_BUILD_ROOT%{_datadir}/wine-c\"|" |\
-sed "s|\"Path\" = \"\${HOME}\"$|\"Path\" = \"%{_builddir}/%{buildsubdir}\"|" -> documentation/samples/config
-WINEPREFIX=%{_builddir}/%{buildsubdir}/documentation/samples programs/regedit/regedit winedefault.reg #> /dev/null
-# Wait until wineserver finishes and closes those files
-sleep 5
-install -c -m 0644 documentation/samples/system.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/system.reg
-install -c -m 0644 documentation/samples/user.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/user.reg
-install -c -m 0644 documentation/samples/userdef.reg $RPM_BUILD_ROOT%{_sysconfdir}/wine/userdef.reg
-rm -f documentation/samples/system.reg
-rm -f documentation/samples/user.reg
-rm -f documentation/samples/userdef.reg
-
-sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"%{_datadir}/wine-c\"|" documentation/samples/config.orig > documentation/samples/config.rh
-mv documentation/samples/config.rh documentation/samples/config.orig
-sed "s|\"Path\" = \"/cdrom\"\$|\"Path\" = \"/mnt/cdrom\"|" documentation/samples/config.orig > documentation/samples/config.rh
-mv documentation/samples/config.rh documentation/samples/config.orig
-sed "s|\"Path\" = \"/mnt/fd0\"\$|\"Path\" = \"/mnt/floppy\"|" documentation/samples/config.orig > documentation/samples/config.rh
-
-install -c -m 0644 documentation/samples/config.rh $RPM_BUILD_ROOT%{_sysconfdir}/wine/wine.conf
-rm -f documentation/samples/config
-rm -f documentation/samples/config.rh
-mv documentation/samples/config.orig documentation/samples/config
-
-# Install link to windows applications replacements
-ln -sf %{_libdir}/wine/wine/start.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/command/start.exe
-ln -sf %{_libdir}/wine/wine/notepad.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/notepad.exe
-ln -sf %{_libdir}/wine/wine/regedit.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/regedit.exe
-ln -sf %{_libdir}/wine/wine/rundll32.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/rundll32.exe
-ln -sf %{_libdir}/wine/wine/wcmd.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/cmd.exe
-ln -sf %{_libdir}/wine/wine/control.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/control.exe
-ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/help.exe
-ln -sf %{_libdir}/wine/wine/notepad.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/notepad.exe
-ln -sf %{_libdir}/wine/wine/progman.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/progman.exe
-ln -sf %{_libdir}/wine/wine/regsvr32.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/regsvr32.exe
-ln -sf %{_libdir}/wine/wine/winemine.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/winmine.exe
-ln -sf %{_libdir}/wine/wine/winver.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/winver.exe
-ln -sf %{_libdir}/wine/wine/uninstaller.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/uninstaller.exe
-ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/winhelp.exe
-ln -sf %{_libdir}/wine/wine/winhelp.exe.so $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/winhlp32.exe
-
-for i in shell.dll shell32.dll winsock.dll wnsock32.dll; do
-	touch $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system/$i
-done
-touch $RPM_BUILD_ROOT%{_datadir}/wine-c/autoexec.bat
-touch $RPM_BUILD_ROOT%{_datadir}/wine-c/config.sys
-touch $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/win.ini
-install -c -m 0644 documentation/samples/system.ini $RPM_BUILD_ROOT%{_datadir}/wine-c/windows/system.ini
-
-cat >RedHat <<EOF
-Wine directory structure used in Red Hat Linux:
-===============================================
-
-%{_datadir}/wine-c is the root directory (aka C: drive) wine looks for
-by default. It contains (empty) C:\windows and C:\windows\system
-directories, needed to operate Wine without an existing Windows installation.
-
-If you want to use Wine with an existing Windows installation that is mounted,
-for example, in /mnt/windows-c, edit /etc/wine.conf to say
-
-[Drive C]
-Path=/mnt/windows-c
-Type=hd
-Label=Whatever
-Filesystem=win95
-
-instead of the defaults set by installation.
-
-If you do this, you can safely remove %{_datadir}/wine-c.
-(Alternatively, just mount your Windows partition to %{_datadir}/wine-c.)
-EOF
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+%makeinstall \
+	-C dlls/wineps \
+	includedir=%{buildroot}%{_includedir}/wine \
+	sysconfdir=%{buildroot}%{_sysconfdir}/wine \
+	dlldir=%{buildroot}%{_libdir}/wine \
+	LDCONFIG=/bin/true \
+	UPDATE_DESKTOP_DATABASE=/bin/true
+
+mkdir -p %{buildroot}%{_sysconfdir}/wine
 
 # Allow users to launch Windows programs by just clicking on the .exe file...
-mkdir -p $RPM_BUILD_ROOT%{_initrddir}
-install -c -m 755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/wine
+mkdir -p %{buildroot}%{_initrddir}
+install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine
 
+# Install Wine's fonts
+mkdir -p %{buildroot}%{_datadir}/fonts/wine
+tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE100}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE101}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE102}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE103}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE104}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE105}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  %{SOURCE106}
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/wine.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+cp %{SOURCE3} README-Fedora
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
 
-%pre
-/usr/sbin/groupadd -g 66 -r wine &>/dev/null || :
+%clean
+rm -rf %{buildroot}
 
 %post
-if ! grep -q "^/usr/lib/wine$" /etc/ld.so.conf; then
-	echo "/usr/lib/wine" >>/etc/ld.so.conf
-fi
+/sbin/ldconfig
 /sbin/chkconfig --add wine
 /sbin/chkconfig --level 2345 wine on
 /sbin/service wine start &>/dev/null || :
-/sbin/ldconfig
+update-desktop-database &>/dev/null || :
 
 %preun
 if test "$1" = "0"; then
-	/sbin/service wine stop &> /dev/null || :
 	/sbin/chkconfig --del wine
 fi
 
 %postun
-if test "$1" = "0"; then
-	perl -pi -e "s,^/usr/lib/wine\n$,,g" /etc/ld.so.conf
-	/usr/sbin/groupdel wine &>/dev/null || :
-fi
 /sbin/ldconfig
+update-desktop-database &>/dev/null || :
+
+%post arts -p /sbin/ldconfig
+%postun arts -p /sbin/ldconfig
+
+%post esd -p /sbin/ldconfig
+%postun esd -p /sbin/ldconfig
+
+%post jack -p /sbin/ldconfig
+%postun jack -p /sbin/ldconfig
+
+%post nas -p /sbin/ldconfig
+%postun nas -p /sbin/ldconfig
+
+%post ldap -p /sbin/ldconfig
+%postun ldap -p /sbin/ldconfig
+
+%post cms -p /sbin/ldconfig
+%postun cms -p /sbin/ldconfig
+
+%post twain -p /sbin/ldconfig
+%postun twain -p /sbin/ldconfig
 
+%post capi -p /sbin/ldconfig
+%postun capi -p /sbin/ldconfig
 
 %files
-%defattr(0775,root,wine)
-%dir %{_datadir}/wine-c
-%dir %{_datadir}/wine-c/windows
-%dir %{_datadir}/wine-c/windows/command
-%dir %{_datadir}/wine-c/windows/system
-%dir "%{_datadir}/wine-c/windows/Start Menu"
-%dir "%{_datadir}/wine-c/windows/Start Menu/Programs"
-%dir "%{_datadir}/wine-c/windows/Start Menu/Programs/Startup"
-%dir %{_datadir}/wine-c/windows/Profiles
-%dir %{_datadir}/wine-c/windows/Profiles/Administrator
-%dir %{_datadir}/wine-c/windows/Fonts
-%dir %{_datadir}/wine-c/windows/Desktop
-%dir %{_datadir}/wine-c/windows/Favorites
-%dir %{_datadir}/wine-c/windows/NetHood
-%dir %{_datadir}/wine-c/windows/Recent
-%dir %{_datadir}/wine-c/windows/SendTo
-%dir %{_datadir}/wine-c/windows/ShellNew
-%dir "%{_datadir}/wine-c/My Documents"
-%dir "%{_datadir}/wine-c/Program Files"
-%dir "%{_datadir}/wine-c/Program Files/Common Files"
-%defattr(-,root,wine,-)
-%{_libdir}/wine
-%{_bindir}/*
-%{_mandir}/man?/*
-%{_datadir}/wine-c/windows/command/*.exe
-%{_datadir}/wine-c/windows/system/*.dll
-%{_datadir}/wine-c/windows/system/*.exe
-%{_datadir}/wine-c/windows/*.exe
-%{_datadir}/aclocal/wine.m4
-%config %{_datadir}/wine-c/autoexec.bat
-%config %{_datadir}/wine-c/config.sys
-%attr(0664, root, wine) %config %{_datadir}/wine-c/windows/win.ini
-%attr(0664, root, wine) %config %{_datadir}/wine-c/windows/system.ini
-%config %{_sysconfdir}/wine/*
-%config %{_initrddir}/*
-%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD README VERSION
-%doc AUTHORS RedHat
+%defattr(-,root,root,-)
+%doc ANNOUNCE BUGS COPYING.LIB ChangeLog DEVELOPERS-HINTS LICENSE LICENSE.OLD
+%doc AUTHORS README-Fedora README VERSION
+%doc documentation/*
+%{_bindir}/msiexec
+%{_bindir}/regedit
+%{_bindir}/regsvr32
+%{_bindir}/wine
+%{_bindir}/wineboot
+%{_bindir}/winebrowser
+%{_bindir}/wineconsole
+%{_bindir}/wineprefixcreate
+%{_bindir}/wineshelllink
+%{_bindir}/winecfg
+%{_bindir}/uninstaller
+%{_initrddir}/wine
+%{_libdir}/wine/expand.exe.so
+%{_libdir}/wine/msiexec.exe.so
+%{_libdir}/wine/regedit.exe.so
+%{_libdir}/wine/regsvr32.exe.so
+%{_libdir}/wine/rpcss.exe.so
+%{_libdir}/wine/rundll32.exe.so
+%{_libdir}/wine/start.exe.so
+%{_libdir}/wine/wineboot.exe.so
+%{_libdir}/wine/winebrowser.exe.so
+%{_libdir}/wine/wineconsole.exe.so
+%{_libdir}/wine/winemenubuilder.exe.so
+%{_libdir}/wine/winevdm.exe.so
+%{_datadir}/applications/fedora-wine.desktop
+%{_datadir}/applications/fedora-wine-regedit.desktop
+%{_datadir}/applications/fedora-wine-uninstaller.desktop
+%{_datadir}/applications/fedora-wine-winecfg.desktop
+%{_mandir}/man1/wine.1.gz
+%{_datadir}/wine/generic.ppd
+%{_datadir}/wine/wine.inf
+%{_bindir}/wine-kthread
+%{_bindir}/wine-preloader
+%{_bindir}/wine-pthread
+%{_bindir}/winelauncher
+%{_bindir}/wineserver
+%{_mandir}/man1/wineserver.1*
+%{_libdir}/libwine.so.1
+%{_libdir}/libwine_unicode.so.1
+%dir %{_libdir}/wine
+%{_libdir}/wine/activeds.dll.so
+%{_libdir}/wine/advapi32.dll.so
+%{_libdir}/wine/advpack.dll.so
+%{_libdir}/wine/amstream.dll.so
+%{_libdir}/wine/atl.dll.so
+%{_libdir}/wine/avicap32.dll.so
+%{_libdir}/wine/avifil32.dll.so
+%{_libdir}/wine/avifile.dll.so
+%{_libdir}/wine/aviinfo.exe.so
+%{_libdir}/wine/aviplay.exe.so
+%{_libdir}/wine/cabinet.dll.so
+%{_libdir}/wine/cards.dll.so
+%{_libdir}/wine/cfgmgr32.dll.so
+%{_libdir}/wine/clock.exe.so
+%{_libdir}/wine/comcat.dll.so
+%{_libdir}/wine/comctl32.dll.so
+%{_libdir}/wine/comdlg32.dll.so
+%{_libdir}/wine/comm.drv.so
+%{_libdir}/wine/commdlg.dll.so
+%{_libdir}/wine/compobj.dll.so
+%{_libdir}/wine/crtdll.dll.so
+%{_libdir}/wine/crypt32.dll.so
+%{_libdir}/wine/cryptdll.dll.so
+%{_libdir}/wine/ctl3d.dll.so
+%{_libdir}/wine/ctl3d32.dll.so
+%{_libdir}/wine/ctl3dv2.dll.so
+%{_libdir}/wine/d3dim.dll.so
+%{_libdir}/wine/d3drm.dll.so
+%{_libdir}/wine/d3dxof.dll.so
+%{_libdir}/wine/dbghelp.dll.so
+%{_libdir}/wine/dciman32.dll.so
+%{_libdir}/wine/ddeml.dll.so
+%{_libdir}/wine/ddraw.dll.so
+%{_libdir}/wine/devenum.dll.so
+%{_libdir}/wine/dinput.dll.so
+%{_libdir}/wine/dinput8.dll.so
+%{_libdir}/wine/dispdib.dll.so
+%{_libdir}/wine/display.drv.so
+%{_libdir}/wine/dmband.dll.so
+%{_libdir}/wine/dmcompos.dll.so
+%{_libdir}/wine/dmime.dll.so
+%{_libdir}/wine/dmloader.dll.so
+%{_libdir}/wine/dmscript.dll.so
+%{_libdir}/wine/dmstyle.dll.so
+%{_libdir}/wine/dmsynth.dll.so
+%{_libdir}/wine/dmusic.dll.so
+%{_libdir}/wine/dmusic32.dll.so
+%{_libdir}/wine/dplay.dll.so
+%{_libdir}/wine/dplayx.dll.so
+%{_libdir}/wine/dpnet.dll.so
+%{_libdir}/wine/dpnhpast.dll.so
+%{_libdir}/wine/dsound.dll.so
+%{_libdir}/wine/dswave.dll.so
+%{_libdir}/wine/dxdiagn.dll.so
+%{_libdir}/wine/eject.exe.so
+%{_libdir}/wine/gdi.exe.so
+%{_libdir}/wine/gdi32.dll.so
+%{_libdir}/wine/hh.exe.so
+%{_libdir}/wine/hhctrl.ocx.so
+%{_libdir}/wine/iccvid.dll.so
+%{_libdir}/wine/icinfo.exe.so
+%{_libdir}/wine/icmp.dll.so
+%{_libdir}/wine/ifsmgr.vxd.so
+%{_libdir}/wine/imaadp32.acm.so
+%{_libdir}/wine/imagehlp.dll.so
+%{_libdir}/wine/imm.dll.so
+%{_libdir}/wine/imm32.dll.so
+%{_libdir}/wine/iphlpapi.dll.so
+%{_libdir}/wine/itss.dll.so
+%{_libdir}/wine/joystick.drv.so
+%{_libdir}/wine/kernel32.dll.so
+%{_libdir}/wine/keyboard.drv.so
+%{_libdir}/wine/krnl386.exe.so
+%{_libdir}/wine/lz32.dll.so
+%{_libdir}/wine/lzexpand.dll.so
+%{_libdir}/wine/mapi32.dll.so
+%{_libdir}/wine/mciavi32.dll.so
+%{_libdir}/wine/mcicda.dll.so
+%{_libdir}/wine/mciseq.dll.so
+%{_libdir}/wine/mciwave.drv.so
+%{_libdir}/wine/midimap.dll.so
+%{_libdir}/wine/mlang.dll.so
+%{_libdir}/wine/mmdevldr.vxd.so
+%{_libdir}/wine/mmsystem.dll.so
+%{_libdir}/wine/monodebg.vxd.so
+%{_libdir}/wine/mouse.drv.so
+%{_libdir}/wine/mpr.dll.so
+%{_libdir}/wine/msacm.dll.so
+%{_libdir}/wine/msacm.drv.so
+%{_libdir}/wine/msacm32.dll.so
+%{_libdir}/wine/msadp32.acm.so
+%{_libdir}/wine/msdmo.dll.so
+%{_libdir}/wine/msg711.acm.so
+%{_libdir}/wine/mshtml.dll.so
+%{_libdir}/wine/msi.dll.so
+%{_libdir}/wine/msimg32.dll.so
+%{_libdir}/wine/msisys.ocx.so
+%{_libdir}/wine/msnet32.dll.so
+%{_libdir}/wine/msrle32.dll.so
+%{_libdir}/wine/msvcrt.dll.so
+%{_libdir}/wine/msvcrt20.dll.so
+%{_libdir}/wine/msvcrt40.dll.so
+%{_libdir}/wine/msvcrtd.dll.so
+%{_libdir}/wine/msvfw32.dll.so
+%{_libdir}/wine/msvidc32.dll.so
+%{_libdir}/wine/msvideo.dll.so
+%{_libdir}/wine/mswsock.dll.so
+%{_libdir}/wine/msxml3.dll.so
+%{_libdir}/wine/netapi32.dll.so
+%{_libdir}/wine/newdev.dll.so
+%{_libdir}/wine/ntdll.dll.so
+%{_libdir}/wine/objsel.dll.so
+%{_libdir}/wine/odbc32.dll.so
+%{_libdir}/wine/odbccp32.dll.so
+%{_libdir}/wine/ole2.dll.so
+%{_libdir}/wine/ole2conv.dll.so
+%{_libdir}/wine/ole2disp.dll.so
+%{_libdir}/wine/ole2nls.dll.so
+%{_libdir}/wine/ole2prox.dll.so
+%{_libdir}/wine/ole2thk.dll.so
+%{_libdir}/wine/ole32.dll.so
+%{_libdir}/wine/oleacc.dll.so
+%{_libdir}/wine/oleaut32.dll.so
+%{_libdir}/wine/olecli.dll.so
+%{_libdir}/wine/olecli32.dll.so
+%{_libdir}/wine/oledlg.dll.so
+%{_libdir}/wine/olepro32.dll.so
+%{_libdir}/wine/olesvr.dll.so
+%{_libdir}/wine/olesvr32.dll.so
+%{_libdir}/wine/powrprof.dll.so
+%{_libdir}/wine/psapi.dll.so
+%{_libdir}/wine/qcap.dll.so
+%{_libdir}/wine/quartz.dll.so
+%{_libdir}/wine/rasapi16.dll.so
+%{_libdir}/wine/rasapi32.dll.so
+%{_libdir}/wine/riched20.dll.so
+%{_libdir}/wine/riched32.dll.so
+%{_libdir}/wine/rpcrt4.dll.so
+%{_libdir}/wine/rsabase.dll.so
+%{_libdir}/wine/rsaenh.dll.so
+%{_libdir}/wine/secur32.dll.so
+%{_libdir}/wine/sensapi.dll.so
+%{_libdir}/wine/serialui.dll.so
+%{_libdir}/wine/setupapi.dll.so
+%{_libdir}/wine/setupx.dll.so
+%{_libdir}/wine/shdocvw.dll.so
+%{_libdir}/wine/shell.dll.so
+%{_libdir}/wine/shell32.dll.so
+%{_libdir}/wine/shfolder.dll.so
+%{_libdir}/wine/shlwapi.dll.so
+%{_libdir}/wine/snmpapi.dll.so
+%{_libdir}/wine/sound.drv.so
+%{_libdir}/wine/stdole2.tlb.so
+%{_libdir}/wine/stdole32.tlb.so
+%{_libdir}/wine/sti.dll.so
+%{_libdir}/wine/storage.dll.so
+%{_libdir}/wine/stress.dll.so
+%{_libdir}/wine/system.drv.so
+%{_libdir}/wine/tapi32.dll.so
+%{_libdir}/wine/toolhelp.dll.so
+%{_libdir}/wine/typelib.dll.so
+%{_libdir}/wine/unicows.dll.so
+%{_libdir}/wine/url.dll.so
+%{_libdir}/wine/urlmon.dll.so
+%{_libdir}/wine/user.exe.so
+%{_libdir}/wine/user32.dll.so
+%{_libdir}/wine/usp10.dll.so
+%{_libdir}/wine/uxtheme.dll.so
+%{_libdir}/wine/vdhcp.vxd.so
+%{_libdir}/wine/vdmdbg.dll.so
+%{_libdir}/wine/ver.dll.so
+%{_libdir}/wine/version.dll.so
+%{_libdir}/wine/vmm.vxd.so
+%{_libdir}/wine/vnbt.vxd.so
+%{_libdir}/wine/vnetbios.vxd.so
+%{_libdir}/wine/vtdapi.vxd.so
+%{_libdir}/wine/vwin32.vxd.so
+%{_libdir}/wine/w32skrnl.dll.so
+%{_libdir}/wine/w32sys.dll.so
+%{_libdir}/wine/win32s16.dll.so
+%{_libdir}/wine/win87em.dll.so
+%{_libdir}/wine/winaspi.dll.so
+%{_libdir}/wine/windebug.dll.so
+%{_libdir}/wine/wineaudioio.drv.so
+%{_libdir}/wine/winedos.dll.so
+%{_libdir}/wine/winemp3.acm.so
+%{_libdir}/wine/wineoss.drv.so
+#%{_libdir}/wine/winetty.drv.so
+%{_libdir}/wine/winex11.drv.so
+%{_libdir}/wine/wing.dll.so
+%{_libdir}/wine/wininet.dll.so
+%{_libdir}/wine/winmm.dll.so
+%{_libdir}/wine/winnls.dll.so
+%{_libdir}/wine/winnls32.dll.so
+%{_libdir}/wine/winsock.dll.so
+%{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/wintab.dll.so
+%{_libdir}/wine/wintab32.dll.so
+%{_libdir}/wine/wintrust.dll.so
+%{_libdir}/wine/wnaspi32.dll.so
+%{_libdir}/wine/wow32.dll.so
+%{_libdir}/wine/wprocs.dll.so
+%{_libdir}/wine/ws2_32.dll.so
+%{_libdir}/wine/wsock32.dll.so
+%{_libdir}/wine/wtsapi32.dll.so
+%dir %{_datadir}/fonts/wine
+%{_datadir}/fonts/wine/wine_coure.fon
+%{_datadir}/fonts/wine/wine_couree.fon
+%{_datadir}/fonts/wine/wine_courer.fon
+%{_datadir}/fonts/wine/wine_marlett.ttf
+%{_datadir}/fonts/wine/wine_sserife.fon
+%{_datadir}/fonts/wine/wine_sserifee.fon
+%{_datadir}/fonts/wine/wine_sserifer.fon
+%{_datadir}/fonts/wine/wine_vgasys.fon
+%{_datadir}/fonts/wine/wine_vgasyse.fon
+%{_datadir}/fonts/wine/wine_vgasysr.fon
+%{_datadir}/fonts/wine/coue1255.fon
+%{_datadir}/fonts/wine/coue1256.fon
+%{_datadir}/fonts/wine/coue1257.fon
+%{_datadir}/fonts/wine/coure.fon
+%{_datadir}/fonts/wine/couree.fon
+%{_datadir}/fonts/wine/coureg.fon
+%{_datadir}/fonts/wine/courer.fon
+%{_datadir}/fonts/wine/couret.fon
+%{_datadir}/fonts/wine/cvgasys.fon
+%{_datadir}/fonts/wine/hvgasys.fon
+%{_datadir}/fonts/wine/jvgasys.fon
+%{_datadir}/fonts/wine/marlett.ttf
+%{_datadir}/fonts/wine/ssee1255.fon
+%{_datadir}/fonts/wine/ssee1256.fon
+%{_datadir}/fonts/wine/ssee1257.fon
+%{_datadir}/fonts/wine/ssee874.fon
+%{_datadir}/fonts/wine/sserife.fon
+%{_datadir}/fonts/wine/sserifee.fon
+%{_datadir}/fonts/wine/sserifeg.fon
+%{_datadir}/fonts/wine/sserifer.fon
+%{_datadir}/fonts/wine/sserifet.fon
+%{_datadir}/fonts/wine/svgasys.fon
+%{_datadir}/fonts/wine/vgas1255.fon
+%{_datadir}/fonts/wine/vgas1256.fon
+%{_datadir}/fonts/wine/vgas1257.fon
+%{_datadir}/fonts/wine/vgas874.fon
+%{_datadir}/fonts/wine/vgasys.fon
+%{_datadir}/fonts/wine/vgasyse.fon
+%{_datadir}/fonts/wine/vgasysg.fon
+%{_datadir}/fonts/wine/vgasysr.fon
+%{_datadir}/fonts/wine/vgasyst.fon
+%{_libdir}/wine/winealsa.drv.so
+%{_libdir}/wine/wineps.drv.so
+%{_libdir}/wine/wineps16.drv.so
+%{_libdir}/wine/d3d8.dll.so
+%{_libdir}/wine/d3d9.dll.so
+%{_libdir}/wine/d3dx8.dll.so
+%{_libdir}/wine/glu32.dll.so
+%{_libdir}/wine/glut32.dll.so
+%{_libdir}/wine/opengl32.dll.so
+%{_libdir}/wine/wined3d.dll.so
+%{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
-%files devel
+%files tools
+%defattr(-,root,root,-)
+%{_bindir}/notepad
+%{_bindir}/progman
+%{_bindir}/wcmd
+%{_bindir}/winedbg
+%{_bindir}/winedump
+%{_bindir}/winefile
+%{_bindir}/winemaker
+%{_bindir}/winemine
+%{_bindir}/winepath
+%{_bindir}/winhelp
+%{_libdir}/wine/explorer.exe.so
+%{_libdir}/wine/control.exe.so
+%{_libdir}/wine/notepad.exe.so
+%{_libdir}/wine/progman.exe.so
+%{_libdir}/wine/taskmgr.exe.so
+%{_libdir}/wine/uninstaller.exe.so
+%{_libdir}/wine/wcmd.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/winedbg.exe.so
+%{_libdir}/wine/winefile.exe.so
+%{_libdir}/wine/winemine.exe.so
+%{_libdir}/wine/winepath.exe.so
+%{_libdir}/wine/winhelp.exe.so
+%{_libdir}/wine/winver.exe.so
+%{_libdir}/wine/winetest.exe.so
+%{_datadir}/applications/fedora-wine-notepad.desktop
+%{_datadir}/applications/fedora-wine-winefile.desktop
+%{_datadir}/applications/fedora-wine-winemine.desktop
+%{_datadir}/applications/fedora-wine-winhelp.desktop
+
+%files arts
+%defattr(-,root,root,-)
+%{_libdir}/wine/winearts.drv.so
+
+%files esd
+%defattr(-,root,root,-)
+%{_libdir}/wine/wineesd.drv.so
+
+%files jack
+%defattr(-,root,root,-)
+%{_libdir}/wine/winejack.drv.so
+
+%files nas
 %defattr(-,root,root,-)
-%doc documentation/winelib-* documentation/wine-devel* documentation/debug*
-%doc documentation/patches* documentation/porting.sgml documentation/implementation.sgml
-%doc documentation/HOWTO-winelib
-%{_includedir}/*
+%{_libdir}/wine/winenas.drv.so
 
+%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/wine/wldap32.dll.so
+
+%files cms
+%defattr(-,root,root,-)
+%{_libdir}/wine/mscms.dll.so
+
+%files twain
+%defattr(-,root,root,-)
+%{_libdir}/wine/twain.dll.so
+%{_libdir}/wine/twain_32.dll.so
+
+%files capi
+%defattr(-,root,root,-)
+%{_libdir}/wine/capi2032.dll.so
+
+%files devel
+%defattr(-,root,root,-)
+%{_bindir}/function_grep.pl
+%{_bindir}/widl
+%{_bindir}/winebuild
+%{_bindir}/winecpp
+%{_bindir}/winedump
+%{_bindir}/wineg++
+%{_bindir}/winegcc
+%{_bindir}/winemaker
+%{_bindir}/wmc
+%{_bindir}/wrc
+%{_libdir}/*.so
+%{_mandir}/man1/widl.1*
+%{_mandir}/man1/winebuild.1*
+%{_mandir}/man1/winedump.1*
+%{_mandir}/man1/winegcc.1*
+%{_mandir}/man1/winemaker.1*
+%{_mandir}/man1/wmc.1*
+%{_mandir}/man1/wrc.1*
+%{_mandir}/man1/winedbg.1*
+%{_mandir}/man1/wineg++.1*
+%{_datadir}/aclocal/wine.m4
+%attr(0755, root, root) %dir %{_includedir}/wine
+%{_includedir}/wine/*
+%{_libdir}/wine/*.a
+%{_libdir}/wine/*.def
 
 %changelog
-* Sun Sep 28 2003 Ville Skytt?? <ville.skytta at iki.fi> 0:0.0-0.fdr.2.20030911
-- Fix SSL detection (need krb5), require openssl.
-- Disable ALSA by default, use "--with alsa" to enable.
-- Disable valgrind by default, use "--with valgrind" to enable.
-- Cosmetic improvements.
-
-* Tue Sep 16 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030911
-- update to 20030911
-
-* Tue Aug 19 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030813
-- update to 20030813
-
-* Thu Jul 10 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030709
-- update to 20030709
-- add /lib/tls requirement -> only works with NTPL capable systems
-
-* Wed Jul 02 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030618
-- update to 20030618
-
-* Thu May 22 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030508
-- update to 20030508
-- add buildreq's & other QA issues from #255
-
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com> 0.0-0.fdr.1.20030408
-- package for fedora
-- based on modified RH wine from 8.0 found off the net
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-4
+- bump for import
+
+* Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-3       
+- use ExclusiveArch instead of ExcludeArch
+
+* Sun Jan 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-2
+- own font directory
+- fix devel summary
+- add ExcludeArch x86_64 for now
+
+* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-1
+- version upgrade
+- changed wine.init perissions to 0644
+- added autoconf BR
+
+* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.3-1
+- version upgrade
+
+* Thu Nov 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.2-1
+- version upgrade
+
+* Thu Nov 17 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
+0.9.1-3
+- fix typo in winefile desktop file
+- drop in ld config instead of editing ld.so.conf
+
+* Sun Nov 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-2
+- add fontforge BR and include generated fonts...
+
+* Sat Nov 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.1-1
+- version upgrade
+- move uninstaller and winecfg into wine main package...
+- drop wine suite
+
+* Sat Oct 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-3
+- s/libwine/wine/
+
+* Thu Oct 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-2
+- remerge some subpackages which should be defaults
+
+* Tue Oct 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9-1
+- upgrade to new version
+- start splitting
+
+* Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0-1.20050930
+- add fedora readme
+- switch to new (old) versioning sheme
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-3
+- add desktop files
+- revisit summary and description
+- consistant use of %{buildroot}
+
+* Sat Oct 22 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-2
+- some more spec tuneups...
+
+* Sat Oct 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050930-1
+- version upgrade
+
+* Sun Sep 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050925-1
+- upgrade to current cvs
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050830-1
+- version upgrade
+
+* Mon Sep 19 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+20050524-2
+- fedorarized version
+
+* Mon May 30 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050524-1fc3
+- Update to 20050524
+- Remove pdf documentation build as it's no more included in the main archive
+- Workaround for generic.ppd installation
+
+* Tue Apr 19 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050419-1fc3
+- Update to 20050419
+
+* Thu Mar 10 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050310-1fc3
+- Update to 20050310
+
+* Sat Feb 12 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050211-1fc3
+- Update to 20050211
+
+* Tue Jan 11 2005 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20050111-1fc3
+- Update to 20050111
+
+* Wed Dec 1 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041201-1fc3
+- Recompile for FC3
+- Update to 20041201
+- Small reorganization:
+    - use the generic ICU static libs name;
+    - no more wine group;
+    - use Wine's generated stdole32.tlb file;
+    - use Wine's generated fonts.
+
+* Wed Oct 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20041019-1fc2
+- Update to 20041019
+
+* Wed Sep 15 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040914-1fc2
+- Update to 20040914
+
+* Sat Aug 14 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040813-1fc2
+- Update to 20040813
+
+* Sat Jul 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040716-1fc2
+- Update to 20040716
+
+* Fri Jun 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc2
+- Recompile for FC2
+- Backport from current CVS some fixes to the preloader to prevent
+  a segfault on startup
+- Include a currently uncommitted patch from Alexandre Julliard regarding
+  further issues with the preloader
+
+* Sun Jun 20 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040615-1fc1
+- Update to 20040615
+- Use of wineprefixcreate instead of old RedHat patches
+
+* Wed May 5 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040505-1fc1
+- Update to 20040505
+
+* Fri Apr 9 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040408-1fc1
+- Update to 20040408
+- Change the handling of paths to DOS drives in the installation process
+
+* Wed Mar 17 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040309-1fc1
+- Update to 20040309
+- Replaced winedefault.reg by wine.inf
+
+* Wed Feb 18 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040213-1fc1
+- Update to 20040213
+- Moved Wine dlls back to %{_libdir}/wine rather than %{_libdir}/wine/wine
+
+* Sun Jan 25 2004 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20040121-fc1
+- Update to 20040121
+
+* Sat Dec 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031212-fc1
+- Update to 20031212
+
+* Wed Nov 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031118-fc1
+- Update to 20031118
+
+* Thu Oct 16 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20031016-1rh9
+- Update to 20031016
+
+* Tue Sep 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030911-1rh9
+- Fix of include location
+- Better separation of run-time and development files
+- Update to 20030911
+
+* Wed Aug 13 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030813-1rh9
+- Update to 20030813
+
+* Wed Jul 09 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030709-1rh9
+- Update to 20030709
+
+* Wed Jun 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030618-1rh9
+- Change the default C drive to ~/.wine/c, copied from /usr/share/wine
+  if non-existant (Thanks to Rudolf Kastl)
+- Updated to 20030618
+
+* Tue May 20 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1rh9
+- Adapted for RH9
+
+* Thu May 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030508-1
+- Add libraries definition files to devel package
+- Update to 20030508
+
+* Tue Apr 08 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030408-1
+- Update to 20030408
+
+* Tue Mar 18 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030318-1
+- Update to 20030318
+
+* Thu Mar 11 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-2
+- Fix the symlinks in wine-c.
+
+* Wed Feb 19 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030219-1
+- Update to 20030129
+- Various fixes in RPM build process
+
+* Fri Jan 17 2003 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20030115-1
+- Update to 20030115
+- fix to build problem
+
+* Thu Nov  7 2002 Vincent B?ron <vberon at mecano.gme.usherb.ca> 20021031-1
+- Update to 20021031
+- Tweaks here and there
+
+* Wed Sep  4 2002 Bill Nottingham <notting at redhat.com> 20020605-2
+- fix docs (#72923)
+
+* Wed Jul 10 2002 Karsten Hopp <karsten at redhat.de> 20020605-1
+- update
+- remove obsolete part of redhat patch
+- redo destdir patch
+- redo kde patch
+- redo defaultversion patch
+- fix 'my_perl unknown' error
+- work around name conflict with textutils 'expand'
+
+* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp at redhat.com>
+- automated rebuild
+
+* Wed Mar 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020327-1
+- Fix wineshelllink (#61761)
+- Fix up initscript (#53625)
+- Clean up spec file
+- Default to emulating Windoze ME rather than 3.1, nobody uses 3.1
+  applications anymore
+- Auto-generate default config if none exists (#61920)
+
+* Mon Mar 04 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020304-1
+- Assign gid 66 (closest to 666 [Microsoft number] we can get for a
+  system account ;) )
+- Don't use glibc private functions (__libc_fork)
+- Update
+
+* Tue Feb 26 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020226-1
+- Fix bug #60250
+- Update
+
+* Thu Feb 21 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020221-1
+- Update
+- Don't try to launch winesetup in winelauncher, we aren't shipping it
+  (#59621)
+
+* Sun Jan 27 2002 Bernhard Rosenkraenzer <bero at redhat.com> 20020127-1
+- Update
+- Fix build in current environment
+
+* Wed Aug 22 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010822-1
+- Make sure the package can be cleanly uninstalled (#52007)
+- Add build dependencies
+
+* Thu Jul 26 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010726-1
+- Fix -devel package group (#49989)
+- remove internal CVS files
+- chkconfig deletion should be in %preun, not %postun
+- rename initscript ("Starting windows:" at startup does look off)
+
+* Thu May 03 2001 Bernhard Rosenkraenzer <bero at redhat.com> 20010503-1
+- Update
+- generate HTML documentation rather than shipping plain docbook text
+  (#38453)
+
+* Sat Apr 14 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Update registry to mount "/" as drive "Z:", fixes winedbg (needs to be
+  accessible from 'doze drives)
+- Don't create KDE 1.x style desktop entries in wineshelllink
+- Be more tolerant on failing stuff in %%post
+
+* Thu Mar  1 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+
+* Thu Feb 15 2001 Tim Powers <timp at redhat.com>
+- fixed time.h build problems
+
+* Wed Jan 31 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Add a patch to handle .exe and .com file permissions the way we want them
+
+* Thu Jan 18 2001 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update
+- Restore wine's ability to use a global config file, it was removed
+  in CVS for whatever reason
+- Move libraries to %{_libdir}/wine to prevent conflicts with libuser
+  (Bug #24202)
+- Move include files to /usr/include/wine to prevent it from messing with
+  some autoconf scripts (some broken scripts assume they're running on windoze
+  if /usr/include/windows.h exists...)
+
+* Tue Dec 19 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Fix %%pre and %%postun scripts
+- --enable-opengl, glibc 2.2 should be safe
+- Update CVS
+
+* Mon Nov 20 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Update CVS
+- Add a new (user) group wine that can write to the "C: drive"
+  %{_datadir}/wine-c
+- Fix up winedbg installation (registry entries)
+- Add "Program Files/Common Files" subdirectory to the "C: drive", it's
+  referenced in the registry
+
+* Wed Oct 11 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update
+
+* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
+- rebuilt with new DGA
+
+* Tue Jul 25 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- new snapshot
+- fix compilation with gcc 2.96
+
+* Fri Jul 21 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Move init script back
+- new version
+- move man pages to FHS locations
+
+* Thu Jul 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- move initscript
+- new snapshot
+
+* Fri Jun 23 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- Start the initscript on startup
+
+* Mon May  9 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- New version
+- new feature: You can now launch wine by just running a windows .exe file
+  (./some.exe or just click on it in kfm, gmc and the likes)
+- some spec file modifications
+
+* Sun Feb 13 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- newer version
+- Improve the system.ini file - all multimedia stuff should work now.
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- enable and fix up the urlmon/wininet patch
+- add: autoexec.bat, config.sys, windows/win.ini windows/system.ini
+  windows/Profiles/Administrator
+- allow i[456]86 arches
+- add some system.ini configuration
+
+* Wed Feb  2 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update current
+- add urlmon and wininet patches from Corel (don't apply them for now though)
+- create empty shell*dll and winsock*dll files (as mentioned in the HOWTO)
+
+* Mon Jan 17 2000 Bernhard Rosenkraenzer <bero at redhat.com>
+- update to current (lots of important fixes)
+- Fix up the default wine.conf file (We really don't want it to look
+  for CD-ROMs in /cdrom!)
+- create a "root filesystem" with everything required to run wine without
+  windows in %{_datadir}/wine-c (drive c:)
+- add RedHat file in /usr/doc/wine-%{version} explaining the new directory
+  layout
+- wine-devel requires wine
+
+* Tue Dec 14 1999 Preston Brown <pbrown at redhat.com>
+- updated source for Powertools 6.2
+- better files list
+
+* Fri Jul 23 1999 Tim Powers <timp at redhat.com>
+- updated source
+- built for 6.1
+
+* Tue Apr 13 1999 Michael Maher <mike at redhat.com>
+- built package for 6.0
+- updated package and spec file
+
+* Mon Oct 26 1998 Preston Brown <pbrown at redhat.com>
+- updated to 10/25/98 version.  There is really no point in keeping the
+- older one, it is full of bugs and the newer one has fewer.
+- commented out building of texinfo manual, it is horrendously broken.
+
+* Mon Oct 12 1998 Michael Maher <mike at redhat.com>
+- built package for 5.2
+- pressured by QA, not updating.
 
+* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
+- repackaged for PowerTools



From fedora-extras-commits at redhat.com  Mon Jan  2 09:34:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 04:34:21 -0500
Subject: rpms/wine/FC-3 branch,1.2,1.3
Message-ID: <200601020934.k029YrJV029188@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29171

Modified Files:
	branch 
Log Message:
- fix branch



Index: branch
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/branch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- branch	2 Jan 2006 09:31:09 -0000	1.2
+++ branch	2 Jan 2006 09:34:20 -0000	1.3
@@ -1 +1 @@
-FC-4
+FC-3



From fedora-extras-commits at redhat.com  Mon Jan  2 10:06:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  2 Jan 2006 05:06:13 -0500
Subject: owners owners.list,1.495,1.496
Message-ID: <200601021006.k02A6kWI030999@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30982

Modified Files:
	owners.list 
Log Message:
- add wine



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- owners.list	1 Jan 2006 17:53:17 -0000	1.495
+++ owners.list	2 Jan 2006 10:06:13 -0000	1.496
@@ -1240,6 +1240,7 @@
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wmacpi|Dockapp for laptop acpi/apm information|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:02 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:02 -0500
Subject: rpms/nautilus-actions - New directory
Message-ID: <200601021521.k02FL4cg007381@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7373/nautilus-actions

Log Message:
Directory /cvs/extras/rpms/nautilus-actions added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:08 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:08 -0500
Subject: rpms/nautilus-actions/devel - New directory
Message-ID: <200601021521.k02FLAkU007396@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7373/nautilus-actions/devel

Log Message:
Directory /cvs/extras/rpms/nautilus-actions/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:20 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:20 -0500
Subject: rpms/nautilus-actions Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601021521.k02FLMl0007430@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418

Added Files:
	Makefile import.log 
Log Message:
Setup of module nautilus-actions


--- NEW FILE Makefile ---
# Top level Makefile for module nautilus-actions
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:26 -0500
Subject: rpms/nautilus-actions/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601021521.k02FLS3U007450@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7418/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nautilus-actions


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:47 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:47 -0500
Subject: rpms/nautilus-actions import.log,1.1,1.2
Message-ID: <200601021522.k02FMJ8Q007518@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7484

Modified Files:
	import.log 
Log Message:
auto-import nautilus-actions-0.99-5 on branch devel from nautilus-actions-0.99-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	2 Jan 2006 15:21:20 -0000	1.1
+++ import.log	2 Jan 2006 15:21:46 -0000	1.2
@@ -0,0 +1 @@
+nautilus-actions-0_99-5:HEAD:nautilus-actions-0.99-5.src.rpm:1136215211



From fedora-extras-commits at redhat.com  Mon Jan  2 15:21:52 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:21:52 -0500
Subject: rpms/nautilus-actions/devel nautilus-actions.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601021522.k02FMPlu007522@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7484/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nautilus-actions.spec 
Log Message:
auto-import nautilus-actions-0.99-5 on branch devel from nautilus-actions-0.99-5.src.rpm


--- NEW FILE nautilus-actions.spec ---
Summary: Nautilus extension for customizing the context menu
Name:    nautilus-actions
Version: 0.99
Release: 5
Group:   User Interface/Desktops
License: GPL
URL:     http://www.grumz.net/node/8
Source0: http://www.grumz.net/download/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel, libglade2-devel, nautilus
BuildRequires: e2fsprogs-devel
BuildRequires: desktop-file-utils
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2

%description
Nautilus actions is an extension for Nautilus, the GNOME file manager.
It provides an easy way to configure programs to be launch on files 
selected in Nautilus interface

%prep
%setup -q

%build
%configure --disable-schemas-install --enable-commandline-tool
make %{?_smp_mflags} 

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

cp -pr %{buildroot}/%{_datadir}/{nautilus-actions/nact,pixmaps}/nautilus-actions-icon.png

rm -rf %{buildroot}/%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.la
rm -rf %{buildroot}%{_datadir}/applications/fedora-nact.desktop

desktop-file-install --delete-original                   \
        --vendor fedora                                  \
        --dir %{buildroot}%{_datadir}/applications       \
	--mode 0644				         \
        --add-category X-Fedora                          \
        %{buildroot}%{_datadir}/applications/nact.desktop

%find_lang %{name}

%clean
rm -rf %{buildroot}

%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/config_newaction.schemas >/dev/null || :
    killall -HUP gconfd-2 || :
fi

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
  %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
killall -HUP gconfd-2 || :

%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/config_newaction.schemas > /dev/null || :
    gconftool-2 --recursive-unset /apps/nautilus-actions
    gconftool-2 --recursive-unset /schemas/apps/nautilus-actions
    killall -HUP gconfd-2 || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/nautilus-actions-config
%{_bindir}/nautilus-actions-convert
%{_bindir}/nautilus-actions-new-config
%{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so
%{_datadir}/%{name}/
%{_datadir}/applications/fedora-nact.desktop
%{_datadir}/pixmaps/nautilus-actions-icon.png
%config %{_sysconfdir}/gconf/schemas/config_newaction.schemas

%changelog
* Sun Jan 1 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-5
- Remove libXdmcp-devel as BR, nautilus now takkes care of it

* Sun Dec 18 2005 Deji Akingunola <dakingun at gmail.com> - 0.99-4
- Remove libSM-devel from build require as libgnomeui now build-requires
- Add libXdmcp-devel to the build requires

* Tue Nov 29 2005 Deji Akingunola <dakingun at gmail.com> - 0.99-2
- Remove unnecesary configure options
- Clean-up the desktop file installation
- Add e2fsprogs-devel buildrequire and remove explicit require on nautilus

* Fri Nov 25 2005 Deji Akingunola <dakingun at gmail.com> - 0.99-1
- initial Extras release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	2 Jan 2006 15:21:25 -0000	1.1
+++ .cvsignore	2 Jan 2006 15:21:52 -0000	1.2
@@ -0,0 +1 @@
+nautilus-actions-0.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	2 Jan 2006 15:21:25 -0000	1.1
+++ sources	2 Jan 2006 15:21:52 -0000	1.2
@@ -0,0 +1 @@
+682d452e4b05c77b5a258c7ec49634bc  nautilus-actions-0.99.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 15:30:50 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 10:30:50 -0500
Subject: owners owners.list,1.496,1.497
Message-ID: <200601021531.k02FVN20007603@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7582

Modified Files:
	owners.list 
Log Message:
Adding nautilus-actions



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -r1.496 -r1.497
--- owners.list	2 Jan 2006 10:06:13 -0000	1.496
+++ owners.list	2 Jan 2006 15:30:50 -0000	1.497
@@ -623,6 +623,7 @@
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|nautilus-actions|Nautilus extension for customizing the context menu|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-image-converter|Nautilus extension to mass resize images|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-open-terminal|Nautilus extension for an open terminal shortcut|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan  2 16:23:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:23:35 -0500
Subject: rpms/perl-Glib/FC-3 .cvsignore, 1.4, 1.5 perl-Glib.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200601021624.k02GO8Ju009448@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9427

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Sync with FC-4 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Mar 2005 18:00:45 -0000	1.4
+++ .cvsignore	2 Jan 2006 16:23:35 -0000	1.5
@@ -1 +1 @@
-Glib-1.080.tar.gz
+Glib-1.082.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/perl-Glib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Glib.spec	8 Mar 2005 18:00:45 -0000	1.6
+++ perl-Glib.spec	2 Jan 2006 16:23:35 -0000	1.7
@@ -1,14 +1,12 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Glib
-Version:        1.080
-Release:        1
+Version:        1.082
+Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Glib/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.080.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.082.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -60,6 +58,12 @@
 
 
 %changelog
+* Mon Jun 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.082-1
+- Update to 1.082.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Tue Mar  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-1
 - Update to 1.080.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Mar 2005 18:00:45 -0000	1.4
+++ sources	2 Jan 2006 16:23:35 -0000	1.5
@@ -1 +1 @@
-b6cb2978519fc3ee882c2c4aa27cbdd1  Glib-1.080.tar.gz
+6f3c675acf177763f51394b7e087d507  Glib-1.082.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:28:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:28:38 -0500
Subject: rpms/perl-Gtk2/FC-3 .cvsignore, 1.4, 1.5 perl-Gtk2.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200601021629.k02GTArh009521@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9500

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Sync with FC-4 branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Mar 2005 18:28:36 -0000	1.4
+++ .cvsignore	2 Jan 2006 16:28:37 -0000	1.5
@@ -1 +1 @@
-Gtk2-1.080.tar.gz
+Gtk2-1.083.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/perl-Gtk2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Gtk2.spec	10 Mar 2005 22:51:33 -0000	1.6
+++ perl-Gtk2.spec	2 Jan 2006 16:28:37 -0000	1.7
@@ -1,20 +1,18 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Gtk2
-Version:        1.080
-Release:        2
+Version:        1.083
+Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Gtk2/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-1.080.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Gtk2-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.080
+BuildRequires:  gtk2-devel, perl-Glib >= 1.082
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.080
+Requires:       perl-Glib >= 1.082
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -30,7 +28,6 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -62,6 +59,15 @@
 
 
 %changelog
+* Fri Jul 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.083-1
+- Update to 1.083.
+
+* Mon Jun 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.082-1
+- Update to 1.082.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Thu Mar 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.080-2
 - Use perl-Glib for versioning control (patch by Ville Skytt??).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Mar 2005 18:28:36 -0000	1.4
+++ sources	2 Jan 2006 16:28:37 -0000	1.5
@@ -1 +1 @@
-fa9bf175f72291ae7d843912fed4651a  Gtk2-1.080.tar.gz
+4ccec16a8a87bbf0b058c92ac44d60ae  Gtk2-1.083.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:31:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:31:59 -0500
Subject: rpms/perl-Glib/FC-4 .cvsignore, 1.5, 1.6 perl-Glib.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200601021632.k02GWV0J009598@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9575

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
Sync with devel branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Jun 2005 16:17:41 -0000	1.5
+++ .cvsignore	2 Jan 2006 16:31:57 -0000	1.6
@@ -1 +1 @@
-Glib-1.082.tar.gz
+Glib-1.102.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/perl-Glib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Glib.spec	27 Jun 2005 16:17:41 -0000	1.9
+++ perl-Glib.spec	2 Jan 2006 16:31:57 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           perl-Glib
-Version:        1.082
+Version:        1.102
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://search.cpan.org/dist/Glib/
-Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-1.082.tar.gz
+Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Glib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
@@ -28,7 +28,6 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -41,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +57,15 @@
 
 
 %changelog
+* Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
+- Update to 1.102.
+
+* Thu Oct  6 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.101-1
+- Update to 1.101.
+
+* Thu Sep  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.100-1
+- Update to 1.100.
+
 * Mon Jun 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.082-1
 - Update to 1.082.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jun 2005 16:17:41 -0000	1.5
+++ sources	2 Jan 2006 16:31:58 -0000	1.6
@@ -1 +1 @@
-6f3c675acf177763f51394b7e087d507  Glib-1.082.tar.gz
+d49aa86f0c77f04c0a196414ba0a27fa  Glib-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:35:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  2 Jan 2006 11:35:09 -0500
Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.6, 1.7 perl-Gtk2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200601021635.k02GZfOr009677@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9647

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Sync with devel branch


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	29 Jul 2005 19:27:35 -0000	1.6
+++ .cvsignore	2 Jan 2006 16:35:08 -0000	1.7
@@ -1 +1 @@
-Gtk2-1.083.tar.gz
+Gtk2-1.102.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Gtk2.spec	29 Jul 2005 19:27:35 -0000	1.10
+++ perl-Gtk2.spec	2 Jan 2006 16:35:08 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Gtk2
-Version:        1.083
+Version:        1.102
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -10,9 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.082
+BuildRequires:  gtk2-devel, perl-Glib >= 1.102
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.082
+Requires:       perl-Glib >= 1.102
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -40,7 +40,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 # Testing requires X
 %{?_with_tests:make test}
 
@@ -59,6 +59,15 @@
 
 
 %changelog
+* Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
+- Update to 1.102.
+
+* Thu Oct  6 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.101-1
+- Update to 1.101.
+
+* Thu Sep  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.100-1
+- Update to 1.100.
+
 * Fri Jul 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.083-1
 - Update to 1.083.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Jul 2005 19:27:35 -0000	1.6
+++ sources	2 Jan 2006 16:35:08 -0000	1.7
@@ -1 +1 @@
-4ccec16a8a87bbf0b058c92ac44d60ae  Gtk2-1.083.tar.gz
+8bd7173c8a2b6b8baf2fa3c3d48d4bb5  Gtk2-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:41:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Jan 2006 11:41:36 -0500
Subject: rpms/perl-Module-Signature/FC-4 .cvsignore, 1.3,
	1.4 perl-Module-Signature.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200601021642.k02Gg8rD009756@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9718/FC-4

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
- 0.51.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2005 16:10:12 -0000	1.3
+++ .cvsignore	2 Jan 2006 16:41:35 -0000	1.4
@@ -1 +1 @@
-Module-Signature-0.50.tar.gz
+Module-Signature-0.51.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/perl-Module-Signature.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Signature.spec	22 Aug 2005 16:10:12 -0000	1.3
+++ perl-Module-Signature.spec	2 Jan 2006 16:41:35 -0000	1.4
@@ -2,7 +2,7 @@
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
 Name:           perl-Module-Signature
-Version:        0.50
+Version:        0.51
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
+- 0.51.
+
 * Mon Aug 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-1
 - 0.50.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2005 16:10:12 -0000	1.3
+++ sources	2 Jan 2006 16:41:35 -0000	1.4
@@ -1 +1 @@
-3dd8abcf67f4fa5c85d898267e3cad53  Module-Signature-0.50.tar.gz
+c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 16:41:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon,  2 Jan 2006 11:41:41 -0500
Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.4,
	1.5 perl-Module-Signature.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601021642.k02GgEiF009765@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9718/devel

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
- 0.51.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Aug 2005 16:10:13 -0000	1.4
+++ .cvsignore	2 Jan 2006 16:41:41 -0000	1.5
@@ -1 +1 @@
-Module-Signature-0.50.tar.gz
+Module-Signature-0.51.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Module-Signature.spec	22 Aug 2005 16:10:13 -0000	1.4
+++ perl-Module-Signature.spec	2 Jan 2006 16:41:41 -0000	1.5
@@ -2,7 +2,7 @@
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
 Name:           perl-Module-Signature
-Version:        0.50
+Version:        0.51
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
+- 0.51.
+
 * Mon Aug 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.50-1
 - 0.50.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Aug 2005 16:10:13 -0000	1.4
+++ sources	2 Jan 2006 16:41:41 -0000	1.5
@@ -1 +1 @@
-3dd8abcf67f4fa5c85d898267e3cad53  Module-Signature-0.50.tar.gz
+c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  2 18:46:47 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 2 Jan 2006 13:46:47 -0500
Subject: rpms/scponly/devel scponly-4.3-optreset.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 scponly.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601021846.k02IklXq013398@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/scponly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13387

Modified Files:
	.cvsignore scponly.spec sources 
Added Files:
	scponly-4.3-optreset.patch 
Log Message:
4.3 security update


scponly-4.3-optreset.patch:

--- NEW FILE scponly-4.3-optreset.patch ---
http://bugs.gentoo.org/show_bug.cgi?id=116526#c11

--- helper.c.orig	2005-12-23 06:08:59.000000000 +0100
+++ helper.c	2005-12-28 10:51:29.000000000 +0100
@@ -39,7 +39,9 @@
 
 extern char *optarg;
 extern int optind;
+#ifdef HAVE_OPTRESET
 extern int optreset;
+#endif
 
 #ifdef UNIX_COMPAT
 char* solaris_needs_strsep(char** str, char* delims)
@@ -160,8 +162,14 @@
 				 *	now use getopt to look for our problem option
 				 */
 #ifdef HAVE_GETOPT
+#ifdef HAVE_OPTRESET
 				optreset=1;
+#endif
+#ifdef __GLIBC__
+				optind=0;
+#else
 				optind=1;
+#endif
 				/*
 				 *	tell getopt to only be strict if the 'opts' is well defined
 				 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scponly/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 16:06:31 -0000	1.2
+++ .cvsignore	2 Jan 2006 18:46:47 -0000	1.3
@@ -1 +1 @@
-scponly-4.1.tgz
+scponly-4.3.tgz


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/devel/scponly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scponly.spec	3 Nov 2005 16:06:32 -0000	1.1
+++ scponly.spec	2 Jan 2006 18:46:47 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-4.3-optreset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -45,6 +47,10 @@
 %{_bindir}/scponly
 
 %changelog
+* Mon Jan 02 2006 Warren Togami <wtogami at redhat.com> - 4.3-1
+- security fixes
+- Gentoo's patch for optreset which is not supplied by glibc
+
 * Thu Nov 03 2005 Warren Togami <wtogami at redhat.com> - 4.1-6
 - use macro in substitution
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scponly/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 16:06:32 -0000	1.2
+++ sources	2 Jan 2006 18:46:47 -0000	1.3
@@ -1 +1 @@
-32e4b87dc46c78573010c1146e9744f0  scponly-4.1.tgz
+2cef26fe5ed740031a067f189c293e77  scponly-4.3.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 18:48:07 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 2 Jan 2006 13:48:07 -0500
Subject: rpms/scponly/FC-3 scponly-4.3-optreset.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 scponly.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601021848.k02Im7tQ013516@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/scponly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13505

Modified Files:
	.cvsignore scponly.spec sources 
Added Files:
	scponly-4.3-optreset.patch 
Log Message:
4.3 security update


scponly-4.3-optreset.patch:

--- NEW FILE scponly-4.3-optreset.patch ---
http://bugs.gentoo.org/show_bug.cgi?id=116526#c11

--- helper.c.orig	2005-12-23 06:08:59.000000000 +0100
+++ helper.c	2005-12-28 10:51:29.000000000 +0100
@@ -39,7 +39,9 @@
 
 extern char *optarg;
 extern int optind;
+#ifdef HAVE_OPTRESET
 extern int optreset;
+#endif
 
 #ifdef UNIX_COMPAT
 char* solaris_needs_strsep(char** str, char* delims)
@@ -160,8 +162,14 @@
 				 *	now use getopt to look for our problem option
 				 */
 #ifdef HAVE_GETOPT
+#ifdef HAVE_OPTRESET
 				optreset=1;
+#endif
+#ifdef __GLIBC__
+				optind=0;
+#else
 				optind=1;
+#endif
 				/*
 				 *	tell getopt to only be strict if the 'opts' is well defined
 				 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 16:06:31 -0000	1.2
+++ .cvsignore	2 Jan 2006 18:48:07 -0000	1.3
@@ -1 +1 @@
-scponly-4.1.tgz
+scponly-4.3.tgz


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/scponly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scponly.spec	3 Nov 2005 16:06:32 -0000	1.1
+++ scponly.spec	2 Jan 2006 18:48:07 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-4.3-optreset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -45,6 +47,10 @@
 %{_bindir}/scponly
 
 %changelog
+* Mon Jan 02 2006 Warren Togami <wtogami at redhat.com> - 4.3-1
+- security fixes
+- Gentoo's patch for optreset which is not supplied by glibc
+
 * Thu Nov 03 2005 Warren Togami <wtogami at redhat.com> - 4.1-6
 - use macro in substitution
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 16:06:32 -0000	1.2
+++ sources	2 Jan 2006 18:48:07 -0000	1.3
@@ -1 +1 @@
-32e4b87dc46c78573010c1146e9744f0  scponly-4.1.tgz
+2cef26fe5ed740031a067f189c293e77  scponly-4.3.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 18:48:42 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Mon, 2 Jan 2006 13:48:42 -0500
Subject: rpms/scponly/FC-4 scponly-4.3-optreset.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 scponly.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601021848.k02ImgDM013567@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/rpms/scponly/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13556

Modified Files:
	.cvsignore scponly.spec sources 
Added Files:
	scponly-4.3-optreset.patch 
Log Message:
4.3 security update


scponly-4.3-optreset.patch:

--- NEW FILE scponly-4.3-optreset.patch ---
http://bugs.gentoo.org/show_bug.cgi?id=116526#c11

--- helper.c.orig	2005-12-23 06:08:59.000000000 +0100
+++ helper.c	2005-12-28 10:51:29.000000000 +0100
@@ -39,7 +39,9 @@
 
 extern char *optarg;
 extern int optind;
+#ifdef HAVE_OPTRESET
 extern int optreset;
+#endif
 
 #ifdef UNIX_COMPAT
 char* solaris_needs_strsep(char** str, char* delims)
@@ -160,8 +162,14 @@
 				 *	now use getopt to look for our problem option
 				 */
 #ifdef HAVE_GETOPT
+#ifdef HAVE_OPTRESET
 				optreset=1;
+#endif
+#ifdef __GLIBC__
+				optind=0;
+#else
 				optind=1;
+#endif
 				/*
 				 *	tell getopt to only be strict if the 'opts' is well defined
 				 */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 16:06:31 -0000	1.2
+++ .cvsignore	2 Jan 2006 18:48:42 -0000	1.3
@@ -1 +1 @@
-scponly-4.1.tgz
+scponly-4.3.tgz


Index: scponly.spec
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-4/scponly.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scponly.spec	3 Nov 2005 16:06:32 -0000	1.1
+++ scponly.spec	2 Jan 2006 18:48:42 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Restricted shell for ssh based file services
 Name: scponly
-Version: 4.1
-Release: 6%{?dist}
+Version: 4.3
+Release: 1%{?dist}
 License: BSD
 Group: Applications/Internet
 URL: http://sublimation.org/scponly/
 Source: http://sublimation.org/scponly/scponly-%{version}.tgz
+Patch0: scponly-4.3-optreset.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Checks only for location of binaries
@@ -20,6 +21,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -45,6 +47,10 @@
 %{_bindir}/scponly
 
 %changelog
+* Mon Jan 02 2006 Warren Togami <wtogami at redhat.com> - 4.3-1
+- security fixes
+- Gentoo's patch for optreset which is not supplied by glibc
+
 * Thu Nov 03 2005 Warren Togami <wtogami at redhat.com> - 4.1-6
 - use macro in substitution
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scponly/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 16:06:32 -0000	1.2
+++ sources	2 Jan 2006 18:48:42 -0000	1.3
@@ -1 +1 @@
-32e4b87dc46c78573010c1146e9744f0  scponly-4.1.tgz
+2cef26fe5ed740031a067f189c293e77  scponly-4.3.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 21:40:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  2 Jan 2006 16:40:02 -0500
Subject: rpms/xforms/devel xforms-1.0.90-prelink.patch, NONE, 1.1 xforms.spec,
	1.13, 1.14
Message-ID: <200601022140.k02LeYEu019028@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19006

Modified Files:
	xforms.spec 
Added Files:
	xforms-1.0.90-prelink.patch 
Log Message:
* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
- prelink.patch: fix undefined symbols in (shared) lib(s)


xforms-1.0.90-prelink.patch:

--- NEW FILE xforms-1.0.90-prelink.patch ---
--- xforms-1.0.90/fd2ps/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.in	2006-01-02 15:18:01.000000000 -0600
@@ -115,7 +115,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/fd2ps/Makefile.am.prelink	2003-11-13 15:46:47.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.am	2006-01-02 15:18:10.000000000 -0600
@@ -16,7 +16,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/image/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/image/Makefile.in	2006-01-02 15:05:52.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/image/Makefile.am.prelink	2003-11-13 15:46:48.000000000 -0600
+++ xforms-1.0.90/image/Makefile.am	2006-01-02 15:05:50.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/gl/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.in	2006-01-02 15:04:24.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/gl/Makefile.am.prelink	2003-11-20 03:33:11.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.am	2006-01-02 15:04:20.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/demos/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.in	2006-01-02 15:07:41.000000000 -0600
@@ -206,7 +206,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -263,12 +263,12 @@
 
 gl_SOURCES = gl.c
 gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 glwin_SOURCES = glwin.c
 glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 goodies_SOURCES = goodies.c
@@ -276,7 +276,7 @@
 
 ibrowser_SOURCES = ibrowser.c
 ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -284,7 +284,7 @@
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -295,7 +295,7 @@
 
 itest_SOURCES = itest.c
 itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -304,7 +304,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -355,7 +355,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
--- xforms-1.0.90/demos/Makefile.am.prelink	2004-02-24 09:42:43.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.am	2006-01-02 15:19:03.000000000 -0600
@@ -105,7 +105,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -168,11 +168,11 @@
 
 gl_SOURCES = gl.c
 gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 glwin_SOURCES = glwin.c
 glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 goodies_SOURCES = goodies.c
 group_SOURCES = group.c
@@ -180,14 +180,14 @@
 ibrowser_SOURCES = ibrowser.c
 ibrowser.$(OBJEXT): fd/ibrowser_gui.c
 ibrowser_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 iconify_SOURCES = iconify.c
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 inputall_SOURCES = inputall.c
@@ -199,7 +199,7 @@
 itest_SOURCES = itest.c
 itest.$(OBJEXT): fd/is_gui.c
 itest_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 lalign_SOURCES = lalign.c
@@ -207,7 +207,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 longlabel_SOURCES = longlabel.c
@@ -260,7 +260,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 yesno_SOURCES = yesno.c
--- xforms-1.0.90/lib/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.in	2006-01-02 14:52:11.000000000 -0600
@@ -116,7 +116,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \
--- xforms-1.0.90/lib/Makefile.am.prelink	2003-11-20 03:33:16.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.am	2006-01-02 14:52:19.000000000 -0600
@@ -17,7 +17,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \


Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xforms.spec	19 Dec 2005 21:17:13 -0000	1.13
+++ xforms.spec	2 Jan 2006 21:40:01 -0000	1.14
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -11,6 +11,9 @@
 Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# TODO: remove -lc (all), -lm (most) linker steps
+Patch1: xforms-1.0.90-prelink.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: libGL-devel
 %if "%{?fedora}" > "4"
@@ -46,6 +49,8 @@
 
 %setup -q
 
+%patch1 -p1 -b .prelink
+
 
 %build
 
@@ -53,7 +58,8 @@
   --disable-static \
   --enable-optimization="$RPM_OPT_FLAGS"
 
-make %{?_smp_mflags} 
+make %{?_smp_mflags} \
+  X_PRE_LIBS=''
 
 
 %install
@@ -88,6 +94,9 @@
 
 
 %changelog 
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
+- prelink.patch: fix undefined symbols in (shared) lib(s)
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
 - BR: libXpm-devel
 - -devel: Req: libX11-devel 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:10:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:10:55 -0500
Subject: rpms/pl/FC-4 pl-5.6.0-multilib.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 pl.spec, 1.16, 1.17 sources, 1.4, 1.5
Message-ID: <200601022211.k02MBSEj021064@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21025

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.0-multilib.patch 
Log Message:
new version 5.6.0

pl-5.6.0-multilib.patch:

--- NEW FILE pl-5.6.0-multilib.patch ---
--- pl-5.6.0/src/rc/Makefile.in.multilib	2006-01-02 22:43:19.000000000 +0100
+++ pl-5.6.0/src/rc/Makefile.in	2006-01-02 22:43:46.000000000 +0100
@@ -18,7 +18,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=$(exec_prefix)/bin
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 man_prefix=$(prefix)/man
 mansec=1
 lmansec=3
--- pl-5.6.0/src/configure.multilib	2006-01-02 22:41:36.000000000 +0100
+++ pl-5.6.0/src/configure	2006-01-02 22:41:59.000000000 +0100
@@ -2546,7 +2546,7 @@
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
-PLBASE=$prefix/lib/$PL-$PLVERSION
+PLBASE=$libdir/$PL-$PLVERSION
 
 
 for ac_prog in gmake make
--- pl-5.6.0/src/Makefile.in.multilib	2006-01-02 22:42:12.000000000 +0100
+++ pl-5.6.0/src/Makefile.in	2006-01-02 22:42:46.000000000 +0100
@@ -46,7 +46,8 @@
 PLVERSION=@PLVERSION@
 PL=@PL@@RT@
 PLV=@PL@@RT at -@PLVERSION@
-PLBASE=$(prefix)/lib/@PL@@RT at -@PLVERSION@
+libdir=@libdir@
+PLBASE=$(libdir)/@PL@@RT at -@PLVERSION@
 BOOTFILE=@BOOTFILE@
 
 CC=@CC@
--- pl-5.6.0/packages/Makefile.in.multilib	2006-01-02 22:39:53.000000000 +0100
+++ pl-5.6.0/packages/Makefile.in	2006-01-02 22:41:19.000000000 +0100
@@ -30,7 +30,8 @@
 bindir=@bindir@
 PL=@PL@@RT@
 PLVERSION=@PLVERSION@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 PKGDOC=$(PLBASE)/doc/packages
 PLLIBS=@LIBS@
 PLARCH=@ARCH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 19:47:37 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:10:54 -0000	1.5
@@ -1,3 +1,3 @@
-pl-5.4.7.tar.gz
 HTMLmanual.tar.gz
+pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pl.spec	22 Jun 2005 19:47:37 -0000	1.16
+++ pl.spec	2 Jan 2006 22:10:54 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.4.7
+Version:	5.6.0
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,19 +7,18 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
-Patch0:		pl-5.4.6-rpath.patch
-Patch1:		pl-5.4.6-multilib.patch
-Patch2:		pl-5.4.6-visibilityabuse.patch
-Patch3:		pl-5.4.7-gcc4fix.patch
+Patch0:         pl-5.4.6-rpath.patch
+Patch1:         pl-5.6.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:	libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
+BuildRequires:  xorg-x11-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -29,12 +28,11 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .visibilityabuse
-%patch3 -p1 -b .gcc4fix
 (
    mkdir doc-install
    cd doc-install
@@ -42,6 +40,7 @@
    tar zxf %{SOURCE2}
 )
 
+
 %build
 %configure
 make COFLAGS="$RPM_OPT_FLAGS"
@@ -51,6 +50,7 @@
 make COFLAGS="$RPM_OPT_FLAGS"
 cd ..
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
@@ -67,9 +67,11 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
@@ -79,9 +81,13 @@
 %{_libdir}/pl*
 %{_bindir}/*
 
+
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
+- new version 5.6.0
+
 * Wed Jun 22 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.7-1
-- New Version 5.4.7
+- new version 5.4.7
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.4.6-9
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2005 19:47:37 -0000	1.4
+++ sources	2 Jan 2006 22:10:54 -0000	1.5
@@ -1,3 +1,3 @@
-5c57c9a752bd3c6f56e4ae506ab23726  pl-5.4.7.tar.gz
-e93a7d6ed002750f38dd3ae83f6e0fa8  HTMLmanual.tar.gz
-fbe3c4102f897fbfcadeb1cc94603dfa  userguide.html.tgz
+6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
+ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
+72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 22:25:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:25:57 -0500
Subject: rpms/pl/FC-3 pl-5.6.0-multilib.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 pl.spec, 1.13, 1.14 sources, 1.3, 1.4
Message-ID: <200601022226.k02MQTdc021185@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21161

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.0-multilib.patch 
Log Message:
new version 5.6.0

pl-5.6.0-multilib.patch:

--- NEW FILE pl-5.6.0-multilib.patch ---
--- pl-5.6.0/src/rc/Makefile.in.multilib	2006-01-02 22:43:19.000000000 +0100
+++ pl-5.6.0/src/rc/Makefile.in	2006-01-02 22:43:46.000000000 +0100
@@ -18,7 +18,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=$(exec_prefix)/bin
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 man_prefix=$(prefix)/man
 mansec=1
 lmansec=3
--- pl-5.6.0/src/configure.multilib	2006-01-02 22:41:36.000000000 +0100
+++ pl-5.6.0/src/configure	2006-01-02 22:41:59.000000000 +0100
@@ -2546,7 +2546,7 @@
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
-PLBASE=$prefix/lib/$PL-$PLVERSION
+PLBASE=$libdir/$PL-$PLVERSION
 
 
 for ac_prog in gmake make
--- pl-5.6.0/src/Makefile.in.multilib	2006-01-02 22:42:12.000000000 +0100
+++ pl-5.6.0/src/Makefile.in	2006-01-02 22:42:46.000000000 +0100
@@ -46,7 +46,8 @@
 PLVERSION=@PLVERSION@
 PL=@PL@@RT@
 PLV=@PL@@RT at -@PLVERSION@
-PLBASE=$(prefix)/lib/@PL@@RT at -@PLVERSION@
+libdir=@libdir@
+PLBASE=$(libdir)/@PL@@RT at -@PLVERSION@
 BOOTFILE=@BOOTFILE@
 
 CC=@CC@
--- pl-5.6.0/packages/Makefile.in.multilib	2006-01-02 22:39:53.000000000 +0100
+++ pl-5.6.0/packages/Makefile.in	2006-01-02 22:41:19.000000000 +0100
@@ -30,7 +30,8 @@
 bindir=@bindir@
 PL=@PL@@RT@
 PLVERSION=@PLVERSION@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 PKGDOC=$(PLBASE)/doc/packages
 PLLIBS=@LIBS@
 PLARCH=@ARCH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 02:19:11 -0000	1.3
+++ .cvsignore	2 Jan 2006 22:25:57 -0000	1.4
@@ -1,3 +1,3 @@
 HTMLmanual.tar.gz
-pl-5.4.6.tar.gz
+pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/pl.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pl.spec	23 Feb 2005 16:04:06 -0000	1.13
+++ pl.spec	2 Jan 2006 22:25:57 -0000	1.14
@@ -1,23 +1,24 @@
 Name:		pl
-Version:	5.4.6
-Release:	7
+Version:	5.6.0
+Release:	1%{?dist}
+
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.6.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
-Patch:		pl-5.4.6-rpath.patch
-Patch1:		pl-5.4.6-multilib.patch
-Patch2:		pl-5.4.6-visibilityabuse.patch
+Patch0:         pl-5.4.6-rpath.patch
+Patch1:         pl-5.6.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:	libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
+BuildRequires:  xorg-x11-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -29,9 +30,8 @@
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .vis
 (
    mkdir doc-install
    cd doc-install
@@ -77,6 +77,18 @@
 %{_bindir}/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
+- new version 5.6.0
+
+* Wed Jun 22 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.7-1
+- new version 5.4.7
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.4.6-9
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Wed Feb 23 2005 David Woodhouse <dwmw2 at infradead.org> - 5.4.6-7
 - Fix visibility abuse. This may well fix x86_64 too, so re-enable that.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 02:16:37 -0000	1.3
+++ sources	2 Jan 2006 22:25:57 -0000	1.4
@@ -1,3 +1,3 @@
-e93a7d6ed002750f38dd3ae83f6e0fa8  HTMLmanual.tar.gz
-f4977a5b24e07f3ef67d805c1773dc2c  pl-5.4.6.tar.gz
-fbe3c4102f897fbfcadeb1cc94603dfa  userguide.html.tgz
+6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
+ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
+72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 22:29:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:29:21 -0500
Subject: rpms/pl/devel pl-5.6.0-multilib.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 pl.spec, 1.18, 1.19 sources, 1.4, 1.5
Message-ID: <200601022229.k02MTrp1021259@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21235

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.0-multilib.patch 
Log Message:
new version 5.6.0

pl-5.6.0-multilib.patch:

--- NEW FILE pl-5.6.0-multilib.patch ---
--- pl-5.6.0/src/rc/Makefile.in.multilib	2006-01-02 22:43:19.000000000 +0100
+++ pl-5.6.0/src/rc/Makefile.in	2006-01-02 22:43:46.000000000 +0100
@@ -18,7 +18,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=$(exec_prefix)/bin
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 man_prefix=$(prefix)/man
 mansec=1
 lmansec=3
--- pl-5.6.0/src/configure.multilib	2006-01-02 22:41:36.000000000 +0100
+++ pl-5.6.0/src/configure	2006-01-02 22:41:59.000000000 +0100
@@ -2546,7 +2546,7 @@
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
-PLBASE=$prefix/lib/$PL-$PLVERSION
+PLBASE=$libdir/$PL-$PLVERSION
 
 
 for ac_prog in gmake make
--- pl-5.6.0/src/Makefile.in.multilib	2006-01-02 22:42:12.000000000 +0100
+++ pl-5.6.0/src/Makefile.in	2006-01-02 22:42:46.000000000 +0100
@@ -46,7 +46,8 @@
 PLVERSION=@PLVERSION@
 PL=@PL@@RT@
 PLV=@PL@@RT at -@PLVERSION@
-PLBASE=$(prefix)/lib/@PL@@RT at -@PLVERSION@
+libdir=@libdir@
+PLBASE=$(libdir)/@PL@@RT at -@PLVERSION@
 BOOTFILE=@BOOTFILE@
 
 CC=@CC@
--- pl-5.6.0/packages/Makefile.in.multilib	2006-01-02 22:39:53.000000000 +0100
+++ pl-5.6.0/packages/Makefile.in	2006-01-02 22:41:19.000000000 +0100
@@ -30,7 +30,8 @@
 bindir=@bindir@
 PL=@PL@@RT@
 PLVERSION=@PLVERSION@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 PKGDOC=$(PLBASE)/doc/packages
 PLLIBS=@LIBS@
 PLARCH=@ARCH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 19:48:03 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:29:20 -0000	1.5
@@ -1,3 +1,3 @@
-pl-5.4.7.tar.gz
 HTMLmanual.tar.gz
+pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pl.spec	15 Nov 2005 19:18:21 -0000	1.18
+++ pl.spec	2 Jan 2006 22:29:20 -0000	1.19
@@ -1,22 +1,30 @@
 Name:		pl
-Version:	5.4.7
-Release:	3%{?dist}
+Version:	5.6.0
+Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
-Patch0:		pl-5.4.6-rpath.patch
-Patch1:		pl-5.4.6-multilib.patch
-Patch2:		pl-5.4.6-visibilityabuse.patch
-Patch3:		pl-5.4.7-gcc4fix.patch
+Patch0:         pl-5.4.6-rpath.patch
+Patch1:         pl-5.6.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:	libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
+Buildrequires:  freetype-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libX11-devel
+BuildRequires:  libXaw-devel
+BuildRequires:  libXext-devel
+BuildRequires:  libXft-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXrender-devel
+BuildRequires:  libXt-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
 #ExcludeArch: x86_64
@@ -33,8 +41,6 @@
 %setup -q
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .visibilityabuse
-%patch3 -p1 -b .gcc4fix
 (
    mkdir doc-install
    cd doc-install
@@ -80,8 +86,11 @@
 %{_bindir}/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
+- new version 5.6.0
+
 * Wed Jun 22 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.7-1
-- New Version 5.4.7
+- new version 5.4.7
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.4.6-9
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2005 19:48:03 -0000	1.4
+++ sources	2 Jan 2006 22:29:20 -0000	1.5
@@ -1,3 +1,3 @@
-5c57c9a752bd3c6f56e4ae506ab23726  pl-5.4.7.tar.gz
-e93a7d6ed002750f38dd3ae83f6e0fa8  HTMLmanual.tar.gz
-fbe3c4102f897fbfcadeb1cc94603dfa  userguide.html.tgz
+6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
+ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
+72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Mon Jan  2 22:41:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:41:57 -0500
Subject: rpms/tkcvs/FC-4 tkcvs.spec,1.11,1.12
Message-ID: <200601022242.k02MgUM8021400@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21381

Modified Files:
	tkcvs.spec 
Log Message:
new version 8.0


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tkcvs.spec	13 Aug 2005 17:58:07 -0000	1.11
+++ tkcvs.spec	2 Jan 2006 22:41:57 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	7.2.4
+Version:	8.0
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,25 +7,40 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
 
 %description
-TkCVS is a Tcl/Tk-based graphical interface to the CVS configuration
-management system.  It displays the status of the files in the current
-working directory, and provides buttons and menus to execute CVS
-commands on the selected files. TkDiff is included for browsing and
-merging your changes.
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. TkDiff
+is included for browsing and merging your changes.
+
+TkCVS shows the status of the files in the current working directory,
+and has tools for tagging, merging, importing, exporting, checking
+in/out, and other user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the
+repository tree is browsed like an ordinary file tree. For CVS, the
+CVSROOT/modules file is read. TkCVS extends CVS with a method to
+produce a "user friendly" listing of modules. This requires special
+comments in the CVSROOT/modules file.
+
+Although TkCVS now supports Subversion, it will still work happily
+without it in your CVS directories. It didn't abandon CVS, it just
+grew some new capabilities.
+
 
 %prep
-%setup -q -n tkcvs_7_2_4
+%setup -q -n tkcvs_8_0
+
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
 perl -pi -e 's|\[file join \$TclRoot tkcvs bitmaps\]|\[file join \$TCDIR bitmaps\]|' tkcvs/tkcvs.tcl
 
+
 %install
 install -d ${RPM_BUILD_ROOT}%{_datadir}
 install -d ${RPM_BUILD_ROOT}%{_bindir}
@@ -38,11 +53,12 @@
 install -m 0755 tkdiff ${RPM_BUILD_ROOT}%{_bindir}
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
-cp -fr bitmaps ${RPM_BUILD_ROOT}%{_datadir}/tkcvs
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
@@ -50,12 +66,16 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
+- new version 8.0
+
 * Sat Aug 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.4
-- New Version 2.7.4
+- new version 7.2.4
 
 * Tue Jul  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.3-1
-- New Version 2.7.3
+- new version 7.2.3
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan  2 22:44:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:44:03 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore,1.3,1.4 tkcvs.spec,1.8,1.9
Message-ID: <200601022244.k02MiaQx021515@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21473/FC-3

Modified Files:
	.cvsignore tkcvs.spec 
Log Message:
new version 8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:23:15 -0000	1.3
+++ .cvsignore	2 Jan 2006 22:44:03 -0000	1.4
@@ -1 +1 @@
-tkcvs_7_2_2.tar.gz
+tkcvs_7_2_4.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- tkcvs.spec	13 Aug 2005 17:58:53 -0000	1.8
+++ tkcvs.spec	2 Jan 2006 22:44:03 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	7.2.4
+Version:	8.0
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,20 +7,34 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
 
 %description
-TkCVS is a Tcl/Tk-based graphical interface to the CVS configuration
-management system.  It displays the status of the files in the current
-working directory, and provides buttons and menus to execute CVS
-commands on the selected files. TkDiff is included for browsing and
-merging your changes.
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. TkDiff
+is included for browsing and merging your changes.
+
+TkCVS shows the status of the files in the current working directory,
+and has tools for tagging, merging, importing, exporting, checking
+in/out, and other user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the
+repository tree is browsed like an ordinary file tree. For CVS, the
+CVSROOT/modules file is read. TkCVS extends CVS with a method to
+produce a "user friendly" listing of modules. This requires special
+comments in the CVSROOT/modules file.
+
+Although TkCVS now supports Subversion, it will still work happily
+without it in your CVS directories. It didn't abandon CVS, it just
+grew some new capabilities.
+
 
 %prep
-%setup -q -n tkcvs_7_2_4
+%setup -q -n tkcvs_8_0
+
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
@@ -38,7 +52,6 @@
 install -m 0755 tkdiff ${RPM_BUILD_ROOT}%{_bindir}
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
-cp -fr bitmaps ${RPM_BUILD_ROOT}%{_datadir}/tkcvs
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,11 +64,14 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
+- new version 8.0
+
 * Sat Aug 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.4
-- New Version 2.7.4
+- new version 7.2.4
 
 * Tue Jul  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.3-1
-- New Version 2.7.3
+- new version 7.2.3
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan  2 22:44:09 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:44:09 -0500
Subject: rpms/tkcvs/devel .cvsignore,1.4,1.5 tkcvs.spec,1.11,1.12
Message-ID: <200601022244.k02Mif4a021522@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21473/devel

Modified Files:
	.cvsignore tkcvs.spec 
Log Message:
new version 8.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Jul 2005 16:51:32 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:44:09 -0000	1.5
@@ -1 +1 @@
-tkcvs_7_2_3.tar.gz
+tkcvs_7_2_4.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tkcvs.spec	13 Aug 2005 17:59:07 -0000	1.11
+++ tkcvs.spec	2 Jan 2006 22:44:09 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	7.2.4
+Version:	8.0
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,20 +7,34 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_7_2_4.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
 
 %description
-TkCVS is a Tcl/Tk-based graphical interface to the CVS configuration
-management system.  It displays the status of the files in the current
-working directory, and provides buttons and menus to execute CVS
-commands on the selected files. TkDiff is included for browsing and
-merging your changes.
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. TkDiff
+is included for browsing and merging your changes.
+
+TkCVS shows the status of the files in the current working directory,
+and has tools for tagging, merging, importing, exporting, checking
+in/out, and other user operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the
+repository tree is browsed like an ordinary file tree. For CVS, the
+CVSROOT/modules file is read. TkCVS extends CVS with a method to
+produce a "user friendly" listing of modules. This requires special
+comments in the CVSROOT/modules file.
+
+Although TkCVS now supports Subversion, it will still work happily
+without it in your CVS directories. It didn't abandon CVS, it just
+grew some new capabilities.
+
 
 %prep
-%setup -q -n tkcvs_7_2_4
+%setup -q -n tkcvs_8_0
+
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
@@ -38,7 +52,6 @@
 install -m 0755 tkdiff ${RPM_BUILD_ROOT}%{_bindir}
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
-cp -fr bitmaps ${RPM_BUILD_ROOT}%{_datadir}/tkcvs
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -51,11 +64,14 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
+- new version 8.0
+
 * Sat Aug 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.4
-- New Version 2.7.4
+- new version 7.2.4
 
 * Tue Jul  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 7.2.3-1
-- New Version 2.7.3
+- new version 7.2.3
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan  2 22:48:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:48:21 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tkcvs.spec,
	1.9, 1.10
Message-ID: <200601022248.k02MmslC021642@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21584/FC-3

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2006 22:44:03 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:48:21 -0000	1.5
@@ -1 +1 @@
-tkcvs_7_2_4.tar.gz
+tkcvs_8_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Aug 2005 17:58:53 -0000	1.4
+++ sources	2 Jan 2006 22:48:21 -0000	1.5
@@ -1 +1 @@
-d5fc8adc92c197c9662512a698de62d0  tkcvs_7_2_4.tar.gz
+6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tkcvs.spec	2 Jan 2006 22:44:03 -0000	1.9
+++ tkcvs.spec	2 Jan 2006 22:48:21 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		tkcvs
 Version:	8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	TkCVS and TkDiff
 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:48:27 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:48:27 -0500
Subject: rpms/tkcvs/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tkcvs.spec, 
	1.12, 1.13
Message-ID: <200601022248.k02MmxvN021650@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21584/FC-4

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Aug 2005 17:58:07 -0000	1.5
+++ .cvsignore	2 Jan 2006 22:48:27 -0000	1.6
@@ -1 +1 @@
-tkcvs_7_2_4.tar.gz
+tkcvs_8_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Aug 2005 17:58:07 -0000	1.5
+++ sources	2 Jan 2006 22:48:27 -0000	1.6
@@ -1 +1 @@
-d5fc8adc92c197c9662512a698de62d0  tkcvs_7_2_4.tar.gz
+6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tkcvs.spec	2 Jan 2006 22:41:57 -0000	1.12
+++ tkcvs.spec	2 Jan 2006 22:48:27 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		tkcvs
 Version:	8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	TkCVS and TkDiff
 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:48:33 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:48:33 -0500
Subject: rpms/tkcvs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tkcvs.spec, 
	1.12, 1.13
Message-ID: <200601022249.k02Mn5kY021656@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21584/devel

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:44:09 -0000	1.5
+++ .cvsignore	2 Jan 2006 22:48:33 -0000	1.6
@@ -1 +1 @@
-tkcvs_7_2_4.tar.gz
+tkcvs_8_0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Aug 2005 17:59:07 -0000	1.5
+++ sources	2 Jan 2006 22:48:33 -0000	1.6
@@ -1 +1 @@
-d5fc8adc92c197c9662512a698de62d0  tkcvs_7_2_4.tar.gz
+6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tkcvs.spec	2 Jan 2006 22:44:09 -0000	1.12
+++ tkcvs.spec	2 Jan 2006 22:48:33 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		tkcvs
 Version:	8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	TkCVS and TkDiff
 



From fedora-extras-commits at redhat.com  Mon Jan  2 22:53:37 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 17:53:37 -0500
Subject: rpms/pl/devel pl.spec,1.19,1.20
Message-ID: <200601022254.k02Ms9ww021816@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21796

Modified Files:
	pl.spec 
Log Message:



Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pl.spec	2 Jan 2006 22:29:20 -0000	1.19
+++ pl.spec	2 Jan 2006 22:53:37 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		pl
 Version:	5.6.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -23,6 +23,7 @@
 BuildRequires:  libXext-devel
 BuildRequires:  libXft-devel
 BuildRequires:  libXmu-devel
+BuildRequires:  libXpm-devel
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:04:15 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:04:15 -0500
Subject: rpms/nautilus-actions/devel nautilus-actions.spec,1.1,1.2
Message-ID: <200601022304.k02N4p4Y023514@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23496

Modified Files:
	nautilus-actions.spec 
Log Message:
Add dist tag



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/devel/nautilus-actions.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-actions.spec	2 Jan 2006 15:21:52 -0000	1.1
+++ nautilus-actions.spec	2 Jan 2006 23:04:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5
+Release: 5%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8



From fedora-extras-commits at redhat.com  Mon Jan  2 23:06:35 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:06:35 -0500
Subject: rpms/nautilus-actions/FC-4 nautilus-actions.spec,1.1,1.2
Message-ID: <200601022307.k02N7ERY023575@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23558

Modified Files:
	nautilus-actions.spec 
Log Message:
Add dist tag



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/nautilus-actions.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-actions.spec	2 Jan 2006 15:21:52 -0000	1.1
+++ nautilus-actions.spec	2 Jan 2006 23:06:34 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5
+Release: 5%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8



From fedora-extras-commits at redhat.com  Mon Jan  2 23:08:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:08:26 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.1,1.2
Message-ID: <200601022309.k02N9JNV023636@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23619

Modified Files:
	nautilus-actions.spec 
Log Message:
Add dist tag



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nautilus-actions.spec	2 Jan 2006 15:21:52 -0000	1.1
+++ nautilus-actions.spec	2 Jan 2006 23:08:26 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5
+Release: 5%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8



From fedora-extras-commits at redhat.com  Mon Jan  2 23:14:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon,  2 Jan 2006 18:14:24 -0500
Subject: rpms/plt-scheme/devel plt-scheme.spec,1.20,1.21
Message-ID: <200601022314.k02NEuFL023731@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23714

Modified Files:
	plt-scheme.spec 
Log Message:



Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plt-scheme.spec	20 Dec 2005 23:36:16 -0000	1.20
+++ plt-scheme.spec	2 Jan 2006 23:14:23 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        300
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -29,6 +29,8 @@
 BuildRequires:	mesa-libGLU-devel
 BuildRequires:	xorg-x11-xbitmaps
 BuildRequires:	desktop-file-utils
+BuildRequires:  cairo-devel
+BuildRequires:  pkgconfig
 Obsoletes:	plt, drscheme
 Provides:	plt, drscheme, mzscheme, mred, mrflow
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:27:24 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:27:24 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.2,1.3
Message-ID: <200601022327.k02NRu9b023820@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23796

Modified Files:
	nautilus-actions.spec 
Log Message:
Add --with-nautilus-extdir configure option



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-actions.spec	2 Jan 2006 23:08:26 -0000	1.2
+++ nautilus-actions.spec	2 Jan 2006 23:27:23 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -23,7 +23,8 @@
 %setup -q
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool
+%configure --disable-schemas-install --enable-commandline-tool  \
+           --with-nautilus-extdir=%{_libdir}/nautilus/extensions-1.0
 make %{?_smp_mflags} 
 
 %install
@@ -84,6 +85,9 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Mon Jan 2 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-6
+- Add nautilus extensions dir to configure arguments
+
 * Sun Jan 1 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-5
 - Remove libXdmcp-devel as BR, nautilus now takkes care of it
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:30:06 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon,  2 Jan 2006 18:30:06 -0500
Subject: rpms/nautilus-actions/FC-4 nautilus-actions.spec,1.2,1.3
Message-ID: <200601022330.k02NUcaa023881@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23864

Modified Files:
	nautilus-actions.spec 
Log Message:
Add -with-nautilus-extdir to configure options



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-4/nautilus-actions.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-actions.spec	2 Jan 2006 23:06:34 -0000	1.2
+++ nautilus-actions.spec	2 Jan 2006 23:30:05 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -23,7 +23,8 @@
 %setup -q
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool
+%configure --disable-schemas-install --enable-commandline-tool \
+          --with-nautilus-extdir=%{_libdir}/nautilus/extensions-1.0 
 make %{?_smp_mflags} 
 
 %install
@@ -84,6 +85,9 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Mon Jan 2 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-6
+- Add nautilus extensions dir to configure arguments
+
 * Sun Jan 1 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-5
 - Remove libXdmcp-devel as BR, nautilus now takkes care of it
 



From fedora-extras-commits at redhat.com  Mon Jan  2 23:32:22 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon,  2 Jan 2006 18:32:22 -0500
Subject: rpms/xfce4-battery-plugin/FC-4 xfce4-battery-plugin.spec,1.1,1.2
Message-ID: <200601022332.k02NWsQ6023947@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23930

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
add libxfcegui4-devel buildreq and fix %defattr


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-4/xfce4-battery-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-battery-plugin.spec	15 Dec 2005 03:10:03 -0000	1.1
+++ xfce4-battery-plugin.spec	2 Jan 2006 23:32:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,9 +8,9 @@
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 Source1:	GPL
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -34,11 +34,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
+- Add libxfcegui4-devel BuildReqs.
+- Fix %defattr.
+
 * Sat Nov 19 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
 - Use %{?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).



From fedora-extras-commits at redhat.com  Mon Jan  2 23:33:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Mon,  2 Jan 2006 18:33:36 -0500
Subject: rpms/xfce4-battery-plugin/FC-3 xfce4-battery-plugin.spec,1.1,1.2
Message-ID: <200601022334.k02NY8EL024008@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23991

Modified Files:
	xfce4-battery-plugin.spec 
Log Message:
add libxfcegui4-devel buildreq and fix %defattr


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-3/xfce4-battery-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-battery-plugin.spec	15 Dec 2005 03:10:03 -0000	1.1
+++ xfce4-battery-plugin.spec	2 Jan 2006 23:33:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -8,9 +8,9 @@
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
 Source1:	GPL
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	xfce4-panel-devel >= 4.2, libxml2-devel
+BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -34,11 +34,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
+- Add libxfcegui4-devel BuildReqs.
+- Fix %defattr.
+
 * Sat Nov 19 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-3
 - Use %{?_smp_mflags}.
 - Replace wrong BSD license with a copy of the GPL (#173105).



From fedora-extras-commits at redhat.com  Tue Jan  3 03:48:27 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon,  2 Jan 2006 22:48:27 -0500
Subject: rpms/linkchecker import.log,1.2,1.3
Message-ID: <200601030349.k033n0Ed031189@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31156

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.2-4 on branch devel from linkchecker-3.2-4.src.rpm





From fedora-extras-commits at redhat.com  Tue Jan  3 03:53:00 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon,  2 Jan 2006 22:53:00 -0500
Subject: rpms/linkchecker import.log,1.3,1.4
Message-ID: <200601030353.k033rW09031288@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31244

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.2-5 on branch devel from linkchecker-3.2-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Jan 2006 03:48:27 -0000	1.3
+++ import.log	3 Jan 2006 03:52:59 -0000	1.4
@@ -1,2 +1,3 @@
 linkchecker-3_2-3:HEAD:linkchecker-3.2-3.src.rpm:1132802837
 linkchecker-3_2-4:HEAD:linkchecker-3.2-4.src.rpm:1136260100
+linkchecker-3_2-5:HEAD:linkchecker-3.2-5.src.rpm:1136260374



From fedora-extras-commits at redhat.com  Tue Jan  3 03:53:05 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Mon,  2 Jan 2006 22:53:05 -0500
Subject: rpms/linkchecker/devel linkchecker.spec,1.1,1.2
Message-ID: <200601030353.k033rcK7031295@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31244/devel

Modified Files:
	linkchecker.spec 
Log Message:
auto-import linkchecker-3.2-5 on branch devel from linkchecker-3.2-5.src.rpm


Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linkchecker.spec	24 Nov 2005 03:27:27 -0000	1.1
+++ linkchecker.spec	3 Jan 2006 03:53:05 -0000	1.2
@@ -4,7 +4,7 @@
 Summary: Check HTML documents for broken links
 Name: linkchecker
 Version: 3.2
-Release: 3
+Release: 5
 License: GPL
 Group: Development/Tools
 Source: http://dl.sf.net/linkchecker/linkchecker-3.2.tar.gz
@@ -12,6 +12,8 @@
 Url: http://linkchecker.sourceforge.net/
 BuildRequires: python-devel
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+# Do not have one of these to test on:
+ExcludeArch: x86_64
 
 %description
 Linkchecker is a simple script that checks HTML documents for broken links.
@@ -67,6 +69,12 @@
 %doc TODO doc/ cgi/lconline/ test/ README LICENSE
 
 %changelog
+* Sun Jan 02 2006 W. Michael Petullo <mike[at]flyn.org> - 3.2-4
+   - Bump release number to re-import.
+
+* Sun Jan 02 2006 W. Michael Petullo <mike[at]flyn.org> - 3.2-4
+   - ExcludeArch: x86_64.  I don't have one to test on.
+
 * Sun Oct 23 2005 W. Michael Petullo <mike[at]flyn.org> - 3.2-3
    - %dir appropriate directories.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 04:57:26 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  2 Jan 2006 23:57:26 -0500
Subject: rpms/deskbar-applet/devel .cvsignore, 1.6, 1.7 deskbar-applet.spec, 
	1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200601030457.k034vxpp000706@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv685

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Dec 2005 04:43:38 -0000	1.6
+++ .cvsignore	3 Jan 2006 04:57:26 -0000	1.7
@@ -1 +1 @@
-deskbar-applet-0.8.6.1.tar.bz2
+deskbar-applet-0.8.7.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- deskbar-applet.spec	13 Dec 2005 04:43:38 -0000	1.11
+++ deskbar-applet.spec	3 Jan 2006 04:57:26 -0000	1.12
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        0.8.6.1
+Version:        0.8.7
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -59,6 +59,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.7-1
+- Upstream update
+
 * Mon Dec 12 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.6.1-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Dec 2005 04:43:38 -0000	1.6
+++ sources	3 Jan 2006 04:57:26 -0000	1.7
@@ -1 +1 @@
-6a4d4169cdb568f5555e3c824a856637  deskbar-applet-0.8.6.1.tar.bz2
+6ecb74c123b66aa2874d88b5b7cfbaf6  deskbar-applet-0.8.7.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 05:04:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  3 Jan 2006 00:04:43 -0500
Subject: rpms/deskbar-applet/devel deskbar-applet-0.5.0-fedorabz.patch, 1.1, 
	NONE
Message-ID: <200601030504.k0354jZH002369@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2360

Removed Files:
	deskbar-applet-0.5.0-fedorabz.patch 
Log Message:
Obsolete patch


--- deskbar-applet-0.5.0-fedorabz.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 07:32:41 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  3 Jan 2006 02:32:41 -0500
Subject: rpms/ortp/devel ortp-0.8.1-Werror.patch, NONE, 1.1 .cvsignore, 1.3, 
	1.4 ortp.spec, 1.6, 1.7 sources, 1.3,
	1.4 ortp-0.7.1-Werror.patch, 1.1, NONE
Message-ID: <200601030733.k037XEnd005940@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ortp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914

Modified Files:
	.cvsignore ortp.spec sources 
Added Files:
	ortp-0.8.1-Werror.patch 
Removed Files:
	ortp-0.7.1-Werror.patch 
Log Message:
Upstream update

ortp-0.8.1-Werror.patch:

--- NEW FILE ortp-0.8.1-Werror.patch ---
--- ortp-0.8.1/configure.Werror	2006-01-03 02:03:58.000000000 -0500
+++ ortp-0.8.1/configure	2006-01-03 02:04:14.000000000 -0500
@@ -21310,10 +21310,6 @@
 _ACEOF
 
 
-if test $GCC = yes && test $wall_werror = yes;  then
-	CFLAGS="$CFLAGS -Werror "
-fi
-
 
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2005 23:59:14 -0000	1.3
+++ .cvsignore	3 Jan 2006 07:32:41 -0000	1.4
@@ -1 +1 @@
-ortp-0.7.1.tar.gz
+ortp-0.8.1.tar.gz


Index: ortp.spec
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/ortp.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ortp.spec	22 Dec 2005 20:18:20 -0000	1.6
+++ ortp.spec	3 Jan 2006 07:32:41 -0000	1.7
@@ -1,13 +1,13 @@
 Name:           ortp
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.8.1
+Release:        1%{?dist}
 Summary:        A C library implementing the RTP protocol (RFC3550)
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.linphone.org/ortp/
 Source0:        http://www.linphone.org/ortp/sources/%{name}-%{version}.tar.gz
-Patch0:         ortp-0.7.1-Werror.patch
+Patch0:         ortp-0.8.1-Werror.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel >= 2.0.0
@@ -53,6 +53,9 @@
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.1-1
+- Upstream update
+
 * Thu Dec 22 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.7.1-2
 - Added ortp.pc to -devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ortp/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2005 23:59:14 -0000	1.3
+++ sources	3 Jan 2006 07:32:41 -0000	1.4
@@ -1 +1 @@
-e69ba3f5a2ac76e3b6117826d0c536b2  ortp-0.7.1.tar.gz
+5d8a8da638aec3a80214d64e0c7929af  ortp-0.8.1.tar.gz


--- ortp-0.7.1-Werror.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 08:44:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 03:44:50 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.9, 
	1.10 sources, 1.7, 1.8
Message-ID: <200601030845.k038jNV8007796@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7738/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 08:09:18 -0000	1.7
+++ .cvsignore	3 Jan 2006 08:44:50 -0000	1.8
@@ -1 +1 @@
-rxvt-unicode-6.1.tar.bz2
+rxvt-unicode-6.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rxvt-unicode.spec	28 Dec 2005 08:09:18 -0000	1.9
+++ rxvt-unicode.spec	3 Jan 2006 08:44:50 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.2-1
+- version upgrade
+
 * Wed Dec 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 08:09:18 -0000	1.7
+++ sources	3 Jan 2006 08:44:50 -0000	1.8
@@ -1 +1 @@
-9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2
+0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 08:44:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 03:44:56 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.9, 
	1.10 sources, 1.7, 1.8
Message-ID: <200601030845.k038jTq5007801@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7738/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 08:09:40 -0000	1.7
+++ .cvsignore	3 Jan 2006 08:44:56 -0000	1.8
@@ -1 +1 @@
-rxvt-unicode-6.1.tar.bz2
+rxvt-unicode-6.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rxvt-unicode.spec	28 Dec 2005 08:09:40 -0000	1.9
+++ rxvt-unicode.spec	3 Jan 2006 08:44:56 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -65,6 +65,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.2-1
+- version upgrade
+
 * Wed Dec 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 08:09:40 -0000	1.7
+++ sources	3 Jan 2006 08:44:56 -0000	1.8
@@ -1 +1 @@
-9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2
+0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 08:45:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 03:45:02 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.7, 1.8 rxvt-unicode.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200601030845.k038jYoT007806@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7738/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 08:09:46 -0000	1.7
+++ .cvsignore	3 Jan 2006 08:45:02 -0000	1.8
@@ -1 +1 @@
-rxvt-unicode-6.1.tar.bz2
+rxvt-unicode-6.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rxvt-unicode.spec	28 Dec 2005 08:09:46 -0000	1.12
+++ rxvt-unicode.spec	3 Jan 2006 08:45:02 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.1
+Version:        6.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -70,6 +70,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.2-1 
+- version upgrade
+
 * Wed Dec 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 08:09:46 -0000	1.7
+++ sources	3 Jan 2006 08:45:02 -0000	1.8
@@ -1 +1 @@
-9aae8858e0c123e5c618ab0f41da1bdc  rxvt-unicode-6.1.tar.bz2
+0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 10:03:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 05:03:13 -0500
Subject: rpms/centericq/FC-3 centericq-4.21.0-kkstrtext.patch, NONE,
	1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.9, 1.10
Message-ID: <200601031003.k03A3keI012111@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/centericq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10431/FC-3

Modified Files:
	centericq.spec 
Added Files:
	centericq-4.21.0-kkstrtext.patch centericq-4.21.0.msn.patch 
Log Message:
- fix more security suff
- fix libmsn


centericq-4.21.0-kkstrtext.patch:

--- NEW FILE centericq-4.21.0-kkstrtext.patch ---
--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h	2004-11-17 23:00:38.000000000 +0000
+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h	2005-12-13 18:34:56.308723728 +0000
@@ -87,7 +87,7 @@
     { \
 	va_list vgs__ap; char vgs__buf[1024]; \
 	va_start(vgs__ap, fmt); \
-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
+	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
 	va_end(vgs__ap); \
     }

centericq-4.21.0.msn.patch:

--- NEW FILE centericq-4.21.0.msn.patch ---
diff -NPrc centericq-4.21.0-org/aclocal.m4 centericq-4.21.0/aclocal.m4
*** centericq-4.21.0-org/aclocal.m4	2005-09-02 16:46:00.000000000 +0200
--- centericq-4.21.0/aclocal.m4	2005-11-07 16:43:58.000000000 +0100
***************
*** 1,1146 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! 
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
! 
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
! dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
! dnl require excessive bracketing.
! ifdef([AC_HELP_STRING],
! [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
! [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
  
! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
! dnl to access previously installed libraries. The basic assumption is that
! dnl a user will want packages to use other packages he previously installed
! dnl with the same --prefix option.
! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
! dnl libraries, but is otherwise very convenient.
! AC_DEFUN([AC_LIB_PREFIX],
! [
!   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
!   AC_REQUIRE([AC_PROG_CC])
!   AC_REQUIRE([AC_CANONICAL_HOST])
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   dnl By default, look in $includedir and $libdir.
!   use_additional=yes
!   AC_LIB_WITH_FINAL_PREFIX([
!     eval additional_includedir=\"$includedir\"
!     eval additional_libdir=\"$libdir\"
!   ])
!   AC_LIB_ARG_WITH([lib-prefix],
! [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
!   --without-lib-prefix    don't search for libraries in includedir and libdir],
! [
!     if test "X$withval" = "Xno"; then
!       use_additional=no
!     else
!       if test "X$withval" = "X"; then
!         AC_LIB_WITH_FINAL_PREFIX([
!           eval additional_includedir=\"$includedir\"
!           eval additional_libdir=\"$libdir\"
!         ])
!       else
!         additional_includedir="$withval/include"
!         additional_libdir="$withval/lib"
!       fi
!     fi
! ])
!   if test $use_additional = yes; then
!     dnl Potentially add $additional_includedir to $CPPFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/include,
!     dnl   2. if it's already present in $CPPFLAGS,
!     dnl   3. if it's /usr/local/include and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_includedir" != "X/usr/include"; then
!       haveit=
!       for x in $CPPFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-I$additional_includedir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_includedir" = "X/usr/local/include"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux* | gnu* | k*bsd*-gnu) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_includedir"; then
!             dnl Really add $additional_includedir to $CPPFLAGS.
!             CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
!           fi
!         fi
!       fi
!     fi
!     dnl Potentially add $additional_libdir to $LDFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/lib,
!     dnl   2. if it's already present in $LDFLAGS,
!     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_libdir" != "X/usr/lib"; then
!       haveit=
!       for x in $LDFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-L$additional_libdir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_libdir" = "X/usr/local/lib"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux*) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_libdir"; then
!             dnl Really add $additional_libdir to $LDFLAGS.
!             LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
!           fi
!         fi
!       fi
!     fi
!   fi
! ])
  
! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
! dnl acl_final_exec_prefix, containing the values to which $prefix and
! dnl $exec_prefix will expand at the end of the configure script.
! AC_DEFUN([AC_LIB_PREPARE_PREFIX],
  [
!   dnl Unfortunately, prefix and exec_prefix get only finally determined
!   dnl at the end of configure.
!   if test "X$prefix" = "XNONE"; then
!     acl_final_prefix="$ac_default_prefix"
!   else
!     acl_final_prefix="$prefix"
!   fi
!   if test "X$exec_prefix" = "XNONE"; then
!     acl_final_exec_prefix='${prefix}'
!   else
!     acl_final_exec_prefix="$exec_prefix"
    fi
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-   prefix="$acl_save_prefix"
- ])
- 
- dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
- dnl variables prefix and exec_prefix bound to the values they will have
- dnl at the end of the configure script.
- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- [
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   acl_save_exec_prefix="$exec_prefix"
-   exec_prefix="$acl_final_exec_prefix"
-   $1
-   exec_prefix="$acl_save_exec_prefix"
-   prefix="$acl_save_prefix"
  ])
  
! # lib-link.m4 serial 6 (gettext-0.14.3)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! AC_PREREQ(2.50)
  
! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
! dnl the libraries corresponding to explicit and implicit dependencies.
! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
! dnl augments the CPPFLAGS variable.
! AC_DEFUN([AC_LIB_LINKFLAGS],
  [
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   AC_REQUIRE([AC_LIB_RPATH])
!   define([Name],[translit([$1],[./-], [___])])
!   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
!                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
!   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
!     AC_LIB_LINKFLAGS_BODY([$1], [$2])
!     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
!     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
!     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
    ])
-   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
[...78903 lines suppressed...]
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
+ 	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
+ 	  empty_fix=; \
+ 	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test ! -f $$subdir/TAGS || \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! 	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! 	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
! 	fi
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
! 
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	    distdir=`$(am__cd) $(distdir) && pwd`; \
! 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! 	    (cd $$subdir && \
! 	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
! 	        distdir) \
  	      || exit 1; \
  	  fi; \
  	done
  check-am: all-am
  check: check-recursive
! all-am: Makefile $(PROGRAMS)
! installdirs: installdirs-recursive
! installdirs-am:
! 	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
! install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
+ uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
+ installcheck: installcheck-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
  clean-generic:
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
! 	@echo "This command is intended for maintainers to use"
! 	@echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
  
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  
! distclean: distclean-recursive
! 	-rm -rf ./$(DEPDIR)
! 	-rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! 	distclean-tags
  
! dvi: dvi-recursive
! 
! dvi-am:
  
! html: html-recursive
  
! info: info-recursive
  
! info-am:
! 
! install-data-am:
! 
! install-exec-am: install-binPROGRAMS
! 
! install-info: install-info-recursive
! 
! install-man:
! 
! installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+ 
+ pdf: pdf-recursive
+ 
+ pdf-am:
+ 
+ ps: ps-recursive
+ 
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
! uninstall-info: uninstall-info-recursive
  
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ 	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ 	ctags-recursive distclean distclean-compile distclean-generic \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-exec install-exec-am \
+ 	install-info install-info-am install-man install-strip \
+ 	installcheck installcheck-am installdirs installdirs-am \
+ 	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-info-am
  
  # 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.
diff -NPrc centericq-4.21.0-org/stamp-h.in centericq-4.21.0/stamp-h.in
*** centericq-4.21.0-org/stamp-h.in	2005-09-02 16:46:28.000000000 +0200
--- centericq-4.21.0/stamp-h.in	1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- timestamp
--- 0 ----


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- centericq.spec	30 Nov 2005 21:19:20 -0000	1.9
+++ centericq.spec	3 Jan 2006 10:02:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -17,6 +17,11 @@
 # see redhat bugzilla #174611
 Patch4:         centericq-4.21.0-icq-short-read.diff.bz2
 Patch5:         centericq-4.21.0-memory-handling.diff.bz2
+# and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml 
+# and redhat bugzilla #176451
+Patch6:         centericq-4.21.0-kkstrtext.patch
+# Fix libmsn 
+Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -38,6 +43,8 @@
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch100 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -65,8 +72,14 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
-
+# we don't want that
+%exclude %{_includedir}/msn
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-3
+- Fix more security related stuff
+- Fix libmsn
+
 * Wed Nov 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.21.0-2
 - fix CVE-2005-3694 see (#174611)



From fedora-extras-commits at redhat.com  Tue Jan  3 10:03:19 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 05:03:19 -0500
Subject: rpms/centericq/FC-4 centericq-4.21.0-kkstrtext.patch, NONE,
	1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.19, 1.20
Message-ID: <200601031003.k03A3qgf012114@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/centericq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10431/FC-4

Modified Files:
	centericq.spec 
Added Files:
	centericq-4.21.0-kkstrtext.patch centericq-4.21.0.msn.patch 
Log Message:
- fix more security suff
- fix libmsn


centericq-4.21.0-kkstrtext.patch:

--- NEW FILE centericq-4.21.0-kkstrtext.patch ---
--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h	2004-11-17 23:00:38.000000000 +0000
+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h	2005-12-13 18:34:56.308723728 +0000
@@ -87,7 +87,7 @@
     { \
 	va_list vgs__ap; char vgs__buf[1024]; \
 	va_start(vgs__ap, fmt); \
-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
+	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
 	va_end(vgs__ap); \
     }

centericq-4.21.0.msn.patch:

--- NEW FILE centericq-4.21.0.msn.patch ---
diff -NPrc centericq-4.21.0-org/aclocal.m4 centericq-4.21.0/aclocal.m4
*** centericq-4.21.0-org/aclocal.m4	2005-09-02 16:46:00.000000000 +0200
--- centericq-4.21.0/aclocal.m4	2005-11-07 16:43:58.000000000 +0100
***************
*** 1,1146 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! 
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
! 
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
! dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
! dnl require excessive bracketing.
! ifdef([AC_HELP_STRING],
! [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
! [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
  
! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
! dnl to access previously installed libraries. The basic assumption is that
! dnl a user will want packages to use other packages he previously installed
! dnl with the same --prefix option.
! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
! dnl libraries, but is otherwise very convenient.
! AC_DEFUN([AC_LIB_PREFIX],
! [
!   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
!   AC_REQUIRE([AC_PROG_CC])
!   AC_REQUIRE([AC_CANONICAL_HOST])
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   dnl By default, look in $includedir and $libdir.
!   use_additional=yes
!   AC_LIB_WITH_FINAL_PREFIX([
!     eval additional_includedir=\"$includedir\"
!     eval additional_libdir=\"$libdir\"
!   ])
!   AC_LIB_ARG_WITH([lib-prefix],
! [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
!   --without-lib-prefix    don't search for libraries in includedir and libdir],
! [
!     if test "X$withval" = "Xno"; then
!       use_additional=no
!     else
!       if test "X$withval" = "X"; then
!         AC_LIB_WITH_FINAL_PREFIX([
!           eval additional_includedir=\"$includedir\"
!           eval additional_libdir=\"$libdir\"
!         ])
!       else
!         additional_includedir="$withval/include"
!         additional_libdir="$withval/lib"
!       fi
!     fi
! ])
!   if test $use_additional = yes; then
!     dnl Potentially add $additional_includedir to $CPPFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/include,
!     dnl   2. if it's already present in $CPPFLAGS,
!     dnl   3. if it's /usr/local/include and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_includedir" != "X/usr/include"; then
!       haveit=
!       for x in $CPPFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-I$additional_includedir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_includedir" = "X/usr/local/include"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux* | gnu* | k*bsd*-gnu) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_includedir"; then
!             dnl Really add $additional_includedir to $CPPFLAGS.
!             CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
!           fi
!         fi
!       fi
!     fi
!     dnl Potentially add $additional_libdir to $LDFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/lib,
!     dnl   2. if it's already present in $LDFLAGS,
!     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_libdir" != "X/usr/lib"; then
!       haveit=
!       for x in $LDFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-L$additional_libdir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_libdir" = "X/usr/local/lib"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux*) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_libdir"; then
!             dnl Really add $additional_libdir to $LDFLAGS.
!             LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
!           fi
!         fi
!       fi
!     fi
!   fi
! ])
  
! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
! dnl acl_final_exec_prefix, containing the values to which $prefix and
! dnl $exec_prefix will expand at the end of the configure script.
! AC_DEFUN([AC_LIB_PREPARE_PREFIX],
  [
!   dnl Unfortunately, prefix and exec_prefix get only finally determined
!   dnl at the end of configure.
!   if test "X$prefix" = "XNONE"; then
!     acl_final_prefix="$ac_default_prefix"
!   else
!     acl_final_prefix="$prefix"
!   fi
!   if test "X$exec_prefix" = "XNONE"; then
!     acl_final_exec_prefix='${prefix}'
!   else
!     acl_final_exec_prefix="$exec_prefix"
    fi
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-   prefix="$acl_save_prefix"
- ])
- 
- dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
- dnl variables prefix and exec_prefix bound to the values they will have
- dnl at the end of the configure script.
- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- [
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   acl_save_exec_prefix="$exec_prefix"
-   exec_prefix="$acl_final_exec_prefix"
-   $1
-   exec_prefix="$acl_save_exec_prefix"
-   prefix="$acl_save_prefix"
  ])
  
! # lib-link.m4 serial 6 (gettext-0.14.3)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! AC_PREREQ(2.50)
  
! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
! dnl the libraries corresponding to explicit and implicit dependencies.
! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
! dnl augments the CPPFLAGS variable.
! AC_DEFUN([AC_LIB_LINKFLAGS],
  [
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   AC_REQUIRE([AC_LIB_RPATH])
!   define([Name],[translit([$1],[./-], [___])])
!   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
!                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
!   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
!     AC_LIB_LINKFLAGS_BODY([$1], [$2])
!     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
!     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
!     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
    ])
-   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
[...78903 lines suppressed...]
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
+ 	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
+ 	  empty_fix=; \
+ 	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test ! -f $$subdir/TAGS || \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! 	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! 	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
! 	fi
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
! 
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	    distdir=`$(am__cd) $(distdir) && pwd`; \
! 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! 	    (cd $$subdir && \
! 	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
! 	        distdir) \
  	      || exit 1; \
  	  fi; \
  	done
  check-am: all-am
  check: check-recursive
! all-am: Makefile $(PROGRAMS)
! installdirs: installdirs-recursive
! installdirs-am:
! 	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
! install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
+ uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
+ installcheck: installcheck-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
  clean-generic:
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
! 	@echo "This command is intended for maintainers to use"
! 	@echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
  
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  
! distclean: distclean-recursive
! 	-rm -rf ./$(DEPDIR)
! 	-rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! 	distclean-tags
  
! dvi: dvi-recursive
! 
! dvi-am:
  
! html: html-recursive
  
! info: info-recursive
  
! info-am:
! 
! install-data-am:
! 
! install-exec-am: install-binPROGRAMS
! 
! install-info: install-info-recursive
! 
! install-man:
! 
! installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+ 
+ pdf: pdf-recursive
+ 
+ pdf-am:
+ 
+ ps: ps-recursive
+ 
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
! uninstall-info: uninstall-info-recursive
  
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ 	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ 	ctags-recursive distclean distclean-compile distclean-generic \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-exec install-exec-am \
+ 	install-info install-info-am install-man install-strip \
+ 	installcheck installcheck-am installdirs installdirs-am \
+ 	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-info-am
  
  # 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.
diff -NPrc centericq-4.21.0-org/stamp-h.in centericq-4.21.0/stamp-h.in
*** centericq-4.21.0-org/stamp-h.in	2005-09-02 16:46:28.000000000 +0200
--- centericq-4.21.0/stamp-h.in	1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- timestamp
--- 0 ----


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- centericq.spec	30 Nov 2005 21:19:25 -0000	1.19
+++ centericq.spec	3 Jan 2006 10:03:19 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -17,6 +17,11 @@
 # see redhat bugzilla #174611
 Patch4:         centericq-4.21.0-icq-short-read.diff.bz2
 Patch5:         centericq-4.21.0-memory-handling.diff.bz2
+# and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml 
+# and redhat bugzilla #176451
+Patch6:         centericq-4.21.0-kkstrtext.patch
+# Fix libmsn 
+Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -38,6 +43,8 @@
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch100 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -65,8 +72,14 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
-
+# we don't want that
+%exclude %{_includedir}/msn
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-3
+- Fix more security related stuff
+- Fix libmsn
+
 * Wed Nov 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.21.0-2
 - fix CVE-2005-3694 see (#174611)



From fedora-extras-commits at redhat.com  Tue Jan  3 10:03:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 05:03:25 -0500
Subject: rpms/centericq/devel centericq-4.21.0-kkstrtext.patch, NONE,
	1.1 centericq-4.21.0.msn.patch, NONE, 1.1 centericq.spec, 1.20, 1.21
Message-ID: <200601031004.k03A3xdA012115@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/centericq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10431/devel

Modified Files:
	centericq.spec 
Added Files:
	centericq-4.21.0-kkstrtext.patch centericq-4.21.0.msn.patch 
Log Message:
- fix more security suff
- fix libmsn


centericq-4.21.0-kkstrtext.patch:

--- NEW FILE centericq-4.21.0-kkstrtext.patch ---
--- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h	2004-11-17 23:00:38.000000000 +0000
+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h	2005-12-13 18:34:56.308723728 +0000
@@ -87,7 +87,7 @@
     { \
 	va_list vgs__ap; char vgs__buf[1024]; \
 	va_start(vgs__ap, fmt); \
-	vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \
+	vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \
 	va_end(vgs__ap); \
     }

centericq-4.21.0.msn.patch:

--- NEW FILE centericq-4.21.0.msn.patch ---
diff -NPrc centericq-4.21.0-org/aclocal.m4 centericq-4.21.0/aclocal.m4
*** centericq-4.21.0-org/aclocal.m4	2005-09-02 16:46:00.000000000 +0200
--- centericq-4.21.0/aclocal.m4	2005-11-07 16:43:58.000000000 +0100
***************
*** 1,1146 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p6
  
! dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
! 
! dnl This program is distributed in the hope that it will be useful,
! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! dnl PARTICULAR PURPOSE.
! 
! # lib-prefix.m4 serial 4 (gettext-0.14.2)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
! dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
! dnl require excessive bracketing.
! ifdef([AC_HELP_STRING],
! [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
! [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
  
! dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
! dnl to access previously installed libraries. The basic assumption is that
! dnl a user will want packages to use other packages he previously installed
! dnl with the same --prefix option.
! dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
! dnl libraries, but is otherwise very convenient.
! AC_DEFUN([AC_LIB_PREFIX],
! [
!   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
!   AC_REQUIRE([AC_PROG_CC])
!   AC_REQUIRE([AC_CANONICAL_HOST])
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   dnl By default, look in $includedir and $libdir.
!   use_additional=yes
!   AC_LIB_WITH_FINAL_PREFIX([
!     eval additional_includedir=\"$includedir\"
!     eval additional_libdir=\"$libdir\"
!   ])
!   AC_LIB_ARG_WITH([lib-prefix],
! [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
!   --without-lib-prefix    don't search for libraries in includedir and libdir],
! [
!     if test "X$withval" = "Xno"; then
!       use_additional=no
!     else
!       if test "X$withval" = "X"; then
!         AC_LIB_WITH_FINAL_PREFIX([
!           eval additional_includedir=\"$includedir\"
!           eval additional_libdir=\"$libdir\"
!         ])
!       else
!         additional_includedir="$withval/include"
!         additional_libdir="$withval/lib"
!       fi
!     fi
! ])
!   if test $use_additional = yes; then
!     dnl Potentially add $additional_includedir to $CPPFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/include,
!     dnl   2. if it's already present in $CPPFLAGS,
!     dnl   3. if it's /usr/local/include and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_includedir" != "X/usr/include"; then
!       haveit=
!       for x in $CPPFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-I$additional_includedir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_includedir" = "X/usr/local/include"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux* | gnu* | k*bsd*-gnu) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_includedir"; then
!             dnl Really add $additional_includedir to $CPPFLAGS.
!             CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
!           fi
!         fi
!       fi
!     fi
!     dnl Potentially add $additional_libdir to $LDFLAGS.
!     dnl But don't add it
!     dnl   1. if it's the standard /usr/lib,
!     dnl   2. if it's already present in $LDFLAGS,
!     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
!     dnl   4. if it doesn't exist as a directory.
!     if test "X$additional_libdir" != "X/usr/lib"; then
!       haveit=
!       for x in $LDFLAGS; do
!         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
!         if test "X$x" = "X-L$additional_libdir"; then
!           haveit=yes
!           break
!         fi
!       done
!       if test -z "$haveit"; then
!         if test "X$additional_libdir" = "X/usr/local/lib"; then
!           if test -n "$GCC"; then
!             case $host_os in
!               linux*) haveit=yes;;
!             esac
!           fi
!         fi
!         if test -z "$haveit"; then
!           if test -d "$additional_libdir"; then
!             dnl Really add $additional_libdir to $LDFLAGS.
!             LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
!           fi
!         fi
!       fi
!     fi
!   fi
! ])
  
! dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
! dnl acl_final_exec_prefix, containing the values to which $prefix and
! dnl $exec_prefix will expand at the end of the configure script.
! AC_DEFUN([AC_LIB_PREPARE_PREFIX],
  [
!   dnl Unfortunately, prefix and exec_prefix get only finally determined
!   dnl at the end of configure.
!   if test "X$prefix" = "XNONE"; then
!     acl_final_prefix="$ac_default_prefix"
!   else
!     acl_final_prefix="$prefix"
!   fi
!   if test "X$exec_prefix" = "XNONE"; then
!     acl_final_exec_prefix='${prefix}'
!   else
!     acl_final_exec_prefix="$exec_prefix"
    fi
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
-   prefix="$acl_save_prefix"
- ])
- 
- dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
- dnl variables prefix and exec_prefix bound to the values they will have
- dnl at the end of the configure script.
- AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
- [
-   acl_save_prefix="$prefix"
-   prefix="$acl_final_prefix"
-   acl_save_exec_prefix="$exec_prefix"
-   exec_prefix="$acl_final_exec_prefix"
-   $1
-   exec_prefix="$acl_save_exec_prefix"
-   prefix="$acl_save_prefix"
  ])
  
! # lib-link.m4 serial 6 (gettext-0.14.3)
! dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
! dnl This file is free software; the Free Software Foundation
! dnl gives unlimited permission to copy and/or distribute it,
! dnl with or without modifications, as long as this notice is preserved.
  
! dnl From Bruno Haible.
  
! AC_PREREQ(2.50)
  
! dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
! dnl the libraries corresponding to explicit and implicit dependencies.
! dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
! dnl augments the CPPFLAGS variable.
! AC_DEFUN([AC_LIB_LINKFLAGS],
  [
!   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
!   AC_REQUIRE([AC_LIB_RPATH])
!   define([Name],[translit([$1],[./-], [___])])
!   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
!                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
!   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
!     AC_LIB_LINKFLAGS_BODY([$1], [$2])
!     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
!     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
!     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
    ])
-   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
[...78903 lines suppressed...]
  
! TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
  	tags=; \
  	here=`pwd`; \
+ 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ 	  include_option=--etags-include; \
+ 	  empty_fix=.; \
+ 	else \
+ 	  include_option=--include; \
+ 	  empty_fix=; \
+ 	fi; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
! 	  if test "$$subdir" = .; then :; else \
! 	    test ! -f $$subdir/TAGS || \
! 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
! 	  fi; \
  	done; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
! 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
! 	  test -n "$$unique" || unique=$$empty_fix; \
! 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! 	    $$tags $$unique; \
! 	fi
! ctags: CTAGS
! CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
! 		$(TAGS_FILES) $(LISP)
! 	tags=; \
! 	here=`pwd`; \
! 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
! 	unique=`for i in $$list; do \
! 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! 	  done | \
! 	  $(AWK) '    { files[$$0] = 1; } \
! 	       END { for (i in files) print i; }'`; \
! 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
! 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! 	     $$tags $$unique
! 
! GTAGS:
! 	here=`$(am__cd) $(top_builddir) && pwd` \
! 	  && cd $(top_srcdir) \
! 	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
! 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
! 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
! 	list='$(DISTFILES)'; for file in $$list; do \
! 	  case $$file in \
! 	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! 	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
! 	  esac; \
! 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! 	    dir="/$$dir"; \
! 	    $(mkdir_p) "$(distdir)$$dir"; \
! 	  else \
! 	    dir=''; \
! 	  fi; \
  	  if test -d $$d/$$file; then \
! 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! 	    fi; \
! 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
  	  else \
  	    test -f $(distdir)/$$file \
! 	    || cp -p $$d/$$file $(distdir)/$$file \
! 	    || exit 1; \
  	  fi; \
  	done
! 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
! 	    test -d "$(distdir)/$$subdir" \
! 	    || $(mkdir_p) "$(distdir)/$$subdir" \
  	    || exit 1; \
! 	    distdir=`$(am__cd) $(distdir) && pwd`; \
! 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
! 	    (cd $$subdir && \
! 	      $(MAKE) $(AM_MAKEFLAGS) \
! 	        top_distdir="$$top_distdir" \
! 	        distdir="$$distdir/$$subdir" \
! 	        distdir) \
  	      || exit 1; \
  	  fi; \
  	done
  check-am: all-am
  check: check-recursive
! all-am: Makefile $(PROGRAMS)
! installdirs: installdirs-recursive
! installdirs-am:
! 	for dir in "$(DESTDIR)$(bindir)"; do \
! 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
! 	done
! install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
+ uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
  
+ installcheck: installcheck-recursive
+ install-strip:
+ 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ 	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ 	  `test -z '$(STRIP)' || \
+ 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
  
  clean-generic:
  
  distclean-generic:
! 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
! 	@echo "This command is intended for maintainers to use"
! 	@echo "it deletes files that may require special tools to rebuild."
! clean: clean-recursive
  
! clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
  
! distclean: distclean-recursive
! 	-rm -rf ./$(DEPDIR)
! 	-rm -f Makefile
! distclean-am: clean-am distclean-compile distclean-generic \
! 	distclean-tags
  
! dvi: dvi-recursive
! 
! dvi-am:
  
! html: html-recursive
  
! info: info-recursive
  
! info-am:
! 
! install-data-am:
! 
! install-exec-am: install-binPROGRAMS
! 
! install-info: install-info-recursive
! 
! install-man:
! 
! installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
+ 	-rm -rf ./$(DEPDIR)
+ 	-rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+ mostlyclean: mostlyclean-recursive
+ 
+ mostlyclean-am: mostlyclean-compile mostlyclean-generic
+ 
+ pdf: pdf-recursive
+ 
+ pdf-am:
+ 
+ ps: ps-recursive
+ 
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
  
! uninstall-info: uninstall-info-recursive
  
+ .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ 	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
+ 	ctags-recursive distclean distclean-compile distclean-generic \
+ 	distclean-recursive distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-binPROGRAMS \
+ 	install-data install-data-am install-exec install-exec-am \
+ 	install-info install-info-am install-man install-strip \
+ 	installcheck installcheck-am installdirs installdirs-am \
+ 	maintainer-clean maintainer-clean-generic \
+ 	maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
+ 	tags tags-recursive uninstall uninstall-am \
+ 	uninstall-binPROGRAMS uninstall-info-am
  
  # 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.
diff -NPrc centericq-4.21.0-org/stamp-h.in centericq-4.21.0/stamp-h.in
*** centericq-4.21.0-org/stamp-h.in	2005-09-02 16:46:28.000000000 +0200
--- centericq-4.21.0/stamp-h.in	1970-01-01 01:00:00.000000000 +0100
***************
*** 1 ****
- timestamp
--- 0 ----


Index: centericq.spec
===================================================================
RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- centericq.spec	30 Nov 2005 21:19:31 -0000	1.20
+++ centericq.spec	3 Jan 2006 10:03:25 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           centericq
 Version:        4.21.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        Text mode menu- and window-driven IM
 
@@ -17,6 +17,12 @@
 # see redhat bugzilla #174611
 Patch4:         centericq-4.21.0-icq-short-read.diff.bz2
 Patch5:         centericq-4.21.0-memory-handling.diff.bz2
+# and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml 
+# and redhat bugzilla #176451
+Patch6:         centericq-4.21.0-kkstrtext.patch
+# Fix libmsn 
+Patch100:       http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  krb5-devel
@@ -38,6 +44,8 @@
 %patch3
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch100 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" \
@@ -65,8 +73,15 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_mandir}/man1/*
+# we don't want that
+%exclude %{_includedir}/msn
 
 %changelog
+* Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+4.21.0-4
+- Fix more security related stuff
+- Fix libmsn
+
 * Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 4.21.0-2
 - rebuild



From fedora-extras-commits at redhat.com  Tue Jan  3 10:15:40 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:15:40 -0500
Subject: rpms/perl-Digest-BubbleBabble - New directory
Message-ID: <200601031015.k03AFgeV012342@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12334/perl-Digest-BubbleBabble

Log Message:
Directory /cvs/extras/rpms/perl-Digest-BubbleBabble added to the repository




From fedora-extras-commits at redhat.com  Tue Jan  3 10:15:45 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:15:45 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel - New directory
Message-ID: <200601031015.k03AFl7x012357@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12334/perl-Digest-BubbleBabble/devel

Log Message:
Directory /cvs/extras/rpms/perl-Digest-BubbleBabble/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan  3 10:16:30 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:16:30 -0500
Subject: rpms/perl-Digest-BubbleBabble Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601031016.k03AGWhU012391@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Digest-BubbleBabble


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Digest-BubbleBabble
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan  3 10:16:35 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:16:35 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601031016.k03AGbEH012411@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12379/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Digest-BubbleBabble


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan  3 10:17:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:17:50 -0500
Subject: rpms/perl-Digest-BubbleBabble import.log,1.1,1.2
Message-ID: <200601031018.k03AIMhW012479@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12445

Modified Files:
	import.log 
Log Message:
auto-import perl-Digest-BubbleBabble-0.01-1 on branch devel from perl-Digest-BubbleBabble-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Jan 2006 10:16:29 -0000	1.1
+++ import.log	3 Jan 2006 10:17:49 -0000	1.2
@@ -0,0 +1 @@
+perl-Digest-BubbleBabble-0_01-1:HEAD:perl-Digest-BubbleBabble-0.01-1.src.rpm:1136283458



From fedora-extras-commits at redhat.com  Tue Jan  3 10:17:55 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:17:55 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel perl-Digest-BubbleBabble.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601031018.k03AISNM012483@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Digest-BubbleBabble.spec 
Log Message:
auto-import perl-Digest-BubbleBabble-0.01-1 on branch devel from perl-Digest-BubbleBabble-0.01-1.src.rpm


--- NEW FILE perl-Digest-BubbleBabble.spec ---
Summary:	Create bubble-babble fingerprints
Name:		perl-Digest-BubbleBabble
Version:	0.01
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Digest-BubbleBabble/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BT/BTROTT/Digest-BubbleBabble-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Digest::BubbleBabble takes a message digest (generated by either of the MD5 or
SHA-1 message digest algorithms) and creates a fingerprint of that digest in
"bubble babble" format. Bubble babble is a method of representing a message
digest as a string of "real" words, to make the fingerprint easier to remember.
The "words" are not necessarily real words, but they look more like words than
a string of hex characters.

Bubble babble fingerprinting is used by the SSH2 suite (and, consequently, by
Net::SSH::Perl, the Perl SSH implementation) to display easy-to-remember key
fingerprints. The key (a DSA or RSA key) is converted into a textual form,
digested using Digest::SHA1, and run through bubblebabble to create the key
fingerprint.

%prep
%setup -q -n Digest-BubbleBabble-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%{perl_vendorlib}/Digest/
%{_mandir}/man3/Digest::BubbleBabble.3pm*

%changelog
* Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 0.01-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Jan 2006 10:16:35 -0000	1.1
+++ .cvsignore	3 Jan 2006 10:17:55 -0000	1.2
@@ -0,0 +1 @@
+Digest-BubbleBabble-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Jan 2006 10:16:35 -0000	1.1
+++ sources	3 Jan 2006 10:17:55 -0000	1.2
@@ -0,0 +1 @@
+0e8ef3de82ae909cfaeddf8269140c17  Digest-BubbleBabble-0.01.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 10:22:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:22:19 -0500
Subject: rpms/perl-Digest-BubbleBabble/devel perl-Digest-BubbleBabble.spec,
	1.1, 1.2
Message-ID: <200601031022.k03AMpm9012549@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-BubbleBabble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12525

Modified Files:
	perl-Digest-BubbleBabble.spec 
Log Message:
Don't include README (review comment)



Index: perl-Digest-BubbleBabble.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-BubbleBabble/devel/perl-Digest-BubbleBabble.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Digest-BubbleBabble.spec	3 Jan 2006 10:17:55 -0000	1.1
+++ perl-Digest-BubbleBabble.spec	3 Jan 2006 10:22:19 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:	Create bubble-babble fingerprints
 Name:		perl-Digest-BubbleBabble
 Version:	0.01
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL or Artistic
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Digest-BubbleBabble/
@@ -46,10 +46,13 @@
 
 %files
 %defattr(-,root,root,0755)
-%doc Changes README
+%doc Changes
 %{perl_vendorlib}/Digest/
 %{_mandir}/man3/Digest::BubbleBabble.3pm*
 
 %changelog
+* Tue Jan  3 2006 Paul Howarth <paul at city-fan.org> 0.01-2
+- Don't include README, which contains only install instructions (#175280)
+
 * Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 0.01-1
 - Initial build



From fedora-extras-commits at redhat.com  Tue Jan  3 10:26:21 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue,  3 Jan 2006 05:26:21 -0500
Subject: owners owners.list,1.497,1.498
Message-ID: <200601031026.k03AQrRY012627@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12610

Modified Files:
	owners.list 
Log Message:
perl-Digest-BubbleBabble



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.497
retrieving revision 1.498
diff -u -r1.497 -r1.498
--- owners.list	2 Jan 2006 15:30:50 -0000	1.497
+++ owners.list	3 Jan 2006 10:26:21 -0000	1.498
@@ -768,6 +768,7 @@
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan  3 11:24:15 2006
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue,  3 Jan 2006 06:24:15 -0500
Subject: rpms/dia/devel dia.spec,1.4,1.5
Message-ID: <200601031124.k03BOlu8014401@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14384

Modified Files:
	dia.spec 
Log Message:
rh#176504# add BuildRequires


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dia.spec	19 Dec 2005 09:17:27 -0000	1.4
+++ dia.spec	3 Jan 2006 11:24:14 -0000	1.5
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	17
+Release:	18
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -25,7 +25,7 @@
 BuildRequires:	glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel
 BuildRequires:	docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl
 BuildRequires:	openjade, libpng-devel, automake17, libart_lgpl-devel, 
-BuildRequires:  libxslt-devel
+BuildRequires:  libxslt-devel, libgnome-devel
 
 Patch0: dia-0.94-svgimport-fix.patch
 Patch1: dia-0.92.2-dtd.patch
@@ -113,6 +113,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-18
+- rh#176504# add BuildRequires
+
 * Mon Dec 19 2005 Caolan McNamara <caolanm at redhat.com> 1:0.94-17
 - rh#176003# rejig Pre/Post
 



From fedora-extras-commits at redhat.com  Tue Jan  3 12:05:15 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  3 Jan 2006 07:05:15 -0500
Subject: rpms/linphone/devel linphone-1.2.0-maxrtp.patch, NONE,
	1.1 linphone-1.2.0-ortp.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 linphone.spec, 1.15, 1.16 sources, 1.4,
	1.5 linphone-1.1.0-ortp.patch, 1.1, NONE
Message-ID: <200601031205.k03C5mUe016270@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16243

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.2.0-maxrtp.patch linphone-1.2.0-ortp.patch 
Removed Files:
	linphone-1.1.0-ortp.patch 
Log Message:
Upstream update

linphone-1.2.0-maxrtp.patch:

--- NEW FILE linphone-1.2.0-maxrtp.patch ---
--- linphone-1.2.0/mediastreamer/audiostream.c.maxrtp	2006-01-03 04:26:06.000000000 -0500
+++ linphone-1.2.0/mediastreamer/audiostream.c	2006-01-03 04:26:28.000000000 -0500
@@ -112,7 +112,7 @@
 			RtpSession **recvsend){
 	RtpSession *rtpr;
 	rtpr=rtp_session_new(RTP_SESSION_SENDRECV);
-	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
+/*	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);*/
 	rtp_session_set_profile(rtpr,profile);
 	rtp_session_set_local_addr(rtpr,get_local_addr_for(remip),locport);
 	if (remport>0) rtp_session_set_remote_addr(rtpr,remip,remport);
@@ -133,7 +133,7 @@
 	/* creates two rtp filters to recv send streams (remote part)*/
 	
 	rtps=rtp_session_new(RTP_SESSION_SENDONLY);
-	rtp_session_max_buf_size_set(rtps,MAX_RTP_SIZE);
+/*	rtp_session_max_buf_size_set(rtps,MAX_RTP_SIZE);*/
 	rtp_session_set_profile(rtps,profile);
 #ifdef INET6
 	rtp_session_set_local_addr(rtps,"::",locport+2);
@@ -147,7 +147,7 @@
 	rtp_session_set_jitter_compensation(rtps,jitt_comp);
 	
 	rtpr=rtp_session_new(RTP_SESSION_RECVONLY);
-	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);
+/*	rtp_session_max_buf_size_set(rtpr,MAX_RTP_SIZE);*/
 	rtp_session_set_profile(rtpr,profile);
 #ifdef INET6
 	rtp_session_set_local_addr(rtpr,"::",locport);

linphone-1.2.0-ortp.patch:

--- NEW FILE linphone-1.2.0-ortp.patch ---
--- linphone-1.2.0/gnome/Makefile.in.ortp	2005-12-16 17:05:06.000000000 -0500
+++ linphone-1.2.0/gnome/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -340,8 +340,7 @@
 @BUILD_GNOME_TRUE at INCLUDES = \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)\
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/intl \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/src \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/ \
+ at BUILD_GNOME_TRUE@	-I$(includedir)/ortp/ \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/mediastreamer \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/speex/libspeex \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/coreapi \
--- linphone-1.2.0/coreapi/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.2.0/coreapi/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -289,8 +289,7 @@
 INCLUDES = \
 	-I$(top_srcdir)\
 	-I$(top_srcdir)/exosip\
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS) \
 	-I$(osip_prefix)/include/ 
--- linphone-1.2.0/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.2.0/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -61,7 +61,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+DIST_SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
 	win32acm mediastreamer mediastreamer2 media_api exosip coreapi \
 	console gnome share developer-docs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -274,7 +274,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
-SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
 		media_api exosip coreapi console gnome share developer-docs
 
--- linphone-1.2.0/console/Makefile.in.ortp	2005-12-16 17:05:05.000000000 -0500
+++ linphone-1.2.0/console/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -281,8 +281,7 @@
 	-I$(top_srcdir)/coreapi\
 	-I$(top_srcdir)/osipua/\
 	-I$(top_srcdir)/osipua/src \
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS)\
 	-I$(osip_prefix)/include \
--- linphone-1.2.0/mediastreamer/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.2.0/mediastreamer/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -67,7 +67,7 @@
 @BUILD_TRUESPEECH_TRUE at am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
 libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -348,6 +348,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -485,7 +486,7 @@
 libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SAMPLERATE_LIBS)\
 							$(SUPPORTLIB) \
@@ -551,8 +552,7 @@
 
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						$(SPEEX_CFLAGS) \
--- linphone-1.2.0/mediastreamer2/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.2.0/mediastreamer2/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -54,7 +54,7 @@
 @BUILD_UGLIB_TRUE@	$(top_builddir)/support/libuglib.la
 libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \
@@ -213,6 +213,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -313,7 +314,7 @@
 libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SUPPORTLIB) \
 							$(ALSA_LIBS) \
@@ -322,8 +323,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS)
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer2 \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						$(SPEEX_CFLAGS)
--- linphone-1.2.0/media_api/Makefile.in.ortp	2005-12-16 17:05:07.000000000 -0500
+++ linphone-1.2.0/media_api/Makefile.in	2006-01-03 00:58:20.000000000 -0500
@@ -299,8 +299,7 @@
 INCLUDES = -I$(top_srcdir)/mediastreamer \
 		-I$(top_srcdir)/speex \
 		-I$(top_srcdir)/gsmlib \
-		-I$(top_srcdir)/oRTP \
-		-I$(top_srcdir)/oRTP/src \
+		-I$(includedir)/ortp \
 		-I$(top_srcdir)/lpc10-1.5 \
 		-I$(top_srcdir)/ffmpeg 
 
--- linphone-1.2.0/configure.ortp	2005-12-16 17:05:11.000000000 -0500
+++ linphone-1.2.0/configure	2006-01-03 00:59:50.000000000 -0500
@@ -463,7 +463,6 @@
 # include <unistd.h>
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all oRTP"
 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 LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RU!
 LE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS STRICT_OPTIONS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LI!
 BS SAMPLERATE_CFLAGS SAMPLERATE_LIBS osip_prefix OSIP_CFLAGS O!
 SIP_LI
EXOSIP_CFLAGS EXOSIP_LIBS SPEEX_CFLAGS SPEEX_LIBS ${NAME}_CFLAGS ${NAME}_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -30162,9 +30161,6 @@
 
 
 
-subdirs="$subdirs oRTP"
-
-
 ##################################################
 # Check for gtk-doc.
 ##################################################


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Dec 2005 00:17:38 -0000	1.4
+++ .cvsignore	3 Jan 2006 12:05:15 -0000	1.5
@@ -1 +1 @@
-linphone-1.1.0.tar.gz
+linphone-1.2.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- linphone.spec	6 Dec 2005 00:36:09 -0000	1.15
+++ linphone.spec	3 Jan 2006 12:05:15 -0000	1.16
@@ -1,16 +1,16 @@
 Name:           linphone
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.1.x/source/%{name}-%{version}.tar.gz
-Patch:          linphone-1.0.1-pkgconfig.patch
-Patch1:         linphone-1.0.1-desktop.patch
-Patch2:         linphone-1.1.0-ortp.patch
-Patch3:         linphone-1.1.0-Werror.patch
+Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
+Patch:          linphone-1.0.1-desktop.patch
+Patch1:         linphone-1.2.0-ortp.patch
+Patch2:         linphone-1.1.0-Werror.patch
+Patch3:         linphone-1.2.0-maxrtp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -43,10 +43,10 @@
 
 %prep
 %setup -q
-%patch -p 1 -b .pkgconfig
-%patch1 -p 1 -b .old
-%patch2 -p 1 -b .ortp
-%patch3 -p 1 -b .Werror
+%patch -p 1 -b .old
+%patch1 -p 1 -b .ortp
+%patch2 -p 1 -b .Werror
+%patch3 -p 1 -b .maxrtp
 rm -r oRTP
 
 %build
@@ -99,6 +99,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
+- Upstream update
+
 * Mon Dec  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.0-2
 - Added version on ortp-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Dec 2005 00:17:38 -0000	1.4
+++ sources	3 Jan 2006 12:05:15 -0000	1.5
@@ -1 +1 @@
-9f164b41c76ef1caca164909dea199a1  linphone-1.1.0.tar.gz
+bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz


--- linphone-1.1.0-ortp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 12:23:48 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:23:48 -0500
Subject: rpms/linkchecker import.log,1.4,1.5
Message-ID: <200601031224.k03COKLm016476@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16442

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.3-1 on branch devel from linkchecker-3.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Jan 2006 03:52:59 -0000	1.4
+++ import.log	3 Jan 2006 12:23:48 -0000	1.5
@@ -1,3 +1,4 @@
 linkchecker-3_2-3:HEAD:linkchecker-3.2-3.src.rpm:1132802837
 linkchecker-3_2-4:HEAD:linkchecker-3.2-4.src.rpm:1136260100
 linkchecker-3_2-5:HEAD:linkchecker-3.2-5.src.rpm:1136260374
+linkchecker-3_3-1:HEAD:linkchecker-3.3-1.src.rpm:1136291023



From fedora-extras-commits at redhat.com  Tue Jan  3 12:23:54 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:23:54 -0500
Subject: rpms/linkchecker/devel .cvsignore, 1.2, 1.3 linkchecker.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200601031224.k03COQ53016484@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16442/devel

Modified Files:
	.cvsignore linkchecker.spec sources 
Log Message:
auto-import linkchecker-3.3-1 on branch devel from linkchecker-3.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Nov 2005 03:27:27 -0000	1.2
+++ .cvsignore	3 Jan 2006 12:23:54 -0000	1.3
@@ -1 +1 @@
-linkchecker-3.2.tar.gz
+linkchecker-3.3.tar.gz


Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linkchecker.spec	3 Jan 2006 03:53:05 -0000	1.2
+++ linkchecker.spec	3 Jan 2006 12:23:54 -0000	1.3
@@ -3,11 +3,11 @@
 
 Summary: Check HTML documents for broken links
 Name: linkchecker
-Version: 3.2
-Release: 5
+Version: 3.3
+Release: 1
 License: GPL
 Group: Development/Tools
-Source: http://dl.sf.net/linkchecker/linkchecker-3.2.tar.gz
+Source: http://dl.sf.net/linkchecker/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://linkchecker.sourceforge.net/
 BuildRequires: python-devel
@@ -69,6 +69,9 @@
 %doc TODO doc/ cgi/lconline/ test/ README LICENSE
 
 %changelog
+* Mon Jan 03 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-1
+   - Update to linkchecker 3.3.
+
 * Sun Jan 02 2006 W. Michael Petullo <mike[at]flyn.org> - 3.2-4
    - Bump release number to re-import.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Nov 2005 03:27:27 -0000	1.2
+++ sources	3 Jan 2006 12:23:54 -0000	1.3
@@ -1 +1 @@
-95c79936dadbbe9b5a17c297e5c98fb5  linkchecker-3.2.tar.gz
+84b1ac29c8a638f77f9db5c2b27b5a79  linkchecker-3.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 12:57:21 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:57:21 -0500
Subject: rpms/linkchecker import.log,1.5,1.6
Message-ID: <200601031257.k03CvrA7016791@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757

Modified Files:
	import.log 
Log Message:
auto-import linkchecker-3.3-2 on branch devel from linkchecker-3.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	3 Jan 2006 12:23:48 -0000	1.5
+++ import.log	3 Jan 2006 12:57:21 -0000	1.6
@@ -2,3 +2,4 @@
 linkchecker-3_2-4:HEAD:linkchecker-3.2-4.src.rpm:1136260100
 linkchecker-3_2-5:HEAD:linkchecker-3.2-5.src.rpm:1136260374
 linkchecker-3_3-1:HEAD:linkchecker-3.3-1.src.rpm:1136291023
+linkchecker-3_3-2:HEAD:linkchecker-3.3-2.src.rpm:1136293034



From fedora-extras-commits at redhat.com  Tue Jan  3 12:57:27 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue,  3 Jan 2006 07:57:27 -0500
Subject: rpms/linkchecker/devel linkchecker.spec,1.3,1.4
Message-ID: <200601031257.k03Cvx2o016794@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/linkchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16757/devel

Modified Files:
	linkchecker.spec 
Log Message:
auto-import linkchecker-3.3-2 on branch devel from linkchecker-3.3-2.src.rpm


Index: linkchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/linkchecker/devel/linkchecker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linkchecker.spec	3 Jan 2006 12:23:54 -0000	1.3
+++ linkchecker.spec	3 Jan 2006 12:57:26 -0000	1.4
@@ -4,7 +4,7 @@
 Summary: Check HTML documents for broken links
 Name: linkchecker
 Version: 3.3
-Release: 1
+Release: 2
 License: GPL
 Group: Development/Tools
 Source: http://dl.sf.net/linkchecker/%{name}-%{version}.tar.gz
@@ -63,12 +63,27 @@
 %{python_sitelib}/linkcheck/logger/*.py
 %{python_sitelib}/linkcheck/logger/*.pyc
 %ghost %{python_sitelib}/linkcheck/logger/*.pyo
+%dir %{python_sitelib}/linkcheck/dns/rdtypes/ANY
+%{python_sitelib}/linkcheck/dns/rdtypes/ANY/*.py
+%{python_sitelib}/linkcheck/dns/rdtypes/ANY/*.pyc
+%ghost %{python_sitelib}/linkcheck/dns/rdtypes/ANY/*.pyo
+%dir %{python_sitelib}/linkcheck/dns/rdtypes/IN
+%{python_sitelib}/linkcheck/dns/rdtypes/IN/*.py
+%{python_sitelib}/linkcheck/dns/rdtypes/IN/*.pyc
+%ghost %{python_sitelib}/linkcheck/dns/rdtypes/IN/*.pyo
+%dir %{python_sitelib}/linkcheck/dns/rdtypes
+%{python_sitelib}/linkcheck/dns/rdtypes/*.py
+%{python_sitelib}/linkcheck/dns/rdtypes/*.pyc
+%ghost %{python_sitelib}/linkcheck/dns/rdtypes/*.pyo
 %dir %{_datadir}/linkchecker/
 %{_datadir}/linkchecker/*
 %{_mandir}/man1/*
 %doc TODO doc/ cgi/lconline/ test/ README LICENSE
 
 %changelog
+* Mon Jan 03 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-2
+   - Add some missing items to %%files.
+
 * Mon Jan 03 2006 W. Michael Petullo <mike[at]flyn.org> - 3.3-1
    - Update to linkchecker 3.3.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:18:04 2006
From: fedora-extras-commits at redhat.com (Caolan McNamara (caolanm))
Date: Tue,  3 Jan 2006 09:18:04 -0500
Subject: rpms/dia/devel dia-0.94-gnomeflags.patch,NONE,1.1 dia.spec,1.5,1.6
Message-ID: <200601031418.k03EIkfj020414@cvs-int.fedora.redhat.com>

Author: caolanm

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20394

Modified Files:
	dia.spec 
Added Files:
	dia-0.94-gnomeflags.patch 
Log Message:
make buildable

dia-0.94-gnomeflags.patch:

--- NEW FILE dia-0.94-gnomeflags.patch ---
--- dia-0.94.orig/plug-ins/cairo/Makefile.am	2006-01-03 13:45:06.000000000 +0000
+++ dia-0.94/plug-ins/cairo/Makefile.am	2006-01-03 13:45:30.000000000 +0000
@@ -11,4 +11,4 @@
 
 libcairo_filter_la_LIBADD = $(CAIRO_LIBS)
 
-INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
+INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS) $(GNOME_CFLAGS)
--- dia-0.94.orig/app/Makefile.am	2006-01-03 13:53:07.000000000 +0000
+++ dia-0.94/app/Makefile.am	2006-01-03 13:53:27.000000000 +0000
@@ -8,6 +8,7 @@
 	-I$(top_srcdir)/lib \
 	$(DEBUG_FLAGS) \
 	$(GTK_CFLAGS) \
+	$(GNOME_CFLAGS) \
         -DPREFIX=\""$(prefix)"\" \
         -DSYSCONFDIR=\""$(sysconfdir)"\" \
         -DDATADIR=\""$(datadir)"\" \
--- dia-0.94.orig/app/Makefile.am	2006-01-03 14:02:08.000000000 +0000
+++ dia-0.94/app/Makefile.am	2006-01-03 14:04:00.000000000 +0000
@@ -168,7 +168,7 @@
 
 dia_LDADD = ../lib/libdia.la \
 	$(EFENCE) \
-	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
+	$(APP_LIBS) $(Z_LIBS) $(FREETYPE_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(PNG_LIBS) $(INTLLIBS) $(INTLOBJS)
 
 #diaconv_LDADD = ../lib/libdia.la \
 #	$(EFENCE) \


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dia.spec	3 Jan 2006 11:24:14 -0000	1.5
+++ dia.spec	3 Jan 2006 14:17:55 -0000	1.6
@@ -5,7 +5,7 @@
 Name: 		dia
 Summary:	A diagram drawing program.
 Version:	0.94
-Release:	18
+Release:	19
 Epoch:		1
 Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Group:		Applications/Multimedia
@@ -33,6 +33,7 @@
 Patch3: dia-0.94-gcc4.patch
 Patch4: dia-0.94-fallbacktoxpmicons.patch
 Patch5: dia-0.94-rh165337.patch
+Patch6: dia-0.94-gnomeflags.patch
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -51,6 +52,7 @@
 %patch3 -p1 -b .gcc4
 %patch4 -p1 -b .fallbacktoxpmicons
 %patch5 -p1 -b .rh165337
+%patch6 -p1 -b .gnomeflags
 
 %build
 rm doc/*/dia.1
@@ -60,6 +62,8 @@
 autoconf
 %configure --enable-gnome --enable-db2html --with-cairo=no
 
+export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0`
+export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0`
 CFLAGS=$RPM_OPT_FLAGS make
  
 %install
@@ -113,6 +117,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-19
+- make buildable
+
 * Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-18
 - rh#176504# add BuildRequires
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:43:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 09:43:54 -0500
Subject: rpms/geomview/devel .cvsignore, 1.2, 1.3 geomview-1.8.1-rh.patch,
	1.1, 
	1.2 geomview.desktop, 1.1, 1.2 geomview.spec, 1.4, 1.5 sources,
	1.2, 1.3 geomview-1.8.1-cH-2.diff, 1.1, NONE
Message-ID: <200601031444.k03EiRPH020540@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20512

Modified Files:
	.cvsignore geomview-1.8.1-rh.patch geomview.desktop 
	geomview.spec sources 
Removed Files:
	geomview-1.8.1-cH-2.diff 
Log Message:
* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
- cvs20040421
- --with-xforms unconditional, Obsoletes/Provides: geomview-plugins



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Dec 2004 11:58:48 -0000	1.2
+++ .cvsignore	3 Jan 2006 14:43:54 -0000	1.3
@@ -1,3 +1,3 @@
-geomview-1.8.1.tar.gz
 maniview-2.0.0.tar.gz
 orrery-0.9.3.tar.gz
+geomview-snapshot-2004-02-21.tar.gz

geomview-1.8.1-rh.patch:

Index: geomview-1.8.1-rh.patch
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview-1.8.1-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview-1.8.1-rh.patch	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview-1.8.1-rh.patch	3 Jan 2006 14:43:54 -0000	1.2
@@ -1,4 +1,4 @@
---- geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
+--- Geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
 +++ geomview-1.8.1/configure.in	2004-03-16 13:05:13.000000000 -0600
 @@ -491,10 +491,10 @@
  


Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.desktop	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.desktop	3 Jan 2006 14:43:54 -0000	1.2
@@ -2,8 +2,8 @@
 Name=geomview
 Comment=An interactive 3D viewing program
 Exec=geomview
-Icon=geomview.png
-MimeType=
+Icon=geomview
+#MimeType=application/x-geomview
 Type=Application
 Encoding=UTF-8
 Categories=Application;Graphics;Scientific;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geomview.spec	6 Apr 2005 22:11:38 -0000	1.4
+++ geomview.spec	3 Jan 2006 14:43:54 -0000	1.5
@@ -1,57 +1,53 @@
-# $Id$
 
-%define xforms_ver 1.0
-%define maniview_ver 2.0.0
-%define orrery_ver 0.9.3
+## Conditional build:
+# FIXME
+%define _with_orrery --with-orrery
+%define _with_maniview --with-maniview
+
+%define beta -alpha
+%define cvs  20040221
 
 Name:    geomview
 Summary: Interactive 3D viewing program
-Version: 1.8.1
-Release: 11%{?dist_tag}
+Version: 1.8.2
+Release: 0.1.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
-#Url:     http://sourceforge.net/projects/geomview/
+#Url:    http://sourceforge.net/projects/geomview/
 Group:   Applications/Engineering
-Source:  http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+#Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz
+Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: geomview.desktop
 Source2: geomview.png
 
 # Other plugins
+%define orrery_ver 0.9.3
 Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
+%define maniview_ver 2.0.0
 Source11: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
 
 ## Patches
 # put moduledir and data in sane locations
 Patch1: geomview-1.8.1-rh.patch
-# from the "patches" section of http://sourceforge.net/projects/geomview/
-Patch2: geomview-1.8.1-cH-2.diff
 
 BuildRequires: desktop-file-utils
-BuildRequires: autoconf213 automake14 libtool flex
+#BuildRequires: automake libtool
+BuildRequires: flex
 BuildRequires: openmotif-devel
-# For libGL/libGLU (yuck, but I see no other way -- Rex)
+BuildRequires: xforms-devel
+## X/GL support
+%if "%{?fedora}" > "4"
+BuildRequires: libGL-devel libGLU-devel
+%else
 BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+%endif
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-## XForms configuration
-# use xforms by default, unless rpmbuild --without xforms
-%{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
-## plugins, default to yes, unless rpmbuild --without pluginname
-# default plugins
-#{?_without_xforms:Obsoletes: %{name}-plugins < %{version}-%{release}}
-# maniview (requires xforms)
-%{?_without_xforms:%define _without_maniview --without-maniview}
-%{!?_without_maniview:%define _with_maniview --with-maniview}
-#{?_without_maniview:Obsoletes: %{name}-maniview < %{maniview_ver}-%{release}}
-# orrery
-%{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
-
 %description
 Geomview is an interactive 3D viewing program for Unix. It lets you view and
 manipulate 3D objects: you use the mouse to rotate, translate, zoom in and out,
@@ -60,16 +56,8 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-
-%if "%{?_with_xforms:1}" == "1"
-%package plugins
-Group:   Applications/Engineering
-Summary: %{name} plugins
-Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
-%description plugins
-Geomview default plugins
-%endif
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
 
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
@@ -93,39 +81,68 @@
 Group:   Applications/Engineering
 Summary: Geomview module for viewing 3D manifolds
 Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
+BuildRequires: xforms-devel 
 Obsoletes: maniview < %{maniview_ver}-%{release}
-Provides: maniview = %{maniview_ver}-%{release}
+Provides:  maniview = %{maniview_ver}-%{release}
 %description maniview
-a Geomview module for viewing 3D manifolds.
+%{summary}.
 %endif
 
 
 %prep
-%setup -q %{?_with_orrery: -a 10} %{?_with_maniview: -a 11}
+%setup -q -n %{name}-%{version}%{?beta} 
 
 %patch1 -p1 -b .rh
-%patch2 -p1 -b .gcc3
 
 libtoolize --force
-aclocal-1.4 -I ./m4
-automake-1.4
-autoconf-2.13
-autoheader-2.13
-
-# Move misc plugins to correct location
-%{?_with_orrery:(  mv orrery* src/bin; ln -s src/bin/orrery*     ) }
-%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
+aclocal -I m4
+autoconf
+autoheader
+automake -a
+
+%if "%{?_with_orrery:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 10
+pushd orrery-%{orrery_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
+
+%if "%{?_with_maniview:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 11
+pushd maniview-%{maniview_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
 
 
 %build
 
-%{?CCC:export %{CCC}}
-%{?CXX:export %{CXX}}
+export ACLOCAL=aclocal
+export AUTOMAKE=automake
+
+# --config-cache (for maniview)
 %configure \
-  %{?_with_xforms} %{?_without_xforms}
+  --config-cache 
 
-make MATHLIB=-lm %{?CCC} %{?CXX}
+# Either do (re)automake steps above for addons, or this. -- Rex
+%if 0
+#--no-recursion
+%{?_with_orrery:(cd src/bin/orrery-%{orrery_ver};%configure)}
+%{?_with_maniview:(cd src/bin/maniview-%{maniview_ver};%configure --cache-file=../../../config.cache)}
+%endif
+
+# not smp-safe
+make MATHLIB=-lm
 
 
 %install
@@ -141,7 +158,7 @@
   %{SOURCE1}
 
 # app icon
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
 
 # move the html manual for inclusion later
 mv doc/html .
@@ -149,84 +166,97 @@
 # fixup info, We'll use install-info later
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-# Manually install maniview manpage
-%{?_with_maniview:install -D -m644 src/bin/maniview*/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
+# maniview manpage
+%{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
+%POST
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 
 %preun
 if [ $1 -eq 0 ] ;then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 fi
 
+%postun
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL INSTALL.Geomview NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %doc html
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_bindir}/*
 %{_infodir}/*
-%{_mandir}/man?/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/.geomview
-%{_datadir}/%{name}/geom
-%{_datadir}/%{name}/cmap.fmap
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/gvx
-%{_libexecdir}/%{name}/animate
-%{_libexecdir}/%{name}/.geomview-animate
-%{_libexecdir}/%{name}/drawbdy
-%{_libexecdir}/%{name}/.geomview-drawbdy
-
-%if "%{?_with_xforms:1}" == "1"
-%files plugins
-%defattr(-,root,root)
-%{_libexecdir}/%{name}/example
-%{_libexecdir}/%{name}/.geomview-example
-%{_libexecdir}/%{name}/ginsu
-%{_libexecdir}/%{name}/.geomview-ginsu
-%{_libexecdir}/%{name}/graffiti
-%{_libexecdir}/%{name}/.geomview-graffiti
-%{_libexecdir}/%{name}/stereo
-%{_libexecdir}/%{name}/.geomview-stereo
-%{_libexecdir}/%{name}/sweep
-%{_libexecdir}/%{name}/.geomview-sweep
-%{_libexecdir}/%{name}/tackdown
-%{_libexecdir}/%{name}/.geomview-tackdown
-%{_libexecdir}/%{name}/transformer
-%{_libexecdir}/%{name}/.geomview-transformer
-%{_libexecdir}/%{name}/origin
-%endif
+%{_mandir}/man1/*
+%{_datadir}/geomview/
+%{_libexecdir}/geomview/gvx
+%{_libexecdir}/geomview/animate
+%{_libexecdir}/geomview/.geomview-animate
+%{_libexecdir}/geomview/drawbdy
+%{_libexecdir}/geomview/.geomview-drawbdy
+%{_libexecdir}/geomview/example
+%{_libexecdir}/geomview/.geomview-example
+%{_libexecdir}/geomview/ginsu
+%{_libexecdir}/geomview/.geomview-ginsu
+%{_libexecdir}/geomview/graffiti
+%{_libexecdir}/geomview/.geomview-graffiti
+%{_libexecdir}/geomview/stereo
+%{_libexecdir}/geomview/.geomview-stereo
+%{_libexecdir}/geomview/sweep
+%{_libexecdir}/geomview/.geomview-sweep
+%{_libexecdir}/geomview/tackdown
+%{_libexecdir}/geomview/.geomview-tackdown
+%{_libexecdir}/geomview/transformer
+%{_libexecdir}/geomview/.geomview-transformer
+%{_libexecdir}/geomview/origin
+%{?_with_orrery:%exclude %{_datadir}/geomview/modules/ }
+%{?_with_maniview:%exclude %{_datadir}/geomview/groups/ }
+%{?_with_maniview:%exclude %{_mandir}/man1/maniview* }
 
 %if "%{?_with_orrery:1}" == "1"
 %files orrery
-%defattr(-,root,root)
-%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog
+%defattr(-,root,root,-)
+%doc src/bin/orrery*/AUTHORS src/bin/orrery*/ChangeLog src/bin/orrery*/COPYING
+%doc src/bin/orrery*/NEWS src/bin/orrery*/README
 %dir %{_datadir}/geomview/modules
 %{_datadir}/geomview/modules/orrery
-%{_libexecdir}/%{name}/.geomview-orrery
+%{_libexecdir}/geomview/.geomview-orrery
 %endif
 
 %if "%{?_with_maniview:1}" == "1"
 %files maniview
-%defattr(-,root,root)
-%doc maniview*/README maniview*/NEWS maniview*/AUTHORS maniview*/ChangeLog
-%{_datadir}/%{name}/groups
-%{_libexecdir}/%{name}/maniview
-%{_libexecdir}/%{name}/.geomview-maniview
+%defattr(-,root,root,-)
+%doc src/bin/maniview*/AUTHORS src/bin/maniview*/ChangeLog src/bin/maniview*/COPYING
+%doc src/bin/maniview*/README src/bin/maniview*/NEWS
+%{_datadir}/geomview/groups/
+%{_libexecdir}/geomview/maniview
+%{_libexecdir}/geomview/.geomview-maniview
 %{_mandir}/man1/maniview*
 %endif
 
 
 %changelog
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
+- cvs20040421
+- --with-xforms unconditional, Obsoletes/Provides: geomview-plugins
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]usres.sf.net> 1.8.1-12
+- follow/use icon spec
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Dec 2004 11:58:48 -0000	1.2
+++ sources	3 Jan 2006 14:43:54 -0000	1.3
@@ -1,3 +1,3 @@
-1cb0e07a6552e9fe122491af70171536  geomview-1.8.1.tar.gz
+776c3acefac602c422dacd45119f3560  geomview-snapshot-2004-02-21.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz


--- geomview-1.8.1-cH-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 14:51:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 09:51:10 -0500
Subject: rpms/xsupplicant/devel xsupplicant-1.2.2-buf.patch, NONE,
	1.1 xsupplicant.spec, 1.13, 1.14
Message-ID: <200601031451.k03EpgLm020651@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-buf.patch 
Log Message:
fix a possible bufferoverflow bz 170045

xsupplicant-1.2.2-buf.patch:

--- NEW FILE xsupplicant-1.2.2-buf.patch ---
--- xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c.buf	2006-01-03 08:38:37.000000000 +0100
+++ xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c	2006-01-03 08:40:18.000000000 +0100
@@ -806,7 +806,9 @@
   sockData = thisint->sockData;
 
   errno = 0;
-  resultsize = 1550;
+  resultsize = 1520; /* was 1550 but this can cause a bufoverflow, upstream
+                        has changed this to 1520 in CVS, so we fix this
+                        the same way */
 
   newsize = recvfrom(sockData->sockInt, resultframe, resultsize, 0, 0, 0);
   if (newsize <= 0)


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xsupplicant.spec	15 Nov 2005 19:50:16 -0000	1.13
+++ xsupplicant.spec	3 Jan 2006 14:51:09 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.2-compilefix.patch
+Patch2:		xsupplicant-1.2.2-buf.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Tue Jan  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-7
+- fix a possible bufferoverflow bz 170045
+
 * Tue Nov  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2-6
 - compile fix
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:51:54 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  3 Jan 2006 09:51:54 -0500
Subject: fedora-security/audit fc4,1.112,1.113 fc5,1.23,1.24
Message-ID: <200601031452.k03EqPcB020721@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20645

Modified Files:
	fc4 fc5 
Log Message:
Note an issue fixed in the latest ethereal release.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc4	20 Dec 2005 22:27:22 -0000	1.112
+++ fc4	3 Jan 2006 14:51:52 -0000	1.113
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fc5	21 Dec 2005 08:38:29 -0000	1.23
+++ fc5	3 Jan 2006 14:51:52 -0000	1.24
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2005-4585 version (ethereal, fixed 0.10.14)
 CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment



From fedora-extras-commits at redhat.com  Tue Jan  3 14:52:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 09:52:38 -0500
Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.2-buf.patch, NONE,
	1.1 xsupplicant.spec, 1.13, 1.14
Message-ID: <200601031453.k03ErAKj020763@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20733

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-buf.patch 
Log Message:
fix a possible bufferoverflow bz 170045

xsupplicant-1.2.2-buf.patch:

--- NEW FILE xsupplicant-1.2.2-buf.patch ---
--- xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c.buf	2006-01-03 08:38:37.000000000 +0100
+++ xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c	2006-01-03 08:40:18.000000000 +0100
@@ -806,7 +806,9 @@
   sockData = thisint->sockData;
 
   errno = 0;
-  resultsize = 1550;
+  resultsize = 1520; /* was 1550 but this can cause a bufoverflow, upstream
+                        has changed this to 1520 in CVS, so we fix this
+                        the same way */
 
   newsize = recvfrom(sockData->sockInt, resultframe, resultsize, 0, 0, 0);
   if (newsize <= 0)


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xsupplicant.spec	15 Nov 2005 19:50:11 -0000	1.13
+++ xsupplicant.spec	3 Jan 2006 14:52:38 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -11,6 +11,7 @@
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
 Patch1:		xsupplicant-1.2.2-compilefix.patch
+Patch2:		xsupplicant-1.2.2-buf.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -22,6 +23,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -52,6 +54,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Tue Jan  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-7
+- fix a possible bufferoverflow bz 170045
+
 * Tue Nov  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2-6
 - compile fix
 



From fedora-extras-commits at redhat.com  Tue Jan  3 14:57:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 09:57:42 -0500
Subject: rpms/xsupplicant/FC-3 xsupplicant-1.2.2-buf.patch, NONE,
	1.1 xsupplicant.spec, 1.13, 1.14
Message-ID: <200601031458.k03EwFhl020853@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20833

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-buf.patch 
Log Message:
fix a possible bufferoverflow bz 170045

xsupplicant-1.2.2-buf.patch:

--- NEW FILE xsupplicant-1.2.2-buf.patch ---
--- xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c.buf	2006-01-03 08:38:37.000000000 +0100
+++ xsupplicant-1.2.2/src/cardif/linux/cardif_linux.c	2006-01-03 08:40:18.000000000 +0100
@@ -806,7 +806,9 @@
   sockData = thisint->sockData;
 
   errno = 0;
-  resultsize = 1550;
+  resultsize = 1520; /* was 1550 but this can cause a bufoverflow, upstream
+                        has changed this to 1520 in CVS, so we fix this
+                        the same way */
 
   newsize = recvfrom(sockData->sockInt, resultframe, resultsize, 0, 0, 0);
   if (newsize <= 0)


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/xsupplicant.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xsupplicant.spec	15 Nov 2005 19:50:05 -0000	1.13
+++ xsupplicant.spec	3 Jan 2006 14:57:42 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
 Version:	1.2.2
-Release:	6%{?dist}
+Release:	7%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -10,6 +10,7 @@
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
 Patch0:		xsupplicant-1.2.1-docsfix.patch
+Patch1:		xsupplicant-1.2.2-buf.patch
 
 %description
 This software allows a GNU/Linux or BSD workstation to authenticate with
@@ -20,6 +21,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure*
 
@@ -50,6 +52,9 @@
 %{_sbindir}/xsupplicant
 
 %changelog
+* Tue Jan  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.2-7
+- fix a possible bufferoverflow bz 170045
+
 * Tue Nov  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2-6
 - compile fix (FC-4 + only)
 



From fedora-extras-commits at redhat.com  Tue Jan  3 15:09:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue,  3 Jan 2006 10:09:52 -0500
Subject: rpms/xsupplicant/devel xsupplicant-1.2.2-docsfix.patch, NONE,
	1.1 xsupplicant.spec, 1.14, 1.15 xsupplicant-1.2.1-docsfix.patch,
	1.5, NONE
Message-ID: <200601031510.k03FAOmX022556@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533

Modified Files:
	xsupplicant.spec 
Added Files:
	xsupplicant-1.2.2-docsfix.patch 
Removed Files:
	xsupplicant-1.2.1-docsfix.patch 
Log Message:
Fix docbook doc generation on devel

xsupplicant-1.2.2-docsfix.patch:

--- NEW FILE xsupplicant-1.2.2-docsfix.patch ---
--- xsupplicant-1.2.2/doc/xml-userguide/userguide.xml.BAD	2005-09-04 10:28:44.000000000 -0500
+++ xsupplicant-1.2.2/doc/xml-userguide/userguide.xml	2005-09-04 10:28:53.000000000 -0500
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+    "/usr/share/sgml/docbook/xml-dtd-4.3-1.0-30/docbookx.dtd"
     [
       <!ENTITY chapter1 SYSTEM "chapter1.xml">
       <!ENTITY chapter2 SYSTEM "chapter2.xml">


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xsupplicant.spec	3 Jan 2006 14:51:09 -0000	1.14
+++ xsupplicant.spec	3 Jan 2006 15:09:52 -0000	1.15
@@ -9,7 +9,7 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, bison, flex, openjade, lynx, jadetex
 BuildRequires:	docbook-dtds, docbook-style-dsssl, wireless-tools
-Patch0:		xsupplicant-1.2.1-docsfix.patch
+Patch0:		xsupplicant-1.2.2-docsfix.patch
 Patch1:		xsupplicant-1.2.2-compilefix.patch
 Patch2:		xsupplicant-1.2.2-buf.patch
 


--- xsupplicant-1.2.1-docsfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 15:11:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 10:11:53 -0500
Subject: rpms/geomview/FC-4 .cvsignore, 1.2, 1.3 geomview-1.8.1-rh.patch, 1.1,
	1.2 geomview.desktop, 1.1, 1.2 geomview.spec, 1.4, 1.5 sources,
	1.2, 1.3 geomview-1.8.1-cH-2.diff, 1.1, NONE
Message-ID: <200601031513.k03FD0uD022675@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22619

Modified Files:
	.cvsignore geomview-1.8.1-rh.patch geomview.desktop 
	geomview.spec sources 
Removed Files:
	geomview-1.8.1-cH-2.diff 
Log Message:
* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Dec 2004 11:58:48 -0000	1.2
+++ .cvsignore	3 Jan 2006 15:11:53 -0000	1.3
@@ -1,3 +1,3 @@
-geomview-1.8.1.tar.gz
 maniview-2.0.0.tar.gz
 orrery-0.9.3.tar.gz
+geomview-snapshot-2004-02-21.tar.gz

geomview-1.8.1-rh.patch:

Index: geomview-1.8.1-rh.patch
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview-1.8.1-rh.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview-1.8.1-rh.patch	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview-1.8.1-rh.patch	3 Jan 2006 15:11:53 -0000	1.2
@@ -1,4 +1,4 @@
---- geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
+--- Geomview-1.8.1/configure.in.rh	2001-03-25 19:56:01.000000000 -0600
 +++ geomview-1.8.1/configure.in	2004-03-16 13:05:13.000000000 -0600
 @@ -491,10 +491,10 @@
  


Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geomview.desktop	24 Dec 2004 11:58:48 -0000	1.1
+++ geomview.desktop	3 Jan 2006 15:11:53 -0000	1.2
@@ -2,8 +2,8 @@
 Name=geomview
 Comment=An interactive 3D viewing program
 Exec=geomview
-Icon=geomview.png
-MimeType=
+Icon=geomview
+#MimeType=application/x-geomview
 Type=Application
 Encoding=UTF-8
 Categories=Application;Graphics;Scientific;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- geomview.spec	6 Apr 2005 22:11:38 -0000	1.4
+++ geomview.spec	3 Jan 2006 15:11:53 -0000	1.5
@@ -1,57 +1,52 @@
-# $Id$
 
-%define xforms_ver 1.0
-%define maniview_ver 2.0.0
-%define orrery_ver 0.9.3
+## Conditional build:
+%define _with_orrery --with-orrery
+%define _with_maniview --with-maniview
+
+%define beta -alpha
+%define cvs  20040221
 
 Name:    geomview
 Summary: Interactive 3D viewing program
-Version: 1.8.1
-Release: 11%{?dist_tag}
+Version: 1.8.2
+Release: 0.1.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
-#Url:     http://sourceforge.net/projects/geomview/
+#Url:    http://sourceforge.net/projects/geomview/
 Group:   Applications/Engineering
-Source:  http://dl.sourceforge.net/sourceforge/geomview/geomview-1.8.1.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+#Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz
+Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: geomview.desktop
 Source2: geomview.png
 
 # Other plugins
+%define orrery_ver 0.9.3
 Source10: http://dl.sourceforge.net/geomview/orrery-%{orrery_ver}.tar.gz
+%define maniview_ver 2.0.0
 Source11: http://dl.sourceforge.net/geomview/maniview-%{maniview_ver}.tar.gz
 
 ## Patches
 # put moduledir and data in sane locations
 Patch1: geomview-1.8.1-rh.patch
-# from the "patches" section of http://sourceforge.net/projects/geomview/
-Patch2: geomview-1.8.1-cH-2.diff
 
 BuildRequires: desktop-file-utils
-BuildRequires: autoconf213 automake14 libtool flex
+#BuildRequires: automake libtool
+BuildRequires: flex
 BuildRequires: openmotif-devel
-# For libGL/libGLU (yuck, but I see no other way -- Rex)
+BuildRequires: xforms-devel
+## X/GL support
+%if "%{?fedora}" > "3"
+BuildRequires: libGL-devel libGLU-devel
+%else
 BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+%endif
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-## XForms configuration
-# use xforms by default, unless rpmbuild --without xforms
-%{!?_without_xforms:%{?!_with_xforms:%define _with_xforms --with-xforms}}
-## plugins, default to yes, unless rpmbuild --without pluginname
-# default plugins
-#{?_without_xforms:Obsoletes: %{name}-plugins < %{version}-%{release}}
-# maniview (requires xforms)
-%{?_without_xforms:%define _without_maniview --without-maniview}
-%{!?_without_maniview:%define _with_maniview --with-maniview}
-#{?_without_maniview:Obsoletes: %{name}-maniview < %{maniview_ver}-%{release}}
-# orrery
-%{!?_without_orrery:%define _with_orrery --with-orrery}
-#{?_without_orrey:Obsoletes: %{name}-orrery < %{orrery_ver}-%{release}}
-
 %description
 Geomview is an interactive 3D viewing program for Unix. It lets you view and
 manipulate 3D objects: you use the mouse to rotate, translate, zoom in and out,
@@ -60,16 +55,8 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-
-%if "%{?_with_xforms:1}" == "1"
-%package plugins
-Group:   Applications/Engineering
-Summary: %{name} plugins
-Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
-%description plugins
-Geomview default plugins
-%endif
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
 
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
@@ -93,39 +80,68 @@
 Group:   Applications/Engineering
 Summary: Geomview module for viewing 3D manifolds
 Requires: %{name} = %{version}
-BuildRequires: xforms-devel >= %{xforms_ver}
+BuildRequires: xforms-devel 
 Obsoletes: maniview < %{maniview_ver}-%{release}
-Provides: maniview = %{maniview_ver}-%{release}
+Provides:  maniview = %{maniview_ver}-%{release}
 %description maniview
-a Geomview module for viewing 3D manifolds.
+%{summary}.
 %endif
 
 
 %prep
-%setup -q %{?_with_orrery: -a 10} %{?_with_maniview: -a 11}
+%setup -q -n %{name}-%{version}%{?beta} 
 
 %patch1 -p1 -b .rh
-%patch2 -p1 -b .gcc3
 
 libtoolize --force
-aclocal-1.4 -I ./m4
-automake-1.4
-autoconf-2.13
-autoheader-2.13
-
-# Move misc plugins to correct location
-%{?_with_orrery:(  mv orrery* src/bin; ln -s src/bin/orrery*     ) }
-%{?_with_maniview:(mv maniview* src/bin; ln -s src/bin/maniview* )}
+aclocal -I m4
+autoconf
+autoheader
+automake -a
+
+%if "%{?_with_orrery:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 10
+pushd orrery-%{orrery_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
+
+%if "%{?_with_maniview:1}" == "1"
+%setup -q -T -D -n %{name}-%{version}%{?beta}/src/bin -a 11
+pushd maniview-%{maniview_ver}
+libtoolize --force
+aclocal -I ../../../m4
+autoconf
+autoheader
+automake -a
+popd
+%setup -T -D -n %{name}-%{version}%{?beta}
+%endif
 
 
 %build
 
-%{?CCC:export %{CCC}}
-%{?CXX:export %{CXX}}
+export ACLOCAL=aclocal
+export AUTOMAKE=automake
+
+# --config-cache (for maniview)
 %configure \
-  %{?_with_xforms} %{?_without_xforms}
+  --config-cache 
 
-make MATHLIB=-lm %{?CCC} %{?CXX}
+# Either do (re)automake steps above for addons, or this. -- Rex
+%if 0
+#--no-recursion
+%{?_with_orrery:(cd src/bin/orrery-%{orrery_ver};%configure)}
+%{?_with_maniview:(cd src/bin/maniview-%{maniview_ver};%configure --cache-file=../../../config.cache)}
+%endif
+
+# not smp-safe
+make MATHLIB=-lm
 
 
 %install
@@ -141,7 +157,7 @@
   %{SOURCE1}
 
 # app icon
-install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
+install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
 
 # move the html manual for inclusion later
 mv doc/html .
@@ -149,84 +165,97 @@
 # fixup info, We'll use install-info later
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
-# Manually install maniview manpage
-%{?_with_maniview:install -D -m644 src/bin/maniview*/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
+# maniview manpage
+%{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post
+%POST
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
 
 %preun
 if [ $1 -eq 0 ] ;then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 fi
 
+%postun
+for icon_theme in hicolor ; do
+  touch --no-create %{_datadir}/icons/${icon_theme} ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
+done
+
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING INSTALL INSTALL.Geomview NEWS README
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
 %doc html
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_bindir}/*
 %{_infodir}/*
-%{_mandir}/man?/*
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/.geomview
-%{_datadir}/%{name}/geom
-%{_datadir}/%{name}/cmap.fmap
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/gvx
-%{_libexecdir}/%{name}/animate
-%{_libexecdir}/%{name}/.geomview-animate
-%{_libexecdir}/%{name}/drawbdy
-%{_libexecdir}/%{name}/.geomview-drawbdy
-
-%if "%{?_with_xforms:1}" == "1"
-%files plugins
-%defattr(-,root,root)
-%{_libexecdir}/%{name}/example
-%{_libexecdir}/%{name}/.geomview-example
-%{_libexecdir}/%{name}/ginsu
-%{_libexecdir}/%{name}/.geomview-ginsu
-%{_libexecdir}/%{name}/graffiti
-%{_libexecdir}/%{name}/.geomview-graffiti
-%{_libexecdir}/%{name}/stereo
-%{_libexecdir}/%{name}/.geomview-stereo
-%{_libexecdir}/%{name}/sweep
-%{_libexecdir}/%{name}/.geomview-sweep
-%{_libexecdir}/%{name}/tackdown
-%{_libexecdir}/%{name}/.geomview-tackdown
-%{_libexecdir}/%{name}/transformer
-%{_libexecdir}/%{name}/.geomview-transformer
-%{_libexecdir}/%{name}/origin
-%endif
+%{_mandir}/man1/*
+%{_datadir}/geomview/
+%{_libexecdir}/geomview/gvx
+%{_libexecdir}/geomview/animate
+%{_libexecdir}/geomview/.geomview-animate
+%{_libexecdir}/geomview/drawbdy
+%{_libexecdir}/geomview/.geomview-drawbdy
+%{_libexecdir}/geomview/example
+%{_libexecdir}/geomview/.geomview-example
+%{_libexecdir}/geomview/ginsu
+%{_libexecdir}/geomview/.geomview-ginsu
+%{_libexecdir}/geomview/graffiti
+%{_libexecdir}/geomview/.geomview-graffiti
+%{_libexecdir}/geomview/stereo
+%{_libexecdir}/geomview/.geomview-stereo
+%{_libexecdir}/geomview/sweep
+%{_libexecdir}/geomview/.geomview-sweep
+%{_libexecdir}/geomview/tackdown
+%{_libexecdir}/geomview/.geomview-tackdown
+%{_libexecdir}/geomview/transformer
+%{_libexecdir}/geomview/.geomview-transformer
+%{_libexecdir}/geomview/origin
+%{?_with_orrery:%exclude %{_datadir}/geomview/modules/ }
+%{?_with_maniview:%exclude %{_datadir}/geomview/groups/ }
+%{?_with_maniview:%exclude %{_mandir}/man1/maniview* }
 
 %if "%{?_with_orrery:1}" == "1"
 %files orrery
-%defattr(-,root,root)
-%doc orrery*/README orrery*/NEWS orrery*/AUTHORS orrery*/ChangeLog
+%defattr(-,root,root,-)
+%doc src/bin/orrery*/AUTHORS src/bin/orrery*/ChangeLog src/bin/orrery*/COPYING
+%doc src/bin/orrery*/NEWS src/bin/orrery*/README
 %dir %{_datadir}/geomview/modules
 %{_datadir}/geomview/modules/orrery
-%{_libexecdir}/%{name}/.geomview-orrery
+%{_libexecdir}/geomview/.geomview-orrery
 %endif
 
 %if "%{?_with_maniview:1}" == "1"
 %files maniview
-%defattr(-,root,root)
-%doc maniview*/README maniview*/NEWS maniview*/AUTHORS maniview*/ChangeLog
-%{_datadir}/%{name}/groups
-%{_libexecdir}/%{name}/maniview
-%{_libexecdir}/%{name}/.geomview-maniview
+%defattr(-,root,root,-)
+%doc src/bin/maniview*/AUTHORS src/bin/maniview*/ChangeLog src/bin/maniview*/COPYING
+%doc src/bin/maniview*/README src/bin/maniview*/NEWS
+%{_datadir}/geomview/groups/
+%{_libexecdir}/geomview/maniview
+%{_libexecdir}/geomview/.geomview-maniview
 %{_mandir}/man1/maniview*
 %endif
 
 
 %changelog
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
+- cvs20040421
+- --with-xforms unconditional, Obsoletes/Provides: geomview-plugins
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]usres.sf.net> 1.8.1-12
+- follow/use icon spec
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Dec 2004 11:58:48 -0000	1.2
+++ sources	3 Jan 2006 15:11:53 -0000	1.3
@@ -1,3 +1,3 @@
-1cb0e07a6552e9fe122491af70171536  geomview-1.8.1.tar.gz
+776c3acefac602c422dacd45119f3560  geomview-snapshot-2004-02-21.tar.gz
 109909e66ed37c678af4286cc6e620e2  maniview-2.0.0.tar.gz
 8f68b4bd7ae8b207456fbed0650a8330  orrery-0.9.3.tar.gz


--- geomview-1.8.1-cH-2.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 15:50:47 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 10:50:47 -0500
Subject: rpms/pbzip2 import.log,1.2,1.3
Message-ID: <200601031551.k03FpJkG022902@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22868

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.5-1 on branch devel from pbzip2-0.9.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	7 Sep 2005 15:28:58 -0000	1.2
+++ import.log	3 Jan 2006 15:50:47 -0000	1.3
@@ -1 +1,2 @@
 pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956
+pbzip2-0_9_5-1:HEAD:pbzip2-0.9.5-1.src.rpm:1136303439



From fedora-extras-commits at redhat.com  Tue Jan  3 15:50:53 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 10:50:53 -0500
Subject: rpms/pbzip2/devel .cvsignore, 1.2, 1.3 pbzip2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601031551.k03FpP3r022907@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22868/devel

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.5-1 on branch devel from pbzip2-0.9.5-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
+++ .cvsignore	3 Jan 2006 15:50:52 -0000	1.3
@@ -1 +1 @@
-pbzip2-0.9.4.tar.gz
+pbzip2-0.9.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/pbzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pbzip2.spec	7 Sep 2005 15:28:58 -0000	1.1
+++ pbzip2.spec	3 Jan 2006 15:50:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pbzip2
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
@@ -43,8 +43,8 @@
 
 
 %changelog
-* Wed Aug 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-2
-- Release 0.9.4-2
+* Sat Dec 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.5-1
+- Release 0.9.5
 
 * Tue Aug 30 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-1
 - Updated RPM spec with suggestions from Oliver Falk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 15:28:58 -0000	1.2
+++ sources	3 Jan 2006 15:50:52 -0000	1.3
@@ -1 +1 @@
-54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz
+94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 16:00:33 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:00:33 -0500
Subject: rpms/pbzip2 import.log,1.3,1.4
Message-ID: <200601031601.k03G14xZ024677@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23044

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-3 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	3 Jan 2006 15:50:47 -0000	1.3
+++ import.log	3 Jan 2006 16:00:32 -0000	1.4
@@ -1,2 +1,3 @@
 pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956
 pbzip2-0_9_5-1:HEAD:pbzip2-0.9.5-1.src.rpm:1136303439
+pbzip2-0_9_5-1:FC-3:pbzip2-0.9.5-1.src.rpm:1136304021



From fedora-extras-commits at redhat.com  Tue Jan  3 16:00:38 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:00:38 -0500
Subject: rpms/pbzip2/FC-3 .cvsignore, 1.2, 1.3 pbzip2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601031601.k03G1ATv024682@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23044/FC-3

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-3 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
+++ .cvsignore	3 Jan 2006 16:00:38 -0000	1.3
@@ -1 +1 @@
-pbzip2-0.9.4.tar.gz
+pbzip2-0.9.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/pbzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pbzip2.spec	7 Sep 2005 15:28:58 -0000	1.1
+++ pbzip2.spec	3 Jan 2006 16:00:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pbzip2
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
@@ -43,8 +43,8 @@
 
 
 %changelog
-* Wed Aug 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-2
-- Release 0.9.4-2
+* Sat Dec 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.5-1
+- Release 0.9.5
 
 * Tue Aug 30 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-1
 - Updated RPM spec with suggestions from Oliver Falk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 15:28:58 -0000	1.2
+++ sources	3 Jan 2006 16:00:38 -0000	1.3
@@ -1 +1 @@
-54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz
+94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 16:09:12 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:09:12 -0500
Subject: rpms/pbzip2 import.log,1.4,1.5
Message-ID: <200601031610.k03GA42w024795@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24759

Modified Files:
	import.log 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-4 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	3 Jan 2006 16:00:32 -0000	1.4
+++ import.log	3 Jan 2006 16:09:12 -0000	1.5
@@ -1,3 +1,4 @@
 pbzip2-0_9_4-2:HEAD:pbzip2-0.9.4-2.src.rpm:1126106956
 pbzip2-0_9_5-1:HEAD:pbzip2-0.9.5-1.src.rpm:1136303439
 pbzip2-0_9_5-1:FC-3:pbzip2-0.9.5-1.src.rpm:1136304021
+pbzip2-0_9_5-1:FC-4:pbzip2-0.9.5-1.src.rpm:1136304536



From fedora-extras-commits at redhat.com  Tue Jan  3 16:09:28 2006
From: fedora-extras-commits at redhat.com (Jeff Gilchrist (jeffg))
Date: Tue,  3 Jan 2006 11:09:28 -0500
Subject: rpms/pbzip2/FC-4 .cvsignore, 1.2, 1.3 pbzip2.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601031610.k03GA4aw024797@cvs-int.fedora.redhat.com>

Author: jeffg

Update of /cvs/extras/rpms/pbzip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24759/FC-4

Modified Files:
	.cvsignore pbzip2.spec sources 
Log Message:
auto-import pbzip2-0.9.5-1 on branch FC-4 from pbzip2-0.9.5-1.src.rpm
Bug fix update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 15:28:58 -0000	1.2
+++ .cvsignore	3 Jan 2006 16:09:28 -0000	1.3
@@ -1 +1 @@
-pbzip2-0.9.4.tar.gz
+pbzip2-0.9.5.tar.gz


Index: pbzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/pbzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pbzip2.spec	7 Sep 2005 15:28:58 -0000	1.1
+++ pbzip2.spec	3 Jan 2006 16:09:28 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		pbzip2
-Version:	0.9.4
-Release:	2%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	Parallel implementation of bzip2
 URL:		http://www.compression.ca/pbzip2/
 License:	BSD
@@ -43,8 +43,8 @@
 
 
 %changelog
-* Wed Aug 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-2
-- Release 0.9.4-2
+* Sat Dec 31 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.5-1
+- Release 0.9.5
 
 * Tue Aug 30 2005 Jeff Gilchrist <pbzip2 at compression.ca> - 0.9.4-1
 - Updated RPM spec with suggestions from Oliver Falk


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pbzip2/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 15:28:58 -0000	1.2
+++ sources	3 Jan 2006 16:09:28 -0000	1.3
@@ -1 +1 @@
-54d4125b788f5fe7990917256326f844  pbzip2-0.9.4.tar.gz
+94cbc6ff49a6f4df40f6b1552b613ce6  pbzip2-0.9.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 16:34:13 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  3 Jan 2006 11:34:13 -0500
Subject: fedora-security/audit fc4,1.113,1.114 fc5,1.24,1.25
Message-ID: <200601031634.k03GYhlG025007@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24987

Modified Files:
	fc4 fc5 
Log Message:
Some fixes from over the holidays
Note ethereal isn't fixed in fc5t1 (but we'll update this file after t2)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc4	3 Jan 2006 14:51:52 -0000	1.113
+++ fc4	3 Jan 2006 16:34:11 -0000	1.114
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 backport (sudo) [since FEDORA-2005-1147] was ignore only env_reset will properly clean the environment
@@ -11,6 +12,8 @@
 CVE-2005-4153 VULNERABLE (mailman)
 CVE-2005-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
+CVE-2005-4130 ** (HelixPlayer) no information available
+CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
@@ -54,6 +57,7 @@
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
 CVE-2005-3632 version (netpbm)
+CVE-2005-3631 version (udev)
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman)
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067]
@@ -747,7 +751,7 @@
 CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 version (gd, fixed 2.0.22)
+CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream bz#175414
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)
@@ -1254,6 +1258,7 @@
 CVE-2002-1793 version (mod_ssl), also only hp
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
+CVE-2002-1593 version (httpd, fixed 2.0.42)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- fc5	3 Jan 2006 14:51:52 -0000	1.24
+++ fc5	3 Jan 2006 16:34:11 -0000	1.25
@@ -12,7 +12,8 @@
 
 ** are items that need attention
 
-CVE-2005-4585 version (ethereal, fixed 0.10.14)
+CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
@@ -20,6 +21,8 @@
 CVE-2005-4153 VULNERABLE (mailman)
 CVE-2005-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
+CVE-2005-4130 ** (HelixPlayer) no information available
+CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
@@ -60,6 +63,7 @@
 CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
 CVE-2005-3662 version (netpbm)
 CVE-2005-3632 version (netpbm)
+CVE-2005-3631 version (udev)
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman) not fixed 2.1.6 BZ#174166
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least)
@@ -783,7 +787,7 @@
 CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 version (gd, fixed 2.0.22)
+CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream fc4bz#175414
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)
@@ -1297,6 +1301,7 @@
 CVE-2002-1793 version (mod_ssl), also only hp
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
+CVE-2002-1593 version (httpd, fixed 2.0.42)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)



From fedora-extras-commits at redhat.com  Tue Jan  3 16:36:17 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue,  3 Jan 2006 11:36:17 -0500
Subject: fedora-security/audit fc4,1.114,1.115 fc5,1.25,1.26
Message-ID: <200601031636.k03Gal9P025033@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25013

Modified Files:
	fc4 fc5 
Log Message:
Note new kernel issue



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc4	3 Jan 2006 16:34:11 -0000	1.114
+++ fc4	3 Jan 2006 16:36:12 -0000	1.115
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2005-4605 VULNERABLE (kernel) bz#176813
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- fc5	3 Jan 2006 16:34:11 -0000	1.25
+++ fc5	3 Jan 2006 16:36:12 -0000	1.26
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)



From fedora-extras-commits at redhat.com  Tue Jan  3 17:26:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  3 Jan 2006 12:26:20 -0500
Subject: rpms/keychain/FC-3 .cvsignore, 1.2, 1.3 README.Fedora, 1.1,
	1.2 keychain-manpage.patch, 1.1, 1.2 keychain.csh, 1.2,
	1.3 keychain.sh, 1.2, 1.3 keychain.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601031726.k03HQr7w026928@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/keychain/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26896

Modified Files:
	.cvsignore README.Fedora keychain-manpage.patch keychain.csh 
	keychain.sh keychain.spec sources 
Log Message:
Sync with FC-4 (#176783).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 02:55:43 -0000	1.2
+++ .cvsignore	3 Jan 2006 17:26:20 -0000	1.3
@@ -1 +1 @@
-keychain-2.5.5.tar.bz2
+keychain-2.6.1.tar.bz2


Index: README.Fedora
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.Fedora	5 Aug 2005 02:55:43 -0000	1.1
+++ README.Fedora	3 Jan 2006 17:26:20 -0000	1.2
@@ -7,9 +7,8 @@
 different options are documented in keychain(1).
 
 Installed from Fedora Extras keychain can be easily activated by simply
-touching an empty ~/.keychainrc file when using either bash, sh, ksh, csh or
-tcsh. zsh shell users will have to add a `/etc/profile.d/keychain.sh' call to
-their ~/.zlogin file.
+touching an empty ~/.keychainrc file when using either bash, sh, ksh, zsh,
+csh or tcsh.
 This will let the user's shell invoke a default setup of keychain where it
 loads all user's ssh keys from ~/.ssh/ to an ssh-agent process. gpg keys are
 not loaded by default as the necessary gpg-agent is not part of the Fedora

keychain-manpage.patch:

Index: keychain-manpage.patch
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain-manpage.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- keychain-manpage.patch	5 Aug 2005 02:55:43 -0000	1.1
+++ keychain-manpage.patch	3 Jan 2006 17:26:20 -0000	1.2
@@ -1,79 +1,36 @@
-diff -Naru keychain-2.5.0.orig/keychain.1 keychain-2.5.0/keychain.1
---- keychain-2.5.0.orig/keychain.1	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.1	2005-01-08 13:49:25.542402807 +0200
-@@ -291,9 +291,11 @@
+--- keychain-2.6.1/keychain.1~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.1	2005-11-26 16:56:14.000000000 +0200
+@@ -303,8 +303,13 @@
+ Show version information.
  .SH "EXAMPLES"
  .IX Header "EXAMPLES"
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++.PP
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  .PP
- .Vb 5
-+\&    which keychain &>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        [[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \e
- \&                source $HOME/.keychain/$HOSTNAME-sh
-@@ -305,6 +307,7 @@
- \&.profile:
- .PP
- .Vb 6
-+\&    which keychain >/dev/null 2>/dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        [ -f $HOME/.keychain/$host-sh ] && \e
-@@ -316,6 +319,7 @@
- This snippet would work in .login for tcsh:
- .PP
- .Vb 7
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        if (-f $HOME/.keychain/$HOST-csh) then
- \&                source $HOME/.keychain/$HOST-csh
-@@ -328,6 +332,7 @@
- This snippet would work in .login for csh:
- .PP
- .Vb 8
-+\&    which keychain >& /dev/null && \e
- \&    keychain id_rsa id_dsa 0123ABCD
- \&        host=`uname -n`
- \&        if (-f $HOME/.keychain/$host-csh) then
-diff -Naru keychain-2.5.0.orig/keychain.pod keychain-2.5.0/keychain.pod
---- keychain-2.5.0.orig/keychain.pod	2005-01-08 04:02:36.000000000 +0200
-+++ keychain-2.5.0/keychain.pod	2005-01-08 13:49:44.002694389 +0200
-@@ -193,8 +193,10 @@
- =head1 EXAMPLES
+ .Vb 1
+ \&    eval `keychain --eval id_rsa id_dsa 0123ABCD`
+--- keychain-2.6.1/keychain.pod~	2005-10-10 22:40:23.000000000 +0300
++++ keychain-2.6.1/keychain.pod	2005-11-26 16:57:25.000000000 +0200
+@@ -207,8 +207,13 @@
  
- This snippet would work in .bash_profile (for bash) or .zlogin (for
--zsh) to load two ssh keys and one gpg key:
-+zsh) to load two ssh keys (id_rsa and id_dsa) and one gpg key (key ID
-+0123ABCD):
- 
-+    which keychain &>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	[[ -f $HOME/.keychain/$HOSTNAME-sh ]] && \
- 		source $HOME/.keychain/$HOSTNAME-sh
-@@ -204,6 +206,7 @@
- For other Bourne-compatible shells such as sh, you can use this in
- .profile:
- 
-+    which keychain >/dev/null 2>/dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	[ -f $HOME/.keychain/$host-sh ] && \
-@@ -213,6 +216,7 @@
- 
- This snippet would work in .login for tcsh:
+ =head1 EXAMPLES
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	if (-f $HOME/.keychain/$HOST-csh) then
- 		source $HOME/.keychain/$HOST-csh
-@@ -223,6 +227,7 @@
+-This snippet should work in any shell to load two ssh keys and one gpg
+-key:
++Note that the examples below assume that keychain is available on the
++machine they're run.  If you're using them in your login profile snippets
++that are shared between systems, it may be a good idea to protect their
++invocation by first checking if keychain is indeed available.
++
++This snippet should work in any shell to load two ssh keys (id_rsa and id_dsa)
++and one gpg key (key id 0123ABCD):
  
- This snippet would work in .login for csh:
+     eval `keychain --eval id_rsa id_dsa 0123ABCD`
  
-+    which keychain >& /dev/null && \
-     keychain id_rsa id_dsa 0123ABCD
- 	host=`uname -n`
- 	if (-f $HOME/.keychain/$host-csh) then


Index: keychain.csh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.csh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.csh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.csh	3 Jan 2006 17:26:20 -0000	1.3
@@ -10,10 +10,13 @@
     if (! $?KCHOPTS) then
 	set KCHOPTS = "--quiet"
     endif
+    if (! $?prompt) then
+	set KCHOPTS = ( $KCHOPTS --noask )
+    endif
     if (! $?SSHKEYS) then
 	set SSHKEYS = `grep -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*`
     endif
-    if (! $?GPGKEYS ) then
+    if (! $?GPGKEYS) then
 	set GPGKEYS = ""
     endif
 


Index: keychain.sh
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keychain.sh	16 Aug 2005 20:55:11 -0000	1.2
+++ keychain.sh	3 Jan 2006 17:26:20 -0000	1.3
@@ -7,11 +7,19 @@
     . $HOME/.keychainrc
 
     [ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
+    case $- in
+	*i*) ;;
+	*) KCHOPTS="$KCHOPTS --noask" ;;
+    esac
     [ -n "$SSHKEYS" ] || SSHKEYS=`grep -l -e '[DRS]S[AH] PRIVATE KEY' \
 							   $HOME/.ssh/*`
     [ -n "$GPGKEYS" ] || GPGKEYS=""
 
-    keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    if [ -n "$ZSH_VERSION" ] ; then
+	keychain ${=KCHOPTS} ${=SSHKEYS} ${=GPGKEYS}
+    else
+	keychain $KCHOPTS $SSHKEYS $GPGKEYS
+    fi
 
     HOST=`uname -n`
     [ -f $HOME/.keychain/$HOST-sh ] && \


Index: keychain.spec
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/keychain.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keychain.spec	10 Sep 2005 15:57:00 -0000	1.3
+++ keychain.spec	3 Jan 2006 17:26:20 -0000	1.4
@@ -1,7 +1,7 @@
 Name:		keychain
 Summary:	Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG
-Version:	2.5.5
-Release:	2%{?dist}
+Version:	2.6.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://www.gentoo.org/proj/en/keychain/
@@ -31,11 +31,11 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sysconfdir}/profile.d
 mkdir -p %{buildroot}%{_mandir}/man1
-install -m 755 keychain %{buildroot}%{_bindir}/keychain
-install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
-install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
-install -m 644 keychain.1 %{buildroot}%{_mandir}/man1
-install -m 644 %{SOURCE3} README.Fedora
+install -pm 755 keychain %{buildroot}%{_bindir}/keychain
+install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/keychain.sh
+install -pm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/keychain.csh
+install -pm 644 keychain.1 %{buildroot}%{_mandir}/man1
+install -pm 644 %{SOURCE3} README.Fedora
 
 %clean
 rm -rf %{buildroot}
@@ -43,12 +43,21 @@
 %files
 %defattr(-,root,root)
 %doc COPYING ChangeLog README README.Fedora
-%doc %{_mandir}/man1/keychain.1.gz
-%{_bindir}/keychain
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.sh
 %config(noreplace) %{_sysconfdir}/profile.d/keychain.csh
+%{_bindir}/keychain
+%{_mandir}/man1/keychain.1*
 
 %changelog
+* Sat Nov 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.6.1-1
+- Update to 2.6.1.
+- Invoke keychain with --noask in opt-in scripts in non-interactive shells
+  to fix scp'ing to an opt-in enabled account for which keychain hasn't run.
+- Make opt-in config work the same way with zsh as with other shells.
+- Replace tweaks in manpage patch with more generic instructions.
+- Make profile.d snippets non-executable (#35714).
+- Preserve timestamps of installed files, other cosmetics.
+
 * Tue Aug 16 2005  Alexander Dalloz <alex {%} dalloz {*} de> - 2.5.5-2
 - Added test for homedir mismatch in opt-in scripts, covering
   `sudo -s' (reported by Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keychain/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2005 02:55:43 -0000	1.2
+++ sources	3 Jan 2006 17:26:20 -0000	1.3
@@ -1 +1 @@
-3afa5ce32a5c57e43caac82db3396aac  keychain-2.5.5.tar.bz2
+408caf4fe29cd88d5684410ef896c33d  keychain-2.6.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 17:53:58 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Jan 2006 12:53:58 -0500
Subject: rpms/apcupsd/devel apcupsd.spec,1.4,1.5
Message-ID: <200601031754.k03HsVTP027096@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27063

Modified Files:
	apcupsd.spec 
Log Message:
Rebuild



Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apcupsd.spec	21 Dec 2005 17:02:50 -0000	1.4
+++ apcupsd.spec	3 Jan 2006 17:53:58 -0000	1.5
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.10.18
-Release:      6%{?dist}
+Release:      7%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-7
+- Rebuild
+
 * Wed Dec 21 2005 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-6
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan  3 18:07:29 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:07:29 -0500
Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.6, 1.7 gaim-meanwhile.spec,
	1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200601031808.k03I8JKk028825@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28787/FC-4

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2005 13:44:43 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:07:29 -0000	1.7
@@ -1 +1 @@
-gaim-meanwhile-1.2.6.tar.gz
+gaim-meanwhile-1.2.7.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gaim-meanwhile.spec	15 Dec 2005 14:33:16 -0000	1.8
+++ gaim-meanwhile.spec	3 Jan 2006 18:07:29 -0000	1.9
@@ -6,8 +6,8 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.6
-Release:	2%{?dist}
+Version:	1.2.7
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
+- Update to latest release
+
 * Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
 - Fix meanwhile requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Dec 2005 13:44:43 -0000	1.7
+++ sources	3 Jan 2006 18:07:29 -0000	1.8
@@ -1 +1 @@
-215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz
+890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:07:49 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:07:49 -0500
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.6, 1.7 gaim-meanwhile.spec, 
	1.8, 1.9 sources, 1.6, 1.7
Message-ID: <200601031808.k03I8MqE028830@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28787/devel

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2005 13:43:14 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:07:49 -0000	1.7
@@ -1 +1 @@
-gaim-meanwhile-1.2.6.tar.gz
+gaim-meanwhile-1.2.7.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gaim-meanwhile.spec	15 Dec 2005 14:24:02 -0000	1.8
+++ gaim-meanwhile.spec	3 Jan 2006 18:07:49 -0000	1.9
@@ -6,8 +6,8 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.6
-Release:	2%{?dist}
+Version:	1.2.7
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,6 +39,9 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
+- Update to latest release
+
 * Thu Dec 15 2005 - jwboyer at jdub.homelinux.org 1.2.6-2
 - Fix meanwhile requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Dec 2005 13:43:14 -0000	1.6
+++ sources	3 Jan 2006 18:07:49 -0000	1.7
@@ -1 +1 @@
-215adb1af37e700f54a4b890788c587d  gaim-meanwhile-1.2.6.tar.gz
+890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:12:37 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:12:37 -0500
Subject: rpms/meanwhile/FC-4 .cvsignore, 1.6, 1.7 meanwhile.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200601031813.k03IDAJ9028921@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878/FC-4

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Dec 2005 02:58:58 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:12:37 -0000	1.7
@@ -1 +1 @@
-meanwhile-1.0.1.tar.gz
+meanwhile-1.0.2.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/meanwhile.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- meanwhile.spec	17 Dec 2005 02:58:58 -0000	1.5
+++ meanwhile.spec	3 Jan 2006 18:12:37 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.1
+Version:	1.0.2
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.0.2-1
+- Update to latest release
+- Fixes crash when merging buddy list with server
+
 * Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
 - Update to latest release
 - Fixes mpi conflict with mozilla-nss


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Dec 2005 02:58:58 -0000	1.6
+++ sources	3 Jan 2006 18:12:37 -0000	1.7
@@ -1 +1 @@
-85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz
+bf4ced109a367b4c5d71fe63c043270e  meanwhile-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:12:43 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Tue,  3 Jan 2006 13:12:43 -0500
Subject: rpms/meanwhile/devel .cvsignore, 1.6, 1.7 meanwhile.spec, 1.6,
	1.7 sources, 1.6, 1.7
Message-ID: <200601031813.k03IDG06028926@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878/devel

Modified Files:
	.cvsignore meanwhile.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	17 Dec 2005 02:57:09 -0000	1.6
+++ .cvsignore	3 Jan 2006 18:12:43 -0000	1.7
@@ -1 +1 @@
-meanwhile-1.0.1.tar.gz
+meanwhile-1.0.2.tar.gz


Index: meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/meanwhile.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- meanwhile.spec	17 Dec 2005 02:57:09 -0000	1.6
+++ meanwhile.spec	3 Jan 2006 18:12:43 -0000	1.7
@@ -6,7 +6,7 @@
 Summary:	Lotus Sametime Community Client library
 License:	LGPL
 Group:		Applications/Internet
-Version:	1.0.1
+Version:	1.0.2
 Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
@@ -77,6 +77,10 @@
 %{_datadir}/doc/%{name}-doc-%{version}/
 
 %changelog
+* Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.0.2-1
+- Update to latest release
+- Fixes crash when merging buddy list with server
+
 * Fri Dec 16 2005 - jwboyer at jdub.homelinux.org 1.0.1-1
 - Update to latest release
 - Fixes mpi conflict with mozilla-nss


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meanwhile/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	17 Dec 2005 02:57:09 -0000	1.6
+++ sources	3 Jan 2006 18:12:43 -0000	1.7
@@ -1 +1 @@
-85587678afdf7bf1f5ea3bdefec093ba  meanwhile-1.0.1.tar.gz
+bf4ced109a367b4c5d71fe63c043270e  meanwhile-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan  3 18:13:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 13:13:20 -0500
Subject: rpms/clisp/FC-4 .cvsignore, 1.4, 1.5 clisp.spec, 1.13, 1.14 sources,
	1.4, 1.5
Message-ID: <200601031813.k03IDq0F029022@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28932

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.37


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Dec 2005 22:48:56 -0000	1.4
+++ .cvsignore	3 Jan 2006 18:13:19 -0000	1.5
@@ -1 +1 @@
-clisp-2.36.tar.bz2
+clisp-2.37.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- clisp.spec	28 Dec 2005 23:29:11 -0000	1.13
+++ clisp.spec	3 Jan 2006 18:13:19 -0000	1.14
@@ -1,17 +1,17 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.36
-Release: 	7%{?dist}
+Version:	2.37
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-ExcludeArch:	ppc ppc64 x86_64
+#ExcludeArch:	ppc ppc64 x86_64
 
 
 %description
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
+- new version 2.37
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.36-1
 - New Version 2.36
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2005 22:48:56 -0000	1.4
+++ sources	3 Jan 2006 18:13:19 -0000	1.5
@@ -1 +1 @@
-b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2
+f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 18:41:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 13:41:20 -0500
Subject: rpms/clisp/FC-4 clisp.spec,1.14,1.15
Message-ID: <200601031841.k03IfqGL029358@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29323

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clisp.spec	3 Jan 2006 18:13:19 -0000	1.14
+++ clisp.spec	3 Jan 2006 18:41:20 -0000	1.15
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.37
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -11,7 +11,7 @@
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:  xorg-x11-devel
-#ExcludeArch:	ppc ppc64 x86_64
+ExcludeArch:	ppc ppc64
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan  3 18:41:21 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Jan 2006 13:41:21 -0500
Subject: rpms/pytz/devel .cvsignore, 1.3, 1.4 pytz.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200601031841.k03Ifs8K029363@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/pytz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29319

Modified Files:
	.cvsignore pytz.spec sources 
Log Message:
Update to 2005r



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Dec 2005 00:09:35 -0000	1.3
+++ .cvsignore	3 Jan 2006 18:41:21 -0000	1.4
@@ -1 +1 @@
-pytz-2005m.tar.bz2
+pytz-2005r.tar.bz2


Index: pytz.spec
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/pytz.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pytz.spec	23 Dec 2005 00:09:35 -0000	1.4
+++ pytz.spec	3 Jan 2006 18:41:21 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pytz
-Version:        2005m
+Version:        2005r
 Release:        1%{?dist}
 Summary:        World Timezone Definitions for Python
 
@@ -47,6 +47,9 @@
 %{python_sitelib}/pytz/
 
 %changelog
+* Tue Jan  3 2006 Orion Poplawski <orion at cora.nwra.com> 2005r-1
+- Update to 2005r
+
 * Thu Dec 22 2005 Orion Poplawski <orion at cora.nwra.com> 2005m-1
 - Update to 2005m
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pytz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Dec 2005 00:09:35 -0000	1.3
+++ sources	3 Jan 2006 18:41:21 -0000	1.4
@@ -1 +1 @@
-d0b8fd7e4a5be5fc763cb22044fba854  pytz-2005m.tar.bz2
+53c366ec234c09f016f35cea5dee8db7  pytz-2005r.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:23:54 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Tue,  3 Jan 2006 14:23:54 -0500
Subject: rpms/shorewall/devel shorewall-3.0.3-init.patch, NONE,
	1.1 .cvsignore, 1.9, 1.10 shorewall.spec, 1.15, 1.16 sources, 1.9,
	1.10 shorewall-2.4.4-init.patch, 1.1, NONE
Message-ID: <200601031924.k03JOQHb031451@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31426

Modified Files:
	.cvsignore shorewall.spec sources 
Added Files:
	shorewall-3.0.3-init.patch 
Removed Files:
	shorewall-2.4.4-init.patch 
Log Message:
Update to upstream 3.0.3


shorewall-3.0.3-init.patch:

--- NEW FILE shorewall-3.0.3-init.patch ---
diff -Naur shorewall-3.0.3.original/init.sh shorewall-3.0.3/init.sh
--- shorewall-3.0.3.original/init.sh	2005-12-07 18:03:44.000000000 -0400
+++ shorewall-3.0.3/init.sh	2006-01-03 15:18:33.000000000 -0400
@@ -36,15 +36,15 @@
 #	   shorewall status			  Displays firewall status
 #
 
-# chkconfig: 2345 25 90
+# chkconfig: - 25 90
 # description: Packet filtering firewall
 
 ### BEGIN INIT INFO
 # Provides:	  shorewall
 # Required-Start: $network
 # Required-Stop:
-# Default-Start:  2 3 5
-# Default-Stop:	  0 1 6
+# Default-Start:
+# Default-Stop:	  0 1 2 3 4 5 6
 # Description:	  starts and stops the shorewall firewall
 ### END INIT INFO
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Nov 2005 21:18:20 -0000	1.9
+++ .cvsignore	3 Jan 2006 19:23:54 -0000	1.10
@@ -1 +1 @@
-shorewall-3.0.2.tar.bz2
+shorewall-3.0.3.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- shorewall.spec	27 Nov 2005 21:18:20 -0000	1.15
+++ shorewall.spec	3 Jan 2006 19:23:54 -0000	1.16
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.0.2
+Version: 3.0.3
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -8,7 +8,7 @@
 License: GPL
 URL: http://www.shorewall.net/
 Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
-Patch0: shorewall-2.4.4-init.patch
+Patch0: shorewall-3.0.3-init.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -79,6 +79,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Tue Jan 03 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.3-1
+- Update to upstream 3.0.3
+
 * Sun Nov 27 2005 Robert Marcano <robert at marcanoonline.com> - 3.0.2-1
 - Update to upstream 3.0.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Nov 2005 21:18:20 -0000	1.9
+++ sources	3 Jan 2006 19:23:54 -0000	1.10
@@ -1 +1 @@
-5815914ce41f6a06209afc1a468319fe  shorewall-3.0.2.tar.bz2
+2f1ef054cf1c6dbfe0e15d982f90fe11  shorewall-3.0.3.tar.bz2


--- shorewall-2.4.4-init.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan  3 19:34:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:34:24 -0500
Subject: rpms/xforms/FC-4 xforms-1.0.90-prelink.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 sources, 1.2, 1.3 xforms.spec, 1.8, 1.9
Message-ID: <200601031934.k03JYul3031549@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31525

Modified Files:
	.cvsignore sources xforms.spec 
Added Files:
	xforms-1.0.90-prelink.patch 
Log Message:
sync w/devel, update to 1.0.90


xforms-1.0.90-prelink.patch:

--- NEW FILE xforms-1.0.90-prelink.patch ---
--- xforms-1.0.90/fd2ps/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.in	2006-01-02 15:18:01.000000000 -0600
@@ -115,7 +115,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/fd2ps/Makefile.am.prelink	2003-11-13 15:46:47.000000000 -0600
+++ xforms-1.0.90/fd2ps/Makefile.am	2006-01-02 15:18:10.000000000 -0600
@@ -16,7 +16,7 @@
 
 bin_PROGRAMS = fd2ps
 
-fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+fd2ps_LDADD = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 fd2ps_SOURCES = \
         align.c \
--- xforms-1.0.90/image/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/image/Makefile.in	2006-01-02 15:05:52.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/image/Makefile.am.prelink	2003-11-13 15:46:48.000000000 -0600
+++ xforms-1.0.90/image/Makefile.am	2006-01-02 15:05:50.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libflimage.la
 
-libflimage_la_LDFLAGS = -version-info 1:0:0
+libflimage_la_LDFLAGS = ../lib/libforms.la $(JPEG_LIB) $(X_LIBS) -lX11 -version-info 1:0:0
 
 libflimage_la_SOURCES = \
 	flimage.h \
--- xforms-1.0.90/gl/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.in	2006-01-02 15:04:24.000000000 -0600
@@ -109,7 +109,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/gl/Makefile.am.prelink	2003-11-20 03:33:11.000000000 -0600
+++ xforms-1.0.90/gl/Makefile.am	2006-01-02 15:04:20.000000000 -0600
@@ -7,7 +7,7 @@
 
 lib_LTLIBRARIES = libformsGL.la
 
-libformsGL_la_LDFLAGS = -version-info 1:0:0
+libformsGL_la_LDFLAGS = ../lib/libforms.la $(X_LIBS) -lGL -version-info 1:0:0
 
 libformsGL_la_SOURCES = \
 	glcanvas.c \
--- xforms-1.0.90/demos/Makefile.in.prelink	2004-03-30 03:48:44.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.in	2006-01-02 15:07:41.000000000 -0600
@@ -206,7 +206,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -263,12 +263,12 @@
 
 gl_SOURCES = gl.c
 gl_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 glwin_SOURCES = glwin.c
 glwin_LDADD = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 
 goodies_SOURCES = goodies.c
@@ -276,7 +276,7 @@
 
 ibrowser_SOURCES = ibrowser.c
 ibrowser_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -284,7 +284,7 @@
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -295,7 +295,7 @@
 
 itest_SOURCES = itest.c
 itest_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -304,7 +304,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
@@ -355,7 +355,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 
--- xforms-1.0.90/demos/Makefile.am.prelink	2004-02-24 09:42:43.000000000 -0600
+++ xforms-1.0.90/demos/Makefile.am	2006-01-02 15:19:03.000000000 -0600
@@ -105,7 +105,7 @@
 
 # Most of these demos link against libforms only. For them this default is
 # sufficient:
-AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(XPM_LIB) -lX11 $(LIBS) $(X_EXTRA_LIBS)
+AM_LDFLAGS = ../lib/libforms.la $(X_LIBS) $(X_PRE_LIBS) $(LIBS) $(X_EXTRA_LIBS)
 
 arrowbutton_SOURCES = arrowbutton.c
 borderwidth_SOURCES = borderwidth.c
@@ -168,11 +168,11 @@
 
 gl_SOURCES = gl.c
 gl_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 glwin_SOURCES = glwin.c
 glwin_LDADD  = ../lib/libforms.la ../gl/libformsGL.la \
-	$(X_LIBS) $(X_PRE_LIBS) -lGL -lX11 $(LIBS) $(X_EXTRA_LIBS)
+	$(X_LIBS) $(X_PRE_LIBS) -lGL $(LIBS) $(X_EXTRA_LIBS)
 
 goodies_SOURCES = goodies.c
 group_SOURCES = group.c
@@ -180,14 +180,14 @@
 ibrowser_SOURCES = ibrowser.c
 ibrowser.$(OBJEXT): fd/ibrowser_gui.c
 ibrowser_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 iconify_SOURCES = iconify.c
 
 iconvert_SOURCES = iconvert.c
 iconvert_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 inputall_SOURCES = inputall.c
@@ -199,7 +199,7 @@
 itest_SOURCES = itest.c
 itest.$(OBJEXT): fd/is_gui.c
 itest_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 lalign_SOURCES = lalign.c
@@ -207,7 +207,7 @@
 
 ll_SOURCES = ll.c
 ll_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 longlabel_SOURCES = longlabel.c
@@ -260,7 +260,7 @@
 
 xyplotover_SOURCES = xyplotover.c
 xyplotover_LDADD  = ../image/libflimage.la ../lib/libforms.la \
-	$(X_LIBS) $(X_PRE_LIBS) $(JPEG_LIB) $(XPM_LIB) -lX11 $(LIBS) \
+	$(X_LIBS) $(X_PRE_LIBS) $(LIBS) \
 	$(X_EXTRA_LIBS)
 
 yesno_SOURCES = yesno.c
--- xforms-1.0.90/lib/Makefile.in.prelink	2004-03-30 03:48:46.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.in	2006-01-02 14:52:11.000000000 -0600
@@ -116,7 +116,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \
--- xforms-1.0.90/lib/Makefile.am.prelink	2003-11-20 03:33:16.000000000 -0600
+++ xforms-1.0.90/lib/Makefile.am	2006-01-02 14:52:19.000000000 -0600
@@ -17,7 +17,7 @@
 
 lib_LTLIBRARIES = libforms.la
 
-libforms_la_LDFLAGS = -version-info 1:0:0
+libforms_la_LDFLAGS = $(X_LIBS) $(XPM_LIB) -lX11 -version-info 1:0:0
 
 libforms_la_SOURCES = \
 	align.c \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:33:57 -0000	1.2
+++ .cvsignore	3 Jan 2006 19:34:24 -0000	1.3
@@ -1 +1,2 @@
-xforms-1.0.tar.gz
+xforms-1.0.90.tar.gz
+xforms-1.0.90.tar.gz.sig


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:33:57 -0000	1.2
+++ sources	3 Jan 2006 19:34:24 -0000	1.3
@@ -1 +1,2 @@
-64adf1c489b629a92218f7c140f4bdaf  xforms-1.0.tar.gz
+558b600402430f207e671e2d0d725b6d  xforms-1.0.90.tar.gz
+23989dbab27a1b406125bde2a2cc2b90  xforms-1.0.90.tar.gz.sig


Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/FC-4/xforms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xforms.spec	23 May 2005 00:21:33 -0000	1.8
+++ xforms.spec	3 Jan 2006 19:34:24 -0000	1.9
@@ -1,68 +1,74 @@
-# $Id$
-
-# Since we're using xmkmf, we must match XFree86's notion of these
-%define _x11dir /usr/X11R6
-%define _prefix %{_x11dir}
-%define _mandir %{_prefix}/man
 
 Name:    xforms
-Summary: X11 toolkit library
-Version: 1.0
-Release: 4%{?dist_tag}
+Summary: XForms toolkit library
+Version: 1.0.90
+Release: 5%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
 URL:     http://www.nongnu.org/xforms/
-Source:  http://savannah.nongnu.org/download/xforms/stable.pkg/%{version}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source0: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz
+Source1: http://savannah.nongnu.org/download/xforms/xforms-%{version}.tar.gz.sig 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# TODO: remove -lc (all), -lm (most) linker steps
+Patch1: xforms-1.0.90-prelink.patch
 
-BuildRequires: XFree86-devel
 BuildRequires: libjpeg-devel
-BuildRequires: libtiff-devel
+BuildRequires: libGL-devel
+%if "%{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%define x_deps libX11-devel
+%endif
 
-# for xforms' import/export of various image types, including: png, sgi
+# import/export: png, sgi (optional?)
 Requires: netpbm-progs
+# import eps,ps (optional?)
+#Requires: ghostscript
 
 
 %description
-xforms is an X11 toolkit library.
-This package contains the runtime libraries for the xforms toolkit.
+XForms is a GUI toolkit based on Xlib for X Window Systems. It
+features a rich set of objects, such as buttons, sliders, and menus
+etc. integrated into an easy and efficient object/event callback
+execution model that allows fast and easy construction of
+X-applications. In addition, the library is extensible and new objects
+can easily be created and added to the library.
 
-It has now gone Open Source (LGPL).
 
 %package devel
-Summary: Development files for the xforms toolkit
+Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-# legacy versions included -designer/-static subpkgs
-Obsoletes: %{name}-designer < %{version}-%{release}
-Provides:  %{name}-designer = %{version}-%{release}
-Obsoletes: %{name}-static < %{version}-%{release}
-Provides:  %{name}-static = %{version}-%{release}
+Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
 %description devel
-This package contains development headers and libraries for %{name}.
-
-Install this if you intend to develop / compile programs with %{name}.
+%{summary}.
 
 
 %prep
 
 %setup -q
 
+%patch1 -p1 -b .prelink
+
 
 %build
 
-(unset RPM_OPT_FLAGS; xmkmf -a)
+%configure \
+  --disable-static \
+  --enable-optimization="$RPM_OPT_FLAGS"
 
 make %{?_smp_mflags} \
-    CDEBUGFLAGS="$RPM_OPT_FLAGS"
+  X_PRE_LIBS=''
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# makeinstall macro doesn't work for this pkg.
-make install install.man DESTDIR="$RPM_BUILD_ROOT"
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
@@ -70,24 +76,43 @@
 
 
 %post -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root)
-%doc *README Changes Copyright COPYING
+%doc COPYING.LIB Copyright ChangeLog NEWS README
 %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root)
-%{_bindir}/fd*
+%{_bindir}/*
 %{_includedir}/*
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
-%{_mandir}/man*/fd*
+%{_mandir}/man*/*
+
+
+%changelog 
+* Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
+- prelink.patch: fix undefined symbols in (shared) lib(s)
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-4
+- BR: libXpm-devel
+- -devel: Req: libX11-devel 
+
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-3
+- BR: libGL-devel
+- #BR: libXpm-devel (coming soon)
+
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-2
+- BR: libGL.so.1 -> BR: %%x_pkg-Mesa-libGL 
+- remove legacy crud
 
+* Mon Oct 17 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-1
+- 1.0.90
+- new version removes use-of/references-to xmkmf,/usr/X11R6 (#170942)
 
-%changelog
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.0-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan  3 19:40:14 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 14:40:14 -0500
Subject: rpms/clisp/FC-3 .cvsignore, 1.3, 1.4 clisp.spec, 1.10, 1.11 sources,
	1.4, 1.5
Message-ID: <200601031940.k03Jekr1031677@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31656

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.37


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Dec 2005 22:38:04 -0000	1.3
+++ .cvsignore	3 Jan 2006 19:40:14 -0000	1.4
@@ -1 +1 @@
-clisp-2.36.tar.bz2
+clisp-2.37.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clisp.spec	28 Dec 2005 23:06:20 -0000	1.10
+++ clisp.spec	3 Jan 2006 19:40:14 -0000	1.11
@@ -1,17 +1,17 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.36
-Release: 	7%{?dist}
+Version:	2.37
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
 BuildRequires:	XFree86-devel
-ExcludeArch:	x86_64
+ExcludeArch:	ppc ppc64
 
 %description
 ANSI Common Lisp is a high-level, general-purpose programming
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
+- new version 2.37
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.36-1
 - New Version 2.36
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2005 22:41:01 -0000	1.4
+++ sources	3 Jan 2006 19:40:14 -0000	1.5
@@ -1 +1 @@
-b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2
+f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:40:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:40:54 -0500
Subject: rpms/geomview/devel geomview.spec,1.5,1.6
Message-ID: <200601031941.k03JfRJJ031753@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31683

Modified Files:
	geomview.spec 
Log Message:
* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
- rework Obsoletes/Provides: geomview-plugins



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.spec	3 Jan 2006 14:43:54 -0000	1.5
+++ geomview.spec	3 Jan 2006 19:40:54 -0000	1.6
@@ -1,6 +1,5 @@
 
 ## Conditional build:
-# FIXME
 %define _with_orrery --with-orrery
 %define _with_maniview --with-maniview
 
@@ -10,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.1.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -20,6 +19,9 @@
 Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
+
 Source1: geomview.desktop
 Source2: geomview.png
 
@@ -39,10 +41,10 @@
 BuildRequires: openmotif-devel
 BuildRequires: xforms-devel
 ## X/GL support
-%if "%{?fedora}" > "4"
+%if "%{?fedora}" > "3"
 BuildRequires: libGL-devel libGLU-devel
 %else
-BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+BuildRequires: libGL.so.1 libGLU.so.1
 %endif
 
 Requires(post): /sbin/install-info
@@ -56,9 +58,6 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-Obsoletes: %{name}-plugins < %{version}-%{release}
-Provides:  %{name}-plugins = %{version}-%{release}
-
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
 Group:   Applications/Engineering
@@ -250,6 +249,9 @@
 
 
 %changelog
+* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
+- rework Obsoletes/Provides: geomview-plugins
+
 * Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
 - cvs20040421
 - --with-xforms unconditional, Obsoletes/Provides: geomview-plugins



From fedora-extras-commits at redhat.com  Tue Jan  3 19:41:16 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 14:41:16 -0500
Subject: rpms/clisp/devel .cvsignore, 1.3, 1.4 clisp.spec, 1.9, 1.10 sources,
	1.4, 1.5
Message-ID: <200601031941.k03Jfmjk031765@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31703

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.37


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Dec 2005 19:49:58 -0000	1.3
+++ .cvsignore	3 Jan 2006 19:41:16 -0000	1.4
@@ -1 +1 @@
-clisp-2.36.tar.bz2
+clisp-2.37.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- clisp.spec	28 Dec 2005 23:07:47 -0000	1.9
+++ clisp.spec	3 Jan 2006 19:41:16 -0000	1.10
@@ -1,7 +1,7 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.36
-Release: 	7%{?dist}
+Version:	2.37
+Release: 	2%{?dist}
 
 Group:		Development/Languages
 License:	GPL
@@ -20,7 +20,7 @@
 BuildRequires:  libXrender-devel
 BuildRequires:  libXt-devel
 BuildRequires:	imake
-ExcludeArch:	x86_64 ppc ppc64
+ExcludeArch:	ppc ppc64
 
 
 %description
@@ -122,6 +122,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
+- new version 2.37
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.36-1
 - New Version 2.36
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Dec 2005 19:49:58 -0000	1.4
+++ sources	3 Jan 2006 19:41:16 -0000	1.5
@@ -1 +1 @@
-b6b5f6b7e6d0ce9f42bc07d59fbddc09  clisp-2.36.tar.bz2
+f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:49:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:49:24 -0500
Subject: rpms/geomview/FC-4 geomview.spec,1.5,1.6
Message-ID: <200601031949.k03JnuHp031979@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31922

Modified Files:
	geomview.spec 
Log Message:
* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
- rework Obsoletes/Provides: geomview-plugins



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.spec	3 Jan 2006 15:11:53 -0000	1.5
+++ geomview.spec	3 Jan 2006 19:49:24 -0000	1.6
@@ -9,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.1.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -19,6 +19,9 @@
 Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Obsoletes: %{name}-plugins < %{version}-%{release}
+Provides:  %{name}-plugins = %{version}-%{release}
+
 Source1: geomview.desktop
 Source2: geomview.png
 
@@ -41,7 +44,7 @@
 %if "%{?fedora}" > "3"
 BuildRequires: libGL-devel libGLU-devel
 %else
-BuildRequires: XFree86-devel libGL.so.1 libGLU.so.1
+BuildRequires: libGL.so.1 libGLU.so.1
 %endif
 
 Requires(post): /sbin/install-info
@@ -55,9 +58,6 @@
 display objects described in a variety of file formats. It comes with a wide
 selection of example objects, and you can create your own objects too.
 
-Obsoletes: %{name}-plugins < %{version}-%{release}
-Provides:  %{name}-plugins = %{version}-%{release}
-
 %if "%{?_with_orrery:1}" == "1"
 %package orrery
 Group:   Applications/Engineering
@@ -249,6 +249,9 @@
 
 
 %changelog
+* Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
+- rework Obsoletes/Provides: geomview-plugins
+
 * Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.1.cvs20040221
 - cvs20040421
 - --with-xforms unconditional, Obsoletes/Provides: geomview-plugins



From fedora-extras-commits at redhat.com  Tue Jan  3 19:49:19 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue,  3 Jan 2006 14:49:19 -0500
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.6,
	1.7 epiphany-extensions.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601031949.k03Jnqii031947@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31906

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
* Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com> - 1.9.4-1
- Update to 1.9.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	10 Oct 2005 15:15:21 -0000	1.6
+++ .cvsignore	3 Jan 2006 19:49:19 -0000	1.7
@@ -2,3 +2,5 @@
 epiphany-extensions-1.7.4.tar.bz2
 epiphany-extensions-1.8.0.tar.bz2
 epiphany-extensions-1.8.1.tar.bz2
+epiphany-extensions-1.9.3.tar.bz2
+epiphany-extensions-1.9.4.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- epiphany-extensions.spec	10 Oct 2005 15:15:21 -0000	1.5
+++ epiphany-extensions.spec	3 Jan 2006 19:49:19 -0000	1.6
@@ -1,8 +1,8 @@
-%define ephy_major 1.8
+%define ephy_major 1.9
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.8.1
+Version: 1.9.4
 Release: 1
 License: GPL
 Group: Applications/Internet
@@ -21,7 +21,7 @@
 %setup -q
 
 %build
-%configure
+%configure --disable-compiler-warnings
 %{__make} %{?_smp_mflags}
 
 %install
@@ -39,6 +39,12 @@
 %{_libdir}/epiphany
 
 %changelog
+* Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com> - 1.9.4-1
+- Update to 1.9.4
+
+* Fri Dec 30 2005 Christopher Aillon <caillon at redhat.com> - 1.9.3-1
+- Update to 1.9.3
+
 * Mon Oct 10 2005 Christopher Aillon <caillon at redhat.com> - 1.8.1-1
 - Update to 1.8.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Oct 2005 15:15:21 -0000	1.6
+++ sources	3 Jan 2006 19:49:19 -0000	1.7
@@ -1 +1 @@
-d1c40978c89a845973ed131774fa7769  epiphany-extensions-1.8.1.tar.bz2
+407b67286f6a18eacda5e21ae315cdf2  epiphany-extensions-1.9.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan  3 19:51:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  3 Jan 2006 14:51:44 -0500
Subject: rpms/geomview/FC-4 geomview.spec,1.6,1.7
Message-ID: <200601031952.k03JqGL5032041@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32024

Modified Files:
	geomview.spec 
Log Message:
microincrement Release for botched 'make tag'



Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- geomview.spec	3 Jan 2006 19:49:24 -0000	1.6
+++ geomview.spec	3 Jan 2006 19:51:43 -0000	1.7
@@ -9,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.2.cvs%{cvs}%{?dist}
+Release: 0.2.cvs%{cvs}%{?dist}.1
 
 License: LGPL
 Url:     http://www.geomview.org/



From fedora-extras-commits at redhat.com  Tue Jan  3 19:55:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue,  3 Jan 2006 14:55:26 -0500
Subject: rpms/clisp/devel clisp.spec,1.10,1.11
Message-ID: <200601031955.k03Jtww2032190@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32154/devel

Modified Files:
	clisp.spec 
Log Message:



Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clisp.spec	3 Jan 2006 19:41:16 -0000	1.10
+++ clisp.spec	3 Jan 2006 19:55:26 -0000	1.11
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
 Version:	2.37
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.36.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel



From fedora-extras-commits at redhat.com  Tue Jan  3 19:55:29 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue,  3 Jan 2006 14:55:29 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.3,1.4
Message-ID: <200601031956.k03Ju1R1032193@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32150

Modified Files:
	nautilus-actions.spec 
Log Message:
Disable commandline-tool configure option on FC3



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nautilus-actions.spec	2 Jan 2006 23:27:23 -0000	1.3
+++ nautilus-actions.spec	3 Jan 2006 19:55:29 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -23,7 +23,7 @@
 %setup -q
 
 %build
-%configure --disable-schemas-install --enable-commandline-tool  \
+%configure --disable-schemas-install --disable-commandline-tool  \
            --with-nautilus-extdir=%{_libdir}/nautilus/extensions-1.0
 make %{?_smp_mflags} 
 
@@ -85,6 +85,10 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
+* Tue Jan 3 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-7
+- Disable commandline-tool option on FC3 as Glib-2.4 doesn't implement
+  the necesary api
+
 * Mon Jan 2 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-6
 - Add nautilus extensions dir to configure arguments
 



From fedora-extras-commits at redhat.com  Tue Jan  3 20:23:34 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Tue,  3 Jan 2006 15:23:34 -0500
Subject: rpms/nautilus-actions/FC-3 nautilus-actions.spec,1.4,1.5
Message-ID: <200601032024.k03KO7uw001686@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/nautilus-actions/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1656

Modified Files:
	nautilus-actions.spec 
Log Message:
Rebuild



Index: nautilus-actions.spec
===================================================================
RCS file: /cvs/extras/rpms/nautilus-actions/FC-3/nautilus-actions.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nautilus-actions.spec	3 Jan 2006 19:55:29 -0000	1.4
+++ nautilus-actions.spec	3 Jan 2006 20:23:34 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Nautilus extension for customizing the context menu
 Name:    nautilus-actions
 Version: 0.99
-Release: 7%{?dist}
+Release: 7.1%{?dist}
 Group:   User Interface/Desktops
 License: GPL
 URL:     http://www.grumz.net/node/8
@@ -76,8 +76,6 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/nautilus-actions-config
-%{_bindir}/nautilus-actions-convert
-%{_bindir}/nautilus-actions-new-config
 %{_libdir}/nautilus/extensions-1.0/libnautilus-actions.so
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-nact.desktop
@@ -85,7 +83,7 @@
 %config %{_sysconfdir}/gconf/schemas/config_newaction.schemas
 
 %changelog
-* Tue Jan 3 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-7
+* Tue Jan 3 2006 Deji Akingunola <dakingun at gmail.com> - 0.99-7.1
 - Disable commandline-tool option on FC3 as Glib-2.4 doesn't implement
   the necesary api
 



From fedora-extras-commits at redhat.com  Tue Jan  3 21:32:20 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  3 Jan 2006 16:32:20 -0500
Subject: rpms/gdl/devel gdl.spec,1.6,1.7
Message-ID: <200601032132.k03LWqPG003686@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657

Modified Files:
	gdl.spec 
Log Message:
Rebuild



Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdl.spec	21 Nov 2005 18:24:24 -0000	1.6
+++ gdl.spec	3 Jan 2006 21:32:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gdl
 Version:        0.8.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-2
+- Rebuild
+
 * Mon Nov 21 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-1
 - Upstream 0.8.11
 - Remove hdf patch fixed upstream



From fedora-extras-commits at redhat.com  Tue Jan  3 23:22:35 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  3 Jan 2006 18:22:35 -0500
Subject: rpms/rpy/FC-3 rpy.spec,1.3,1.4
Message-ID: <200601032323.k03NNCsh007458@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7438

Modified Files:
	rpy.spec 
Log Message:
Update to work with R-2.2.1


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpy.spec	11 Oct 2005 07:43:42 -0000	1.3
+++ rpy.spec	3 Jan 2006 23:22:34 -0000	1.4
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:	GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+- Update for R-2.2.1
+
 * Tue Oct 11 2005 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 23:31:56 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  3 Jan 2006 18:31:56 -0500
Subject: rpms/rpy/FC-4 rpy.spec,1.3,1.4
Message-ID: <200601032332.k03NWSiv007491@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7474

Modified Files:
	rpy.spec 
Log Message:
Update to work with R-2.2.1


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpy.spec	11 Oct 2005 07:42:50 -0000	1.3
+++ rpy.spec	3 Jan 2006 23:31:56 -0000	1.4
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:	GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+- Update for R-2.2.1
+
 * Tue Oct 11 2005 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 



From fedora-extras-commits at redhat.com  Tue Jan  3 23:32:47 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  3 Jan 2006 18:32:47 -0500
Subject: rpms/rpy/devel rpy.spec,1.3,1.4
Message-ID: <200601032333.k03NXJ4H007514@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7497

Modified Files:
	rpy.spec 
Log Message:
Update to work with R-2.2.1


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpy.spec	11 Oct 2005 07:41:26 -0000	1.3
+++ rpy.spec	3 Jan 2006 23:32:47 -0000	1.4
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	3%{?dist}
+Release:	4%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 License:	GPL
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+- Update for R-2.2.1
+
 * Tue Oct 11 2005 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-3
 - Another try to deal with make tag.
 



From fedora-extras-commits at redhat.com  Wed Jan  4 00:52:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 19:52:55 -0500
Subject: rpms/wine/FC-3 wine.spec,1.3,1.4
Message-ID: <200601040053.k040rRlR009508@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445/FC-3

Modified Files:
	wine.spec 
Log Message:
- fix #176834



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine.spec	2 Jan 2006 09:31:09 -0000	1.3
+++ wine.spec	4 Jan 2006 00:52:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -306,6 +306,7 @@
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
+%{_libdir}/wine/winecfg.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -600,7 +601,6 @@
 %{_libdir}/wine/taskmgr.exe.so
 %{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
-%{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
 %{_libdir}/wine/winemine.exe.so
@@ -675,6 +675,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-5
+- fix #176834 
+
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-4
 - bump for import



From fedora-extras-commits at redhat.com  Wed Jan  4 00:53:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 19:53:01 -0500
Subject: rpms/wine/FC-4 wine.spec,1.5,1.6
Message-ID: <200601040053.k040rYw6009515@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445/FC-4

Modified Files:
	wine.spec 
Log Message:
- fix #176834



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wine.spec	2 Jan 2006 09:27:20 -0000	1.5
+++ wine.spec	4 Jan 2006 00:53:00 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -306,6 +306,8 @@
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/uninstaller.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -598,9 +600,7 @@
 %{_libdir}/wine/notepad.exe.so
 %{_libdir}/wine/progman.exe.so
 %{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
-%{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
 %{_libdir}/wine/winemine.exe.so
@@ -675,6 +675,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.4-5
+- fix #176834 
+
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-4
 - bump for import



From fedora-extras-commits at redhat.com  Wed Jan  4 00:53:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue,  3 Jan 2006 19:53:06 -0500
Subject: rpms/wine/devel wine.spec,1.5,1.6
Message-ID: <200601040053.k040rdx6009518@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445/devel

Modified Files:
	wine.spec 
Log Message:
- fix #176834



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wine.spec	2 Jan 2006 09:09:15 -0000	1.5
+++ wine.spec	4 Jan 2006 00:53:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -310,6 +310,8 @@
 %{_libdir}/wine/wineconsole.exe.so
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
+%{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/uninstaller.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -602,9 +604,7 @@
 %{_libdir}/wine/notepad.exe.so
 %{_libdir}/wine/progman.exe.so
 %{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
-%{_libdir}/wine/winecfg.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
 %{_libdir}/wine/winemine.exe.so
@@ -679,6 +679,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>     
+0.9.4-5                                                                 
+- fix #176834 
+
 * Mon Jan 02 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-4
 - add dist



From fedora-extras-commits at redhat.com  Wed Jan  4 04:08:14 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue,  3 Jan 2006 23:08:14 -0500
Subject: rpms/net6/FC-4 .cvsignore, 1.2, 1.3 net6.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200601040409.k0449BxE016749@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/net6/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16728

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
1.2.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/net6/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Oct 2005 22:22:10 -0000	1.2
+++ .cvsignore	4 Jan 2006 04:08:08 -0000	1.3
@@ -1 +1 @@
-net6-1.1.0.tar.gz
+net6-1.2.2.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/FC-4/net6.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- net6.spec	3 Oct 2005 16:51:57 -0000	1.2
+++ net6.spec	4 Jan 2006 04:08:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           net6
-Version:        1.1.0
-Release:        2%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
@@ -70,6 +70,18 @@
 
 
 %changelog
+* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 1.2.2-1
+- 1.2.2
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 1.2.1-2
+- Rebuild
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 1.2.1-1
+- Bump to 1.2.1
+
+* Wed Nov 16 2005 Luke Macken <lmacken at redhat.com> - 1.2.0-1
+- Bump to 1.2.0
+
 * Fri Sep 30 2005 Luke Macken <lmacken at redhat.com> - 1.1.0-2
 - Use find_lang macro
 - Add pkg-config to -devel Requires


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/net6/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Oct 2005 22:22:10 -0000	1.2
+++ sources	4 Jan 2006 04:08:08 -0000	1.3
@@ -1 +1 @@
-522229474ff554a4ce883002011d0fbb  net6-1.1.0.tar.gz
+8a551a2d9785b2b0ed431bb9eeb6cfd6  net6-1.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 04:25:16 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue,  3 Jan 2006 23:25:16 -0500
Subject: rpms/obby/FC-4 .cvsignore, 1.2, 1.3 obby.spec, 1.6, 1.7 sources, 1.2,
	1.3
Message-ID: <200601040425.k044PmGY016895@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16874

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
0.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Oct 2005 06:43:46 -0000	1.2
+++ .cvsignore	4 Jan 2006 04:25:16 -0000	1.3
@@ -1 +1 @@
-obby-0.2.0.tar.gz
+obby-0.3.0.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- obby.spec	16 Oct 2005 23:51:21 -0000	1.6
+++ obby.spec	4 Jan 2006 04:25:16 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           obby
-Version:        0.2.0
-Release:        6%{?dist}
+Version:        0.3.0
+Release:        1%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@
 Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  net6-devel, gmp-devel, gettext-devel, howl-devel
+BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
 
 %description
 libobby is a library which provides synced document buffers. It supports
@@ -21,7 +21,7 @@
 Summary:        Development libraries for obby
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig, net6-devel, gmp-devel, howl-devel
+Requires:       pkgconfig, net6-devel, gmp-devel
 
 %description devel
 libobby is a library which provides synced document buffers. This package
@@ -36,7 +36,7 @@
 aclocal && autoconf
 sed -i 's!\(return (\)int\() gettext ("")\)!\1long\2!' configure
 
-%configure --disable-static --with-howl
+%configure --disable-static
 make %{?_smp_mflags}
 
 
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
 * Sun Oct 16 2005 Luke Macken <lmacken at redhat.com> - 0.2.0-6
 - Patch from Toshio Kuratomi to fix FC4 build on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Oct 2005 06:43:46 -0000	1.2
+++ sources	4 Jan 2006 04:25:16 -0000	1.3
@@ -1 +1 @@
-6bd46f9b8c7652d7bfa8413ed2c2af4b  obby-0.2.0.tar.gz
+b14135018a3093395296cf091f9f824f  obby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 04:32:59 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue,  3 Jan 2006 23:32:59 -0500
Subject: rpms/obby/FC-4 obby.spec,1.7,1.8
Message-ID: <200601040433.k044XVJD016961@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16944

Modified Files:
	obby.spec 
Log Message:
remove workarounds


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- obby.spec	4 Jan 2006 04:25:16 -0000	1.7
+++ obby.spec	4 Jan 2006 04:32:58 -0000	1.8
@@ -33,9 +33,6 @@
 
 
 %build
-aclocal && autoconf
-sed -i 's!\(return (\)int\() gettext ("")\)!\1long\2!' configure
-
 %configure --disable-static
 make %{?_smp_mflags}
 
@@ -70,6 +67,7 @@
 %changelog
 * Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
+- Remove broken build workarounds
 
 * Sun Oct 16 2005 Luke Macken <lmacken at redhat.com> - 0.2.0-6
 - Patch from Toshio Kuratomi to fix FC4 build on x86_64



From fedora-extras-commits at redhat.com  Wed Jan  4 08:53:34 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed,  4 Jan 2006 03:53:34 -0500
Subject: rpms/python-myghty/devel .cvsignore, 1.3, 1.4 python-myghty.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601040854.k048s71C024023@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23996

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
0.99a


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 00:57:18 -0000	1.3
+++ .cvsignore	4 Jan 2006 08:53:33 -0000	1.4
@@ -1 +1 @@
-Myghty-0.99.tar.gz
+Myghty-0.99a.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-myghty.spec	6 Oct 2005 00:57:18 -0000	1.2
+++ python-myghty.spec	4 Jan 2006 08:53:33 -0000	1.3
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        0.99
+Version:        0.99a
 Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 0.99a-1
+- Bump to 0.99a
+
 * Wed Oct 05 2005 Luke Macken <lmacken at redhat.com> 0.99-1
 - Bump to version 0.99
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 00:57:18 -0000	1.3
+++ sources	4 Jan 2006 08:53:33 -0000	1.4
@@ -1 +1 @@
-01e8677f38e5f822038c12b120f05704  Myghty-0.99.tar.gz
+09953871f9616e4c5f6059fc6bf06b7e  Myghty-0.99a.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 09:17:35 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Wed,  4 Jan 2006 04:17:35 -0500
Subject: rpms/python-myghty/devel python-myghty.spec,1.3,1.4
Message-ID: <200601040918.k049I8OU026276@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26104

Modified Files:
	python-myghty.spec 
Log Message:
Install with --old-and-unmanageable to avoid Python Eggs annoyance


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-myghty.spec	4 Jan 2006 08:53:33 -0000	1.3
+++ python-myghty.spec	4 Jan 2006 09:17:21 -0000	1.4
@@ -33,9 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --old-and-unmanageable --root $RPM_BUILD_ROOT
 (cd doc ; %{__python} genhtml.py)
-find ./doc ./examples -type f -perm +001 | xargs chmod -x
 
 
 %clean
@@ -51,6 +50,7 @@
 %changelog
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 0.99a-1
 - Bump to 0.99a
+- Install with --old-and-unmanageable to avoid Python Eggs annoyance
 
 * Wed Oct 05 2005 Luke Macken <lmacken at redhat.com> 0.99-1
 - Bump to version 0.99



From fedora-extras-commits at redhat.com  Wed Jan  4 10:54:01 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed,  4 Jan 2006 05:54:01 -0500
Subject: rpms/tinyerp/devel tinyerp-server.logrotate, NONE, 1.1 tinyerp.spec,
	1.9, 1.10
Message-ID: <200601041054.k04AsXLD028375@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28336

Modified Files:
	tinyerp.spec 
Added Files:
	tinyerp-server.logrotate 
Log Message:
 - synced devel from FC-4 version



--- NEW FILE tinyerp-server.logrotate ---
/var/log/tinyerp/*.log {
    copytruncate
    missingok
    notifempty
}


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyerp.spec	28 Nov 2005 18:09:17 -0000	1.9
+++ tinyerp.spec	4 Jan 2006 10:54:00 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -13,13 +13,13 @@
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
+Source5:	tinyerp-server.logrotate
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
-BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb, xorg-x11-fonts-misc
+BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb
 Requires:	pygtk2, pygtk2-libglade, pydot
-Requires(pre):	fedora-usermgmt
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
 
@@ -38,6 +38,9 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
+Requires(pre):	fedora-usermgmt
+Requires(postun):	fedora-usermgmt
 
 %description server
 Server components for Tiny ERP.
@@ -49,7 +52,7 @@
 
 %build
 cd tinyerp-client-%{version}
-/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate -fp /usr/share/X11/fonts/misc &
+/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
@@ -57,7 +60,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 cd tinyerp-client-%{version}
-/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate -fp /usr/share/X11/fonts/misc &
+/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
@@ -78,6 +81,7 @@
 
 install -m 644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/tinyerp-server.conf
 install -m 755 -D %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/tinyerp-server
+install -m 644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/tinyerp-server
 mkdir -p $RPM_BUILD_ROOT/var/log/tinyerp
 mkdir -p $RPM_BUILD_ROOT/var/spool/tinyerp
 
@@ -97,8 +101,9 @@
 %files server
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
-%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -109,8 +114,6 @@
 /usr/sbin/fedora-useradd 13 -r -s /sbin/nologin -d /var/spool/tinyerp -M \
 	-c 'TinyERP Server Owner' -g tinyerp tinyerp &>/dev/null || :
 
-chown -R tinyerp:tinyerp /var/log/tinyerp /var/spool/tinyerp
-
 exit 0
 
 %post server
@@ -132,17 +135,19 @@
 
 
 %changelog
-* Mon Nov 28 2005 Dan Horak <dan at danny.cz> 3.1.1-1
-- update to TinyERP 3.1.1
+* Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
+- added Requires(postun) to the -server package (Ville Skytt??)
+- improved startup script, suggested by Enrico Scholz
+- added log rotation
 
-* Wed Nov 23 2005 Dan Horak <dan at danny.cz> 3.1.0-4
-- modify BuildRequires again to support FC5
+* Sun Dec 11 2005 Dan Horak <dan at danny.cz> 3.1.1-4
+- moved Requires(pre) to the -server package (Ville Skytt??)
 
-* Tue Nov 22 2005 Dan Horak <dan at danny.cz> 3.1.0-3
-- modify path of Xvfb to support FC5
+* Thu Dec  7 2005 Dan Horak <dan at danny.cz> 3.1.1-3
+- chown for log and spool is not required
 
-* Sun Nov 20 2005 Dan Horak <dan at danny.cz> 3.1.0-2
-- modify BuildRequires to support FC5
+* Mon Nov 28 2005 Dan Horak <dan at danny.cz> 3.1.1-1
+- upgrade to tinyerp 3.1.1
 
 * Sun Nov 20 2005 Dan Horak <dan at danny.cz> 3.1.0-1
 - upgrade to tinyerp 3.1.x



From fedora-extras-commits at redhat.com  Wed Jan  4 11:19:49 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed,  4 Jan 2006 06:19:49 -0500
Subject: rpms/tinyerp/devel tinyerp.spec,1.10,1.11
Message-ID: <200601041120.k04BKLaf030112@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30093

Modified Files:
	tinyerp.spec 
Log Message:
 - updated Xorg dependencies



Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec	4 Jan 2006 10:54:00 -0000	1.10
+++ tinyerp.spec	4 Jan 2006 11:19:48 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -18,7 +18,8 @@
 BuildArch:	noarch
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
-BuildRequires:	desktop-file-utils, xorg-x11-server-Xvfb
+BuildRequires:	desktop-file-utils
+BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base, xorg-x11-fonts-misc
 Requires:	pygtk2, pygtk2-libglade, pydot
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
@@ -52,7 +53,7 @@
 
 %build
 cd tinyerp-client-%{version}
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py build
@@ -60,7 +61,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 cd tinyerp-client-%{version}
-/usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
+/usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ../tinyerp-server-%{version}
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
@@ -135,6 +136,9 @@
 
 
 %changelog
+* Wed Jan  4 2006 Dan Horak <dan at danny.cz> 3.1.1-6
+- added new Xorg dependencies
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
 - improved startup script, suggested by Enrico Scholz



From fedora-extras-commits at redhat.com  Wed Jan  4 20:20:40 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed,  4 Jan 2006 15:20:40 -0500
Subject: idweb - Imported sources
Message-ID: <200601042020.k04KKefb014585@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/idweb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14571

Log Message:
Initial import of skeleton.

Status:

Vendor Tag:	FEDORA
Release Tags:	V0_0
		
N idweb/README
N idweb/sql/fid.sql

No conflicts created by this import




From fedora-extras-commits at redhat.com  Wed Jan  4 20:27:34 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:27:34 -0500
Subject: rpms/python-basemap - New directory
Message-ID: <200601042027.k04KRaRu014695@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14687/python-basemap

Log Message:
Directory /cvs/extras/rpms/python-basemap added to the repository




From fedora-extras-commits at redhat.com  Wed Jan  4 20:27:40 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:27:40 -0500
Subject: rpms/python-basemap/devel - New directory
Message-ID: <200601042027.k04KRgiU014712@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14687/python-basemap/devel

Log Message:
Directory /cvs/extras/rpms/python-basemap/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan  4 20:28:00 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:28:00 -0500
Subject: rpms/python-basemap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601042028.k04KS2na014750@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14736

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-basemap


--- NEW FILE Makefile ---
# Top level Makefile for module python-basemap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan  4 20:28:06 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:28:06 -0500
Subject: rpms/python-basemap/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601042028.k04KS8ae014770@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14736/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-basemap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan  4 20:29:15 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:29:15 -0500
Subject: rpms/python-basemap import.log,1.1,1.2
Message-ID: <200601042029.k04KTmgb014856@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14816

Modified Files:
	import.log 
Log Message:
auto-import python-basemap-0.7.2.1-1 on branch devel from python-basemap-0.7.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Jan 2006 20:28:00 -0000	1.1
+++ import.log	4 Jan 2006 20:29:15 -0000	1.2
@@ -0,0 +1 @@
+python-basemap-0_7_2_1-1:HEAD:python-basemap-0.7.2.1-1.src.rpm:1136406545



From fedora-extras-commits at redhat.com  Wed Jan  4 20:29:22 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 15:29:22 -0500
Subject: rpms/python-basemap/devel python-basemap-0.7.2.1.patch, NONE,
	1.1 python-basemap.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601042029.k04KTsHK014860@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14816/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-basemap-0.7.2.1.patch python-basemap.spec 
Log Message:
auto-import python-basemap-0.7.2.1-1 on branch devel from python-basemap-0.7.2.1-1.src.rpm

python-basemap-0.7.2.1.patch:

--- NEW FILE python-basemap-0.7.2.1.patch ---
--- basemap-0.7.2.1/setup.py.orig	2005-11-18 06:44:22.000000000 -0700
+++ basemap-0.7.2.1/setup.py	2005-11-20 11:24:20.000000000 -0700
@@ -11,7 +11,7 @@
     DBFUpdateHeader is available, we scan shapefil.h for the string
     'DBFUpdateHeader'.
     """
-    f = open(convert_path("pyshapelib/shapelib/shapefil.h"))
+    f = open(convert_path("/usr/include/libshp//shapefil.h"))
     contents = f.read()
     f.close()
     if contents.find("DBFUpdateHeader") >= 0:
@@ -19,35 +19,30 @@
     else:
         return [("HAVE_UPDATE_HEADER", "0")]
 
-deps = glob.glob('src/*.c')
+#deps = glob.glob('src/*.c')
 
-extensions = [Extension("proj4",deps,include_dirs = ['src'],)]
+extensions = [Extension("proj4",['proj4.c'],libraries=["proj"])]
 packages          = ['matplotlib/toolkits','matplotlib/toolkits/basemap']
 package_dirs       = {'':'lib'}
 
-# don't build pyshapelib if it is already installed.
+# Always build pyshapelib for RPM consistency, uses system shapelib
 
-try:
-    import shapelib
-    import dbflib
-except:
-    packages = packages + ['shapelib','dbflib']
-    package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
-    package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
-    extensions = extensions + \
-             [Extension("shapelibc",
-                        ["pyshapelib/shapelib_wrap.c",
-                         "pyshapelib/shapelib/shpopen.c",
-                         "pyshapelib/shapelib/shptree.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
-              Extension("shptree",
-                        ["pyshapelib/shptreemodule.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
-              Extension("dbflibc",
-                        ["pyshapelib/dbflib_wrap.c",
-                         "pyshapelib/shapelib/dbfopen.c"],
-                        include_dirs = ["pyshapelib/shapelib"],
-                        define_macros = dbf_macros()) ]
+packages = packages + ['shapelib','dbflib']
+package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
+package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
+extensions = extensions + \
+         [Extension("shapelibc",
+                    ["pyshapelib/shapelib_wrap.c"],
+                    include_dirs = ["/usr/include/libshp"],
+                    libraries=["shp"]),
+          Extension("shptree",
+                    ["pyshapelib/shptreemodule.c"],
+                    include_dirs = ["/usr/include/libshp"]),
+          Extension("dbflibc",
+                    ["pyshapelib/dbflib_wrap.c"],
+                    include_dirs = ["/usr/include/libshp"],
+                    libraries = ["shp"],
+                    define_macros = dbf_macros()) ]
 
 setup(
   name              = "basemap",


--- NEW FILE python-basemap.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-basemap
Version:        0.7.2.1
Release:        1%{?dist}
Summary:        Plots data on map projections (with continental and political boundaries) 
Group:          Development/Libraries
License:        MIT and GPL
URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
Source0:        http://dl.sf.net/matplotlib/basemap-%{version}.tar.gz
Patch0:         python-basemap-0.7.2.1.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel, proj-devel, shapelib-devel
Requires:       python-matplotlib >= 0.81, python-basemap-data

%description
Basemap is a matplotlib toolkit that allows you to plot data on map
 projections (with continental and political boundaries)

%prep
%setup -q -n basemap-%{version}
%patch0 -p1 -b .orig

#We are going to use the system proj4 library
mv src/proj4.* .
rm -rf src

#Avoid name conflict
mv examples/README examples/README.examples

#Cleanup line endings
sed -i 's/\r$//' examples/*


%build
%{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
#rm $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/toolkits/__init__.py*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changelog examples/* README LICENSE_pyshapelib
%{python_sitearch}/matplotlib/toolkits/
#%{python_sitearch}/matplotlib/toolkits/basemap/
%{python_sitearch}/proj4.so
%{python_sitearch}/dbflib/
%{python_sitearch}/dbflibc.so
%{python_sitearch}/shapelib/
%{python_sitearch}/shapelibc.so
%{python_sitearch}/shptree.so


%changelog
* Sun Nov 20 2005 Orion Poplawski <orion at cora.nwra.com> 0.7.2.1-1
- Update to upstream 0.7.2.1
- Split into python-basemap and python-basemap-data
- No longer requires python-numarray
- Use system shapelib for pyshapelib components

* Tue Sep 13 2005 Orion Poplawski <orion at cora.nwra.com> 0.6.2-1
- Update to upstream 0.6.2

* Tue Aug 02 2005 Orion Poplawski <orion at cora.nwra.com> 0.5.2-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Jan 2006 20:28:06 -0000	1.1
+++ .cvsignore	4 Jan 2006 20:29:21 -0000	1.2
@@ -0,0 +1 @@
+basemap-0.7.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Jan 2006 20:28:06 -0000	1.1
+++ sources	4 Jan 2006 20:29:21 -0000	1.2
@@ -0,0 +1 @@
+580144218a66e2cb227959f97809f68e  basemap-0.7.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 20:37:15 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Wed,  4 Jan 2006 15:37:15 -0500
Subject: CVSROOT avail,1.22,1.23 loginfo,1.11,1.12
Message-ID: <200601042037.k04Kbk0b014964@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14937

Modified Files:
	avail loginfo 
Log Message:
Split out mail a bit better


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- avail	20 Dec 2005 21:50:42 -0000	1.22
+++ avail	4 Jan 2006 20:37:13 -0000	1.23
@@ -23,15 +23,11 @@
 avail | tfox,notting,sopwith,gdk,katzj,kwade | web
 avail | havill,hp,nman64,ivazquez,jkeating | web
 avail | katzj | web/html/About/Projects/anaconda-installer
-#avail | bfox | web/html/projects/config-tools
 avail | blizzard,krh | web/html/About/Projects/desktop
-#avail | wcohen | web/html/projects/additional-projects/benchmarks
 avail | sopwith,dwalsh,kwade | web/html/About/Projects
-#avail | ezannoni | web/html/projects/additional-projects/gdb
 avail | alikins,trobert | web/html/Download
 avail | llch | web/html/About/Projects/i18n
 avail | sarahs | web/html/About/Projects/translations
-#avail | harald | web/html/projects/config-tools
 avail | kwade,pfrields | web/html/docs
 avail | sarahs | web/html/docs/translation-faq
 avail | sarahs | web/html/docs/translation-guide
@@ -40,9 +36,7 @@
 avail | dmalcolm | web/html/docs/stateless
 avail | riel | web/html/docs/virtualisation
 avail | riel | web/html/About/Projects/virtualisation
-#avail | ezannoni | web/html/projects/systemtap
 avail | harald | web/html/docs/udev
-#avail | cfeist | web/html/projects/cluster
 
 unavail | | fedora-security
 avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security
@@ -53,5 +47,3 @@
 avail | pfrields,mjohnson | web/html/participate/documentation-quick-start
 avail | pfrields | web/html/participate/developers-guide
 avail | tchung | web/html/News
-
-


Index: loginfo
===================================================================
RCS file: /cvs/fedora/CVSROOT/loginfo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- loginfo	8 Dec 2005 20:11:44 -0000	1.11
+++ loginfo	4 Jan 2006 20:37:13 -0000	1.12
@@ -27,6 +27,8 @@
 #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
 
 ^extras-buildsys-temp $CVSROOT/CVSROOT/syncmail %{sVv} katzj skvidal
-ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
+^idweb $CVSROOT/CVSROOT/syncmail %{sVv} cvs-sysadmin at fedora.redhat.com
+^web $CVSROOT/CVSROOT/syncmail %{sVv} cvs-web at fedora.redhat.com
+DEFAULT	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/fedora localdelivery at cvs-int.fedora.redhat.com
 ALL $CVSROOT/CVSROOT/syncmail --require-keyword='*docs*' %{sVv} relnotes at fedoraproject.org



From fedora-extras-commits at redhat.com  Wed Jan  4 20:58:40 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Jan 2006 15:58:40 -0500
Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.7,1.8
Message-ID: <200601042059.k04KxCuT015119@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102

Modified Files:
	perl-File-Tail.spec 
Log Message:
Correction of spelling error in the description.


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-File-Tail.spec	15 Sep 2005 16:36:06 -0000	1.7
+++ perl-File-Tail.spec	4 Jan 2006 20:58:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           perl-File-Tail
 Version:        0.99.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy usefull if you are
+while they are being written, which is especialy useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
+- Correction of spelling error in the description.
+
 * Thu Sep 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.99.3-1
 - 0.99.3.
 - Specfile cleanups.



From fedora-extras-commits at redhat.com  Wed Jan  4 21:02:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Jan 2006 16:02:12 -0500
Subject: rpms/perl-File-Tail/FC-3 .cvsignore, 1.2, 1.3 perl-File-Tail.spec,
	1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601042102.k04L2i9n016846@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808/FC-3

Modified Files:
	.cvsignore perl-File-Tail.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:29 -0000	1.2
+++ .cvsignore	4 Jan 2006 21:02:12 -0000	1.3
@@ -1 +1 @@
-File-Tail-0.98.tar.gz
+File-Tail-0.99.3.tar.gz


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-3/perl-File-Tail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-File-Tail.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-File-Tail.spec	4 Jan 2006 21:02:12 -0000	1.5
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-File-Tail
-Version:        0.98
-Release:        3
-Epoch:          0
+Version:        0.99.3
+Release:        2%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/File-Tail/
-Source0:     http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-0.98.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy usefull if you are
+while they are being written, which is especialy useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -25,22 +22,19 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -51,12 +45,21 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/auto/File
-%{perl_vendorlib}/File
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Tail.3*
 
 
 %changelog
+* Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
+- Correction of spelling error in the description.
+
+* Thu Sep 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.99.3-1
+- 0.99.3.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.98-4
+- rebuilt
+
 * Sun Feb  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.98-0.fdr.3
 - BuildRequire Time::HiRes (bug 731).
 - Run tests in the %%check section.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:29 -0000	1.2
+++ sources	4 Jan 2006 21:02:12 -0000	1.3
@@ -1 +1 @@
-d16d67052577a5cdcde03d5cd2dc5569  File-Tail-0.98.tar.gz
+ef0fb7bcb4181ba593f4a09940f61d1c  File-Tail-0.99.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 21:02:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed,  4 Jan 2006 16:02:19 -0500
Subject: rpms/perl-File-Tail/FC-4 .cvsignore, 1.2, 1.3 perl-File-Tail.spec,
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200601042103.k04L3Bd0016851@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808/FC-4

Modified Files:
	.cvsignore perl-File-Tail.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:00:29 -0000	1.2
+++ .cvsignore	4 Jan 2006 21:02:18 -0000	1.3
@@ -1 +1 @@
-File-Tail-0.98.tar.gz
+File-Tail-0.99.3.tar.gz


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-4/perl-File-Tail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-File-Tail.spec	6 Apr 2005 22:12:44 -0000	1.6
+++ perl-File-Tail.spec	4 Jan 2006 21:02:18 -0000	1.7
@@ -1,15 +1,12 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-File-Tail
-Version:        0.98
-Release:        4
-
+Version:        0.99.3
+Release:        2%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/File-Tail/
-Source0:     http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-0.98.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MG/MGRABNAR/File-Tail-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy usefull if you are
+while they are being written, which is especialy useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -25,22 +22,19 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -51,13 +45,19 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorlib}/auto/File
-%{perl_vendorlib}/File
-%{_mandir}/man3/*.3*
+%{perl_vendorlib}/File/
+%{_mandir}/man3/File::Tail.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
+- Correction of spelling error in the description.
+
+* Thu Sep 15 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.99.3-1
+- 0.99.3.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.98-4
 - rebuilt
 
 * Sun Feb  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.98-0.fdr.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:00:29 -0000	1.2
+++ sources	4 Jan 2006 21:02:18 -0000	1.3
@@ -1 +1 @@
-d16d67052577a5cdcde03d5cd2dc5569  File-Tail-0.98.tar.gz
+ef0fb7bcb4181ba593f4a09940f61d1c  File-Tail-0.99.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 23:17:44 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  4 Jan 2006 18:17:44 -0500
Subject: rpms/ocaml/devel .cvsignore, 1.4, 1.5 ocaml.spec, 1.21, 1.22 sources,
	1.6, 1.7
Message-ID: <200601042318.k04NIGjC020916@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20887

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Mar 2005 18:22:49 -0000	1.4
+++ .cvsignore	4 Jan 2006 23:17:43 -0000	1.5
@@ -1,4 +1,4 @@
-ocaml-3.08.3.tar.bz2
-ocaml-3.08-refman.html.tar.gz
-ocaml-3.08-refman.info.tar.gz
-ocaml-3.08-refman.ps.gz
+ocaml-3.09.1.tar.bz2
+ocaml-3.09-refman.html.tar.gz
+ocaml-3.09-refman.info.tar.gz
+ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ocaml.spec	1 Jan 2006 01:17:07 -0000	1.21
+++ ocaml.spec	4 Jan 2006 23:17:43 -0000	1.22
@@ -1,13 +1,13 @@
 Name:		ocaml
-Version:	3.09.0
-Release: 	3%{?dist}
+Version:	3.09.1
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
+- new version 3.09.1
+
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jan 2006 00:05:17 -0000	1.6
+++ sources	4 Jan 2006 23:17:43 -0000	1.7
@@ -1,4 +1,4 @@
-834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
 598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Wed Jan  4 23:21:28 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  4 Jan 2006 18:21:28 -0500
Subject: rpms/ocaml/FC-4 .cvsignore, 1.6, 1.7 ocaml.spec, 1.19, 1.20 sources,
	1.6, 1.7
Message-ID: <200601042322.k04NM0L7021015@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20972/FC-4

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Jan 2006 00:01:59 -0000	1.6
+++ .cvsignore	4 Jan 2006 23:21:28 -0000	1.7
@@ -1,4 +1,4 @@
-ocaml-3.09.0.tar.bz2
+ocaml-3.09.1.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
 ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ocaml.spec	1 Jan 2006 00:07:21 -0000	1.19
+++ ocaml.spec	4 Jan 2006 23:21:28 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.0
+Version:	3.09.1
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
+- new version 3.09.1
+
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jan 2006 00:01:59 -0000	1.6
+++ sources	4 Jan 2006 23:21:28 -0000	1.7
@@ -1,4 +1,4 @@
-834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
 598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 00:09:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Wed,  4 Jan 2006 19:09:57 -0500
Subject: rpms/apcupsd/devel .cvsignore, 1.2, 1.3 apcupsd.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200601050010.k050AT2t022990@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22969

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
Update to 3.12.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 02:59:11 -0000	1.2
+++ .cvsignore	5 Jan 2006 00:09:56 -0000	1.3
@@ -1 +1 @@
-apcupsd-3.10.18.tar.gz
+apcupsd-3.12.0.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apcupsd.spec	3 Jan 2006 17:53:58 -0000	1.5
+++ apcupsd.spec	5 Jan 2006 00:09:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.10.18
-Release:      7%{?dist}
+Version:      3.12.0
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -43,7 +43,7 @@
 %prep
 %setup -q
 %patch -p1 -b .init
-dos2unix examples/*status
+dos2unix examples/*status examples/*.c
 
 
 %build
@@ -92,7 +92,7 @@
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
-chmod -x examples/*.conf
+chmod -x examples/*.conf examples/*.c
 rm examples/*.in
 
 
@@ -102,7 +102,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog doc/README.apcaccess doc/developers_manual examples ReleaseNotes
+%doc COPYING ChangeLog examples ReleaseNotes
 %dir %{_sysconfdir}/apcupsd
 %{_initrddir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
@@ -112,8 +112,8 @@
 %{_sysconfdir}/apcupsd/changeme
 %{_sysconfdir}/apcupsd/commfailure
 %{_sysconfdir}/apcupsd/commok
+%{_sysconfdir}/apcupsd/offbattery
 %{_sysconfdir}/apcupsd/onbattery
-%{_sysconfdir}/apcupsd/mainsback
 %{_sysconfdir}/apcupsd/masterconnect
 %{_sysconfdir}/apcupsd/mastertimeout
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Wed Jan  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.0-1
+- Update to 3.12.0
+
 * Tue Jan  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-7
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 02:59:11 -0000	1.2
+++ sources	5 Jan 2006 00:09:56 -0000	1.3
@@ -1 +1 @@
-64104a1fface0253e77318ca84948bac  apcupsd-3.10.18.tar.gz
+7adb6274ede9dfaec7b6641105ae7a3a  apcupsd-3.12.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 04:49:11 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed,  4 Jan 2006 23:49:11 -0500
Subject: rpms/libeXosip2/FC-4 libeXosip2.spec,1.3,1.4
Message-ID: <200601050449.k054niZ5030766@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30749

Modified Files:
	libeXosip2.spec 
Log Message:
Update to 2.2.2.



Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/libeXosip2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libeXosip2.spec	29 Oct 2005 16:27:39 -0000	1.3
+++ libeXosip2.spec	5 Jan 2006 04:49:11 -0000	1.4
@@ -1,13 +1,12 @@
-%define pre 17
 
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 1.9.1
-Release: 0.5%{?pre:.pre%{pre}}%{?dist}
+Version: 2.2.2
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}%{?pre:-pre%{pre}}.tar.gz
+Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
@@ -30,7 +29,7 @@
 Development files for libeXosip2.
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-pre%{pre}}
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --disable-static --disable-josua
@@ -70,6 +69,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jan  4 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 2.2.2
+- Update to 2.2.2.
+
 * Sat Oct 29 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 1.9.1-0.5.pre17
 - Update to next prerelease.
 



From fedora-extras-commits at redhat.com  Thu Jan  5 00:54:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  4 Jan 2006 19:54:49 -0500
Subject: rpms/openvpn/devel openvpn.spec,1.12,1.13
Message-ID: <200601050055.k050tL5b023446@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/devel

Modified Files:
	openvpn.spec 
Log Message:
Man page shouldn't be executable (BZ#176953)


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openvpn.spec	6 Dec 2005 15:52:51 -0000	1.12
+++ openvpn.spec	5 Jan 2006 00:54:49 -0000	1.13
@@ -4,7 +4,7 @@
 
 Name:              openvpn
 Version:           2.1
-Release:           0.4%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.5%{?prerelease:.%{prerelease}}%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 #Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -75,7 +75,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m 0755 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+install -D -m 0644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -D -m 0755 sample-scripts/%{name}.init \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Jan 04 2006 Steven Pritchard <steve at kspei.com> 2.1-0.5.beta7
+- Man page shouldn't be executable (BZ#176953)
+
 * Tue Dec 06 2005 Steven Pritchard <steve at kspei.com> 2.1-0.4.beta7
 - Rebuild
 



From fedora-extras-commits at redhat.com  Thu Jan  5 06:31:13 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 01:31:13 -0500
Subject: rpms/rkhunter/FC-1 rkhunter-1.1.9-app_check_default.patch, NONE,
	1.1 rkhunter-1.1.9-shared_man_search.patch, NONE,
	1.1 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 rkhunter.spec, 1.1, 1.2 sources, 1.2,
	1.3 rkhunter-1.1.8-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.8-app_check_default.patch, 1.1,
	NONE rkhunter-1.1.8-prelink_cleanup.patch, 1.1,
	NONE rkhunter-1.1.8-shared_man_search.patch, 1.1,
	NONE rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1, NONE
Message-ID: <200601050631.k056VjSK002253@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-1
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192/FC-1

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.1.9-app_check_default.patch 
	rkhunter-1.1.9-shared_man_search.patch 
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-0.fdr.1.src.md5 
	rkhunter-1.1.8-app_check_default.patch 
	rkhunter-1.1.8-prelink_cleanup.patch 
	rkhunter-1.1.8-shared_man_search.patch 
	rkhunter-1.1.8-whitelist_dir-conf.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-1 from rkhunter-1.2.7-1.src.rpm
auto-import rkhunter-1.2.7-1 from rkhunter-1.2.7-1.src.rpm

rkhunter-1.1.9-app_check_default.patch:

--- NEW FILE rkhunter-1.1.9-app_check_default.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:53:16.000000000 -0500
@@ -49,7 +49,7 @@
 # Skip passwd/group check
 PASSWDCHECK_SKIP=0
 # Application check
-APPLICATION_CHECK=1
+APPLICATION_CHECK=0
 
 USE_PATCHED_SOFTWARE=0
 
@@ -186,6 +186,9 @@
           shift
 	  ROOTDIR=$1
           ;;
+      --run-application-check | --runapplicationcheck | --run-applicationcheck)
+          APPLICATION_CHECK=1
+          ;;
       --scan-knownbad-files)
           PERFORMKNOWNBAD=1
           ;;
@@ -4957,7 +4960,8 @@
     echo $ECHOOPT "--report-mode*            : Don't show uninteresting information for reports"
     echo $ECHOOPT "--report-warnings-only*   : Show only warnings (lesser output than --report-mode,"
     echo $ECHOOPT "                            more than --quiet)"
-    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+#    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+    echo $ECHOOPT "--run-application-check*  : Run application version checks"
     echo $ECHOOPT "--skip-keypress*          : Don't wait after every test (non-interactive)"
     echo $ECHOOPT "--quick*                  : Perform quick scan (instead of full scan)"
     echo $ECHOOPT "--quiet*                  : Be quiet (only show warnings)"    

rkhunter-1.1.9-shared_man_search.patch:

--- NEW FILE rkhunter-1.1.9-shared_man_search.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:25:53.000000000 -0500
@@ -4127,7 +4127,7 @@
 	
 	displaytext -n "   Scanning for hidden files..."
 
-	SEARCHINDIRS="/dev /bin /usr /usr/man /usr/man/man1 /usr/man/man8 /usr/bin /usr/sbin /sbin /etc"
+	SEARCHINDIRS="/dev /bin /usr /usr/share/man /usr/share/man/man1 /usr/share/man/man8 /usr/bin /usr/sbin /sbin /etc"
 	# Only reset status once
 	STATUS=0
 


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-1/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.2
+++ .cvsignore	5 Jan 2006 06:31:13 -0000	1.3
@@ -1,2 +1,2 @@
-rkhunter-1.1.8.tar.gz
-rkhunter-scan_on_boot-rc.local.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-1/rkhunter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rkhunter.spec	8 Nov 2004 05:17:52 -0000	1.1
+++ rkhunter.spec	5 Jan 2006 06:31:13 -0000	1.2
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.8
-Release:        0.fdr.1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.8.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.8-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.8-shared_man_search.patch
-Patch4:         rkhunter-1.1.8-app_check_default.patch
-Patch5:         rkhunter-1.1.8-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,57 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#	s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-    ' rkhunter-scan_on_boot
+%patch0 -b .orig
+
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
+	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
+	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
+    ' files/%{name}.conf
 
 %{__perl} -pi.orig -e '
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
 	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
 	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot-rc.local
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
 %patch1 -b .orig
 %patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
-
-%{__cat} <<'EOF' >%{name}.conf
-## Next three lines installed automatically by RPM. Do not change
-## unless you know what you're doing...
-INSTALLDIR=%{_prefix}
-DBDIR=%{_var}/%{name}/db
-TMPDIR=%{_var}/%{name}/tmp
-
-EOF
-%{__cat} files/%{name}.conf >> %{name}.conf
-
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -108,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -131,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -142,17 +140,27 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
-%{__install} -m640 -p %{name}.conf              ${RPM_BUILD_ROOT}%{_sysconfdir}/
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#%{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
+
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
 
 %postun
 if [ "$1" = 0 ]; then
@@ -166,19 +174,35 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
+
+* Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
+- New package version release
+- Added the --run-application-check command line option
+  to listing in command help
+- Replaced 'Here' Doc editing of rkhunter.conf file
+  with in-place Perl edit
+- tweaked rpmbuild -bb Autoclean
+
 * Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited)
 - Removed redundant buildrequires /bin/sh, coreutils and perl
 - Revise postun scriptlet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-1/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:52 -0000	1.2
+++ sources	5 Jan 2006 06:31:13 -0000	1.3
@@ -1,2 +1,2 @@
-91cae6f04582fb0b27c96784ffe5adae  rkhunter-1.1.8.tar.gz
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.8-app_check_default.patch DELETED ---


--- rkhunter-1.1.8-prelink_cleanup.patch DELETED ---


--- rkhunter-1.1.8-shared_man_search.patch DELETED ---


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 06:31:07 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 01:31:07 -0500
Subject: rpms/rkhunter import.log,1.3,1.4
Message-ID: <200601050631.k056VdAI002248@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-1 from rkhunter-1.2.7-1.src.rpm
auto-import rkhunter-1.2.7-1 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 Jan 2005 08:31:35 -0000	1.3
+++ import.log	5 Jan 2006 06:31:07 -0000	1.4
@@ -1,2 +1,3 @@
 rkhunter-1_1_8-0_fdr_1:HEAD:rkhunter-1.1.8-0.fdr.1.src.rpm:1099891072
 rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718
+rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608



From fedora-extras-commits at redhat.com  Thu Jan  5 07:19:05 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:19:05 -0500
Subject: rpms/rkhunter import.log,1.5,1.6
Message-ID: <200601050719.k057JcPd004451@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4401

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-3 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	5 Jan 2006 07:06:21 -0000	1.5
+++ import.log	5 Jan 2006 07:19:05 -0000	1.6
@@ -2,3 +2,4 @@
 rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718
 rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608
 rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691
+rkhunter-1_2_7-1:FC-3:rkhunter-1.2.7-1.src.rpm:1136445493



From fedora-extras-commits at redhat.com  Thu Jan  5 00:54:37 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  4 Jan 2006 19:54:37 -0500
Subject: rpms/openvpn/FC-3 openvpn.spec,1.9,1.10
Message-ID: <200601050055.k050t9bg023440@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/FC-3

Modified Files:
	openvpn.spec 
Log Message:
Man page shouldn't be executable (BZ#176953)


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/openvpn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openvpn.spec	8 Nov 2005 15:34:56 -0000	1.9
+++ openvpn.spec	5 Jan 2006 00:54:37 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:              openvpn
 Version:           2.0.5
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -72,7 +72,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m 0755 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+install -D -m 0644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -D -m 0755 sample-scripts/%{name}.init \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Jan 04 2006 Steven Pritchard <steve at kspei.com> 2.0.5-3
+- Man page shouldn't be executable (BZ#176953)
+
 * Tue Nov 08 2005 Steven Pritchard <steve at kspei.com> 2.0.5-2
 - Make sample-scripts (etc.) non-executable to avoid some dependencies
 



From fedora-extras-commits at redhat.com  Thu Jan  5 04:57:22 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed,  4 Jan 2006 23:57:22 -0500
Subject: rpms/libeXosip2/devel .cvsignore, 1.3, 1.4 libeXosip2.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601050457.k054vsip030962@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30933

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Update to 2.2.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2005 16:24:20 -0000	1.3
+++ .cvsignore	5 Jan 2006 04:57:22 -0000	1.4
@@ -1 +1 @@
-libeXosip2-1.9.1-pre17.tar.gz
+libeXosip2-2.2.2.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/libeXosip2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libeXosip2.spec	29 Oct 2005 16:24:20 -0000	1.3
+++ libeXosip2.spec	5 Jan 2006 04:57:22 -0000	1.4
@@ -1,13 +1,12 @@
-%define pre 17
 
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
-Version: 1.9.1
-Release: 0.5%{?pre:.pre%{pre}}%{?dist}
+Version: 2.2.2
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
-Source0: http://www.antisip.com/download/%{name}-%{version}%{?pre:-pre%{pre}}.tar.gz
+Source0: http://www.antisip.com/download/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ortp-devel
@@ -30,7 +29,7 @@
 Development files for libeXosip2.
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre:-pre%{pre}}
+%setup -q -n %{name}-%{version}
 
 %build
 %configure --disable-static --disable-josua
@@ -70,6 +69,10 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Wed Jan  4 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 2.2.2
+- Update to 2.2.2.
+- Bump release because forgot to upload new source.
+
 * Sat Oct 29 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 1.9.1-0.5.pre17
 - Update to next prerelease.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2005 16:24:20 -0000	1.3
+++ sources	5 Jan 2006 04:57:22 -0000	1.4
@@ -1 +1 @@
-e16606a53c4c4660a7db7e1c6e3d5256  libeXosip2-1.9.1-pre17.tar.gz
+3434df493dc780b4bae76467ce29d689  libeXosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 07:06:22 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:06:22 -0500
Subject: rpms/rkhunter import.log,1.4,1.5
Message-ID: <200601050707.k0577QoR004192@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4132

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-2 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	5 Jan 2006 06:31:07 -0000	1.4
+++ import.log	5 Jan 2006 07:06:21 -0000	1.5
@@ -1,3 +1,4 @@
 rkhunter-1_1_8-0_fdr_1:HEAD:rkhunter-1.1.8-0.fdr.1.src.rpm:1099891072
 rkhunter-1_1_9-1:HEAD:rkhunter-1.1.9-1.src.rpm:1105086718
 rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608
+rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691



From fedora-extras-commits at redhat.com  Thu Jan  5 07:19:11 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:19:11 -0500
Subject: rpms/rkhunter/FC-3 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rkhunter.spec, 1.3, 1.4 sources, 1.3,
	1.4 rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1,
	NONE rkhunter-1.1.9-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.9-prelink_cleanup.patch, 1.1, NONE
Message-ID: <200601050719.k057Jihx004456@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4401/FC-3

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-whitelist_dir-conf.patch 
	rkhunter-1.1.9-0.fdr.1.src.md5 
	rkhunter-1.1.9-prelink_cleanup.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-3 from rkhunter-1.2.7-1.src.rpm


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jan 2005 08:31:35 -0000	1.3
+++ .cvsignore	5 Jan 2006 07:19:11 -0000	1.4
@@ -1,2 +1,2 @@
-rkhunter-scan_on_boot-rc.local.tar.gz
-rkhunter-1.1.9.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-3/rkhunter.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rkhunter.spec	7 Jan 2005 08:31:35 -0000	1.3
+++ rkhunter.spec	5 Jan 2006 07:19:11 -0000	1.4
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.9
+Version:        1.2.7
 Release:        1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.9-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.9-shared_man_search.patch
-Patch4:         rkhunter-1.1.9-app_check_default.patch
-Patch5:         rkhunter-1.1.9-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,50 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#	s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
-	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
-	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot \
-        rkhunter-scan_on_boot-rc.local
+%patch0 -b .orig
 
-%{__perl} -pi.orig -e '
-	s|^#$|INSTALLDIR=%{_prefix}|;
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
 	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
 	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
     ' files/%{name}.conf
 
-%patch1 -b .0001
-%patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
+%{__perl} -pi.orig -e '
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
+	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@RKEXE\@|%{_bindir}/%{name}|g;
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch1 -b .orig
+%patch2 -b .orig
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -101,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -124,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -135,7 +140,7 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
@@ -143,9 +148,19 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#[ ! -d %{name} ] || %{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
+
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
 
 %postun
 if [ "$1" = 0 ]; then
@@ -159,19 +174,27 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
+
 * Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
 - New package version release
 - Added the --run-application-check command line option


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jan 2005 08:31:35 -0000	1.3
+++ sources	5 Jan 2006 07:19:11 -0000	1.4
@@ -1,2 +1,2 @@
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
-2e24806cb1267124fba6132009e30f1b  rkhunter-1.1.9.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---


--- rkhunter-1.1.9-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.9-prelink_cleanup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 07:06:50 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:06:50 -0500
Subject: rpms/rkhunter/FC-2 rkhunter-1.1.9-app_check_default.patch, NONE,
	1.1 rkhunter-1.1.9-shared_man_search.patch, NONE,
	1.1 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 rkhunter.spec, 1.1, 1.2 sources, 1.2,
	1.3 rkhunter-1.1.8-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.8-app_check_default.patch, 1.1,
	NONE rkhunter-1.1.8-prelink_cleanup.patch, 1.1,
	NONE rkhunter-1.1.8-shared_man_search.patch, 1.1,
	NONE rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1, NONE
Message-ID: <200601050707.k0577QnK004193@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4132/FC-2

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.1.9-app_check_default.patch 
	rkhunter-1.1.9-shared_man_search.patch 
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-0.fdr.1.src.md5 
	rkhunter-1.1.8-app_check_default.patch 
	rkhunter-1.1.8-prelink_cleanup.patch 
	rkhunter-1.1.8-shared_man_search.patch 
	rkhunter-1.1.8-whitelist_dir-conf.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-2 from rkhunter-1.2.7-1.src.rpm

rkhunter-1.1.9-app_check_default.patch:

--- NEW FILE rkhunter-1.1.9-app_check_default.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:53:16.000000000 -0500
@@ -49,7 +49,7 @@
 # Skip passwd/group check
 PASSWDCHECK_SKIP=0
 # Application check
-APPLICATION_CHECK=1
+APPLICATION_CHECK=0
 
 USE_PATCHED_SOFTWARE=0
 
@@ -186,6 +186,9 @@
           shift
 	  ROOTDIR=$1
           ;;
+      --run-application-check | --runapplicationcheck | --run-applicationcheck)
+          APPLICATION_CHECK=1
+          ;;
       --scan-knownbad-files)
           PERFORMKNOWNBAD=1
           ;;
@@ -4957,7 +4960,8 @@
     echo $ECHOOPT "--report-mode*            : Don't show uninteresting information for reports"
     echo $ECHOOPT "--report-warnings-only*   : Show only warnings (lesser output than --report-mode,"
     echo $ECHOOPT "                            more than --quiet)"
-    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+#    echo $ECHOOPT "--skip-application-check* : Don't run application version checks"
+    echo $ECHOOPT "--run-application-check*  : Run application version checks"
     echo $ECHOOPT "--skip-keypress*          : Don't wait after every test (non-interactive)"
     echo $ECHOOPT "--quick*                  : Perform quick scan (instead of full scan)"
     echo $ECHOOPT "--quiet*                  : Be quiet (only show warnings)"    

rkhunter-1.1.9-shared_man_search.patch:

--- NEW FILE rkhunter-1.1.9-shared_man_search.patch ---
--- files/rkhunter.orig	2004-12-28 12:45:21.000000000 -0500
+++ files/rkhunter	2004-12-31 13:25:53.000000000 -0500
@@ -4127,7 +4127,7 @@
 	
 	displaytext -n "   Scanning for hidden files..."
 
-	SEARCHINDIRS="/dev /bin /usr /usr/man /usr/man/man1 /usr/man/man8 /usr/bin /usr/sbin /sbin /etc"
+	SEARCHINDIRS="/dev /bin /usr /usr/share/man /usr/share/man/man1 /usr/share/man/man8 /usr/bin /usr/sbin /sbin /etc"
 	# Only reset status once
 	STATUS=0
 


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:52 -0000	1.2
+++ .cvsignore	5 Jan 2006 07:06:50 -0000	1.3
@@ -1,2 +1,2 @@
-rkhunter-1.1.8.tar.gz
-rkhunter-scan_on_boot-rc.local.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-2/rkhunter.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rkhunter.spec	8 Nov 2004 05:17:52 -0000	1.1
+++ rkhunter.spec	5 Jan 2006 07:06:50 -0000	1.2
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.8
-Release:        0.fdr.1
-Epoch:          0
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits.
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.8.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.8-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.8-shared_man_search.patch
-Patch4:         rkhunter-1.1.8-app_check_default.patch
-Patch5:         rkhunter-1.1.8-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,57 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#	s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-    ' rkhunter-scan_on_boot
+%patch0 -b .orig
+
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
+	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
+	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
+    ' files/%{name}.conf
 
 %{__perl} -pi.orig -e '
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
 	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
 	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot-rc.local
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
 %patch1 -b .orig
 %patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
-
-%{__cat} <<'EOF' >%{name}.conf
-## Next three lines installed automatically by RPM. Do not change
-## unless you know what you're doing...
-INSTALLDIR=%{_prefix}
-DBDIR=%{_var}/%{name}/db
-TMPDIR=%{_var}/%{name}/tmp
-
-EOF
-%{__cat} files/%{name}.conf >> %{name}.conf
-
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -108,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -131,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -142,17 +140,27 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
-%{__install} -m640 -p %{name}.conf              ${RPM_BUILD_ROOT}%{_sysconfdir}/
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
+%{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#%{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
+
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
 
 %postun
 if [ "$1" = 0 ]; then
@@ -166,19 +174,35 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
+
+* Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
+- New package version release
+- Added the --run-application-check command line option
+  to listing in command help
+- Replaced 'Here' Doc editing of rkhunter.conf file
+  with in-place Perl edit
+- tweaked rpmbuild -bb Autoclean
+
 * Fri Oct 15 2004 Greg Houlette - 0:1.1.8-0.fdr.1 (revisited)
 - Removed redundant buildrequires /bin/sh, coreutils and perl
 - Revise postun scriptlet


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:52 -0000	1.2
+++ sources	5 Jan 2006 07:06:50 -0000	1.3
@@ -1,2 +1,2 @@
-91cae6f04582fb0b27c96784ffe5adae  rkhunter-1.1.8.tar.gz
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.8-app_check_default.patch DELETED ---


--- rkhunter-1.1.8-prelink_cleanup.patch DELETED ---


--- rkhunter-1.1.8-shared_man_search.patch DELETED ---


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 14:56:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 09:56:22 -0500
Subject: rpms/maxima/devel maxima.spec,1.11,1.12 xmaxima.desktop,1.3,1.4
Message-ID: <200601051456.k05Eus3t019278@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19255

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
- rebuild for/with new clisp,sbcl



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- maxima.spec	28 Oct 2005 18:49:41 -0000	1.11
+++ maxima.spec	5 Jan 2006 14:56:22 -0000	1.12
@@ -3,14 +3,15 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 6%{?dist} 
+Release: 7%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc (and maybe ppc64)  when lisps build again on ppc 
+# add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
+#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp
@@ -19,8 +20,8 @@
 %define _enable_clisp --enable-clisp 
 # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
 #define _enable_cmucl --enable-cmucl 
-# gcl not built for fc5/development (yet)
-%if "%{?fedora}" < "5"
+%if "%{?fedora}" != "5"
+# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %endif
 %define _enable_sbcl --enable-sbcl 
@@ -351,6 +352,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
+- rebuild for/with new clisp,sbcl
+
 * Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
 - --enable-sbcl
 - avoid rpmquery's at build-time


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/xmaxima.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmaxima.desktop	26 Nov 2005 19:38:20 -0000	1.3
+++ xmaxima.desktop	5 Jan 2006 14:56:22 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=Symbolic Computation Program
 Exec=xmaxima
 Icon=maxima
-MimeType=
+#MimeType=
 Type=Application
 Categories=Application;Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Jan  5 07:36:18 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:36:18 -0500
Subject: rpms/rkhunter/devel rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rkhunter.spec, 1.5, 1.6 sources, 1.3,
	1.4 rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1,
	NONE rkhunter-1.1.9-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.9-prelink_cleanup.patch, 1.1, NONE
Message-ID: <200601050736.k057apUB004818@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4763/devel

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-whitelist_dir-conf.patch 
	rkhunter-1.1.9-0.fdr.1.src.md5 
	rkhunter-1.1.9-prelink_cleanup.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch devel from rkhunter-1.2.7-1.src.rpm


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jan 2005 08:31:35 -0000	1.3
+++ .cvsignore	5 Jan 2006 07:36:18 -0000	1.4
@@ -1,2 +1,2 @@
-rkhunter-scan_on_boot-rc.local.tar.gz
-rkhunter-1.1.9.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rkhunter.spec	6 Apr 2005 22:13:31 -0000	1.5
+++ rkhunter.spec	5 Jan 2006 07:36:18 -0000	1.6
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.9
-Release:        2
-
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.9-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.9-shared_man_search.patch
-Patch4:         rkhunter-1.1.9-app_check_default.patch
-Patch5:         rkhunter-1.1.9-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,50 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#       s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
-	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
-	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot \
-      rkhunter-scan_on_boot-rc.local
+%patch0 -b .orig
 
-%{__perl} -pi.orig -e '
-	s|^#$|INSTALLDIR=%{_prefix}|;
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
 	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
 	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
     ' files/%{name}.conf
 
-%patch1 -b .0001
-%patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
+%{__perl} -pi.orig -e '
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
+	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@RKEXE\@|%{_bindir}/%{name}|g;
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch1 -b .orig
+%patch2 -b .orig
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -101,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -124,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -135,7 +140,7 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
@@ -143,10 +148,20 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#[ ! -d %{name} ] || %{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
 
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
+
 %postun
 if [ "$1" = 0 ]; then
     [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name}
@@ -159,21 +174,26 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
 
 * Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
 - New package version release
@@ -252,7 +272,7 @@
 - added recursive remove of old build root as prep for install phase
 
 * Wed Apr 28 2004 Doncho N. Gunchev - 1.0.9-0.mr700
-- dropped Requires: perl - rkhunter works without it
+- dropped Requires: perl - rkhunter works without it 
 - dropped the bash alignpatch (check the source or contact me)
 - various file mode fixes (.../tmp/, *.db)
 - optimized the %%files section - any new files in the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jan 2005 08:31:35 -0000	1.3
+++ sources	5 Jan 2006 07:36:18 -0000	1.4
@@ -1,2 +1,2 @@
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
-2e24806cb1267124fba6132009e30f1b  rkhunter-1.1.9.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---


--- rkhunter-1.1.9-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.9-prelink_cleanup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 15:05:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:05:51 -0500
Subject: rpms/maxima/devel maxima.spec,1.12,1.13
Message-ID: <200601051506.k05F6cZB021057@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21039

Modified Files:
	maxima.spec 
Log Message:
%files: fix icon



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maxima.spec	5 Jan 2006 14:56:22 -0000	1.12
+++ maxima.spec	5 Jan 2006 15:05:50 -0000	1.13
@@ -316,7 +316,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp



From fedora-extras-commits at redhat.com  Thu Jan  5 09:03:42 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  5 Jan 2006 04:03:42 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.8, 1.9 rxvt-unicode.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200601050904.k0594Fbt009141@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jan 2006 08:45:02 -0000	1.8
+++ .cvsignore	5 Jan 2006 09:03:42 -0000	1.9
@@ -1 +1 @@
-rxvt-unicode-6.2.tar.bz2
+rxvt-unicode-6.3.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rxvt-unicode.spec	3 Jan 2006 08:45:02 -0000	1.13
+++ rxvt-unicode.spec	5 Jan 2006 09:03:42 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.2
+Version:        6.3
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -68,8 +68,13 @@
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
 %{_datadir}/applications/*
+%{_libdir}/urxvt
 
 %changelog
+* Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.3-1
+- version upgrade
+
 * Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.2-1 
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 08:45:02 -0000	1.8
+++ sources	5 Jan 2006 09:03:42 -0000	1.9
@@ -1 +1 @@
-0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2
+411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 14:15:31 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:15:31 -0500
Subject: rpms/lib3ds/FC-4 .cvsignore, 1.2, 1.3 lib3ds.spec, 1.7, 1.8 sources,
	1.2, 1.3
Message-ID: <200601051416.k05EG35i019042@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19021

Modified Files:
	.cvsignore lib3ds.spec sources 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:41:15 -0000	1.2
+++ .cvsignore	5 Jan 2006 14:15:31 -0000	1.3
@@ -1 +1,2 @@
 lib3ds-1.2.0.tar.gz
+lib3ds-cvs-20060105.diff


Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/lib3ds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lib3ds.spec	23 May 2005 00:22:28 -0000	1.7
+++ lib3ds.spec	5 Jan 2006 14:15:31 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release: 5
+Release:        6%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -9,6 +9,7 @@
 URL:            http://lib3ds.sourceforge.net
 Source:         http://dl.sf.net/lib3ds/lib3ds-%{version}.tar.gz
 Patch0:         lib3ds-1.2.0.diff
+Patch1:         lib3ds-cvs-20060105.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -48,6 +49,7 @@
 %prep
 %setup -q
 %patch -p1 -P 0
+%patch -p2 -P 1
 
 %build
 %configure
@@ -70,6 +72,10 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <rc040203 at freenet.de> - 1.2.0-6
+- PR 176665: Apply upstream patch.
+- Add %%dist.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.0-5
 - rebuild on all arches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:41:15 -0000	1.2
+++ sources	5 Jan 2006 14:15:31 -0000	1.3
@@ -1 +1,2 @@
 3a7f891d18af0151876b98bc05d3b373  lib3ds-1.2.0.tar.gz
+f337a875d264c2e938d762ca82491451  lib3ds-cvs-20060105.diff



From fedora-extras-commits at redhat.com  Thu Jan  5 07:27:20 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:27:20 -0500
Subject: rpms/rkhunter/FC-4 rkhunter-1.2.7-1.src.md5, NONE,
	1.1 rkhunter-1.2.7-append_log.patch, NONE,
	1.1 rkhunter-1.2.7-datestamp.patch, NONE,
	1.1 rkhunter-1.2.7-group_log.patch, NONE,
	1.1 rkhunter-1.2.7-install_dir-conf.patch, NONE,
	1.1 rkhunter-1.2.7-manpage.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rkhunter.spec, 1.5, 1.6 sources, 1.3,
	1.4 rkhunter-1.1.8-whitelist_dir-conf.patch, 1.1,
	NONE rkhunter-1.1.9-0.fdr.1.src.md5, 1.1,
	NONE rkhunter-1.1.9-prelink_cleanup.patch, 1.1, NONE
Message-ID: <200601050727.k057RrhM004645@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590/FC-4

Modified Files:
	.cvsignore rkhunter.spec sources 
Added Files:
	rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-append_log.patch 
	rkhunter-1.2.7-datestamp.patch rkhunter-1.2.7-group_log.patch 
	rkhunter-1.2.7-install_dir-conf.patch 
	rkhunter-1.2.7-manpage.patch 
Removed Files:
	rkhunter-1.1.8-whitelist_dir-conf.patch 
	rkhunter-1.1.9-0.fdr.1.src.md5 
	rkhunter-1.1.9-prelink_cleanup.patch 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-4 from rkhunter-1.2.7-1.src.rpm


--- NEW FILE rkhunter-1.2.7-1.src.md5 ---
288ba8a87352716384823c9ea1958fa7  ../SOURCES/rkhunter-1.2.7.tar.gz
a80c43eec631b565ca8b85e7ce9b8724  ../SOURCES/rkhunter-auto_scan.tar.gz
b1525a7b472b96c669d6b7cd9048d6ed  ../SOURCES/rkhunter-1.1.8-showfiles.patch
22ad8521939744a7889d4fd8e6dad619  ../SOURCES/rkhunter-1.1.9-shared_man_search.patch
7d2857462a1555dff41b467d6272b35d  ../SOURCES/rkhunter-1.1.9-app_check_default.patch
d9c7e1bcf14218bf45cef9e77fdb0c2a  ../SOURCES/rkhunter-1.2.7-install_dir-conf.patch
2a33c05b180a792813776ee188c300a8  ../SOURCES/rkhunter-1.2.7-datestamp.patch
7a8a7587b9781a94837978e15bd9766b  ../SOURCES/rkhunter-1.2.7-append_log.patch
e9d8c6fa241a2fcae0dd99975fd343db  ../SOURCES/rkhunter-1.2.7-group_log.patch
b13c7597610577a01fc6d612708d7ee4  ../SOURCES/rkhunter-1.2.7-manpage.patch

rkhunter-1.2.7-append_log.patch:

--- NEW FILE rkhunter-1.2.7-append_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-06-04 11:46:17.000000000 -0500
@@ -35,9 +35,10 @@
 CHECK=0
 
 # Debugging
-DEBUG=1
+DEBUG=0
 DEBUGLOG=0
 CATLOGFILE=0
+APPENDLOG=0
 
 VERSIONCHECK=0
 UPDATE=0
@@ -136,6 +137,13 @@
       --allow-ssh-root-user)
           ALLOW_SSH_ROOT_USER="1"
 	  ;;
+      --append-log)
+          shift
+          DEBUGFILE=$1
+          DEBUGLOG=1
+          DEBUG=0
+          APPENDLOG=1
+	  ;;
       -c | --checkall) 
 	  CHECK=1
 	  ;;
@@ -235,18 +243,21 @@
     # Through the drain...
     DEBUGFILE="/dev/null"
   else
-    if [ -d "/var/log" ]
+    if [ "${DEBUGFILE}" = "" ]
       then
-        DEBUGFILE="/var/log/rkhunter.log"
-      else
-        echo "/var/log doesn't exists... no log file created"
-	DEBUGFILE="/dev/null"
+        if [ -d "/var/log" ]
+          then
+            DEBUGFILE="/var/log/rkhunter.log"
+          else
+            echo "/var/log doesn't exists... no log file created"
+	    DEBUGFILE="/dev/null"
+        fi
     fi
     # Clear debug file
-    if [ -f ${DEBUGFILE} ]; then
+    if [ ${APPENDLOG} -eq 0 -a -f ${DEBUGFILE} ]; then
       rm -f ${DEBUGFILE}
+      touch ${DEBUGFILE}
     fi
-
 fi
 
 if [ "${DEBUGFILE}" = "" ]; then
@@ -5060,6 +5071,7 @@
     echo $ECHOOPT "--version                 : Show version and quit"
     echo $ECHOOPT "--versioncheck            : Check for latest version"    
     echo $ECHOOPT ""
+    echo $ECHOOPT "--append-log <file>*      : Append (instead of overwrite) logfile output to <file>"
     echo $ECHOOPT "--bindir <bindir>*        : Use <bindir> instead of using default binaries"
     echo $ECHOOPT "--configfile <file>*      : Use different configuration file"    
     echo $ECHOOPT "--dbdir <dir>*            : Use <dbdir> as database directory"        

rkhunter-1.2.7-datestamp.patch:

--- NEW FILE rkhunter-1.2.7-datestamp.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-29 15:20:25.000000000 -0500
@@ -576,7 +576,7 @@
 
 
 logtext "Running ${PROGRAM_NAME} ${PROGRAM_version} on ${hostname}"
-logtext "${PROGRAM_license}"
+logtext "`date -R` ${PROGRAM_license}"
 
 
 ##################################################################################################
@@ -1687,7 +1687,7 @@
   then
     displaytext ""; displaytext "";
     displaytext "${PROGRAM_NAME} ${PROGRAM_version} is running"
-    displaytext ""
+    displaytext "`date -R`"
     displaytext -n "Determining OS... "
 
     if [ "${OPERATING_SYSTEM}" = "Darwin" ]
@@ -4899,7 +4899,7 @@
 	    fi
 	  
 	    displaytext ""
-	    displaytext "-----------------------------------------------------------------------"
+	    displaytext "------------------- `date -R` -------------------"
 	    displaytext ""
 	    displaytext "Do you have some problems, undetected rootkits, false positives, ideas"
 	    displaytext "or suggestions?"
@@ -4981,10 +4981,10 @@
 
 if [ "${UPDATE}" -eq 1 ]
   then
-    displaytext "Running updater..."
+    displaytext -e "\nRunning rkhunter updater... `date -R`"
     displaytext ""
     ${MYDIR}/lib/rkhunter/scripts/check_update.sh ${CONFIGFILE} ${MIRRORFILE} ${DB_PATH} ${md5} ${DEBUGFILE}
-    displaytext ""
+    displaytext "Finished rkhunter updater.. `date -R`"
     displaytext "Ready."
 fi
 

rkhunter-1.2.7-group_log.patch:

--- NEW FILE rkhunter-1.2.7-group_log.patch ---
--- files/rkhunter.orig	2005-05-24 00:40:22.000000000 -0500
+++ files/rkhunter	2005-05-31 22:41:52.000000000 -0500
@@ -3979,7 +3979,7 @@
 		cp /etc/group ${TMPDIR}/group
 	      else
 	        displaytext "${BAD}Error. ${NORMAL}Cannot find /etc/group"
-		logtext "Can't find /etc/passwd file?!?"
+		logtext "Can't find /etc/group file?!?"
 	    fi
         fi
 

rkhunter-1.2.7-install_dir-conf.patch:

--- NEW FILE rkhunter-1.2.7-install_dir-conf.patch ---
--- files/rkhunter.conf.orig	2005-03-19 12:27:20.000000000 -0500
+++ files/rkhunter.conf	2005-05-29 12:48:32.000000000 -0500
@@ -3,6 +3,7 @@
 #
 # All lines beginning with a dash (#) or empty lines, will be ignored.
 #
+#INSTALLDIR=/usr/local
 
 # Links to files. Don't change if you don't need to.
 LATESTVERSION=/rkhunter_latest.dat

rkhunter-1.2.7-manpage.patch:

--- NEW FILE rkhunter-1.2.7-manpage.patch ---
--- files/development/rkhunter.8.orig	2005-03-19 07:10:16.000000000 -0500
+++ files/development/rkhunter.8	2005-06-05 11:37:23.000000000 -0500
@@ -13,7 +13,8 @@
 
 
 \fBrkhunter\fP [-c|--checkall] [--createlogfile] [--cronjob] 
-[--disable-md5-check] [--nocolors] [--versioncheck]
+[--disable-md5-check] [--help] [--nocolors] [--run-application-check]
+[--update] [--versioncheck]
 .fam T
 .fi
 .SH DESCRIPTION
@@ -101,6 +102,12 @@
 Changes the default root directory, for chroot environments.
 .TP
 .B
+--run-application-check
+Finds and checks various significant applications for downrev 
+versions (with possible vulnerabilities) and recommends their 
+update to more recent versions.
+.TP
+.B
 --tmpdir
 Changes the default directory for temporary storage
 .TP
@@ -109,6 +116,12 @@
 Make rkhunter non-interactive
 .TP
 .B
+--update
+Checks the \fBrkhunter\fP mirror list to determine if any newer 
+versions of the file signature database files are available for 
+download.  Should be run often.
+.TP
+.B
 --versioncheck
 Consults the \fBrkhunter\fP website to determine if a newer 
 version is available for download. Uses wget. The latest version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jan 2005 08:31:35 -0000	1.3
+++ .cvsignore	5 Jan 2006 07:27:20 -0000	1.4
@@ -1,2 +1,2 @@
-rkhunter-scan_on_boot-rc.local.tar.gz
-rkhunter-1.1.9.tar.gz
+rkhunter-1.2.7.tar.gz
+rkhunter-auto_scan.tar.gz


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-4/rkhunter.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rkhunter.spec	6 Apr 2005 22:13:31 -0000	1.5
+++ rkhunter.spec	5 Jan 2006 07:27:20 -0000	1.6
@@ -4,32 +4,36 @@
 AutoReqProv:    no
 
 Name:           rkhunter
-Version:        1.1.9
-Release:        2
-
-Summary:        Rootkit Hunter scans for rootkits, backdoors and local exploits
+Version:        1.2.7
+Release:        1
+Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.rootkit.nl/
-Source0:        http://downloads.rootkit.nl/rkhunter-1.1.9.tar.gz
-Source1:        rkhunter-scan_on_boot-rc.local.tar.gz
-Source2:        rkhunter-1.1.9-0.fdr.1.src.md5
-Patch1:         rkhunter-1.1.8-whitelist_dir-conf.patch
-Patch2:         rkhunter-1.1.8-showfiles.patch
-Patch3:         rkhunter-1.1.9-shared_man_search.patch
-Patch4:         rkhunter-1.1.9-app_check_default.patch
-Patch5:         rkhunter-1.1.9-prelink_cleanup.patch
+Source0:        http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz
+Source1:        rkhunter-auto_scan.tar.gz
+Source2:        rkhunter-%{version}-%{release}.src.md5
+Patch0:         rkhunter-1.2.7-install_dir-conf.patch
+Patch1:         rkhunter-1.1.8-showfiles.patch
+Patch2:         rkhunter-1.1.9-shared_man_search.patch
+Patch3:         rkhunter-1.1.9-app_check_default.patch
+Patch4:         rkhunter-1.2.7-datestamp.patch
+Patch5:         rkhunter-1.2.7-append_log.patch
+Patch6:         rkhunter-1.2.7-group_log.patch
+Patch7:         rkhunter-1.2.7-manpage.patch
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep
-Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools
-Requires:       perl, perl(strict), perl(IO::Socket), nmap, mailx
+Requires:       /bin/sh, coreutils, binutils, modutils, findutils, grep, mktemp
+Requires:       e2fsprogs, procps, lsof, prelink, iproute, net-tools, wget
+Requires:       perl, perl(strict), perl(IO::Socket), mailx
 
 %description
-Rootkit Hunter is a scanning tool to ensure that you're about 99.9%%
-clean of nasty tools.  This tool scans for rootkits, backdoors and local
+Rootkit Hunter scans files and systems for known and unknown rootkits,
+backdoors, and sniffers.  The package contains one shell script, a few
+text-based databases, and optional Perl modules.  It should run on almost
+every Unix clone.  This tool scans for rootkits, backdoors and local
 exploits by running tests like:
         - MD5 hash compare
         - Look for default files used by rootkits
@@ -48,50 +52,52 @@
 
 # This optional check is for verification of original sources
 # DURING the binary build process (md5 canary check)
-#[ ! -e %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5.orig ] \
-#    && %{__perl} -pi.orig -e '
-#       s|../SOURCES|%{_sourcedir}|g;
-#     ' %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5
-#md5sum --check %{_sourcedir}/%{name}-%{version}-0.fdr.1.src.md5 || exit $?
+[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \
+    && %{__perl} -pi.orig -e '
+	s|../SOURCES|%{_sourcedir}|g;
+     ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $?
+%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
+%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \
+        %{_sourcedir}/%{name}-%{version}-%{release}.src.md5
 
 %setup -q -n %{name}
 %setup -q -D -T -a 1 -n %{name}
 
-%{__perl} -pi.orig -e '
-	s|\@RKLIB\@|%{_libdir}/%{name}|g;
-	s|\@LGDIR\@|%{_localstatedir}/log|g;
-	s|\@RCDIR\@|%{_sysconfdir}/rc.d|g;
-	s|\@ITDIR\@|%{_initrddir}|g;
-	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
-	s|\@RKEXE\@|%{_bindir}/%{name}|g;
-    ' rkhunter-scan_on_boot \
-      rkhunter-scan_on_boot-rc.local
+%patch0 -b .orig
 
-%{__perl} -pi.orig -e '
-	s|^#$|INSTALLDIR=%{_prefix}|;
+%{__perl} -pi.0001 -e '
+	s|^#(INSTALLDIR=).+$|$1%{_prefix}|;
+	s|^#(MAIL-ON-WARNING=).+$|$1root\@localhost|;
 	s|^#(TMPDIR=).+$|$1%{_var}/%{name}/tmp|;
 	s|^#(DBDIR=).+$|$1%{_var}/%{name}/db|;
     ' files/%{name}.conf
 
-%patch1 -b .0001
-%patch2 -b .orig
-%patch3 -b .orig
-%patch4 -b .0001
-%patch5 -b .0002
-
-%{__cat} <<'EOF' >%{name}.sysconfig
-# System configuration file for Rootkit Hunter which
-# stores RPM system specifics for rc.local, etc.
-
-RKHUNTER_FLAGS="
-    --quiet
-    --create-logfile
-"
-EOF
+%{__perl} -pi.orig -e '
+	s|\@TMPDIR\@|%{_var}/%{name}/tmp|g;
+	s|\@STDIR\@|%{_localstatedir}|g;
+	s|\@CFGDIR\@|%{_sysconfdir}|g;
+	s|\@SCDIR\@|%{_sysconfdir}/sysconfig|g;
+	s|\@ITDIR\@|%{_initrddir}|g;
+	s|\@RKEXE\@|%{_bindir}/%{name}|g;
+	s|\@RKHSH\@|%{_bindir}/%{name}-scan.sh|g;
+	s|\@LGDIR\@|%{_localstatedir}/log|g;
+    ' 01-%{name}
 
-%{__cat} <<'EOF' >01-%{name}
-#!/bin/sh
-%{_bindir}/%{name} --cronjob | /bin/mail -s '%{name} Daily Run' root
+%patch1 -b .orig
+%patch2 -b .orig
+%patch3 -b .0001
+%patch4 -b .0002
+%patch5 -b .0003
+%patch6 -b .0004
+%patch7 -b .orig
+
+%{__cat} <<'EOF' >%{name}.logrotate
+%{_localstatedir}/log/%{name}.log {
+    weekly
+    notifempty
+    create 640 root root
+}
 EOF
 
 
@@ -101,11 +107,11 @@
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig}
-%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/{scripts,rc.d}
+%{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d}
+%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}
 %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp}
@@ -124,7 +130,6 @@
 %{__install} -m644 -p files/LICENSE             ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/README              ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
 %{__install} -m644 -p files/WISHLIST            ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/
-%{__install} -m644 -p rkhunter-scan_on_boot     ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/BOOTSCAN
 
 %{__install} -m644 -p files/development/*.8     ${RPM_BUILD_ROOT}%{_mandir}/man8/
 
@@ -135,7 +140,7 @@
 %{__install} -m750 -p files/filehashsha1.pl     ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p files/showfiles.pl        ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/
 %{__install} -m750 -p 01-%{name}                ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/
-%{__install} -m750 -p rkhunter-scan_on_boot-rc.local ${RPM_BUILD_ROOT}%{_libdir}/%{name}/rc.d/rc.local
+%{__install} -m644 -p %{name}.logrotate         ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -m640 -p files/%{name}.conf        ${RPM_BUILD_ROOT}%{_sysconfdir}/
 %{__install} -m640 -p %{name}.sysconfig         ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}
 
@@ -143,10 +148,20 @@
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 # Autoclean for rpmbuild -bb
-#cd ..
-#[ ! -d %{name} ] || %{__rm} -rf %{name}
+cd ..
+[ ! -d %{name} ] || %{__rm} -rf %{name}
 
 
+%post
+/bin/touch %{_localstatedir}/log/%{name}.log
+/bin/echo -e "------------------- `/bin/date -R` -------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+%{_bindir}/%{name} --version >> %{_localstatedir}/log/%{name}.log
+/bin/echo -e "\n------------------------------ Installed ------------------------------\n" \
+  >> %{_localstatedir}/log/%{name}.log
+/bin/chown root.root %{_localstatedir}/log/%{name}.log
+/bin/chmod 640 %{_localstatedir}/log/%{name}.log
+
 %postun
 if [ "$1" = 0 ]; then
     [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name}
@@ -159,21 +174,26 @@
 %{_bindir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/scripts
-%{_libdir}/%{name}/rc.d
 %{_sysconfdir}/cron.daily/01-%{name}
+%{_sysconfdir}/logrotate.d/%{name}
 %dir %{_var}/%{name}
 %{_var}/%{name}/db
 %dir %{_var}/%{name}/tmp
-%config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%{_sysconfdir}/%{name}.conf
+%{_sysconfdir}/sysconfig/%{name}
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/*
 %{_mandir}/man8/*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Mon Jun 11 2005 Greg Houlette <tamaster at pobox.com> - 1.2.7-1
+- Added signature auto-updating to CRON scan (new script)
+- Removed BOOTSCAN pending rewrite to full SysV Init scan in background
+- Added the --append-log command line option
+- Added Date Stamping to output
+- Fixed bug in /etc/group missing report
+- New package version release
 
 * Sun Jan 2 2005 Greg Houlette <tamaster at tekarmory.com> - 0:1.1.9-1
 - New package version release
@@ -252,7 +272,7 @@
 - added recursive remove of old build root as prep for install phase
 
 * Wed Apr 28 2004 Doncho N. Gunchev - 1.0.9-0.mr700
-- dropped Requires: perl - rkhunter works without it
+- dropped Requires: perl - rkhunter works without it 
 - dropped the bash alignpatch (check the source or contact me)
 - various file mode fixes (.../tmp/, *.db)
 - optimized the %%files section - any new files in the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jan 2005 08:31:35 -0000	1.3
+++ sources	5 Jan 2006 07:27:20 -0000	1.4
@@ -1,2 +1,2 @@
-0728cef20dde6817c36ef5787286b6f6  rkhunter-scan_on_boot-rc.local.tar.gz
-2e24806cb1267124fba6132009e30f1b  rkhunter-1.1.9.tar.gz
+288ba8a87352716384823c9ea1958fa7  rkhunter-1.2.7.tar.gz
+a80c43eec631b565ca8b85e7ce9b8724  rkhunter-auto_scan.tar.gz


--- rkhunter-1.1.8-whitelist_dir-conf.patch DELETED ---


--- rkhunter-1.1.9-0.fdr.1.src.md5 DELETED ---


--- rkhunter-1.1.9-prelink_cleanup.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 14:03:37 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:03:37 -0500
Subject: rpms/lib3ds/devel lib3ds.spec,1.7,1.8
Message-ID: <200601051404.k05E4K9X018856@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18839

Modified Files:
	lib3ds.spec 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.



Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/lib3ds.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lib3ds.spec	23 May 2005 00:22:28 -0000	1.7
+++ lib3ds.spec	5 Jan 2006 14:03:35 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lib3ds
 Version:        1.2.0
-Release: 5
+Release:        6%{?dist}
 
 Summary:        3D Studio file format library
 
@@ -9,6 +9,7 @@
 URL:            http://lib3ds.sourceforge.net
 Source:         http://dl.sf.net/lib3ds/lib3ds-%{version}.tar.gz
 Patch0:         lib3ds-1.2.0.diff
+Patch1:         lib3ds-cvs-20060105.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -48,6 +49,7 @@
 %prep
 %setup -q
 %patch -p1 -P 0
+%patch -p2 -P 1
 
 %build
 %configure
@@ -70,6 +72,10 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <rc040203 at freenet.de> - 1.2.0-6
+- PR 176665: Apply upstream patch.
+- Add %%dist.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.0-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Jan  5 13:02:00 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu,  5 Jan 2006 08:02:00 -0500
Subject: fedora-security/audit fc4,1.115,1.116 fc5,1.26,1.27
Message-ID: <200601051302.k05D2Geu016933@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895

Modified Files:
	fc4 fc5 
Log Message:
Updates for ImageMagick and kernel



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc4	3 Jan 2006 16:36:12 -0000	1.115
+++ fc4	5 Jan 2006 13:01:32 -0000	1.116
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20051219
-Up to date FC4 as of 20051219
+Up to date CVE as of CVE email 20060104
+Up to date FC4 as of 20060104
 
 ** are items that need attention
 
+CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176813
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- fc5	3 Jan 2006 16:36:12 -0000	1.26
+++ fc5	5 Jan 2006 13:01:32 -0000	1.27
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20051219
+Up to date CVE as of CVE email 20060104
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -12,6 +12,8 @@
 
 ** are items that need attention
 
+CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only



From fedora-extras-commits at redhat.com  Thu Jan  5 09:03:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  5 Jan 2006 04:03:20 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.8, 1.9 rxvt-unicode.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200601050904.k0594bY6009147@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jan 2006 08:44:56 -0000	1.8
+++ .cvsignore	5 Jan 2006 09:03:19 -0000	1.9
@@ -1 +1 @@
-rxvt-unicode-6.2.tar.bz2
+rxvt-unicode-6.3.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rxvt-unicode.spec	3 Jan 2006 08:44:56 -0000	1.10
+++ rxvt-unicode.spec	5 Jan 2006 09:03:19 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.2
+Version:        6.3
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -63,8 +63,13 @@
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
 %{_datadir}/applications/*
+%{_libdir}/urxvt
 
 %changelog
+* Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.3-1
+- version upgrade
+
 * Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 08:44:56 -0000	1.8
+++ sources	5 Jan 2006 09:03:19 -0000	1.9
@@ -1 +1 @@
-0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2
+411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 15:28:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:28:49 -0500
Subject: rpms/maxima/FC-4 maxima.spec,1.13,1.14
Message-ID: <200601051529.k05FTLFb021307@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21263/FC-4

Modified Files:
	maxima.spec 
Log Message:
mention "sbcl doesn't build on ppc" bz



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- maxima.spec	5 Jan 2006 15:24:48 -0000	1.13
+++ maxima.spec	5 Jan 2006 15:28:48 -0000	1.14
@@ -12,6 +12,7 @@
 # add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
 #  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
+#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp



From fedora-extras-commits at redhat.com  Thu Jan  5 14:07:47 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:07:47 -0500
Subject: rpms/lib3ds/devel sources,1.2,1.3 .cvsignore,1.2,1.3
Message-ID: <200601051408.k05E8KDG018898@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18879

Modified Files:
	sources .cvsignore 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:41:15 -0000	1.2
+++ sources	5 Jan 2006 14:07:47 -0000	1.3
@@ -1 +1,2 @@
 3a7f891d18af0151876b98bc05d3b373  lib3ds-1.2.0.tar.gz
+f337a875d264c2e938d762ca82491451  lib3ds-cvs-20060105.diff


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:41:15 -0000	1.2
+++ .cvsignore	5 Jan 2006 14:07:47 -0000	1.3
@@ -1 +1,2 @@
 lib3ds-1.2.0.tar.gz
+lib3ds-cvs-20060105.diff



From fedora-extras-commits at redhat.com  Thu Jan  5 14:13:31 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 09:13:31 -0500
Subject: rpms/lib3ds/FC-3 .cvsignore, 1.2, 1.3 lib3ds.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200601051414.k05EE3l4019013@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/lib3ds/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18992

Modified Files:
	.cvsignore lib3ds.spec sources 
Log Message:
- PR 176665: Apply upstream patch.
- Add %%dist.
- Sync spec with devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:41:15 -0000	1.2
+++ .cvsignore	5 Jan 2006 14:13:30 -0000	1.3
@@ -1 +1,2 @@
 lib3ds-1.2.0.tar.gz
+lib3ds-cvs-20060105.diff


Index: lib3ds.spec
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-3/lib3ds.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lib3ds.spec	10 Dec 2004 22:03:04 -0000	1.3
+++ lib3ds.spec	5 Jan 2006 14:13:30 -0000	1.4
@@ -1,36 +1,37 @@
 Name:           lib3ds
 Version:        1.2.0
-Release:        3
-Epoch:          0
-Summary:        The 3D Studio File Format Library
+Release:        6%{?dist}
 
-Group: 		System Environment/Libraries
+Summary:        3D Studio file format library
+
+Group:          System Environment/Libraries
 License:        LGPL
-URL: 		http://lib3ds.sourceforge.net
-Source: 	http://download.sourceforge.net/lib3ds/lib3ds-%{version}.tar.gz
-Patch0:		lib3ds-1.2.0.diff
+URL:            http://lib3ds.sourceforge.net
+Source:         http://dl.sf.net/lib3ds/lib3ds-%{version}.tar.gz
+Patch0:         lib3ds-1.2.0.diff
+Patch1:         lib3ds-cvs-20060105.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 lib3ds is a free ANSI-C library for working with the popular "3ds" 3D model
 format.
 
-Supported platforms include GNU (autoconf, automake, libtool, make, GCC) on 
-Unix and Cygwin, and MS Visual C++ 6.0. lib3ds loads and saves Atmosphere 
-settings, Background settings, Shadow map settings, Viewport setting, 
-Materials, Cameras, Lights, Meshes, Hierarchy, Animation keyframes. It also 
-contains useful matrix, vector and quaternion mathematics tools. lib3ds 
-usually integrates well with OpenGL. In addition, some diagnostic and 
-conversion tools are included. 
+Supported platforms include GNU (autoconf, automake, libtool, make, GCC) on
+Unix and Cygwin, and MS Visual C++ 6.0. lib3ds loads and saves Atmosphere
+settings, Background settings, Shadow map settings, Viewport setting,
+Materials, Cameras, Lights, Meshes, Hierarchy, Animation keyframes. It also
+contains useful matrix, vector and quaternion mathematics tools. lib3ds
+usually integrates well with OpenGL. In addition, some diagnostic and
+conversion tools are included.
 
-%package	tools
+%package        tools
 Summary:        %summary
 Group:          Applications/Multimedia
 
 %description    tools
 Some tools to process 3ds files.
 
-%files		tools
+%files          tools
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/3dsdump
@@ -48,6 +49,7 @@
 %prep
 %setup -q
 %patch -p1 -P 0
+%patch -p2 -P 1
 
 %build
 %configure
@@ -70,6 +72,11 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <rc040203 at freenet.de> - 1.2.0-6
+- PR 176665: Apply upstream patch.
+- Add %%dist.
+- Sync spec with devel.
+
 * Mon Aug 09 2004 Ralf Corsepius <ralf[AT]links2linux.de> - 0:1.2.0-0.fdr.3
 - Fix m4-underquoting in lib3d.m4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib3ds/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:41:15 -0000	1.2
+++ sources	5 Jan 2006 14:13:30 -0000	1.3
@@ -1 +1,2 @@
 3a7f891d18af0151876b98bc05d3b373  lib3ds-1.2.0.tar.gz
+f337a875d264c2e938d762ca82491451  lib3ds-cvs-20060105.diff



From fedora-extras-commits at redhat.com  Thu Jan  5 15:28:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:28:55 -0500
Subject: rpms/maxima/devel maxima.spec,1.14,1.15
Message-ID: <200601051529.k05FTRAP021312@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21263/devel

Modified Files:
	maxima.spec 
Log Message:
mention "sbcl doesn't build on ppc" bz



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maxima.spec	5 Jan 2006 15:23:26 -0000	1.14
+++ maxima.spec	5 Jan 2006 15:28:54 -0000	1.15
@@ -12,6 +12,7 @@
 # add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
 #  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
+#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp



From fedora-extras-commits at redhat.com  Thu Jan  5 15:00:16 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 10:00:16 -0500
Subject: rpms/abiword/devel abiword-2.4.2-desktop.patch, NONE,
	1.1 abiword.spec, 1.26, 1.27
Message-ID: <200601051500.k05F0nFD019381@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19361

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.2-desktop.patch 
Log Message:
Commit missing patch



abiword-2.4.2-desktop.patch:

--- NEW FILE abiword-2.4.2-desktop.patch ---
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop	2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop	2006-01-02 00:32:33.000000000 +0100
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- abiword.spec	5 Jan 2006 14:57:02 -0000	1.26
+++ abiword.spec	5 Jan 2006 15:00:16 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -141,6 +141,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc5
+- Bump release, forgot to add desktop patch
+
 * Mon Jan 02 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc5
 - Update to 2.4.2
 - Add BuildRequires readline-devel for the AbiCommand plugin



From fedora-extras-commits at redhat.com  Thu Jan  5 15:23:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:23:27 -0500
Subject: rpms/maxima/devel maxima.spec,1.13,1.14
Message-ID: <200601051523.k05FNxaf021216@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21198

Modified Files:
	maxima.spec 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
- tighten Req: on clisp/sbcl runtimes



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- maxima.spec	5 Jan 2006 15:05:50 -0000	1.13
+++ maxima.spec	5 Jan 2006 15:23:26 -0000	1.14
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 7%{?dist} 
+Release: 8%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -102,8 +102,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-# To appease those who are paranoid about rpm queries at build time
-#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -141,9 +140,8 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.6
-## To appease those who are paranoid about rpm queries at build time
-#define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
+BuildRequires: sbcl 
+%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -352,6 +350,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
+- tighten Req: on clisp/sbcl runtimes
+
 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
 - rebuild for/with new clisp,sbcl
 



From fedora-extras-commits at redhat.com  Thu Jan  5 14:57:02 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 09:57:02 -0500
Subject: rpms/abiword/devel abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore,
	1.12, 1.13 abiword.spec, 1.25, 1.26 sources, 1.12,
	1.13 abiword-2.2.6-desktop.patch, 1.1, NONE
Message-ID: <200601051457.k05EvYUR019306@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19276

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+        ABI_PLUGIN_REPORT([OpenDocument: okay])
 ],[        ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+        ABI_PLUGIN_REPORT([OpenWriter: okay])
 ],[        ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	8 Oct 2005 22:56:47 -0000	1.12
+++ .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- abiword.spec	9 Nov 2005 10:28:53 -0000	1.25
+++ abiword.spec	5 Jan 2006 14:57:02 -0000	1.26
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.1
-Release: 4%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -27,6 +27,9 @@
 BuildRequires: libgnomeprintui22-devel
 
 # some plugin build deps
+BuildRequires: readline-devel
+BuildRequires: bzip2-devel
+BuildRequires: poppler-devel >= 0.4.0
 BuildRequires: ots-devel >= 0.4.2
 BuildRequires: libwpd-devel >= 0.8.0
 BuildRequires: librsvg2-devel
@@ -43,7 +46,8 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.6-desktop.patch
+Patch1: abiword-2.4.2-desktop.patch
+Patch2: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -53,6 +57,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -136,6 +141,13 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Jan 02 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc5
+- Update to 2.4.2
+- Add BuildRequires readline-devel for the AbiCommand plugin
+- Add BuildRequires bzip2-devel and poppler-devel for plugins
+- Update desktop patch
+- Patch to fix plugin marcros
+
 * Wed Nov 09 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-4.fc5
 - Fix bug 171928
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	8 Oct 2005 22:56:47 -0000	1.12
+++ sources	5 Jan 2006 14:57:02 -0000	1.13
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 09:03:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  5 Jan 2006 04:03:12 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.8, 1.9 rxvt-unicode.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200601050904.k0594FJX009142@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8999/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Jan 2006 08:44:50 -0000	1.8
+++ .cvsignore	5 Jan 2006 09:03:11 -0000	1.9
@@ -1 +1 @@
-rxvt-unicode-6.2.tar.bz2
+rxvt-unicode-6.3.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rxvt-unicode.spec	3 Jan 2006 08:44:50 -0000	1.10
+++ rxvt-unicode.spec	5 Jan 2006 09:03:11 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.2
+Version:        6.3
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -63,8 +63,13 @@
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
 %{_datadir}/applications/*
+%{_libdir}/urxvt
 
 %changelog
+* Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+6.3-1
+- version upgrade
+
 * Tue Jan 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 08:44:50 -0000	1.8
+++ sources	5 Jan 2006 09:03:11 -0000	1.9
@@ -1 +1 @@
-0b1366ae8383c7d7252cd3096f4586c5  rxvt-unicode-6.2.tar.bz2
+411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 07:27:14 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:27:14 -0500
Subject: rpms/rkhunter import.log,1.6,1.7
Message-ID: <200601050727.k057RlaJ004640@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4590

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch FC-4 from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	5 Jan 2006 07:19:05 -0000	1.6
+++ import.log	5 Jan 2006 07:27:14 -0000	1.7
@@ -3,3 +3,4 @@
 rkhunter-1_2_7-1:FC-1:rkhunter-1.2.7-1.src.rpm:1136442608
 rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691
 rkhunter-1_2_7-1:FC-3:rkhunter-1.2.7-1.src.rpm:1136445493
+rkhunter-1_2_7-1:FC-4:rkhunter-1.2.7-1.src.rpm:1136445982



From fedora-extras-commits at redhat.com  Thu Jan  5 15:24:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:24:49 -0500
Subject: rpms/maxima/FC-4 maxima.spec,1.12,1.13 xmaxima.desktop,1.3,1.4
Message-ID: <200601051525.k05FPLMB021255@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21234

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:

 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
 - tighten Req: on clisp/sbcl runtimes

 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
 - rebuild for/with new clisp,sbcl




Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maxima.spec	28 Oct 2005 19:10:46 -0000	1.12
+++ maxima.spec	5 Jan 2006 15:24:48 -0000	1.13
@@ -3,14 +3,15 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 6%{?dist} 
+Release: 8%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc (and maybe ppc64)  when lisps build again on ppc 
+# add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
+#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp
@@ -19,8 +20,8 @@
 %define _enable_clisp --enable-clisp 
 # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
 #define _enable_cmucl --enable-cmucl 
-# gcl not built for fc5/development (yet)
-%if "%{?fedora}" < "5"
+%if "%{?fedora}" != "5"
+# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %endif
 %define _enable_sbcl --enable-sbcl 
@@ -101,8 +102,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-# To appease those who are paranoid about rpm queries at build time
-#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -140,9 +140,8 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.6
-## To appease those who are paranoid about rpm queries at build time
-#define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
+BuildRequires: sbcl 
+%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -315,7 +314,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
@@ -351,6 +350,12 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
+- tighten Req: on clisp/sbcl runtimes
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
+- rebuild for/with new clisp,sbcl
+
 * Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
 - --enable-sbcl
 - avoid rpmquery's at build-time


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/xmaxima.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmaxima.desktop	26 Nov 2005 19:38:14 -0000	1.3
+++ xmaxima.desktop	5 Jan 2006 15:24:48 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=Symbolic Computation Program
 Exec=xmaxima
 Icon=maxima
-MimeType=
+#MimeType=
 Type=Application
 Categories=Application;Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Jan  5 15:40:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:40:45 -0500
Subject: rpms/maxima/FC-4 maxima.spec,1.14,1.15
Message-ID: <200601051541.k05FfHB6021550@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21525

Modified Files:
	maxima.spec 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
- OK, loosen Req's again (buildsystem can't handle it)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maxima.spec	5 Jan 2006 15:28:48 -0000	1.14
+++ maxima.spec	5 Jan 2006 15:40:44 -0000	1.15
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -103,7 +103,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
+#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -142,7 +142,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 BuildRequires: sbcl 
-%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
+#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -351,6 +351,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
+- OK, loosen Req's again (buildsystem can't handle it)
+
 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
 - tighten Req: on clisp/sbcl runtimes
 



From fedora-extras-commits at redhat.com  Thu Jan  5 16:54:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:54:31 -0500
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Plugin-RetrieveAll.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051655.k05Gt3Ww024735@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674/devel

Modified Files:
	.cvsignore perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

Bump to 1.02



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 18:53:58 -0000	1.2
+++ .cvsignore	5 Jan 2006 16:54:31 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+Class-DBI-Plugin-RetrieveAll-1.02.tar.gz


Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Plugin-RetrieveAll.spec	7 Sep 2005 18:53:58 -0000	1.1
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
+- bump to 1.02
+
 * Wed Aug 31 2005 Paul Howarth <paul at city-fan.org> 1.01-3
 - remove redundant BR: perl
 - use %%{?_smp_mflags} with make in %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:53:58 -0000	1.2
+++ sources	5 Jan 2006 16:54:31 -0000	1.3
@@ -1 +1 @@
-27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:14:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:14:15 -0500
Subject: rpms/swatch/FC-3 swatch-3.1.1.patch,NONE,1.1 swatch.spec,1.5,1.6
Message-ID: <200601051714.k05HElbh026681@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/swatch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-3

Modified Files:
	swatch.spec 
Added Files:
	swatch-3.1.1.patch 
Log Message:
Sync with devel

swatch-3.1.1.patch:

--- NEW FILE swatch-3.1.1.patch ---
diff -ruN swatch-3.1.1-orig/swatch swatch-3.1.1/swatch
--- swatch-3.1.1-orig/swatch	2004-07-19 21:14:54.000000000 +0100
+++ swatch-3.1.1/swatch	2005-08-29 20:52:13.000000000 +0100
@@ -32,7 +32,7 @@
 [ B<--input-record-separator> I<regex> ] 
 [ [ B<--examine> I<file_to_examine> ] 
 | [ B<--read-pipe> I<program_to_pipe_from> ] 
-| [ B<--tail> I<file_to_tail> ] ]
+| [ B<--tail-file> I<file_to_tail> ] ]
 [ B<--daemon> ] 
 [ B<--use-cpan-file-tail> ]
 [ B<--awk-field-syntax> ]
@@ -68,7 +68,7 @@
 
 Restart at the specified time where I<hh> is hours and I<mm> is minutes. 
 If the am/pm indicator is omitted, then a 24-hour clock is assumed. 
-If the time is preceeded by the "+" character, then the restart time 
+If the time is preceded by the "+" character, then the restart time 
 will be set to the current time plus the specified time and the am/pm
 indicator will be ignored.
 
@@ -124,18 +124,12 @@
 If swatch is called with no options, it is the same as typing the 
 command line
 
-=over 5
-
-=item
-
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog>
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog
 
 or if /var/log/messages exists
 
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/messages>
-
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/messages
 
-=back
 
 If the configuration file doesn't exist then the following configuration
 is used:
@@ -152,7 +146,7 @@
 
 Each line should contain a keyword and a, sometimes optional,
 value for that keyword. The keyword and value are separated by 
-space or an equal (=) sign.
+a space or an equal (=) sign.
 
 watchfor regex
 
@@ -162,7 +156,7 @@
 
 =item B<echo [modes]>
 
-.Echo the matched line. The text mode may be I<normal>,
+Echo the matched line. The text mode may be I<normal>,
 I<bold>, I<underscore>, I<blink>, I<inverse>, 
 I<black>, I<red>, I<green>, I<yellow>, I<blue>, I<magenta>, I<cyan>, I<white>,
 I<black_h>, I<red_h>, I<green_h>, I<yellow_h>, I<blue_h>, 
@@ -180,7 +174,7 @@
 Execute I<command>. The I<command> may contain variables which are 
 substituted with fields from the matched line. A I<$N> will be replaced
 by the I<Nth> field in the line. A I<$0> or I<$*> will be replaced by the
- entire line.
+entire line.
 
 =item B<mail [addresses=address:address:...][,subject=your_text_here]>
 
@@ -197,7 +191,7 @@
 
 Use B<write(1)> to send matched lines to I<user(s)>.
 
-=item B<throttle hours:minutes:seconds,[use=message|regex|<regex>]>
+=item B<throttle hours:minutes:seconds,[use=message|regex|<regexE<gt>]>
 
 Use this action to limit the number of times that the matched pattern 
 has actions performed on it.
@@ -205,7 +199,15 @@
 The B<use=regex> option will cause throttling to be based on the regular
 expression instead of the message.
 
-You can also specify a perl compliant regular expression as the value for B,use>. The default is use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)" causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
+You can also specify a perl compliant regular expression as the value for B<use>. The default is
+
+=over 4
+
+use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)"
+
+=back
+
+and causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
 
 =item B<threshold events:seconds,[repeat=no|yes]>
 
@@ -223,7 +225,7 @@
  
 Note that this is similar to, but different from, the standard "throttle"
 command, since "throttle" shows the first line and ignores the rest, while
-"threshold" shows the last line and ignores the preceeding (and optionally
+"threshold" shows the last line and ignores the preceding (and optionally
 the following).  However, an action like "threshold 1:120" should perform
 similarly to "throttle 0:2:0,use=regex" and has the advantage of not relying
 on a particular timestamp format in the source log entry.
@@ -268,9 +270,13 @@
 conditional used by the current watchfor statement, and 3=inside the throttle
 block).
 
-Its intended use is to permit variable substitution through use like.
+Its intended use is to permit variable substitution. For example:
+
+=over 4
+
+perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";
 
-C<perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";>
+=back
  
 watchfor /$syslog hostname pppd/>
  
@@ -315,7 +321,7 @@
 
 =head1 NOTES
 
-Upon receiving a ALRM or HUP signal swatch will re-read the
+Upon receiving an ALRM or HUP signal swatch will re-read the
 configuration file and restart, except when used with the I<--daemon> 
 command line option where it will simply exit.
 Swatch will terminate gracefully
@@ -382,7 +388,8 @@
 my @Swatch_ARGV = join(' ', $0, @ARGV); # Save just in case we need to restart 
 (my $Me = $0) =~ s%.*/%%;	      # Strip the path off of the program name
 
-$SIG{'CHLD'} = 'IGNORE';
+#$SIG{'CHLD'} = 'IGNORE';
+$SIG{'CHLD'} = 'DEFAULT';
 
 my $DEF_CONFIG_FILE = "$ENV{'HOME'}/.swatchrc";
 my $DEF_INPUT;
@@ -406,13 +413,13 @@
     --config-file=FILENAME               Use FILENAME for configuration.
     --old-style-config                   Parse a pre-version 3 configuration.
     --restart-time=[+]HH:MM[AM|PM]       Send a HUP signal to swatch at the specified time.
-    --input-record-separator=REGEX       Specify an what should be used to separate "lines."
+    --input-record-separator=REGEX       Specify what should be used to separate "lines."
     --help                               Display this message.
     --version                            Display author and version information.
     --tail-file=FILENAME                 Watch a tail of FILENAME.
-    --read-pipe=COMMAND                  Watch a pipe from COMMAND
-    --examine=FILENAME                   Perform a single pass through FILENAME
-    --pid-file=FILENAME			 File to write pid of process to
+    --read-pipe=COMMAND                  Watch a pipe from COMMAND.
+    --examine=FILENAME                   Perform a single pass through FILENAME.
+    --pid-file=FILENAME			 File to write pid of process to.
     --use-cpan-file-tail                 Use the File::Tail CPAN module to read the log file.
 /;
 
@@ -566,8 +573,8 @@
     s/^\s+//; ## strip off leading blank space
     s/\s+$//; ## strip off trailing blank space
 
-    ### Skip comments blank lines ###
-    next if (/^\#/ or /^\s*$/);
+    ### Skip comments and blank lines ###
+    next if (/^\#/ or /^$/);
 
     s/\#.*$//; ## strip trailing comments
 
@@ -746,7 +753,8 @@
 /;
 
 \$SIG{'TERM'} = \$SIG{'HUP'} = 'goodbye';
-\$SIG{'CHLD'} = 'IGNORE';
+##\$SIG{'CHLD'} = 'IGNORE';
+\$SIG{'CHLD'} = 'DEFAULT';
 
 ## Constants
 (my \$Me = \$0) =~ s%.*/%%;
@@ -759,7 +767,7 @@
 my \$swatch_last_flush = time;
 
 use IO::Handle;
-STDOUT->autoflush(1);;
+STDOUT->autoflush(1);
 
 sub goodbye {
   \$| = 0;
@@ -959,8 +967,13 @@
     } else {
       my $opt = $v;
       $opt =~ s/@/\\@/g;
-      $opt =~ s/^['" ]*//;
-      $opt =~ s/['" ]*$//;
+#     $opt =~ s/^['" ]*//;
+#     $opt =~ s/['" ]*$//;
+      $opt =~ s/^\s+//o;
+      $opt =~ s/\s+$//o;
+      $opt = $1 if ($opt =~ /^['"]\s*(.*)\s*['"]$/o);
+      $opt =~ s/"/\\"/go;
+
       if ($actinfo->{$key}{'def_arg'} eq 'MODES') { 
         ## Modes are processed as an array ##
 	push(@{$options{$actinfo->{$key}{'def_arg'}}}, $opt);
@@ -1038,7 +1051,7 @@
   }
 #  $command =~ s/\$([0-9]+)/\$_[$1]/g;
 
-  return join(' ', @new_cmd);;
+  return join(' ', @new_cmd);
 }
 
  


Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/FC-3/swatch.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- swatch.spec	25 Feb 2005 20:36:41 -0000	1.5
+++ swatch.spec	5 Jan 2006 17:14:15 -0000	1.6
@@ -1,15 +1,13 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           swatch
 Version:        3.1.1
-Release:        1
-Epoch:          0
-Summary:        A tool for actively monitoring log files.
+Release:        4%{?dist}
+Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
 URL:            http://swatch.sourceforge.net/
 Source0:        http://dl.sf.net/swatch/swatch-3.1.1.tar.gz
+Patch0:         swatch-3.1.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -19,14 +17,15 @@
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-The Simple WATCHer is an automated monitoring tool that is capable 
-of alerting system administrators of anything that matches the 
-patterns described in the configuration file, whilst constantly 
+The Simple WATCHer is an automated monitoring tool that is capable
+of alerting system administrators of anything that matches the
+patterns described in the configuration file, whilst constantly
 searching logfiles using perl.
 
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 tools/*
 
 %build
@@ -42,11 +41,11 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check ||:
+%check
 make test
 
 
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 
@@ -54,12 +53,22 @@
 %defattr(-,root,root,-)
 %doc CHANGES COPYRIGHT COPYING KNOWN_BUGS README examples/ tools/
 %{_bindir}/swatch
-%{_mandir}/man[13]/*
+%{_mandir}/man1/*.1*
+%{_mandir}/man3/*.3*
 %{perl_vendorlib}/Swatch/
 %{perl_vendorlib}/auto/Swatch/
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-4
+- Patch supplied by John Horne: doc updates and $0 handling (#160817).
+
+* Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-3
+- Add dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 3.1.1-2
+- rebuilt
+
 * Thu Aug 26 2004 Gavin Henry <ghenry[AT]suretecsystems.com> - 0:3.1.1-1
 - Retaking ownership, thanks jpo and updating for version 3.1.1
 



From fedora-extras-commits at redhat.com  Thu Jan  5 15:29:39 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 10:29:39 -0500
Subject: rpms/abiword/FC-4 abiword-2.4.2-desktop.patch, NONE,
	1.1 abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 abiword.spec, 1.19, 1.20 sources, 1.9,
	1.10 abiword-2.2.6-desktop.patch, 1.1,
	NONE abiword-2.4.1-gsf.patch, 1.1, NONE
Message-ID: <200601051530.k05FUBIa021355@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21316

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch abiword-2.4.1-gsf.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-desktop.patch:

--- NEW FILE abiword-2.4.2-desktop.patch ---
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop	2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop	2006-01-02 00:32:33.000000000 +0100
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor

abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+        ABI_PLUGIN_REPORT([OpenDocument: okay])
 ],[        ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+        ABI_PLUGIN_REPORT([OpenWriter: okay])
 ],[        ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Oct 2005 19:55:56 -0000	1.9
+++ .cvsignore	5 Jan 2006 15:29:38 -0000	1.10
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- abiword.spec	30 Dec 2005 21:32:37 -0000	1.19
+++ abiword.spec	5 Jan 2006 15:29:38 -0000	1.20
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.1
-Release: 5%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -46,8 +46,8 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.4.1-gsf.patch
+Patch1: abiword-2.4.2-desktop.patch
+Patch2: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -57,7 +57,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .gsf
+%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -141,6 +141,12 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc4
+- Update to 2.4.2;
+- Drop the gsf patch
+- Update the desktop patch
+- Add a plugins macros patch
+
 * Fri Dec 30 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-5.fc4
 - Add BuildRequires readline-devel for the AbiCommand plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Oct 2005 19:55:56 -0000	1.9
+++ sources	5 Jan 2006 15:29:38 -0000	1.10
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---


--- abiword-2.4.1-gsf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 16:32:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 11:32:46 -0500
Subject: rpms/swatch/devel swatch-3.1.1.patch,NONE,1.1 swatch.spec,1.8,1.9
Message-ID: <200601051633.k05GXIvu024081@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/swatch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24057

Modified Files:
	swatch.spec 
Added Files:
	swatch-3.1.1.patch 
Log Message:
Doc updates and /bin/bash handling (#160817).

swatch-3.1.1.patch:

--- NEW FILE swatch-3.1.1.patch ---
diff -ruN swatch-3.1.1-orig/swatch swatch-3.1.1/swatch
--- swatch-3.1.1-orig/swatch	2004-07-19 21:14:54.000000000 +0100
+++ swatch-3.1.1/swatch	2005-08-29 20:52:13.000000000 +0100
@@ -32,7 +32,7 @@
 [ B<--input-record-separator> I<regex> ] 
 [ [ B<--examine> I<file_to_examine> ] 
 | [ B<--read-pipe> I<program_to_pipe_from> ] 
-| [ B<--tail> I<file_to_tail> ] ]
+| [ B<--tail-file> I<file_to_tail> ] ]
 [ B<--daemon> ] 
 [ B<--use-cpan-file-tail> ]
 [ B<--awk-field-syntax> ]
@@ -68,7 +68,7 @@
 
 Restart at the specified time where I<hh> is hours and I<mm> is minutes. 
 If the am/pm indicator is omitted, then a 24-hour clock is assumed. 
-If the time is preceeded by the "+" character, then the restart time 
+If the time is preceded by the "+" character, then the restart time 
 will be set to the current time plus the specified time and the am/pm
 indicator will be ignored.
 
@@ -124,18 +124,12 @@
 If swatch is called with no options, it is the same as typing the 
 command line
 
-=over 5
-
-=item
-
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog>
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog
 
 or if /var/log/messages exists
 
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/messages>
-
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/messages
 
-=back
 
 If the configuration file doesn't exist then the following configuration
 is used:
@@ -152,7 +146,7 @@
 
 Each line should contain a keyword and a, sometimes optional,
 value for that keyword. The keyword and value are separated by 
-space or an equal (=) sign.
+a space or an equal (=) sign.
 
 watchfor regex
 
@@ -162,7 +156,7 @@
 
 =item B<echo [modes]>
 
-.Echo the matched line. The text mode may be I<normal>,
+Echo the matched line. The text mode may be I<normal>,
 I<bold>, I<underscore>, I<blink>, I<inverse>, 
 I<black>, I<red>, I<green>, I<yellow>, I<blue>, I<magenta>, I<cyan>, I<white>,
 I<black_h>, I<red_h>, I<green_h>, I<yellow_h>, I<blue_h>, 
@@ -180,7 +174,7 @@
 Execute I<command>. The I<command> may contain variables which are 
 substituted with fields from the matched line. A I<$N> will be replaced
 by the I<Nth> field in the line. A I<$0> or I<$*> will be replaced by the
- entire line.
+entire line.
 
 =item B<mail [addresses=address:address:...][,subject=your_text_here]>
 
@@ -197,7 +191,7 @@
 
 Use B<write(1)> to send matched lines to I<user(s)>.
 
-=item B<throttle hours:minutes:seconds,[use=message|regex|<regex>]>
+=item B<throttle hours:minutes:seconds,[use=message|regex|<regexE<gt>]>
 
 Use this action to limit the number of times that the matched pattern 
 has actions performed on it.
@@ -205,7 +199,15 @@
 The B<use=regex> option will cause throttling to be based on the regular
 expression instead of the message.
 
-You can also specify a perl compliant regular expression as the value for B,use>. The default is use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)" causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
+You can also specify a perl compliant regular expression as the value for B<use>. The default is
+
+=over 4
+
+use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)"
+
+=back
+
+and causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
 
 =item B<threshold events:seconds,[repeat=no|yes]>
 
@@ -223,7 +225,7 @@
  
 Note that this is similar to, but different from, the standard "throttle"
 command, since "throttle" shows the first line and ignores the rest, while
-"threshold" shows the last line and ignores the preceeding (and optionally
+"threshold" shows the last line and ignores the preceding (and optionally
 the following).  However, an action like "threshold 1:120" should perform
 similarly to "throttle 0:2:0,use=regex" and has the advantage of not relying
 on a particular timestamp format in the source log entry.
@@ -268,9 +270,13 @@
 conditional used by the current watchfor statement, and 3=inside the throttle
 block).
 
-Its intended use is to permit variable substitution through use like.
+Its intended use is to permit variable substitution. For example:
+
+=over 4
+
+perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";
 
-C<perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";>
+=back
  
 watchfor /$syslog hostname pppd/>
  
@@ -315,7 +321,7 @@
 
 =head1 NOTES
 
-Upon receiving a ALRM or HUP signal swatch will re-read the
+Upon receiving an ALRM or HUP signal swatch will re-read the
 configuration file and restart, except when used with the I<--daemon> 
 command line option where it will simply exit.
 Swatch will terminate gracefully
@@ -382,7 +388,8 @@
 my @Swatch_ARGV = join(' ', $0, @ARGV); # Save just in case we need to restart 
 (my $Me = $0) =~ s%.*/%%;	      # Strip the path off of the program name
 
-$SIG{'CHLD'} = 'IGNORE';
+#$SIG{'CHLD'} = 'IGNORE';
+$SIG{'CHLD'} = 'DEFAULT';
 
 my $DEF_CONFIG_FILE = "$ENV{'HOME'}/.swatchrc";
 my $DEF_INPUT;
@@ -406,13 +413,13 @@
     --config-file=FILENAME               Use FILENAME for configuration.
     --old-style-config                   Parse a pre-version 3 configuration.
     --restart-time=[+]HH:MM[AM|PM]       Send a HUP signal to swatch at the specified time.
-    --input-record-separator=REGEX       Specify an what should be used to separate "lines."
+    --input-record-separator=REGEX       Specify what should be used to separate "lines."
     --help                               Display this message.
     --version                            Display author and version information.
     --tail-file=FILENAME                 Watch a tail of FILENAME.
-    --read-pipe=COMMAND                  Watch a pipe from COMMAND
-    --examine=FILENAME                   Perform a single pass through FILENAME
-    --pid-file=FILENAME			 File to write pid of process to
+    --read-pipe=COMMAND                  Watch a pipe from COMMAND.
+    --examine=FILENAME                   Perform a single pass through FILENAME.
+    --pid-file=FILENAME			 File to write pid of process to.
     --use-cpan-file-tail                 Use the File::Tail CPAN module to read the log file.
 /;
 
@@ -566,8 +573,8 @@
     s/^\s+//; ## strip off leading blank space
     s/\s+$//; ## strip off trailing blank space
 
-    ### Skip comments blank lines ###
-    next if (/^\#/ or /^\s*$/);
+    ### Skip comments and blank lines ###
+    next if (/^\#/ or /^$/);
 
     s/\#.*$//; ## strip trailing comments
 
@@ -746,7 +753,8 @@
 /;
 
 \$SIG{'TERM'} = \$SIG{'HUP'} = 'goodbye';
-\$SIG{'CHLD'} = 'IGNORE';
+##\$SIG{'CHLD'} = 'IGNORE';
+\$SIG{'CHLD'} = 'DEFAULT';
 
 ## Constants
 (my \$Me = \$0) =~ s%.*/%%;
@@ -759,7 +767,7 @@
 my \$swatch_last_flush = time;
 
 use IO::Handle;
-STDOUT->autoflush(1);;
+STDOUT->autoflush(1);
 
 sub goodbye {
   \$| = 0;
@@ -959,8 +967,13 @@
     } else {
       my $opt = $v;
       $opt =~ s/@/\\@/g;
-      $opt =~ s/^['" ]*//;
-      $opt =~ s/['" ]*$//;
+#     $opt =~ s/^['" ]*//;
+#     $opt =~ s/['" ]*$//;
+      $opt =~ s/^\s+//o;
+      $opt =~ s/\s+$//o;
+      $opt = $1 if ($opt =~ /^['"]\s*(.*)\s*['"]$/o);
+      $opt =~ s/"/\\"/go;
+
       if ($actinfo->{$key}{'def_arg'} eq 'MODES') { 
         ## Modes are processed as an array ##
 	push(@{$options{$actinfo->{$key}{'def_arg'}}}, $opt);
@@ -1038,7 +1051,7 @@
   }
 #  $command =~ s/\$([0-9]+)/\$_[$1]/g;
 
-  return join(' ', @new_cmd);;
+  return join(' ', @new_cmd);
 }
 
  


Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/devel/swatch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- swatch.spec	12 May 2005 23:27:11 -0000	1.8
+++ swatch.spec	5 Jan 2006 16:32:46 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           swatch
 Version:        3.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
 URL:            http://swatch.sourceforge.net/
 Source0:        http://dl.sf.net/swatch/swatch-3.1.1.tar.gz
+Patch0:         swatch-3.1.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 tools/*
 
 %build
@@ -39,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check ||:
+%check
 make test
 
 
@@ -58,6 +60,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-4
+- Patch supplied by John Horne: doc updates and $0 handling (#160817).
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-3
 - Add dist tag.
 



From fedora-extras-commits at redhat.com  Thu Jan  5 15:49:50 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:49:50 -0500
Subject: rpms/maxima/FC-3 maxima.spec,1.12,1.13 xmaxima.desktop,1.3,1.4
Message-ID: <200601051550.k05FoM9d021667@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21648

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
sync w/devel branch



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/maxima.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- maxima.spec	28 Oct 2005 19:10:40 -0000	1.12
+++ maxima.spec	5 Jan 2006 15:49:49 -0000	1.13
@@ -3,14 +3,16 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 6%{?dist} 
+Release: 9%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc (and maybe ppc64)  when lisps build again on ppc 
+# add ppc (and maybe ppc64)  when lisps are available for ppc 
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
+#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
+#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
 %define _with_default_lisp --with-default-lisp=clisp
@@ -19,8 +21,8 @@
 %define _enable_clisp --enable-clisp 
 # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796
 #define _enable_cmucl --enable-cmucl 
-# gcl not built for fc5/development (yet)
-%if "%{?fedora}" < "5"
+%if "%{?fedora}" != "5"
+# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %endif
 %define _enable_sbcl --enable-sbcl 
@@ -101,8 +103,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-# To appease those who are paranoid about rpm queries at build time
-#define clisp_ver %{expand:%%(rpm -q --qf '%%{VERSION}' clisp )}
+#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -140,9 +141,8 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.6
-## To appease those who are paranoid about rpm queries at build time
-#define sbcl_ver %{expand:%%(rpm -q --qf '%%{VERSION}' sbcl )}
+BuildRequires: sbcl 
+#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -315,7 +315,7 @@
 %{_bindir}/xmaxima
 %{_datadir}/maxima/%{version}/xmaxima
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 
 %if "%{?_enable_clisp:1}" == "1"
 %files runtime-clisp
@@ -351,6 +351,15 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
+- OK, loosen Req's again (buildsystem can't handle it)
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
+- tighten Req: on clisp/sbcl runtimes
+
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-7
+- rebuild for/with new clisp,sbcl
+
 * Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-6
 - --enable-sbcl
 - avoid rpmquery's at build-time


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-3/xmaxima.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmaxima.desktop	26 Nov 2005 19:38:09 -0000	1.3
+++ xmaxima.desktop	5 Jan 2006 15:49:49 -0000	1.4
@@ -3,7 +3,7 @@
 Comment=Symbolic Computation Program
 Exec=xmaxima
 Icon=maxima
-MimeType=
+#MimeType=
 Type=Application
 Categories=Application;Science;Education;Math;
 Encoding=UTF-8



From fedora-extras-commits at redhat.com  Thu Jan  5 16:47:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:47:16 -0500
Subject: rpms/perl-DBIx-ContextualFetch/FC-3 perl-DBIx-ContextualFetch.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051647.k05GlmXi024455@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385/FC-3

Modified Files:
	perl-DBIx-ContextualFetch.spec sources 
Log Message:

Bump to 1.03



Index: perl-DBIx-ContextualFetch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-3/perl-DBIx-ContextualFetch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBIx-ContextualFetch.spec	18 Aug 2005 03:49:29 -0000	1.1
+++ perl-DBIx-ContextualFetch.spec	5 Jan 2006 16:47:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-ContextualFetch
-Version:        1.02
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        Add contextual fetches to DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,8 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(DBD::SQLite2)
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(DBD::SQLite), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(DBI)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.03-1
+- bump to 1.03
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-3
 - more cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:49:29 -0000	1.2
+++ sources	5 Jan 2006 16:47:16 -0000	1.3
@@ -1 +1 @@
-e0e2d7db498de03fb3aef95ebd1e0947  DBIx-ContextualFetch-1.02.tar.gz
+20a78432ae26b266216b7b30ff7941c3  DBIx-ContextualFetch-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:47:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:47:28 -0500
Subject: rpms/perl-DBIx-ContextualFetch/devel .cvsignore, 1.2,
	1.3 perl-DBIx-ContextualFetch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051648.k05Gm0xj024465@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385/devel

Modified Files:
	.cvsignore perl-DBIx-ContextualFetch.spec sources 
Log Message:

Bump to 1.03



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 03:49:29 -0000	1.2
+++ .cvsignore	5 Jan 2006 16:47:27 -0000	1.3
@@ -1 +1,2 @@
 DBIx-ContextualFetch-1.02.tar.gz
+DBIx-ContextualFetch-1.03.tar.gz


Index: perl-DBIx-ContextualFetch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/perl-DBIx-ContextualFetch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBIx-ContextualFetch.spec	18 Aug 2005 03:49:29 -0000	1.1
+++ perl-DBIx-ContextualFetch.spec	5 Jan 2006 16:47:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-ContextualFetch
-Version:        1.02
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        Add contextual fetches to DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,8 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(DBD::SQLite2)
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(DBD::SQLite), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(DBI)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.03-1
+- bump to 1.03
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-3
 - more cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:49:29 -0000	1.2
+++ sources	5 Jan 2006 16:47:27 -0000	1.3
@@ -1 +1 @@
-e0e2d7db498de03fb3aef95ebd1e0947  DBIx-ContextualFetch-1.02.tar.gz
+20a78432ae26b266216b7b30ff7941c3  DBIx-ContextualFetch-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:36:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:36:09 -0500
Subject: rpms/perl-Apache-Session-Wrapper/FC-4
	perl-Apache-Session-Wrapper.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051636.k05Gafit024192@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24135/FC-4

Modified Files:
	perl-Apache-Session-Wrapper.spec sources 
Log Message:

Bump to 0.26



Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-4/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session-Wrapper.spec	12 Sep 2005 14:44:40 -0000	1.1
+++ perl-Apache-Session-Wrapper.spec	5 Jan 2006 16:36:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session-Wrapper
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+APACHE_TEST_HTTPD=/usr/sbin/httpd ./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.26-1
+- bump to 0.26
+
 * Mon Sep 12 2005 Paul Howarth <paul at city-fan.org> 0.25-2
 - Use Module::Build
 - Add dep perl(Class::Container)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2005 14:44:40 -0000	1.2
+++ sources	5 Jan 2006 16:36:09 -0000	1.3
@@ -1 +1 @@
-fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz
+3da1330b76d1305bde3bbfee7e82ae17  Apache-Session-Wrapper-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:04 -0500
Subject: rpms/perl-Text-CSV_XS - New directory
Message-ID: <200601051722.k05HM6I6026830@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/perl-Text-CSV_XS

Log Message:
Directory /cvs/extras/rpms/perl-Text-CSV_XS added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 16:47:22 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:47:22 -0500
Subject: rpms/perl-DBIx-ContextualFetch/FC-4 perl-DBIx-ContextualFetch.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051647.k05GlteM024459@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385/FC-4

Modified Files:
	perl-DBIx-ContextualFetch.spec sources 
Log Message:

Bump to 1.03



Index: perl-DBIx-ContextualFetch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-4/perl-DBIx-ContextualFetch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DBIx-ContextualFetch.spec	18 Aug 2005 03:49:29 -0000	1.1
+++ perl-DBIx-ContextualFetch.spec	5 Jan 2006 16:47:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-DBIx-ContextualFetch
-Version:        1.02
-Release:        3%{?dist}
+Version:        1.03
+Release:        1%{?dist}
 Summary:        Add contextual fetches to DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,8 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(DBD::SQLite2)
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(DBD::SQLite), perl(Test::Pod::Coverage)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	perl(DBI)
 
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.03-1
+- bump to 1.03
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-3
 - more cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-ContextualFetch/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:49:29 -0000	1.2
+++ sources	5 Jan 2006 16:47:22 -0000	1.3
@@ -1 +1 @@
-e0e2d7db498de03fb3aef95ebd1e0947  DBIx-ContextualFetch-1.02.tar.gz
+20a78432ae26b266216b7b30ff7941c3  DBIx-ContextualFetch-1.03.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 00:54:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed,  4 Jan 2006 19:54:43 -0500
Subject: rpms/openvpn/FC-4 openvpn.spec,1.10,1.11
Message-ID: <200601050055.k050tFV7023443@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23388/FC-4

Modified Files:
	openvpn.spec 
Log Message:
Man page shouldn't be executable (BZ#176953)


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/openvpn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openvpn.spec	8 Nov 2005 15:35:33 -0000	1.10
+++ openvpn.spec	5 Jan 2006 00:54:43 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:              openvpn
 Version:           2.0.5
-Release:           2%{?dist}
+Release:           3%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
 Source0:           http://openvpn.net/release/%{name}-%{version}.tar.gz
@@ -72,7 +72,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -D -m 0755 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
+install -D -m 0644 %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8/%{name}.8
 install -D -m 0755 %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install -D -m 0755 sample-scripts/%{name}.init \
     $RPM_BUILD_ROOT%{_initrddir}/%{name}
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Jan 04 2006 Steven Pritchard <steve at kspei.com> 2.0.5-3
+- Man page shouldn't be executable (BZ#176953)
+
 * Tue Nov 08 2005 Steven Pritchard <steve at kspei.com> 2.0.5-2
 - Make sample-scripts (etc.) non-executable to avoid some dependencies
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:10 -0500
Subject: rpms/perl-Text-CSV_XS/devel - New directory
Message-ID: <200601051722.k05HMCMm026845@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26822/perl-Text-CSV_XS/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-CSV_XS/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 17:23:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:23:05 -0500
Subject: rpms/perl-Text-CSV_XS import.log,1.1,1.2
Message-ID: <200601051723.k05HNiJX026973@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26936

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-CSV_XS-0.23-1 on branch devel from perl-Text-CSV_XS-0.23-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jan 2006 17:22:27 -0000	1.1
+++ import.log	5 Jan 2006 17:23:04 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-CSV_XS-0_23-1:HEAD:perl-Text-CSV_XS-0.23-1.src.rpm:1136481777



From fedora-extras-commits at redhat.com  Thu Jan  5 17:29:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:29:30 -0500
Subject: rpms/perl-Text-CSV_XS/devel perl-Text-CSV_XS.spec,1.1,1.2
Message-ID: <200601051730.k05HU3xM027045@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023

Modified Files:
	perl-Text-CSV_XS.spec 
Log Message:
Build section: simplified RPM_OPT_FLAGS handling (#175898).


Index: perl-Text-CSV_XS.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/perl-Text-CSV_XS.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-CSV_XS.spec	5 Jan 2006 17:23:10 -0000	1.1
+++ perl-Text-CSV_XS.spec	5 Jan 2006 17:29:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Text-CSV_XS
 Version:        0.23
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Comma-separated values manipulation routines
 
 Group:          Development/Libraries
@@ -22,8 +22,8 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
@@ -52,5 +52,8 @@
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-2
+- Build section: simplified RPM_OPT_FLAGS handling (#175898).
+
 * Sat Nov 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
 - First build.



From fedora-extras-commits at redhat.com  Thu Jan  5 15:51:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu,  5 Jan 2006 10:51:40 -0500
Subject: rpms/maxima/devel maxima.spec,1.15,1.16
Message-ID: <200601051552.k05FqCAO021738@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21720

Modified Files:
	maxima.spec 
Log Message:
* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
- OK, loosen Req's again (buildsystem can't handle it)



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- maxima.spec	5 Jan 2006 15:28:54 -0000	1.15
+++ maxima.spec	5 Jan 2006 15:51:40 -0000	1.16
@@ -3,7 +3,7 @@
 Name: 	 maxima
 Version: 5.9.2
 
-Release: 8%{?dist} 
+Release: 9%{?dist} 
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -103,7 +103,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-%define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
+#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
 Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
@@ -142,7 +142,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 BuildRequires: sbcl 
-%define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
+#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)}
 Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} 
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-sbcl < %{version}-%{release}
@@ -351,6 +351,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-9
+- OK, loosen Req's again (buildsystem can't handle it)
+
 * Thu Jan 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-8
 - tighten Req: on clisp/sbcl runtimes
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:34 -0500
Subject: rpms/perl-Text-CSV_XS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601051722.k05HMaBe026900@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26867/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-CSV_XS


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan  5 04:53:44 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Wed,  4 Jan 2006 23:53:44 -0500
Subject: rpms/libeXosip2/FC-4 .cvsignore, 1.3, 1.4 libeXosip2.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601050454.k054sGiE030860@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/libeXosip2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30826

Modified Files:
	.cvsignore libeXosip2.spec sources 
Log Message:
Upload new source.
Bump release because forgot to upload new source.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Oct 2005 16:27:39 -0000	1.3
+++ .cvsignore	5 Jan 2006 04:53:43 -0000	1.4
@@ -1 +1 @@
-libeXosip2-1.9.1-pre17.tar.gz
+libeXosip2-2.2.2.tar.gz


Index: libeXosip2.spec
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/libeXosip2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libeXosip2.spec	5 Jan 2006 04:49:11 -0000	1.4
+++ libeXosip2.spec	5 Jan 2006 04:53:43 -0000	1.5
@@ -2,7 +2,7 @@
 Summary: A library that hides the complexity of using the SIP protocol
 Name: libeXosip2
 Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/eXosip
@@ -71,6 +71,7 @@
 %changelog
 * Wed Jan  4 2006 Jeffrey C. Ollie <jeff at max1.ocjtech.us> - 2.2.2
 - Update to 2.2.2.
+- Bump release because forgot to upload new source.
 
 * Sat Oct 29 2005 Jeffrey C. Ollie <jcollie at lt16585.campus.dmacc.edu> - 1.9.1-0.5.pre17
 - Update to next prerelease.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libeXosip2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Oct 2005 16:27:39 -0000	1.3
+++ sources	5 Jan 2006 04:53:43 -0000	1.4
@@ -1 +1 @@
-e16606a53c4c4660a7db7e1c6e3d5256  libeXosip2-1.9.1-pre17.tar.gz
+3434df493dc780b4bae76467ce29d689  libeXosip2-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 15:53:23 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu,  5 Jan 2006 10:53:23 -0500
Subject: rpms/abiword/FC-3 abiword-2.4.2-desktop.patch, NONE,
	1.1 abiword-2.4.2-gsf.patch, NONE,
	1.1 abiword-2.4.2-macros.patch, NONE, 1.1 .cvsignore, 1.12,
	1.13 abiword.spec, 1.31, 1.32 sources, 1.12,
	1.13 abiword-2.2.6-desktop.patch, 1.1,
	NONE abiword-2.4.1-gsf.patch, 1.1, NONE
Message-ID: <200601051553.k05FrusO021834@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21802

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-gsf.patch 
	abiword-2.4.2-macros.patch 
Removed Files:
	abiword-2.2.6-desktop.patch abiword-2.4.1-gsf.patch 
Log Message:
Update to 2.4.2



abiword-2.4.2-desktop.patch:

--- NEW FILE abiword-2.4.2-desktop.patch ---
diff -r -u abiword-2.4.2.orig/abi/abiword.desktop abiword-2.4.2/abi/abiword.desktop
--- abiword-2.4.2.orig/abi/abiword.desktop	2005-11-09 11:21:03.000000000 +0100
+++ abiword-2.4.2/abi/abiword.desktop	2006-01-02 00:32:33.000000000 +0100
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/vnd.ms-word;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/vnd.ms-word;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor

abiword-2.4.2-gsf.patch:

--- NEW FILE abiword-2.4.2-gsf.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-11-25 18:20:59.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-02 00:35:51.000000000 +0100
@@ -28,7 +28,7 @@
 # Checks for libraries.
 # Checks for header files.
 
-LIBGSF_REQUIRED_VERSION=1.11.1
+LIBGSF_REQUIRED_VERSION=1.10.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
         ABI_PLUGIN_REPORT([OpenDocument: okay]), \
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:17:38.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-02 00:36:00.000000000 +0100
@@ -28,7 +28,7 @@
 # Checks for libraries.
 # Checks for header files.
 
-LIBGSF_REQUIRED_VERSION=1.11.1
+LIBGSF_REQUIRED_VERSION=1.10.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
         ABI_PLUGIN_REPORT([OpenWriter: okay]), \

abiword-2.4.2-macros.patch:

--- NEW FILE abiword-2.4.2-macros.patch ---
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2005-12-06 23:29:07.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenDocument/plugin.m4	2006-01-05 15:10:52.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENDOCUMENT, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenDocument: okay]), \
+        ABI_PLUGIN_REPORT([OpenDocument: okay])
 ],[        ABI_PLUGIN_REPORT([OpenDocument: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])
diff -r -u abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4 abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4
--- abiword-2.4.2.orig/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2005-12-31 13:18:08.000000000 +0100
+++ abiword-2.4.2/abiword-plugins/wp/impexp/OpenWriter/plugin.m4	2006-01-05 15:11:03.000000000 +0100
@@ -31,7 +31,7 @@
 LIBGSF_REQUIRED_VERSION=1.11.1
 
 PKG_CHECK_MODULES(ABI_OPENWRITER, [libgsf-1 >= $LIBGSF_REQUIRED_VERSION],[
-        ABI_PLUGIN_REPORT([OpenWriter: okay]), \
+        ABI_PLUGIN_REPORT([OpenWriter: okay])
 ],[        ABI_PLUGIN_REPORT([OpenWriter: error libgsf >= $LIBGSF_REQUIRED_VERSION required])
         abi_plugin_disable=yes
 ])


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	13 Oct 2005 21:58:57 -0000	1.12
+++ .cvsignore	5 Jan 2006 15:53:23 -0000	1.13
@@ -1 +1 @@
-abiword-2.4.1.tar.bz2
+abiword-2.4.2.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- abiword.spec	30 Dec 2005 21:31:50 -0000	1.31
+++ abiword.spec	5 Jan 2006 15:53:23 -0000	1.32
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.1
-Release: 8%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -45,8 +45,9 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.2.6-desktop.patch
-Patch2: abiword-2.4.1-gsf.patch
+Patch1: abiword-2.4.2-desktop.patch
+Patch2: abiword-2.4.2-gsf.patch
+Patch3: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -57,6 +58,7 @@
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .gsf
+%patch3 -p1 -b .macros
 
 %build
 cd abi
@@ -140,6 +142,11 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-1.fc3
+- Update to 2.4.2
+- Update the gsf and desktop patches
+- Add a plugin macros patch
+
 * Fri Dec 30 2005 Marc Maurer <uwog at abisource.com> - 1:2.4.1-8.fc3
 - Add BuildRequires readline-devel for the AbiCommand plugin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	13 Oct 2005 21:58:57 -0000	1.12
+++ sources	5 Jan 2006 15:53:23 -0000	1.13
@@ -1 +1 @@
-03d47aad66c4c9f9d329e3538de97dcd  abiword-2.4.1.tar.bz2
+935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2


--- abiword-2.2.6-desktop.patch DELETED ---


--- abiword-2.4.1-gsf.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:35:25 -0500
Subject: owners owners.list,1.498,1.499
Message-ID: <200601051735.k05HZwi6027214@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27159

Modified Files:
	owners.list 
Log Message:
New package: perl-Text-CSV_XS (#175898).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -r1.498 -r1.499
--- owners.list	3 Jan 2006 10:26:21 -0000	1.498
+++ owners.list	5 Jan 2006 17:35:25 -0000	1.499
@@ -905,6 +905,7 @@
 Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Jan  5 16:36:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:36:15 -0500
Subject: rpms/perl-Apache-Session-Wrapper/devel .cvsignore, 1.2,
	1.3 perl-Apache-Session-Wrapper.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051636.k05GaleW024198@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24135/devel

Modified Files:
	.cvsignore perl-Apache-Session-Wrapper.spec sources 
Log Message:

Bump to 0.26



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Sep 2005 14:44:40 -0000	1.2
+++ .cvsignore	5 Jan 2006 16:36:15 -0000	1.3
@@ -1 +1,2 @@
 Apache-Session-Wrapper-0.25.tar.gz
+Apache-Session-Wrapper-0.26.tar.gz


Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session-Wrapper.spec	12 Sep 2005 14:44:40 -0000	1.1
+++ perl-Apache-Session-Wrapper.spec	5 Jan 2006 16:36:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session-Wrapper
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+APACHE_TEST_HTTPD=/usr/sbin/httpd ./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.26-1
+- bump to 0.26
+
 * Mon Sep 12 2005 Paul Howarth <paul at city-fan.org> 0.25-2
 - Use Module::Build
 - Add dep perl(Class::Container)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2005 14:44:40 -0000	1.2
+++ sources	5 Jan 2006 16:36:15 -0000	1.3
@@ -1 +1 @@
-fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz
+3da1330b76d1305bde3bbfee7e82ae17  Apache-Session-Wrapper-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:22:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:22:28 -0500
Subject: rpms/perl-Text-CSV_XS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601051722.k05HMUbu026879@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26867

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-CSV_XS


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-CSV_XS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:35:26 -0500
Subject: rpms/perl-SQL-Abstract/devel .cvsignore, 1.2,
	1.3 perl-SQL-Abstract.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051736.k05HZw4v027215@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27127/devel

Modified Files:
	.cvsignore perl-SQL-Abstract.spec sources 
Log Message:

Bump to 1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Jul 2005 01:35:59 -0000	1.2
+++ .cvsignore	5 Jan 2006 17:35:25 -0000	1.3
@@ -1 +1,2 @@
 SQL-Abstract-1.19.tar.gz
+SQL-Abstract-1.20.tar.gz


Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/perl-SQL-Abstract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Abstract.spec	30 Jul 2005 01:35:59 -0000	1.1
+++ perl-SQL-Abstract.spec	5 Jan 2006 17:35:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-1
+- bump to 1.20
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 01:35:59 -0000	1.2
+++ sources	5 Jan 2006 17:35:25 -0000	1.3
@@ -1 +1 @@
-d0e937d2f7781ed56c4ba855ee4ab47a  SQL-Abstract-1.19.tar.gz
+0a6fd0dab5d69f5ae800c4f39caa5cbf  SQL-Abstract-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:35:14 -0500
Subject: rpms/perl-SQL-Abstract/FC-3 perl-SQL-Abstract.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601051735.k05HZk0w027202@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27127/FC-3

Modified Files:
	perl-SQL-Abstract.spec sources 
Log Message:

Bump to 1.20



Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/perl-SQL-Abstract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Abstract.spec	30 Jul 2005 01:35:59 -0000	1.1
+++ perl-SQL-Abstract.spec	5 Jan 2006 17:35:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-1
+- bump to 1.20
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 01:35:59 -0000	1.2
+++ sources	5 Jan 2006 17:35:13 -0000	1.3
@@ -1 +1 @@
-d0e937d2f7781ed56c4ba855ee4ab47a  SQL-Abstract-1.19.tar.gz
+0a6fd0dab5d69f5ae800c4f39caa5cbf  SQL-Abstract-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 07:36:12 2006
From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster))
Date: Thu,  5 Jan 2006 02:36:12 -0500
Subject: rpms/rkhunter import.log,1.7,1.8
Message-ID: <200601050736.k057ajhr004813@cvs-int.fedora.redhat.com>

Author: tamaster

Update of /cvs/extras/rpms/rkhunter
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4763

Modified Files:
	import.log 
Log Message:
auto-import rkhunter-1.2.7-1 on branch devel from rkhunter-1.2.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	5 Jan 2006 07:27:14 -0000	1.7
+++ import.log	5 Jan 2006 07:36:12 -0000	1.8
@@ -4,3 +4,4 @@
 rkhunter-1_2_7-1:FC-2:rkhunter-1.2.7-1.src.rpm:1136444691
 rkhunter-1_2_7-1:FC-3:rkhunter-1.2.7-1.src.rpm:1136445493
 rkhunter-1_2_7-1:FC-4:rkhunter-1.2.7-1.src.rpm:1136445982
+rkhunter-1_2_7-1:HEAD:rkhunter-1.2.7-1.src.rpm:1136446530



From fedora-extras-commits at redhat.com  Thu Jan  5 17:51:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:51:26 -0500
Subject: owners owners.list,1.499,1.500
Message-ID: <200601051751.k05HpxrA027628@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27564

Modified Files:
	owners.list 
Log Message:
Add python-basemap and python-basemap-data



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -r1.499 -r1.500
--- owners.list	5 Jan 2006 17:35:25 -0000	1.499
+++ owners.list	5 Jan 2006 17:51:25 -0000	1.500
@@ -995,6 +995,8 @@
 Fedora Extras|python-adns|Python interface for the GNU adns library|colin at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-basemap|Plots data on map projections (with continental and political boundaries)|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-basemap-data|Data for python-basemap|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-bibtex|Python extension to parse BibTeX files|z.kota at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org|
 Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan  5 17:51:47 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:51:47 -0500
Subject: rpms/python-basemap-data/devel python-basemap-data.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601051752.k05HqJ5i027637@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27594/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-basemap-data.spec 
Log Message:
auto-import python-basemap-data-0.7-1 on branch devel from python-basemap-data-0.7-1.src.rpm


--- NEW FILE python-basemap-data.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-basemap-data
Version:        0.7
Release:        1%{?dist}
Summary:        Data for python-basemap
Group:          Development/Libraries
License:        GPL
URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
Source0:        http://dl.sf.net/matplotlib/basemap-data-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel, proj-devel
BuildArch:      noarch

%description
Data for python-basemap

%prep
%setup -q -n basemap-data-%{version}


%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 LICENSE_data
%{_datadir}/basemap/


%changelog
* Sun Nov 20 2005 Orion Poplawski <orion at cora.nwra.com> 0.7-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Jan 2006 17:48:03 -0000	1.1
+++ .cvsignore	5 Jan 2006 17:51:47 -0000	1.2
@@ -0,0 +1 @@
+basemap-data-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Jan 2006 17:48:03 -0000	1.1
+++ sources	5 Jan 2006 17:51:47 -0000	1.2
@@ -0,0 +1 @@
+8f745d4575e996348e3b315859b354e0  basemap-data-0.7.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:53:12 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:53:12 -0500
Subject: rpms/python-basemap-data/devel python-basemap-data.spec,1.1,1.2
Message-ID: <200601051753.k05HrjvE027711@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27678

Modified Files:
	python-basemap-data.spec 
Log Message:
Remove dist tag to avoid unnecessary upgrades - this is static data



Index: python-basemap-data.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/devel/python-basemap-data.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-basemap-data.spec	5 Jan 2006 17:51:47 -0000	1.1
+++ python-basemap-data.spec	5 Jan 2006 17:53:12 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-basemap-data
 Version:        0.7
-Release:        1%{?dist}
+Release:        1
 Summary:        Data for python-basemap
 Group:          Development/Libraries
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Jan  5 18:59:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 13:59:43 -0500
Subject: rpms/perl-CGI-Untaint/devel .cvsignore, 1.2,
	1.3 perl-CGI-Untaint.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051900.k05J0GE2030109@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042/devel

Modified Files:
	.cvsignore perl-CGI-Untaint.spec sources 
Log Message:

bump to 1.26



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 03:28:34 -0000	1.2
+++ .cvsignore	5 Jan 2006 18:59:43 -0000	1.3
@@ -1 +1,2 @@
 CGI-Untaint-1.25.tar.gz
+CGI-Untaint-1.26.tar.gz


Index: perl-CGI-Untaint.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/perl-CGI-Untaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint.spec	18 Aug 2005 03:28:34 -0000	1.1
+++ perl-CGI-Untaint.spec	5 Jan 2006 18:59:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint
-Version:        1.25
-Release:        3%{?dist}
+Version:        1.26
+Release:        1%{?dist}
 Summary:        Process CGI input parameters
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.26-1
+- bump to 1.26
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.25-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:28:34 -0000	1.2
+++ sources	5 Jan 2006 18:59:43 -0000	1.3
@@ -1 +1 @@
-f75b2641202e441a16db5040c37170c0  CGI-Untaint-1.25.tar.gz
+1ed11830476470d4895b632bf2222606  CGI-Untaint-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:57:23 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:57:23 -0500
Subject: rpms/logjam/FC-4 logjam-4.5.2-gtkhtml38.patch, NONE, 1.1 logjam.spec,
	1.21, 1.22 sources, 1.6, 1.7
Message-ID: <200601051757.k05Hvtrl027934@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869/FC-4

Modified Files:
	logjam.spec sources 
Added Files:
	logjam-4.5.2-gtkhtml38.patch 
Log Message:

Bump to 4.5.2


logjam-4.5.2-gtkhtml38.patch:

--- NEW FILE logjam-4.5.2-gtkhtml38.patch ---
--- logjam-4.5.2/configure.in.BAD	2006-01-05 11:45:05.000000000 -0600
+++ logjam-4.5.2/configure.in	2006-01-05 11:46:58.000000000 -0600
@@ -74,21 +74,29 @@
                    [compile with GtkSpell support (default autodetect)]),
     gtkspell-2.0)
 
-  LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
-    AC_HELP_STRING([--with-gtkhtml36],
-                   [compile with GtkHtml3.6 support (default autodetect)]),
-    libgtkhtml-3.6)
-  if test "$with_gtkhtml36" = "yes"; then
-    with_gtkhtml="3.6"
+  LJ_PKG_ARG_WITH(gtkhtml38, GTKHTML38,
+    AC_HELP_STRING([--with-gtkhtml38],
+                   [compile with GtkHtml3.8 support (default autodetect)]),   
+    libgtkhtml-3.8)
+  if test "$with_gtkhtml38" = "yes"; then
+    with_gtkhtml="3.8"
   else
-    LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
-      AC_HELP_STRING([--with-gtkhtml30],
-                     [compile with GtkHtml3.0 support (default autodetect)]),
-      libgtkhtml-3.0)
-    if test "$with_gtkhtml30" = "yes"; then
-      with_gtkhtml="3.0"
+    LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
+      AC_HELP_STRING([--with-gtkhtml36],
+                     [compile with GtkHtml3.6 support (default autodetect)]),
+      libgtkhtml-3.6)
+    if test "$with_gtkhtml36" = "yes"; then
+      with_gtkhtml="3.6"
     else
-      with_gtkhtml="no"
+      LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
+        AC_HELP_STRING([--with-gtkhtml30],
+                       [compile with GtkHtml3.0 support (default autodetect)]),
+        libgtkhtml-3.0)
+      if test "$with_gtkhtml30" = "yes"; then
+        with_gtkhtml="3.0"
+      else
+        with_gtkhtml="no"
+      fi
     fi
   fi
   if test "$with_gtkhtml" != "no"; then


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- logjam.spec	6 Sep 2005 22:02:26 -0000	1.21
+++ logjam.spec	5 Jan 2006 17:57:23 -0000	1.22
@@ -1,8 +1,8 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.1
-Release:	5%{?dist}
+Version:	4.5.2
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -18,11 +18,11 @@
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		logjam-4.4.1-offline-segfaultfix.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
 Patch5:		logjam-4.5-patch8-manfix.patch
+Patch6:		logjam-4.5.2-gtkhtml38.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -41,13 +41,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .offline-segfaultfix
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
+%patch6 -p1 -b .gtkhtml38
 
 %build
+autoconf
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -82,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.2-1
+- bump to 4.5.2
+
 * Tue Sep  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.1-5
 - add BR: libgcrypt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 22:02:26 -0000	1.6
+++ sources	5 Jan 2006 17:57:23 -0000	1.7
@@ -1 +1 @@
-ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2
+4c06324355ba01a2a1cf1ad5b48f4c85  logjam-4.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan  4 23:21:22 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Wed,  4 Jan 2006 18:21:22 -0500
Subject: rpms/ocaml/FC-3 .cvsignore, 1.5, 1.6 ocaml.spec, 1.13, 1.14 sources,
	1.6, 1.7
Message-ID: <200601042321.k04NLsiA021010@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20972/FC-3

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jan 2006 00:07:03 -0000	1.5
+++ .cvsignore	4 Jan 2006 23:21:22 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.09.0.tar.bz2
+ocaml-3.09.1.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
 ocaml-3.09-refman.ps.gz


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ocaml.spec	1 Jan 2006 00:07:03 -0000	1.13
+++ ocaml.spec	4 Jan 2006 23:21:22 -0000	1.14
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.0
+Version:	3.09.1
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.0.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
 Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
@@ -18,6 +18,7 @@
 BuildRequires:  gdbm-devel
 BuildRequires:	tcl-devel, tk-devel
 BuildRequires:	emacs, perl
+BuildRequires:  XFree86-devel
 Requires(post):	/sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -180,6 +181,9 @@
 %doc emacs/README
 
 %changelog
+* Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
+- new version 3.09.1
+
 * Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.0-1
 - new version 3.09.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Jan 2006 00:07:03 -0000	1.6
+++ sources	4 Jan 2006 23:21:22 -0000	1.7
@@ -1,4 +1,4 @@
-834f88b1f39aa066bb620747764c0588  ocaml-3.09.0.tar.bz2
+b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
 598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:54:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:54:25 -0500
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051654.k05Gswrv024730@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674/FC-4

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

Bump to 1.02



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Plugin-RetrieveAll.spec	7 Sep 2005 18:53:58 -0000	1.1
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
+- bump to 1.02
+
 * Wed Aug 31 2005 Paul Howarth <paul at city-fan.org> 1.01-3
 - remove redundant BR: perl
 - use %%{?_smp_mflags} with make in %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:53:58 -0000	1.2
+++ sources	5 Jan 2006 16:54:25 -0000	1.3
@@ -1 +1 @@
-27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:36:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:36:03 -0500
Subject: rpms/perl-Apache-Session-Wrapper/FC-3
	perl-Apache-Session-Wrapper.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051636.k05GaZ1H024188@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24135/FC-3

Modified Files:
	perl-Apache-Session-Wrapper.spec sources 
Log Message:

Bump to 0.26



Index: perl-Apache-Session-Wrapper.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-3/perl-Apache-Session-Wrapper.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session-Wrapper.spec	12 Sep 2005 14:44:40 -0000	1.1
+++ perl-Apache-Session-Wrapper.spec	5 Jan 2006 16:36:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Apache-Session-Wrapper
-Version:        0.25
-Release:        2%{?dist}
+Version:        0.26
+Release:        1%{?dist}
 Summary:        A simple wrapper around Apache::Session
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -32,7 +32,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %check
-./Build test
+APACHE_TEST_HTTPD=/usr/sbin/httpd ./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.26-1
+- bump to 0.26
+
 * Mon Sep 12 2005 Paul Howarth <paul at city-fan.org> 0.25-2
 - Use Module::Build
 - Add dep perl(Class::Container)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session-Wrapper/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Sep 2005 14:44:40 -0000	1.2
+++ sources	5 Jan 2006 16:36:03 -0000	1.3
@@ -1 +1 @@
-fb9b36ff0bef82c537a0f05edd846832  Apache-Session-Wrapper-0.25.tar.gz
+3da1330b76d1305bde3bbfee7e82ae17  Apache-Session-Wrapper-0.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 19:55:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  5 Jan 2006 14:55:27 -0500
Subject: rpms/svgalib/devel svgalib.spec, 1.5, 1.6 svgalib-1.9.21-wip.patch, 
	1.2, NONE svgalib-1.9.22.diff, 1.2, NONE
Message-ID: <200601051955.k05JtxE5032492@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32475

Modified Files:
	svgalib.spec 
Removed Files:
	svgalib-1.9.21-wip.patch svgalib-1.9.22.diff 
Log Message:
New upstream version, drop merged patches


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svgalib.spec	16 Aug 2005 11:55:30 -0000	1.5
+++ svgalib.spec	5 Jan 2006 19:55:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		svgalib
-Version:	1.9.21
-Release:	5
+Version:	1.9.24
+Release:	1
 Exclusivearch:	%{ix86} x86_64
 Summary:	Low-level fullscreen SVGA graphics library
 
@@ -9,13 +9,11 @@
 URL:		http://www.svgalib.org/
 Source0:	http://www.arava.co.il/matan/svgalib/svgalib-%{version}.tar.gz
 Source1:	svgalib-todo
-Patch0:		svgalib-1.9.22.diff
-Patch1:		svgalib-1.9.21-makefiles.patch
-Patch2:		svgalib-1.4.3-fhs.patch
-Patch3:		svgalib-1.9.21-demos.patch
-Patch4:		svgalib-1.9.21-wip.patch
-Patch5:		svgalib-1.9.21-cfg.patch
-Patch6:		svgalib-1.9.21-x86_64.patch
+Patch0:		svgalib-1.9.21-makefiles.patch
+Patch1:		svgalib-1.4.3-fhs.patch
+Patch2:		svgalib-1.9.21-demos.patch
+Patch3:		svgalib-1.9.21-cfg.patch
+Patch4:		svgalib-1.9.21-x86_64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	libvga = %{version}-%{release}
 
@@ -39,14 +37,12 @@
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p1 -b .makefiles
-%patch2 -p1 -b .fhs
-%patch3 -p1
-%patch4 -p1 -b .wip
-%patch5 -p1 -b .defaultcfg
+%patch0 -p1 -b .makefiles
+%patch1 -p1 -b .fhs
+%patch2 -p1
+%patch3 -p1 -b .defaultcfg
 %ifnarch %{ix86}
-%patch6 -p1 -b .x86_64
+%patch4 -p1 -b .x86_64
 %endif
 
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
@@ -76,7 +72,7 @@
 cd ..
 cd threeDKit
 make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
-  prefix=%{_prefix} lib3dkit.so.1.9.22
+  prefix=%{_prefix} lib3dkit.so.%{version}
 cd ..
 
 %install
@@ -129,6 +125,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.24-1
+- New upstream version, drop merged patches.
+
 * Tue Aug 16 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.21-5
 - Merge with upstream, drop merged patches, fix dark vga modes on radeon.
 


--- svgalib-1.9.21-wip.patch DELETED ---


--- svgalib-1.9.22.diff DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan  5 19:00:40 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu,  5 Jan 2006 14:00:40 -0500
Subject: rpms/gazpacho/FC-4 .cvsignore, 1.7, 1.8 gazpacho.spec, 1.13,
	1.14 sources, 1.7, 1.8
Message-ID: <200601051901.k05J1Xe0031854@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/FC-4

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Oct 2005 22:53:09 -0000	1.7
+++ .cvsignore	5 Jan 2006 19:00:40 -0000	1.8
@@ -1,2 +1,2 @@
+gazpacho-0.6.3.tar.bz2
 gazpacho-0.6.1-nox.patch
-gazpacho-0.6.2.tar.bz2


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/gazpacho.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gazpacho.spec	25 Nov 2005 14:16:22 -0000	1.13
+++ gazpacho.spec	5 Jan 2006 19:00:40 -0000	1.14
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://gazpacho.sicem.biz/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/%{name}-%{version}.tar.bz2
-Patch0:         gazpacho-0.6.1-nox.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nox
 sed -i -e 's/\(^docs_dir =.*\)gazpacho/\1gazpacho-%{version}/' setup.py
 
 
@@ -37,7 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/gazpacho
+rm -rf $RPM_BUILD_ROOT%{_docdir}/gazpacho
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -75,6 +73,10 @@
 
 
 %changelog
+* Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
+- Version 0.6.3
+- .nox patch no longer needed
+
 * Tue Nov 22 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.2-2
 - Handle docdir correctly
 - Package missed docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	29 Oct 2005 22:53:09 -0000	1.7
+++ sources	5 Jan 2006 19:00:40 -0000	1.8
@@ -1,2 +1 @@
-40f1dc10bebd7f3f06bbb53ea533bf75  gazpacho-0.6.1-nox.patch
-64311aa9688c456838903b3777703981  gazpacho-0.6.2.tar.bz2
+12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 17:51:41 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:51:41 -0500
Subject: rpms/python-basemap-data import.log,1.1,1.2
Message-ID: <200601051752.k05HqD3S027631@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27594

Modified Files:
	import.log 
Log Message:
auto-import python-basemap-data-0.7-1 on branch devel from python-basemap-data-0.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-basemap-data/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	5 Jan 2006 17:47:57 -0000	1.1
+++ import.log	5 Jan 2006 17:51:41 -0000	1.2
@@ -0,0 +1 @@
+python-basemap-data-0_7-1:HEAD:python-basemap-data-0.7-1.src.rpm:1136483497



From fedora-extras-commits at redhat.com  Thu Jan  5 17:48:03 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:48:03 -0500
Subject: rpms/python-basemap-data/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601051748.k05Hm5Qb027520@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27488/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-basemap-data


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan  5 20:00:39 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu,  5 Jan 2006 15:00:39 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.4,1.5
Message-ID: <200601052001.k05K1CpN001895@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32607

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdesklets.spec	18 Dec 2005 10:32:11 -0000	1.4
+++ gdesklets.spec	5 Jan 2006 20:00:39 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
 License:        GPL
 
-URL:            http://gdesklets.gnomedesktop.org/
+URL:            http://www.gdesklets.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
 Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -21,7 +21,7 @@
 
 BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires: libXau-devel, libXdmcp-devel
+BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -98,10 +98,12 @@
 %{_mandir}/man1/*
 
 
-
-
 %changelog
-* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-23.fc5
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
+- Rebuilt against libgtop2-devel
+- Changed url of the provider
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-24.fc5
 - Added libXdmcp-devel on BuildRequires
 
 * Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-23.fc5



From fedora-extras-commits at redhat.com  Thu Jan  5 17:47:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:47:57 -0500
Subject: rpms/python-basemap-data Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601051747.k05Hlx1l027500@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27488

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-basemap-data


--- NEW FILE Makefile ---
# Top level Makefile for module python-basemap-data
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan  5 19:00:46 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu,  5 Jan 2006 14:00:46 -0500
Subject: rpms/gazpacho/devel .cvsignore, 1.8, 1.9 gazpacho.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <200601051901.k05J1MEI031846@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30202/devel

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Oct 2005 22:55:41 -0000	1.8
+++ .cvsignore	5 Jan 2006 19:00:46 -0000	1.9
@@ -1,2 +1,2 @@
-gazpacho-0.6.2.tar.bz2
+gazpacho-0.6.3.tar.bz2
 gazpacho-0.6.1-nox.patch


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gazpacho.spec	25 Nov 2005 14:16:27 -0000	1.14
+++ gazpacho.spec	5 Jan 2006 19:00:46 -0000	1.15
@@ -1,15 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.2
-Release:        2%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://gazpacho.sicem.biz/
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/%{name}-%{version}.tar.bz2
-Patch0:         gazpacho-0.6.1-nox.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -26,7 +25,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .nox
 sed -i -e 's/\(^docs_dir =.*\)gazpacho/\1gazpacho-%{version}/' setup.py
 
 
@@ -37,7 +35,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT/%{_docdir}/gazpacho
+rm -rf $RPM_BUILD_ROOT%{_docdir}/gazpacho
 desktop-file-install \
     --delete-original \
     --vendor fedora \
@@ -75,6 +73,10 @@
 
 
 %changelog
+* Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
+- Version 0.6.3
+- .nox patch no longer needed
+
 * Tue Nov 22 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.2-2
 - Handle docdir correctly
 - Package missed docs


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Oct 2005 22:55:41 -0000	1.8
+++ sources	5 Jan 2006 19:00:46 -0000	1.9
@@ -1,2 +1 @@
-64311aa9688c456838903b3777703981  gazpacho-0.6.2.tar.bz2
-40f1dc10bebd7f3f06bbb53ea533bf75  gazpacho-0.6.1-nox.patch
+12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 18:59:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 13:59:37 -0500
Subject: rpms/perl-CGI-Untaint/FC-4 perl-CGI-Untaint.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200601051900.k05J0A2d030104@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042/FC-4

Modified Files:
	perl-CGI-Untaint.spec sources 
Log Message:

bump to 1.26



Index: perl-CGI-Untaint.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-4/perl-CGI-Untaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint.spec	18 Aug 2005 03:28:34 -0000	1.1
+++ perl-CGI-Untaint.spec	5 Jan 2006 18:59:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint
-Version:        1.25
-Release:        3%{?dist}
+Version:        1.26
+Release:        1%{?dist}
 Summary:        Process CGI input parameters
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.26-1
+- bump to 1.26
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.25-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:28:34 -0000	1.2
+++ sources	5 Jan 2006 18:59:37 -0000	1.3
@@ -1 +1 @@
-f75b2641202e441a16db5040c37170c0  CGI-Untaint-1.25.tar.gz
+1ed11830476470d4895b632bf2222606  CGI-Untaint-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:47:44 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:47:44 -0500
Subject: rpms/python-basemap-data/devel - New directory
Message-ID: <200601051747.k05HlkX5027466@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27443/python-basemap-data/devel

Log Message:
Directory /cvs/extras/rpms/python-basemap-data/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 17:23:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:23:11 -0500
Subject: rpms/perl-Text-CSV_XS/devel perl-Text-CSV_XS.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601051723.k05HNiMi026972@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Text-CSV_XS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26936/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-CSV_XS.spec 
Log Message:
auto-import perl-Text-CSV_XS-0.23-1 on branch devel from perl-Text-CSV_XS-0.23-1.src.rpm


--- NEW FILE perl-Text-CSV_XS.spec ---
Name:           perl-Text-CSV_XS
Version:        0.23
Release:        1%{?dist}
Summary:        Comma-separated values manipulation routines

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Text-CSV_XS/
Source0:        http://www.cpan.org/authors/id/J/JW/JWIED/Text-CSV_XS-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::CSV provides facilities for the composition and decomposition of
comma-separated values.  An instance of the Text::CSV class can combine
fields into a CSV string and parse a CSV string into fields.


%prep
%setup -q -n Text-CSV_XS-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorarch}/Text/
%{perl_vendorarch}/auto/Text/
%{_mandir}/man3/*.3*


%changelog
* Sat Nov 05 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.23-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	5 Jan 2006 17:22:33 -0000	1.1
+++ .cvsignore	5 Jan 2006 17:23:10 -0000	1.2
@@ -0,0 +1 @@
+Text-CSV_XS-0.23.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-CSV_XS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	5 Jan 2006 17:22:33 -0000	1.1
+++ sources	5 Jan 2006 17:23:10 -0000	1.2
@@ -0,0 +1 @@
+936eca163a09e92353565ad37ee7a4fa  Text-CSV_XS-0.23.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:35:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:35:19 -0500
Subject: rpms/perl-SQL-Abstract/FC-4 perl-SQL-Abstract.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601051735.k05HZqRQ027207@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27127/FC-4

Modified Files:
	perl-SQL-Abstract.spec sources 
Log Message:

Bump to 1.20



Index: perl-SQL-Abstract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/perl-SQL-Abstract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SQL-Abstract.spec	30 Jul 2005 01:35:59 -0000	1.1
+++ perl-SQL-Abstract.spec	5 Jan 2006 17:35:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-SQL-Abstract
-Version:        1.19
-Release:        2%{?dist}
+Version:        1.20
+Release:        1%{?dist}
 Summary:        Generate SQL from Perl data structures
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.20-1
+- bump to 1.20
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.19-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Jul 2005 01:35:59 -0000	1.2
+++ sources	5 Jan 2006 17:35:19 -0000	1.3
@@ -1 +1 @@
-d0e937d2f7781ed56c4ba855ee4ab47a  SQL-Abstract-1.19.tar.gz
+0a6fd0dab5d69f5ae800c4f39caa5cbf  SQL-Abstract-1.20.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 09:26:48 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu,  5 Jan 2006 04:26:48 -0500
Subject: rpms/gtkglext/devel gtkglext.spec,1.5,1.6
Message-ID: <200601050927.k059RO1U009570@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/gtkglext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9553

Modified Files:
	gtkglext.spec 
Log Message:
- Add %%dist.
- Adaptations to modular X .
- Remove gcc-c++ (Already in default deps).




Index: gtkglext.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkglext/devel/gtkglext.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtkglext.spec	6 Apr 2005 22:11:58 -0000	1.5
+++ gtkglext.spec	5 Jan 2006 09:26:48 -0000	1.6
@@ -6,7 +6,7 @@
 Summary:	OpenGL Extension to GTK
 Name:		gtkglext
 Version:	%{base_version}
-Release:	2
+Release:	3%{?dist}
 
 License:	LGPL
 Group:		System Environment/Libraries
@@ -15,14 +15,14 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
-BuildRequires:	Mesa, libGL.so.1, libGLU.so.1
+BuildRequires:	libGLU-devel
+BuildRequires:	libGL-devel
+# The configure script checks for X11/Intrinsic.h
+BuildRequires:	libXt-devel
 
 Requires(postun):	/sbin/ldconfig
 Requires(post):		/sbin/ldconfig
 
-# Work around to the broken libtool being used
-BuildRequires:	gcc-c++
-
 %description
 GtkGLExt is an OpenGL extension to GTK. It provides the GDK objects
 which support OpenGL rendering in GTK, and GtkWidget API add-ons to
@@ -79,6 +79,11 @@
 %doc %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Jan 05 2006 Ralf Corsepius <ralf at links2linux.de> - 1.0.6-3
+- Add %%dist.
+- Adaptations to modular X .
+- Remove gcc-c++ (Already in default deps).
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:47:38 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu,  5 Jan 2006 12:47:38 -0500
Subject: rpms/python-basemap-data - New directory
Message-ID: <200601051747.k05Hle48027451@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-basemap-data
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27443/python-basemap-data

Log Message:
Directory /cvs/extras/rpms/python-basemap-data added to the repository




From fedora-extras-commits at redhat.com  Thu Jan  5 17:57:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:57:29 -0500
Subject: rpms/logjam/devel logjam-4.5.2-gtkhtml38.patch, NONE, 1.1 .cvsignore,
	1.4, 1.5 logjam.spec, 1.21, 1.22 sources, 1.6, 1.7
Message-ID: <200601051758.k05Hw27Y027941@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869/devel

Modified Files:
	.cvsignore logjam.spec sources 
Added Files:
	logjam-4.5.2-gtkhtml38.patch 
Log Message:

Bump to 4.5.2


logjam-4.5.2-gtkhtml38.patch:

--- NEW FILE logjam-4.5.2-gtkhtml38.patch ---
--- logjam-4.5.2/configure.in.BAD	2006-01-05 11:45:05.000000000 -0600
+++ logjam-4.5.2/configure.in	2006-01-05 11:46:58.000000000 -0600
@@ -74,21 +74,29 @@
                    [compile with GtkSpell support (default autodetect)]),
     gtkspell-2.0)
 
-  LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
-    AC_HELP_STRING([--with-gtkhtml36],
-                   [compile with GtkHtml3.6 support (default autodetect)]),
-    libgtkhtml-3.6)
-  if test "$with_gtkhtml36" = "yes"; then
-    with_gtkhtml="3.6"
+  LJ_PKG_ARG_WITH(gtkhtml38, GTKHTML38,
+    AC_HELP_STRING([--with-gtkhtml38],
+                   [compile with GtkHtml3.8 support (default autodetect)]),   
+    libgtkhtml-3.8)
+  if test "$with_gtkhtml38" = "yes"; then
+    with_gtkhtml="3.8"
   else
-    LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
-      AC_HELP_STRING([--with-gtkhtml30],
-                     [compile with GtkHtml3.0 support (default autodetect)]),
-      libgtkhtml-3.0)
-    if test "$with_gtkhtml30" = "yes"; then
-      with_gtkhtml="3.0"
+    LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
+      AC_HELP_STRING([--with-gtkhtml36],
+                     [compile with GtkHtml3.6 support (default autodetect)]),
+      libgtkhtml-3.6)
+    if test "$with_gtkhtml36" = "yes"; then
+      with_gtkhtml="3.6"
     else
-      with_gtkhtml="no"
+      LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
+        AC_HELP_STRING([--with-gtkhtml30],
+                       [compile with GtkHtml3.0 support (default autodetect)]),
+        libgtkhtml-3.0)
+      if test "$with_gtkhtml30" = "yes"; then
+        with_gtkhtml="3.0"
+      else
+        with_gtkhtml="no"
+      fi
     fi
   fi
   if test "$with_gtkhtml" != "no"; then


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Sep 2005 14:38:20 -0000	1.4
+++ .cvsignore	5 Jan 2006 17:57:29 -0000	1.5
@@ -1,2 +1,3 @@
 logjam-4.4.1.tar.bz2
 logjam-4.5.1.tar.bz2
+logjam-4.5.2.tar.bz2


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- logjam.spec	6 Sep 2005 22:02:54 -0000	1.21
+++ logjam.spec	5 Jan 2006 17:57:29 -0000	1.22
@@ -1,8 +1,8 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.1
-Release:	5%{?dist}
+Version:	4.5.2
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -18,11 +18,11 @@
 BuildRequires:	libsoup-devel, sqlite-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		logjam-4.4.1-offline-segfaultfix.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
 Patch5:		logjam-4.5-patch8-manfix.patch
+Patch6:		logjam-4.5.2-gtkhtml38.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -41,13 +41,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .offline-segfaultfix
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
+%patch6 -p1 -b .gtkhtml38
 
 %build
+autoconf
 %configure --with-sqlite3 \
 %if %{use_xmms}
 	--with-xmms
@@ -82,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.2-1
+- bump to 4.5.2
+
 * Tue Sep  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.1-5
 - add BR: libgcrypt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 22:02:54 -0000	1.6
+++ sources	5 Jan 2006 17:57:29 -0000	1.7
@@ -1 +1 @@
-ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2
+4c06324355ba01a2a1cf1ad5b48f4c85  logjam-4.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 20:16:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu,  5 Jan 2006 15:16:05 -0500
Subject: rpms/svgalib/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200601052016.k05KGbV3002558@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2538

Modified Files:
	.cvsignore sources 
Log Message:
New upstream version, drop merged patches


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Aug 2005 09:37:40 -0000	1.2
+++ .cvsignore	5 Jan 2006 20:16:05 -0000	1.3
@@ -1 +1 @@
-svgalib-1.9.21.tar.gz
+svgalib-1.9.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Aug 2005 09:37:40 -0000	1.2
+++ sources	5 Jan 2006 20:16:05 -0000	1.3
@@ -1 +1 @@
-1bd8892ee38481051e4b4d85008c86be  svgalib-1.9.21.tar.gz
+3be376c08462caf88cfc150239481110  svgalib-1.9.24.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 16:54:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 11:54:19 -0500
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601051654.k05Gsqok024726@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24674/FC-3

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

Bump to 1.02



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Plugin-RetrieveAll.spec	7 Sep 2005 18:53:58 -0000	1.1
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.01
-Release:        3%{?dist}
+Version:        1.02
+Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
+- bump to 1.02
+
 * Wed Aug 31 2005 Paul Howarth <paul at city-fan.org> 1.01-3
 - remove redundant BR: perl
 - use %%{?_smp_mflags} with make in %%build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:53:58 -0000	1.2
+++ sources	5 Jan 2006 16:54:19 -0000	1.3
@@ -1 +1 @@
-27dd0db083dd0127a2704bf55c29b8a8  Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
+69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 17:14:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu,  5 Jan 2006 12:14:21 -0500
Subject: rpms/swatch/FC-4 swatch-3.1.1.patch,NONE,1.1 swatch.spec,1.8,1.9
Message-ID: <200601051714.k05HErVE026684@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/swatch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26643/FC-4

Modified Files:
	swatch.spec 
Added Files:
	swatch-3.1.1.patch 
Log Message:
Sync with devel

swatch-3.1.1.patch:

--- NEW FILE swatch-3.1.1.patch ---
diff -ruN swatch-3.1.1-orig/swatch swatch-3.1.1/swatch
--- swatch-3.1.1-orig/swatch	2004-07-19 21:14:54.000000000 +0100
+++ swatch-3.1.1/swatch	2005-08-29 20:52:13.000000000 +0100
@@ -32,7 +32,7 @@
 [ B<--input-record-separator> I<regex> ] 
 [ [ B<--examine> I<file_to_examine> ] 
 | [ B<--read-pipe> I<program_to_pipe_from> ] 
-| [ B<--tail> I<file_to_tail> ] ]
+| [ B<--tail-file> I<file_to_tail> ] ]
 [ B<--daemon> ] 
 [ B<--use-cpan-file-tail> ]
 [ B<--awk-field-syntax> ]
@@ -68,7 +68,7 @@
 
 Restart at the specified time where I<hh> is hours and I<mm> is minutes. 
 If the am/pm indicator is omitted, then a 24-hour clock is assumed. 
-If the time is preceeded by the "+" character, then the restart time 
+If the time is preceded by the "+" character, then the restart time 
 will be set to the current time plus the specified time and the am/pm
 indicator will be ignored.
 
@@ -124,18 +124,12 @@
 If swatch is called with no options, it is the same as typing the 
 command line
 
-=over 5
-
-=item
-
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog>
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/syslog
 
 or if /var/log/messages exists
 
-C<swatch --config-file=~/.swatchrc --tail-file=/var/log/messages>
-
+     swatch --config-file=~/.swatchrc --tail-file=/var/log/messages
 
-=back
 
 If the configuration file doesn't exist then the following configuration
 is used:
@@ -152,7 +146,7 @@
 
 Each line should contain a keyword and a, sometimes optional,
 value for that keyword. The keyword and value are separated by 
-space or an equal (=) sign.
+a space or an equal (=) sign.
 
 watchfor regex
 
@@ -162,7 +156,7 @@
 
 =item B<echo [modes]>
 
-.Echo the matched line. The text mode may be I<normal>,
+Echo the matched line. The text mode may be I<normal>,
 I<bold>, I<underscore>, I<blink>, I<inverse>, 
 I<black>, I<red>, I<green>, I<yellow>, I<blue>, I<magenta>, I<cyan>, I<white>,
 I<black_h>, I<red_h>, I<green_h>, I<yellow_h>, I<blue_h>, 
@@ -180,7 +174,7 @@
 Execute I<command>. The I<command> may contain variables which are 
 substituted with fields from the matched line. A I<$N> will be replaced
 by the I<Nth> field in the line. A I<$0> or I<$*> will be replaced by the
- entire line.
+entire line.
 
 =item B<mail [addresses=address:address:...][,subject=your_text_here]>
 
@@ -197,7 +191,7 @@
 
 Use B<write(1)> to send matched lines to I<user(s)>.
 
-=item B<throttle hours:minutes:seconds,[use=message|regex|<regex>]>
+=item B<throttle hours:minutes:seconds,[use=message|regex|<regexE<gt>]>
 
 Use this action to limit the number of times that the matched pattern 
 has actions performed on it.
@@ -205,7 +199,15 @@
 The B<use=regex> option will cause throttling to be based on the regular
 expression instead of the message.
 
-You can also specify a perl compliant regular expression as the value for B,use>. The default is use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)" causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
+You can also specify a perl compliant regular expression as the value for B<use>. The default is
+
+=over 4
+
+use="^\w{3}\s+\d{1,2}\s\d{2}:\d{2}:\d{2}\s+(.*)"
+
+=back
+
+and causes the key to be the syslog message without the timestamp. This is most useful when throttling non-syslog created files.
 
 =item B<threshold events:seconds,[repeat=no|yes]>
 
@@ -223,7 +225,7 @@
  
 Note that this is similar to, but different from, the standard "throttle"
 command, since "throttle" shows the first line and ignores the rest, while
-"threshold" shows the last line and ignores the preceeding (and optionally
+"threshold" shows the last line and ignores the preceding (and optionally
 the following).  However, an action like "threshold 1:120" should perform
 similarly to "throttle 0:2:0,use=regex" and has the advantage of not relying
 on a particular timestamp format in the source log entry.
@@ -268,9 +270,13 @@
 conditional used by the current watchfor statement, and 3=inside the throttle
 block).
 
-Its intended use is to permit variable substitution through use like.
+Its intended use is to permit variable substitution. For example:
+
+=over 4
+
+perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";
 
-C<perlcode $syslog="^\w{3}\s+\d{1,2}\s+\d{2}:\d{2}:\d{2}.*";>
+=back
  
 watchfor /$syslog hostname pppd/>
  
@@ -315,7 +321,7 @@
 
 =head1 NOTES
 
-Upon receiving a ALRM or HUP signal swatch will re-read the
+Upon receiving an ALRM or HUP signal swatch will re-read the
 configuration file and restart, except when used with the I<--daemon> 
 command line option where it will simply exit.
 Swatch will terminate gracefully
@@ -382,7 +388,8 @@
 my @Swatch_ARGV = join(' ', $0, @ARGV); # Save just in case we need to restart 
 (my $Me = $0) =~ s%.*/%%;	      # Strip the path off of the program name
 
-$SIG{'CHLD'} = 'IGNORE';
+#$SIG{'CHLD'} = 'IGNORE';
+$SIG{'CHLD'} = 'DEFAULT';
 
 my $DEF_CONFIG_FILE = "$ENV{'HOME'}/.swatchrc";
 my $DEF_INPUT;
@@ -406,13 +413,13 @@
     --config-file=FILENAME               Use FILENAME for configuration.
     --old-style-config                   Parse a pre-version 3 configuration.
     --restart-time=[+]HH:MM[AM|PM]       Send a HUP signal to swatch at the specified time.
-    --input-record-separator=REGEX       Specify an what should be used to separate "lines."
+    --input-record-separator=REGEX       Specify what should be used to separate "lines."
     --help                               Display this message.
     --version                            Display author and version information.
     --tail-file=FILENAME                 Watch a tail of FILENAME.
-    --read-pipe=COMMAND                  Watch a pipe from COMMAND
-    --examine=FILENAME                   Perform a single pass through FILENAME
-    --pid-file=FILENAME			 File to write pid of process to
+    --read-pipe=COMMAND                  Watch a pipe from COMMAND.
+    --examine=FILENAME                   Perform a single pass through FILENAME.
+    --pid-file=FILENAME			 File to write pid of process to.
     --use-cpan-file-tail                 Use the File::Tail CPAN module to read the log file.
 /;
 
@@ -566,8 +573,8 @@
     s/^\s+//; ## strip off leading blank space
     s/\s+$//; ## strip off trailing blank space
 
-    ### Skip comments blank lines ###
-    next if (/^\#/ or /^\s*$/);
+    ### Skip comments and blank lines ###
+    next if (/^\#/ or /^$/);
 
     s/\#.*$//; ## strip trailing comments
 
@@ -746,7 +753,8 @@
 /;
 
 \$SIG{'TERM'} = \$SIG{'HUP'} = 'goodbye';
-\$SIG{'CHLD'} = 'IGNORE';
+##\$SIG{'CHLD'} = 'IGNORE';
+\$SIG{'CHLD'} = 'DEFAULT';
 
 ## Constants
 (my \$Me = \$0) =~ s%.*/%%;
@@ -759,7 +767,7 @@
 my \$swatch_last_flush = time;
 
 use IO::Handle;
-STDOUT->autoflush(1);;
+STDOUT->autoflush(1);
 
 sub goodbye {
   \$| = 0;
@@ -959,8 +967,13 @@
     } else {
       my $opt = $v;
       $opt =~ s/@/\\@/g;
-      $opt =~ s/^['" ]*//;
-      $opt =~ s/['" ]*$//;
+#     $opt =~ s/^['" ]*//;
+#     $opt =~ s/['" ]*$//;
+      $opt =~ s/^\s+//o;
+      $opt =~ s/\s+$//o;
+      $opt = $1 if ($opt =~ /^['"]\s*(.*)\s*['"]$/o);
+      $opt =~ s/"/\\"/go;
+
       if ($actinfo->{$key}{'def_arg'} eq 'MODES') { 
         ## Modes are processed as an array ##
 	push(@{$options{$actinfo->{$key}{'def_arg'}}}, $opt);
@@ -1038,7 +1051,7 @@
   }
 #  $command =~ s/\$([0-9]+)/\$_[$1]/g;
 
-  return join(' ', @new_cmd);;
+  return join(' ', @new_cmd);
 }
 
  


Index: swatch.spec
===================================================================
RCS file: /cvs/extras/rpms/swatch/FC-4/swatch.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- swatch.spec	12 May 2005 23:27:11 -0000	1.8
+++ swatch.spec	5 Jan 2006 17:14:21 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           swatch
 Version:        3.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tool for actively monitoring log files
 
 Group:          Applications/File
 License:        GPL
 URL:            http://swatch.sourceforge.net/
 Source0:        http://dl.sf.net/swatch/swatch-3.1.1.tar.gz
+Patch0:         swatch-3.1.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 chmod 644 tools/*
 
 %build
@@ -39,7 +41,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check ||:
+%check
 make test
 
 
@@ -58,6 +60,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-4
+- Patch supplied by John Horne: doc updates and $0 handling (#160817).
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-3
 - Add dist tag.
 



From fedora-extras-commits at redhat.com  Thu Jan  5 20:23:26 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu,  5 Jan 2006 15:23:26 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.5,1.6
Message-ID: <200601052023.k05KNwkl002658@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2641

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdesklets.spec	5 Jan 2006 20:00:39 -0000	1.5
+++ gdesklets.spec	5 Jan 2006 20:23:25 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.2
-Release:        25%{?dist}
+Release:        26%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -99,7 +99,10 @@
 
 
 %changelog
-* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-26.fc5
+- Minor rebuilt
+
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
 - Rebuilt against libgtop2-devel
 - Changed url of the provider
 



From fedora-extras-commits at redhat.com  Thu Jan  5 17:57:17 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 12:57:17 -0500
Subject: rpms/logjam/FC-3 logjam-4.5.2-gtkhtml38.patch, NONE, 1.1 logjam.spec,
	1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200601051757.k05HvnmP027930@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/logjam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27869/FC-3

Modified Files:
	logjam.spec sources 
Added Files:
	logjam-4.5.2-gtkhtml38.patch 
Log Message:

Bump to 4.5.2


logjam-4.5.2-gtkhtml38.patch:

--- NEW FILE logjam-4.5.2-gtkhtml38.patch ---
--- logjam-4.5.2/configure.in.BAD	2006-01-05 11:45:05.000000000 -0600
+++ logjam-4.5.2/configure.in	2006-01-05 11:46:58.000000000 -0600
@@ -74,21 +74,29 @@
                    [compile with GtkSpell support (default autodetect)]),
     gtkspell-2.0)
 
-  LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
-    AC_HELP_STRING([--with-gtkhtml36],
-                   [compile with GtkHtml3.6 support (default autodetect)]),
-    libgtkhtml-3.6)
-  if test "$with_gtkhtml36" = "yes"; then
-    with_gtkhtml="3.6"
+  LJ_PKG_ARG_WITH(gtkhtml38, GTKHTML38,
+    AC_HELP_STRING([--with-gtkhtml38],
+                   [compile with GtkHtml3.8 support (default autodetect)]),   
+    libgtkhtml-3.8)
+  if test "$with_gtkhtml38" = "yes"; then
+    with_gtkhtml="3.8"
   else
-    LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
-      AC_HELP_STRING([--with-gtkhtml30],
-                     [compile with GtkHtml3.0 support (default autodetect)]),
-      libgtkhtml-3.0)
-    if test "$with_gtkhtml30" = "yes"; then
-      with_gtkhtml="3.0"
+    LJ_PKG_ARG_WITH(gtkhtml36, GTKHTML36,
+      AC_HELP_STRING([--with-gtkhtml36],
+                     [compile with GtkHtml3.6 support (default autodetect)]),
+      libgtkhtml-3.6)
+    if test "$with_gtkhtml36" = "yes"; then
+      with_gtkhtml="3.6"
     else
-      with_gtkhtml="no"
+      LJ_PKG_ARG_WITH(gtkhtml30, GTKHTML30,
+        AC_HELP_STRING([--with-gtkhtml30],
+                       [compile with GtkHtml3.0 support (default autodetect)]),
+        libgtkhtml-3.0)
+      if test "$with_gtkhtml30" = "yes"; then
+        with_gtkhtml="3.0"
+      else
+        with_gtkhtml="no"
+      fi
     fi
   fi
   if test "$with_gtkhtml" != "no"; then


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- logjam.spec	6 Sep 2005 22:02:24 -0000	1.12
+++ logjam.spec	5 Jan 2006 17:57:17 -0000	1.13
@@ -1,8 +1,8 @@
 %define use_xmms 1
 
 Name:		logjam
-Version:	4.5.1
-Release:	5%{?dist}
+Version:	4.5.2
+Release:	1%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPL
@@ -18,11 +18,11 @@
 BuildRequires:	libsoup-devel, gnutls-devel, libgcrypt-devel
 Obsoletes:	loserjabber, logjam-gnome
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0:		logjam-4.4.1-offline-segfaultfix.patch
 Patch2:		logjam-4.4.1-backdated.patch
 Patch3:		logjam-4.4.1-cleanups.patch
 Patch4:		logjam-4.4.1-fedora-desktop.patch
 Patch5:		logjam-4.5-patch8-manfix.patch
+Patch6:		logjam-4.5.2-gtkhtml38.patch
 
 %description
 This is the new GTK2 client for LiveJournal (http://www.livejournal.com).
@@ -41,13 +41,14 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .offline-segfaultfix
 %patch2 -p1 -b .backdated
 %patch3 -p1 -b .cleanups
 %patch4 -p1 -b .desktop
 %patch5 -p1 -b .manfix
+%patch6 -p1 -b .gtkhtml38
 
 %build
+autoconf
 %configure \
 %if %{use_xmms}
 	--with-xmms
@@ -82,6 +83,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.2-1
+- bump to 4.5.2
+
 * Tue Sep  6 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1:4.5.1-5
 - add BR: libgcrypt-devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/logjam/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Sep 2005 22:02:24 -0000	1.6
+++ sources	5 Jan 2006 17:57:17 -0000	1.7
@@ -1 +1 @@
-ccae70dc36644cd1529c581443484ebe  logjam-4.5.1.tar.bz2
+4c06324355ba01a2a1cf1ad5b48f4c85  logjam-4.5.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 18:59:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 13:59:31 -0500
Subject: rpms/perl-CGI-Untaint/FC-3 perl-CGI-Untaint.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200601051900.k05J04Dp030095@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30042/FC-3

Modified Files:
	perl-CGI-Untaint.spec sources 
Log Message:

bump to 1.26



Index: perl-CGI-Untaint.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-3/perl-CGI-Untaint.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint.spec	18 Aug 2005 03:28:34 -0000	1.1
+++ perl-CGI-Untaint.spec	5 Jan 2006 18:59:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint
-Version:        1.25
-Release:        3%{?dist}
+Version:        1.26
+Release:        1%{?dist}
 Summary:        Process CGI input parameters
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.26-1
+- bump to 1.26
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.25-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:28:34 -0000	1.2
+++ sources	5 Jan 2006 18:59:31 -0000	1.3
@@ -1 +1 @@
-f75b2641202e441a16db5040c37170c0  CGI-Untaint-1.25.tar.gz
+1ed11830476470d4895b632bf2222606  CGI-Untaint-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 21:00:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 16:00:44 -0500
Subject: rpms/perl-Class-DBI-AsForm/FC-3 perl-Class-DBI-AsForm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601052101.k05L1ET2004855@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188/FC-3

Modified Files:
	perl-Class-DBI-AsForm.spec sources 
Log Message:

Bump to 2.42



Index: perl-Class-DBI-AsForm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-3/perl-Class-DBI-AsForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AsForm.spec	8 Sep 2005 15:22:24 -0000	1.1
+++ perl-Class-DBI-AsForm.spec	5 Jan 2006 21:00:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AsForm
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.42
+Release:        1%{?dist}
 Summary:        Produce HTML form elements for database columns
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,7 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
-BuildRequires:  perl(DBD::SQLite2)
+BuildRequires:  perl(DBD::SQLite)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.42-1
+- bump to 2.42
+
 * Wed Sep  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.41-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:22:24 -0000	1.2
+++ sources	5 Jan 2006 21:00:42 -0000	1.3
@@ -1 +1 @@
-123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz
+5799ef3305aff13b911b2f13f36951f5  Class-DBI-AsForm-2.42.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 21:00:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 16:00:49 -0500
Subject: rpms/perl-Class-DBI-AsForm/FC-4 perl-Class-DBI-AsForm.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601052101.k05L1Lqn004859@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188/FC-4

Modified Files:
	perl-Class-DBI-AsForm.spec sources 
Log Message:

Bump to 2.42



Index: perl-Class-DBI-AsForm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-4/perl-Class-DBI-AsForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AsForm.spec	8 Sep 2005 15:22:24 -0000	1.1
+++ perl-Class-DBI-AsForm.spec	5 Jan 2006 21:00:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AsForm
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.42
+Release:        1%{?dist}
 Summary:        Produce HTML form elements for database columns
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,7 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
-BuildRequires:  perl(DBD::SQLite2)
+BuildRequires:  perl(DBD::SQLite)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.42-1
+- bump to 2.42
+
 * Wed Sep  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.41-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:22:24 -0000	1.2
+++ sources	5 Jan 2006 21:00:49 -0000	1.3
@@ -1 +1 @@
-123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz
+5799ef3305aff13b911b2f13f36951f5  Class-DBI-AsForm-2.42.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 21:00:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 16:00:55 -0500
Subject: rpms/perl-Class-DBI-AsForm/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-AsForm.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601052101.k05L1RJI004864@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AsForm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3188/devel

Modified Files:
	.cvsignore perl-Class-DBI-AsForm.spec sources 
Log Message:

Bump to 2.42



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:22:24 -0000	1.2
+++ .cvsignore	5 Jan 2006 21:00:55 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-AsForm-2.41.tar.gz
+Class-DBI-AsForm-2.42.tar.gz


Index: perl-Class-DBI-AsForm.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/perl-Class-DBI-AsForm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AsForm.spec	8 Sep 2005 15:22:24 -0000	1.1
+++ perl-Class-DBI-AsForm.spec	5 Jan 2006 21:00:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AsForm
-Version:        2.41
-Release:        3%{?dist}
+Version:        2.42
+Release:        1%{?dist}
 Summary:        Produce HTML form elements for database columns
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,7 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(HTML::Element), perl(Class::DBI::Plugin::Type)
-BuildRequires:  perl(DBD::SQLite2)
+BuildRequires:  perl(DBD::SQLite)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.42-1
+- bump to 2.42
+
 * Wed Sep  7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.41-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AsForm/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:22:24 -0000	1.2
+++ sources	5 Jan 2006 21:00:55 -0000	1.3
@@ -1 +1 @@
-123ef74dd79a632b881189334cfa6827  Class-DBI-AsForm-2.41.tar.gz
+5799ef3305aff13b911b2f13f36951f5  Class-DBI-AsForm-2.42.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan  5 22:09:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 17:09:33 -0500
Subject: rpms/lincity-ng/FC-3 lincity-ng-1.0.2-gcc4.patch, NONE,
	1.1 lincity-ng.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601052210.k05MAsq1007164@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7086/FC-3

Modified Files:
	lincity-ng.spec sources 
Added Files:
	lincity-ng-1.0.2-gcc4.patch 
Log Message:

bump to 1.0.2


lincity-ng-1.0.2-gcc4.patch:

--- NEW FILE lincity-ng-1.0.2-gcc4.patch ---
--- lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp.BAD	2006-01-05 15:32:35.000000000 -0600
+++ lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp	2006-01-05 15:32:40.000000000 -0600
@@ -62,7 +62,7 @@
   int previousTool;
   int lastShownTechType;
  
-  std::string ButtonPanel::createTooltip( int module, bool root = true );
+  std::string createTooltip( int module, bool root = true );
   std::vector<std::string> mMenuButtons;
   std::vector<std::string> mMenus;
   std::vector<std::string> mButtons;


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lincity-ng.spec	5 Oct 2005 15:09:54 -0000	1.2
+++ lincity-ng.spec	5 Jan 2006 22:09:28 -0000	1.3
@@ -1,17 +1,18 @@
 Name:		lincity-ng
-Version:	1.0.1
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
-Source0:	http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
+Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -60,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- bump to 1.0.2
+
 * Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-3
 - add Requires: kdelibs to resolve bz 169941
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2005 21:59:13 -0000	1.2
+++ sources	5 Jan 2006 22:09:28 -0000	1.3
@@ -1 +1 @@
-1576a0765eb29a668f7af3084de00739  lincity-ng-1.0.1.tar.bz2
+3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 22:10:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 17:10:25 -0500
Subject: rpms/lincity-ng/devel lincity-ng-1.0.2-gcc4.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 lincity-ng.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601052211.k05MBEpI007171@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7086/devel

Modified Files:
	.cvsignore lincity-ng.spec sources 
Added Files:
	lincity-ng-1.0.2-gcc4.patch 
Log Message:

bump to 1.0.2


lincity-ng-1.0.2-gcc4.patch:

--- NEW FILE lincity-ng-1.0.2-gcc4.patch ---
--- lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp.BAD	2006-01-05 15:32:35.000000000 -0600
+++ lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp	2006-01-05 15:32:40.000000000 -0600
@@ -62,7 +62,7 @@
   int previousTool;
   int lastShownTechType;
  
-  std::string ButtonPanel::createTooltip( int module, bool root = true );
+  std::string createTooltip( int module, bool root = true );
   std::vector<std::string> mMenuButtons;
   std::vector<std::string> mMenus;
   std::vector<std::string> mButtons;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Sep 2005 21:59:13 -0000	1.2
+++ .cvsignore	5 Jan 2006 22:10:07 -0000	1.3
@@ -1 +1,2 @@
 lincity-ng-1.0.1.tar.bz2
+lincity-ng-1.0.2.tar.bz2


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lincity-ng.spec	5 Oct 2005 15:09:55 -0000	1.2
+++ lincity-ng.spec	5 Jan 2006 22:10:07 -0000	1.3
@@ -1,17 +1,19 @@
 Name:		lincity-ng
-Version:	1.0.1
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
-Source0:	http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
-BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
+BuildRequires:	SDL_ttf-devel, desktop-file-utils
+BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
+Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -29,6 +31,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -60,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- bump to 1.0.2
+
 * Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-3
 - add Requires: kdelibs to resolve bz 169941
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2005 21:59:13 -0000	1.2
+++ sources	5 Jan 2006 22:10:07 -0000	1.3
@@ -1 +1 @@
-1576a0765eb29a668f7af3084de00739  lincity-ng-1.0.1.tar.bz2
+3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan  5 22:09:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 17:09:49 -0500
Subject: rpms/lincity-ng/FC-4 lincity-ng-1.0.2-gcc4.patch, NONE,
	1.1 lincity-ng.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601052211.k05MBEds007170@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7086/FC-4

Modified Files:
	lincity-ng.spec sources 
Added Files:
	lincity-ng-1.0.2-gcc4.patch 
Log Message:

bump to 1.0.2


lincity-ng-1.0.2-gcc4.patch:

--- NEW FILE lincity-ng-1.0.2-gcc4.patch ---
--- lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp.BAD	2006-01-05 15:32:35.000000000 -0600
+++ lincity-ng-1.0.2/src/lincity-ng/ButtonPanel.hpp	2006-01-05 15:32:40.000000000 -0600
@@ -62,7 +62,7 @@
   int previousTool;
   int lastShownTechType;
  
-  std::string ButtonPanel::createTooltip( int module, bool root = true );
+  std::string createTooltip( int module, bool root = true );
   std::vector<std::string> mMenuButtons;
   std::vector<std::string> mMenus;
   std::vector<std::string> mButtons;


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lincity-ng.spec	5 Oct 2005 15:09:54 -0000	1.2
+++ lincity-ng.spec	5 Jan 2006 22:09:49 -0000	1.3
@@ -1,17 +1,18 @@
 Name:		lincity-ng
-Version:	1.0.1
-Release:	3%{?dist}
+Version:	1.0.2
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
 URL:		http://lincity-ng.berlios.de/
-Source0:	http://download.berlios.de/lincity-ng/lincity-ng-1.0.1.tar.bz2
+Source0:	http://download.berlios.de/lincity-ng/lincity-ng-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
+Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -60,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
+- bump to 1.0.2
+
 * Wed Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.1-3
 - add Requires: kdelibs to resolve bz 169941
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Sep 2005 21:59:13 -0000	1.2
+++ sources	5 Jan 2006 22:09:49 -0000	1.3
@@ -1 +1 @@
-1576a0765eb29a668f7af3084de00739  lincity-ng-1.0.1.tar.bz2
+3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan  6 00:31:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:31:03 -0500
Subject: rpms/lincity-ng/devel lincity-ng.spec,1.3,1.4
Message-ID: <200601060031.k060Vgiv011704@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11650/devel

Modified Files:
	lincity-ng.spec 
Log Message:

Missing BR for devel



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lincity-ng.spec	5 Jan 2006 22:10:07 -0000	1.3
+++ lincity-ng.spec	6 Jan 2006 00:31:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -10,7 +10,7 @@
 BuildRequires:	jam, physfs-devel, zlib-devel, libxml2-devel
 BuildRequires:	SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_gfx-devel
 BuildRequires:	SDL_ttf-devel, desktop-file-utils
-BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel
+BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
 Patch0:		lincity-ng-1.0.2-gcc4.patch
@@ -63,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-2
+- FC5: BR: mesa-libGLU-devel
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
 - bump to 1.0.2
 



From fedora-extras-commits at redhat.com  Fri Jan  6 00:30:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:30:30 -0500
Subject: rpms/lincity-ng/FC-3 lincity-ng.spec,1.3,1.4
Message-ID: <200601060031.k060VoCC011709@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11650/FC-3

Modified Files:
	lincity-ng.spec 
Log Message:

Missing BR for devel



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lincity-ng.spec	5 Jan 2006 22:09:28 -0000	1.3
+++ lincity-ng.spec	6 Jan 2006 00:30:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -62,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-2
+- FC5: BR: mesa-libGLU-devel
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
 - bump to 1.0.2
 



From fedora-extras-commits at redhat.com  Fri Jan  6 00:30:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:30:48 -0500
Subject: rpms/lincity-ng/FC-4 lincity-ng.spec,1.3,1.4
Message-ID: <200601060031.k060VoKe011712@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11650/FC-4

Modified Files:
	lincity-ng.spec 
Log Message:

Missing BR for devel



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lincity-ng.spec	5 Jan 2006 22:09:49 -0000	1.3
+++ lincity-ng.spec	6 Jan 2006 00:30:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		lincity-ng
 Version:	1.0.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -62,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-2
+- FC5: BR: mesa-libGLU-devel
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-1
 - bump to 1.0.2
 



From fedora-extras-commits at redhat.com  Fri Jan  6 00:48:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:48:07 -0500
Subject: rpms/comical/FC-4 comical-0.7-jpe.patch, NONE,
	1.1 comical-0.7-nostrip.patch, NONE,
	1.1 comical-0.7-optflags.patch, NONE, 1.1 comical.spec, 1.5,
	1.6 sources, 1.2, 1.3
Message-ID: <200601060048.k060mdVv011929@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11875/FC-4

Modified Files:
	comical.spec sources 
Added Files:
	comical-0.7-jpe.patch comical-0.7-nostrip.patch 
	comical-0.7-optflags.patch 
Log Message:

Update to 0.7


comical-0.7-jpe.patch:

--- NEW FILE comical-0.7-jpe.patch ---
--- comical-0.7/src/ComicBookZIP.cpp.BAD	2006-01-05 17:39:58.000000000 -0600
+++ comical-0.7/src/ComicBookZIP.cpp	2006-01-05 17:40:31.000000000 -0600
@@ -47,7 +47,7 @@
 	wxZipEntry *entry;
 	while ((entry = zipFile->GetNextEntry()) != NULL) {
 		page = entry->GetName();
-		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 			page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 			page.Right(4).Upper() == wxT(".GIF") ||
 			page.Right(4).Upper() == wxT(".PNG"))
--- comical-0.7/src/ComicBookRAR.cpp.BAD	2006-01-05 18:00:37.000000000 -0600
+++ comical-0.7/src/ComicBookRAR.cpp	2006-01-05 18:00:48.000000000 -0600
@@ -63,7 +63,7 @@
 #else
 		page = wxString(HeaderData.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))

comical-0.7-nostrip.patch:

--- NEW FILE comical-0.7-nostrip.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:17:52.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:17:59.000000000 -0600
@@ -14,7 +14,6 @@
 
 comical: $(ALL.O) unrar/libunrar.a
 	$(CC) -o $@ $(ALL.O) $(LDFLAGS)
-	$(STRIP) $@
 
 unrar/libunrar.a:
 	$(MAKE) lib -C unrar -f makefile.linux

comical-0.7-optflags.patch:

--- NEW FILE comical-0.7-optflags.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:08:30.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:08:45.000000000 -0600
@@ -1,7 +1,7 @@
 CC = `wx-config --cxx`
 LD = `wx-config --ld`
 INCLUDE = -Iunrar
-CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE)
+CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE) $(RPM_OPT_FLAGS)
 LDFLAGS = `wx-config --libs` -Lunrar -lunrar
 STRIP = strip
 
--- comical-0.7/unrar/makefile.linux.BAD	2006-01-05 18:15:53.000000000 -0600
+++ comical-0.7/unrar/makefile.linux	2006-01-05 18:16:03.000000000 -0600
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/comical.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comical.spec	4 Jun 2005 16:48:34 -0000	1.5
+++ comical.spec	6 Jan 2006 00:48:06 -0000	1.6
@@ -1,23 +1,25 @@
 Name: comical
-Version: 0.4
-Release: 9%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://jathey.home.comcast.net/comical-0.4.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
 Source1: comical.png
 Source2: comical.desktop
 Patch0: comical-0.4-bracket.patch
 Patch1: comical-0.4-sort.patch
 Patch2: comical-0.4-nounrar.patch
 Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.4-jpe.patch
+Patch4: comical-0.7-jpe.patch
 Patch5: comical-0.4-minfix.patch
+Patch6: comical-0.7-optflags.patch
+Patch7: comical-0.7-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
-Requires: unzip, bzip2
+Requires: unzip
 
 %description
 Comical is a fully featured GUI comic book viewer using wxWidgets. It 
@@ -27,19 +29,21 @@
 %prep
 %setup -q
 #%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
-%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m0755 comical $RPM_BUILD_ROOT%{_bindir}
 
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor fedora                            \
@@ -58,6 +62,11 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- bump to 0.7
+- disable all the sort patches, the 0.7 sort is no better than the 
+  original 0.4 sort, but they changed how they did it, so the old sort
+  patches would have to be reworked... and I'm not motivated right now.
 * Sat Jun  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-9
 - fix x86_64 by not using std::min
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2005 03:49:47 -0000	1.2
+++ sources	6 Jan 2006 00:48:06 -0000	1.3
@@ -1 +1 @@
-ad7c93b5527b2ea4fde2bbed6eab920c  comical-0.4.tar.gz
+b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 00:48:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu,  5 Jan 2006 19:48:13 -0500
Subject: rpms/comical/devel comical-0.7-jpe.patch, NONE,
	1.1 comical-0.7-nostrip.patch, NONE,
	1.1 comical-0.7-optflags.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 comical.spec, 1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200601060048.k060mjUp011934@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11875/devel

Modified Files:
	.cvsignore comical.spec sources 
Added Files:
	comical-0.7-jpe.patch comical-0.7-nostrip.patch 
	comical-0.7-optflags.patch 
Log Message:

Update to 0.7


comical-0.7-jpe.patch:

--- NEW FILE comical-0.7-jpe.patch ---
--- comical-0.7/src/ComicBookZIP.cpp.BAD	2006-01-05 17:39:58.000000000 -0600
+++ comical-0.7/src/ComicBookZIP.cpp	2006-01-05 17:40:31.000000000 -0600
@@ -47,7 +47,7 @@
 	wxZipEntry *entry;
 	while ((entry = zipFile->GetNextEntry()) != NULL) {
 		page = entry->GetName();
-		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(	page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 			page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 			page.Right(4).Upper() == wxT(".GIF") ||
 			page.Right(4).Upper() == wxT(".PNG"))
--- comical-0.7/src/ComicBookRAR.cpp.BAD	2006-01-05 18:00:37.000000000 -0600
+++ comical-0.7/src/ComicBookRAR.cpp	2006-01-05 18:00:48.000000000 -0600
@@ -63,7 +63,7 @@
 #else
 		page = wxString(HeaderData.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(5).Upper() == wxT(".TIFF") || page.Right(4).Upper() == wxT(".TIF") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))

comical-0.7-nostrip.patch:

--- NEW FILE comical-0.7-nostrip.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:17:52.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:17:59.000000000 -0600
@@ -14,7 +14,6 @@
 
 comical: $(ALL.O) unrar/libunrar.a
 	$(CC) -o $@ $(ALL.O) $(LDFLAGS)
-	$(STRIP) $@
 
 unrar/libunrar.a:
 	$(MAKE) lib -C unrar -f makefile.linux

comical-0.7-optflags.patch:

--- NEW FILE comical-0.7-optflags.patch ---
--- comical-0.7/Makefile.BAD	2006-01-05 18:08:30.000000000 -0600
+++ comical-0.7/Makefile	2006-01-05 18:08:45.000000000 -0600
@@ -1,7 +1,7 @@
 CC = `wx-config --cxx`
 LD = `wx-config --ld`
 INCLUDE = -Iunrar
-CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE)
+CFLAGS =  `wx-config --cxxflags` -O2 -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRARDLL -D_UNIX $(INCLUDE) $(RPM_OPT_FLAGS)
 LDFLAGS = `wx-config --libs` -Lunrar -lunrar
 STRIP = strip
 
--- comical-0.7/unrar/makefile.linux.BAD	2006-01-05 18:15:53.000000000 -0600
+++ comical-0.7/unrar/makefile.linux	2006-01-05 18:16:03.000000000 -0600
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2005 03:49:47 -0000	1.2
+++ .cvsignore	6 Jan 2006 00:48:12 -0000	1.3
@@ -1 +1,2 @@
 comical-0.4.tar.gz
+comical-0.7.tar.gz


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/comical.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comical.spec	4 Jun 2005 16:48:34 -0000	1.5
+++ comical.spec	6 Jan 2006 00:48:12 -0000	1.6
@@ -1,23 +1,25 @@
 Name: comical
-Version: 0.4
-Release: 9%{?dist}
+Version: 0.7
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://jathey.home.comcast.net/comical-0.4.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
 Source1: comical.png
 Source2: comical.desktop
 Patch0: comical-0.4-bracket.patch
 Patch1: comical-0.4-sort.patch
 Patch2: comical-0.4-nounrar.patch
 Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.4-jpe.patch
+Patch4: comical-0.7-jpe.patch
 Patch5: comical-0.4-minfix.patch
+Patch6: comical-0.7-optflags.patch
+Patch7: comical-0.7-nostrip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
-Requires: unzip, bzip2
+Requires: unzip
 
 %description
 Comical is a fully featured GUI comic book viewer using wxWidgets. It 
@@ -27,19 +29,21 @@
 %prep
 %setup -q
 #%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
 %patch4 -p1
-%patch5 -p1
+#%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
-%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m0755 comical $RPM_BUILD_ROOT%{_bindir}
 
 install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor fedora                            \
@@ -58,6 +62,11 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1
+- bump to 0.7
+- disable all the sort patches, the 0.7 sort is no better than the 
+  original 0.4 sort, but they changed how they did it, so the old sort
+  patches would have to be reworked... and I'm not motivated right now.
 * Sat Jun  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.4-9
 - fix x86_64 by not using std::min
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2005 03:49:47 -0000	1.2
+++ sources	6 Jan 2006 00:48:12 -0000	1.3
@@ -1 +1 @@
-ad7c93b5527b2ea4fde2bbed6eab920c  comical-0.4.tar.gz
+b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 01:04:43 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu,  5 Jan 2006 20:04:43 -0500
Subject: rpms/ldns import.log,1.2,1.3
Message-ID: <200601060105.k0615F9x013920@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886

Modified Files:
	import.log 
Log Message:
auto-import ldns-1.0.1-1 on branch devel from ldns-1.0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ldns/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Dec 2005 04:08:01 -0000	1.2
+++ import.log	6 Jan 2006 01:04:20 -0000	1.3
@@ -1 +1,2 @@
 ldns-1_0_0-5:HEAD:ldns-1.0.0-5.src.rpm:1134446913
+ldns-1_0_1-1:HEAD:ldns-1.0.1-1.src.rpm:1136509466



From fedora-extras-commits at redhat.com  Fri Jan  6 01:05:03 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu,  5 Jan 2006 20:05:03 -0500
Subject: rpms/ldns/devel .cvsignore, 1.2, 1.3 ldns.spec, 1.6, 1.7 sources,
	1.2, 1.3
Message-ID: <200601060105.k0615a4H013925@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13886/devel

Modified Files:
	.cvsignore ldns.spec sources 
Log Message:
auto-import ldns-1.0.1-1 on branch devel from ldns-1.0.1-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Dec 2005 04:08:25 -0000	1.2
+++ .cvsignore	6 Jan 2006 01:05:03 -0000	1.3
@@ -1 +1 @@
-ldns-1.0.0.tar.gz
+ldns-1.0.1.tar.gz


Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/ldns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ldns.spec	19 Dec 2005 02:39:14 -0000	1.6
+++ ldns.spec	6 Jan 2006 01:05:03 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.0.0
-Release: 8%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -25,13 +25,9 @@
 
 %prep
 %setup -q 
-# only for 1.0.0, since upstream left .o files in release and 'make clean'
-# won't work without the Makefile.
-rm drill/*.o
-
-rm config.sub config.guess
-libtoolize
-autoreconf
+
+#libtoolize
+#autoreconf
 
 %configure
 
@@ -81,6 +77,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+- Upgraded to 1.0.1. Removed temporary clean hack from spec file.
+
 * Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8
 - Cannot use make clean because there are no Makefiles. Use hardcoded rm.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 04:08:25 -0000	1.2
+++ sources	6 Jan 2006 01:05:03 -0000	1.3
@@ -1 +1 @@
-bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz
+39210ff3bb2673d57e024f7908d31be5  ldns-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 08:56:49 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  6 Jan 2006 03:56:49 -0500
Subject: rpms/perl-MailTools/devel .cvsignore, 1.5, 1.6 perl-MailTools.spec, 
	1.12, 1.13 sources, 1.5, 1.6
Message-ID: <200601060857.k068vLF0027277@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27256

Modified Files:
	.cvsignore perl-MailTools.spec sources 
Log Message:
* Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.71-1
- 1.71.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Jul 2005 11:15:37 -0000	1.5
+++ .cvsignore	6 Jan 2006 08:56:48 -0000	1.6
@@ -1 +1 @@
-MailTools-1.67.tar.gz
+MailTools-1.71.tar.gz


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-MailTools.spec	14 Dec 2005 21:09:15 -0000	1.12
+++ perl-MailTools.spec	6 Jan 2006 08:56:48 -0000	1.13
@@ -1,7 +1,7 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
-Version:        1.67
-Release:        2%{?dist}
+Version:        1.71
+Release:        1%{?dist}
 
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.71-1
+- 1.71.
+
 * Wed Dec 14 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.67-2
 - Fix demo scripts.
 - Sync with fedora-rpmdevtools' perl spec template.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Jul 2005 11:15:37 -0000	1.5
+++ sources	6 Jan 2006 08:56:48 -0000	1.6
@@ -1 +1 @@
-7871c38e42792c5e0920b3817e1523fd  MailTools-1.67.tar.gz
+f42de7cd61246870b9c08369fd4a5e60  MailTools-1.71.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 09:29:34 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Fri,  6 Jan 2006 04:29:34 -0500
Subject: rpms/monotone/FC-4 .cvsignore, 1.5, 1.6 monotone.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200601060930.k069U7sg029570@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29549

Modified Files:
	.cvsignore monotone.spec sources 
Log Message:
Update to 0.25


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Dec 2005 02:38:33 -0000	1.5
+++ .cvsignore	6 Jan 2006 09:29:34 -0000	1.6
@@ -1 +1 @@
-monotone-0.24.tar.gz
+monotone-0.25.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- monotone.spec	13 Dec 2005 07:33:54 -0000	1.12
+++ monotone.spec	6 Jan 2006 09:29:34 -0000	1.13
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.24
+Version: 0.25
 Release: 1%{?dist}
 
 Summary: A free, distributed version control system
@@ -162,6 +162,9 @@
 
 
 %changelog
+* Thu Jan  5 2006 Roland McGrath <roland at redhat.com> - 0.25-1
+- Updated for 0.25 release.
+
 * Sun Dec 11 2005 Roland McGrath <roland at redhat.com> - 0.24-1
 - Updated for 0.24 release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Dec 2005 02:38:33 -0000	1.5
+++ sources	6 Jan 2006 09:29:34 -0000	1.6
@@ -1 +1 @@
-8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz
+fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 10:27:47 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Fri,  6 Jan 2006 05:27:47 -0500
Subject: rpms/monotone/FC-4 monotone-xfail-if-root.patch, 1.2,
	1.3 monotone.spec, 1.13, 1.14
Message-ID: <200601061028.k06ASKRb031558@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31536

Modified Files:
	monotone.spec 
Added Files:
	monotone-xfail-if-root.patch 
Log Message:
Test suite patch for mock builds to cope

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: monotone-xfail-if-root.patch
diff -N monotone-xfail-if-root.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ monotone-xfail-if-root.patch	6 Jan 2006 10:27:47 -0000	1.3
@@ -0,0 +1,22 @@
+--- monotone-0.23/testsuite
++++ monotone-0.23/testsuite
+@@ -67479,7 +67479,7 @@ $at_traceon
+     at_desc='checkout validates target directory'
+     $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
+     at_xfail=no
+-      test -O / && at_xfail=yes
++      test -w test_dir4 && at_xfail=yes
+     (
+       echo "64. t_checkout_dir.at:1: testing ..."
+       $at_traceon
+--- monotone-0.23/tests/t_checkout_dir.at
++++ monotone-0.23/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- monotone.spec	6 Jan 2006 09:29:34 -0000	1.13
+++ monotone.spec	6 Jan 2006 10:27:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,6 +12,8 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
+Patch1: monotone-xfail-if-root.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -59,6 +61,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
 	   --with-bundled-sqlite=%{bundled_sqlite}
@@ -162,6 +166,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
+- Restore testsuite fix for nonroot owner of / in build chroot.
+
 * Thu Jan  5 2006 Roland McGrath <roland at redhat.com> - 0.25-1
 - Updated for 0.25 release.
 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:00:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 06:00:54 -0500
Subject: rpms/wine/FC-3 .cvsignore, 1.2, 1.3 sources, 1.3,
	1.4 wine-winemine.desktop, 1.1, 1.2 wine.spec, 1.4, 1.5
Message-ID: <200601061101.k06B1QWP000997@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31800/FC-3

Modified Files:
	.cvsignore sources wine-winemine.desktop wine.spec 
Log Message:
- upgrade
- bugfix #177089



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:32:54 -0000	1.2
+++ .cvsignore	6 Jan 2006 11:00:54 -0000	1.3
@@ -1 +1,2 @@
-Wine-20030911.tar.gz
+wine-0.9.5.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jan 2006 09:31:09 -0000	1.3
+++ sources	6 Jan 2006 11:00:54 -0000	1.4
@@ -1,2 +1,2 @@
-73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine-winemine.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine-winemine.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winemine.desktop	2 Jan 2006 09:31:09 -0000	1.1
+++ wine-winemine.desktop	6 Jan 2006 11:00:54 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Game;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine.spec	4 Jan 2006 00:52:54 -0000	1.4
+++ wine.spec	6 Jan 2006 11:00:54 -0000	1.5
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.4
-Release:	5%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -49,7 +49,7 @@
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -307,6 +307,7 @@
 %{_libdir}/wine/winemenubuilder.exe.so
 %{_libdir}/wine/winevdm.exe.so
 %{_libdir}/wine/winecfg.exe.so
+%{_libdir}/wine/uninstaller.exe.so
 %{_datadir}/applications/fedora-wine.desktop
 %{_datadir}/applications/fedora-wine-regedit.desktop
 %{_datadir}/applications/fedora-wine-uninstaller.desktop
@@ -599,7 +600,6 @@
 %{_libdir}/wine/notepad.exe.so
 %{_libdir}/wine/progman.exe.so
 %{_libdir}/wine/taskmgr.exe.so
-%{_libdir}/wine/uninstaller.exe.so
 %{_libdir}/wine/wcmd.exe.so
 %{_libdir}/wine/winedbg.exe.so
 %{_libdir}/wine/winefile.exe.so
@@ -675,6 +675,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-1
+- version upgrade
+- fix #177089
+
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-5
 - fix #176834 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:01:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 06:01:00 -0500
Subject: rpms/wine/FC-4 .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 wine-winemine.desktop, 1.1, 1.2 wine.spec, 1.6, 1.7
Message-ID: <200601061101.k06B1Wt0001003@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31800/FC-4

Modified Files:
	sources wine-winemine.desktop wine.spec 
Added Files:
	.cvsignore 
Log Message:
- upgrade
- bugfix #177089



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	6 Jan 2006 11:01:00 -0000	1.4
@@ -0,0 +1,2 @@
+wine-0.9.5.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 09:24:37 -0000	1.4
+++ sources	6 Jan 2006 11:01:00 -0000	1.5
@@ -1,2 +1,2 @@
-73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine-winemine.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine-winemine.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winemine.desktop	2 Jan 2006 09:24:37 -0000	1.1
+++ wine-winemine.desktop	6 Jan 2006 11:01:00 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Game;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wine.spec	4 Jan 2006 00:53:00 -0000	1.6
+++ wine.spec	6 Jan 2006 11:01:00 -0000	1.7
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.4
-Release:	5%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -49,7 +49,7 @@
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -675,6 +675,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-1
+- version upgrade
+- fix #177089 (winemine desktop entry should be in Game not in System)
+
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-5
 - fix #176834 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:01:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 06:01:06 -0500
Subject: rpms/wine/devel .cvsignore, 1.3, 1.4 sources, 1.4,
	1.5 wine-winemine.desktop, 1.1, 1.2 wine.spec, 1.6, 1.7
Message-ID: <200601061101.k06B1dEi001021@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31800/devel

Modified Files:
	sources wine-winemine.desktop wine.spec 
Added Files:
	.cvsignore 
Log Message:
- upgrade
- bugfix #177089



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	6 Jan 2006 11:01:06 -0000	1.4
@@ -0,0 +1,2 @@
+wine-0.9.5.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 09:04:37 -0000	1.4
+++ sources	6 Jan 2006 11:01:06 -0000	1.5
@@ -1,2 +1,2 @@
-73205d83a5612a43441a8532683c0434  wine-0.9.4.tar.bz2
+b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
 fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz


Index: wine-winemine.desktop
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine-winemine.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-winemine.desktop	2 Jan 2006 09:04:37 -0000	1.1
+++ wine-winemine.desktop	6 Jan 2006 11:01:06 -0000	1.2
@@ -5,4 +5,4 @@
 Terminal=false
 Type=Application
 Encoding=UTF-8
-Categories=Application;System;
+Categories=Application;Game;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wine.spec	4 Jan 2006 00:53:06 -0000	1.6
+++ wine.spec	6 Jan 2006 11:01:06 -0000	1.7
@@ -1,12 +1,14 @@
+%define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
+
 Name:		wine
-Version:	0.9.4
-Release:	5%{?dist}
+Version:	0.9.5
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.4.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -53,7 +55,7 @@
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
-Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database, %{__perl}
+Requires(postun): /sbin/ldconfig, /usr/bin/update-desktop-database
 
 %description
 While Wine is usually thought of as a Windows(TM) emulator, the Wine
@@ -679,6 +681,12 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-1
+- version upgrade
+- fix #177089 (winemine desktop entry should be in Game not in System)
+- fix cflags for compile
+
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>     
 0.9.4-5                                                                 
 - fix #176834 



From fedora-extras-commits at redhat.com  Fri Jan  6 11:19:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Jan 2006 06:19:12 -0500
Subject: fedora-security/audit fc4,1.116,1.117 fc5,1.27,1.28
Message-ID: <200601061119.k06BJCXG001246@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1226

Modified Files:
	fc4 fc5 
Log Message:
Deal with new updates, bad ordering in fc4, and a stock of new fc4
releases, although we'll need to fill in their real FEDORA-2006 id's when
I've looked them up



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc4	5 Jan 2006 13:01:32 -0000	1.116
+++ fc4	6 Jan 2006 11:19:04 -0000	1.117
@@ -1,12 +1,12 @@
-Up to date CVE as of CVE email 20060104
-Up to date FC4 as of 20060104
+Up to date CVE as of CVE email 20060105
+Up to date FC4 as of 20060105 (except netpbm)
 
 ** are items that need attention
 
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176813
-CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
@@ -18,28 +18,10 @@
 CVE-2005-4130 ** (HelixPlayer) no information available
 CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 backport (curl) [since FEDORA-2005-1137]
-CVE-2005-3896 ignore (mozilla) recoverable DoS only
-CVE-2005-3651 VULNERABLE (ethereal)
-CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
-CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3964 VULNERABLE (openmotif) bz#174815
 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144]
 CVE-2005-3912 backport (perl) [since FEDORA-2005-1144]
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3883 VULNERABLE (php)
 CVE-2005-3858 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
 CVE-2005-3857 VULNERABLE (kernel, fixed 2.6.15)
@@ -59,8 +41,13 @@
 CVE-2005-3675 VULNERABLE (kernel) optack
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
+CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
+CVE-2005-3627 backport (cups) [since FEDORA-2005-000**]
+CVE-2005-3626 backport (cups) [since FEDORA-2005-000**]
+CVE-2005-3625 backport (cups) [since FEDORA-2005-000**]
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman)
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067]
@@ -70,12 +57,14 @@
 CVE-2005-3390 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3389 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
+CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]
 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-3322 version (squid, not upstream) SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
-CVE-2005-3313 VULNERABLE (ethereal)
+CVE-2005-3313 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-3276 version (kernel, fixed 2.6.12.4) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3275 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3274 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]
@@ -93,9 +82,21 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
-CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1122]
-CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1122]
-CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1122]
+CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
 CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- fc5	5 Jan 2006 13:01:32 -0000	1.27
+++ fc5	6 Jan 2006 11:19:04 -0000	1.28
@@ -29,6 +29,9 @@
 CVE-2005-4077 VULNERABLE (curl)
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
@@ -65,6 +68,7 @@
 CVE-2005-3675 VULNERABLE (kernel) optack
 CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
 CVE-2005-3662 version (netpbm)
+CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3582 version (ImageMagick) gentoo only



From fedora-extras-commits at redhat.com  Fri Jan  6 11:34:11 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Fri,  6 Jan 2006 06:34:11 -0500
Subject: rpms/monotone/devel monotone-xfail-if-root.patch, 1.2,
	1.3 .cvsignore, 1.5, 1.6 monotone.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200601061134.k06BYhsN001323@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1296

Modified Files:
	.cvsignore monotone.spec sources 
Added Files:
	monotone-xfail-if-root.patch 
Log Message:
Update to 0.25

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: monotone-xfail-if-root.patch
diff -N monotone-xfail-if-root.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ monotone-xfail-if-root.patch	6 Jan 2006 11:34:11 -0000	1.3
@@ -0,0 +1,22 @@
+--- monotone-0.23/testsuite
++++ monotone-0.23/testsuite
+@@ -67479,7 +67479,7 @@ $at_traceon
+     at_desc='checkout validates target directory'
+     $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
+     at_xfail=no
+-      test -O / && at_xfail=yes
++      test -w test_dir4 && at_xfail=yes
+     (
+       echo "64. t_checkout_dir.at:1: testing ..."
+       $at_traceon
+--- monotone-0.23/tests/t_checkout_dir.at
++++ monotone-0.23/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Dec 2005 07:35:07 -0000	1.5
+++ .cvsignore	6 Jan 2006 11:34:11 -0000	1.6
@@ -1 +1 @@
-monotone-0.24.tar.gz
+monotone-0.25.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- monotone.spec	18 Dec 2005 06:15:35 -0000	1.8
+++ monotone.spec	6 Jan 2006 11:34:11 -0000	1.9
@@ -1,5 +1,5 @@
 Name: monotone
-Version: 0.24
+Version: 0.25
 Release: 2%{?dist}
 
 Summary: A free, distributed version control system
@@ -12,7 +12,7 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
-Patch1: monotone-0.24-gcc41.patch
+Patch1: monotone-xfail-if-root.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -166,8 +166,11 @@
 
 
 %changelog
-* Sat Dec 17 2005 Roland McGrath <roland at redhat.com> - 0.24-2
-- Patched to work with gcc 4.1.
+* Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
+- Restore testsuite fix for nonroot owner of / in build chroot.
+
+* Thu Jan  5 2006 Roland McGrath <roland at redhat.com> - 0.25-1
+- Updated for 0.25 release.
 
 * Sun Dec 11 2005 Roland McGrath <roland at redhat.com> - 0.24-1
 - Updated for 0.24 release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Dec 2005 07:35:07 -0000	1.5
+++ sources	6 Jan 2006 11:34:11 -0000	1.6
@@ -1 +1 @@
-8193203c8b48104500d956f9e524bfcd  monotone-0.24.tar.gz
+fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 12:34:06 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri,  6 Jan 2006 07:34:06 -0500
Subject: rpms/yumex/devel .cvsignore, 1.7, 1.8 sources, 1.10, 1.11 yumex.spec,
	1.10, 1.11
Message-ID: <200601061234.k06CYdAH004592@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4569

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
New Release 0.45-02


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	20 Dec 2005 17:15:19 -0000	1.7
+++ .cvsignore	6 Jan 2006 12:34:06 -0000	1.8
@@ -1 +1 @@
-yumex-0.45-1.tar.gz
+yumex-0.45-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	20 Dec 2005 17:15:19 -0000	1.10
+++ sources	6 Jan 2006 12:34:06 -0000	1.11
@@ -1 +1 @@
-ada14317266254793e180a4e32c5408a  yumex-0.45-1.tar.gz
+9c064934cf21ca340b45ff13ca232e55  yumex-0.45-2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- yumex.spec	20 Dec 2005 17:15:19 -0000	1.10
+++ yumex.spec	6 Jan 2006 12:34:06 -0000	1.11
@@ -1,8 +1,8 @@
-%define   build_v 1
+%define   build_v 3
 
 Name:     yumex
 Version:  0.45
-Release:  1.0%{?dist}
+Release:  3.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,7 +67,12 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Tue Dec 20 2005 Tim Lauridsen <tla at rasmil.dk> - 0.44-1.0
+* Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-3.0
+- Development Release 0.45-3.0
+* Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-2.0
+- Development Release 0.45-2.0
+- Lot of changes, check the changelog.
+* Tue Dec 20 2005 Tim Lauridsen <tla at rasmil.dk> - 0.45-1.0
 - Development Release 0.45-1.0
 - Changed to work with yum 2.5.0
 - Requires: yum >= 2.5



From fedora-extras-commits at redhat.com  Fri Jan  6 12:35:45 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri,  6 Jan 2006 07:35:45 -0500
Subject: rpms/yumex/devel yumex.spec,1.11,1.12
Message-ID: <200601061236.k06CaIIp004644@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4627

Modified Files:
	yumex.spec 
Log Message:
New Release 0.45-02


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yumex.spec	6 Jan 2006 12:34:06 -0000	1.11
+++ yumex.spec	6 Jan 2006 12:35:45 -0000	1.12
@@ -1,8 +1,8 @@
-%define   build_v 3
+%define   build_v 2
 
 Name:     yumex
 Version:  0.45
-Release:  3.0%{?dist}
+Release:  2.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
@@ -67,8 +67,6 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-3.0
-- Development Release 0.45-3.0
 * Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-2.0
 - Development Release 0.45-2.0
 - Lot of changes, check the changelog.



From fedora-extras-commits at redhat.com  Fri Jan  6 12:58:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri,  6 Jan 2006 07:58:03 -0500
Subject: rpms/wine/devel wine.spec,1.7,1.8
Message-ID: <200601061258.k06CwZik004823@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4806

Modified Files:
	wine.spec 
Log Message:
- test new BR



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine.spec	6 Jan 2006 11:01:06 -0000	1.7
+++ wine.spec	6 Jan 2006 12:58:02 -0000	1.8
@@ -52,6 +52,10 @@
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
 
+BuildRequires:  fontconfig-devel
+BuildRequires:  giflib-devel
+BuildRequires:  cups-devel
+
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
 Requires(preun): /sbin/chkconfig
@@ -154,7 +158,8 @@
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 %configure \
-	--sysconfdir=%{_sysconfdir}/wine --disable-static
+	--sysconfdir=%{_sysconfdir}/wine --disable-static \
+	--x-includes=%{_includedir} --x-libraries=%{_libdir}
 
 %{__make} depend
 %{__make}
@@ -686,6 +691,7 @@
 - version upgrade
 - fix #177089 (winemine desktop entry should be in Game not in System)
 - fix cflags for compile
+- test new BR
 
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>     
 0.9.4-5                                                                 



From fedora-extras-commits at redhat.com  Fri Jan  6 13:12:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 08:12:24 -0500
Subject: rpms/gift/devel gift.spec,1.1,1.2 giftd.sh,1.1,1.2
Message-ID: <200601061313.k06DDEoB006587@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6568

Modified Files:
	gift.spec giftd.sh 
Log Message:
* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
- giftd.sh (wrapper): pass on command-line params/options



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gift.spec	20 Dec 2005 14:24:40 -0000	1.1
+++ gift.spec	6 Jan 2006 13:12:24 -0000	1.2
@@ -10,7 +10,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
+- giftd.sh (wrapper): pass on command-line params/options
+
 * Wed Dec 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-3
 - --enable-libmagic (on platforms where file > 4 available)
 


Index: giftd.sh
===================================================================
RCS file: /cvs/extras/rpms/gift/devel/giftd.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- giftd.sh	20 Dec 2005 14:24:40 -0000	1.1
+++ giftd.sh	6 Jan 2006 13:12:24 -0000	1.2
@@ -17,4 +17,4 @@
 fi
 
 # Hopefully we're good to go now
-exec ${GIFTD} 
+exec ${GIFTD} ${1+"$@"}



From fedora-extras-commits at redhat.com  Fri Jan  6 13:14:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 08:14:44 -0500
Subject: rpms/gift/FC-4 gift.spec,1.1,1.2 giftd.sh,1.1,1.2
Message-ID: <200601061315.k06DFHmn006663@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gift/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6637

Modified Files:
	gift.spec giftd.sh 
Log Message:
* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
- giftd.sh (wrapper): pass on command-line params/options



Index: gift.spec
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-4/gift.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gift.spec	20 Dec 2005 14:24:40 -0000	1.1
+++ gift.spec	6 Jan 2006 13:14:44 -0000	1.2
@@ -10,7 +10,7 @@
 Name:	 gift
 Summary: Daemon for communicating with filesharing protocols
 Version: 0.11.8.1
-Release: 3%{?dist} 
+Release: 4%{?dist} 
 
 License: GPL
 Group:	 System Environment/Daemons
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-4
+- giftd.sh (wrapper): pass on command-line params/options
+
 * Wed Dec 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.11.8.1-3
 - --enable-libmagic (on platforms where file > 4 available)
 


Index: giftd.sh
===================================================================
RCS file: /cvs/extras/rpms/gift/FC-4/giftd.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- giftd.sh	20 Dec 2005 14:24:40 -0000	1.1
+++ giftd.sh	6 Jan 2006 13:14:44 -0000	1.2
@@ -17,4 +17,4 @@
 fi
 
 # Hopefully we're good to go now
-exec ${GIFTD} 
+exec ${GIFTD} ${1+"$@"}



From fedora-extras-commits at redhat.com  Fri Jan  6 13:35:49 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:35:49 -0500
Subject: rpms/streamtuner - New directory
Message-ID: <200601061335.k06DZp7h006885@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6877/streamtuner

Log Message:
Directory /cvs/extras/rpms/streamtuner added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 13:35:55 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:35:55 -0500
Subject: rpms/streamtuner/devel - New directory
Message-ID: <200601061335.k06DZvkn006900@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6877/streamtuner/devel

Log Message:
Directory /cvs/extras/rpms/streamtuner/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 13:36:17 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:36:17 -0500
Subject: rpms/streamtuner Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061336.k06DaJ9S006939@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927

Added Files:
	Makefile import.log 
Log Message:
Setup of module streamtuner


--- NEW FILE Makefile ---
# Top level Makefile for module streamtuner
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 13:36:23 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:36:23 -0500
Subject: rpms/streamtuner/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061336.k06DaPOJ006959@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6927/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module streamtuner


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 13:37:41 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:37:41 -0500
Subject: rpms/streamtuner import.log,1.1,1.2
Message-ID: <200601061338.k06DcE5L007071@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7023

Modified Files:
	import.log 
Log Message:
auto-import streamtuner-0.99.99-6.fc4 on branch devel from streamtuner-0.99.99-6.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 13:36:16 -0000	1.1
+++ import.log	6 Jan 2006 13:37:41 -0000	1.2
@@ -0,0 +1 @@
+streamtuner-0_99_99-6_fc4:HEAD:streamtuner-0.99.99-6.fc4.src.rpm:1136554650



From fedora-extras-commits at redhat.com  Fri Jan  6 13:37:47 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:37:47 -0500
Subject: rpms/streamtuner/devel streamtuner-0.99.99-defaultconfig.patch, NONE,
	1.1 streamtuner-0.99.99-live365.patch, NONE,
	1.1 streamtuner-0.99.99-pkgconfig.patch, NONE,
	1.1 streamtuner-0.99.99-pygtk-2.6.patch, NONE,
	1.1 streamtuner.png, NONE, 1.1 streamtuner.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061338.k06DcKOQ007075@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7023/devel

Modified Files:
	.cvsignore sources 
Added Files:
	streamtuner-0.99.99-defaultconfig.patch 
	streamtuner-0.99.99-live365.patch 
	streamtuner-0.99.99-pkgconfig.patch 
	streamtuner-0.99.99-pygtk-2.6.patch streamtuner.png 
	streamtuner.spec 
Log Message:
auto-import streamtuner-0.99.99-6.fc4 on branch devel from streamtuner-0.99.99-6.fc4.src.rpm

streamtuner-0.99.99-defaultconfig.patch:

--- NEW FILE streamtuner-0.99.99-defaultconfig.patch ---
--- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
@@ -1410,8 +1410,8 @@
   init_handler();
 
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
 
   return TRUE;
 }

--- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
@@ -1057,8 +1057,8 @@
 
   init_handler();
 
-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
 
   return TRUE;
 }

--- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
@@ -959,9 +959,9 @@
 
   init_handler();
   
-  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
 
   return TRUE;
 }

--- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
@@ -957,7 +957,7 @@
   init_handler();
 
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
 
   return TRUE;
 }

--- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
@@ -123,7 +123,7 @@
 {
   actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
   st_action_register("view-ghelp", _("Open a GNOME help document"), "yelp %q");
 }
 

--- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
@@ -390,9 +390,9 @@
 {
   st_preselections_init_handler();
   
-  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
-  st_action_register("view-web", _("Open a web page"), "epiphany %q");
+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
 }
 
 void

streamtuner-0.99.99-live365.patch:

--- NEW FILE streamtuner-0.99.99-live365.patch ---
--- src/plugins/live365/live365.c.orig	Wed May 11 03:49:30 2005
+++ src/plugins/live365/live365.c	Wed May 11 03:51:11 2005
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2003, 2004 Jean-Yves Lefort
+ * Copyright (C) 2002-2005 Jean-Yves Lefort
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,9 @@
 {
   ACCESS_ALL,
   ACCESS_VIP,
-  ACCESS_SUBSCRIPTION
+  ACCESS_SUBSCRIPTION,
+  ACCESS_SOLD_OUT,
+  ACCESS_UNKNOWN
 } Access;
 
 typedef struct
@@ -94,7 +96,8 @@
 {
   GList			**streams;
   Live365Stream		*stream;
-  Live365Stream		*finished_stream;
+  gboolean		first_page;
+  gboolean		looped;
   gboolean		has_next_page;
 } ReloadStreamsInfo;
 
@@ -263,13 +266,16 @@
 
     case FIELD_ACCESS_STRING:
       {
-	const char *str = NULL;
+	const char *str;
 
 	switch (stream->access)
 	  {
 	  case ACCESS_ALL:		str = _("All"); break;
 	  case ACCESS_VIP:		str = _("VIP"); break;
 	  case ACCESS_SUBSCRIPTION:	str = _("Subscription"); break;
+	  case ACCESS_SOLD_OUT:		str = _("Sold out"); break;
+	  case ACCESS_UNKNOWN:		str = _("Unknown"); break;
+	  default:			str = NULL; break;
 	  }
 
 	g_value_set_string(value, str);
@@ -707,14 +713,16 @@
   char *s1, *s2, *s3, *s4, *s5;
 
   if ((s1 = st_strstr_span(line, "<a href=\"/cgi-bin/directory"))
-      && (s2 = st_strstr_span(s1, "&genre="))
+      && (s2 = st_strstr_span(s1, "genre="))
       && (s3 = strchr(s2, '"'))
       && (s4 = st_strchr_span(s3, '>'))
       && (s5 = strstr(s4, "</a>")))
     {
       category = st_category_new();
       category->name = g_strndup(s2, s3 - s2);
-      category->label = st_sgml_ref_expand_len(s4, s5 - s4);
+      category->label = ! strcmp(category->name, "Recommendations")
+	? g_strdup(_("Recommendations"))
+	: st_sgml_ref_expand_len(s4, s5 - s4);
       category->url_postfix = g_strconcat(DIRECTORY_PREFIX, category->name, NULL);
     }
   else if ((s1 = st_strstr_span(line, "<a href=\"/genres/"))
@@ -755,6 +763,8 @@
 
   *streams = NULL;
   info.streams = streams;
+  info.first_page = TRUE;
+  info.looped = FALSE;
 
   session = st_transfer_session_new();
 
@@ -802,9 +812,11 @@
 	  if (status) /* only display warning if the transfer was otherwise correct */
 	    PARSE_ERROR;
 	}
+
+      info.first_page = FALSE;
     }
-  while (status && info.has_next_page
-	 && (stream_limit == -1 || received_streams < stream_limit));
+  while (status && info.has_next_page && ! info.looped
+	  && (stream_limit == -1 || received_streams < stream_limit));
 
   st_transfer_session_free(session);
 
@@ -818,6 +830,10 @@
   char *s1, *s2, *s3, *s4, *s5, *s6, *s7;
   char *word1, *word2, *word3;
 
+  /* if we have detected a loop, we just ignore the page */
+  if (info->looped)
+    return;
+
   if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"icon\""))
       && (s2 = st_strstr_span(s1, "DrawPlayIcon")))
     {
@@ -834,15 +850,18 @@
 	info->stream->access = ACCESS_VIP;
       else if (strstr(s2, "'SUBSCRIPTION'"))
 	info->stream->access = ACCESS_SUBSCRIPTION;
+      else if (strstr(s2, "'SOLD_OUT'"))
+	info->stream->access = ACCESS_SOLD_OUT;
       else
-	PARSE_ERROR;
-
-      info->finished_stream = NULL;
+	{
+	  PARSE_ERROR;
+	  info->stream->access = ACCESS_UNKNOWN;
+	}
     }
   else if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"title"))
-      && (s2 = st_strstr_span(s1, "href='"))
-      && (s3 = strstr(s2, "'>"))
-      && (s4 = strstr(s3, "</a>")))
+	   && (s2 = st_strstr_span(s1, "href='"))
+	   && (s3 = strstr(s2, "'>"))
+	   && (s4 = strstr(s3, "</a>")))
     {
       if (info->stream)
 	{
@@ -865,12 +884,19 @@
       else
 	PARSE_ERROR;
     }
-  else if ((s1 = st_strstr_span(line, "&station_id="))
-	   && (s2 = strchr(s1, '&')))
+  else if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"handle\""))
+	   && (s2 = st_strstr_span(s1, "ReadCookie("))
+	   && (s3 = st_strstr_span(s2, ", '"))
+	   && (s4 = strchr(s3, '\''))
+	   && (s5 = st_strstr_span(s4, "&station_id="))
+	   && (s6 = strchr(s5, '&')))
     {
       if (info->stream)
 	{
-	  word1 = g_strndup(s1, s2 - s1);
+	  g_free(info->stream->broadcaster);
+	  info->stream->broadcaster = st_sgml_ref_expand_len(s3, s4 - s3);
+
+	  word1 = g_strndup(s5, s6 - s5);
 	  if (st_str_like(word1, ST_NUMERIC))
 	    info->stream->station_id = atoi(word1);
 	  g_free(word1);
@@ -878,34 +904,23 @@
       else
 	PARSE_ERROR;
     }
-  else if ((s1 = st_strstr_span(line, "alt=\"More broadcaster info"))
-	   && (s2 = st_strchr_span(s1, '>'))
-	   && (s3 = strstr(s2, "</a>")))
-    {
-      if (info->stream)
-	{
-	  g_free(info->stream->broadcaster);
-	  info->stream->broadcaster = st_sgml_ref_expand_len(s2, s3 - s2);
-	}
-      else
-	PARSE_ERROR;
-    }
   else if ((s1 = st_str_has_prefix_span(line, "<TD  CLASS=\"connection\""))
 	   && (s2 = st_strchr_span(s1, '>'))
-	   && (s3 = strstr(s2, "<br>"))
-	   && ((s4 = strstr(s3, "<img src='/images/mp3pro"))
-	       || (s4 = strstr(s3, "</TD>"))))
+	   && (s3 = strchr(s2, '<')))
     {
       if (info->stream)
 	{
 	  word1 = st_sgml_ref_expand_len(s2, s3 - s2);
-	  s3 += 4; word2 = st_sgml_ref_expand_len(s3, s4 - s3);
-	  
+
 	  g_free(info->stream->audio);
-	  info->stream->audio = g_strdup_printf(g_str_has_prefix(s4, "</TD>") ? "%s %s" : "%s %s, MP3Pro", word2, word1);
 
-	  g_free(word1);
-	  g_free(word2);
+	  if (strstr(s3, "<img src='/images/mp3pro"))
+	    {
+	      info->stream->audio = g_strdup_printf("%s, MP3Pro", word1);
+	      g_free(word1);
+	    }
+	  else
+	    info->stream->audio = word1;
 	}
       else
 	PARSE_ERROR;
@@ -947,12 +962,17 @@
       else
 	PARSE_ERROR;
     }
-  else if (strstr(line, "TD  CLASS=\"tabledesc2\""))
+  else if ((s1 = st_strstr_span(line, "<TD  CLASS=\"desc\"")))
     {
       if (info->stream)
 	{
 	  if (info->stream->station_id)
 	    {
+	      if ((s2 = st_strstr_span(s1, "<a class='desc-link' href='"))
+		  && (s3 = st_strchr_span(s2, '>'))
+		  && (s4 = strstr(s3, "<BR>")))
+		info->stream->description = st_sgml_ref_expand_len(s3, s4 - s3);
+
 	      ((STStream *) info->stream)->name = g_strdup_printf("%i", info->stream->station_id);
 	      *(info->streams) = g_list_append(*(info->streams), info->stream);
 	    }
@@ -962,23 +982,23 @@
 	      stream_free_cb(info->stream, NULL);
 	    }
 
-	  info->finished_stream = info->stream;
 	  info->stream = NULL;
 	}
       else
 	PARSE_ERROR;
     }
-  else if ((s1 = st_strstr_span(line, "<a class='desc-link' href='"))
-	   && (s2 = st_strchr_span(s1, '>'))
-	   && (s3 = strstr(s2, "<BR>")))
-    {
-      if (info->finished_stream)
-	{
-	  info->finished_stream->description = st_sgml_ref_expand_len(s2, s3 - s2);
-	  info->finished_stream = NULL;
+  else if ((s1 = st_strstr_span(line, "<TD class=\"pagination\""))
+	   && (s2 = st_strstr_span(s1, ">Showing "))
+	   && (s3 = strchr(s2, '-')))
+    {
+      word1 = g_strndup(s2, s3 - s2);
+      if (st_str_like(word1, ST_NUMERIC))
+	{
+	  int n = atoi(word1);
+	  if (n == 1 && ! info->first_page)
+	    info->looped = TRUE;
 	}
-      else
-	PARSE_ERROR;
+      g_free(word1);
     }
   else if (strstr(line, "Next</A>"))
     info->has_next_page = TRUE;

streamtuner-0.99.99-pkgconfig.patch:

--- NEW FILE streamtuner-0.99.99-pkgconfig.patch ---
diff -Nur streamtuner-0.99.99-orig/data/streamtuner.pc.in streamtuner-0.99.99/data/streamtuner.pc.in
--- streamtuner-0.99.99-orig/data/streamtuner.pc.in	2004-12-11 03:03:20.000000000 +0100
+++ streamtuner-0.99.99/data/streamtuner.pc.in	2006-01-01 01:33:39.000000000 +0100
@@ -1,9 +1,8 @@
 prefix=@prefix@
 includedir=@includedir@/streamtuner
-oldincludedir=@includedir@
 
 Name: @PACKAGE@
 Description: A stream directory browser
 Version: @VERSION@
 Requires: gmodule-2.0 gtk+-2.0
-Cflags: -I${includedir} -I${oldincludedir}
+Cflags: -I${includedir}

streamtuner-0.99.99-pygtk-2.6.patch:

--- NEW FILE streamtuner-0.99.99-pygtk-2.6.patch ---
--- src/plugins/python/pst-main.c.orig	Thu Mar 24 15:52:58 2005
+++ src/plugins/python/pst-main.c	Thu Mar 24 15:53:59 2005
@@ -94,6 +94,7 @@
 {
   gboolean status = FALSE;
   PyObject *module;
+  char *argv[] = { "" };
 
   if (! check_api_version(err))
     return FALSE;
@@ -109,6 +110,7 @@
     }
 
   Py_Initialize();
+  PySys_SetArgv(G_N_ELEMENTS(argv), argv);
   PyEval_InitThreads();
 
   module = PyImport_AddModule("__main__");


--- NEW FILE streamtuner.spec ---
Summary: A stream directory browser
Name: streamtuner
Version: 0.99.99
Release: 6%{?dist}
URL: http://streamtuner.sourceforge.net
Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
Source1: %{name}.png
Patch0: %{name}-%{version}-live365.patch
Patch1: %{name}-%{version}-pygtk-2.6.patch
Patch2: %{name}-%{version}-defaultconfig.patch
Patch3: %{name}-%{version}-pkgconfig.patch
License: BSD
Group: Applications/Internet
Requires: python, pygtk2, htmlview, bmp, xterm
Requires(post): desktop-file-utils, scrollkeeper
Requires(postun): desktop-file-utils, scrollkeeper
BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel
BuildRequires: gettext, desktop-file-utils
Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                
BuildRoot: %{_tmppath}/%{name}-%{version}-root

%description 
Streamtuner is a stream directory browser,
it offers an intuitive GTK+ 2.0 interface
to Internet radio directories such as SHOUTcast and Live365

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

%description devel
Streamtuner is a stream directory browser,
it offers an intuitive GTK+ 2.0 interface
to Internet radio directories such as SHOUTcast and Live365
This package contains the libraries and includes files necessary
to develop applications for Streamtuner

%prep
%setup -q
%patch0 -p0 -b .%{name}-%{version}-live365
%patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
%patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
%patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}

%makeinstall
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -D -m644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
%{__rm} -rf %{buildroot}%{_localstatedir}
%{__rm} -f %{buildroot}%{_datadir}/applications/%{name}.desktop
%{__rm} -f %{buildroot}%{_libdir}/%{name}/plugins/*.*a

cat > %{name}.desktop << EOF
[Desktop Entry]
Encoding=UTF-8
StartupNotify=true
Name=Streamtuner
Comment=A stream directory browser.
Exec=%{name}
Icon=%{name}.png
Terminal=false
Type=Application
EOF
mkdir -p %{buildroot}%{_datadir}/applications 
desktop-file-install --vendor=fedora         \
  --dir %{buildroot}%{_datadir}/applications \
  --add-category X-Fedora                    \
  --add-category Application                 \
  --add-category AudioVideo                  \
  %{name}.desktop

%find_lang %{name}

%post
scrollkeeper-update -q || :

%postun
scrollkeeper-update -q || :

%clean
%{__rm} -rf %{buildroot}

%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING NEWS README TODO
%{_bindir}/%{name}
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/plugins
%{_libdir}/%{name}/plugins/*.so
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%dir %{_datadir}/omf/%{name}
%{_datadir}/omf/%{name}/*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/gtk-doc/html/*
%dir %{_datadir}/help
%{_datadir}/help/*


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


%changelog
* Mon Jan  2 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-6
- redundant dependencies removed
- useless update-desktop-database call removed
- pkgconfig.patch added
 
* Thu Dec 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-5
- defaultconfig patch for htmlview and beep-media-player
- htmlview, bmp and xterm added to deps
- more cleanups

* Mon Dec 19 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-4
- more cleanups
- libxml2-devel and desktop-file-utils added to BuildRequires

* Sun Dec 18 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-3
- cleanups

* Wed Jun 29 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-2.fc4
- update-desktop-database added to post and postun

* Thu Jun 16 2005 Matthias Haase <matthias_haase at bennewitz.com> - 0.99-1
- Update to 0.99.99
- File list changed
- Patches added
- Rebuild for Fedora Core 4

* Wed Nov 10 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Added libidn and libidn-devel
- Rebuild for Fedora Core 3

* Sat Oct 23 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.99
- Many changes because the plugins have been now included in the core distribution
- Taglib and taglib-devel added to deps

* Wed Aug 11 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.5
_ Category changed to AudioVideo for desktop link

* Tue Aug 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.4
- ChangeLog removed from the documentation

* Thu Jun 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for Fedora Core 2

* Tue May 12 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.3

* Fri Apr 02 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.12.1
- scrollkeeper and some cleanups

* Wed Feb 18 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.11.1

* Sat Jan 03 2004 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.2

* Sun Nov 09 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for Fedora Core 1

* Mon Sep 29 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.1
- Some new translations

* Wed Jul 16 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Update to 0.10.0
- Theme directorys are removed and some cleanups are done

* Sat Apr 05 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild of 0.9.1 for RH9

* Tue Mar 18 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Rebuild for 0.9.1

* Sun Feb 02 2003 Matthias Haase <matthias_haase at bennewitz.com>
- Changes in order to match the GNU build system
- Split into binary/devel packages
- Rebuild for 0.9.0

* Wed Dec 25 2002 Matthias Haase <matthias_haase at bennewitz.com>
- Some cleanups in order to match RH8
- smp flag added
- RPM_OPT_FLAGS added
- debugging disabled

* Sat Oct 29 2002 Rudolf Kastl
- Cosmetical changes.

* Sat Oct 05 2002 Rudolf Kastl
- Minor fixes and new version.

* Wed Aug 21 2002 Rudolf Kastl
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 13:36:22 -0000	1.1
+++ .cvsignore	6 Jan 2006 13:37:47 -0000	1.2
@@ -0,0 +1 @@
+streamtuner-0.99.99.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 13:36:22 -0000	1.1
+++ sources	6 Jan 2006 13:37:47 -0000	1.2
@@ -0,0 +1 @@
+2027b7c34e85b594524b0b4351c14362  streamtuner-0.99.99.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 13:56:30 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 08:56:30 -0500
Subject: owners owners.list,1.500,1.501
Message-ID: <200601061357.k06Dv3B8007255@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7214

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -r1.500 -r1.501
--- owners.list	5 Jan 2006 17:51:25 -0000	1.500
+++ owners.list	6 Jan 2006 13:56:30 -0000	1.501
@@ -1339,3 +1339,4 @@
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
+Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:02 -0500
Subject: rpms/akode - New directory
Message-ID: <200601061449.k06En4pT009120@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9112/akode

Log Message:
Directory /cvs/extras/rpms/akode added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:07 -0500
Subject: rpms/akode/devel - New directory
Message-ID: <200601061449.k06En9Xe009135@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9112/akode/devel

Log Message:
Directory /cvs/extras/rpms/akode/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:19 -0500
Subject: rpms/akode Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061449.k06EnLig009169@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9157

Added Files:
	Makefile import.log 
Log Message:
Setup of module akode


--- NEW FILE Makefile ---
# Top level Makefile for module akode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 14:49:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:49:25 -0500
Subject: rpms/akode/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601061449.k06EnR0j009189@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9157/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module akode


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 14:50:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:50:12 -0500
Subject: rpms/akode import.log,1.1,1.2
Message-ID: <200601061450.k06Eoi0k009261@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9223

Modified Files:
	import.log 
Log Message:
auto-import akode-2.0-1 on branch devel from akode-2.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/akode/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 14:49:19 -0000	1.1
+++ import.log	6 Jan 2006 14:50:11 -0000	1.2
@@ -0,0 +1 @@
+akode-2_0-1:HEAD:akode-2.0-1.src.rpm:1136559007



From fedora-extras-commits at redhat.com  Fri Jan  6 14:50:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:50:18 -0500
Subject: rpms/akode/devel akode.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601061450.k06EooiZ009265@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/akode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9223/devel

Modified Files:
	.cvsignore sources 
Added Files:
	akode.spec 
Log Message:
auto-import akode-2.0-1 on branch devel from akode-2.0-1.src.rpm


--- NEW FILE akode.spec ---

Summary: Audio-decoding framework 
Name:	 akode 
Version: 2.0 
Release: 1%{?dist}
License: LGPL
Group: 	 System Environment/Libraries
URL:	 http://carewolf.com/akode/  
#URL:	 http://www.kde-apps.org/content/show.php?content=30375
Source:	 http://www.kde-apps.org/content/files/30375-akode-2.0.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: automake
BuildRequires: alsa-lib-devel
BuildRequires: flac-devel
BuildRequires: libsamplerate-devel
BuildRequires: speex-devel
BuildRequires: libvorbis-devel
BuildRequires: libtool

%description
aKode is a simple audio-decoding frame-work that provides a uniform
interface to decode the most common audio-formats. It also has a direct
playback option for a number of audio-outputs.

aKode currently has the following decoder plugins:
* mpc: Decodes musepack aka mpc audio.
* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. 

aKode also has the following audio outputs:
* oss: Outputs to the OSS (Open Sound System)
* alsa: Outputs to ALSA (dmix is recommended).
%if 0
TODO
* jack: Outputs using Jack audio backend.
* polyp: Output to the polypaudio server.  Recommended for network 
  transparent audio. 
%endif

%package devel
Summary: Headers for developing programs that will use %{name} 
Group:   Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
%{summary}.


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

[ ! -f configure ] && make -f Makefile.cvs


%build
%configure \
  --disable-static \
  --disable-debug --disable-warnings --disable-dependency-tracking \
  --without-libltdl \
  --with-alsa \
  --with-flac \
  --with-libsamplerate \
  --with-speex \
  --with-vorbis \
  --without-jack \
  --without-polypaudio \
  --without-ffmpeg \
  --without-libmad 

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

# unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
# NEWS omitted, currently empty
#doc NEWS
%{_bindir}/akodeplay
%{_libdir}/libakode.so.*
%{_libdir}/libakode_*_*.so

%files devel
%defattr(-,root,root,-)
%{_bindir}/akode-config
%{_includedir}/*
%{_libdir}/libakode.so


%changelog
* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-1
- 2.0(final)

* Wed Nov 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-0.4.rc1
- 2.0rc1 

* Wed Nov 23 2005 Rex Dieter <rexdieter[AT]users.sf.net. 2.0-0.2.b3
- --without-libltdl

* Tue Nov 22 2005 Rex Dieter <rexdieter[AT]users.sf.net> 2.0-0.1.b3
- akode-2.0b3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/akode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 14:49:25 -0000	1.1
+++ .cvsignore	6 Jan 2006 14:50:17 -0000	1.2
@@ -0,0 +1 @@
+30375-akode-2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/akode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 14:49:25 -0000	1.1
+++ sources	6 Jan 2006 14:50:17 -0000	1.2
@@ -0,0 +1 @@
+04f79cda65c8e9966fa462eaaaa282dc  30375-akode-2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 14:52:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri,  6 Jan 2006 09:52:08 -0500
Subject: owners owners.list,1.501,1.502
Message-ID: <200601061452.k06EqeZm009330@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9309

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -r1.501 -r1.502
--- owners.list	6 Jan 2006 13:56:30 -0000	1.501
+++ owners.list	6 Jan 2006 14:52:08 -0000	1.502
@@ -20,6 +20,7 @@
 Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|airsnort|Wireless LAN (WLAN) tool which recovers encryption keys|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 15:01:27 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Fri,  6 Jan 2006 10:01:27 -0500
Subject: owners owners.list,1.502,1.503
Message-ID: <200601061502.k06F24rm011067@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11038

Modified Files:
	owners.list 
Log Message:
Sorted the list, added a comment to keep it sorted.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- owners.list	6 Jan 2006 14:52:08 -0000	1.502
+++ owners.list	6 Jan 2006 15:01:27 -0000	1.503
@@ -6,6 +6,9 @@
 # initialqacontact is the initial qa contact of bugs on this component
 # initialcclist is the list of people initially CC'd for bugs on this component
 #
+# Please keep the list sorted alphabetically when adding new packages, treating
+# uppercase and lowercase letters equivalently.
+#
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
 
 Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org|
@@ -77,6 +80,7 @@
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
+Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
@@ -1142,6 +1146,7 @@
 Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|
 Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|superkaramba|Custom content on the desktop|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1339,5 +1344,3 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
-Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 15:14:32 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 10:14:32 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.1,1.2
Message-ID: <200601061515.k06FF651011167@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11138

Modified Files:
	streamtuner.spec 
Log Message:
desktop-file-utils dependency removed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner.spec	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner.spec	6 Jan 2006 15:14:32 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -16,7 +16,7 @@
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel
-BuildRequires: gettext, desktop-file-utils
+BuildRequires: gettext
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
+- desktop-file-utils dependency removed
+
 * Mon Jan  2 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-6
 - redundant dependencies removed
 - useless update-desktop-database call removed



From fedora-extras-commits at redhat.com  Fri Jan  6 15:26:55 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  6 Jan 2006 10:26:55 -0500
Subject: fedora-security/audit fc4,1.117,1.118 fc5,1.28,1.29
Message-ID: <200601061526.k06FQtku011434@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11409

Modified Files:
	fc4 fc5 
Log Message:
Deal with netpbm release - although upstream fixed this CVE at least in
10.31 we still have a patch to use PARANOIDSAFER instead of SAFER.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc4	6 Jan 2006 11:19:04 -0000	1.117
+++ fc4	6 Jan 2006 15:26:47 -0000	1.118
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060105
-Up to date FC4 as of 20060105 (except netpbm)
+Up to date FC4 as of 20060105
 
 ** are items that need attention
 
@@ -212,7 +212,7 @@
 CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2490 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2475 VULNERABLE (unzip) bz#164928
-CVE-2005-2471 backport (netpbm) [since FEDORA-2005-728]
+CVE-2005-2471 version (netpbm, 10.31 at least) [since FEDORA-2005-000**] was backport since FEDORA-2005-728
 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible
 CVE-2005-2458 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 CVE-2005-2457 ignore (kernel, fixed 2.6.12.5) this is just a bug


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fc5	6 Jan 2006 11:19:04 -0000	1.28
+++ fc5	6 Jan 2006 15:26:47 -0000	1.29
@@ -216,7 +216,7 @@
 CVE-2005-2492 version (kernel, fixed 2.6.13.1)
 CVE-2005-2490 version (kernel, fixed 2.6.13.1)
 CVE-2005-2475 backport (unzip)
-CVE-2005-2471 backport (netpbm) netpbm-10.28-CAN-2005-2471.patch
+CVE-2005-2471 backport (netpbm, fixed 10.31 at least) netpbm-10.28-CAN-2005-2471.patch
 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible
 CVE-2005-2458 version (kernel, fixed 2.6.12.5)
 CVE-2005-2457 version (kernel, fixed 2.6.12.5)



From fedora-extras-commits at redhat.com  Fri Jan  6 15:31:53 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Fri,  6 Jan 2006 10:31:53 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.2,1.3
Message-ID: <200601061532.k06FWPlf011483@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11466

Modified Files:
	streamtuner.spec 
Log Message:
cosmetic change


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- streamtuner.spec	6 Jan 2006 15:14:32 -0000	1.2
+++ streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
@@ -15,8 +15,7 @@
 Requires(post): desktop-file-utils, scrollkeeper
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
-BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel
-BuildRequires: gettext
+BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 



From fedora-extras-commits at redhat.com  Fri Jan  6 15:36:09 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri,  6 Jan 2006 10:36:09 -0500
Subject: rpms/baobab/devel baobab.spec,1.9,1.10
Message-ID: <200601061536.k06Fafih011573@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11539

Modified Files:
	baobab.spec 
Log Message:
rebuild due to new libgtop


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- baobab.spec	1 Jan 2006 15:29:45 -0000	1.9
+++ baobab.spec	6 Jan 2006 15:36:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           baobab
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
@@ -56,6 +56,9 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Fri Jan 06 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-2
+- rebuild
+
 * Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
 - Update to 2.3.0
 



From fedora-extras-commits at redhat.com  Fri Jan  6 15:40:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri,  6 Jan 2006 10:40:02 -0500
Subject: rpms/perl-File-Tail/devel perl-File-Tail.spec,1.8,1.9
Message-ID: <200601061540.k06FeYVL011696@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-File-Tail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11668

Modified Files:
	perl-File-Tail.spec 
Log Message:
Another typo corrected.


Index: perl-File-Tail.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Tail/devel/perl-File-Tail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-File-Tail.spec	4 Jan 2006 20:58:40 -0000	1.8
+++ perl-File-Tail.spec	6 Jan 2006 15:40:01 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           perl-File-Tail
 Version:        0.99.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Perl extension for reading from continously updated files
 
 Group:          Development/Libraries
@@ -14,7 +14,7 @@
 
 %description
 The primary purpose of File::Tail is reading and analysing log files
-while they are being written, which is especialy useful if you are
+while they are being written, which is especially useful if you are
 monitoring the logging process with a tool like Tobias Oetiker's MRTG.
 
 %prep
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-3
+- Another typo corrected.
+
 * Wed Jan  4 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.99.3-2
 - Correction of spelling error in the description.
 



From fedora-extras-commits at redhat.com  Fri Jan  6 16:10:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:10:07 -0500
Subject: rpms/compat-wxGTK - New directory
Message-ID: <200601061610.k06GADCQ013661@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652/compat-wxGTK

Log Message:
Directory /cvs/extras/rpms/compat-wxGTK added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:10:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:10:24 -0500
Subject: rpms/compat-wxGTK/devel - New directory
Message-ID: <200601061610.k06GAQCa013679@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13652/compat-wxGTK/devel

Log Message:
Directory /cvs/extras/rpms/compat-wxGTK/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:10:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:10:59 -0500
Subject: rpms/compat-wxGTK Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061611.k06GB1Fa013734@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13722

Added Files:
	Makefile import.log 
Log Message:
Setup of module compat-wxGTK


--- NEW FILE Makefile ---
# Top level Makefile for module compat-wxGTK
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:11:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:11:37 -0500
Subject: rpms/compat-wxGTK/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061611.k06GBeuj013766@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13722/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compat-wxGTK


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:14:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:14:47 -0500
Subject: rpms/compat-wxGTK import.log,1.1,1.2
Message-ID: <200601061615.k06GFJHv013934@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13873

Modified Files:
	import.log 
Log Message:
auto-import compat-wxGTK-2.4.2-15 on branch devel from compat-wxGTK-2.4.2-15.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 16:10:59 -0000	1.1
+++ import.log	6 Jan 2006 16:14:46 -0000	1.2
@@ -0,0 +1 @@
+compat-wxGTK-2_4_2-15:HEAD:compat-wxGTK-2.4.2-15.src.rpm:1136564071



From fedora-extras-commits at redhat.com  Fri Jan  6 16:14:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:14:53 -0500
Subject: rpms/compat-wxGTK/devel compat-wxGTK.spec, NONE,
	1.1 wxGTK-2.4.2-aclocal18.patch, NONE,
	1.1 wxGTK-2.4.2-gcc4.patch, NONE, 1.1 wxGTK-2.4.2-privates.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061615.k06GFP9R013947@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13873/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-wxGTK.spec wxGTK-2.4.2-aclocal18.patch 
	wxGTK-2.4.2-gcc4.patch wxGTK-2.4.2-privates.patch 
Log Message:
auto-import compat-wxGTK-2.4.2-15 on branch devel from compat-wxGTK-2.4.2-15.src.rpm


--- NEW FILE compat-wxGTK.spec ---
%define x11libdir %{_prefix}/X11R6/%{_lib}

Name:           compat-wxGTK
Version:        2.4.2
Release:        15%{?dist}
Summary:        Compatibility version of the wxWidgets GTK GUI library
License:        BSD
Group:          System Environment/Libraries
URL:            http://www.wxwidgets.org/
Source0:        http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
Patch0:         wxGTK-2.4.2-privates.patch
Patch1:         wxGTK-2.4.2-aclocal18.patch
Patch2:         wxGTK-2.4.2-gcc4.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
BuildRequires:  libpng-devel libjpeg-devel libtiff-devel
BuildRequires:  libGL libGLU
Requires:       %{name}-common = %{version}-%{release}
Obsoletes:      wxGTK <= 2.4.2-12

Provides:       wxGTK = %{version}-%{release}

%description
wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.

%package        devel
Group:          Development/Libraries
Summary:        Development files for the wxGTK library
Requires:       %{name} = %{version}-%{release}
Requires:       %{name}-common-devel = %{version}-%{release}
Requires:       %{name}-gl = %{version}-%{release}
Requires:       %{name}-stc = %{version}-%{release}
Requires:       %{name}-xrc = %{version}-%{release}
Requires:       gtk+-devel
Conflicts:      %{name}2-devel
Obsoletes:      wxGTK-devel <= 2.4.2-12
Provides:       wxGTK-devel = %{version}-%{release}

%description    devel
This package includes files needed to link with the wxGTK library.

%package     -n %{name}2
Group:          System Environment/Libraries
Summary:        Compatibility version of the wxWidgets GTK2 GUI library
Requires:       %{name}-common = %{version}-%{release}
Obsoletes:      wxGTK2 <= 2.4.2-12
Provides:       wxGTK2 = %{version}-%{release}

%description -n %{name}2
wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.

%package     -n %{name}2-devel
Group:          Development/Libraries
Summary:        Development files for the wxGTK2 library
Requires:       %{name}2 = %{version}-%{release}
Requires:       %{name}-common-devel = %{version}-%{release}
Requires:       %{name}2-gl = %{version}-%{release}
Requires:       %{name}2-stc = %{version}-%{release}
Requires:       %{name}2-xrc = %{version}-%{release}
Requires:       gtk2-devel
Conflicts:      %{name}-devel
Obsoletes:      wxGTK2-devel <= 2.4.2-12
Provides:       wxGTK2-devel = %{version}-%{release}

%description -n %{name}2-devel
This package include files needed to link with the wxGTK2 library.

%package        common
Group:          System Environment/Libraries
Summary:        wxGTK* common files
Obsoletes:      wxGTK-common <= 2.4.2-12
Provides:       wxGTK-common = %{version}-%{release}

%description    common
Common files for wxWidgets/GTK1 and GTK2.

%package        common-devel
Group:          Development/Libraries
Summary:        wxGTK* common development files
Obsoletes:      wxGTK-common-devel <= 2.4.2-12
Provides:       wxGTK-common-devel = %{version}-%{release}

%description    common-devel
Common development files for wxWidgets/GTK1 and GTK2.

%package        gl
Summary:        OpenGL add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Obsoletes:      wxGTK-gl <= 2.4.2-12
Provides:       wxGTK-gl = %{version}-%{release}

%description    gl
%{summary}.

%package     -n %{name}2-gl
Summary:        OpenGL add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name}2 = %{version}-%{release}
Obsoletes:      wxGTK2-gl <= 2.4.2-12
Provides:       wxGTK2-gl = %{version}-%{release}

%description -n %{name}2-gl
%{summary}.

%package        stc
Summary:        Styled text control add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Obsoletes:      wxGTK-stc <= 2.4.2-12
Provides:       wxGTK-stc = %{version}-%{release}

%description    stc
Styled text control add-on for wxGTK. Based on the Scintillia project.

%package     -n %{name}2-stc
Summary:        Styled text control add-on for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name}2 = %{version}-%{release}
Obsoletes:      wxGTK2-stc <= 2.4.2-12
Provides:       wxGTK2-stc = %{version}-%{release}

%description -n %{name}2-stc
Styled text control add-on for wxGTK2. Based on the Scintillia project.

%package        xrc
Summary:        The XML-based resource system for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name} = %{version}-%{release}
Obsoletes:      wxGTK-xrc <= 2.4.2-12
Provides:       wxGTK-xrc = %{version}-%{release}

%description    xrc
The XML-based resource system, known as XRC, allows user interface
elements such as dialogs, menu bars and toolbars, to be stored in
text files and loaded into the application at run-time.
This package is for the GTK 1.2 backend

%package     -n %{name}2-xrc
Summary:        The XML-based resource system for the wxWidgets library
Group:          System Environment/Libraries
Requires:       %{name}2 = %{version}-%{release}
Obsoletes:      wxGTK2-xrc <= 2.4.2-12
Provides:       wxGTK2-xrc = %{version}-%{release}

%description -n %{name}2-xrc
The XML-based resource system, known as XRC, allows user interface
elements such as dialogs, menu bars and toolbars, to be stored in
text files and loaded into the application at run-time.
This package is for the GTK2 backend.


%prep
%setup -q -n wxGTK-%{version}
%patch0 -p1 -b .privates
%patch1 -p0 -b .aclocal18
%patch2 -p1 -b .gcc4

sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure


%build
mkdir _gtk1 _gtk2
export CC="%{__cc}"
export CXX="%{__cxx}"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
# (see OPTIMISE in configure).

cd _gtk1
../configure \
  --prefix=%{_prefix} \
  --libdir=%{_libdir} \
  --x-libraries=%{x11libdir} \
  --with-opengl \
  --enable-shared \
  --enable-soname \
  --disable-optimise
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/xrc
cd ..

cd _gtk2
../configure \
  --prefix=%{_prefix} \
  --libdir=%{_libdir} \
  --x-libraries=%{x11libdir} \
  --with-opengl \
  --enable-shared \
  --enable-soname \
  --disable-optimise \
  --enable-gtk2
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/xrc

cd ..


%install
rm -rf $RPM_BUILD_ROOT

# Since we're not using %%configure, we would really like to use
# "make install DESTDIR=..." instead of %%makeinstall here to keep things in
# sync.  Unfortunately that does not work.
cd _gtk1
%makeinstall
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/xrc
cd ..
cd _gtk2
%makeinstall
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/xrc
cd ..

# Deal with conflicting files
rm -f $RPM_BUILD_ROOT%{_bindir}/wx-config
touch $RPM_BUILD_ROOT%{_bindir}/wx-2.4-config
chmod 755 $RPM_BUILD_ROOT%{_bindir}/wx-2.4-config
mv $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin.m4 \
   $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin-2.4.m4

%find_lang wxstd


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%post devel
ln -sf $(basename %{_bindir}/wxgtk-*-config) %{_bindir}/wx-2.4-config

%post gl -p /sbin/ldconfig
%postun gl -p /sbin/ldconfig

%post stc -p /sbin/ldconfig
%postun stc -p /sbin/ldconfig

%post xrc -p /sbin/ldconfig
%postun xrc -p /sbin/ldconfig

%post -n %{name}2 -p /sbin/ldconfig
%postun -n %{name}2 -p /sbin/ldconfig

%post -n %{name}2-devel
ln -sf $(basename %{_bindir}/wxgtk2-*-config) %{_bindir}/wx-2.4-config

%post -n %{name}2-gl -p /sbin/ldconfig
%postun -n %{name}2-gl -p /sbin/ldconfig

%post -n %{name}2-stc -p /sbin/ldconfig
%postun -n %{name}2-stc -p /sbin/ldconfig

%post -n %{name}2-xrc -p /sbin/ldconfig
%postun -n %{name}2-xrc -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk-*.so.*

%files devel
%defattr(-,root,root,-)
%ghost %{_bindir}/wx-2.4-config
%{_bindir}/wxgtk-*-config
%{_libdir}/libwx_gtk[-_]*.so
%{_libdir}/wx/include/gtk-*

%files -n %{name}2
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2-*.so.*

%files -n %{name}2-devel
%defattr(-,root,root,-)
%ghost %{_bindir}/wx-2.4-config
%{_bindir}/wxgtk2-*-config
%{_libdir}/libwx_gtk2[-_]*.so
%{_libdir}/wx/include/gtk-2*

%files common -f wxstd.lang
%defattr(-,root,root,-)
%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
%{_datadir}/wx/

%files common-devel
%defattr(-,root,root,-)
%{_datadir}/aclocal/*
%{_includedir}/wx/
%dir %{_libdir}/wx/
%dir %{_libdir}/wx/include/

%files gl
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk_gl-*.so.*

%files -n %{name}2-gl
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2_gl-*.so.*

%files stc
%defattr(-,root,root,-)
%doc contrib/src/stc/README.txt
%{_libdir}/libwx_gtk_stc-*.so.*

%files -n %{name}2-stc
%defattr(-,root,root,-)
%doc contrib/src/stc/README.txt
%{_libdir}/libwx_gtk2_stc-*.so.*

%files xrc
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk_xrc-*.so.*

%files -n %{name}2-xrc
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2_xrc-*.so.*


%changelog
* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-15
- spec file cleanups

* Mon Aug 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-14
- Make all packages Provide their old name = r-v

* Sat Aug 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-13
- take ownership
- rename to "compat-wxGTK"
- add dist tag

* Sun May  8 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.4.2-12
- sed -i -e 's|/usr/lib\b|%%{_libdir}|' in configure also to fix
  x86_64

* Sat May  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-11
- Add BR libGL and libGLU to fix FC4 build failure
  (alternatively use xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU).

* Fri Apr 22 2005 Dams <anvil[AT]livna.org> - 2.4.2-10
- Added patch from Ignacio and Denis to fix build with gcc4 

* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt

* Sun Jan 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.2-8
- Fix wx-config for x86_64 (#145508).
- Honor $RPM_OPT_FLAGS better, as well as %%{__cc} and %%{__cxx}.

* Mon Dec  6 2004 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.2-7
- Patch to avoid aclocal >= 1.8 warnings from wxwin.m4.
- Move unversioned *.so links for -gl, -stc and -xrc to -devel, make -devel
  require them.

* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 2.4.2-6
- Bump release to provide Extras upgrade path.
- Fix spaces/tabs in spec.
- Remove unneeded zero epochs.
- Add full source URL.

* Tue Jun 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.2-0.fdr.2
- s/wxWindows/wxWidgets/
- Fix release tag.

* Sat May 22 2004 Noa Resare <noa at resare.com> - 0:2.4.2-0.fdr.1.3
- Merged fix from wxGTK cvs head, now works with recent gtk2

* Sat Oct 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.2-0.fdr.1
- Update to 2.4.2.

* Mon Aug  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.1-0.fdr.4
- Borrow Matthias Saou's -gl and -stc subpackages.

* Mon Jun 16 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.3
- Removed libwx_gtk2_xrc*so* from wxGTK2/wxGTK2-devel packages

* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.2
- Removed *-devel postun scriptlets (from Ville Skytt??)

* Sat Jun 14 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.1
- Updated to 2.4.1

* Wed May 28 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.7
- Added xrc contrib in separate packages

* Wed May 21 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.6
- Corrected typo in postun devel

* Wed May 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.0-0.fdr.5
- Make -devel packages require the corresponding GTK devel package.
- Save .spec in UTF-8.
- Fixes from Dams:
- Don't build --with-unicode, it breaks stuff (as was already noted by Dams).
- Don't remove wx-config symlinks on upgrades.
- Remove duplicates from docs.

* Tue May 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.4.0-0.fdr.4
- Split into subpackages, spec file rewrite.
- Use bzipped upstream tarball.
- Clean up BuildRequirement versions.

* Fri May  9 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.3
- Now build/include both gtk/gtk2 libs
- buildroot -> RPM_BUILD_ROOT

* Mon Mar  3 2003 Dams <anvil at livna.org>
- Initial build.
- Disable unicode as it breaks lmule
- use the %find_lang macro for locale

wxGTK-2.4.2-aclocal18.patch:

--- NEW FILE wxGTK-2.4.2-aclocal18.patch ---
--- wxwin.m4~	2003-09-21 14:31:27.000000000 +0300
+++ wxwin.m4	2004-12-06 11:33:44.097041699 +0200
@@ -33,7 +33,7 @@
 dnl command line options
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN(AM_OPTIONS_WXCONFIG,
+AC_DEFUN([AM_OPTIONS_WXCONFIG],
 [
    AC_ARG_WITH(wx-prefix, [  --with-wx-prefix=PREFIX   Prefix where wxWindows is installed (optional)],
                wx_config_prefix="$withval", wx_config_prefix="")
@@ -56,7 +56,7 @@
 dnl
 dnl Get the cflags and libraries from the wx-config script
 dnl
-AC_DEFUN(AM_PATH_WXCONFIG,
+AC_DEFUN([AM_PATH_WXCONFIG],
 [
   dnl do we have wx-config name: it can be wx-config or wxd-config or ...
   if test x${WX_CONFIG_NAME+set} != xset ; then

wxGTK-2.4.2-gcc4.patch:

--- NEW FILE wxGTK-2.4.2-gcc4.patch ---
--- wxGTK-2.4.2/contrib/src/xrc/xml.cpp.gcc4	2003-09-21 07:32:56.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/xrc/xml.cpp	2005-04-15 06:59:47.000000000 -0400
@@ -354,8 +354,8 @@
 #else
     if ( conv )
     {
-        size_t nLen = (len != wxSTRING_MAXLEN) ? len :
-                          nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
+        size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
+                          wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
 
         wchar_t *buf = new wchar_t[nLen+1];
         wxConvUTF8.MB2WC(buf, s, nLen);
--- wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c.gcc4	2003-09-21 07:32:54.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c	2005-04-15 06:59:47.000000000 -0400
@@ -203,8 +203,10 @@
 static enum XML_Error
 doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
 	 const char *end, int tok, const char *next, const char **nextPtr);
+#ifdef XML_DTD
 static enum XML_Error
 processInternalParamEntity(XML_Parser parser, ENTITY *entity);
+#endif /* XML_DTD */
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
 	  const char *start, const char *end, const char **endPtr);
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx.gcc4	2003-09-21 07:32:47.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx	2005-04-15 06:59:47.000000000 -0400
@@ -850,6 +850,7 @@
 	DocumentIndexer(Document *pdoc_, int end_) :
 		pdoc(pdoc_), end(end_) {
 	}
+	virtual ~DocumentIndexer() {};
 
 	virtual char CharAt(int index) {
 		if (index < 0 || index >= end)
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h.gcc4	2003-09-21 07:32:50.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h	2005-04-15 06:59:47.000000000 -0400
@@ -38,6 +38,7 @@
 		strncpy(name, languageName_, sizeof(name));
 		languageName = name;
 	};
+	virtual ~ExternalLexerModule() {};
 	virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
 					WordList *keywordlists[], Accessor &styler) const;
 	virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h.gcc4	2003-09-21 07:32:50.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h	2005-04-15 06:59:47.000000000 -0400
@@ -20,6 +20,7 @@
 class CharacterIndexer {
 public: 
 	virtual char CharAt(int index)=0;
+	virtual ~CharacterIndexer() {};
 };
 
 class RESearch {
--- wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h.gcc4	2003-09-21 07:32:47.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h	2005-04-15 06:59:47.000000000 -0400
@@ -29,6 +29,7 @@
 	LexerModule(int language_, LexerFunction fnLexer_, 
 		const char *languageName_=0, LexerFunction fnFolder_=0,
 		const char * const wordListDescriptions_[] = NULL);
+	virtual ~LexerModule() {};
 	int GetLanguage() const { return language; }
 
 	// -1 is returned if no WordList information is available
--- wxGTK-2.4.2/src/common/dircmn.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
+++ wxGTK-2.4.2/src/common/dircmn.cpp	2005-04-15 06:59:47.000000000 -0400
@@ -147,6 +147,7 @@
 {
 public:
     wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
+    virtual ~wxDirTraverserSimple() {};
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
--- wxGTK-2.4.2/src/common/xpmdecod.cpp.gcc4	2003-09-21 07:31:39.000000000 -0400
+++ wxGTK-2.4.2/src/common/xpmdecod.cpp	2005-04-15 14:06:53.000000000 -0400
@@ -669,7 +669,7 @@
     wxChar key[64];
     const char *clr_def;
     bool hasMask;
-    wxXPMColourMapData clr_data;
+    wxXPMColourMapData clr_data = {0, 0, 0};
     wxXPMColourMap clr_tbl;
 
     /*
@@ -712,7 +712,7 @@
         }
         else
         {
-            bool isNone;
+            bool isNone = false;
             if ( !GetRGBFromName(clr_def, &isNone,
                                  &clr_data.R, &clr_data.G, &clr_data.B) )
             {
--- wxGTK-2.4.2/src/unix/mimetype.cpp.gcc4	2003-09-21 07:31:40.000000000 -0400
+++ wxGTK-2.4.2/src/unix/mimetype.cpp	2005-04-15 06:59:47.000000000 -0400
@@ -1580,7 +1580,7 @@
     {
         // now got a file we can write to ....
         wxMimeTypeCommands * entries = m_aEntries[index];
-        size_t iOpen;
+        size_t iOpen = 0;
         wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
         wxString sTmp;
 
--- wxGTK-2.4.2/include/wx/statline.h.gcc4	2003-09-21 07:31:35.000000000 -0400
+++ wxGTK-2.4.2/include/wx/statline.h	2005-04-15 06:59:47.000000000 -0400
@@ -39,6 +39,7 @@
 public:
     // constructor
     wxStaticLineBase() { }
+    virtual ~wxStaticLineBase() {};
 
     // is the line vertical?
     bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
--- wxGTK-2.4.2/include/wx/datetime.h.gcc4	2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/datetime.h	2005-04-15 06:59:47.000000000 -0400
@@ -1300,6 +1300,7 @@
 {
 friend class wxDateTimeHolidaysModule;
 public:
+    virtual ~wxDateTimeHolidayAuthority() {};
     // returns TRUE if the given date is a holiday
     static bool IsHoliday(const wxDateTime& dt);
 
@@ -1340,6 +1341,8 @@
 // the holidays for this class are all Saturdays and Sundays
 class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
 {
+public:
+    virtual ~wxDateTimeWorkDays() {};
 protected:
     virtual bool DoIsHoliday(const wxDateTime& dt) const;
     virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
--- wxGTK-2.4.2/include/wx/notebook.h.gcc4	2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/notebook.h	2005-04-15 06:59:47.000000000 -0400
@@ -193,6 +193,7 @@
             m_nSel = nSel;
             m_nOldSel = nOldSel;
         }
+    virtual ~wxNotebookEvent() {};
 
     // accessors
         // the currently selected page (-1 if none)
--- wxGTK-2.4.2/include/wx/event.h.gcc4	2003-09-21 07:31:33.000000000 -0400
+++ wxGTK-2.4.2/include/wx/event.h	2005-04-15 06:59:47.000000000 -0400
@@ -1952,6 +1952,7 @@
         : wxEventTableEntryBase(id, idLast, fn, data),
         m_eventType(evType)
     { }
+    virtual ~wxEventTableEntry() {};
 
     // the reference to event type: this allows us to not care about the
     // (undefined) order in which the event table entries and the event types
--- wxGTK-2.4.2/include/wx/geometry.h.gcc4	2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/geometry.h	2005-04-15 06:59:47.000000000 -0400
@@ -785,6 +785,7 @@
 class wxTransform2D
 {
 public :
+    virtual ~wxTransform2D() {};
     virtual void                    Transform( wxPoint2DInt* pt )const  = 0;
     virtual void                    Transform( wxRect2DInt* r ) const;
     virtual wxPoint2DInt    Transform( const wxPoint2DInt &pt ) const;
--- wxGTK-2.4.2/include/wx/list.h.gcc4	2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/list.h	2005-04-15 14:05:22.000000000 -0400
@@ -384,6 +384,7 @@
                  T *data = (T *)NULL,                                       \
                  const wxListKey& key = wxDefaultListKey)                   \
             : wxNodeBase(list, previous, next, data, key) { }               \
+        virtual ~nodetype() {};                                             \
                                                                             \
         nodetype *GetNext() const                                           \
             { return (nodetype *)wxNodeBase::GetNext(); }                   \
@@ -410,6 +411,7 @@
                                                                             \
         name& operator=(const name& list)                                   \
             { (void) wxListBase::operator=(list); return *this; }           \
+        virtual ~name() {};                                                 \
                                                                             \
         nodetype *GetFirst() const                                          \
             { return (nodetype *)wxListBase::GetFirst(); }                  \
--- wxGTK-2.4.2/include/wx/radiobox.h.gcc4	2003-09-21 07:31:35.000000000 -0400
+++ wxGTK-2.4.2/include/wx/radiobox.h	2005-04-15 06:59:47.000000000 -0400
@@ -35,6 +35,7 @@
 class WXDLLEXPORT wxRadioBoxBase
 {
 public:
+    virtual ~wxRadioBoxBase() {};
     // selection
     virtual void SetSelection(int n) = 0;
     virtual int GetSelection() const = 0;
--- wxGTK-2.4.2/include/wx/caret.h.gcc4	2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/caret.h	2005-04-15 06:59:47.000000000 -0400
@@ -60,6 +60,7 @@
 
         (void)Create(window, size);
     }
+    virtual ~wxCaretBase() {};
 
     // Create() functions - same as ctor but returns the success code
     // --------------------------------------------------------------
--- wxGTK-2.4.2/include/wx/dir.h.gcc4	2003-09-21 07:31:32.000000000 -0400
+++ wxGTK-2.4.2/include/wx/dir.h	2005-04-15 06:59:47.000000000 -0400
@@ -52,6 +52,7 @@
 class WXDLLEXPORT wxDirTraverser
 {
 public:
+    virtual ~wxDirTraverser() {};
     // called for each file found by wxDir::Traverse()
     //
     // return wxDIR_STOP or wxDIR_CONTINUE from here
--- wxGTK-2.4.2/include/wx/clipbrd.h.gcc4	2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/clipbrd.h	2005-04-15 06:59:47.000000000 -0400
@@ -39,6 +39,7 @@
 {
 public:
     wxClipboardBase();
+    virtual ~wxClipboardBase() {};
 
     // open the clipboard before Add/SetData() and GetData()
     virtual bool Open() = 0;
--- wxGTK-2.4.2/src/common/sckfile.cpp.orig	2005-04-16 16:50:11.000000000 -0700
+++ wxGTK-2.4.2/src/common/sckfile.cpp	2005-04-16 16:50:14.000000000 -0700
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 #ifdef __GNUG__
-#pragma implementation "sckfile.h"
+#pragma implementation "file.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

wxGTK-2.4.2-privates.patch:

--- NEW FILE wxGTK-2.4.2-privates.patch ---
diff -ur wxGTK-2.4.2.vanilla/src/gtk/menu.cpp wxGTK-2.4.2/src/gtk/menu.cpp
--- wxGTK-2.4.2.vanilla/src/gtk/menu.cpp	2003-09-21 13:31:57.000000000 +0200
+++ wxGTK-2.4.2/src/gtk/menu.cpp	2004-05-22 20:57:58.753013328 +0200
@@ -30,13 +30,13 @@
 #ifdef __WXGTK20__
     #include <glib-object.h>
 
-    #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
-    #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
+    #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
+    #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
     #define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
 
-    #define ACCEL_OBJECT        GObject
+    #define ACCEL_OBJECT        GtkWindow
     #define ACCEL_OBJECTS(a)    (a)->acceleratables
-    #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
+    #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
 #else // GTK+ 1.x
     #define ACCEL_OBJECT        GtkObject
     #define ACCEL_OBJECTS(a)    (a)->attach_objects
Endast i wxGTK-2.4.2/src/gtk: menu.cppprivates
diff -ur wxGTK-2.4.2.vanilla/src/gtk/settings.cpp wxGTK-2.4.2/src/gtk/settings.cpp
--- wxGTK-2.4.2.vanilla/src/gtk/settings.cpp	2003-09-21 13:31:57.000000000 +0200
+++ wxGTK-2.4.2/src/gtk/settings.cpp	2004-05-22 20:57:15.330585304 +0200
@@ -340,9 +340,20 @@
                 }  
                 else  
                 {  
-                    const gchar *font_name =
-                        _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
-                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
+                    GtkSettings *settings = gtk_settings_get_default();
+                    gchar *font_name = NULL;
+                    g_object_get ( settings,
+                                   "gtk-font-name",
+                                   &font_name,
+                                   NULL);
+
+                    if (!font_name) 
+                            g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+
+                    else
+	                    g_systemFont = new wxFont(wxString::FromAscii(font_name));
+                    g_free (font_name);
+			
                 }  
                 gtk_widget_destroy( widget );
 #else
Endast i wxGTK-2.4.2/src/gtk: settings.cppprivates


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 16:11:20 -0000	1.1
+++ .cvsignore	6 Jan 2006 16:14:52 -0000	1.2
@@ -0,0 +1 @@
+wxGTK-2.4.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 16:11:20 -0000	1.1
+++ sources	6 Jan 2006 16:14:52 -0000	1.2
@@ -0,0 +1 @@
+cdadfe82fc93f8a65a2ae18a95b0b0e3  wxGTK-2.4.2.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan  6 16:15:17 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:15:17 -0500
Subject: owners owners.list,1.503,1.504
Message-ID: <200601061615.k06GFnIB013976@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13842

Modified Files:
	owners.list 
Log Message:

Here come compat-wxGTK & compat-wxPythonGTK2, swinging proud and free, flying through the air, watch out for that tree!



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.503
retrieving revision 1.504
diff -u -r1.503 -r1.504
--- owners.list	6 Jan 2006 15:01:27 -0000	1.503
+++ owners.list	6 Jan 2006 16:15:17 -0000	1.504
@@ -114,6 +114,8 @@
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|comical|GUI comic book viewer|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|compat-wxGTK|Compatibility version of the wxWidgets GUI library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|compat-wxPythonGTK2|Compatibility version of the wxWidgets GUI toolkit for Python|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|compface|Library for handling X-Faces|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan  6 16:16:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:16:53 -0500
Subject: rpms/compat-wxPythonGTK2 - New directory
Message-ID: <200601061616.k06GGtRO014033@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14025/compat-wxPythonGTK2

Log Message:
Directory /cvs/extras/rpms/compat-wxPythonGTK2 added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:16:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:16:59 -0500
Subject: rpms/compat-wxPythonGTK2/devel - New directory
Message-ID: <200601061617.k06GH1DZ014048@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14025/compat-wxPythonGTK2/devel

Log Message:
Directory /cvs/extras/rpms/compat-wxPythonGTK2/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:17:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:17:15 -0500
Subject: rpms/compat-wxPythonGTK2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061617.k06GHHLP014082@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14070

Added Files:
	Makefile import.log 
Log Message:
Setup of module compat-wxPythonGTK2


--- NEW FILE Makefile ---
# Top level Makefile for module compat-wxPythonGTK2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:17:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:17:21 -0500
Subject: rpms/compat-wxPythonGTK2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061617.k06GHN8u014102@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14070/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module compat-wxPythonGTK2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:22:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:22:14 -0500
Subject: owners owners.list,1.504,1.505
Message-ID: <200601061622.k06GMkJJ014151@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14133

Modified Files:
	owners.list 
Log Message:

perl-Clone attacks!



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -r1.504 -r1.505
--- owners.list	6 Jan 2006 16:15:17 -0000	1.504
+++ owners.list	6 Jan 2006 16:22:14 -0000	1.505
@@ -753,6 +753,7 @@
 Fedora Extras|perl-Class-Singleton|Class::Singleton Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 16:23:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:23:06 -0500
Subject: rpms/compat-wxPythonGTK2 import.log,1.1,1.2
Message-ID: <200601061623.k06GNkPi014209@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171

Modified Files:
	import.log 
Log Message:
auto-import compat-wxPythonGTK2-2.4.2.4-9 on branch devel from compat-wxPythonGTK2-2.4.2.4-9.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 16:17:14 -0000	1.1
+++ import.log	6 Jan 2006 16:23:03 -0000	1.2
@@ -0,0 +1 @@
+compat-wxPythonGTK2-2_4_2_4-9:HEAD:compat-wxPythonGTK2-2.4.2.4-9.src.rpm:1136564568



From fedora-extras-commits at redhat.com  Fri Jan  6 16:23:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:23:12 -0500
Subject: rpms/compat-wxPythonGTK2/devel compat-wxPython.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061623.k06GNkP0014210@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14171/devel

Modified Files:
	.cvsignore sources 
Added Files:
	compat-wxPython.spec 
Log Message:
auto-import compat-wxPythonGTK2-2.4.2.4-9 on branch devel from compat-wxPythonGTK2-2.4.2.4-9.src.rpm


--- NEW FILE compat-wxPython.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

%define buildflags WXPORT=gtk2 UNICODE=1 WX_CONFIG=%{_bindir}/wx-2.4-config

Name:           compat-wxPythonGTK2
Version:        2.4.2.4
Release:        9%{?dist}
Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
Group:          Development/Languages
License:        LGPL
URL:            http://www.wxpython.org/
Source0:        http://dl.sf.net/wxpython/wxPythonSrc-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires:  python-devel

# This is what other packages should depend on, NOT the package name!
Provides:       wxPython = %{version}-%{release}
Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
Obsoletes:      wxPython <= 2.4.2.4-7

%description
wxPython is a GUI toolkit for the Python programming language. It allows
Python programmers to create programs with a robust, highly functional
graphical user interface, simply and easily. It is implemented as a Python
extension module (native code) that wraps the popular wxWindows cross
platform GUI library, which is written in C++.

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

%build
# Just build the wxPython part, not all of wxWindows which we already have
# in Fedora
cd wxPython
# included disutils is not multilib aware; use normal
rm -rf distutils
python setup.py %{buildflags} build

# There's a binary included in sources resulting in bogus libwx_gtk2-2.3.so.0
# dependency for the package, clean it up
cd demo/dllwidget
make clean

%install
rm -rf $RPM_BUILD_ROOT
cd wxPython
python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc wxPython/docs/ wxPython/demo/ wxPython/licence/ wxPython/samples/
%{_bindir}/*
# These binaries are now in the wxPython 2.6 package
%exclude %{_bindir}/helpviewer
%exclude %{_bindir}/img2png
%exclude %{_bindir}/img2py
%exclude %{_bindir}/img2xpm
%exclude %{_bindir}/xrced
%{python_sitearch}/wxPython/
%{python_sitearch}/wx/

%changelog
* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
- spec cleanups

* Mon Aug 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-8
- rename to compat-wxPythonGTK2

* Wed May 11 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.4.2.4-7
- d'oh, it's sitearch here

* Wed May 11 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.4.2.4-6
- rebuilt
- use %%python_sitelib macro
- drop dependency on python binary, python(abi) dependency is automatic

* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 2.4.2.4-5
- rebuilt

* Tue Feb 08 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:2.4.2.4-4
- remove included disutils - it is not multilib aware; this
  fixes build on x86_64

* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.3
- rename package to wxPythonGTK2, provide wxPython (see bug 927)
- dont ship binaries in /usr/share

* Thu Nov 20 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.2
- add missing buildrequires: python-devel, wxGTK2-gl

* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.1
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 16:17:20 -0000	1.1
+++ .cvsignore	6 Jan 2006 16:23:11 -0000	1.2
@@ -0,0 +1 @@
+wxPythonSrc-2.4.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 16:17:20 -0000	1.1
+++ sources	6 Jan 2006 16:23:11 -0000	1.2
@@ -0,0 +1 @@
+ea4eb68e10a0c2a9be643b35dcb78e41  wxPythonSrc-2.4.2.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 16:24:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:24:50 -0500
Subject: rpms/perl-Clone - New directory
Message-ID: <200601061624.k06GOqcD014297@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14289/perl-Clone

Log Message:
Directory /cvs/extras/rpms/perl-Clone added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:24:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:24:55 -0500
Subject: rpms/perl-Clone/devel - New directory
Message-ID: <200601061624.k06GOvRK014312@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14289/perl-Clone/devel

Log Message:
Directory /cvs/extras/rpms/perl-Clone/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:10 -0500
Subject: rpms/perl-Clone Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061625.k06GPCFJ014346@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14334

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Clone


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Clone
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:25 -0500
Subject: rpms/perl-Clone/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601061625.k06GPRKW014366@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14334/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Clone


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:47 -0500
Subject: rpms/perl-Clone import.log,1.1,1.2
Message-ID: <200601061626.k06GQKMZ014482@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14400

Modified Files:
	import.log 
Log Message:
auto-import perl-Clone-0.18-2 on branch devel from perl-Clone-0.18-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 16:25:10 -0000	1.1
+++ import.log	6 Jan 2006 16:25:47 -0000	1.2
@@ -0,0 +1 @@
+perl-Clone-0_18-2:HEAD:perl-Clone-0.18-2.src.rpm:1136564733



From fedora-extras-commits at redhat.com  Fri Jan  6 16:25:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 11:25:53 -0500
Subject: rpms/perl-Clone/devel perl-Clone.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601061626.k06GQQvM014486@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14400/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Clone.spec 
Log Message:
auto-import perl-Clone-0.18-2 on branch devel from perl-Clone-0.18-2.src.rpm


--- NEW FILE perl-Clone.spec ---
Name:           perl-Clone
Version:        0.18
Release:        2%{?dist}
Summary:        Recursively copy perl datatypes
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Clone
Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	perl(ExtUtils::ParseXS)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a clone() method which makes recursive
copies of nested hash, array, scalar and reference types,
including tied variables and objects.

clone() takes a scalar argument and an optional parameter that
can be used to limit the depth of the copy. To duplicate lists,
arrays or hashes, pass them in by reference.

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

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes
%{perl_vendorarch}/auto/Clone/
%{perl_vendorarch}/Clone.pm
%{_mandir}/man3/*.3*


%changelog
* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-2
- don't pass optflags twice
- remove .bs files

* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 16:25:25 -0000	1.1
+++ .cvsignore	6 Jan 2006 16:25:53 -0000	1.2
@@ -0,0 +1 @@
+Clone-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 16:25:25 -0000	1.1
+++ sources	6 Jan 2006 16:25:53 -0000	1.2
@@ -0,0 +1 @@
+7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 17:35:43 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:35:43 -0500
Subject: rpms/perl-String-CRC32 - New directory
Message-ID: <200601061735.k06HZjtb016940@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932/perl-String-CRC32

Log Message:
Directory /cvs/extras/rpms/perl-String-CRC32 added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 17:35:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:35:49 -0500
Subject: rpms/perl-String-CRC32/devel - New directory
Message-ID: <200601061735.k06HZpnx016955@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16932/perl-String-CRC32/devel

Log Message:
Directory /cvs/extras/rpms/perl-String-CRC32/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 17:38:41 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:38:41 -0500
Subject: rpms/perl-String-CRC32 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601061738.k06HciE4016999@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16987

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-String-CRC32


--- NEW FILE Makefile ---
# Top level Makefile for module perl-String-CRC32
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 17:38:57 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:38:57 -0500
Subject: rpms/perl-String-CRC32/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601061738.k06HcxfP017019@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16987/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-String-CRC32


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 17:42:43 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:42:43 -0500
Subject: rpms/perl-String-CRC32 import.log,1.1,1.2
Message-ID: <200601061743.k06HhFCm017140@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17106

Modified Files:
	import.log 
Log Message:
auto-import perl-String-CRC32-1.3-1 on branch devel from perl-String-CRC32-1.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 17:38:41 -0000	1.1
+++ import.log	6 Jan 2006 17:42:43 -0000	1.2
@@ -0,0 +1 @@
+perl-String-CRC32-1_3-1:HEAD:perl-String-CRC32-1.3-1.src.rpm:1136569332



From fedora-extras-commits at redhat.com  Fri Jan  6 17:42:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:42:49 -0500
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601061743.k06HhLMN017144@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17106/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-String-CRC32.spec 
Log Message:
auto-import perl-String-CRC32-1.3-1 on branch devel from perl-String-CRC32-1.3-1.src.rpm


--- NEW FILE perl-String-CRC32.spec ---
Summary:	Perl interface for cyclic redundency check generation
Name:		perl-String-CRC32
Version:	1.3
Release:	1%{?dist}
License:	Public Domain
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/String-CRC32/
Source0:	http://search.cpan.org/CPAN/authors/id/S/SO/SOENKE/String-CRC32-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The CRC32 module calculates CRC sums of 32 bit lengths. It generates the same
CRC values as ZMODEM, PKZIP, PICCHECK and many others. Despite its name, this
module is able to compute the checksum of files as well as strings.

%prep
%setup -q -n String-CRC32-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc README
%{perl_vendorarch}/String/
%{perl_vendorarch}/auto/String/
%{_mandir}/man3/String::CRC32.3pm*

%changelog
* Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 1.3-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 17:38:56 -0000	1.1
+++ .cvsignore	6 Jan 2006 17:42:49 -0000	1.2
@@ -0,0 +1 @@
+String-CRC32-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 17:38:56 -0000	1.1
+++ sources	6 Jan 2006 17:42:49 -0000	1.2
@@ -0,0 +1 @@
+7683cd1b183a6af807f20ee5fd076d0b  String-CRC32-1.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 17:47:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:47:10 -0500
Subject: owners owners.list,1.505,1.506
Message-ID: <200601061747.k06Hlh75017205@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17188

Modified Files:
	owners.list 
Log Message:
perl-String-CRC32



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.505
retrieving revision 1.506
diff -u -r1.505 -r1.506
--- owners.list	6 Jan 2006 16:22:14 -0000	1.505
+++ owners.list	6 Jan 2006 17:47:10 -0000	1.506
@@ -891,6 +891,7 @@
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundency check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 17:50:48 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:50:48 -0500
Subject: owners owners.list,1.506,1.507
Message-ID: <200601061751.k06HpLaw017242@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17223

Modified Files:
	owners.list 
Log Message:
Fix typo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -r1.506 -r1.507
--- owners.list	6 Jan 2006 17:47:10 -0000	1.506
+++ owners.list	6 Jan 2006 17:50:48 -0000	1.507
@@ -891,7 +891,7 @@
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundency check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 17:52:11 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Fri,  6 Jan 2006 12:52:11 -0500
Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.1,1.2
Message-ID: <200601061752.k06Hqhgc017292@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17250

Modified Files:
	perl-String-CRC32.spec 
Log Message:
Fix typo



Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-String-CRC32.spec	6 Jan 2006 17:42:49 -0000	1.1
+++ perl-String-CRC32.spec	6 Jan 2006 17:52:11 -0000	1.2
@@ -1,4 +1,4 @@
-Summary:	Perl interface for cyclic redundency check generation
+Summary:	Perl interface for cyclic redundancy check generation
 Name:		perl-String-CRC32
 Version:	1.3
 Release:	1%{?dist}



From fedora-extras-commits at redhat.com  Fri Jan  6 17:52:38 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  6 Jan 2006 12:52:38 -0500
Subject: rpms/compat-wxGTK/devel compat-wxGTK.spec,1.1,1.2
Message-ID: <200601061753.k06HrA8Q017308@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17274/devel

Modified Files:
	compat-wxGTK.spec 
Log Message:

Fix spec for FC5 modular X.



Index: compat-wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/compat-wxGTK.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxGTK.spec	6 Jan 2006 16:14:52 -0000	1.1
+++ compat-wxGTK.spec	6 Jan 2006 17:52:38 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           compat-wxGTK
 Version:        2.4.2
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Compatibility version of the wxWidgets GTK GUI library
 License:        BSD
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@
 
 BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel libjpeg-devel libtiff-devel
-BuildRequires:  libGL libGLU
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 Requires:       %{name}-common = %{version}-%{release}
 Obsoletes:      wxGTK <= 2.4.2-12
 
@@ -330,6 +330,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-16
+- FC5 modular X deps
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-15
 - spec file cleanups
 



From fedora-extras-commits at redhat.com  Fri Jan  6 20:16:16 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri,  6 Jan 2006 15:16:16 -0500
Subject: fedora-security/audit fc4,1.118,1.119 fc5,1.29,1.30
Message-ID: <200601062016.k06KGGWO023041@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23021

Modified Files:
	fc4 fc5 
Log Message:
Add lots of xpdf CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc4	6 Jan 2006 15:26:47 -0000	1.118
+++ fc4	6 Jan 2006 20:16:08 -0000	1.119
@@ -4,6 +4,27 @@
 ** are items that need attention
 
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3624 VULNERABLE (cups)
+CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176813
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- fc5	6 Jan 2006 15:26:47 -0000	1.29
+++ fc5	6 Jan 2006 20:16:08 -0000	1.30
@@ -13,6 +13,26 @@
 ** are items that need attention
 
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2005-3628 VULNERABLE (cups)
+CVE-2005-3628 VULNERABLE (poppler)
+CVE-2005-3628 VULNERABLE (xpdf)
+CVE-2005-3628 backport (kdegraphics)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (kdegraphics)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (kdegraphics)
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (kdegraphics)
+CVE-2005-3624 VULNERABLE (cups)
+CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (kdegraphics)
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)



From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:19 -0500
Subject: rpms/perl-Text-Diff - New directory
Message-ID: <200601062122.k06LMLlM024986@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24978/perl-Text-Diff

Log Message:
Directory /cvs/extras/rpms/perl-Text-Diff added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:25 -0500
Subject: rpms/perl-Text-Diff/devel - New directory
Message-ID: <200601062122.k06LMRVq025001@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24978/perl-Text-Diff/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-Diff/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:43 -0500
Subject: rpms/perl-Text-Diff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601062122.k06LMjcw025035@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25023

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-Diff


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-Diff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan  6 21:22:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:22:49 -0500
Subject: rpms/perl-Text-Diff/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601062122.k06LMpOh025055@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25023/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-Diff


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan  6 21:23:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:23:05 -0500
Subject: owners owners.list,1.507,1.508
Message-ID: <200601062123.k06LNev0025111@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25074

Modified Files:
	owners.list 
Log Message:
Add perl-Text-Diff.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -r1.507 -r1.508
--- owners.list	6 Jan 2006 17:50:48 -0000	1.507
+++ owners.list	6 Jan 2006 21:23:04 -0000	1.508
@@ -915,6 +915,7 @@
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Jan  6 21:23:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:23:43 -0500
Subject: rpms/perl-Text-Diff import.log,1.1,1.2
Message-ID: <200601062124.k06LOF75025149@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25115

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-Diff-0.35-2 on branch devel from perl-Text-Diff-0.35-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	6 Jan 2006 21:22:43 -0000	1.1
+++ import.log	6 Jan 2006 21:23:42 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-Diff-0_35-2:HEAD:perl-Text-Diff-0.35-2.src.rpm:1136582596



From fedora-extras-commits at redhat.com  Fri Jan  6 21:24:02 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  6 Jan 2006 16:24:02 -0500
Subject: rpms/perl-Text-Diff/devel perl-Text-Diff.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601062124.k06LOYTK025153@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Diff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25115/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-Diff.spec 
Log Message:
auto-import perl-Text-Diff-0.35-2 on branch devel from perl-Text-Diff-0.35-2.src.rpm


--- NEW FILE perl-Text-Diff.spec ---
Name:           perl-Text-Diff
Version:        0.35
Release:        2%{?dist}
Summary:        Text::Diff Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Diff/
Source0:        http://www.cpan.org/modules/by-module/Text/Text-Diff-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Algorithm::Diff)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Diff - Perform diffs on files and record sets.

%prep
%setup -q -n Text-Diff-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Sep 16 2005 Steven Pritchard <steve at kspei.com> 0.35-2
- Minor spec cleanup.

* Sat Aug 27 2005 Steven Pritchard <steve at kspei.com> 0.35-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	6 Jan 2006 21:22:48 -0000	1.1
+++ .cvsignore	6 Jan 2006 21:24:01 -0000	1.2
@@ -0,0 +1 @@
+Text-Diff-0.35.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Diff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	6 Jan 2006 21:22:48 -0000	1.1
+++ sources	6 Jan 2006 21:24:01 -0000	1.2
@@ -0,0 +1 @@
+4931662ea353384dec2a54a71b26ee8c  Text-Diff-0.35.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan  6 23:07:27 2006
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Fri,  6 Jan 2006 18:07:27 -0500
Subject: rpms/balsa/devel .cvsignore, 1.9, 1.10 balsa.spec, 1.12,
	1.13 sources, 1.9, 1.10
Message-ID: <200601062307.k06N7xGH030960@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30939

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to 2.3.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	28 Dec 2005 16:08:31 -0000	1.9
+++ .cvsignore	6 Jan 2006 23:07:17 -0000	1.10
@@ -1,2 +1,2 @@
-balsa-2.3.8.tar.bz2
 gmime-2.1.17.tar.bz2
+balsa-2.3.9.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- balsa.spec	28 Dec 2005 16:08:31 -0000	1.12
+++ balsa.spec	6 Jan 2006 23:07:17 -0000	1.13
@@ -2,7 +2,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.8
+Version:        2.3.9
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
+- update to 2.3.9.
+
 * Wed Dec 28 2005 Pawel Salek <pawsa at theochem.kth.se> - 2.3.8-1
 - update to 2.3.8; enable gtkhtml and gtkspell.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	28 Dec 2005 16:08:31 -0000	1.9
+++ sources	6 Jan 2006 23:07:17 -0000	1.10
@@ -1,2 +1,2 @@
-517c0a1cbd4dc85ec06a6c7b0f522ffa  balsa-2.3.8.tar.bz2
 4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
+65872d953f0c3c7d2dc50bb09f800629  balsa-2.3.9.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan  7 03:59:31 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Fri,  6 Jan 2006 22:59:31 -0500
Subject: owners owners.list,1.508,1.509
Message-ID: <200601070400.k07403De006502@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6441

Modified Files:
	owners.list 
Log Message:
Assign ownership of libapreq2 to bojan at rexursive.com


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -r1.508 -r1.509
--- owners.list	6 Jan 2006 21:23:04 -0000	1.508
+++ owners.list	7 Jan 2006 03:59:30 -0000	1.509
@@ -477,7 +477,7 @@
 Fedora Extras|lib3ds|The 3D Studio File Format Library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|libAfterImage|A generic image manipulation library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libannodex|Library for annotating and indexing networked media|thomas at apestaart.org|extras-qa at fedoraproject.org|
-Fedora Extras|libapreq2|Apache HTTP request library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libapreq2|Apache HTTP request library|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|libassuan|GnuPG IPC library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libbinio|A binary stream interface class library for C++|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libcaca|Library for Colour AsCii Art, text mode graphics|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan  7 05:18:37 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:18:37 -0500
Subject: rpms/python-feedparser - New directory
Message-ID: <200601070518.k075IdZ6010183@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10175/python-feedparser

Log Message:
Directory /cvs/extras/rpms/python-feedparser added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 05:18:43 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:18:43 -0500
Subject: rpms/python-feedparser/devel - New directory
Message-ID: <200601070518.k075IjVe010199@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10175/python-feedparser/devel

Log Message:
Directory /cvs/extras/rpms/python-feedparser/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 05:18:55 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:18:55 -0500
Subject: rpms/python-feedparser Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601070518.k075IvKZ010236@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10222

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-feedparser


--- NEW FILE Makefile ---
# Top level Makefile for module python-feedparser
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan  7 05:19:00 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:19:00 -0500
Subject: rpms/python-feedparser/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601070519.k075J3SL010260@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10222/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-feedparser


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan  7 05:19:19 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:19:19 -0500
Subject: rpms/python-feedparser import.log,1.1,1.2
Message-ID: <200601070519.k075Jpuk010333@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10295

Modified Files:
	import.log 
Log Message:
auto-import python-feedparser-4.0.2-2 on branch devel from python-feedparser-4.0.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jan 2006 05:18:54 -0000	1.1
+++ import.log	7 Jan 2006 05:19:18 -0000	1.2
@@ -0,0 +1 @@
+python-feedparser-4_0_2-2:HEAD:python-feedparser-4.0.2-2.src.rpm:1136611155



From fedora-extras-commits at redhat.com  Sat Jan  7 05:19:24 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:19:24 -0500
Subject: rpms/python-feedparser/devel python-feedparser.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601070519.k075JvjS010337@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10295/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-feedparser.spec 
Log Message:
auto-import python-feedparser-4.0.2-2 on branch devel from python-feedparser-4.0.2-2.src.rpm


--- NEW FILE python-feedparser.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-feedparser
Version:        4.0.2
Release:        2%{?dist}
Summary:        Parse RSS and Atom feeds in Python

Group:          Development/Languages
License:        BSD-ish
URL:            http://feedparser.org/
Source0:        http://download.sourceforge.net/feedparser/feedparser-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
Universal Feed Parser is a Python module for downloading and parsing 
syndicated feeds. It can handle RSS 0.90, Netscape RSS 0.91, 
Userland RSS 0.91, RSS 0.92, RSS 0.93, RSS 0.94, RSS 1.0, RSS 2.0, 
Atom 0.3, Atom 1.0, and CDF feeds. It also parses several popular extension 
modules, including Dublin Core and Apple's iTunes extensions.


%prep
%setup -q -c


%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
cp -a docs html
chmod 0644 LICENSE README
 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE README html
%{python_sitelib}/*.py
%{python_sitelib}/*.pyc
%ghost %{python_sitelib}/*.pyo


%changelog
* Sat Jan 07 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-2
- Set sane permissions on doc files.

* Wed Jan 04 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-1
- Initial build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2006 05:19:00 -0000	1.1
+++ .cvsignore	7 Jan 2006 05:19:24 -0000	1.2
@@ -0,0 +1 @@
+feedparser-4.0.2.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2006 05:19:00 -0000	1.1
+++ sources	7 Jan 2006 05:19:24 -0000	1.2
@@ -0,0 +1 @@
+85cc43faf40f8aefdb5885bdabc1a94c  feedparser-4.0.2.zip



From fedora-extras-commits at redhat.com  Sat Jan  7 05:25:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Sat,  7 Jan 2006 00:25:58 -0500
Subject: owners owners.list,1.509,1.510
Message-ID: <200601070526.k075QV72010441@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10424/owners

Modified Files:
	owners.list 
Log Message:
Adding ownership of python-feedparser



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -r1.509 -r1.510
--- owners.list	7 Jan 2006 03:59:30 -0000	1.509
+++ owners.list	7 Jan 2006 05:25:58 -0000	1.510
@@ -1017,6 +1017,7 @@
 Fedora Extras|python-docutils|A system for processing plaintext documentation|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-durus|A Python persistent Object Database|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-elementtree|Fast XML parser and writer|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-feedparser|Parse RSS and Atom feeds in Python|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-formencode|FormEncode is a validation and form generation package.|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan  7 09:37:27 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 04:37:27 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.3,1.4
Message-ID: <200601070937.k079bxqT019227@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19210

Modified Files:
	streamtuner.spec 
Log Message:
desktop-file-utils added to deps again


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
+++ streamtuner.spec	7 Jan 2006 09:37:26 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 7%{?dist}
+Release: 8%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -15,6 +15,7 @@
 Requires(post): desktop-file-utils, scrollkeeper
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
+BuildRequires: desktop-file-utils
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
@@ -115,6 +116,9 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
+- desktop-file-utils dependency added again
+
 * Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
 - desktop-file-utils dependency removed
 



From fedora-extras-commits at redhat.com  Sat Jan  7 09:47:07 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 04:47:07 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.4,1.5
Message-ID: <200601070947.k079ldVs019267@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19250

Modified Files:
	streamtuner.spec 
Log Message:
cosmetics


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- streamtuner.spec	7 Jan 2006 09:37:26 -0000	1.4
+++ streamtuner.spec	7 Jan 2006 09:47:06 -0000	1.5
@@ -15,8 +15,8 @@
 Requires(post): desktop-file-utils, scrollkeeper
 Requires(postun): desktop-file-utils, scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
-BuildRequires: desktop-file-utils
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
+BuildRequires: desktop-file-utils
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 



From fedora-extras-commits at redhat.com  Sat Jan  7 10:13:24 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 05:13:24 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.5,1.6
Message-ID: <200601071013.k07ADvgJ021053@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21015

Modified Files:
	streamtuner.spec 
Log Message:
desktop-file-utils dependency removed from requires(post) and requires(postun)


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- streamtuner.spec	7 Jan 2006 09:47:06 -0000	1.5
+++ streamtuner.spec	7 Jan 2006 10:13:24 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 8%{?dist}
+Release: 9%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -12,8 +12,8 @@
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, bmp, xterm
-Requires(post): desktop-file-utils, scrollkeeper
-Requires(postun): desktop-file-utils, scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
 BuildRequires: desktop-file-utils
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
+- desktop-file-utils dependency removed from requires(post) and requires(postun)  
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
 - desktop-file-utils dependency added again
 



From fedora-extras-commits at redhat.com  Sat Jan  7 10:18:09 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 05:18:09 -0500
Subject: rpms/streamtuner/FC-3 streamtuner.spec,1.3,1.4
Message-ID: <200601071018.k07AIf9B021141@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21124

Modified Files:
	streamtuner.spec 
Log Message:
sync specfile with FC-4


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
+++ streamtuner.spec	7 Jan 2006 10:18:09 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 7%{?dist}
+Release: 9%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -12,10 +12,11 @@
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, bmp, xterm
-Requires(post): desktop-file-utils, scrollkeeper
-Requires(postun): desktop-file-utils, scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
+BuildRequires: desktop-file-utils
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 
@@ -115,6 +116,12 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
+- desktop-file-utils dependency removed from requires(post) and requires(postun)  
+
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
+- desktop-file-utils dependency added again
+
 * Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
 - desktop-file-utils dependency removed
 



From fedora-extras-commits at redhat.com  Sat Jan  7 10:23:02 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Sat,  7 Jan 2006 05:23:02 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.3,1.4
Message-ID: <200601071023.k07ANhDp021218@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21199

Modified Files:
	streamtuner.spec 
Log Message:
sync specfile with FC-4


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- streamtuner.spec	6 Jan 2006 15:31:53 -0000	1.3
+++ streamtuner.spec	7 Jan 2006 10:23:02 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 7%{?dist}
+Release: 9%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -12,10 +12,11 @@
 License: BSD
 Group: Applications/Internet
 Requires: python, pygtk2, htmlview, bmp, xterm
-Requires(post): desktop-file-utils, scrollkeeper
-Requires(postun): desktop-file-utils, scrollkeeper
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
 BuildRequires: taglib-devel, libidn-devel, pygtk2-devel, libxml2-devel, gettext
+BuildRequires: desktop-file-utils
 Obsoletes: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
 Provides: streamtuner-live365, streamtuner-local, streamtuner-xiph, streamtuner-python
                 
@@ -115,6 +116,12 @@
 
 
 %changelog
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
+- desktop-file-utils dependency removed from requires(post) and requires(postun)  
+
+* Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-8
+- desktop-file-utils dependency added again
+
 * Fri Jan  6 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-7
 - desktop-file-utils dependency removed
 



From fedora-extras-commits at redhat.com  Sat Jan  7 17:58:56 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:58:56 -0500
Subject: rpms/geos - New directory
Message-ID: <200601071758.k07Hwwnh002328@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/geos

Log Message:
Directory /cvs/extras/rpms/geos added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 17:59:02 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:59:02 -0500
Subject: rpms/geos/devel - New directory
Message-ID: <200601071759.k07Hx4L3002343@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2320/geos/devel

Log Message:
Directory /cvs/extras/rpms/geos/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan  7 17:59:23 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:59:23 -0500
Subject: rpms/geos Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601071759.k07HxPcZ002377@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365

Added Files:
	Makefile import.log 
Log Message:
Setup of module geos


--- NEW FILE Makefile ---
# Top level Makefile for module geos
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan  7 17:59:29 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 12:59:29 -0500
Subject: rpms/geos/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601071759.k07HxVVT002397@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2365/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module geos


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan  7 18:00:41 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 13:00:41 -0500
Subject: rpms/geos import.log,1.1,1.2
Message-ID: <200601071801.k07I1CNt004121@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2445

Modified Files:
	import.log 
Log Message:
auto-import geos-2.2.1-1 on branch devel from geos-2.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/geos/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Jan 2006 17:59:23 -0000	1.1
+++ import.log	7 Jan 2006 18:00:40 -0000	1.2
@@ -0,0 +1 @@
+geos-2_2_1-1:HEAD:geos-2.2.1-1.src.rpm:1136656826



From fedora-extras-commits at redhat.com  Sat Jan  7 18:00:46 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 13:00:46 -0500
Subject: rpms/geos/devel geos-config.in.patch, NONE, 1.1 geos.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601071801.k07I1Lxi004125@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2445/devel

Modified Files:
	.cvsignore sources 
Added Files:
	geos-config.in.patch geos.spec 
Log Message:
auto-import geos-2.2.1-1 on branch devel from geos-2.2.1-1.src.rpm

geos-config.in.patch:

--- NEW FILE geos-config.in.patch ---
--- tools/geos-config.in~	2006-01-05 16:55:49.000000000 -0800
+++ tools/geos-config.in	2006-01-05 16:56:33.000000000 -0800
@@ -32,13 +32,13 @@
     echo @VERSION@
      ;;
     --cflags)
-    echo -I at prefix@/include 
+    echo 
       ;;
     --libs)
-      echo -L at prefix@/lib -lgeos
+      echo -lgeos
       ;;
     --ldflags)
-      echo -L at prefix@/lib
+      echo 
       ;;
     --includes)
       echo @prefix@/include


--- NEW FILE geos.spec ---
Name: geos
Version: 2.2.1
Release: 1
Summary: GEOS is a C++ port of the Java Topology Suite

Group: Applications/Engineering
License: LGPL
URL: http://geos.refractions.net
Source0: http://geos.refractions.net/%{name}-%{version}.tar.bz2
Patch0: geos-config.in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen

%description
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
Suite (JTS). As such, it aims to contain the complete functionality of 
JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial 
predicate functions and spatial operators, as well as specific JTS topology 
functions such as IsValid()

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

%description devel
GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology 
Suite (JTS). As such, it aims to contain the complete functionality of 
JTS in C++. This includes all the OpenGIS "Simple Features for SQL" spatial 
predicate functions and spatial operators, as well as specific JTS topology 
functions such as IsValid()

This package contains the development files to build applications that 
use GEOS

%prep
%setup -q
%patch0 -p0 -b .buildroot 

%build
%configure --disable-static --disable-dependency-tracking
make %{?_smp_mflags}

# Make doxygen documentation files
cd doc
make doxygen-html

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO
%{_libdir}/libgeos*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/doxygen_docs
%{_bindir}/geos-config
%{_includedir}/*
%{_libdir}/*.so
%exclude %{_bindir}/XMLTester
%exclude %{_libdir}/*.la

%changelog
* Sat Dec 31 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-1
- Updated to address review comments in bug 17039

* Fri Dec 30 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-1
- Initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Jan 2006 17:59:29 -0000	1.1
+++ .cvsignore	7 Jan 2006 18:00:46 -0000	1.2
@@ -0,0 +1 @@
+geos-2.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Jan 2006 17:59:29 -0000	1.1
+++ sources	7 Jan 2006 18:00:46 -0000	1.2
@@ -0,0 +1 @@
+272132bfb64422915d0f748f5e26932b  geos-2.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan  7 18:06:37 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat,  7 Jan 2006 13:06:37 -0500
Subject: owners owners.list,1.510,1.511
Message-ID: <200601071807.k07I7AVJ004211@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4194

Modified Files:
	owners.list 
Log Message:
Added entry for geos



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -r1.510 -r1.511
--- owners.list	7 Jan 2006 05:25:58 -0000	1.510
+++ owners.list	7 Jan 2006 18:06:15 -0000	1.511
@@ -265,6 +265,7 @@
 Fedora Extras|gentium-fonts|SIL Gentium fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gentoo|Graphical file management program in GTK+ for Linux|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|geomview|An interactive 3D viewing program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|geos|GEOS is a C++ port of the Java Topology Suite|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gfontview|A font viewer for Type 1 and TrueType fonts|mpeters at mac.com|extras-qa at fedoraproject.org|ksfiles at gmail.com
 Fedora Extras|gforth|Fast and portable implementation of the ANS Forth language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ghasher|GUI hasher for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan  7 21:09:32 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 16:09:32 -0500
Subject: rpms/istanbul/devel istanbul.spec,1.2,1.3
Message-ID: <200601072110.k07LA7vR009608@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/istanbul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9582

Modified Files:
	istanbul.spec 
Log Message:
* Sat Jan 07 2006 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-6
- Change requirements to gstreamer08* to match rawhide change



Index: istanbul.spec
===================================================================
RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- istanbul.spec	18 Aug 2005 22:22:57 -0000	1.2
+++ istanbul.spec	7 Jan 2006 21:09:29 -0000	1.3
@@ -8,27 +8,23 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.1.1 
-Release: 5
+Release: 6
 License: GPL
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
 Source: http://http://live.hujjat.org/istanbul-%{version}.tar.bz2
-#Patch0: istanbul-0.1.0-pythondir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: pygtk2 >= %{pygtk2_version}
 Requires: gnome-desktop >= 2.6.0
-Requires: gstreamer >= %gstreamer_version
-Requires: gstreamer-plugins >= %gstreamer_plugins_version
+Requires: gstreamer08 >= %gstreamer_version
+Requires: gstreamer08-plugins >= %gstreamer_plugins_version
 Requires: gstreamer-python
 
 BuildRequires: python, python-devel
 BuildRequires: desktop-file-utils
-BuildRequires: gstreamer-plugins-devel >= %gstreamer_plugins_version
-BuildRequires: gstreamer-python-devel, gtk2-devel 
-#BuildRequires: gstreamer-devel >= %gstreamer_version
-#BuildRequires: automake, autoconf 
-#BuildRequires: gnome-common
+BuildRequires: gstreamer08-plugins-devel >= %gstreamer_plugins_version
+BuildRequires: gstreamer08-python-devel, gtk2-devel 
 
 %description
 Istanbul is a desktop session recorder.  You can use it to record your 
@@ -96,6 +92,9 @@
 %{python_sitelib}/%{name}/configure/*.py*
 
 %changelog
+* Sat Jan 07 2006 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-6
+- Change requirements to gstreamer08* to match rawhide change
+
 * Thu Aug 18 2005 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-5
 - rebuild
 



From fedora-extras-commits at redhat.com  Sat Jan  7 21:48:31 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 16:48:31 -0500
Subject: rpms/glabels import.log,1.2,1.3
Message-ID: <200601072149.k07Ln3ps009869@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835

Modified Files:
	import.log 
Log Message:
auto-import glabels-2.0.4-1 on branch devel from glabels-2.0.4-1.src.rpm
update to new stable version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glabels/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	6 Jul 2005 14:35:20 -0000	1.2
+++ import.log	7 Jan 2006 21:48:31 -0000	1.3
@@ -1 +1,2 @@
 glabels-2_0_3-1:HEAD:glabels-2.0.3-1.src.rpm:1120660509
+glabels-2_0_4-1:HEAD:glabels-2.0.4-1.src.rpm:1136670507



From fedora-extras-commits at redhat.com  Sat Jan  7 21:48:37 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 16:48:37 -0500
Subject: rpms/glabels/devel .cvsignore, 1.2, 1.3 glabels.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601072149.k07Ln9UQ009874@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9835/devel

Modified Files:
	.cvsignore glabels.spec sources 
Log Message:
auto-import glabels-2.0.4-1 on branch devel from glabels-2.0.4-1.src.rpm
update to new stable version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glabels/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jul 2005 14:35:20 -0000	1.2
+++ .cvsignore	7 Jan 2006 21:48:37 -0000	1.3
@@ -1 +1 @@
-glabels-2.0.3.tar.gz
+glabels-2.0.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/extras/rpms/glabels/devel/glabels.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glabels.spec	18 Aug 2005 22:11:38 -0000	1.3
+++ glabels.spec	7 Jan 2006 21:48:37 -0000	1.4
@@ -1,12 +1,12 @@
 Name: glabels
-Version: 2.0.3
-Release: 3%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: A program for creating labels and business cards for GNOME
 
 Group: Applications/Publishing
 License: GPL
 URL: http://glabels.sf.net
-Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz
+Source0: http://dl.sf.net/glabels/glabels-2.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1
@@ -99,6 +99,9 @@
 %exclude %{_libdir}/libglabels.la
 
 %changelog
+* Sat Jan 01 2006 Jef Spaleta <jspaleta at gmail.com> - 2.0.4-1
+- Update to new stable upstream version
+
 * Thu Aug 18 2005 Jef Spaleta <jspaleta at gmail.com> - 2.0.3-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glabels/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jul 2005 14:35:20 -0000	1.2
+++ sources	7 Jan 2006 21:48:37 -0000	1.3
@@ -1 +1 @@
-c077afdeac5ba0c685e404eea1d794e8  glabels-2.0.3.tar.gz
+76a6f1f8055f75ab4204fdca79627006  glabels-2.0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan  7 22:38:38 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 17:38:38 -0500
Subject: rpms/glabels import.log,1.3,1.4
Message-ID: <200601072239.k07MdAk0011876@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842

Modified Files:
	import.log 
Log Message:
auto-import glabels-2.0.4-1 on branch FC-4 from glabels-2.0.4-1.src.rpm
update to new stable version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glabels/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	7 Jan 2006 21:48:31 -0000	1.3
+++ import.log	7 Jan 2006 22:38:38 -0000	1.4
@@ -1,2 +1,3 @@
 glabels-2_0_3-1:HEAD:glabels-2.0.3-1.src.rpm:1120660509
 glabels-2_0_4-1:HEAD:glabels-2.0.4-1.src.rpm:1136670507
+glabels-2_0_4-1:FC-4:glabels-2.0.4-1.src.rpm:1136673514



From fedora-extras-commits at redhat.com  Sat Jan  7 22:38:44 2006
From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta))
Date: Sat,  7 Jan 2006 17:38:44 -0500
Subject: rpms/glabels/FC-4 .cvsignore, 1.2, 1.3 glabels.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601072239.k07MdGR4011881@cvs-int.fedora.redhat.com>

Author: jspaleta

Update of /cvs/extras/rpms/glabels/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842/FC-4

Modified Files:
	.cvsignore glabels.spec sources 
Log Message:
auto-import glabels-2.0.4-1 on branch FC-4 from glabels-2.0.4-1.src.rpm
update to new stable version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glabels/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jul 2005 14:35:20 -0000	1.2
+++ .cvsignore	7 Jan 2006 22:38:43 -0000	1.3
@@ -1 +1 @@
-glabels-2.0.3.tar.gz
+glabels-2.0.4.tar.gz


Index: glabels.spec
===================================================================
RCS file: /cvs/extras/rpms/glabels/FC-4/glabels.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glabels.spec	8 Jul 2005 04:16:32 -0000	1.2
+++ glabels.spec	7 Jan 2006 22:38:43 -0000	1.3
@@ -1,12 +1,12 @@
 Name: glabels
-Version: 2.0.3
-Release: 2%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 Summary: A program for creating labels and business cards for GNOME
 
 Group: Applications/Publishing
 License: GPL
 URL: http://glabels.sf.net
-Source0: http://dl.sf.net/glabels/glabels-2.0.3.tar.gz
+Source0: http://dl.sf.net/glabels/glabels-2.0.4.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libgnomeui-devel >= 2.0, libglade2-devel >= 2.0.1
@@ -99,6 +99,12 @@
 %exclude %{_libdir}/libglabels.la
 
 %changelog
+* Sat Jan 01 2006 Jef Spaleta <jspaleta at gmail.com> - 2.0.4-1
+- Update to new stable upstream version
+
+* Thu Aug 18 2005 Jef Spaleta <jspaleta at gmail.com> - 2.0.3-3
+- rebuild
+
 * Thu Jul 7 2005 Jef Spaleta <jspaleta at gmail.com> - 2.0.3-2
 - use Source0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glabels/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jul 2005 14:35:20 -0000	1.2
+++ sources	7 Jan 2006 22:38:43 -0000	1.3
@@ -1 +1 @@
-c077afdeac5ba0c685e404eea1d794e8  glabels-2.0.3.tar.gz
+76a6f1f8055f75ab4204fdca79627006  glabels-2.0.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan  7 23:15:33 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  7 Jan 2006 18:15:33 -0500
Subject: rpms/wine/devel wine.spec,1.8,1.9
Message-ID: <200601072316.k07NG64x013851@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13832

Modified Files:
	wine.spec 
Log Message:
- more new BR



Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine.spec	6 Jan 2006 12:58:02 -0000	1.8
+++ wine.spec	7 Jan 2006 23:15:33 -0000	1.9
@@ -48,13 +48,15 @@
 BuildRequires:  fontforge
 # modular x
 BuildRequires:  libX11-devel
-BuildRequires:  mesa-libGL-devel mesa-libGLU-devel mesa-libGLw-devel
+BuildRequires:  mesa-libGL-devel mesa-libGLU-devel
 BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 BuildRequires:  libXrandr-devel libXrender-devel libXext-devel
 
 BuildRequires:  fontconfig-devel
 BuildRequires:  giflib-devel
 BuildRequires:  cups-devel
+BuildRequires:  libXmu-devel
+BuildRequires:  libXi-devel
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database



From fedora-extras-commits at redhat.com  Sun Jan  8 04:36:19 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat,  7 Jan 2006 23:36:19 -0500
Subject: rpms/nethack-vultures/FC-3 .cvsignore, 1.4,
	1.5 nethack-vultures.spec, 1.14, 1.15 sources, 1.4, 1.5
Message-ID: <200601080436.k084apnl023195@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23140/FC-3

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgrade tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2005 17:29:25 -0000	1.4
+++ .cvsignore	8 Jan 2006 04:36:18 -0000	1.5
@@ -1 +1 @@
-vultures-1.11.1-full.tar.bz2
+vultures-1.11.2-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nethack-vultures.spec	24 Dec 2005 06:48:06 -0000	1.14
+++ nethack-vultures.spec	8 Jan 2006 04:36:18 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.1
-Release:        3%{?dist}
+Version:        1.11.2
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
+- Upgraded the tarball to the latest version.
+
 * Fri Dec 23 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.1-3
 - Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2005 17:29:25 -0000	1.4
+++ sources	8 Jan 2006 04:36:18 -0000	1.5
@@ -1 +1 @@
-d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2
+2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  8 04:36:25 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat,  7 Jan 2006 23:36:25 -0500
Subject: rpms/nethack-vultures/FC-4 .cvsignore, 1.4,
	1.5 nethack-vultures.spec, 1.15, 1.16 sources, 1.4, 1.5
Message-ID: <200601080436.k084awrv023200@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23140/FC-4

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgrade tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	21 Dec 2005 17:29:31 -0000	1.4
+++ .cvsignore	8 Jan 2006 04:36:25 -0000	1.5
@@ -1 +1 @@
-vultures-1.11.1-full.tar.bz2
+vultures-1.11.2-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack-vultures.spec	24 Dec 2005 06:48:13 -0000	1.15
+++ nethack-vultures.spec	8 Jan 2006 04:36:25 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.1
-Release:        3%{?dist}
+Version:        1.11.2
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
+- Upgraded the tarball to the latest version.
+
 * Fri Dec 23 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.1-3
 - Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2005 17:29:31 -0000	1.4
+++ sources	8 Jan 2006 04:36:25 -0000	1.5
@@ -1 +1 @@
-d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2
+2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  8 04:36:31 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sat,  7 Jan 2006 23:36:31 -0500
Subject: rpms/nethack-vultures/devel .cvsignore, 1.5,
	1.6 nethack-vultures.spec, 1.15, 1.16 sources, 1.4, 1.5
Message-ID: <200601080437.k084b33K023205@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23140/devel

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Log Message:
Upgrade tarball




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 17:29:37 -0000	1.5
+++ .cvsignore	8 Jan 2006 04:36:31 -0000	1.6
@@ -1 +1 @@
-vultures-1.11.1-full.tar.bz2
+vultures-1.11.2-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack-vultures.spec	24 Dec 2005 06:48:19 -0000	1.15
+++ nethack-vultures.spec	8 Jan 2006 04:36:31 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.1
-Release:        3%{?dist}
+Version:        1.11.2
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
+- Upgraded the tarball to the latest version.
+
 * Fri Dec 23 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.1-3
 - Modified the specfile to duplicate the slash'em contents into the vultures dirs before rm'ing, to fix a missing-file crash
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	21 Dec 2005 17:29:37 -0000	1.4
+++ sources	8 Jan 2006 04:36:31 -0000	1.5
@@ -1 +1 @@
-d1456849d0d854d29c5d510382f49287  vultures-1.11.1-full.tar.bz2
+2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan  8 06:37:24 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 01:37:24 -0500
Subject: rpms/obby/FC-4 obby.spec,1.8,1.9
Message-ID: <200601080637.k086bvGo027023@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27002

Modified Files:
	obby.spec 
Log Message:
rebuild


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- obby.spec	4 Jan 2006 04:32:58 -0000	1.8
+++ obby.spec	8 Jan 2006 06:37:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           obby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Rebuild
+
 * Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 - Remove broken build workarounds



From fedora-extras-commits at redhat.com  Sun Jan  8 06:48:17 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 01:48:17 -0500
Subject: rpms/obby/FC-4 obby.spec,1.9,1.10
Message-ID: <200601080648.k086mn2o027156@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27139

Modified Files:
	obby.spec 
Log Message:
typos


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- obby.spec	8 Jan 2006 06:37:24 -0000	1.9
+++ obby.spec	8 Jan 2006 06:48:17 -0000	1.10
@@ -65,10 +65,10 @@
 
 
 %changelog
-* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
 - Rebuild
 
-* Tue Jan 03 2007 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+* Tue Jan 03 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 - Remove broken build workarounds
 



From fedora-extras-commits at redhat.com  Sun Jan  8 06:49:29 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 01:49:29 -0500
Subject: rpms/gobby/FC-4 .cvsignore, 1.2, 1.3 gobby.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601080650.k086o1BS027189@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27168

Modified Files:
	.cvsignore gobby.spec sources 
Log Message:
0.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Oct 2005 19:13:54 -0000	1.2
+++ .cvsignore	8 Jan 2006 06:49:29 -0000	1.3
@@ -1 +1 @@
-gobby-0.2.2.tar.gz
+gobby-0.3.0.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gobby.spec	22 Oct 2005 01:47:16 -0000	1.2
+++ gobby.spec	8 Jan 2006 06:49:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gobby
-Version:        0.2.2
-Release:        6%{?dist}
+Version:        0.3.0
+Release:        4%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils
+BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -62,10 +62,22 @@
 %doc README NEWS AUTHORS COPYING ChangeLog TODO
 %{_bindir}/gobby
 %{_datadir}/applications/fedora-gobby.desktop
-%{_datadir}/pixmaps/gobby.png
+%{_datadir}/pixmaps/*
 
 
 %changelog
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
+- Rebuild
+
+* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Add libXau-devel to BuildRequires
+
+* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
+- Bump to 0.3.0rc3
+
 * Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
 - Update Summary
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Oct 2005 19:13:54 -0000	1.2
+++ sources	8 Jan 2006 06:49:29 -0000	1.3
@@ -1 +1 @@
-9a1b61ee3aebe737e5d9918f7601b5d4  gobby-0.2.2.tar.gz
+1b674f42654cc1960d37e0a6a2fcff1f  gobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 07:16:37 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 02:16:37 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.3,1.4
Message-ID: <200601080717.k087H9BW029060@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29034

Modified Files:
	gobby.spec 
Log Message:
update BR


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gobby.spec	8 Jan 2006 06:49:29 -0000	1.3
+++ gobby.spec	8 Jan 2006 07:16:36 -0000	1.4
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
-BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
+BuildRequires:  desktop-file-utils
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils



From fedora-extras-commits at redhat.com  Sun Jan  8 07:25:52 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 02:25:52 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.4,1.5
Message-ID: <200601080726.k087QO5W029224@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29207

Modified Files:
	gobby.spec 
Log Message:
rebuild


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gobby.spec	8 Jan 2006 07:16:36 -0000	1.4
+++ gobby.spec	8 Jan 2006 07:25:51 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -66,7 +66,29 @@
 
 
 %changelog
-* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-5
+- Rebuild
+
+* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Add libXau-devel to BuildRequires
+
+* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
+* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
+- Bump to 0.3.0rc3
+
+* Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
+- Update Summary
+
+* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-5
+- Use desktop-file-install to install the desktop file
+
+* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-4
+- Add desktop-file-utils to Requires(post/postun) and remove howl-devel BR
+
+* Fri Oct 07 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-3
+- Build with gnome support
 - Rebuild
 
 * Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2



From fedora-extras-commits at redhat.com  Sun Jan  8 09:06:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Jan 2006 04:06:39 -0500
Subject: rpms/wine/FC-3 wine-CVE-2005-4560.patch,NONE,1.1 wine.spec,1.5,1.6
Message-ID: <200601080907.k0897hgn000892@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828/FC-3

Modified Files:
	wine.spec 
Added Files:
	wine-CVE-2005-4560.patch 
Log Message:
- fix CVE-2005-4560


wine-CVE-2005-4560.patch:

--- NEW FILE wine-CVE-2005-4560.patch ---
===================================================================
RCS file: /home/wine/wine/dlls/gdi/metafile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- wine/dlls/gdi/metafile.c	2006/01/03 12:43:52	1.11
+++ wine/dlls/gdi/metafile.c	2006/01/06 20:52:46	1.12
@@ -863,6 +863,13 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc,
         break;
 
     case META_ESCAPE:
+        switch (mr->rdParm[0]) {
+        case GETSCALINGFACTOR: /* get function ... would just NULL dereference */
+             return FALSE;
+        case SETABORTPROC:
+             FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");
+             return FALSE;
+        }
         Escape(hdc, mr->rdParm[0], mr->rdParm[1], (LPCSTR)&mr->rdParm[2], NULL);
         break;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wine.spec	6 Jan 2006 11:00:54 -0000	1.5
+++ wine.spec	8 Jan 2006 09:06:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -19,6 +19,8 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
+# CVS-2005-4560 wmf exploit
+Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -45,6 +47,7 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fontforge
+BuildRequires:  cups-devel
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
@@ -143,6 +146,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
+%patch100 -p1
 autoconf
 
 %build
@@ -675,10 +679,15 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-2
+- fix for CVE-2005-4560
+- add fix BR from devel
+
 * Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-1
 - version upgrade
-- fix #177089
+- fix #177089 (winemine desktop entry should be in Game not in System)
 
 * Wed Jan 04 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.4-5



From fedora-extras-commits at redhat.com  Sun Jan  8 09:07:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Jan 2006 04:07:13 -0500
Subject: rpms/wine/devel wine-CVE-2005-4560.patch, NONE, 1.1 wine.spec, 1.9,
	1.10
Message-ID: <200601080907.k0897kXP000895@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828/devel

Modified Files:
	wine.spec 
Added Files:
	wine-CVE-2005-4560.patch 
Log Message:
- fix CVE-2005-4560


wine-CVE-2005-4560.patch:

--- NEW FILE wine-CVE-2005-4560.patch ---
===================================================================
RCS file: /home/wine/wine/dlls/gdi/metafile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- wine/dlls/gdi/metafile.c	2006/01/03 12:43:52	1.11
+++ wine/dlls/gdi/metafile.c	2006/01/06 20:52:46	1.12
@@ -863,6 +863,13 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc,
         break;
 
     case META_ESCAPE:
+        switch (mr->rdParm[0]) {
+        case GETSCALINGFACTOR: /* get function ... would just NULL dereference */
+             return FALSE;
+        case SETABORTPROC:
+             FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");
+             return FALSE;
+        }
         Escape(hdc, mr->rdParm[0], mr->rdParm[1], (LPCSTR)&mr->rdParm[2], NULL);
         break;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wine.spec	7 Jan 2006 23:15:33 -0000	1.9
+++ wine.spec	8 Jan 2006 09:07:13 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:		wine
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -21,6 +21,10 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
+# CVS-2005-4560 wmf exploit from wine cvs
+# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
+Patch100:       wine-CVE-2005-4560.patch
+
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch: %{ix86}
@@ -155,6 +159,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
+%patch100 -p1
 autoconf
 
 %build
@@ -688,6 +693,10 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-2
+- fix for CVE-2005-4560
+
 * Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Jan  8 09:06:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun,  8 Jan 2006 04:06:46 -0500
Subject: rpms/wine/FC-4 wine-CVE-2005-4560.patch,NONE,1.1 wine.spec,1.7,1.8
Message-ID: <200601080908.k0898DO3000898@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828/FC-4

Modified Files:
	wine.spec 
Added Files:
	wine-CVE-2005-4560.patch 
Log Message:
- fix CVE-2005-4560


wine-CVE-2005-4560.patch:

--- NEW FILE wine-CVE-2005-4560.patch ---
===================================================================
RCS file: /home/wine/wine/dlls/gdi/metafile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- wine/dlls/gdi/metafile.c	2006/01/03 12:43:52	1.11
+++ wine/dlls/gdi/metafile.c	2006/01/06 20:52:46	1.12
@@ -863,6 +863,13 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc,
         break;
 
     case META_ESCAPE:
+        switch (mr->rdParm[0]) {
+        case GETSCALINGFACTOR: /* get function ... would just NULL dereference */
+             return FALSE;
+        case SETABORTPROC:
+             FIXME("Filtering Escape(SETABORTPROC), possible virus?\n");
+             return FALSE;
+        }
         Escape(hdc, mr->rdParm[0], mr->rdParm[1], (LPCSTR)&mr->rdParm[2], NULL);
         break;


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine.spec	6 Jan 2006 11:01:00 -0000	1.7
+++ wine.spec	8 Jan 2006 09:06:46 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		wine
 Version:	0.9.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -19,6 +19,9 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
+# CVS-2005-4560 wmf exploit from wine cvs
+# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
+Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -45,6 +48,7 @@
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fontforge
+BuildRequires:  cups-devel
 
 Requires(post): /sbin/ldconfig, /sbin/chkconfig, /sbin/service,
 Requires(post): /usr/bin/update-desktop-database
@@ -143,6 +147,7 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
+%patch100 -p1
 autoconf
 
 %build
@@ -675,6 +680,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-2
+- fix for CVE-2005-4560
+- add fix BR from devel
+
 * Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Jan  8 12:52:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:52:32 -0500
Subject: rpms/perl-Net-Server import.log,1.4,1.5
Message-ID: <200601081253.k08Cr5tp010368@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.90-1.fc5 on branch devel from perl-Net-Server-0.90-1.fc5.src.rpm
0.90 + Multiplex


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:06:35 -0000	1.4
+++ import.log	8 Jan 2006 12:52:32 -0000	1.5
@@ -1,3 +1,4 @@
 perl-Net-Server-0_87-0_fdr_2_rh90:HEAD:perl-Net-Server-0.87-0.fdr.2.rh90.src.rpm:1099890383
 perl-Net-Server-0_87-0_fdr_2_1:HEAD:perl-Net-Server-0.87-0.fdr.2.1.src.rpm:1099890389
 perl-Net-Server-0_87-0_fdr_2_2:HEAD:perl-Net-Server-0.87-0.fdr.2.2.src.rpm:1099890395
+perl-Net-Server-0_90-1_fc5:HEAD:perl-Net-Server-0.90-1.fc5.src.rpm:1136724741



From fedora-extras-commits at redhat.com  Sun Jan  8 12:52:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:52:38 -0500
Subject: rpms/perl-Net-Server/devel .cvsignore, 1.3, 1.4 perl-Net-Server.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601081253.k08CrBsO010373@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324/devel

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.90-1.fc5 on branch devel from perl-Net-Server-0.90-1.fc5.src.rpm
0.90 + Multiplex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jun 2005 05:53:27 -0000	1.3
+++ .cvsignore	8 Jan 2006 12:52:38 -0000	1.4
@@ -1 +1 @@
-Net-Server-0.88.tar.gz
+Net-Server-0.90.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Net-Server.spec	23 Jun 2005 05:53:27 -0000	1.9
+++ perl-Net-Server.spec	8 Jan 2006 12:52:38 -0000	1.10
@@ -1,19 +1,22 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.88
+Version: 0.90
 Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
 License:   Artistic
-URL:       http://perl-net-server.sourceforge.net/
+URL:       http://search.cpan.org/dist/Net-Server/
 Source:    http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 BuildRequires: perl
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# IO::Multiplex support is optional, but since it's in FE and not including it 
+# causes build problems in some packages...
+Requires:      perl(IO::Multiplex)
 
 
 %description
@@ -58,6 +61,10 @@
 
 
 %changelog
+* Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
+- Updated to 0.90
+- add IO::Multiplex dep
+
 * Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0.88-1
 - Updated to 0.88, fixes remote format string vulnerability
 - Remove perl macros integrated in rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2005 05:53:27 -0000	1.3
+++ sources	8 Jan 2006 12:52:38 -0000	1.4
@@ -1 +1 @@
-f068d68fb3ccac2ee93860d1fcdbdb4e  Net-Server-0.88.tar.gz
+6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 12:54:47 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:54:47 -0500
Subject: rpms/perl-Net-Server import.log,1.5,1.6
Message-ID: <200601081255.k08CtJX1010477@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10443

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.90-1.fc4 on branch FC-4 from perl-Net-Server-0.90-1.fc4.src.rpm
0.90 + Multiplex


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Jan 2006 12:52:32 -0000	1.5
+++ import.log	8 Jan 2006 12:54:47 -0000	1.6
@@ -2,3 +2,4 @@
 perl-Net-Server-0_87-0_fdr_2_1:HEAD:perl-Net-Server-0.87-0.fdr.2.1.src.rpm:1099890389
 perl-Net-Server-0_87-0_fdr_2_2:HEAD:perl-Net-Server-0.87-0.fdr.2.2.src.rpm:1099890395
 perl-Net-Server-0_90-1_fc5:HEAD:perl-Net-Server-0.90-1.fc5.src.rpm:1136724741
+perl-Net-Server-0_90-1_fc4:FC-4:perl-Net-Server-0.90-1.fc4.src.rpm:1136724876



From fedora-extras-commits at redhat.com  Sun Jan  8 12:54:53 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:54:53 -0500
Subject: rpms/perl-Net-Server/FC-4 .cvsignore, 1.3, 1.4 perl-Net-Server.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601081255.k08CtPE2010482@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10443/FC-4

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.90-1.fc4 on branch FC-4 from perl-Net-Server-0.90-1.fc4.src.rpm
0.90 + Multiplex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jun 2005 05:53:26 -0000	1.3
+++ .cvsignore	8 Jan 2006 12:54:53 -0000	1.4
@@ -1 +1 @@
-Net-Server-0.88.tar.gz
+Net-Server-0.90.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/perl-Net-Server.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Net-Server.spec	23 Jun 2005 05:53:26 -0000	1.9
+++ perl-Net-Server.spec	8 Jan 2006 12:54:53 -0000	1.10
@@ -1,19 +1,22 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.88
+Version: 0.90
 Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
 License:   Artistic
-URL:       http://perl-net-server.sourceforge.net/
+URL:       http://search.cpan.org/dist/Net-Server/
 Source:    http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 BuildRequires: perl
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# IO::Multiplex support is optional, but since it's in FE and not including it 
+# causes build problems in some packages...
+Requires:      perl(IO::Multiplex)
 
 
 %description
@@ -58,6 +61,10 @@
 
 
 %changelog
+* Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
+- Updated to 0.90
+- add IO::Multiplex dep
+
 * Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0.88-1
 - Updated to 0.88, fixes remote format string vulnerability
 - Remove perl macros integrated in rpm


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2005 05:53:26 -0000	1.3
+++ sources	8 Jan 2006 12:54:53 -0000	1.4
@@ -1 +1 @@
-f068d68fb3ccac2ee93860d1fcdbdb4e  Net-Server-0.88.tar.gz
+6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 12:56:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:56:36 -0500
Subject: rpms/perl-Net-Server import.log,1.6,1.7
Message-ID: <200601081257.k08Cv8F3010577@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10543

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.90-1.fc3 on branch FC-3 from perl-Net-Server-0.90-1.fc3.src.rpm
0.90 + Multiplex


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	8 Jan 2006 12:54:47 -0000	1.6
+++ import.log	8 Jan 2006 12:56:35 -0000	1.7
@@ -3,3 +3,4 @@
 perl-Net-Server-0_87-0_fdr_2_2:HEAD:perl-Net-Server-0.87-0.fdr.2.2.src.rpm:1099890395
 perl-Net-Server-0_90-1_fc5:HEAD:perl-Net-Server-0.90-1.fc5.src.rpm:1136724741
 perl-Net-Server-0_90-1_fc4:FC-4:perl-Net-Server-0.90-1.fc4.src.rpm:1136724876
+perl-Net-Server-0_90-1_fc3:FC-3:perl-Net-Server-0.90-1.fc3.src.rpm:1136724984



From fedora-extras-commits at redhat.com  Sun Jan  8 12:56:46 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun,  8 Jan 2006 07:56:46 -0500
Subject: rpms/perl-Net-Server/FC-3 .cvsignore, 1.3, 1.4 perl-Net-Server.spec,
	1.6, 1.7 sources, 1.3, 1.4
Message-ID: <200601081257.k08CvIFb010582@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10543/FC-3

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.90-1.fc3 on branch FC-3 from perl-Net-Server-0.90-1.fc3.src.rpm
0.90 + Multiplex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Jun 2005 05:53:26 -0000	1.3
+++ .cvsignore	8 Jan 2006 12:56:46 -0000	1.4
@@ -1 +1 @@
-Net-Server-0.88.tar.gz
+Net-Server-0.90.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-3/perl-Net-Server.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-Server.spec	23 Jun 2005 05:53:26 -0000	1.6
+++ perl-Net-Server.spec	8 Jan 2006 12:56:46 -0000	1.7
@@ -1,20 +1,22 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.88
+Version: 0.90
 Release: 1%{?dist}
-Epoch:   0
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
 License:   Artistic
-URL:       http://perl-net-server.sourceforge.net/
+URL:       http://search.cpan.org/dist/Net-Server/
 Source:    http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/%{rname}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 BuildRequires: perl
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+# IO::Multiplex support is optional, but since it's in FE and not including it 
+# causes build problems in some packages...
+Requires:      perl(IO::Multiplex)
 
 
 %description
@@ -59,11 +61,18 @@
 
 
 %changelog
-* Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0:0.88-1
+* Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
+- Updated to 0.90
+- add IO::Multiplex dep
+
+* Wed Jun 22 2005 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0.88-1
 - Updated to 0.88, fixes remote format string vulnerability
 - Remove perl macros integrated in rpm
 - merge fedora perl template changes
 
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.87-4
+- rebuilt
+
 * Fri Feb 11 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:0.87-3
 - Use perl_vendorlib macro; Fixes x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Jun 2005 05:53:26 -0000	1.3
+++ sources	8 Jan 2006 12:56:46 -0000	1.4
@@ -1 +1 @@
-f068d68fb3ccac2ee93860d1fcdbdb4e  Net-Server-0.88.tar.gz
+6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 15:12:25 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 10:12:25 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.16,1.17
Message-ID: <200601081512.k08FCvIm016129@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped revision to get it to build on the server properly.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nethack-vultures.spec	8 Jan 2006 04:36:25 -0000	1.16
+++ nethack-vultures.spec	8 Jan 2006 15:12:25 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
+- Upped revision to try to get package to build on the server.
+
 * Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
 - Upgraded the tarball to the latest version.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 15:12:46 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 10:12:46 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.16,1.17
Message-ID: <200601081513.k08FDIPn016132@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped revision to get it to build on the server properly.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nethack-vultures.spec	8 Jan 2006 04:36:31 -0000	1.16
+++ nethack-vultures.spec	8 Jan 2006 15:12:45 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
+- Upped revision to try to get package to build on the server.
+
 * Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
 - Upgraded the tarball to the latest version.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 15:12:18 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 10:12:18 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.15,1.16
Message-ID: <200601081513.k08FDLS3016135@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16072/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped revision to get it to build on the server properly.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nethack-vultures.spec	8 Jan 2006 04:36:18 -0000	1.15
+++ nethack-vultures.spec	8 Jan 2006 15:12:15 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
+- Upped revision to try to get package to build on the server.
+
 * Fri Jan 06 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-1
 - Upgraded the tarball to the latest version.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 16:31:54 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 11:31:54 -0500
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.16,1.17
Message-ID: <200601081632.k08GWQZv018179@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Trying to work around a strange plague build error on the guidebook that I
don't get locally.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nethack-vultures.spec	8 Jan 2006 15:12:15 -0000	1.16
+++ nethack-vultures.spec	8 Jan 2006 16:31:53 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
+- Upped revision for consistancy with FC-4 and devel builds.
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 16:32:00 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 11:32:00 -0500
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.17,1.18
Message-ID: <200601081632.k08GWW7d018182@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Trying to work around a strange plague build error on the guidebook that I
don't get locally.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nethack-vultures.spec	8 Jan 2006 15:12:25 -0000	1.17
+++ nethack-vultures.spec	8 Jan 2006 16:31:59 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -21,6 +21,7 @@
 BuildRequires:  flex
 BuildRequires:  desktop-file-utils
 BuildRequires:  groff
+BuildRequires:  util-linux
 Requires:       /usr/bin/bzip2
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
@@ -163,6 +164,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
+- To fix a strange error on the plague server, added a req for util-linux.
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 16:32:06 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 11:32:06 -0500
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.17,1.18
Message-ID: <200601081632.k08GWcDd018185@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18130/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Trying to work around a strange plague build error on the guidebook that I
don't get locally.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nethack-vultures.spec	8 Jan 2006 15:12:45 -0000	1.17
+++ nethack-vultures.spec	8 Jan 2006 16:32:05 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -21,6 +21,7 @@
 BuildRequires:  flex
 BuildRequires:  desktop-file-utils
 BuildRequires:  groff
+BuildRequires:  util-linux
 Requires:       /usr/bin/bzip2
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
@@ -163,6 +164,9 @@
 
 
 %changelog
+* Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
+- To fix a strange error on the plague server, added a req for util-linux.
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-2
 - Upped revision to try to get package to build on the server.
 



From fedora-extras-commits at redhat.com  Sun Jan  8 17:13:51 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:13:51 -0500
Subject: rpms/clearsilver - New directory
Message-ID: <200601081713.k08HDrb3020270@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20262/clearsilver

Log Message:
Directory /cvs/extras/rpms/clearsilver added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:13:57 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:13:57 -0500
Subject: rpms/clearsilver/devel - New directory
Message-ID: <200601081713.k08HDxoU020285@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20262/clearsilver/devel

Log Message:
Directory /cvs/extras/rpms/clearsilver/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:14:18 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:14:18 -0500
Subject: rpms/clearsilver Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601081714.k08HEKFU020319@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307

Added Files:
	Makefile import.log 
Log Message:
Setup of module clearsilver


--- NEW FILE Makefile ---
# Top level Makefile for module clearsilver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:14:24 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:14:24 -0500
Subject: rpms/clearsilver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601081714.k08HEQk3020337@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20307/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module clearsilver


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:15:12 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:15:12 -0500
Subject: rpms/clearsilver import.log,1.1,1.2
Message-ID: <200601081715.k08HFi7D020415@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378

Modified Files:
	import.log 
Log Message:
auto-import clearsilver-0.10.2-2 on branch devel from clearsilver-0.10.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Jan 2006 17:14:17 -0000	1.1
+++ import.log	8 Jan 2006 17:15:12 -0000	1.2
@@ -0,0 +1 @@
+clearsilver-0_10_2-2:HEAD:clearsilver-0.10.2-2.src.rpm:1136740503



From fedora-extras-commits at redhat.com  Sun Jan  8 17:15:18 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:15:18 -0500
Subject: rpms/clearsilver/devel clearsilver-0.10.2-fedora.patch, NONE,
	1.1 clearsilver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601081715.k08HFowr020419@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20378/devel

Modified Files:
	.cvsignore sources 
Added Files:
	clearsilver-0.10.2-fedora.patch clearsilver.spec 
Log Message:
auto-import clearsilver-0.10.2-2 on branch devel from clearsilver-0.10.2-2.src.rpm

clearsilver-0.10.2-fedora.patch:

--- NEW FILE clearsilver-0.10.2-fedora.patch ---
diff -Nur clearsilver-0.10.2.orig/cgi/cgi.c clearsilver-0.10.2/cgi/cgi.c
--- clearsilver-0.10.2.orig/cgi/cgi.c	2005-12-02 10:34:04.000000000 +0100
+++ clearsilver-0.10.2/cgi/cgi.c	2005-12-15 20:45:13.000000000 +0100
@@ -641,7 +641,7 @@
 
   if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL)
   {
-    debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d";
+    debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d";
   }
 
   if (!pid)
diff -Nur clearsilver-0.10.2.orig/configure clearsilver-0.10.2/configure
--- clearsilver-0.10.2.orig/configure	2005-12-15 01:26:08.000000000 +0100
+++ clearsilver-0.10.2/configure	2005-12-15 20:56:46.000000000 +0100
@@ -6002,7 +6002,7 @@
   echo "$as_me:$LINENO: checking for python includes" >&5
 echo $ECHO_N "checking for python includes... $ECHO_C" >&6
   python_inc=no
-  python_search_path="/neo/opt /usr/local /usr /c"
+  python_search_path="/usr"
   python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15"
   if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then
     python_bin=$cs_cv_python_path
@@ -6023,7 +6023,7 @@
 	  python_site=$path/lib/python$vers/site-packages
 	  break 2
 	fi
-			if test -f $path/python$vers/include/Python.h; then
+	if test -f $path/python$vers/include/Python.h; then
 	  python_inc=$path/python$vers/include
 	  python_lib="-L$path/python$vers/libs -lpython$vers"
 	  python_site=$path/python$vers/Lib/site-packages
@@ -6034,14 +6034,14 @@
   fi
   if test "x$python_inc" = "xno"; then
     echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
+    echo "${ECHO_T}not found" >&6
     PYTHON=
     PYTHON_INC=
     PYTHON_LIB=
     PYTHON_SITE=
   else
     echo "$as_me:$LINENO: result: found $python_inc" >&5
-echo "${ECHO_T}found $python_inc" >&6
+    echo "${ECHO_T}found $python_inc" >&6
     PYTHON=$python_bin
     PYTHON_INC="-I$python_inc"
     PYTHON_LIB=$python_lib
@@ -6050,6 +6050,7 @@
     fi
     BUILD_WRAPPERS="$BUILD_WRAPPERS python"
   fi
+  PYTHON_SITE=`$python_bin -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)"`
 fi
 
 cs_cv_perl=yes
@@ -6278,7 +6279,8 @@
 done
 _ACJNI_FOLLOWED="$_cur"
 
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
+#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
+_JTOPDIR="$java_path"
 case "$host_os" in
         darwin*)        _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
                         _JINC="$_JTOPDIR/Headers";;
diff -Nur clearsilver-0.10.2.orig/imd/imdm.py clearsilver-0.10.2/imd/imdm.py
--- clearsilver-0.10.2.orig/imd/imdm.py	2005-06-30 20:51:54.000000000 +0200
+++ clearsilver-0.10.2/imd/imdm.py	2005-12-15 20:45:14.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 #
 # imdm
 # 
diff -Nur clearsilver-0.10.2.orig/java-jni/Makefile clearsilver-0.10.2/java-jni/Makefile
--- clearsilver-0.10.2.orig/java-jni/Makefile	2005-12-02 11:35:28.000000000 +0100
+++ clearsilver-0.10.2/java-jni/Makefile	2005-12-15 20:45:13.000000000 +0100
@@ -37,14 +37,14 @@
 org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR)
 	$(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS
 
-CSTest.class: CSTest.java
+CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR)
 	$(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java
 
 gold: CSTest.class
 	@/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold
 	@echo "Generated gold files"
 
-test: CSTest.class
+test: CSTest.class $(NEO_UTIL_SO)
 	@echo "Running java test"
 	@failed=0; \
 	rm -f javatest.out; \
diff -Nur clearsilver-0.10.2.orig/ruby/Makefile clearsilver-0.10.2/ruby/Makefile
--- clearsilver-0.10.2.orig/ruby/Makefile	2005-12-02 11:35:52.000000000 +0100
+++ clearsilver-0.10.2/ruby/Makefile	2005-12-15 20:45:14.000000000 +0100
@@ -41,7 +41,7 @@
 
 
 install: all
-	$(RUBY) install.rb install
+	$(RUBY) install.rb install --prefix=$(DESTDIR)
 
 clean:
 	$(RM) ext/hdf/*.o ext/hdf/*.so
diff -Nur clearsilver-0.10.2.orig/scripts/document.py clearsilver-0.10.2/scripts/document.py
--- clearsilver-0.10.2.orig/scripts/document.py	2005-07-28 02:53:10.000000000 +0200
+++ clearsilver-0.10.2/scripts/document.py	2005-12-15 20:45:14.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 """
   document.py -- Simple script to generate manpages from C header
   files.  Looks for the following formatted C comments in the C header files:


--- NEW FILE clearsilver.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           clearsilver
Version:        0.10.2
Release:        2%{?dist}
Summary:        Fast and powerful HTML templating system
Group:          Development/Libraries
License:        Neotonic ClearSilver Software License
URL:            http://www.clearsilver.net/
Source0:        http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
Patch0:         %{name}-0.10.2-fedora.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  zlib-devel
Provides:       %{name}-devel = %{version}-%{release}

%description
ClearSilver is a fast, powerful, and language-neutral HTML template
system.  In both static content sites and dynamic HTML applications,
it provides a separation between presentation code and application
logic which makes working with your project easier.  The design of
ClearSilver began in 1999, and evolved during its use at onelist.com,
egroups.com, and Yahoo! Groups.  Today many other projects and
websites are using it.

%package        devel
Summary:        ClearSilver development package
Group:          Development/Libraries

%description devel
This package provides needed files to develop extensions
to ClearSilver.

%package     -n python-%{name}
Summary:        Python interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  python-devel >= 2.1
Provides:       %{name}-python = %{version}-%{release}

%description -n python-%{name}
%{summary}.

%package     -n perl-%{name}
Summary:        Perl interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  perl
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides:       %{name}-perl = %{version}-%{release}

%description -n perl-%{name}
%{summary}.

%ifarch %{ix86} ppc 
%package     -n ruby-%{name}
Summary:        Ruby interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  ruby
BuildRequires:  ruby-devel
Provides:       %{name}-ruby = %{version}-%{release}
%endif

%ifarch %{ix86} ppc 
%description -n ruby-%{name}
%{summary}.
%endif

%ifarch %{ix86} ppc
%package     -n java-%{name}
Summary:        Java interface to the ClearSilver HTML templating system
Group:          Development/Libraries
BuildRequires:  java-devel
Provides:       %{name}-java = %{version}-%{release}
%endif

%ifarch %{ix86} ppc 
%description -n java-%{name}
%{summary}.
%endif

%prep
%setup -q
%patch0 -p1
touch configure
sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py
find python/examples -type f | xargs chmod -x

%build
# java and ruby does not build on x86_64
%ifarch %{ix86} ppc 
%configure \
  --with-java=%{_libdir}/jvm/java \
  --with-python=%{__python} \
  --disable-csharp 
%else
%configure \
  --with-python=%{__python} \
  --disable-java \
  --disable-ruby \
  --disable-csharp
%endif
cd perl && %{__perl} Makefile.PL INSTALLDIRS=vendor && cd ..
make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%ifarch %{ix86} ppc 
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/java
mv $RPM_BUILD_ROOT%{_libdir}{,/java}/libclearsilver-jni.so
mv $RPM_BUILD_ROOT%{_libdir}/clearsilver.jar \
  $RPM_BUILD_ROOT%{_libdir}/java/clearsilver-%{version}.jar
chmod 644 $RPM_BUILD_ROOT%{_libdir}/java/clearsilver-%{version}.jar
ln -s clearsilver-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/java/clearsilver.jar
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CS_LICENSE INSTALL LICENSE README
%{_bindir}/cstest
%{_bindir}/static.cgi
%{_mandir}/man3/*

%files devel
%defattr(-, root, root, 0755)
%doc CS_LICENSE LICENSE
%{_includedir}/ClearSilver/
%{_libdir}/libneo_*.a

%files -n python-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%doc README.python python/examples/
%{python_sitearch}/neo_cgi.so

%files -n perl-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%{perl_vendorarch}/auto/ClearSilver/
%{perl_vendorarch}/ClearSilver.pm

%ifarch %{ix86} ppc 
%files -n ruby-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%{_libdir}/site_ruby/*/*/hdf.so
%{_libdir}/site_ruby/*/neo.rb
%endif

%ifarch %{ix86} ppc 
%files -n java-clearsilver
%doc CS_LICENSE LICENSE
%defattr(-,root,root,-)
%{_libdir}/java/*clearsilver*
%endif

%changelog
* Fri Jan  6 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.2-2
- Rebuild with disable-ruby, disable-java for any arch other than i386
- hardcoded version in Patch0
- extra line in prep-section
- license files in all subpackages

* Thu Dec 15 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.2-1
- Rebuild for 0.10.2

* Tue Nov 29 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.1-1
- Rebuild for Fedora Extras

* Sun Jul 31 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-0.1
- 0.10.1, PIC issues fixed upstream.

* Sun May 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.14-0.3
- Rebuild for FC4.
- Rename subpackages to $foo-clearsilver.

* Mon Apr 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.14-0.2
- Build as PIC, fixes Ruby and Java builds on FC4.
- More parallel make fixing.

* Fri Apr  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9.14-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Jan 2006 17:14:23 -0000	1.1
+++ .cvsignore	8 Jan 2006 17:15:17 -0000	1.2
@@ -0,0 +1 @@
+clearsilver-0.10.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Jan 2006 17:14:23 -0000	1.1
+++ sources	8 Jan 2006 17:15:17 -0000	1.2
@@ -0,0 +1 @@
+10e19526e87b712068e9073469b10d94  clearsilver-0.10.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 17:19:27 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun,  8 Jan 2006 12:19:27 -0500
Subject: owners owners.list,1.511,1.512
Message-ID: <200601081719.k08HJxYb020474@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20457

Modified Files:
	owners.list 
Log Message:
added clearsilver



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -r1.511 -r1.512
--- owners.list	7 Jan 2006 18:06:15 -0000	1.511
+++ owners.list	8 Jan 2006 17:19:27 -0000	1.512
@@ -107,6 +107,7 @@
 Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|cksfv|Utility to manipulate SFV files|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|clamav|End-user tools for the Clam Antivirus scanner|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan  8 17:22:38 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:22:38 -0500
Subject: rpms/rootsh - New directory
Message-ID: <200601081722.k08HMexY020565@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20557/rootsh

Log Message:
Directory /cvs/extras/rpms/rootsh added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:22:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:22:44 -0500
Subject: rpms/rootsh/devel - New directory
Message-ID: <200601081722.k08HMkTt020580@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20557/rootsh/devel

Log Message:
Directory /cvs/extras/rpms/rootsh/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan  8 17:22:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:22:58 -0500
Subject: rpms/rootsh Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601081723.k08HN0OD020614@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20602

Added Files:
	Makefile import.log 
Log Message:
Setup of module rootsh


--- NEW FILE Makefile ---
# Top level Makefile for module rootsh
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:23:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:23:04 -0500
Subject: rpms/rootsh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601081723.k08HN6kg020636@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20602/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rootsh


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan  8 17:23:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:23:29 -0500
Subject: rpms/rootsh import.log,1.1,1.2
Message-ID: <200601081724.k08HO1Se020706@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20670

Modified Files:
	import.log 
Log Message:
auto-import rootsh-1.5.2-2 on branch devel from rootsh-1.5.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rootsh/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Jan 2006 17:22:57 -0000	1.1
+++ import.log	8 Jan 2006 17:23:29 -0000	1.2
@@ -0,0 +1 @@
+rootsh-1_5_2-2:HEAD:rootsh-1.5.2-2.src.rpm:1136740994



From fedora-extras-commits at redhat.com  Sun Jan  8 17:23:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:23:35 -0500
Subject: rpms/rootsh/devel rootsh.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601081724.k08HOEFH020708@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rootsh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20670/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rootsh.spec 
Log Message:
auto-import rootsh-1.5.2-2 on branch devel from rootsh-1.5.2-2.src.rpm


--- NEW FILE rootsh.spec ---
Name:		rootsh
Summary: 	Shell wrapper for auditing
Version:	1.5.2
Release:	2%{?dist}
License:	GPL
Group:		Applications/System
Source0:	http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz
URL:		http://sourceforge.net/projects/rootsh
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Rootsh is a wrapper for shells which logs all echoed keystrokes and 
terminal output to a file and/or to syslog. Its main purpose is the 
auditing of users who need a shell with root privileges. They start 
rootsh through the sudo mechanism.

%prep
%setup -q 

%build
%configure
make %{?smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS ChangeLog THANKS INSTALL NEWS TODO COPYING
%{_bindir}/rootsh
%{_mandir}/man1/rootsh.1.gz

%changelog
* Sat Jan  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.2-2
- forgot to include COPYING

* Wed Jan  4 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5.2-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rootsh/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Jan 2006 17:23:03 -0000	1.1
+++ .cvsignore	8 Jan 2006 17:23:35 -0000	1.2
@@ -0,0 +1 @@
+rootsh-1.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rootsh/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Jan 2006 17:23:03 -0000	1.1
+++ sources	8 Jan 2006 17:23:35 -0000	1.2
@@ -0,0 +1 @@
+39e3a876b991fe235af3150335d1a0f8  rootsh-1.5.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 17:27:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  8 Jan 2006 12:27:39 -0500
Subject: owners owners.list,1.512,1.513
Message-ID: <200601081728.k08HSC3g020767@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20750

Modified Files:
	owners.list 
Log Message:

rootsh



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -r1.512 -r1.513
--- owners.list	8 Jan 2006 17:19:27 -0000	1.512
+++ owners.list	8 Jan 2006 17:27:39 -0000	1.513
@@ -1083,6 +1083,7 @@
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rocksndiamonds|Underground digging game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|rpmlint|RPM correctness checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan  8 21:11:28 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 16:11:28 -0500
Subject: rpms/fortune-firefly/devel firefly, 1.5, 1.6 fortune-firefly.spec,
	1.7, 1.8
Message-ID: <200601082111.k08LBjEv028146@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28092/devel

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Lots of new content.




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 firefly
Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/firefly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- firefly	6 Dec 2005 02:56:40 -0000	1.5
+++ firefly	8 Jan 2006 21:11:28 -0000	1.6
@@ -1,35 +1,9 @@
-Drunk: "Hey, you gonna toast unification with me?  Six years today, the
-Alliance sent the Browncoats runnin', pissin' their pants... You know, your
-coat is kinda a brownish color."
-
-Mal: "It was on sale."
-
-%
 Mal: "We're not gonna die. We can't die, Bendis. You know why? Because we
 are so...very...pretty. We are just too pretty for God to let us die."
-
+				--Episode #1, "Serenity"
 %
 Mal: "We've done the impossible, and that makes us mighty."
-
-%
-Mal: "If you can't do something smart, do something right."
-
-%
-Inara: "This is just a moment in time.  Step aside and let it happen."
-
-%
-Mal: "When you can't run anymore, you crawl, and when you can't do that, you
-find someone to carry you."
-
-%
-Early: "Well... here I am..."
-
-%
-Mal (naked, alone in the desert): "Yep... that went well."
-
-%
-River (startling Jayne, jumping up from unconsciousness): "Copper for a kiss?"
-
+				--Episode #1, "Serenity"
 %
 Wash: "Everything looks good from here... (beat...playing with plastic
 dinosaurs over his console) Yes. Yes, this is a fertile land, and we will
@@ -43,34 +17,167 @@
 (Stegosaurus) "Ah, curse your sudden but inevitable betrayal!"
 
 (T-Rex) "Ha ha HA! Mine is an evil laugh...now die!"
+				--Episode #1, "Serenity"
+%
+Take my love, take my land
+Take me where I cannot stand
+I don't care, I'm still free
+You can't take the sky from me
+
+Take me out to the black
+Tell them I ain't comin' back
+Burn the land and boil the sea
+You can't take the sky from me
 
+There's no place I can be
+Since I found Serenity
+But you can't take the sky from me...
 %
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+				--Episode #1, "Serenity"
+%
+Zoe: "Something ain't right."
+
+Wash: "Sweetie, we're crooks.  If everything were right, we'd be in jail."
+				--Episode #1, "Serenity"
+%
+Wash: "Just a couple of days lying around.  You with the bathing, 
+me with the watching you bathe."
+				--Episode #1, "Serenity"
+%
+Kaylee: "I'd sure like to get a new compression coil."
+
+Mal: "And I'd like to be the king of all Londinum and wear a shiny hat."
+				--Episode #1, "Serenity"
+%
+Mal: "Wheel always keeps on turning, Badger."
 
+Badger: "That only matters to people on the rim."
+				--Episode #1, "Serenity"
+%
+Badger: "Crime and politics, little girl.  The situation is always... fluid."
+
+Jayne: "The only fluid I see here is the puddle of piss refusing to pay our wage."
+				--Episode #1, "Serenity"
+%
+Book: "The destination's not important.  How you get there's the worthier
+part."
+				--Episode #1, "Serenity"
+%
+Book: "Been out of the world for a spell.  Like to walk it a while."
+				--Episode #1, "Serenity"
 %
 Jayne: "Ten percent of nuthin' is...let me do the math here...nuthin' into
 nuthin'...carry the nuthin'..."
+				--Episode #1, "Serenity"
+%
+Mal: "Jayne! Your mouth is talking, you'd might wanna look to that."
+				--Episode #1, "Serenity"
+%
+Zoe: "Sir, we don't want to deal with Patience again."
+
+Mal: "Why not?"
+
+Zoe: "She shot you."
+
+Mal: "Well, yeah, she did a bit..."
+				--Episode #1, "Serenity"
+%
+Mal: "Ain't no way in the verse they could find that compartment, even if
+they were lookin' for it."
+
+Zoe: "Why not?"
+
+Mal: "... cause?"
 
+Zoe: "Oh yeah, this is going to go great."
+				--Episode #1, "Serenity"
 %
 Mal: "If anyone gets nosy, just...you know... shoot 'em. "
 
 Zoe: "Shoot 'em?"
 
 Mal: "Politely."
+				--Episode #1, "Serenity"
+%
+Mal: "Send word to Patience?"
 
+Wash: "Haven't heard back yet.  Didn't she soot you one time?"
+
+Mal: "Everyone's making a fuss."
+				--Episode #1, "Serenity"
 %
-Book: "The destination's not important.  How you get there's the worthier
-part."
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
-Jayne: "I was gonna get me an ear."
+Book: "Captain, do you mind if I say grace?"
+
+Mal: "Only if you say it out loud."
+				--Episode #1, "Serenity"
+%
+Mal: "How's business?"
+
+Inara: "None of yours."
+				--Episode #1, "Serenity"
+%
+Book: "The important thing is the spices.  A man could live on enough 
+packaged food from here till judgement day as long as he has 
+enough rosemary."
+				--Episode #1, "Serenity"
+%
+Mal: "That's what governments are for, to get in a man's way."
+				--Episode #1, "Serenity"
+%
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
+Inara: "So, would you like to lecture me on the wickedness of my ways?"
+
 Book: "I brought you some supper but if you'd prefer a lecture, I've a few
 very catchy ones prepped...sin and hellfire... one has lepers."
+				--Episode #1, "Serenity"
+%
+Wash: "Can we maybe vote on the whole murdering people issue?"
+				--Episode #1, "Serenity"
+%
+Mal: "Now, you only gotta scare him."
+
+Jayne: (beat) "Pain is scary."
+				--Episode #1, "Serenity"
+%
+Jayne: "It's a girl. Cute too.  'Cept I don't think she's all there, you know?
+Course, not all of her has to be."
+ 				--Episode #1, "Serenity"
+%
+Jayne: "I was gonna get me an ear."
+				--Episode #1, "Serenity"
+%
+Simon: "What will they do?"
+
+Zoe: "If they take the ship, they'll rape us to death, eat our flesh and
+sew our skins into their clothing and if we're very very lucky, they'll
+do it in that order."
+				--Episode #1, "Serenity"
[...5555 lines suppressed...]
 %
 Fanty: "You're unpredictable, Mal... you run when you oughtta fight, 
 fight when you oughtta deal.  Makes a business person twitchy..."
-
+				--"Serenity"
 %
 River: "Show me off like a dog, old men covered in blood, it never 
 touched them but they're drowning in it... I don't know what I'm 
 saying, I never know what I'm saying..."
-
+				--"Serenity"
 %
 Operative: "We locked on to Serenity's pulse beacon the moment you 
 hit atmo.  I can speak a word and send a missile to that exact location 
@@ -3454,20 +3818,20 @@
 (tosses a gadget to the Operative)
 
 Operative: "... pulse beacon..."
-
+				--"Serenity"
 %
 Mal: "Piece of shrapnel tore up that nerve cluster my first
 tour.  Had it moved."
-
+				--"Serenity"
 %
 River: "Miranda."
-
+				--"Serenity"
 %
 Mal: "What was that?"
-
+				--"Serenity"
 %
 Mal: "I, uh, better go see how the inevitable mutiny is coming along..."
-
+				--"Serenity"
 %
 Teacher: "...so why would [the independents] fight so hard against us?"
 
@@ -3481,46 +3845,152 @@
 
 Teacher: "River, we're not telling people what to think.  We're just trying 
 to show them how."
-
+				--"Serenity"
 %
 Dr. Mathias: "All our subjects are conditioned for combat, but River... 
 she's a creature of extraordinary grace."
 
 Simon: "Yes.  She always did love to dance."
-
+				--"Serenity"
 %
 Operative: "We're making a better world.  All of them, better worlds."
-
+				--"Serenity"
 %
 Zoe: "Nobody flies like my mister."
-
+				--"Serenity"
 %
 Simon: "I bring River all the way out to the raggedy edge of the 'verse 
 so she can hide from the Alliance by robbing banks."
 
 Kaylee: "I know the cap'n'll look out for her.  They'll be back before you 
 can spit." (beat)  "Not that you spit."
-
+				--"Serenity"
 %
 Jayne: "How come they ain't blowin' us out of the air?"
 
 Mal: "They wanna run us down.  The up close kill."
 
 River: "They want us alive when they eat us."
-
+				--"Serenity"
 %
 Screen in a bar, advertizing candy: "Not Mandatory"
 
 [Ed: There's mandatory candy?]
-
+				--"Serenity"
 %
 Mal: "Hello, little one.  You know your part in this?"
 
 River: (beat) "Do you?"
 
 Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+				--"Serenity"
+%
+Mal: "Ready to go to work, darlin'?"
+
+River: "There's no pattern to the pebbles here.  Completely random.  "I
+tried to count them, but you drove too fast.  Hummingbird.
+
+Mal: "Alright.  Great.  Lets go."
+				--"Serenity", deleted scenes
+%
+Sheydra: "All the more reason the girls look to you.  You've seen so much.
+You're a figure of great romance to them."
+
+Inara: "Great romance has nothing to do with being a companion, Sheydra; you
+should know better."
+
+Sheydra: (coyly) "I'm not the one who had a torrid affair with a pirate."
+
+Inara: (shocked) "A who?  With a what?"
 
+Sheydra: "It's the talk of the house.  The girls all trade stories in the
+dorms at night."
+
+Inara: "I... didn't... have a... pirate!"
+
+Sheydra: "In one of the stories, you make love in a burning temple.  I think
+that's my favorite."
+				--"Serenity", deleted scenes
+%
+Book: "Lord - I'm walking your way.  Let me in, for my feet are sore.  My
+clothes are ragged.  Look in my eyes, Lord, and my sins will play out in
+them as on the screen.  Read them off.  Forgive what you can, and send me
+on my path.  I will walk on until you give me rest."
+				--"Serenity", deleted scenes
+%
+Mal:"They take you down, I don't expect to grieve over it much.  I'd like
+to kill you myself if I ever see you again."
+
+Operative: "You won't." (pause) "There is nothing left to see."
+
+(Operative walks off, then stops near the engine, looking up at the ship
+through the rain)
+
+Operative: "Serenity.  You lost everything in that battle.  Everything you
+had, everything you were.  How did you go on?"
+
+Mal: "You're still standing there when that engine starts, you never will
+figure it out." (walks into Serenity)  "What a whiner!"
+				--"Serenity", deleted scenes
+%
+Zoe: (to Wash, lovingly) "That was close."  (They hug each other playfully)
+
+Mal: "Hey, what are you guys doin?" (beat) "Making out?"
+
+Wash: (flips off Mal) "Blow it, captain."
+				--"Serenity", outtakes
+%
+Mal: "Whoa, Whoa, you see that?  You see it, right?  You see that?"
+
+Mal: "Turn?  Would you turn?"
+
+Wash: "You want to fly this thing?"
+
+Mal: "You want me... would you pull over?  Is that what you call what you're
+doing?"
+
+Wash: "I will pull over this spaceship right now!"
+
+Mal: "Christ almighty!"
+
+Wash: "Dammit, I don't need a back spaceship driver!"
+
+Mal: "Get out of the way!!!"
+
+Wash: "Christ, that's it!" (throws up hands, leaves seat) "You wanna fly,
+f'in fly!" (off set) "I'll be in my bunk."
+				--"Serenity", outtakes
+%
+Everyone: "Summer!"
+
+[Ed: It was a running joke on-set that whenever anything went wrong, it was
+actress Summer Glau (River)'s fault.]
+
+				--"Serenity", outtakes
+%
+Mal: "TRAAAAAAAAAAPPP!!!!!!!!!!!!"
+				--"Serenity", outtakes
+%
+Mal: "Don't f'in tell me what to goddamn do!"
+
+Kaylee: (laughing) "Goddamn do?"
+				--"Serenity", outtakes
+%
+Mal: "Get these bodies together!"
+
+Zoe: "We got time for gravedigging?"
+
+Mal: "Zoe, take this and rope them together; five or six of them, I want
+them laid out on the nose of our ship."
+
+Simon: "Are you insane?"
+
+Mal: "Put Book front and center.  He's our friend; we should honor him. 
+Kaylee!  Find that kid who's taking a dirt nap with Baby Jesus; we need a
+hood ornament.  Jayne!  Try not to steal too much of their shit."
+				--"Serenity", outtakes
 %
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.
+


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/fortune-firefly.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fortune-firefly.spec	6 Dec 2005 02:56:40 -0000	1.7
+++ fortune-firefly.spec	8 Jan 2006 21:11:28 -0000	1.8
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.0.1
+Version:	2.1.0
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,11 +49,17 @@
 
 %changelog
 
+* Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
+- Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
+- Added quotes from unfilmed episode, "Dead or Alive"
+- Added quotes from deleted scenes
+- Added quotes from outtakes
+
 * Mon Dec 05 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.1
 - Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
 - Changed the versioning style
 
-* Wed Oct 12 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.3
+* Wed Oct 12 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0
 - Fixed some quotes, added one more.
 
 * Wed Oct 12 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0



From fedora-extras-commits at redhat.com  Sun Jan  8 21:11:22 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 16:11:22 -0500
Subject: rpms/fortune-firefly/FC-4 firefly, 1.4, 1.5 fortune-firefly.spec,
	1.4, 1.5
Message-ID: <200601082111.k08LBsJO028150@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28092/FC-4

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Lots of new content.




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 firefly
Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/firefly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefly	6 Dec 2005 02:56:34 -0000	1.4
+++ firefly	8 Jan 2006 21:11:21 -0000	1.5
@@ -1,35 +1,9 @@
-Drunk: "Hey, you gonna toast unification with me?  Six years today, the
-Alliance sent the Browncoats runnin', pissin' their pants... You know, your
-coat is kinda a brownish color."
-
-Mal: "It was on sale."
-
-%
 Mal: "We're not gonna die. We can't die, Bendis. You know why? Because we
 are so...very...pretty. We are just too pretty for God to let us die."
-
+				--Episode #1, "Serenity"
 %
 Mal: "We've done the impossible, and that makes us mighty."
-
-%
-Mal: "If you can't do something smart, do something right."
-
-%
-Inara: "This is just a moment in time.  Step aside and let it happen."
-
-%
-Mal: "When you can't run anymore, you crawl, and when you can't do that, you
-find someone to carry you."
-
-%
-Early: "Well... here I am..."
-
-%
-Mal (naked, alone in the desert): "Yep... that went well."
-
-%
-River (startling Jayne, jumping up from unconsciousness): "Copper for a kiss?"
-
+				--Episode #1, "Serenity"
 %
 Wash: "Everything looks good from here... (beat...playing with plastic
 dinosaurs over his console) Yes. Yes, this is a fertile land, and we will
@@ -43,34 +17,167 @@
 (Stegosaurus) "Ah, curse your sudden but inevitable betrayal!"
 
 (T-Rex) "Ha ha HA! Mine is an evil laugh...now die!"
+				--Episode #1, "Serenity"
+%
+Take my love, take my land
+Take me where I cannot stand
+I don't care, I'm still free
+You can't take the sky from me
+
+Take me out to the black
+Tell them I ain't comin' back
+Burn the land and boil the sea
+You can't take the sky from me
 
+There's no place I can be
+Since I found Serenity
+But you can't take the sky from me...
 %
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+				--Episode #1, "Serenity"
+%
+Zoe: "Something ain't right."
+
+Wash: "Sweetie, we're crooks.  If everything were right, we'd be in jail."
+				--Episode #1, "Serenity"
+%
+Wash: "Just a couple of days lying around.  You with the bathing, 
+me with the watching you bathe."
+				--Episode #1, "Serenity"
+%
+Kaylee: "I'd sure like to get a new compression coil."
+
+Mal: "And I'd like to be the king of all Londinum and wear a shiny hat."
+				--Episode #1, "Serenity"
+%
+Mal: "Wheel always keeps on turning, Badger."
 
+Badger: "That only matters to people on the rim."
+				--Episode #1, "Serenity"
+%
+Badger: "Crime and politics, little girl.  The situation is always... fluid."
+
+Jayne: "The only fluid I see here is the puddle of piss refusing to pay our wage."
+				--Episode #1, "Serenity"
+%
+Book: "The destination's not important.  How you get there's the worthier
+part."
+				--Episode #1, "Serenity"
+%
+Book: "Been out of the world for a spell.  Like to walk it a while."
+				--Episode #1, "Serenity"
 %
 Jayne: "Ten percent of nuthin' is...let me do the math here...nuthin' into
 nuthin'...carry the nuthin'..."
+				--Episode #1, "Serenity"
+%
+Mal: "Jayne! Your mouth is talking, you'd might wanna look to that."
+				--Episode #1, "Serenity"
+%
+Zoe: "Sir, we don't want to deal with Patience again."
+
+Mal: "Why not?"
+
+Zoe: "She shot you."
+
+Mal: "Well, yeah, she did a bit..."
+				--Episode #1, "Serenity"
+%
+Mal: "Ain't no way in the verse they could find that compartment, even if
+they were lookin' for it."
+
+Zoe: "Why not?"
+
+Mal: "... cause?"
 
+Zoe: "Oh yeah, this is going to go great."
+				--Episode #1, "Serenity"
 %
 Mal: "If anyone gets nosy, just...you know... shoot 'em. "
 
 Zoe: "Shoot 'em?"
 
 Mal: "Politely."
+				--Episode #1, "Serenity"
+%
+Mal: "Send word to Patience?"
 
+Wash: "Haven't heard back yet.  Didn't she soot you one time?"
+
+Mal: "Everyone's making a fuss."
+				--Episode #1, "Serenity"
 %
-Book: "The destination's not important.  How you get there's the worthier
-part."
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
-Jayne: "I was gonna get me an ear."
+Book: "Captain, do you mind if I say grace?"
+
+Mal: "Only if you say it out loud."
+				--Episode #1, "Serenity"
+%
+Mal: "How's business?"
+
+Inara: "None of yours."
+				--Episode #1, "Serenity"
+%
+Book: "The important thing is the spices.  A man could live on enough 
+packaged food from here till judgement day as long as he has 
+enough rosemary."
+				--Episode #1, "Serenity"
+%
+Mal: "That's what governments are for, to get in a man's way."
+				--Episode #1, "Serenity"
+%
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
+Inara: "So, would you like to lecture me on the wickedness of my ways?"
+
 Book: "I brought you some supper but if you'd prefer a lecture, I've a few
 very catchy ones prepped...sin and hellfire... one has lepers."
+				--Episode #1, "Serenity"
+%
+Wash: "Can we maybe vote on the whole murdering people issue?"
+				--Episode #1, "Serenity"
+%
+Mal: "Now, you only gotta scare him."
+
+Jayne: (beat) "Pain is scary."
+				--Episode #1, "Serenity"
+%
+Jayne: "It's a girl. Cute too.  'Cept I don't think she's all there, you know?
+Course, not all of her has to be."
+ 				--Episode #1, "Serenity"
+%
+Jayne: "I was gonna get me an ear."
+				--Episode #1, "Serenity"
+%
+Simon: "What will they do?"
+
+Zoe: "If they take the ship, they'll rape us to death, eat our flesh and
+sew our skins into their clothing and if we're very very lucky, they'll
+do it in that order."
+				--Episode #1, "Serenity"
[...5555 lines suppressed...]
 %
 Fanty: "You're unpredictable, Mal... you run when you oughtta fight, 
 fight when you oughtta deal.  Makes a business person twitchy..."
-
+				--"Serenity"
 %
 River: "Show me off like a dog, old men covered in blood, it never 
 touched them but they're drowning in it... I don't know what I'm 
 saying, I never know what I'm saying..."
-
+				--"Serenity"
 %
 Operative: "We locked on to Serenity's pulse beacon the moment you 
 hit atmo.  I can speak a word and send a missile to that exact location 
@@ -3454,20 +3818,20 @@
 (tosses a gadget to the Operative)
 
 Operative: "... pulse beacon..."
-
+				--"Serenity"
 %
 Mal: "Piece of shrapnel tore up that nerve cluster my first
 tour.  Had it moved."
-
+				--"Serenity"
 %
 River: "Miranda."
-
+				--"Serenity"
 %
 Mal: "What was that?"
-
+				--"Serenity"
 %
 Mal: "I, uh, better go see how the inevitable mutiny is coming along..."
-
+				--"Serenity"
 %
 Teacher: "...so why would [the independents] fight so hard against us?"
 
@@ -3481,46 +3845,152 @@
 
 Teacher: "River, we're not telling people what to think.  We're just trying 
 to show them how."
-
+				--"Serenity"
 %
 Dr. Mathias: "All our subjects are conditioned for combat, but River... 
 she's a creature of extraordinary grace."
 
 Simon: "Yes.  She always did love to dance."
-
+				--"Serenity"
 %
 Operative: "We're making a better world.  All of them, better worlds."
-
+				--"Serenity"
 %
 Zoe: "Nobody flies like my mister."
-
+				--"Serenity"
 %
 Simon: "I bring River all the way out to the raggedy edge of the 'verse 
 so she can hide from the Alliance by robbing banks."
 
 Kaylee: "I know the cap'n'll look out for her.  They'll be back before you 
 can spit." (beat)  "Not that you spit."
-
+				--"Serenity"
 %
 Jayne: "How come they ain't blowin' us out of the air?"
 
 Mal: "They wanna run us down.  The up close kill."
 
 River: "They want us alive when they eat us."
-
+				--"Serenity"
 %
 Screen in a bar, advertizing candy: "Not Mandatory"
 
 [Ed: There's mandatory candy?]
-
+				--"Serenity"
 %
 Mal: "Hello, little one.  You know your part in this?"
 
 River: (beat) "Do you?"
 
 Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+				--"Serenity"
+%
+Mal: "Ready to go to work, darlin'?"
+
+River: "There's no pattern to the pebbles here.  Completely random.  "I
+tried to count them, but you drove too fast.  Hummingbird.
+
+Mal: "Alright.  Great.  Lets go."
+				--"Serenity", deleted scenes
+%
+Sheydra: "All the more reason the girls look to you.  You've seen so much.
+You're a figure of great romance to them."
+
+Inara: "Great romance has nothing to do with being a companion, Sheydra; you
+should know better."
+
+Sheydra: (coyly) "I'm not the one who had a torrid affair with a pirate."
+
+Inara: (shocked) "A who?  With a what?"
 
+Sheydra: "It's the talk of the house.  The girls all trade stories in the
+dorms at night."
+
+Inara: "I... didn't... have a... pirate!"
+
+Sheydra: "In one of the stories, you make love in a burning temple.  I think
+that's my favorite."
+				--"Serenity", deleted scenes
+%
+Book: "Lord - I'm walking your way.  Let me in, for my feet are sore.  My
+clothes are ragged.  Look in my eyes, Lord, and my sins will play out in
+them as on the screen.  Read them off.  Forgive what you can, and send me
+on my path.  I will walk on until you give me rest."
+				--"Serenity", deleted scenes
+%
+Mal:"They take you down, I don't expect to grieve over it much.  I'd like
+to kill you myself if I ever see you again."
+
+Operative: "You won't." (pause) "There is nothing left to see."
+
+(Operative walks off, then stops near the engine, looking up at the ship
+through the rain)
+
+Operative: "Serenity.  You lost everything in that battle.  Everything you
+had, everything you were.  How did you go on?"
+
+Mal: "You're still standing there when that engine starts, you never will
+figure it out." (walks into Serenity)  "What a whiner!"
+				--"Serenity", deleted scenes
+%
+Zoe: (to Wash, lovingly) "That was close."  (They hug each other playfully)
+
+Mal: "Hey, what are you guys doin?" (beat) "Making out?"
+
+Wash: (flips off Mal) "Blow it, captain."
+				--"Serenity", outtakes
+%
+Mal: "Whoa, Whoa, you see that?  You see it, right?  You see that?"
+
+Mal: "Turn?  Would you turn?"
+
+Wash: "You want to fly this thing?"
+
+Mal: "You want me... would you pull over?  Is that what you call what you're
+doing?"
+
+Wash: "I will pull over this spaceship right now!"
+
+Mal: "Christ almighty!"
+
+Wash: "Dammit, I don't need a back spaceship driver!"
+
+Mal: "Get out of the way!!!"
+
+Wash: "Christ, that's it!" (throws up hands, leaves seat) "You wanna fly,
+f'in fly!" (off set) "I'll be in my bunk."
+				--"Serenity", outtakes
+%
+Everyone: "Summer!"
+
+[Ed: It was a running joke on-set that whenever anything went wrong, it was
+actress Summer Glau (River)'s fault.]
+
+				--"Serenity", outtakes
+%
+Mal: "TRAAAAAAAAAAPPP!!!!!!!!!!!!"
+				--"Serenity", outtakes
+%
+Mal: "Don't f'in tell me what to goddamn do!"
+
+Kaylee: (laughing) "Goddamn do?"
+				--"Serenity", outtakes
+%
+Mal: "Get these bodies together!"
+
+Zoe: "We got time for gravedigging?"
+
+Mal: "Zoe, take this and rope them together; five or six of them, I want
+them laid out on the nose of our ship."
+
+Simon: "Are you insane?"
+
+Mal: "Put Book front and center.  He's our friend; we should honor him. 
+Kaylee!  Find that kid who's taking a dirt nap with Baby Jesus; we need a
+hood ornament.  Jayne!  Try not to steal too much of their shit."
+				--"Serenity", outtakes
 %
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.
+


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/fortune-firefly.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fortune-firefly.spec	6 Dec 2005 02:56:34 -0000	1.4
+++ fortune-firefly.spec	8 Jan 2006 21:11:21 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.0.1
+Version:	2.1.0
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,12 @@
 
 %changelog
 
+* Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
+- Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
+- Added quotes from unfilmed episode, "Dead or Alive"
+- Added quotes from deleted scenes
+- Added quotes from outtakes
+
 * Mon Dec 05 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.1
 - Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
 - Changed the versioning style



From fedora-extras-commits at redhat.com  Sun Jan  8 21:10:59 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  8 Jan 2006 16:10:59 -0500
Subject: rpms/fortune-firefly/FC-3 firefly, 1.4, 1.5 fortune-firefly.spec,
	1.3, 1.4
Message-ID: <200601082112.k08LC4es028154@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28092/FC-3

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Lots of new content.




View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.4 -r 1.5 firefly
Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/firefly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- firefly	6 Dec 2005 02:56:29 -0000	1.4
+++ firefly	8 Jan 2006 21:10:57 -0000	1.5
@@ -1,35 +1,9 @@
-Drunk: "Hey, you gonna toast unification with me?  Six years today, the
-Alliance sent the Browncoats runnin', pissin' their pants... You know, your
-coat is kinda a brownish color."
-
-Mal: "It was on sale."
-
-%
 Mal: "We're not gonna die. We can't die, Bendis. You know why? Because we
 are so...very...pretty. We are just too pretty for God to let us die."
-
+				--Episode #1, "Serenity"
 %
 Mal: "We've done the impossible, and that makes us mighty."
-
-%
-Mal: "If you can't do something smart, do something right."
-
-%
-Inara: "This is just a moment in time.  Step aside and let it happen."
-
-%
-Mal: "When you can't run anymore, you crawl, and when you can't do that, you
-find someone to carry you."
-
-%
-Early: "Well... here I am..."
-
-%
-Mal (naked, alone in the desert): "Yep... that went well."
-
-%
-River (startling Jayne, jumping up from unconsciousness): "Copper for a kiss?"
-
+				--Episode #1, "Serenity"
 %
 Wash: "Everything looks good from here... (beat...playing with plastic
 dinosaurs over his console) Yes. Yes, this is a fertile land, and we will
@@ -43,34 +17,167 @@
 (Stegosaurus) "Ah, curse your sudden but inevitable betrayal!"
 
 (T-Rex) "Ha ha HA! Mine is an evil laugh...now die!"
+				--Episode #1, "Serenity"
+%
+Take my love, take my land
+Take me where I cannot stand
+I don't care, I'm still free
+You can't take the sky from me
+
+Take me out to the black
+Tell them I ain't comin' back
+Burn the land and boil the sea
+You can't take the sky from me
 
+There's no place I can be
+Since I found Serenity
+But you can't take the sky from me...
 %
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+				--Episode #1, "Serenity"
+%
+Zoe: "Something ain't right."
+
+Wash: "Sweetie, we're crooks.  If everything were right, we'd be in jail."
+				--Episode #1, "Serenity"
+%
+Wash: "Just a couple of days lying around.  You with the bathing, 
+me with the watching you bathe."
+				--Episode #1, "Serenity"
+%
+Kaylee: "I'd sure like to get a new compression coil."
+
+Mal: "And I'd like to be the king of all Londinum and wear a shiny hat."
+				--Episode #1, "Serenity"
+%
+Mal: "Wheel always keeps on turning, Badger."
 
+Badger: "That only matters to people on the rim."
+				--Episode #1, "Serenity"
+%
+Badger: "Crime and politics, little girl.  The situation is always... fluid."
+
+Jayne: "The only fluid I see here is the puddle of piss refusing to pay our wage."
+				--Episode #1, "Serenity"
+%
+Book: "The destination's not important.  How you get there's the worthier
+part."
+				--Episode #1, "Serenity"
+%
+Book: "Been out of the world for a spell.  Like to walk it a while."
+				--Episode #1, "Serenity"
 %
 Jayne: "Ten percent of nuthin' is...let me do the math here...nuthin' into
 nuthin'...carry the nuthin'..."
+				--Episode #1, "Serenity"
+%
+Mal: "Jayne! Your mouth is talking, you'd might wanna look to that."
+				--Episode #1, "Serenity"
+%
+Zoe: "Sir, we don't want to deal with Patience again."
+
+Mal: "Why not?"
+
+Zoe: "She shot you."
+
+Mal: "Well, yeah, she did a bit..."
+				--Episode #1, "Serenity"
+%
+Mal: "Ain't no way in the verse they could find that compartment, even if
+they were lookin' for it."
+
+Zoe: "Why not?"
+
+Mal: "... cause?"
 
+Zoe: "Oh yeah, this is going to go great."
+				--Episode #1, "Serenity"
 %
 Mal: "If anyone gets nosy, just...you know... shoot 'em. "
 
 Zoe: "Shoot 'em?"
 
 Mal: "Politely."
+				--Episode #1, "Serenity"
+%
+Mal: "Send word to Patience?"
 
+Wash: "Haven't heard back yet.  Didn't she soot you one time?"
+
+Mal: "Everyone's making a fuss."
+				--Episode #1, "Serenity"
 %
-Book: "The destination's not important.  How you get there's the worthier
-part."
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
-Jayne: "I was gonna get me an ear."
+Book: "Captain, do you mind if I say grace?"
+
+Mal: "Only if you say it out loud."
+				--Episode #1, "Serenity"
+%
+Mal: "How's business?"
+
+Inara: "None of yours."
+				--Episode #1, "Serenity"
+%
+Book: "The important thing is the spices.  A man could live on enough 
+packaged food from here till judgement day as long as he has 
+enough rosemary."
+				--Episode #1, "Serenity"
+%
+Mal: "That's what governments are for, to get in a man's way."
+				--Episode #1, "Serenity"
+%
+Simon: (concerning Jayne) "What do you pay him for?"
 
+Mal: "Public relations."
+				--Episode #1, "Serenity"
 %
+Inara: "So, would you like to lecture me on the wickedness of my ways?"
+
 Book: "I brought you some supper but if you'd prefer a lecture, I've a few
 very catchy ones prepped...sin and hellfire... one has lepers."
+				--Episode #1, "Serenity"
+%
+Wash: "Can we maybe vote on the whole murdering people issue?"
+				--Episode #1, "Serenity"
+%
+Mal: "Now, you only gotta scare him."
+
+Jayne: (beat) "Pain is scary."
+				--Episode #1, "Serenity"
+%
+Jayne: "It's a girl. Cute too.  'Cept I don't think she's all there, you know?
+Course, not all of her has to be."
+ 				--Episode #1, "Serenity"
+%
+Jayne: "I was gonna get me an ear."
+				--Episode #1, "Serenity"
+%
+Simon: "What will they do?"
+
+Zoe: "If they take the ship, they'll rape us to death, eat our flesh and
+sew our skins into their clothing and if we're very very lucky, they'll
+do it in that order."
+				--Episode #1, "Serenity"
[...5555 lines suppressed...]
 %
 Fanty: "You're unpredictable, Mal... you run when you oughtta fight, 
 fight when you oughtta deal.  Makes a business person twitchy..."
-
+				--"Serenity"
 %
 River: "Show me off like a dog, old men covered in blood, it never 
 touched them but they're drowning in it... I don't know what I'm 
 saying, I never know what I'm saying..."
-
+				--"Serenity"
 %
 Operative: "We locked on to Serenity's pulse beacon the moment you 
 hit atmo.  I can speak a word and send a missile to that exact location 
@@ -3454,20 +3818,20 @@
 (tosses a gadget to the Operative)
 
 Operative: "... pulse beacon..."
-
+				--"Serenity"
 %
 Mal: "Piece of shrapnel tore up that nerve cluster my first
 tour.  Had it moved."
-
+				--"Serenity"
 %
 River: "Miranda."
-
+				--"Serenity"
 %
 Mal: "What was that?"
-
+				--"Serenity"
 %
 Mal: "I, uh, better go see how the inevitable mutiny is coming along..."
-
+				--"Serenity"
 %
 Teacher: "...so why would [the independents] fight so hard against us?"
 
@@ -3481,46 +3845,152 @@
 
 Teacher: "River, we're not telling people what to think.  We're just trying 
 to show them how."
-
+				--"Serenity"
 %
 Dr. Mathias: "All our subjects are conditioned for combat, but River... 
 she's a creature of extraordinary grace."
 
 Simon: "Yes.  She always did love to dance."
-
+				--"Serenity"
 %
 Operative: "We're making a better world.  All of them, better worlds."
-
+				--"Serenity"
 %
 Zoe: "Nobody flies like my mister."
-
+				--"Serenity"
 %
 Simon: "I bring River all the way out to the raggedy edge of the 'verse 
 so she can hide from the Alliance by robbing banks."
 
 Kaylee: "I know the cap'n'll look out for her.  They'll be back before you 
 can spit." (beat)  "Not that you spit."
-
+				--"Serenity"
 %
 Jayne: "How come they ain't blowin' us out of the air?"
 
 Mal: "They wanna run us down.  The up close kill."
 
 River: "They want us alive when they eat us."
-
+				--"Serenity"
 %
 Screen in a bar, advertizing candy: "Not Mandatory"
 
 [Ed: There's mandatory candy?]
-
+				--"Serenity"
 %
 Mal: "Hello, little one.  You know your part in this?"
 
 River: (beat) "Do you?"
 
 Mal: "It's what I do, darlin'."  (sighing) "It's what I do."
+				--"Serenity"
+%
+Mal: "Ready to go to work, darlin'?"
+
+River: "There's no pattern to the pebbles here.  Completely random.  "I
+tried to count them, but you drove too fast.  Hummingbird.
+
+Mal: "Alright.  Great.  Lets go."
+				--"Serenity", deleted scenes
+%
+Sheydra: "All the more reason the girls look to you.  You've seen so much.
+You're a figure of great romance to them."
+
+Inara: "Great romance has nothing to do with being a companion, Sheydra; you
+should know better."
+
+Sheydra: (coyly) "I'm not the one who had a torrid affair with a pirate."
+
+Inara: (shocked) "A who?  With a what?"
 
+Sheydra: "It's the talk of the house.  The girls all trade stories in the
+dorms at night."
+
+Inara: "I... didn't... have a... pirate!"
+
+Sheydra: "In one of the stories, you make love in a burning temple.  I think
+that's my favorite."
+				--"Serenity", deleted scenes
+%
+Book: "Lord - I'm walking your way.  Let me in, for my feet are sore.  My
+clothes are ragged.  Look in my eyes, Lord, and my sins will play out in
+them as on the screen.  Read them off.  Forgive what you can, and send me
+on my path.  I will walk on until you give me rest."
+				--"Serenity", deleted scenes
+%
+Mal:"They take you down, I don't expect to grieve over it much.  I'd like
+to kill you myself if I ever see you again."
+
+Operative: "You won't." (pause) "There is nothing left to see."
+
+(Operative walks off, then stops near the engine, looking up at the ship
+through the rain)
+
+Operative: "Serenity.  You lost everything in that battle.  Everything you
+had, everything you were.  How did you go on?"
+
+Mal: "You're still standing there when that engine starts, you never will
+figure it out." (walks into Serenity)  "What a whiner!"
+				--"Serenity", deleted scenes
+%
+Zoe: (to Wash, lovingly) "That was close."  (They hug each other playfully)
+
+Mal: "Hey, what are you guys doin?" (beat) "Making out?"
+
+Wash: (flips off Mal) "Blow it, captain."
+				--"Serenity", outtakes
+%
+Mal: "Whoa, Whoa, you see that?  You see it, right?  You see that?"
+
+Mal: "Turn?  Would you turn?"
+
+Wash: "You want to fly this thing?"
+
+Mal: "You want me... would you pull over?  Is that what you call what you're
+doing?"
+
+Wash: "I will pull over this spaceship right now!"
+
+Mal: "Christ almighty!"
+
+Wash: "Dammit, I don't need a back spaceship driver!"
+
+Mal: "Get out of the way!!!"
+
+Wash: "Christ, that's it!" (throws up hands, leaves seat) "You wanna fly,
+f'in fly!" (off set) "I'll be in my bunk."
+				--"Serenity", outtakes
+%
+Everyone: "Summer!"
+
+[Ed: It was a running joke on-set that whenever anything went wrong, it was
+actress Summer Glau (River)'s fault.]
+
+				--"Serenity", outtakes
+%
+Mal: "TRAAAAAAAAAAPPP!!!!!!!!!!!!"
+				--"Serenity", outtakes
+%
+Mal: "Don't f'in tell me what to goddamn do!"
+
+Kaylee: (laughing) "Goddamn do?"
+				--"Serenity", outtakes
+%
+Mal: "Get these bodies together!"
+
+Zoe: "We got time for gravedigging?"
+
+Mal: "Zoe, take this and rope them together; five or six of them, I want
+them laid out on the nose of our ship."
+
+Simon: "Are you insane?"
+
+Mal: "Put Book front and center.  He's our friend; we should honor him. 
+Kaylee!  Find that kid who's taking a dirt nap with Baby Jesus; we need a
+hood ornament.  Jayne!  Try not to steal too much of their shit."
+				--"Serenity", outtakes
 %
 --Package Maintainers note--: If your favorite Firefly quote is not in here,
 or you can help correct/expand a quote from "Serenity", please drop me a line
 at meme at daughtersoftiresias.org.
+


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/fortune-firefly.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fortune-firefly.spec	6 Dec 2005 02:56:29 -0000	1.3
+++ fortune-firefly.spec	8 Jan 2006 21:10:57 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.0.1
+Version:	2.1.0
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,12 @@
 
 %changelog
 
+* Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
+- Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
+- Added quotes from unfilmed episode, "Dead or Alive"
+- Added quotes from deleted scenes
+- Added quotes from outtakes
+
 * Mon Dec 05 2005 Karen Pease <meme at daughtersoftiresias.org> - 2.0.1
 - Incorporated some typo corrections from Zack Elan (zackelan at gmail.com)
 - Changed the versioning style



From fedora-extras-commits at redhat.com  Sun Jan  8 22:14:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Jan 2006 17:14:15 -0500
Subject: rpms/opensc/devel .cvsignore, 1.4, 1.5 opensc.spec, 1.7, 1.8 sources,
	1.4, 1.5
Message-ID: <200601082214.k08MEmR4030109@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30088

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-1
- 0.10.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 15:11:14 -0000	1.4
+++ .cvsignore	8 Jan 2006 22:14:15 -0000	1.5
@@ -1 +1 @@
-opensc-0.10.0.tar.gz
+opensc-0.10.1.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- opensc.spec	12 Nov 2005 15:11:14 -0000	1.7
+++ opensc.spec	8 Jan 2006 22:14:15 -0000	1.8
@@ -1,14 +1,14 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.10.0
+Version:        0.10.1
 Release:        1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/%{name}-%{version}.tar.gz
+Source0:        http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-1
+- 0.10.1.
+
 * Wed Nov  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.0-1
 - 0.10.0.
 - Adapt to modularized X.Org.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 15:11:14 -0000	1.4
+++ sources	8 Jan 2006 22:14:15 -0000	1.5
@@ -1 +1 @@
-d25271140776df94ada13f45dad34996  opensc-0.10.0.tar.gz
+5549c7c339775356784837887750d232  opensc-0.10.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan  8 22:40:02 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 17:40:02 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.5,1.6
Message-ID: <200601082240.k08MeZoI030277@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30260

Modified Files:
	gobby.spec 
Log Message:
rebuild and fix typos


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gobby.spec	8 Jan 2006 07:25:51 -0000	1.5
+++ gobby.spec	8 Jan 2006 22:40:02 -0000	1.6
@@ -69,6 +69,12 @@
 * Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-5
 - Rebuild
 
+* Sat Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
+- rebuild
+
+* Fri Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
+- Remove modular Xorg BR's for FC-4 package
+
 * Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
 - Add libXau-devel to BuildRequires
 



From fedora-extras-commits at redhat.com  Sun Jan  8 22:47:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Sun,  8 Jan 2006 17:47:03 -0500
Subject: rpms/libcaca/devel libcaca.spec,1.8,1.9
Message-ID: <200601082247.k08MlZ42030389@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/libcaca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30338

Modified Files:
	libcaca.spec 
Log Message:
Include fixes from Ville (#176796).



Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/devel/libcaca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libcaca.spec	17 Nov 2005 15:19:28 -0000	1.8
+++ libcaca.spec	8 Jan 2006 22:47:03 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://sam.zoy.org/projects/libcaca/
@@ -100,10 +100,16 @@
 %{_mandir}/man1/cacaball.1*
 %{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
+%{_mandir}/man1/cacamoir.1*
+%{_mandir}/man1/cacaplas.1*
 %{_mandir}/man1/cacaview.1*
 
 
 %changelog
+* Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-8
+- Include unpackaged man page symlinks.
+- Rebuild against new slang.
+
 * Thu Nov 17 2005 Matthias Saou <http://freshrpms.net/> 0.9-7
 - Change XFree86-devel requirements to libX11-devel.
 - Force --x-includes= and --x-libraries=, otherwise -L gets passed empty.



From fedora-extras-commits at redhat.com  Sun Jan  8 22:55:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  8 Jan 2006 17:55:34 -0500
Subject: rpms/cvsweb/devel cvsweb-3.0.6-fedora-config.patch, NONE,
	1.1 cvsweb.spec, 1.7, 1.8 cvsweb-fedora-config.patch, 1.2, NONE
Message-ID: <200601082256.k08Mu6XG030523@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/cvsweb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30502

Modified Files:
	cvsweb.spec 
Added Files:
	cvsweb-3.0.6-fedora-config.patch 
Removed Files:
	cvsweb-fedora-config.patch 
Log Message:
* Mon Jan  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.6-2
- Use enscript by default if it's installed (enscript >= 1.6.3 in FC5+).
- Fix cvsweb.css permissions.


cvsweb-3.0.6-fedora-config.patch:

--- NEW FILE cvsweb-3.0.6-fedora-config.patch ---
--- cvsweb-3.0.6/cvsweb.conf.fedora-config	2005-06-19 12:13:50.000000000 +0300
+++ cvsweb-3.0.6/cvsweb.conf	2006-01-09 00:34:39.000000000 +0200
@@ -24,7 +24,7 @@
 #   cvsgraph (if you enable $allow_graph)
 #   enscript (if you enable $allow_enscript)
 #
- at command_path = qw(/bin /usr/bin /usr/local/bin);
+ at command_path = qw(/bin /usr/bin);
 
 # Search the above directories for each command (prefer gtar over tar).
 #
@@ -226,14 +226,14 @@
 # check out the "mini" versions in the icons/ directory; they have a
 # width/height of 16/16.
 #
-my $iconsdir = '/icons';
+my $iconsdir = '/icons/small';
 
 # format:          TEXT       ICON-URL                  width height
 %ICONS = (
-     back    => [('[BACK]',   "$iconsdir/back.gif",      20,   22)],
-     dir     => [('[DIR]',    "$iconsdir/dir.gif",       20,   22)],
-     file    => [('[TXT]',    "$iconsdir/text.gif",      20,   22)],
-     binfile => [('[BIN]',    "$iconsdir/binary.gif",    20,   22)],
+     back    => [('[BACK]',   "$iconsdir/back.gif",      16,   16)],
+     dir     => [('[DIR]',    "$iconsdir/dir.gif",       16,   16)],
+     file    => [('[TXT]',    "$iconsdir/text.gif",      16,   16)],
+     binfile => [('[BIN]',    "$iconsdir/binary.gif",    16,   16)],
      graph   => [('[GRAPH]',  "$iconsdir/minigraph.png", 16,   16)],
 );
 undef $iconsdir;
@@ -368,7 +368,7 @@
 # The traditional mime.types file, eg. the one from Apache is fine.
 # See above where this gets used.
 #
-$mime_types = '/usr/local/etc/apache/mime.types';
+$mime_types = '/etc/mime.types';
 
 # Charset appended to the Content-Type HTTP header for text/* MIME types.
 # Note that the web server may default to some charset which may take effect
@@ -518,7 +518,7 @@
 # versions, the user account running CVSweb needs write access to
 # CVSROOT/val-tags.  See also the tar, gzip and zip options below.
 #
-#$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
+$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0;
 
 # Options to pass to tar(1).
 # For example: @tar_options = qw(--ignore-failed-read);
@@ -526,7 +526,7 @@
 # Other useful options include "--owner=0" and "--group=0", see
 # the tar(1) (or gtar(1)) manpage for details.
 #
- at tar_options = qw();
+ at tar_options = qw(--owner=0 --group=0);
 
 # Options to pass to gzip(1) when compressing a tarball to download.
 # For example: @gzip_options = qw(-3);
@@ -564,7 +564,7 @@
 # To make annotate work against a read only repository, add -n, ie.:
 # @annotate_options = (@cvs_options, '-n');
 #
- at annotate_options = @cvs_options;
+ at annotate_options = (@cvs_options, '-n');
 
 # Options to pass to rcsdiff(1).
 # Probably the only useful one here is -q (suppress diagnostic output).
@@ -574,7 +574,7 @@
 # Enables syntax highlighting using GNU Enscript if set.
 # You will need GNU Enscript version 1.6.3 or newer for this to work.
 #
-#$allow_enscript = $CMD{enscript} ? 1 : 0;
+$allow_enscript = $CMD{enscript} ? 1 : 0;
 
 # Options to pass to enscript(1).
 # Do not set the -q, --language, -o or --highlight options here.
@@ -639,9 +639,9 @@
 # Enable this to let CVSweb load extra configuration files from the "conf.d"
 # subdirectory of the directory this file is located in.  This enables site
 # specific configuration without having to modify this "master" configuration
-# file (except for enabling this functionality below :)
+# file.
 #
-if (0) {
+if (1) {
   my $confdir = catdir(dirname(__FILE__), 'conf.d');
   if (opendir(CONFD, $confdir)) {
     my @files = sort(map(catfile($confdir, $_), readdir(CONFD)));
--- cvsweb-3.0.6/cvsweb.cgi.fedora-config	2005-09-25 23:28:51.000000000 +0300
+++ cvsweb-3.0.6/cvsweb.cgi	2006-01-09 00:33:32.000000000 +0200
@@ -208,22 +208,8 @@
 # (think mod_perl)...
 delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)});
 
-my ($mydir) = (dirname($0) =~ /(.*)/);    # untaint
-
-##### Start of Configuration Area ########
-
-# == EDIT this ==
-# Locations to search for user configuration, in order:
-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
-  if (-r $_) {
-    $config = $_;
-    last;
-  }
-}
-
-##### End of Configuration Area   ########
-
-undef $mydir;
+# Path to the configuration file.
+$config = '/etc/cvsweb/cvsweb.conf';
 
 ######## Configuration parameters #########
 


Index: cvsweb.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsweb/devel/cvsweb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cvsweb.spec	25 Sep 2005 21:02:24 -0000	1.7
+++ cvsweb.spec	8 Jan 2006 22:55:34 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           cvsweb
 Version:        3.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Web interface for CVS repositories
 
 License:        BSD
 Group:          Development/Tools
 URL:            http://www.freebsd.org/projects/cvsweb.html
 Source0:        http://people.freebsd.org/~scop/cvsweb/%{name}-%{version}.tar.gz
-Patch0:         %{name}-fedora-config.patch
+Patch0:         %{name}-3.0.6-fedora-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,7 +34,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -Dpm 755 cvsweb.cgi \
   $RPM_BUILD_ROOT%{_localstatedir}/www/cgi-bin/cvsweb.cgi
-install -Dpm 755 css/cvsweb.css \
+install -Dpm 644 css/cvsweb.css \
   $RPM_BUILD_ROOT%{_localstatedir}/www/html/css/cvsweb.css
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb/conf.d
 install -pm 644 cvsweb.conf $RPM_BUILD_ROOT%{_sysconfdir}/cvsweb
@@ -53,12 +53,16 @@
 %doc ChangeLog NEWS README TODO INSTALL samples/cvsweb-httpd.conf
 %config(noreplace) %{_sysconfdir}/cvsweb/
 %{_localstatedir}/www/cgi-bin/cvsweb.cgi
-%{_localstatedir}/www/html/css
+%{_localstatedir}/www/html/css/
 %{_localstatedir}/www/icons/small/minigraph.png
 %{_datadir}/enscript/
 
 
 %changelog
+* Mon Jan  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.6-2
+- Use enscript by default if it's installed (enscript >= 1.6.3 in FC5+).
+- Fix cvsweb.css permissions.
+
 * Sun Sep 25 2005 Ville Skytt?? <ville.skytta at iki.fi> - 3.0.6-1
 - 3.0.6.
 


--- cvsweb-fedora-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan  9 00:08:45 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  8 Jan 2006 19:08:45 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.6,1.7
Message-ID: <200601090010.k090A2YQ001903@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1886

Modified Files:
	gobby.spec 
Log Message:
- fix tag/branch issues, and regress FC5 changes for FC4 branch



Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gobby.spec	8 Jan 2006 22:40:02 -0000	1.6
+++ gobby.spec	9 Jan 2006 00:07:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        5%{?dist}
+Release:        1%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -66,46 +66,9 @@
 
 
 %changelog
-* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-5
-- Rebuild
-
-* Sat Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
-- rebuild
-
-* Fri Jan 07 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
-- Remove modular Xorg BR's for FC-4 package
-
-* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
-- Add libXau-devel to BuildRequires
-
-* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+* Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 
-* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
-- Bump to 0.3.0rc3
-
-* Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
-- Update Summary
-
-* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-5
-- Use desktop-file-install to install the desktop file
-
-* Mon Oct 10 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-4
-- Add desktop-file-utils to Requires(post/postun) and remove howl-devel BR
-
-* Fri Oct 07 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-3
-- Build with gnome support
-- Rebuild
-
-* Sat Dec 24 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-2
-- Add libXau-devel to BuildRequires
-
-* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
-- 0.3.0
-
-* Sat Nov 26 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1.rc3
-- Bump to 0.3.0rc3
-
 * Wed Oct 12 2005 Luke Macken <lmacken at redhat.com> - 0.2.2-6
 - Update Summary
 



From fedora-extras-commits at redhat.com  Mon Jan  9 02:32:13 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun,  8 Jan 2006 21:32:13 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.3,1.4
Message-ID: <200601090232.k092Wjc8006172@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6155

Modified Files:
	ldns.spec 
Log Message:
* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
- Upgraded to 1.0.1. Removed temporary clean hack from spec file.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
+++ ldns.spec	9 Jan 2006 02:32:12 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.0.0
-Release: 7%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -25,21 +25,20 @@
 
 %prep
 %setup -q 
-rm config.sub config.guess
-libtoolize
-autoreconf
-# only for 2.3.3, since upstream left .o files in release
-make clean
+
+#libtoolize
+#autoreconf
 
 %configure
 
 
 %build
-%{__make} %{?_smp_mflags} allautoconf
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} drill
-%{__make} %{?_smp_mflags} examples
-%{__make} %{?_smp_mflags} doc
+make %{?_smp_mflags} clean
+make %{?_smp_mflags} allautoconf
+make %{?_smp_mflags}
+make %{?_smp_mflags} drill
+make %{?_smp_mflags} examples
+make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
@@ -78,8 +77,17 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+- Upgraded to 1.0.1. Removed temporary clean hack from spec file.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8
+- Cannot use make clean because there are no Makefiles. Use hardcoded rm.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-7
+- Patched 'make clean' target to get rid of object files shipped with 1.0.0
+
 * Sun Dec 13 2005 Paul Wouters <paul at xelerance.com> 1.0.0-6
-- added a make clean for 1.0.0 since .o files were left behind upstream,
+- added a make clean for 2.3.3 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.0-5



From fedora-extras-commits at redhat.com  Mon Jan  9 02:34:27 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun,  8 Jan 2006 21:34:27 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.4,1.5
Message-ID: <200601090234.k092YxYu006230@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6213

Modified Files:
	ldns.spec 
Log Message:
bumped version



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ldns.spec	9 Jan 2006 02:32:12 -0000	1.4
+++ ldns.spec	9 Jan 2006 02:34:27 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -77,7 +77,7 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-2
 - Upgraded to 1.0.1. Removed temporary clean hack from spec file.
 
 * Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8



From fedora-extras-commits at redhat.com  Mon Jan  9 02:59:50 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  8 Jan 2006 21:59:50 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.1,1.2
Message-ID: <200601090300.k0930NjH006350@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6320

Modified Files:
	tclxml.spec 
Log Message:
Package now owns the directories that it creates.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclxml.spec	5 Dec 2005 17:56:35 -0000	1.1
+++ tclxml.spec	9 Jan 2006 02:59:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -101,6 +101,7 @@
 
 %files
 %defattr(-,root,root)
+%dir %{_libdir}/Tclxml%{version}
 %{_libdir}/Tclxml%{version}/*.so
 %{_libdir}/Tclxml%{version}/*.tcl
 %doc LICENSE ANNOUNCE ChangeLog README RELNOTES
@@ -121,6 +122,8 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Sun Jan 8 2006 Wart <wart at kobold.org> - 3.1-2
+- Package now owns the directories that it creates.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.1-1
 - Update to new upstream sources.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.0-3



From fedora-extras-commits at redhat.com  Mon Jan  9 03:00:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  8 Jan 2006 22:00:48 -0500
Subject: rpms/tclxml/FC-4 tclxml.spec,1.1,1.2
Message-ID: <200601090301.k0931L57007765@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6356/FC-4

Modified Files:
	tclxml.spec 
Log Message:
Package now owns the directories that it creates.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/FC-4/tclxml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclxml.spec	5 Dec 2005 17:56:35 -0000	1.1
+++ tclxml.spec	9 Jan 2006 03:00:47 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -101,6 +101,7 @@
 
 %files
 %defattr(-,root,root)
+%dir %{_libdir}/Tclxml%{version}
 %{_libdir}/Tclxml%{version}/*.so
 %{_libdir}/Tclxml%{version}/*.tcl
 %doc LICENSE ANNOUNCE ChangeLog README RELNOTES
@@ -121,6 +122,8 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Sun Jan 8 2006 Wart <wart at kobold.org> - 3.1-2
+- Package now owns the directories that it creates.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.1-1
 - Update to new upstream sources.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.0-3



From fedora-extras-commits at redhat.com  Mon Jan  9 07:52:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  9 Jan 2006 02:52:39 -0500
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.12, 1.13 sources, 1.13,
	1.14 sylpheed-claws.spec, 1.31, 1.32
Message-ID: <200601090753.k097rBL6015975@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15942

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	25 Dec 2005 09:26:51 -0000	1.12
+++ .cvsignore	9 Jan 2006 07:52:38 -0000	1.13
@@ -1 +1 @@
-sylpheed-claws-2.0.0-rc2.tar.bz2
+sylpheed-claws-2.0.0-rc3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Dec 2005 09:26:51 -0000	1.13
+++ sources	9 Jan 2006 07:52:38 -0000	1.14
@@ -1 +1 @@
-1becc85e57825d4e654c34bf14e2877b  sylpheed-claws-2.0.0-rc2.tar.bz2
+105875aa5c853f47c38996bd8820a49e  sylpheed-claws-2.0.0-rc3.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sylpheed-claws.spec	28 Dec 2005 08:46:36 -0000	1.31
+++ sylpheed-claws.spec	9 Jan 2006 07:52:38 -0000	1.32
@@ -2,12 +2,12 @@
 
 Name:           sylpheed-claws
 Version:        2.0.0
-Release:        0.rc2%{?dist}
+Release:        0.rc3%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc2.tar.bz2
+Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc3.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -47,7 +47,7 @@
 for development with %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q -n %{name}-%{version}-rc3
 
 %build
 #%if %openssl_pc
@@ -82,7 +82,7 @@
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
-%{__install} %{_builddir}/%{name}-%{version}-rc2/sylpheed-claws.png \
+%{__install} %{_builddir}/%{name}-%{version}-rc3/sylpheed-claws.png \
 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
 %clean
@@ -113,6 +113,10 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Mon Jan 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.0.0-0.rc3
+- version upgrade
+
 * Sun Dec 25 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-0.rc2
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Jan  9 08:22:17 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Mon,  9 Jan 2006 03:22:17 -0500
Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.5,
	1.6
Message-ID: <200601090822.k098MnR3017779@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-netspeed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17762

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
Bumping devel for new libgtop



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-applet-netspeed.spec	21 Sep 2005 20:09:25 -0000	1.5
+++ gnome-applet-netspeed.spec	9 Jan 2006 08:22:17 -0000	1.6
@@ -53,6 +53,9 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-3
+- Rebuild for libgtop soname change
+
 * Wed Sep 21 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-2
 - Proper buildreps this time
 



From fedora-extras-commits at redhat.com  Mon Jan  9 09:35:21 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Jan 2006 04:35:21 -0500
Subject: fedora-security/audit fc4,1.119,1.120 fc5,1.30,1.31
Message-ID: <200601090935.k099ZLdR020147@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20127

Modified Files:
	fc4 fc5 
Log Message:
kernel update and some others (note the FEDORA-* id's in the announce
emails are incorrect)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc4	6 Jan 2006 20:16:08 -0000	1.119
+++ fc4	9 Jan 2006 09:35:13 -0000	1.120
@@ -1,8 +1,9 @@
-Up to date CVE as of CVE email 20060105
-Up to date FC4 as of 20060105
+Up to date CVE as of CVE email 20060108
+Up to date FC4 as of 20060108
 
 ** are items that need attention
 
+CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
@@ -26,7 +27,7 @@
 CVE-2005-3624 VULNERABLE (xpdf)
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-4618 VULNERABLE (kernel)
-CVE-2005-4605 VULNERABLE (kernel) bz#176813
+CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
@@ -62,7 +63,7 @@
 CVE-2005-3675 VULNERABLE (kernel) optack
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
-CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3656 backport (mod_auth_pgsql, fixed 2.0.3) [since FEDORA-2006-015]
 CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
@@ -79,6 +80,7 @@
 CVE-2005-3389 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3358 version (kernel, fixed 2.6.11)
+CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- fc5	6 Jan 2006 20:16:08 -0000	1.30
+++ fc5	9 Jan 2006 09:35:13 -0000	1.31
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
 CVE-2005-3628 VULNERABLE (cups)
 CVE-2005-3628 VULNERABLE (poppler)
@@ -53,6 +54,7 @@
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
+CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3193 VULNERABLE (xpdf)
 CVE-2005-3193 VULNERABLE (kdegraphics)



From fedora-extras-commits at redhat.com  Mon Jan  9 10:51:12 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon,  9 Jan 2006 05:51:12 -0500
Subject: rpms/esmtp/FC-4 esmtp.spec,1.3,1.4
Message-ID: <200601091051.k09ApiRS022628@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/esmtp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22606

Modified Files:
	esmtp.spec 
Log Message:
* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
- convert man pages to utf8 (Dmitry Butskoy report)
- remove the workaround for libesmtp not requiring openssl (#166844 closed)




Index: esmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/esmtp/FC-4/esmtp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- esmtp.spec	30 Aug 2005 09:05:27 -0000	1.3
+++ esmtp.spec	9 Jan 2006 10:51:11 -0000	1.4
@@ -2,7 +2,7 @@
 Summary(de):   Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
 Name:		esmtp
 Version:	0.5.1
-Release:	7%{?dist}
+Release:	10%{?dist}
 Source: 	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Source1:	esmtp-0.4.1-mutt
 Url:		http://esmtp.sourceforge.net/
@@ -11,8 +11,6 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):	%{_sbindir}/alternatives
-# workaround a missing libesmtp-devel Requires:
-BuildRequires:	openssl-devel
 BuildRequires:	libesmtp-devel
 Provides:       %{_sbindir}/sendmail
 # esmtp doesn't listen on port 25, so it cannot provide smtpdaemon. 
@@ -53,6 +51,9 @@
 %prep
 %setup -q
 cp %{SOURCE1} mutt-esmtp
+for file in esmtp.1 esmtprc.5; do
+   iconv -f ISO8859-1 -t UTF8 < $file > $file.new && mv -f $file.new $file
+done
 
 %build
 %configure
@@ -96,6 +97,12 @@
 %{_mandir}/man[^3]/esmtp*
 
 %changelog
+* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
+- convert man pages to utf8 (Dmitry Butskoy report)
+
+* Wed Nov 16 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-9
+- remove the workaround for libesmtp not requiring openssl (#166844 closed)
+
 * Mon Aug 29 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-7
 - uncomment german translation
 



From fedora-extras-commits at redhat.com  Mon Jan  9 11:02:18 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon,  9 Jan 2006 06:02:18 -0500
Subject: rpms/esmtp/devel esmtp.spec,1.5,1.6
Message-ID: <200601091103.k09B34ra024366@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/esmtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24349

Modified Files:
	esmtp.spec 
Log Message:
* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
- convert man pages to utf8 (Dmitry Butskoy report)



Index: esmtp.spec
===================================================================
RCS file: /cvs/extras/rpms/esmtp/devel/esmtp.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- esmtp.spec	16 Nov 2005 12:07:33 -0000	1.5
+++ esmtp.spec	9 Jan 2006 11:02:18 -0000	1.6
@@ -2,7 +2,7 @@
 Summary(de):   Benutzerkonfigurierbarer nur versendender Mail Transfer Agent (MTA)
 Name:		esmtp
 Version:	0.5.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Source: 	http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
 Source1:	esmtp-0.4.1-mutt
 Url:		http://esmtp.sourceforge.net/
@@ -51,6 +51,9 @@
 %prep
 %setup -q
 cp %{SOURCE1} mutt-esmtp
+for file in esmtp.1 esmtprc.5; do
+   iconv -f ISO8859-1 -t UTF8 < $file > $file.new && mv -f $file.new $file
+done
 
 %build
 %configure
@@ -94,6 +97,9 @@
 %{_mandir}/man[^3]/esmtp*
 
 %changelog
+* Sun Jan  8 2006 Patrice Dumas <pertusus at free.fr> 0.5.1-10
+- convert man pages to utf8 (Dmitry Butskoy report)
+
 * Wed Nov 16 2005 Patrice Dumas <pertusus at free.fr> 0.5.1-9
 - remove the workaround for libesmtp not requiring openssl (#166844 closed)
 



From fedora-extras-commits at redhat.com  Mon Jan  9 11:26:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Mon,  9 Jan 2006 06:26:36 -0500
Subject: owners owners.list,1.513,1.514
Message-ID: <200601091127.k09BREfl024508@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24476

Modified Files:
	owners.list 
Log Message:
Add at-poke (as orphaned, because maintainer listed in changelog is not reachable and not via fedora-maintainers either)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.513
retrieving revision 1.514
diff -u -r1.513 -r1.514
--- owners.list	8 Jan 2006 17:27:39 -0000	1.513
+++ owners.list	9 Jan 2006 11:26:36 -0000	1.514
@@ -49,6 +49,7 @@
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info



From fedora-extras-commits at redhat.com  Mon Jan  9 12:51:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Jan 2006 07:51:12 -0500
Subject: fedora-security/audit fc4,1.120,1.121
Message-ID: <200601091251.k09CpCjK026494@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26474

Modified Files:
	fc4 
Log Message:
Use proper errata id that bressers looked up



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc4	9 Jan 2006 09:35:13 -0000	1.120
+++ fc4	9 Jan 2006 12:51:04 -0000	1.121
@@ -12,23 +12,23 @@
 CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
 CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (poppler)
-CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (poppler)
-CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (poppler)
-CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3624 VULNERABLE (cups)
 CVE-2005-3624 VULNERABLE (poppler)
-CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (xpdf) [since FEDORA-2006-010]
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
-CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
+CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-4442 version (openldap) gentoo only
 CVE-2005-4348 version (fetchmail, fixed 6.2.5.5) [since FEDORA-2005-1187]
 CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
@@ -64,7 +64,7 @@
 CVE-2005-3671 version (openswan, fixed 2.4.4) [since FEDORA-2005-1093]
 CVE-2005-3662 version (netpbm)
 CVE-2005-3656 backport (mod_auth_pgsql, fixed 2.0.3) [since FEDORA-2006-015]
-CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
+CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3627 backport (cups) [since FEDORA-2005-000**]
@@ -87,7 +87,7 @@
 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-3322 version (squid, not upstream) SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
-CVE-2005-3313 version (ethereal, fixed 0.10.14) [since FEDORA-2005-000**]
+CVE-2005-3313 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-3276 version (kernel, fixed 2.6.12.4) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3275 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-3274 version (kernel, fixed 2.6.13) [since FEDORA-2005-949]



From fedora-extras-commits at redhat.com  Mon Jan  9 13:54:14 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon,  9 Jan 2006 08:54:14 -0500
Subject: fedora-security/audit fc4,1.121,1.122 fc5,1.31,1.32
Message-ID: <200601091354.k09DsEV7028425@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28406

Modified Files:
	fc4 fc5 
Log Message:
Deal with pdf issues which got messed out of order in the files - so sort
the files as well



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc4	9 Jan 2006 12:51:04 -0000	1.121
+++ fc4	9 Jan 2006 13:54:05 -0000	1.122
@@ -5,27 +5,7 @@
 
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
-CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (poppler)
-CVE-2005-3627 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (poppler)
-CVE-2005-3626 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (poppler)
-CVE-2005-3625 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3624 VULNERABLE (cups)
-CVE-2005-3624 VULNERABLE (poppler)
-CVE-2005-3624 backport (xpdf) [since FEDORA-2006-010]
-CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
@@ -67,9 +47,28 @@
 CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
-CVE-2005-3627 backport (cups) [since FEDORA-2005-000**]
-CVE-2005-3626 backport (cups) [since FEDORA-2005-000**]
-CVE-2005-3625 backport (cups) [since FEDORA-2005-000**]
+CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
+CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
+CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3627 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3627 VULNERABLE (poppler) bz#176873
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3626 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3626 VULNERABLE (poppler) bz#176873
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3625 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3625 VULNERABLE (poppler) bz#176873
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3624 VULNERABLE (poppler) bz#176873
+CVE-2005-3624 backport (cups) [since FEDORA-2006-010]
+CVE-2005-3623 backport (kernel, fixed 2.6.14.5) [since FEDORA-2006-013]
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman)
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least) [since FEDORA-2005-1067]
@@ -105,25 +104,25 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
-CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
+CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
-CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
 CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
-CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
+CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
+CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]
-CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE
+CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-3185 blocked (wget) by FORTIFY_SOURCE
+CVE-2005-3185 backport (curl) [since FEDORA-2005-1129] was blocked (curl) by FORTIFY_SOURCE
 CVE-2005-3184 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3183 backport (w3c-libwww) [since FEDORA-2005-952]
 CVE-2005-3181 version (kernel, fixed 2.6.13.4 at least) [since FEDORA-2005-1067] was backport since FEDORA-2005-1013
@@ -149,29 +148,29 @@
 CVE-2005-2978 version (netpbm, fixed 10.25)
 CVE-2005-2977 backport (pam) [since FEDORA-2005-1031]
 CVE-2005-2976 backport (gdk-pixbuf) [since FEDORA-2005-1085]
-CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-2975 backport (gtk2) [since FEDORA-2005-1088]
+CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-2974 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-2973 version (kernel, 2.6.14 at least) [since FEODRA-2005-1067]
 CVE-2005-2970 VULNERABLE (httpd) bz#171759
-CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986]
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h) [since FEDORA-2005-986]
+CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986]
+CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963]
 CVE-2005-2968 version (mozilla, not 1.7.10) +we include a different mozilla sh
 CVE-2005-2968 version (firefox) [since FEDORA-2005-926]
-CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963]
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 VULNERABLE (openssl, fixed 0.9.8) (as it uses md5 md)
-CVE-2005-2933 VULNERABLE (uw-imap) bz#171345
 CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115]
+CVE-2005-2933 VULNERABLE (uw-imap) bz#171345
 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079]
 CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913]
 CVE-2005-2876 backport (util-linux) [since FEDORA-2005-887]
 CVE-2005-2874 version (cups, fixed 1.1.23)
 CVE-2005-2873 VULNERABLE (kernel) not upstream fixed
 CVE-2005-2872 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
-CVE-2005-2871 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] was backport [since FEDORA-2005-871]
-CVE-2005-2871 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] was backport [since FEDORA-2005-873]
 CVE-2005-2871 version (thunderbird) (moderate only) [since FEDORA-2005-963]
+CVE-2005-2871 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927] was backport [since FEDORA-2005-873]
+CVE-2005-2871 version (firefox, fixed 1.0.7) [since FEDORA-2005-926] was backport [since FEDORA-2005-871]
 CVE-2005-2811 version (net-snmp, not upstream) gentoo only
 CVE-2005-2801 version (kernel, fixed 2.6.11)
 CVE-2005-2800 version (kernel, fixed 2.6.12.6) [since FEDORA-2005-949] was backport since FEDORA-2005-906
@@ -184,25 +183,25 @@
 CVE-2005-2709 backport (kernel, fixed 2.6.14.3) [since FEDORA-2005-1104]
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2707 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2707 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2706 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2706 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2706 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2706 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2705 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2705 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2705 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2705 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2704 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2704 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2704 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2704 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2703 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2703 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2703 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2703 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2702 version (thunderbird) [since FEDORA-2005-963]
-CVE-2005-2702 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2702 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
-CVE-2005-2701 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
+CVE-2005-2702 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2701 version (mozilla, fixed 1.7.12) [since FEDORA-2005-927]
+CVE-2005-2701 version (firefox, fixed 1.0.7) [since FEDORA-2005-926]
 CVE-2005-2700 backport (httpd, fixed 2.0.55-dev) [since FEDORA-2005-849]
 CVE-2005-2693 backport (cvs) [since FEDORA-2005-790]
 CVE-2005-2672 backport (lm_sensors) [since FEDORA-2005-1053]
@@ -211,10 +210,10 @@
 CVE-2005-2641 VULNERABLE (pam_ldap) bz#166164
 CVE-2005-2629 version (helixplayer, fixed 1.0.6) [since FEDORA-2005-940]
 CVE-2005-2617 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
-CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2602 ignore (thunderbird) probably
-CVE-2005-2558 ignore (mysql) not an issue
+CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2558 version (mysql, fixed 4.1.13) [since FEDORA-2005-974]
+CVE-2005-2558 ignore (mysql) not an issue
 CVE-2005-2555 version (kernel, fixed 2.6.12.6pre) [since FEDORA-2005-949] was backport since FEDORA-2005-820
 CVE-2005-2553 version (kernel, not 2.6)
 CVE-2005-2550 backport (evolution) [since FEDORA-2005-743]
@@ -228,11 +227,11 @@
 CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
 CVE-2005-2495 backport (xorg-x11) [since FEDORA-2005-894]
 CVE-2005-2494 version (kdebase, fixed after 3.4.2) [since FEDORA-2005-1152]
+CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2491 ignore (python, fc4 python does not contain pcre)
-CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
-CVE-2005-2491 ignore (httpd, pcre uses system pcre)
 CVE-2005-2491 ignore (php, pcre uses system pcre)
-CVE-2005-2492 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
+CVE-2005-2491 ignore (httpd, pcre uses system pcre)
+CVE-2005-2491 backport (pcre, fixed 6.2) [since FEDORA-2005-803]
 CVE-2005-2490 version (kernel, fixed 2.6.13.1) [since FEDORA-2005-949] was backport since FEDORA-2005-906
 CVE-2005-2475 VULNERABLE (unzip) bz#164928
 CVE-2005-2471 version (netpbm, 10.31 at least) [since FEDORA-2005-000**] was backport since FEDORA-2005-728
@@ -260,34 +259,34 @@
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3) [since FEDORA-2005-936]
 CVE-2005-2335 version (fetchmail, fixed 6.2.5.2) [since FEDORA-2005-1108] was backport since FEDORA-2005-613
-CVE-2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2270 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2269 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2270 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2270 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2269 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+CVE-2005-2269 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2269 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2268 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2268 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2267 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2267 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2266 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
 CVE-2005-2266 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
-CVE-2005-2265 version (mozilla, fixed 1.7.9) [si [since FEDORA-2005-619]
+CVE-2005-2266 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2266 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2265 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
+CVE-2005-2265 version (mozilla, fixed 1.7.9) [si [since FEDORA-2005-619]
+CVE-2005-2265 version (firefox, fixed 1.0.5) [since FEDORA-2005]
 CVE-2005-2264 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
-CVE-2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2263 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2263 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2262 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2261 version (thunderbird, fixed 1.0.5) [since FEDORA-2005-606]
-CVE-2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2261 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
-CVE-2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
+CVE-2005-2261 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2260 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2260 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2177 version (net-snmp, fixed 5.2.1.2) [since FEDORA-2005-561]
-CVE-2005-2114 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2114 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-2114 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-2104 version (sysreport, fixed 1.4.1-5) [since FEDORA-2005-1071]
 CVE-2005-2103 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
 CVE-2005-2102 version (gaim, fixed 1.5.0) [since FEDORA-2005-751]
@@ -295,8 +294,8 @@
 CVE-2005-2100 version (kernel, not upstream) only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
 CVE-2005-2098 version (kernel, fixed 2.6.12.5) [since FEDORA-2005-820]
-CVE-2005-2097 backport (cups) [since FEDORA-2005-732]
 CVE-2005-2097 version (xpdf, fixed 3.0.1) [since FEDORA-2005-755] was backport since FEDORA-2005-729
+CVE-2005-2097 backport (cups) [since FEDORA-2005-732]
 CVE-2005-2096 backport (zlib) [since FEDORA-2005-523]
 CVE-2005-2096 backport (rpm) [since FEDORA-2005-565]
 CVE-2005-2095 version (squirrelmail, fixed 1.4.5) since [FEDORA-2005-780]
@@ -306,8 +305,8 @@
 CVE-2005-2023 version (gnupg, fixed 1.9.15)
 CVE-2005-1993 backport (sudo, fixed 1.6.8p9) [since FEDORA-2005-472]
 CVE-2005-1992 version (ruby, fixed 1.8.3 at least) [since FEDORA-2005-936] was backport since FEDORA-2005-475
-CVE-2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-1937 version (mozilla, fixed 1.7.9) [since FEDORA-2005-619]
+CVE-2005-1937 version (firefox, fixed 1.0.5) [since FEDORA-2005-605]
 CVE-2005-1934 version (gaim, fixed 1.3.1) [since FEDORA-2005-411]
 CVE-2005-1921 version (php, fixed xml_rpm 1.3.1) [since FEDORA-2005-518]
 CVE-2005-1920 version (kdelibs, fixed 3.4.1) [since FEDORA-2005-437]
@@ -325,11 +324,11 @@
 CVE-2005-1762 version (kernel, fixed 2.6.12) [since FEDORA-2005-510]
 CVE-2005-1761 version (kernel, fixed 2.6.12.2) [since FEDORA-2005-510]
 CVE-2005-1760 VULNERABLE (sysreport)
-CVE-2005-1759 ignore (openldap, fixed shtool 2.0.2) flawed code path not used
 CVE-2005-1759 ignore (php) dead code path
-CVE-2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
+CVE-2005-1759 ignore (openldap, fixed shtool 2.0.2) flawed code path not used
 CVE-2005-1751 ignore (openldap, fixed shtool 2.0.2) flawed code path not used
 CVE-2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
+CVE-2005-1751 VULNERABLE (nmap, fixed shtool 2.0.2) #158996
 CVE-2005-1740 backport (net-snmp, not fixed)
 CVE-2005-1739 backport (ImageMagick, fixed 6.2.2.3) [since re0526.1]
 CVE-2005-1705 backport (gdb) [since FEDORA-2005-1033]
@@ -341,11 +340,11 @@
 CVE-2005-1589 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport...2-rc4-git5 since re0522.0
 CVE-2005-1571 version (php, fixed shtool 2.0.2) [since FEDORA-2005-518]
 CVE-2005-1544 version (libtiff, fixed 3.7.1 at least)
-CVE-2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
 CVE-2005-1532 version (thunderbird) [since FEDORA-2005-606]
 CVE-2005-1532 version (mozilla, fixed 1.7.8) [since re0522.0]
-CVE-2005-1531 version (firefox, fixed 1.0.4) [since re0522.0]
+CVE-2005-1532 version (firefox, fixed 1.0.4) [since re0522.0]
 CVE-2005-1531 version (mozilla, fixed 1.7.8) [since re0522.0]
+CVE-2005-1531 version (firefox, fixed 1.0.4) [since re0522.0]
 CVE-2005-1519 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA (re0522.0)
 CVE-2005-1470 version (ethereal, fixed 0.10.11)
 CVE-2005-1469 version (ethereal, fixed 0.10.11)
@@ -393,10 +392,10 @@
 CVE-2005-1184 ignore (kernel) expected to not be an issue
 CVE-2005-1175 backport (krb5) [since FEDORA-2005-553]
 CVE-2005-1174 backport (krb5) [since FEDORA-2005-553]
-CVE-2005-1160 version (firefox, mozilla)
 CVE-2005-1160 version (thunderbird) [since FEDORA-2005-606]
-CVE-2005-1159 version (firefox, mozilla)
+CVE-2005-1160 version (firefox, mozilla)
 CVE-2005-1159 version (thunderbird) [since FEDORA-2005-606]
+CVE-2005-1159 version (firefox, mozilla)
 CVE-2005-1158 version (firefox, fixed 1.0.3)
 CVE-2005-1157 version (firefox, mozilla)
 CVE-2005-1156 version (firefox, mozilla)
@@ -413,9 +412,9 @@
 CVE-2005-1039 ignore (coreutils) not fixed upstream, not a real issue
 CVE-2005-1038 backport (cron) from srpm
 CVE-2005-0990 backport (sharutils) from srpm
+CVE-2005-0989 version (thunderbird) [since FEDORA-2005-606]
 CVE-2005-0989 version (mozilla, fixed 1.7.7)
 CVE-2005-0989 version (firefox, fixed 1.0.3)
-CVE-2005-0989 version (thunderbird) [since FEDORA-2005-606]
 CVE-2005-0988 backport (gzip) from srpm
 CVE-2005-0977 version (kernel, fixed 2.6.11)
 CVE-2005-0967 version (gaim, fixed 1.2.1)
@@ -470,6 +469,7 @@
 CVE-2005-0593 version (firefox, mozilla)
 CVE-2005-0592 version (firefox, mozilla)
 CVE-2005-0591 version (firefox, fixed 1.0.1)
+CVE-2005-0590 version (openswan, fixed 2.1.4)
 CVE-2005-0590 version (firefox, mozilla, thunderbird)
 CVE-2005-0589 version (firefox, fixed 1.0.1)
 CVE-2005-0588 version (firefox, mozilla)
@@ -478,6 +478,7 @@
 CVE-2005-0585 version (firefox, mozilla)
 CVE-2005-0584 version (firefox, mozilla)
 CVE-2005-0578 version (firefox, mozilla)
+CVE-2005-0565 version (kernel, not 2.6)
 CVE-2005-0532 version (kernel, fixed 2.6.11)
 CVE-2005-0531 version (kernel, fixed 2.6.11)
 CVE-2005-0530 version (kernel, fixed 2.6.11)
@@ -502,8 +503,8 @@
 CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020
 CVE-2005-0403 version (kernel, not upstream)
 CVE-2005-0402 version (firefox, fixed 1.0.2)
-CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0401 version (mozilla, fixed 1.7.7)
+CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0400 version (kernel, fixed in bk since 20050325, therefore 2.6.11.6) [since FEDORA-2005-510] was backport
 CVE-2005-0399 version (mozilla, Firefox, thunderbird)
 CVE-2005-0398 version (ipsec-tools, fixed 0.5)
@@ -513,8 +514,8 @@
 CVE-2005-0372 version (gftp, fixed in 2.0.18 at least by inspection)
 CVE-2005-0365 version (kdelibs, not 3.4)
 CVE-2005-0337 version (postfix, not 2.2)
-CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (thunderbird, fixed 1.0.2)
+CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (firefox, fixed 1.0.1)
 CVE-2005-0247 version (postgresql, fixed after 8.0)
 CVE-2005-0246 version (postgresql, fixed 8.0.1)
@@ -529,8 +530,8 @@
 CVE-2005-0232 version (firefox, fixed 1.0.1)
 CVE-2005-0231 version (mozilla, fixed 1.7.6)
 CVE-2005-0231 version (firefox, fixed 1.0.1)
-CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (thunderbird, fixed 1.0.2)
+CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (firefox, fixed 1.0.1)
 CVE-2005-0227 version (postgresql, fixed 8.0.1)
 CVE-2005-0215 version (mozilla)
@@ -593,10 +594,10 @@
 CVE-2005-0077 version (perl-DBI, fixed in 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0069 backport (vim) in vim-6.3-tmpfile.patch
+CVE-2005-0064 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since GA
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kpdf, not 3.4)
 CVE-2005-0064 backport (cups) patch in SRPM
-CVE-2005-0064 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since GA
 CVE-2005-0039 ignore (not a vulnerability) don't do this says the rfc
 CVE-2005-0034 version (bind, fixed after 9.3.0)
 CVE-2005-0033 version (bind, not 9)
@@ -713,9 +714,9 @@
 CVE-2004-1139 version (ethereal, fixed 0.10.8)
 CVE-2004-1138 version (vim, fixed 6.3)
 CVE-2004-1137 version (kernel, fixed 2.6.10)
-CVE-2004-1125 version (kdegraphics, not 3.4)
-CVE-2004-1125 version (tetex, at least 3.0)
 CVE-2004-1125 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
+CVE-2004-1125 version (tetex, at least 3.0)
+CVE-2004-1125 version (kdegraphics, not 3.4)
 CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)
 CVE-2004-1093 version (mc, fixed 4.6.0)
 CVE-2004-1092 version (mc, fixed 4.6.0)
@@ -759,8 +760,8 @@
 CVE-2004-0981 version (ImageMagick, fixed 6.1.0)
 CVE-2004-0977 version (postgresql, fixed after 7.4.6)
 CVE-2004-0976 backport (perl) [since FEDORA-2005-1077]
-CVE-2004-0975 backport (openssl097a, fixed 0.9.7f) from srpm
 CVE-2004-0975 version (openssl, fixed 0.9.7f)
+CVE-2004-0975 backport (openssl097a, fixed 0.9.7f) from srpm
 CVE-2004-0974 version (netatalk, fixed 2.0.1 says netatalk ChangeLog)
 CVE-2004-0972 version (lvm2, fixed 2.2.01.8 at least)
 CVE-2004-0971 backport (krb5, see bug 136307) fixed by patch in SRPM
@@ -775,7 +776,6 @@
 CVE-2004-0958 version (php, fixed 4.3.9)
 CVE-2004-0957 version (mysql, fixed 4.0.21)
 CVE-2004-0956 version (mysql, fixed 4.0.20)
-CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
 CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream bz#175414
@@ -796,16 +796,17 @@
 CVE-2004-0902 version (mozilla #133023, fixed 1.7.3)
 CVE-2004-0891 version (gaim, fixed 1.0.2)
 CVE-2004-0889 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
-CVE-2004-0888 version (kpdegraphics, not 3.4)
+CVE-2004-0888 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
 CVE-2004-0888 version (tetex, fixed 3.0)
+CVE-2004-0888 version (kpdegraphics, not 3.4)
 CVE-2004-0888 backport (cups) patch in SRPM
-CVE-2004-0888 version (xpdf, fixed 3.0.1) [since FEDORA-2005-775] was backport since ga
 CVE-2004-0887 version (kernel, fixed 2.6.10)
-CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0886 version (libtiff, fixed 3.7.1 at least)
+CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0885 version (httpd, fixed after 2.0.52)
 CVE-2004-0884 version (cyrus-sasl, fixed 2.1.20)
 CVE-2004-0883 version (kernel, fixed 2.6.11)
+CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0882 version (samba, fixed 3.0.8)
 CVE-2004-0871 ignore (mozilla, unfixed upstream with no patch)
 CVE-2004-0870 ignore (kde) upstream won't fix
@@ -828,27 +829,27 @@
 CVE-2004-0808 version (samba, fixed 3.0.7)
 CVE-2004-0807 version (samba, fixed 3.0.7)
 CVE-2004-0806 version (cdrtools, fixed 2.0.1)
-CVE-2004-0804 version (kdegraphics)
 CVE-2004-0804 version (libtiff, fixed after 3.6.1)
-CVE-2004-0803 version (kdegraphics)
+CVE-2004-0804 version (kdegraphics)
 CVE-2004-0803 version (libtiff, fixed after 3.6.1)
+CVE-2004-0803 version (kdegraphics)
 CVE-2004-0802 version (imlib, fixed 1.1.2)
 CVE-2004-0801 version (foomatic, fixed 3.0.2)
 CVE-2004-0797 version (zlib, fixed in 1.2.2.2 at least)
+CVE-2004-0797 version (zlib)
 CVE-2004-0796 version (spamassassin, fixed 2.64)
 CVE-2004-0792 version (rsync, fixed 2.6.3)
 CVE-2004-0791 version (kernel, fixed 2.6.9)
 CVE-2004-0790 version (doesn't affect linux 2.4, 2.6)
-CVE-2004-0797 version (zlib)
-CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0788 version (gtk2, fixed 2.6.7 at least by inspection)
+CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0786 version (apr-util, fixed 2.0.51)
 CVE-2004-0785 version (gaim, fixed 0.82)
 CVE-2004-0784 version (gaim, fixed 0.82)
-CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0783 version (gtk2, fixed 2.6.7 at least by inspection)
-CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
+CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0782 version (gtk2, fixed 2.6.7 at least by inspection)
+CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0779 version (mozilla, firefox, thunderbird)
 CVE-2004-0778 version (cvs, fixed 1.11.17)
 CVE-2004-0772 version (krb5, fixed after 1.2.8)
@@ -866,8 +867,8 @@
 CVE-2004-0757 version (mozilla #229374, fixed 1.7)
 CVE-2004-0755 version (ruby, fixed 1.8.1)
 CVE-2004-0754 version (gaim, fixed 0.82)
-CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0753 version (gtk2, fixed after 2.2.4)
+CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0752 version (openoffice.org, fixed after 1.1.2)
 CVE-2004-0751 version (httpd, fixed 2.0.51)
 CVE-2004-0750 version (system-config-nfs, fixed 1.0.13)
@@ -916,11 +917,9 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
-CVE-2005-0590 version (openswan, fixed 2.1.4)
 CVE-2004-0587 version (kernel, not upstream flaw)
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
-CVE-2005-0565 version (kernel, not 2.6)
 CVE-2004-0554 version (kernel, fixed 2.6.7)
 CVE-2004-0548 ignore (aspell, not fixed 0.50.5) not a security issue
 CVE-2004-0547 version (postgresql, fixed 7.2.1)
@@ -944,9 +943,9 @@
 CVE-2004-0492 version (httpd, not 2.0)
 CVE-2004-0491 version (kernel, not upstream)
 CVE-2004-0488 version (httpd, fixed 2.0.50)
+CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0461 version (dhcp, fixed after 3.0.1rc13)
 CVE-2004-0460 version (dhcp, fixed after 3.0.1rc13)
-CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0457 version (mysql, fixed after 4.0.20)
 CVE-2004-0452 backport (perl, not 5.8.6)
 CVE-2004-0447 version (kernel, fixed 2.6.5)
@@ -1009,8 +1008,8 @@
 CVE-2004-0150 version (python, fixed 2.2.2)
 CVE-2004-0133 version (kernel, 2.6.4)
 CVE-2004-0113 version (httpd, fixed 2.0.49)
-CVE-2004-0112 backport (openssl097a, fixed 0.9.7d) from srpm
 CVE-2004-0112 version (openssl, fixed 0.9.7d)
+CVE-2004-0112 backport (openssl097a, fixed 0.9.7d) from srpm
 CVE-2004-0111 version (gdk-pixbuf, fixed 0.20)
 CVE-2004-0110 version (libxml2, fixed 2.6.6)
 CVE-2004-0109 version (kernel, fixed 2.6.6)
@@ -1028,8 +1027,8 @@
 CVE-2004-0081 version (openssl097a, fixed 0.9.6d)
 CVE-2004-0081 version (openssl, fixed 0.9.6d)
 CVE-2004-0080 version (util-linux, fixed after 2.11f)
-CVE-2004-0079 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2004-0079 version (openssl, fixed 0.9.7c)
+CVE-2004-0079 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2004-0078 version (mutt, fixed 1.4.2)
 CVE-2004-0077 version (kernel, fixed 2.6.3)
 CVE-2004-0075 version (kernel, not 2.6)
@@ -1043,8 +1042,8 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1265 VULNERABLE (mozilla)
+CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1232 version (emacs, fixed 21.3)
 CVE-2003-1201 version (openldap, not 2.2)
 CVE-2003-1161 version (kernel, not released version)
@@ -1054,14 +1053,14 @@
 CVE-2003-1013 version (ethereal, fixed 0.10.0)
 CVE-2003-1012 version (ethereal, fixed 0.10.0)
 CVE-2003-0993 version (httpd, not 2.0)
+CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0992 version (mailman, fixed 2.1.3)
 CVE-2003-0991 version (mailman, fixed 2.0.14)
 CVE-2003-0990 version (squirrelmail, fixed after 1.4.0)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
-CVE-2003-0988 version (kde, fixed 3.1.5)
-CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
 CVE-2003-0988 version (kdepim, fixed 3.1.5)
+CVE-2003-0988 version (kde, fixed 3.1.5)
 CVE-2003-0987 version (httpd, not 2.0)
 CVE-2003-0985 version (kernel, not 2.6)
 CVE-2003-0984 version (kernel, fixed 2.4.23)
@@ -1143,12 +1142,12 @@
 CVE-2003-0548 version (gdm, fixed 2.4.1.6)
 CVE-2003-0547 version (gdm, fixed 2.4.1.6)
 CVE-2003-0546 version (up2date, fixed after 3.1.23)
-CVE-2003-0545 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0545 version (openssl, fixed 0.9.7c)
-CVE-2003-0544 backport (openssl097a, fixed 0.9.7c) in srpm
+CVE-2003-0545 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0544 version (openssl, fixed 0.9.7c)
-CVE-2003-0543 backport (openssl097a, fixed 0.9.7c) in srpm
+CVE-2003-0544 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0543 version (openssl, fixed 0.9.7c)
+CVE-2003-0543 backport (openssl097a, fixed 0.9.7c) in srpm
 CVE-2003-0542 version (httpd, fixed 2.0.48)
 CVE-2003-0541 backport (gtkhtml, fixed 1.1.10) gtkhtml-1.1.9-textslave.patch
 CVE-2003-0540 version (postfix, not 2.0 onwards)
@@ -1190,13 +1189,13 @@
 CVE-2003-0289 version (cdrtools, fixed 2.01a14)
 CVE-2003-0282 version (unzip, fixed 5.51)
 CVE-2003-0255 version (gnupg, fixed 1.2.2)
-CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0253 version (httpd, fixed 2.0.47)
 CVE-2003-0252 version (nfs-utils, fixed 1.0.4)
 CVE-2003-0251 version (ypserv, fixed 2.7)
 CVE-2003-0248 version (kernel, not 2.6)
 CVE-2003-0247 version (kernel, not 2.6)
 CVE-2003-0246 version (kernel, not 2.6)
+CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0245 version (httpd, fixed 2.0.46)
 CVE-2003-0244 version (kernel, not 2.6)
 CVE-2003-0211 version (xinetd, fixed 2.3.11)
@@ -1217,8 +1216,8 @@
 CVE-2003-0160 version (squirrelmail, fixed 1.2.11)
 CVE-2003-0159 version (ethereal, fixed after 0.9.9)
 CVE-2003-0150 version (mysql, fixed 3.23.56)
-CVE-2003-0147 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0147 version (openssl, fixed 0.9.7b)
+CVE-2003-0147 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0146 version (netpbm, fixed 10.18)
 CVE-2003-0145 version (tcpdump, fixed 3.7.2)
 CVE-2003-0140 version (mutt, fixed 1.4.1)
@@ -1227,8 +1226,8 @@
 CVE-2003-0135 version (vsftpd, not upstream)
 CVE-2003-0133 version (evolution, fixed 1.2.4)
 CVE-2003-0132 version (httpd, fixed 2.0.45)
-CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0131 version (openssl, fixed 0.9.7b)
+CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) in srpm
 CVE-2003-0130 version (evolution, fixed 1.2.3)
 CVE-2003-0129 version (evolution, fixed 1.2.3)
 CVE-2003-0128 version (evolution, fixed 1.2.3)
@@ -1259,8 +1258,8 @@
 CVE-2003-0043 version (tomcat, fixed 3.3.1a)
 CVE-2003-0041 version (krb5, fixed after 1.2.7)
 CVE-2003-0038 version (mailman, fixed 2.0.13 at least)
-CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0028 version (krb5, fixed after 1.2.7)
+CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0026 version (dhcpd, fixed 3.0.1)
 CVE-2003-0020 version (httpd, fixed 2.0.49)
 CVE-2003-0019 version (kernel-utils, not upstream)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- fc5	9 Jan 2006 09:35:13 -0000	1.31
+++ fc5	9 Jan 2006 13:54:05 -0000	1.32
@@ -14,26 +14,7 @@
 
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
-CVE-2005-3628 VULNERABLE (cups)
-CVE-2005-3628 VULNERABLE (poppler)
-CVE-2005-3628 VULNERABLE (xpdf)
-CVE-2005-3628 backport (kdegraphics)
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (poppler)
-CVE-2005-3627 VULNERABLE (xpdf)
-CVE-2005-3627 backport (kdegraphics)
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (poppler)
-CVE-2005-3626 VULNERABLE (xpdf)
-CVE-2005-3626 backport (kdegraphics)
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (poppler)
-CVE-2005-3625 VULNERABLE (xpdf)
-CVE-2005-3625 backport (kdegraphics)
-CVE-2005-3624 VULNERABLE (cups)
-CVE-2005-3624 VULNERABLE (poppler)
-CVE-2005-3624 VULNERABLE (xpdf)
-CVE-2005-3624 backport (kdegraphics)
+CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 VULNERABLE (kernel)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
@@ -48,29 +29,10 @@
 CVE-2005-4130 ** (HelixPlayer) no information available
 CVE-2005-4126 ** (HelixPlayer) no information available
 CVE-2005-4077 VULNERABLE (curl)
-CVE-2005-3896 ignore (mozilla) recoverable DoS only
-CVE-2005-3651 VULNERABLE (ethereal)
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
-CVE-2005-3193 VULNERABLE (xpdf)
-CVE-2005-3193 VULNERABLE (kdegraphics)
-CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler)
-CVE-2005-3192 VULNERABLE (xpdf)
-CVE-2005-3192 VULNERABLE (kdegraphics)
-CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler)
-CVE-2005-3191 VULNERABLE (xpdf)
-CVE-2005-3191 VULNERABLE (kdegraphics)
-CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler)
 CVE-2005-3964 VULNERABLE (openmotif)
 CVE-2005-3962 VULNERABLE (perl)
 CVE-2005-3912 ** (perl)
+CVE-2005-3896 ignore (mozilla) recoverable DoS only
 CVE-2005-3883 VULNERABLE (php)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
 CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
@@ -91,8 +53,33 @@
 CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
 CVE-2005-3662 version (netpbm)
 CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3651 VULNERABLE (ethereal)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
+CVE-2005-3628 VULNERABLE (xpdf)
+CVE-2005-3628 VULNERABLE (poppler)
+CVE-2005-3628 VULNERABLE (kdegraphics)
+CVE-2005-3628 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (kdegraphics)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3627 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (kdegraphics)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3626 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (kdegraphics)
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3625 VULNERABLE (cups)
+CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (kdegraphics)
+CVE-2005-3624 VULNERABLE (cups)
+CVE-2005-3623 VULNERABLE (kernel, fixed 2.6.14.5)
 CVE-2005-3582 version (ImageMagick) gentoo only
 CVE-2005-3573 VULNERABLE (mailman) not fixed 2.1.6 BZ#174166
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least)
@@ -102,7 +89,10 @@
 CVE-2005-3390 VULNERABLE (php) BZ#174167
 CVE-2005-3389 VULNERABLE (php) BZ#174168
 CVE-2005-3388 VULNERABLE (php) BZ#174169
+CVE-2005-3358 version (kernel, fixed 2.6.11)
+CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
 CVE-2005-3353 version (php, not 5.0)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
 CVE-2005-3351 version (spamassassin, fixed 3.1.0)
 CVE-2005-3322 version (squid) not upstream, SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
@@ -125,12 +115,21 @@
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
 CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3193 VULNERABLE (tetex)
+CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
+CVE-2005-3192 VULNERABLE (tetex)
+CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (kdegraphics)
 CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3186 backport (gdk-pixbuf)
+CVE-2005-3191 VULNERABLE (tetex)
+CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
-CVE-2005-3185 version (curl, fixed 7.15)
+CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
+CVE-2005-3185 version (curl, fixed 7.15)
 CVE-2005-3184 version (ethereal, fixed 0.10.13)
 CVE-2005-3181 version (kernel, fixed 2.6.13.4 at least)
 CVE-2005-3180 version (kernel, fixed 2.6.13.4 at least)
@@ -155,15 +154,15 @@
 CVE-2005-2978 version (netpbm, fixed 10.25)
 CVE-2005-2977 backport (pam)
 CVE-2005-2976 backport (gdk-pixbuf)
-CVE-2005-2975 backport (gdk-pixbuf)
 CVE-2005-2975 version (gtk2, fixed 2.8.7)
+CVE-2005-2975 backport (gdk-pixbuf)
 CVE-2005-2973 version (kernel, fixed 2.6.14 at least)
 CVE-2005-2970 VULNERABLE (httpd, fixed 2.0.55) BZ#174170
 CVE-2005-2969 version (openssl, fixed 0.9.8a)
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h)
+CVE-2005-2968 version (thunderbird)
 CVE-2005-2968 version (mozilla, not 1.7.10)
 CVE-2005-2968 version (firefox)
-CVE-2005-2968 version (thunderbird)
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 version (openssl, fixed 0.9.8)
 CVE-2005-2933 VULNERABLE (libc-client) BZ#174171
@@ -173,9 +172,9 @@
 CVE-2005-2874 version (cups, fixed 1.1.23)
 CVE-2005-2873 VULNERABLE (kernel) not fixed upstream
 CVE-2005-2872 version (kernel, fixed 2.6.12)
-CVE-2005-2871 version (firefox, fixed 1.0.7)
-CVE-2005-2871 version (mozilla, fixed 1.7.12)
 CVE-2005-2871 version (thunderbird)
+CVE-2005-2871 version (mozilla, fixed 1.7.12)
+CVE-2005-2871 version (firefox, fixed 1.0.7)
 CVE-2005-2811 version (net-snmp) not upstream, gentoo only
 CVE-2005-2801 version (kernel, fixed 2.6.11)
 CVE-2005-2800 version (kernel, fixed 2.6.12.6)
@@ -188,25 +187,25 @@
 CVE-2005-2709 VULNERABLE (kernel, fixed 2.6.14.3)
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird)
-CVE-2005-2707 version (firefox, fixed 1.0.7)
 CVE-2005-2707 version (mozilla, fixed 1.7.12)
+CVE-2005-2707 version (firefox, fixed 1.0.7)
 CVE-2005-2706 version (thunderbird)
-CVE-2005-2706 version (firefox, fixed 1.0.7)
 CVE-2005-2706 version (mozilla, fixed 1.7.12)
+CVE-2005-2706 version (firefox, fixed 1.0.7)
 CVE-2005-2705 version (thunderbird)
-CVE-2005-2705 version (firefox, fixed 1.0.7)
 CVE-2005-2705 version (mozilla, fixed 1.7.12)
+CVE-2005-2705 version (firefox, fixed 1.0.7)
 CVE-2005-2704 version (thunderbird)
-CVE-2005-2704 version (firefox, fixed 1.0.7)
 CVE-2005-2704 version (mozilla, fixed 1.7.12)
+CVE-2005-2704 version (firefox, fixed 1.0.7)
 CVE-2005-2703 version (thunderbird)
-CVE-2005-2703 version (firefox, fixed 1.0.7)
 CVE-2005-2703 version (mozilla, fixed 1.7.12)
+CVE-2005-2703 version (firefox, fixed 1.0.7)
 CVE-2005-2702 version (thunderbird)
-CVE-2005-2702 version (firefox, fixed 1.0.7)
 CVE-2005-2702 version (mozilla, fixed 1.7.12)
-CVE-2005-2701 version (firefox, fixed 1.0.7)
+CVE-2005-2702 version (firefox, fixed 1.0.7)
 CVE-2005-2701 version (mozilla, fixed 1.7.12)
+CVE-2005-2701 version (firefox, fixed 1.0.7)
 CVE-2005-2700 backport (httpd, fixed 2.0.55) 
 CVE-2005-2693 backport (cvs) cvs-1.11.19-tmp.patch
 CVE-2005-2672 backport (lm_sensors)
@@ -215,10 +214,10 @@
 CVE-2005-2641 version (nss_ldap, fixed pam_ldap:180)
 CVE-2005-2629 version (HelixPlayer, fixed 1.0.6)
 CVE-2005-2617 version (kernel, fixed 2.6.12.5)
-CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2602 ignore (thunderbird) probably
-CVE-2005-2558 ignore (mysql) not an issue
+CVE-2005-2602 ignore (firefox) https://bugzilla.mozilla.org/show_bug.cgi?id=237085
 CVE-2005-2558 version (mysql, fixed 4.1.13)
+CVE-2005-2558 ignore (mysql) not an issue
 CVE-2005-2555 version (kernel, fixed 2.6.12.6pre)
 CVE-2005-2553 version (kernel, not 2.6)
 CVE-2005-2550 version (evolution, fixed after 2.3.6.1)
@@ -231,11 +230,11 @@
 CVE-2005-2496 backport (ntp, fixed 4.2.0b) ...0a-20040617-ntpd_guid.patch
 CVE-2005-2495 version (xorg-x11-server, fixed 0.99.3 at least)
 CVE-2005-2494 version (kdebase, fixed after 3.4.2)
-CVE-2005-2491 ignore (python) fc4 python does not contain pcre
+CVE-2005-2492 version (kernel, fixed 2.6.13.1)
 CVE-2005-2491 version (pcre, fixed 6.2)
-CVE-2005-2491 ignore (httpd) httpd uses system pcre
+CVE-2005-2491 ignore (python) fc4 python does not contain pcre
 CVE-2005-2491 ignore (php) php uses system pcre
-CVE-2005-2492 version (kernel, fixed 2.6.13.1)
+CVE-2005-2491 ignore (httpd) httpd uses system pcre
 CVE-2005-2490 version (kernel, fixed 2.6.13.1)
 CVE-2005-2475 backport (unzip)
 CVE-2005-2471 backport (netpbm, fixed 10.31 at least) netpbm-10.28-CAN-2005-2471.patch
@@ -263,34 +262,34 @@
 CVE-2005-2353 ignore (thunderbird) debug mode only
 CVE-2005-2337 version (ruby, fixed 1.8.3)
 CVE-2005-2335 version (fetchmail, fixed 6.2.5.2)
-CVE-2005-2270 version (firefox, fixed 1.0.5)
-CVE-2005-2270 version (mozilla, fixed 1.7.9)
 CVE-2005-2270 version (thunderbird, fixed 1.0.5)
-CVE-2005-2269 version (firefox, fixed 1.0.5)
-CVE-2005-2269 version (mozilla, fixed 1.7.9)
+CVE-2005-2270 version (mozilla, fixed 1.7.9)
+CVE-2005-2270 version (firefox, fixed 1.0.5)
 CVE-2005-2269 version (thunderbird, fixed 1.0.5)
-CVE-2005-2268 version (firefox, fixed 1.0.5)
+CVE-2005-2269 version (mozilla, fixed 1.7.9)
+CVE-2005-2269 version (firefox, fixed 1.0.5)
 CVE-2005-2268 version (mozilla, fixed 1.7.9)
+CVE-2005-2268 version (firefox, fixed 1.0.5)
 CVE-2005-2267 version (mozilla, fixed 1.7.9)
 CVE-2005-2267 version (firefox, fixed 1.0.5)
-CVE-2005-2266 version (firefox, fixed 1.0.5)
-CVE-2005-2266 version (mozilla, fixed 1.7.9)
 CVE-2005-2266 version (thunderbird, fixed 1.0.5)
-CVE-2005-2265 version (firefox, fixed 1.0.5)
-CVE-2005-2265 version (mozilla, fixed 1.7.9)
+CVE-2005-2266 version (mozilla, fixed 1.7.9)
+CVE-2005-2266 version (firefox, fixed 1.0.5)
 CVE-2005-2265 version (thunderbird, fixed 1.0.5)
+CVE-2005-2265 version (mozilla, fixed 1.7.9)
+CVE-2005-2265 version (firefox, fixed 1.0.5)
 CVE-2005-2264 version (firefox, fixed 1.0.5)
-CVE-2005-2263 version (firefox, fixed 1.0.5)
 CVE-2005-2263 version (mozilla, fixed 1.7.9)
+CVE-2005-2263 version (firefox, fixed 1.0.5)
 CVE-2005-2262 version (firefox, fixed 1.0.5)
 CVE-2005-2261 version (thunderbird, fixed 1.0.5)
-CVE-2005-2261 version (firefox, fixed 1.0.5)
 CVE-2005-2261 version (mozilla, fixed 1.7.9)
-CVE-2005-2260 version (firefox, fixed 1.0.5)
+CVE-2005-2261 version (firefox, fixed 1.0.5)
 CVE-2005-2260 version (mozilla, fixed 1.7.9)
+CVE-2005-2260 version (firefox, fixed 1.0.5)
 CVE-2005-2177 version (net-snmp, fixed 5.2.1.2)
-CVE-2005-2114 version (firefox, fixed 1.0.5)
 CVE-2005-2114 version (mozilla, fixed 1.7.9)
+CVE-2005-2114 version (firefox, fixed 1.0.5)
 CVE-2005-2104 version (sysreport, fixed 1.4.1-5)
 CVE-2005-2103 version (gaim, fixed 1.5.0)
 CVE-2005-2102 version (gaim, fixed 1.5.0)
@@ -298,19 +297,19 @@
 CVE-2005-2100 version (kernel, not 2.6) not upstream only RHEL4
 CVE-2005-2099 version (kernel, fixed 2.6.12.5)
 CVE-2005-2098 version (kernel, fixed 2.6.12.5)
-CVE-2005-2097 backport (cups)
 CVE-2005-2097 version (xpdf, fixed 3.0.1)
-CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
+CVE-2005-2097 backport (cups)
 CVE-2005-2096 version (rpm, fixed 4.4.2)
+CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
 CVE-2005-2095 version (squirrelmail, fixed 1.4.5)
 CVE-2005-2088 backport (httpd, fixed 2.0.55)
-CVE-2005-2069 backport (openldap) openldap-2.2.13-tls-fix-connection-test.patch
 CVE-2005-2069 version (nss_ldap, fixed pam_ldap:180)
+CVE-2005-2069 backport (openldap) openldap-2.2.13-tls-fix-connection-test.patch
 CVE-2005-2023 version (gnupg, fixed 1.9.15)
 CVE-2005-1993 version (sudo, fixed 1.6.8p9)
 CVE-2005-1992 version (ruby, fixed 1.8.3 at least)
-CVE-2005-1937 version (firefox, fixed 1.0.5)
 CVE-2005-1937 version (mozilla, fixed 1.7.9)
+CVE-2005-1937 version (firefox, fixed 1.0.5)
 CVE-2005-1934 version (gaim, fixed 1.3.1)
 CVE-2005-1921 version (php, fixed xml_rpc:1.3.1)
 CVE-2005-1920 version (kdelibs, fixed 3.4.1)
@@ -328,27 +327,27 @@
 CVE-2005-1762 version (kernel, fixed 2.6.12)
 CVE-2005-1761 version (kernel, fixed 2.6.12.2)
 CVE-2005-1760 version (sysreport, fixed 1.4.1-3)
-CVE-2005-1759 ignore (openldap) fixed shtool 2.0.2 flawed code path not used
 CVE-2005-1759 ignore (php) dead code path
+CVE-2005-1759 ignore (openldap) fixed shtool 2.0.2 flawed code path not used
 CVE-2005-1751 version (nmap, fixed 3.93 at least)
 CVE-2005-1751 ignore (openldap) fixed shtool 2.0.2. Flawed code path not used
 CVE-2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
 CVE-2005-1740 version (net-snmp, fixed 5.2.2.rc5 at least)
 CVE-2005-1739 version (ImageMagick, fixed 6.2.2.3)
 CVE-2005-1705 backport (gdb)
-CVE-2005-1704 backport (gdb)
 CVE-2005-1704 version (binutils, fixed 2.16.91.0.3 at least)
+CVE-2005-1704 backport (gdb)
 CVE-2005-1689 version (krb5, fixed 1.4.2)
 CVE-2005-1686 ignore (gedit) not a vulnerability
 CVE-2005-1636 version (mysql, fixed 4.1.12)
 CVE-2005-1589 version (kernel, fixed 2.6.11.10)
 CVE-2005-1571 version (php, fixed shtool 2.0.2)
 CVE-2005-1544 version (libtiff, fixed 3.7.1 at least)
-CVE-2005-1532 version (firefox, fixed 1.0.4)
 CVE-2005-1532 version (thunderbird)
 CVE-2005-1532 version (mozilla, fixed 1.7.8)
-CVE-2005-1531 version (firefox, fixed 1.0.4)
+CVE-2005-1532 version (firefox, fixed 1.0.4)
 CVE-2005-1531 version (mozilla, fixed 1.7.8)
+CVE-2005-1531 version (firefox, fixed 1.0.4)
 CVE-2005-1519 version (squid, fixed 2.5.STABLE10)
 CVE-2005-1470 version (ethereal, fixed 0.10.11)
 CVE-2005-1469 version (ethereal, fixed 0.10.11)
@@ -396,12 +395,12 @@
 CVE-2005-1184 ignore (kernel) expected to not be an issue
 CVE-2005-1175 version (krb5, fixed 1.4.2)
 CVE-2005-1174 version (krb5, fixed 1.4.2)
+CVE-2005-1160 version (thunderbird)
 CVE-2005-1160 version (mozilla)
 CVE-2005-1160 version (firefox)
-CVE-2005-1160 version (thunderbird)
+CVE-2005-1159 version (thunderbird)
 CVE-2005-1159 version (mozilla)
 CVE-2005-1159 version (firefox)
-CVE-2005-1159 version (thunderbird)
 CVE-2005-1158 version (firefox, fixed 1.0.3)
 CVE-2005-1157 version (mozilla)
 CVE-2005-1157 version (firefox)
@@ -423,9 +422,9 @@
 CVE-2005-1039 ignore (coreutils) not fixed upstream, not a real issue
 CVE-2005-1038 backport (vixie-cron)
 CVE-2005-0990 version (sharutils, fixed 4.6 at least)
+CVE-2005-0989 version (thunderbird)
 CVE-2005-0989 version (mozilla, fixed 1.7.7)
 CVE-2005-0989 version (firefox, fixed 1.0.3)
-CVE-2005-0989 version (thunderbird)
 CVE-2005-0988 backport (gzip)
 CVE-2005-0977 version (kernel, fixed 2.6.11)
 CVE-2005-0967 version (gaim, fixed 1.2.1)
@@ -482,9 +481,10 @@
 CVE-2005-0592 version (mozilla)
 CVE-2005-0592 version (firefox)
 CVE-2005-0591 version (firefox, fixed 1.0.1)
-CVE-2005-0590 version (firefox)
-CVE-2005-0590 version (mozilla)
 CVE-2005-0590 version (thunderbird)
+CVE-2005-0590 version (openswan, fixed 2.1.4)
+CVE-2005-0590 version (mozilla)
+CVE-2005-0590 version (firefox)
 CVE-2005-0589 version (firefox, fixed 1.0.1)
 CVE-2005-0588 version (mozilla)
 CVE-2005-0588 version (firefox)
@@ -498,6 +498,7 @@
 CVE-2005-0584 version (firefox)
 CVE-2005-0578 version (mozilla)
 CVE-2005-0578 version (firefox)
+CVE-2005-0565 version (kernel, not 2.6)
 CVE-2005-0532 version (kernel, fixed 2.6.11)
 CVE-2005-0531 version (kernel, fixed 2.6.11)
 CVE-2005-0530 version (kernel, fixed 2.6.11)
@@ -522,12 +523,12 @@
 CVE-2005-0404 ignore (kde) won't fix http://bugs.kde.org/show_bug.cgi?id=96020
 CVE-2005-0403 version (kernel) not upstream
 CVE-2005-0402 version (firefox, fixed 1.0.2)
-CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0401 version (mozilla, fixed 1.7.7)
+CVE-2005-0401 version (firefox, fixed 1.0.2)
 CVE-2005-0400 version (kernel, fixed 2.6.11.6)
+CVE-2005-0399 version (thunderbird)
 CVE-2005-0399 version (mozilla)
 CVE-2005-0399 version (firefox)
-CVE-2005-0399 version (thunderbird)
 CVE-2005-0398 version (ipsec-tools, fixed 0.5)
 CVE-2005-0397 version (ImageMagick, fixed 6.0.2.5)
 CVE-2005-0396 version (kdelibs, fixed 3.4.0)
@@ -535,8 +536,8 @@
 CVE-2005-0372 version (gftp, fixed 2.0.18 at least)
 CVE-2005-0365 version (kdelibs, not 3.4)
 CVE-2005-0337 version (postfix, not 2.2)
-CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (thunderbird, fixed 1.0.2)
+CVE-2005-0255 version (mozilla, fixed 1.7.6)
 CVE-2005-0255 version (firefox, fixed 1.0.1)
 CVE-2005-0247 version (postgresql, fixed after 8.0)
 CVE-2005-0246 version (postgresql, fixed 8.0.1)
@@ -551,8 +552,8 @@
 CVE-2005-0232 version (firefox, fixed 1.0.1)
 CVE-2005-0231 version (mozilla, fixed 1.7.6)
 CVE-2005-0231 version (firefox, fixed 1.0.1)
-CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (thunderbird, fixed 1.0.2)
+CVE-2005-0230 version (mozilla, fixed 1.7.6)
 CVE-2005-0230 version (firefox, fixed 1.0.1)
 CVE-2005-0227 version (postgresql, fixed 8.0.1)
 CVE-2005-0215 version (mozilla)
@@ -580,27 +581,27 @@
 CVE-2005-0155 backport (perl) perl-5.8.5-CAN-2005-0155+0156.patch
 CVE-2005-0152 version (squirrelmail, not 1.4)
 CVE-2005-0150 version (firefox, fixed 1.0)
-CVE-2005-0149 version (firefox)
 CVE-2005-0149 version (mozilla)
-CVE-2005-0147 version (firefox)
+CVE-2005-0149 version (firefox)
 CVE-2005-0147 version (mozilla)
-CVE-2005-0146 version (firefox)
+CVE-2005-0147 version (firefox)
 CVE-2005-0146 version (mozilla)
+CVE-2005-0146 version (firefox)
 CVE-2005-0145 version (firefox, fixed 1.0)
-CVE-2005-0144 version (firefox)
 CVE-2005-0144 version (mozilla)
-CVE-2005-0143 version (firefox)
+CVE-2005-0144 version (firefox)
 CVE-2005-0143 version (mozilla)
+CVE-2005-0143 version (firefox)
 CVE-2005-0142 version (thunderbird)
-CVE-2005-0142 version (firefox)
 CVE-2005-0142 version (mozilla)
-CVE-2005-0141 version (firefox)
+CVE-2005-0142 version (firefox)
 CVE-2005-0141 version (mozilla)
+CVE-2005-0141 version (firefox)
 CVE-2005-0137 version (kernel, not 2.6)
 CVE-2005-0135 version (kernel, fixed 2.6.11)
 CVE-2005-0124 version (kernel, fixed 2.6.11)
-CVE-2005-0109 backport (openssl097a)
 CVE-2005-0109 version (openssl, not 0.9.8a) 
+CVE-2005-0109 backport (openssl097a)
 CVE-2005-0104 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0103 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0102 version (evolution-data-server, fixed 1.2.2 at least)
@@ -623,10 +624,10 @@
 CVE-2005-0077 version (perl-DBI, fixed 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
 CVE-2005-0069 VULNERABLE (vim) fc4 fixes vim-6.3-tmpfile.patch BZ#174173
+CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kpdf, not 3.4)
 CVE-2005-0064 backport (cups)
-CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0039 ignore (kernel) not a vulnerability: don't do this says the rfc
 CVE-2005-0034 version (bind, fixed after 9.3.0)
 CVE-2005-0033 version (bind, not 9)
@@ -677,8 +678,8 @@
 CVE-2004-1761 version (ethereal, fixed 0.10.3)
 CVE-2004-1689 version (sudo, fixed 1.6.8p1)
 CVE-2004-1653 ignore (openssh)
-CVE-2004-1639 version (firefox)
 CVE-2004-1639 version (mozilla)
+CVE-2004-1639 version (firefox)
 CVE-2004-1617 ignore (lynx) not able to verify flaw
 CVE-2004-1614 version (mozilla, fixed 1.7.5)
 CVE-2004-1613 version (mozilla, fixed 1.7.5)
@@ -687,18 +688,18 @@
 CVE-2004-1453 version (glibc, fixed 2.3.5)
 CVE-2004-1452 version (tomcat, fixed 5.0.27-r3)
 CVE-2004-1451 version (thunderbird)
-CVE-2004-1451 version (firefox)
 CVE-2004-1451 version (mozilla)
+CVE-2004-1451 version (firefox)
 CVE-2004-1450 version (thunderbird)
-CVE-2004-1450 version (firefox)
 CVE-2004-1450 version (mozilla)
+CVE-2004-1450 version (firefox)
 CVE-2004-1449 version (thunderbird)
-CVE-2004-1449 version (firefox)
 CVE-2004-1449 version (mozilla)
+CVE-2004-1449 version (firefox)
 CVE-2004-1392 version (php, fixed 5.0.4)
 CVE-2004-1382 version (glibc, not 2.3.5)
-CVE-2004-1381 version (firefox)
 CVE-2004-1381 version (mozilla)
+CVE-2004-1381 version (firefox)
 CVE-2004-1380 version (mozilla)
 CVE-2004-1380 version (firefox)
 CVE-2004-1377 backport (a2ps) a2ps-4.13-security.patch
@@ -751,9 +752,9 @@
 CVE-2004-1139 version (ethereal, fixed 0.10.8)
 CVE-2004-1138 version (vim, fixed 6.3)
 CVE-2004-1137 version (kernel, fixed 2.6.10)
-CVE-2004-1125 version (kdegraphics, not 3.4)
-CVE-2004-1125 version (tetex, at least 3.0)
 CVE-2004-1125 version (xpdf, fixed 3.0.1)
+CVE-2004-1125 version (tetex, at least 3.0)
+CVE-2004-1125 version (kdegraphics, not 3.4)
 CVE-2004-1096 version (perl-Archive-Zip, fixed 1.14)
 CVE-2004-1093 version (mc, fixed 4.6.0)
 CVE-2004-1092 version (mc, fixed 4.6.0)
@@ -797,8 +798,8 @@
 CVE-2004-0981 version (ImageMagick, fixed 6.1.0)
 CVE-2004-0977 version (postgresql, fixed after 7.4.6)
 CVE-2004-0976 backport (perl) perl-5.8.7-CAN-2004-0976.patch
-CVE-2004-0975 backport (openssl097a, fixed 0.9.7f)
 CVE-2004-0975 version (openssl, not 0.9.8)
+CVE-2004-0975 backport (openssl097a, fixed 0.9.7f)
 CVE-2004-0974 version (netatalk, fixed 2.0.1)
 CVE-2004-0972 version (lvm2, fixed 2.2.01.8 at least)
 CVE-2004-0971 backport (krb5) krb5-1.3.4-send-pr-tempfile.patch
@@ -813,7 +814,6 @@
 CVE-2004-0958 version (php, fixed 4.3.9)
 CVE-2004-0957 version (mysql, fixed 4.0.21)
 CVE-2004-0956 version (mysql, fixed 4.0.20)
-CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
 CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream fc4bz#175414
@@ -824,15 +824,15 @@
 CVE-2004-0923 version (cups, fixed 1.2.22)
 CVE-2004-0918 version (squid, fixed 2.4.STABLE7)
 CVE-2004-0914 version (xorg-x11, fixed after 6.8.1)
-CVE-2004-0909 version (mozilla)
 CVE-2004-0909 version (thunderbird)
+CVE-2004-0909 version (mozilla)
 CVE-2004-0909 version (firefox)
 CVE-2004-0908 version (mozilla, fixed 1.7.3)
-CVE-2004-0907 version (mozilla)
 CVE-2004-0907 version (thunderbird)
+CVE-2004-0907 version (mozilla)
 CVE-2004-0907 version (firefox)
-CVE-2004-0906 version (mozilla)
 CVE-2004-0906 version (thunderbird)
+CVE-2004-0906 version (mozilla)
 CVE-2004-0906 version (firefox)
 CVE-2004-0905 version (mozilla, fixed 1.7.3)
 CVE-2004-0904 version (mozilla, fixed 1.7.3)
@@ -840,16 +840,17 @@
 CVE-2004-0902 version (mozilla, fixed 1.7.3)
 CVE-2004-0891 version (gaim, fixed 1.0.2)
 CVE-2004-0889 version (xpdf, fixed 3.0.1)
-CVE-2004-0888 version (kpdegraphics, not 3.4)
+CVE-2004-0888 version (xpdf, fixed 3.0.1)
 CVE-2004-0888 version (tetex, fixed 3.0)
+CVE-2004-0888 version (kpdegraphics, not 3.4)
 CVE-2004-0888 backport (cups)
-CVE-2004-0888 version (xpdf, fixed 3.0.1)
 CVE-2004-0887 version (kernel, fixed 2.6.10)
-CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0886 version (libtiff, fixed 3.7.1 at least)
+CVE-2004-0886 version (kdegraphics, fixed by Update on 20041109)
 CVE-2004-0885 version (httpd, fixed after 2.0.52)
 CVE-2004-0884 version (cyrus-sasl, fixed 2.1.20)
 CVE-2004-0883 version (kernel, fixed 2.6.11)
+CVE-2004-0883 version (kernel, fixed 2.6.11)
 CVE-2004-0882 version (samba, fixed 3.0.8)
 CVE-2004-0871 ignore (mozilla) unfixed upstream with no patch
 CVE-2004-0870 ignore (kde) upstream won't fix
@@ -872,30 +873,30 @@
 CVE-2004-0808 version (samba, fixed 3.0.7)
 CVE-2004-0807 version (samba, fixed 3.0.7)
 CVE-2004-0806 version (cdrtools, fixed 2.0.1)
-CVE-2004-0804 version (kdegraphics)
 CVE-2004-0804 version (libtiff, fixed after 3.6.1)
-CVE-2004-0803 version (kdegraphics)
+CVE-2004-0804 version (kdegraphics)
 CVE-2004-0803 version (libtiff, fixed after 3.6.1)
+CVE-2004-0803 version (kdegraphics)
 CVE-2004-0802 version (imlib, fixed 1.1.2)
 CVE-2004-0801 version (foomatic, fixed 3.0.2)
 CVE-2004-0797 version (zlib, fixed 1.2.2.2 at least)
+CVE-2004-0797 version (zlib)
 CVE-2004-0796 version (spamassassin, fixed 2.64)
 CVE-2004-0792 version (rsync, fixed 2.6.3)
 CVE-2004-0791 version (kernel, fixed 2.6.9)
 CVE-2004-0790 version (doesn't affect linux 2.6)
-CVE-2004-0797 version (zlib)
-CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0788 version (gtk2, fixed 2.6.7 at least)
+CVE-2004-0788 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0786 version (apr-util, fixed 2.0.51)
 CVE-2004-0785 version (gaim, fixed 0.82)
 CVE-2004-0784 version (gaim, fixed 0.82)
-CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0783 version (gtk2, fixed 2.6.7 at least)
-CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
+CVE-2004-0783 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0782 version (gtk2, fixed 2.6.7 at least)
+CVE-2004-0782 version (gdk-pixbuf, fixed 0.22)
+CVE-2004-0779 version (thunderbird)
 CVE-2004-0779 version (mozilla)
 CVE-2004-0779 version (firefox)
-CVE-2004-0779 version (thunderbird)
 CVE-2004-0778 version (cvs, fixed 1.11.17)
 CVE-2004-0772 version (krb5, fixed after 1.2.8)
 CVE-2004-0771 backport (lha, changelog)
@@ -912,8 +913,8 @@
 CVE-2004-0757 version (mozilla, fixed 1.7)
 CVE-2004-0755 version (ruby, fixed 1.8.1)
 CVE-2004-0754 version (gaim, fixed 0.82)
-CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0753 version (gtk2, fixed after 2.2.4)
+CVE-2004-0753 version (gdk-pixbuf, fixed 0.22)
 CVE-2004-0752 version (openoffice.org, fixed after 1.1.2)
 CVE-2004-0751 version (httpd, fixed 2.0.51)
 CVE-2004-0750 version (system-config-nfs, fixed 1.0.13)
@@ -937,8 +938,8 @@
 CVE-2004-0686 version (samba, fixed 3.0.6)
 CVE-2004-0685 version (kernel, not 2.6)
 CVE-2004-0658 ignore (kernel) not a security issue
-CVE-2004-0648 version (mozilla)
 CVE-2004-0648 version (thunderbird)
+CVE-2004-0648 version (mozilla)
 CVE-2004-0648 version (firefox)
 CVE-2004-0644 version (krb5, fixed after 1.3.4)
 CVE-2004-0643 version (krb5, fixed after 1.3.1)
@@ -964,11 +965,9 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
-CVE-2005-0590 version (openswan, fixed 2.1.4)
 CVE-2004-0587 version (kernel) not upstream flaw
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
-CVE-2005-0565 version (kernel, not 2.6)
 CVE-2004-0554 version (kernel, fixed 2.6.7)
 CVE-2004-0548 ignore (aspell, not fixed 0.50.5) not a security issue
 CVE-2004-0547 version (postgresql, fixed 7.2.1)
@@ -992,9 +991,9 @@
 CVE-2004-0492 version (httpd, not 2.0)
 CVE-2004-0491 version (kernel, not upstream)
 CVE-2004-0488 version (httpd, fixed 2.0.50)
+CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0461 version (dhcp, fixed after 3.0.1rc13)
 CVE-2004-0460 version (dhcp, fixed after 3.0.1rc13)
-CVE-2004-0478 ignore (mozilla) not a security issue
 CVE-2004-0457 version (mysql, fixed after 4.0.20)
 CVE-2004-0452 backport (perl) perl-5.8.5-CAN-2005-0155+0156.patch
 CVE-2004-0447 version (kernel, fixed 2.6.5)
@@ -1057,8 +1056,8 @@
 CVE-2004-0150 version (python, fixed 2.2.2)
 CVE-2004-0133 version (kernel, 2.6.4)
 CVE-2004-0113 version (httpd, fixed 2.0.49)
-CVE-2004-0112 backport (openssl097a, fixed 0.9.7d)
 CVE-2004-0112 version (openssl, not 0.9.8)
+CVE-2004-0112 backport (openssl097a, fixed 0.9.7d)
 CVE-2004-0111 version (gdk-pixbuf, fixed 0.20)
 CVE-2004-0110 version (libxml2, fixed 2.6.6)
 CVE-2004-0109 version (kernel, fixed 2.6.6)
@@ -1076,8 +1075,8 @@
 CVE-2004-0081 version (openssl097a, not 0.9.7)
 CVE-2004-0081 version (openssl, not 0.9.8)
 CVE-2004-0080 version (util-linux, fixed after 2.11f)
-CVE-2004-0079 backport (openssl097a, fixed 0.9.7c)
 CVE-2004-0079 version (openssl, not 0.9.8)
+CVE-2004-0079 backport (openssl097a, fixed 0.9.7c)
 CVE-2004-0078 version (mutt, fixed 1.4.2)
 CVE-2004-0077 version (kernel, fixed 2.6.3)
 CVE-2004-0075 version (kernel, not 2.6)
@@ -1091,8 +1090,8 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1265 VULNERABLE (mozilla)
+CVE-2003-1265 VULNERABLE (firefox)
 CVE-2003-1232 version (emacs, fixed 21.3)
 CVE-2003-1201 version (openldap, not 2.2)
 CVE-2003-1161 version (kernel, not released version)
@@ -1102,14 +1101,14 @@
 CVE-2003-1013 version (ethereal, fixed 0.10.0)
 CVE-2003-1012 version (ethereal, fixed 0.10.0)
 CVE-2003-0993 version (httpd, not 2.0)
+CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0992 version (mailman, fixed 2.1.3)
 CVE-2003-0991 version (mailman, fixed 2.0.14)
 CVE-2003-0990 version (squirrelmail, fixed after 1.4.0)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
-CVE-2003-0988 version (kde, fixed 3.1.5)
-CVE-2003-0992 version (mailman, fixed 2.1.4)
 CVE-2003-0989 version (tcpdump, fixed 3.8.1)
 CVE-2003-0988 version (kdepim, fixed 3.1.5)
+CVE-2003-0988 version (kde, fixed 3.1.5)
 CVE-2003-0987 version (httpd, not 2.0)
 CVE-2003-0985 version (kernel, not 2.6)
 CVE-2003-0984 version (kernel, fixed 2.4.23)
@@ -1190,12 +1189,12 @@
 CVE-2003-0548 version (gdm, fixed 2.4.1.6)
 CVE-2003-0547 version (gdm, fixed 2.4.1.6)
 CVE-2003-0546 version (up2date, fixed after 3.1.23)
-CVE-2003-0545 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0545 version (openssl, not 0.9.8)
-CVE-2003-0544 backport (openssl097a, fixed 0.9.7c)
+CVE-2003-0545 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0544 version (openssl, not 0.9.8)
-CVE-2003-0543 backport (openssl097a, fixed 0.9.7c)
+CVE-2003-0544 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0543 version (openssl, not 0.9.8)
+CVE-2003-0543 backport (openssl097a, fixed 0.9.7c)
 CVE-2003-0542 version (httpd, fixed 2.0.48)
 CVE-2003-0541 backport (gtkhtml, fixed 1.1.10) gtkhtml-1.1.9-textslave.patch
 CVE-2003-0540 version (postfix, not 2.0 onwards)
@@ -1236,13 +1235,13 @@
 CVE-2003-0289 version (cdrtools, fixed 2.01a14)
 CVE-2003-0282 version (unzip, fixed 5.51)
 CVE-2003-0255 version (gnupg, fixed 1.2.2)
-CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0253 version (httpd, fixed 2.0.47)
 CVE-2003-0252 version (nfs-utils, fixed 1.0.4)
 CVE-2003-0251 version (ypserv, fixed 2.7)
 CVE-2003-0248 version (kernel, not 2.6)
 CVE-2003-0247 version (kernel, not 2.6)
 CVE-2003-0246 version (kernel, not 2.6)
+CVE-2003-0245 version (httpd, fixed 2.0.47)
 CVE-2003-0245 version (httpd, fixed 2.0.46)
 CVE-2003-0244 version (kernel, not 2.6)
 CVE-2003-0211 version (xinetd, fixed 2.3.11)
@@ -1263,8 +1262,8 @@
 CVE-2003-0160 version (squirrelmail, fixed 1.2.11)
 CVE-2003-0159 version (ethereal, fixed after 0.9.9)
 CVE-2003-0150 version (mysql, fixed 3.23.56)
-CVE-2003-0147 backport (openssl097a, fixed 0.9.7b)
 CVE-2003-0147 version (openssl, not 0.9.8)
+CVE-2003-0147 backport (openssl097a, fixed 0.9.7b)
 CVE-2003-0146 version (netpbm, fixed 10.18)
 CVE-2003-0145 version (tcpdump, fixed 3.7.2)
 CVE-2003-0140 version (mutt, fixed 1.4.1)
@@ -1273,8 +1272,8 @@
 CVE-2003-0135 version (vsftpd, not upstream)
 CVE-2003-0133 version (evolution, fixed 1.2.4)
 CVE-2003-0132 version (httpd, fixed 2.0.45)
-CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) 
 CVE-2003-0131 version (openssl, not 0.9.8)
+CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) 
 CVE-2003-0130 version (evolution, fixed 1.2.3)
 CVE-2003-0129 version (evolution, fixed 1.2.3)
 CVE-2003-0128 version (evolution, fixed 1.2.3)
@@ -1304,8 +1303,8 @@
 CVE-2003-0043 version (tomcat, fixed 3.3.1a)
 CVE-2003-0041 version (krb5, fixed after 1.2.7)
 CVE-2003-0038 version (mailman, fixed 2.0.13 at least)
-CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0028 version (krb5, fixed after 1.2.7)
+CVE-2003-0028 version (glibc, fixed after 2.3.1)
 CVE-2003-0026 version (dhcpd, fixed 3.0.1)
 CVE-2003-0020 version (httpd, fixed 2.0.49)
 CVE-2003-0019 version (kernel-utils, not upstream)



From fedora-extras-commits at redhat.com  Mon Jan  9 14:26:30 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:26:30 -0500
Subject: rpms/chmlib/devel chmlib-chm_lib_c-ppc-patch.diff, NONE,
	1.1 chmlib.spec, 1.2, 1.3
Message-ID: <200601091427.k09ER3Ql030177@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30156

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:

First try to fix PPC-arch builds



chmlib-chm_lib_c-ppc-patch.diff:

--- NEW FILE chmlib-chm_lib_c-ppc-patch.diff ---
--- src/chm_lib.c	2005-10-26 16:17:50.000000000 +0400
+++ src/chm_lib.c	2006-01-09 17:12:12.000000000 +0300
@@ -160,7 +160,7 @@
 /* Sparc        */
 /* MIPS         */
 /* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
+#elif __i386__ || __sun || __sgi || __ppc__ || ppc
 typedef unsigned char           UChar;
 typedef short                   Int16;
 typedef unsigned short          UInt16;


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chmlib.spec	15 Dec 2005 15:29:43 -0000	1.2
+++ chmlib.spec	9 Jan 2006 14:26:30 -0000	1.3
@@ -1,11 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	1%{?dist}
+Release: 	2
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
 Source: 	http://66.93.236.84/~jedwin/projects/chmlib/%{name}-%{version}.tgz
+Patch0:		chmlib-chm_lib_c-ppc-patch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -25,10 +26,11 @@
 
 %prep
 %setup -q -n chmlib-0.37
+%patch0 -p0
 
 %build
 %configure --disable-static
-%{__make} %{?_smp_mflags}
+%{__make5} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -54,6 +56,9 @@
 
 %changelog
 
+* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-2
+- Fix for PPC-arch
+
 * Sat Nov 12 2005 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-1
 - Initial build for FC-Extras
 



From fedora-extras-commits at redhat.com  Mon Jan  9 14:44:01 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:44:01 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.3,1.4
Message-ID: <200601091444.k09EiYBU030270@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30246

Modified Files:
	chmlib.spec 
Log Message:

Typo fix.



Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- chmlib.spec	9 Jan 2006 14:26:30 -0000	1.3
+++ chmlib.spec	9 Jan 2006 14:44:01 -0000	1.4
@@ -30,7 +30,7 @@
 
 %build
 %configure --disable-static
-%{__make5} %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}



From fedora-extras-commits at redhat.com  Mon Jan  9 14:50:47 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:50:47 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.4,1.5
Message-ID: <200601091451.k09EpJRN030394@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30377

Modified Files:
	chmlib.spec 
Log Message:

Added dist-tag



Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chmlib.spec	9 Jan 2006 14:44:01 -0000	1.4
+++ chmlib.spec	9 Jan 2006 14:50:46 -0000	1.5
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	2
+Release: 	2%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/



From fedora-extras-commits at redhat.com  Mon Jan  9 14:55:56 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Mon,  9 Jan 2006 09:55:56 -0500
Subject: rpms/chmlib/devel chmlib.spec,1.5,1.6
Message-ID: <200601091456.k09EuSYG030504@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30483

Modified Files:
	chmlib.spec 
Log Message:

rev. 3



Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- chmlib.spec	9 Jan 2006 14:50:46 -0000	1.5
+++ chmlib.spec	9 Jan 2006 14:55:56 -0000	1.6
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
@@ -56,7 +56,10 @@
 
 %changelog
 
-* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-2
+* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-3%{?dist}
+- Typo fix
+
+* Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-2%{?dist}
 - Fix for PPC-arch
 
 * Sat Nov 12 2005 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-1



From fedora-extras-commits at redhat.com  Mon Jan  9 15:21:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:21:09 -0500
Subject: rpms/perl-Digest-MD4 - New directory
Message-ID: <200601091521.k09FLBnc032319@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32311/perl-Digest-MD4

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD4 added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:21:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:21:35 -0500
Subject: rpms/perl-Digest-MD4/devel - New directory
Message-ID: <200601091521.k09FLba1032334@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32311/perl-Digest-MD4/devel

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD4/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:22:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:22:27 -0500
Subject: rpms/perl-Digest-MD4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091522.k09FMTq4032370@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32358

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Digest-MD4


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Digest-MD4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:22:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:22:46 -0500
Subject: rpms/perl-Digest-MD4/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601091522.k09FMmRh032390@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32358/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Digest-MD4


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:24:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:24:03 -0500
Subject: rpms/perl-Digest-MD4 import.log,1.1,1.2
Message-ID: <200601091524.k09FOqGH032466@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32432

Modified Files:
	import.log 
Log Message:
auto-import perl-Digest-MD4-1.5-1 on branch devel from perl-Digest-MD4-1.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 15:22:26 -0000	1.1
+++ import.log	9 Jan 2006 15:24:03 -0000	1.2
@@ -0,0 +1 @@
+perl-Digest-MD4-1_5-1:HEAD:perl-Digest-MD4-1.5-1.src.rpm:1136820226



From fedora-extras-commits at redhat.com  Mon Jan  9 15:24:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:24:22 -0500
Subject: rpms/perl-Digest-MD4/devel perl-Digest-MD4.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091524.k09FOs5C032470@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Digest-MD4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32432/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Digest-MD4.spec 
Log Message:
auto-import perl-Digest-MD4-1.5-1 on branch devel from perl-Digest-MD4-1.5-1.src.rpm


--- NEW FILE perl-Digest-MD4.spec ---
Name:           perl-Digest-MD4
Version:        1.5
Release:        1%{?dist}
Summary:        Perl interface to the MD4 Algorithm

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Digest-MD4/
Source0:        http://www.cpan.org/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Digest::MD4 module allows you to use the RSA Data Security
Inc. MD4 Message Digest algorithm from within Perl programs.  The
algorithm takes as input a message of arbitrary length and produces as
output a 128-bit "fingerprint" or "message digest" of the input.


%prep
%setup -q -n Digest-MD4-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README rfc1320.txt
%{perl_vendorarch}/Digest/
%{perl_vendorarch}/auto/Digest/
%{_mandir}/man3/*.3*


%changelog
* Sat Sep 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.5-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 15:22:42 -0000	1.1
+++ .cvsignore	9 Jan 2006 15:24:22 -0000	1.2
@@ -0,0 +1 @@
+Digest-MD4-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 15:22:42 -0000	1.1
+++ sources	9 Jan 2006 15:24:22 -0000	1.2
@@ -0,0 +1 @@
+594d661c18b46a4aea97931dcaf5ce14  Digest-MD4-1.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 15:30:05 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:30:05 -0500
Subject: owners owners.list,1.514,1.515
Message-ID: <200601091530.k09FUbvw032601@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32584

Modified Files:
	owners.list 
Log Message:
New component: perl-Digest-MD4 (#177167)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -r1.514 -r1.515
--- owners.list	9 Jan 2006 11:26:36 -0000	1.514
+++ owners.list	9 Jan 2006 15:30:05 -0000	1.515
@@ -780,6 +780,7 @@
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Digest-MD4|Perl interface to the MD4 Algorithm|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:19 -0500
Subject: rpms/perl-Compress-Bzip2 - New directory
Message-ID: <200601091539.k09FdLR6032715@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707/perl-Compress-Bzip2

Log Message:
Directory /cvs/extras/rpms/perl-Compress-Bzip2 added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:25 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:25 -0500
Subject: rpms/perl-Compress-Bzip2/devel - New directory
Message-ID: <200601091539.k09FdR9e032730@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32707/perl-Compress-Bzip2/devel

Log Message:
Directory /cvs/extras/rpms/perl-Compress-Bzip2/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:44 -0500
Subject: rpms/perl-Compress-Bzip2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091539.k09FdkJf032764@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32752

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Compress-Bzip2


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Compress-Bzip2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:39:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:39:50 -0500
Subject: rpms/perl-Compress-Bzip2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601091539.k09Fdq9B000316@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32752/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Compress-Bzip2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:40:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:40:23 -0500
Subject: rpms/perl-Compress-Bzip2 import.log,1.1,1.2
Message-ID: <200601091540.k09Fetxr000384@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350

Modified Files:
	import.log 
Log Message:
auto-import perl-Compress-Bzip2-2.09-1 on branch devel from perl-Compress-Bzip2-2.09-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 15:39:44 -0000	1.1
+++ import.log	9 Jan 2006 15:40:22 -0000	1.2
@@ -0,0 +1 @@
+perl-Compress-Bzip2-2_09-1:HEAD:perl-Compress-Bzip2-2.09-1.src.rpm:1136821214



From fedora-extras-commits at redhat.com  Mon Jan  9 15:40:29 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:40:29 -0500
Subject: rpms/perl-Compress-Bzip2/devel perl-Compress-Bzip2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091541.k09Ff1wh000390@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Compress-Bzip2.spec 
Log Message:
auto-import perl-Compress-Bzip2-2.09-1 on branch devel from perl-Compress-Bzip2-2.09-1.src.rpm


--- NEW FILE perl-Compress-Bzip2.spec ---
Name:           perl-Compress-Bzip2
Version:        2.09
Release:        1%{?dist}
Summary:        Interface to Bzip2 compression library

Group:          Development/Libraries
License:        GPL
URL:            http://search.cpan.org/dist/Compress-Bzip2/
Source0:        http://www.cpan.org/authors/id/A/AR/ARJAY/Compress-Bzip2-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl
BuildRequires:  bzip2-devel
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Compress::Bzip2 module provides a Perl interface to the Bzip2
compression library.  A relevant subset of the functionality provided
by Bzip2 is available in Compress::Bzip2.

All string parameters can either be a scalar or a scalar reference.

The module can be split into two general areas of functionality,
namely in-memory compression/decompression and read/write access
to bzip2 files.


%prep
%setup -q -n Compress-Bzip2-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes COPYING NEWS README
%{perl_vendorarch}/Compress/
%{perl_vendorarch}/auto/Compress/
%{_mandir}/man3/*.3*


%changelog
* Thu Aug 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
- Update to 2.09.

* Mon May 02 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.07-1
- Update to 2.07.

* Mon Apr 25 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.04-1
- Update to 2.04.

* Sun Apr 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.03-1
- Update to 2.03.

* Sun Apr 24 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.00-1
- Update to 2.00.

* Thu Apr 21 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 15:39:50 -0000	1.1
+++ .cvsignore	9 Jan 2006 15:40:28 -0000	1.2
@@ -0,0 +1 @@
+Compress-Bzip2-2.09.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 15:39:50 -0000	1.1
+++ sources	9 Jan 2006 15:40:28 -0000	1.2
@@ -0,0 +1 @@
+1699fde3e86f2a036f135ae606d456bf  Compress-Bzip2-2.09.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 15:44:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:44:22 -0500
Subject: owners owners.list,1.515,1.516
Message-ID: <200601091544.k09FitEs000470@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv449

Modified Files:
	owners.list 
Log Message:
New component: perl-Compress-Bzip2 (#177166)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.515
retrieving revision 1.516
diff -u -r1.515 -r1.516
--- owners.list	9 Jan 2006 15:30:05 -0000	1.515
+++ owners.list	9 Jan 2006 15:44:22 -0000	1.516
@@ -757,6 +757,7 @@
 Fedora Extras|perl-Class-Trigger|Mixin to add / call inheritable triggers|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Whitehole|Base class to treat unhandled method calls as errors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Clone|Recursively copy perl datatypes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Compress-Bzip2|Interface to Bzip2 compression library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-General|Generic configuration module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:00 -0500
Subject: rpms/perl-SQL-Statement - New directory
Message-ID: <200601091547.k09Fl2WU000557@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv549/perl-SQL-Statement

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Statement added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:06 -0500
Subject: rpms/perl-SQL-Statement/devel - New directory
Message-ID: <200601091547.k09Fl84G000574@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv549/perl-SQL-Statement/devel

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Statement/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:26 -0500
Subject: rpms/perl-SQL-Statement Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091547.k09FlS3P000612@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv600

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-SQL-Statement


--- NEW FILE Makefile ---
# Top level Makefile for module perl-SQL-Statement
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:47:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:47:32 -0500
Subject: rpms/perl-SQL-Statement/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601091547.k09FlYMh000632@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv600/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SQL-Statement


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 15:48:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:48:07 -0500
Subject: rpms/perl-SQL-Statement import.log,1.1,1.2
Message-ID: <200601091548.k09FmdDv000710@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv670

Modified Files:
	import.log 
Log Message:
auto-import perl-SQL-Statement-1.14-1 on branch devel from perl-SQL-Statement-1.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 15:47:26 -0000	1.1
+++ import.log	9 Jan 2006 15:48:07 -0000	1.2
@@ -0,0 +1 @@
+perl-SQL-Statement-1_14-1:HEAD:perl-SQL-Statement-1.14-1.src.rpm:1136821678



From fedora-extras-commits at redhat.com  Mon Jan  9 15:48:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:48:13 -0500
Subject: rpms/perl-SQL-Statement/devel perl-SQL-Statement.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091548.k09Fmj2H000714@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-SQL-Statement/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv670/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SQL-Statement.spec 
Log Message:
auto-import perl-SQL-Statement-1.14-1 on branch devel from perl-SQL-Statement-1.14-1.src.rpm


--- NEW FILE perl-SQL-Statement.spec ---
Name:           perl-SQL-Statement
Version:        1.14
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
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(DBI)
BuildRequires:  perl(DBD::XBase)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The SQL::Statement module implements a pure Perl SQL parsing and execution
engine.  While it by no means implements full ANSI standard, it does support
many features including column and table aliases, built-in and user-defined
functions, implicit and explicit joins, complexly nested search conditions, and
other features.


%prep
%setup -q -n SQL-Statement-%{version}
find . -type f -exec chmod a-x {} ';'
%{__perl} -pi -e 's/\r\n/\n/' Changes README


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/SQL/
%{_mandir}/man3/*.3*


%changelog
* Sun Sep 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 15:47:32 -0000	1.1
+++ .cvsignore	9 Jan 2006 15:48:13 -0000	1.2
@@ -0,0 +1 @@
+SQL-Statement-1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Statement/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 15:47:32 -0000	1.1
+++ sources	9 Jan 2006 15:48:13 -0000	1.2
@@ -0,0 +1 @@
+1a450225dfd1400d507dde6def577cb3  SQL-Statement-1.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 15:52:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 10:52:21 -0500
Subject: owners owners.list,1.516,1.517
Message-ID: <200601091552.k09Fqsgk000833@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv802

Modified Files:
	owners.list 
Log Message:
New component: perl-SQL-Statement (#175896)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.516
retrieving revision 1.517
diff -u -r1.516 -r1.517
--- owners.list	9 Jan 2006 15:44:22 -0000	1.516
+++ owners.list	9 Jan 2006 15:52:21 -0000	1.517
@@ -896,6 +896,7 @@
 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-SQL-Statement|SQL parsing and processing engine|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-CRC32|Perl interface for cyclic redundancy check generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-Ediff|Produce common sub-string indices for two strings|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 16:05:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon,  9 Jan 2006 11:05:31 -0500
Subject: rpms/perl-Compress-Bzip2/devel perl-Compress-Bzip2.spec,1.1,1.2
Message-ID: <200601091606.k09G63H7002870@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Compress-Bzip2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2848

Modified Files:
	perl-Compress-Bzip2.spec 
Log Message:
Applied two of the Ville's suggestions (#177166): trimmed down
the description to the first paragraph and added the file ANNOUNCE
as documentation.



Index: perl-Compress-Bzip2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Compress-Bzip2/devel/perl-Compress-Bzip2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Compress-Bzip2.spec	9 Jan 2006 15:40:28 -0000	1.1
+++ perl-Compress-Bzip2.spec	9 Jan 2006 16:05:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Compress-Bzip2
 Version:        2.09
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Interface to Bzip2 compression library
 
 Group:          Development/Libraries
@@ -18,12 +18,6 @@
 compression library.  A relevant subset of the functionality provided
 by Bzip2 is available in Compress::Bzip2.
 
-All string parameters can either be a scalar or a scalar reference.
-
-The module can be split into two general areas of functionality,
-namely in-memory compression/decompression and read/write access
-to bzip2 files.
-
 
 %prep
 %setup -q -n Compress-Bzip2-%{version}
@@ -53,13 +47,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changes COPYING NEWS README
+%doc ANNOUNCE Changes COPYING NEWS README
 %{perl_vendorarch}/Compress/
 %{perl_vendorarch}/auto/Compress/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-2
+- Applied two of the Ville's suggestions (#177166): trimmed down
+  the description to the first paragraph and added the file ANNOUNCE
+  as documentation.
+
 * Thu Aug 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-1
 - Update to 2.09.
 



From fedora-extras-commits at redhat.com  Mon Jan  9 16:11:09 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:11:09 -0500
Subject: rpms/grace - New directory
Message-ID: <200601091611.k09GBBvA003126@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3114/grace

Log Message:
Directory /cvs/extras/rpms/grace added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 16:11:16 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:11:16 -0500
Subject: rpms/grace/devel - New directory
Message-ID: <200601091611.k09GBIu0003141@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3114/grace/devel

Log Message:
Directory /cvs/extras/rpms/grace/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan  9 16:12:13 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:12:13 -0500
Subject: rpms/grace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601091612.k09GCFKj003199@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3167/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module grace


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan  9 16:12:06 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:12:06 -0500
Subject: rpms/grace Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601091612.k09GCCbc003180@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3167

Added Files:
	Makefile import.log 
Log Message:
Setup of module grace


--- NEW FILE Makefile ---
# Top level Makefile for module grace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan  9 16:15:06 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:15:06 -0500
Subject: rpms/grace import.log,1.1,1.2
Message-ID: <200601091615.k09GFcPt003332@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3283

Modified Files:
	import.log 
Log Message:
auto-import grace-5.1.18-7 on branch devel from grace-5.1.18-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/grace/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Jan 2006 16:12:05 -0000	1.1
+++ import.log	9 Jan 2006 16:15:06 -0000	1.2
@@ -0,0 +1 @@
+grace-5_1_18-7:HEAD:grace-5.1.18-7.src.rpm:1136823283



From fedora-extras-commits at redhat.com  Mon Jan  9 16:15:13 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:15:13 -0500
Subject: rpms/grace/devel LICENSE.cephes, NONE, 1.1 cephes-license.email,
	NONE, 
	1.1 grace-gracerc-no_auxiliary.diff, NONE, 1.1 grace.csh, NONE,
	1.1 grace.desktop, NONE, 1.1 grace.png, NONE, 1.1 grace.sh, NONE,
	1.1 grace.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601091615.k09GFj5B003336@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3283/devel

Modified Files:
	.cvsignore sources 
Added Files:
	LICENSE.cephes cephes-license.email 
	grace-gracerc-no_auxiliary.diff grace.csh grace.desktop 
	grace.png grace.sh grace.spec 
Log Message:
auto-import grace-5.1.18-7 on branch devel from grace-5.1.18-7.src.rpm


--- NEW FILE LICENSE.cephes ---
 
 This software is derived from the Cephes Math Library. It is
 incorporated herein, and licensed in accordance with the Gnu
 General Public License, Version 2, by permission of the author. 


--- NEW FILE cephes-license.email ---
Copyright for the cephes library (details):

  This email from Steve Moshier, the copyright owner of cephes, to Helen 
  Faulkner (Debian maintainer of labplot), and other interested parties 
  (labplot and grace authors, grace maintainer and labplot sponsor), confirms 
  that we may release labplot with cephes licensed under the GPL.
 

  -------- Original Message --------
  Subject: Re: licensing of cephes
  Date: Sun, 2 Jan 2005 21:48:02 -0500 (EST)
  From: Steve Moshier <steve at moshier.net>
  To: Helen Faulkner <helen_ml_faulkner at yahoo.co.uk>
  CC: twerner at debian.org, Ben Burton <bab at debian.org>, evgeny at stambulchik.net,
  Stefan Gerlach <gerlach at mbi-berlin.de>
  References: <41D14354.4040506 at yahoo.co.uk> 
  <Pine.LNX.4.58.0412280836250.9987 at moshier.net> 
  <41D17BE3.3020708 at yahoo.co.uk>
  <Pine.LNX.4.58.0412281219420.10873 at moshier.net> 
  <41D1FB8D.6030002 at yahoo.co.uk> 
  <Pine.LNX.4.58.0412291032190.15474 at moshier.net> 
  <41D2D8EF.9010702 at yahoo.co.uk> 
  <Pine.LNX.4.58.0412291632540.17032 at moshier.net> 
  <41D41B2E.80508 at yahoo.co.uk>



  On Thu, 30 Dec 2004, Helen Faulkner wrote:

  >   http://www.debian.org/social_contract#guidelines

  This is fine with me.  To acknowedge your terms explicily,
  how about augmenting the permission to read something like
  the following --

    This software is derived from the Cephes Math Library. It is
    incorporated herein, and licensed in accordance with DFSG,
    by permission of the author.


  If you are trying to get me to suggest a specific form for your
  license, then from looking at Debian programs such as dpkg it seems to
  me that you would find the GPL to be appropriate and the permission
  statement could reference one of the GPL documents instead of DFSG.
  Alternatively, the packages you have been talking about distributing
  with Debian presumably come with some sort of licenses and it would
  make sense to propose those licenses.

grace-gracerc-no_auxiliary.diff:

--- NEW FILE grace-gracerc-no_auxiliary.diff ---
--- gracerc.old	2005-09-03 20:18:51.000000000 +0200
+++ gracerc	2005-09-03 20:19:04.000000000 +0200
@@ -7,7 +7,7 @@
 DEFINE IFILTER "bin/grconvert %s -" MAGIC "00000031" 
 #
 # This one is for automatic import of Origin-4 fit description files
-DEFINE IFILTER "auxiliary/fdf2fit %s -" PATTERN "*.fdf"
+DEFINE IFILTER "bin/fdf2fit %s -" PATTERN "*.fdf"
 #
 # Save disk space by keeping files gzip'ed
 DEFINE IFILTER "gzip -dc %s" PATTERN "*.gz"


--- NEW FILE grace.csh ---
#!/bin/tcsh
setenv GRACE_HOME "/usr/share/grace"


--- NEW FILE grace.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Grace
Comment=Numerical Data Processing and Visualization Tool
Exec=/usr/bin/xmgrace
Icon=grace.png
Terminal=false
Type=Application
Categories=Application;Graphics;


--- NEW FILE grace.sh ---
#!/bin/bash
export GRACE_HOME="/usr/share/grace"


--- NEW FILE grace.spec ---
Name:           grace
Version:        5.1.18
Release:        7%{?dist}
Summary:        Numerical Data Processing and Visualization Tool (grace)

License:        GPL
# Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
URL:            http://plasma-gate.weizmann.ac.il/Grace/
Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
Source1:        %{name}.desktop
Source2:        %{name}.png
Source3:        %{name}.sh
Source4:        %{name}.csh
Source5:	cephes-license.email
Source6:	LICENSE.cephes
Patch:          %{name}-gracerc-no_auxiliary.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Group:          Applications/Engineering

BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
BuildRequires:  zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel
BuildRequires:  openmotif-devel, gcc-gfortran
BuildRequires:  desktop-file-utils, font-utils
Requires:	nedit
Requires(post): chkfontpath
Requires(postun): chkfontpath

%description
Grace is a Motif application for two-dimensional data visualization.
Grace can transform the data using free equations, FFT, cross- and
auto-correlation, differences, integrals, histograms, and much more. The
generated figures are of high quality.  Grace is a very convenient tool
for data inspection, data transformation, and and for making figures for
publications.


%package devel
Summary:        Files needed for grace development
Group:          Development/Libraries
License:        LGPL
Requires:       %{name} = %{version}-%{release}

%description devel
Install these files if you need to compile software that requires grace.


%prep
%setup -q
%patch

%build
cp %{SOURCE5} %{SOURCE6} .
%configure \
    --enable-editres \
    --with-editor=nedit \
    --with-printcmd="lpr" \
    --enable-grace-home=%{_datadir}/%{name} \
    --disable-pdfdrv \
    --with-x \
    --with-f77=gfortran \
    --with-extra-incpath=%{_includedir}/netcdf-3 \
    --with-extra-ldpath=%{_libdir}/netcdf-3
    
make %{?_smp_mflags}


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

cp Xbae/LICENSE LICENSE.Xbae
rm -f doc/*.1

mkdir -pm 755                               \
    %{buildroot}%{_bindir}                  \
    %{buildroot}%{_includedir}              \
    %{buildroot}%{_libdir}		    \
    %{buildroot}%{_datadir}/pixmaps         \
    %{buildroot}%{_datadir}/applications    \
    %{buildroot}%{_mandir}/man1             \
    %{buildroot}%{_sysconfdir}/profile.d    \
    %{buildroot}%{_sysconfdir}/%{name}
##
# Let's have some sanity
#
pushd %{buildroot}%{_datadir}/%{name}
install -pm 755 bin/*   %{buildroot}%{_bindir}/
rm -rf bin
ln -s %{_bindir} bin
install -pm 755 lib/*   %{buildroot}%{_libdir}/
rm -rf lib
ln -s %{_libdir} lib
install -pm 644 include/* %{buildroot}%{_includedir}/
rm -rf include
ln -s %{_includedir} include
install -pm 644 doc/*.1 %{buildroot}%{_mandir}/man1/
# doc and example directories are removed from GRACE_HOME and put in %doc
rm -rf doc
rm -rf examples
# the convcal source file shouldn't appear in %doc, it is removed here
rm -f auxiliary/convcal.c
# move config files to %{_sysconfdir} and do symlinks
for conf in gracerc templates gracerc.user; do
    mv $conf %{buildroot}%{_sysconfdir}/%{name}
    ln -s %{_sysconfdir}/%{name}/$conf $conf
done
mv fonts/FontDataBase %{buildroot}%{_sysconfdir}/%{name}
ln -s %{_sysconfdir}/%{name}/FontDataBase fonts/FontDataBase
popd
mkfontdir %{buildroot}%{_datadir}/%{name}/fonts/type1
##
# Desktop stuff
#
install -pm 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-install --vendor fedora --delete-original    \
    --dir %{buildroot}%{_datadir}/applications          \
    --add-category Application                          \
    --add-category Graphics	                            \
    %{buildroot}%{_datadir}/applications/%{name}.desktop
##
# Profile scripts
#
install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh


%clean
rm -rf %{buildroot}


%post
%{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1


%postun
%{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1


%files
%defattr(-,root,root,-)
%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
%doc cephes-license.email LICENSE.cephes
%doc examples/ doc/ 
%{_sysconfdir}/profile.d/*
%config(noreplace) %{_sysconfdir}/%{name}/
%{_bindir}/*
%{_datadir}/%{name}
%exclude %{_datadir}/%{name}/include
%exclude %{_datadir}/%{name}/lib
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_mandir}/man*/*


%files devel
%defattr(-,root,root,-)
%doc grace_np/LICENSE
%{_includedir}/*
%{_datadir}/%{name}/include
%{_libdir}/*
%{_datadir}/%{name}/lib


%changelog
* Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
- put config files in /etc
- licence is GPL and not BSD/GPL, as it is not dual licensed

* Wed Sep 14 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-6
- Require nedit as an explicit Require.

* Tue Sep 13 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-5
- Normalize buildroot and change default editor to nedit.

* Fri Sep  9 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-4
- Add license to cephes library as well as the original mail where permission is given.
- Move permission of profile.d files from 644 to 755.

* Sat Sep  3 2005 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-3
- cleanup licences
- put examples/ and doc/ in %doc
- remove duplicate manpages 
- add patch to change fdf2fit path in graderc

* Sun Aug 21 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-2
- Add post and postun requires.

* Sat Aug 20 2005 Jos?? Matos <jamatos at fc.up.pt> - 5.1.18-1

- Prepare for Fedora Extras submission, based on a previous spec file
  from Konstantin Ryabitsev (icon) and Seth Vidal from duke.edu


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Jan 2006 16:12:13 -0000	1.1
+++ .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
@@ -0,0 +1 @@
+grace-5.1.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Jan 2006 16:12:13 -0000	1.1
+++ sources	9 Jan 2006 16:15:12 -0000	1.2
@@ -0,0 +1 @@
+9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 16:22:20 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Mon,  9 Jan 2006 11:22:20 -0500
Subject: owners owners.list,1.517,1.518
Message-ID: <200601091622.k09GMjU9003464@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3440

Modified Files:
	owners.list 
Log Message:
perl-GnuPG-Interface now owned by Matt Domsch, with thanks to spot for holding it for me before.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- owners.list	9 Jan 2006 15:52:21 -0000	1.517
+++ owners.list	9 Jan 2006 16:22:20 -0000	1.518
@@ -809,7 +809,7 @@
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan  9 16:31:59 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Mon,  9 Jan 2006 11:31:59 -0500
Subject: owners owners.list,1.518,1.519
Message-ID: <200601091632.k09GWVfg003587@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3567

Modified Files:
	owners.list 
Log Message:
Add grace


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.518
retrieving revision 1.519
diff -u -r1.518 -r1.519
--- owners.list	9 Jan 2006 16:22:20 -0000	1.518
+++ owners.list	9 Jan 2006 16:31:59 -0000	1.519
@@ -338,6 +338,7 @@
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gqview|Image browser and viewer|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|grace|Numerical Data Processing and Visualization Tool|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|grads|Tool for easy acces, manipulation, and visualization of data|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gramps|Genealogical Research and Analysis Management Programming System|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|graphviz|Graph Visualization Tools|oliver at linux-kernel.at|extras-qa at fedoraproject.org|ellson at research.att.com



From fedora-extras-commits at redhat.com  Mon Jan  9 18:17:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:17:57 -0500
Subject: rpms/perl-Class-Accessor/FC-3 perl-Class-Accessor.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091818.k09IITZM007445@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Accessor/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-3

Modified Files:
	perl-Class-Accessor.spec sources 
Log Message:

Bump to 0.22



Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/perl-Class-Accessor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Accessor.spec	14 Aug 2005 18:39:08 -0000	1.1
+++ perl-Class-Accessor.spec	9 Jan 2006 18:17:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.19
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.22-1
+- bump to 0.22
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
 - add examples/ to %doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 18:39:08 -0000	1.2
+++ sources	9 Jan 2006 18:17:56 -0000	1.3
@@ -1 +1 @@
-c61a058df6901b4ebae2596fd6352197  Class-Accessor-0.19.tar.gz
+6259a41d8a0cb44742f0d9a772df3156  Class-Accessor-0.22.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:18:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:18:04 -0500
Subject: rpms/perl-Class-Accessor/FC-4 perl-Class-Accessor.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091818.k09IIari007449@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Accessor/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-4

Modified Files:
	perl-Class-Accessor.spec sources 
Log Message:

Bump to 0.22



Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/perl-Class-Accessor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Accessor.spec	14 Aug 2005 18:39:08 -0000	1.1
+++ perl-Class-Accessor.spec	9 Jan 2006 18:18:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.19
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.22-1
+- bump to 0.22
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
 - add examples/ to %doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 18:39:08 -0000	1.2
+++ sources	9 Jan 2006 18:18:03 -0000	1.3
@@ -1 +1 @@
-c61a058df6901b4ebae2596fd6352197  Class-Accessor-0.19.tar.gz
+6259a41d8a0cb44742f0d9a772df3156  Class-Accessor-0.22.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:18:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:18:10 -0500
Subject: rpms/perl-Class-Accessor/devel .cvsignore, 1.2,
	1.3 perl-Class-Accessor.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091818.k09IIgwX007454@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Accessor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/devel

Modified Files:
	.cvsignore perl-Class-Accessor.spec sources 
Log Message:

Bump to 0.22



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 18:39:08 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:18:09 -0000	1.3
@@ -1 +1,2 @@
 Class-Accessor-0.19.tar.gz
+Class-Accessor-0.22.tar.gz


Index: perl-Class-Accessor.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/perl-Class-Accessor.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Accessor.spec	14 Aug 2005 18:39:08 -0000	1.1
+++ perl-Class-Accessor.spec	9 Jan 2006 18:18:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Accessor
-Version:        0.19
-Release:        3%{?dist}
+Version:        0.22
+Release:        1%{?dist}
 Summary:        Automated accessor generation
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.22-1
+- bump to 0.22
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.19-3
 - add examples/ to %doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 18:39:08 -0000	1.2
+++ sources	9 Jan 2006 18:18:09 -0000	1.3
@@ -1 +1 @@
-c61a058df6901b4ebae2596fd6352197  Class-Accessor-0.19.tar.gz
+6259a41d8a0cb44742f0d9a772df3156  Class-Accessor-0.22.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:25:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:25:03 -0500
Subject: rpms/perl-Class-DBI-FromCGI/FC-3 perl-Class-DBI-FromCGI.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200601091825.k09IPaLm007639@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587/FC-3

Modified Files:
	perl-Class-DBI-FromCGI.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-FromCGI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-3/perl-Class-DBI-FromCGI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-FromCGI.spec	8 Sep 2005 15:19:27 -0000	1.1
+++ perl-Class-DBI-FromCGI.spec	9 Jan 2006 18:25:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-FromCGI
-Version:        0.94
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Update Class::DBI data using CGI::Untaint
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
+BuildRequires:	perl(Test::More)
 Requires:  perl(Class::DBI), perl(CGI::Untaint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.00-1
+- bump to 1.00
+
 * Wed Sep  7 2005 Paul Howarth <paul at city-fan.org> - 0.94-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:19:27 -0000	1.2
+++ sources	9 Jan 2006 18:25:03 -0000	1.3
@@ -1 +1 @@
-126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz
+b7ff8430745c3a72930310da5fc39ded  Class-DBI-FromCGI-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:25:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:25:10 -0500
Subject: rpms/perl-Class-DBI-FromCGI/FC-4 perl-Class-DBI-FromCGI.spec, 1.1, 
	1.2 sources, 1.2, 1.3
Message-ID: <200601091825.k09IPgP1007643@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587/FC-4

Modified Files:
	perl-Class-DBI-FromCGI.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-FromCGI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-4/perl-Class-DBI-FromCGI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-FromCGI.spec	8 Sep 2005 15:19:27 -0000	1.1
+++ perl-Class-DBI-FromCGI.spec	9 Jan 2006 18:25:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-FromCGI
-Version:        0.94
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Update Class::DBI data using CGI::Untaint
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
+BuildRequires:	perl(Test::More)
 Requires:  perl(Class::DBI), perl(CGI::Untaint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.00-1
+- bump to 1.00
+
 * Wed Sep  7 2005 Paul Howarth <paul at city-fan.org> - 0.94-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:19:27 -0000	1.2
+++ sources	9 Jan 2006 18:25:09 -0000	1.3
@@ -1 +1 @@
-126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz
+b7ff8430745c3a72930310da5fc39ded  Class-DBI-FromCGI-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:25:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:25:15 -0500
Subject: rpms/perl-Class-DBI-FromCGI/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-FromCGI.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091825.k09IPmPp007648@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7587/devel

Modified Files:
	.cvsignore perl-Class-DBI-FromCGI.spec sources 
Log Message:

Bump to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:19:27 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:25:15 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-FromCGI-0.94.tar.gz
+Class-DBI-FromCGI-1.00.tar.gz


Index: perl-Class-DBI-FromCGI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/perl-Class-DBI-FromCGI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-FromCGI.spec	8 Sep 2005 15:19:27 -0000	1.1
+++ perl-Class-DBI-FromCGI.spec	9 Jan 2006 18:25:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-FromCGI
-Version:        0.94
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Update Class::DBI data using CGI::Untaint
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -9,7 +9,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite)
+BuildRequires:	perl(Class::DBI), perl(CGI::Untaint), perl(DBD::SQLite) 
+BuildRequires:	perl(Test::More)
 Requires:  perl(Class::DBI), perl(CGI::Untaint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 1.00-1
+- bump to 1.00
+
 * Wed Sep  7 2005 Paul Howarth <paul at city-fan.org> - 0.94-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-FromCGI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:19:27 -0000	1.2
+++ sources	9 Jan 2006 18:25:15 -0000	1.3
@@ -1 +1 @@
-126040b7e83218197786de2c6699100f  Class-DBI-FromCGI-0.94.tar.gz
+b7ff8430745c3a72930310da5fc39ded  Class-DBI-FromCGI-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:31:38 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:31:38 -0500
Subject: rpms/perl-Class-Data-Inheritable/FC-3
	perl-Class-Data-Inheritable.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091832.k09IWAcT007828@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/FC-3

Modified Files:
	perl-Class-Data-Inheritable.spec sources 
Log Message:

Bump to 0.04



Index: perl-Class-Data-Inheritable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-3/perl-Class-Data-Inheritable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Data-Inheritable.spec	10 Jul 2005 20:32:47 -0000	1.1
+++ perl-Class-Data-Inheritable.spec	9 Jan 2006 18:31:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Inheritable
-Version:        0.02
-Release:        3%{?dist}
+Version:        0.04
+Release:        1%{?dist}
 Summary:        Inheritable, overridable class data
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -40,11 +40,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{perl_vendorlib}/Class
+%{perl_vendorlib}/Class/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-1
+- bump to 0.04
+
 * Sun Jul 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.02-3
 - changed /Class/Data to /Class, for proper ownership
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 20:32:47 -0000	1.2
+++ sources	9 Jan 2006 18:31:38 -0000	1.3
@@ -1 +1 @@
-d3a9fff92ede1085643341179fd9263b  Class-Data-Inheritable-0.02.tar.gz
+49bc899e194c69bc014b14165437f1eb  Class-Data-Inheritable-0.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:31:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:31:44 -0500
Subject: rpms/perl-Class-Data-Inheritable/FC-4
	perl-Class-Data-Inheritable.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091832.k09IWGB6007832@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/FC-4

Modified Files:
	perl-Class-Data-Inheritable.spec sources 
Log Message:

Bump to 0.04



Index: perl-Class-Data-Inheritable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-4/perl-Class-Data-Inheritable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Data-Inheritable.spec	10 Jul 2005 20:32:47 -0000	1.1
+++ perl-Class-Data-Inheritable.spec	9 Jan 2006 18:31:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Inheritable
-Version:        0.02
-Release:        3%{?dist}
+Version:        0.04
+Release:        1%{?dist}
 Summary:        Inheritable, overridable class data
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -40,11 +40,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{perl_vendorlib}/Class
+%{perl_vendorlib}/Class/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-1
+- bump to 0.04
+
 * Sun Jul 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.02-3
 - changed /Class/Data to /Class, for proper ownership
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 20:32:47 -0000	1.2
+++ sources	9 Jan 2006 18:31:44 -0000	1.3
@@ -1 +1 @@
-d3a9fff92ede1085643341179fd9263b  Class-Data-Inheritable-0.02.tar.gz
+49bc899e194c69bc014b14165437f1eb  Class-Data-Inheritable-0.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:31:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:31:50 -0500
Subject: rpms/perl-Class-Data-Inheritable/devel .cvsignore, 1.2,
	1.3 perl-Class-Data-Inheritable.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091832.k09IWMWC007837@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Data-Inheritable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7776/devel

Modified Files:
	.cvsignore perl-Class-Data-Inheritable.spec sources 
Log Message:

Bump to 0.04



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Jul 2005 20:32:47 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:31:50 -0000	1.3
@@ -1 +1,2 @@
 Class-Data-Inheritable-0.02.tar.gz
+Class-Data-Inheritable-0.04.tar.gz


Index: perl-Class-Data-Inheritable.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/perl-Class-Data-Inheritable.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Data-Inheritable.spec	10 Jul 2005 20:32:47 -0000	1.1
+++ perl-Class-Data-Inheritable.spec	9 Jan 2006 18:31:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Data-Inheritable
-Version:        0.02
-Release:        3%{?dist}
+Version:        0.04
+Release:        1%{?dist}
 Summary:        Inheritable, overridable class data
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -40,11 +40,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{perl_vendorlib}/Class
+%{perl_vendorlib}/Class/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.04-1
+- bump to 0.04
+
 * Sun Jul 10 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.02-3
 - changed /Class/Data to /Class, for proper ownership
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Data-Inheritable/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Jul 2005 20:32:47 -0000	1.2
+++ sources	9 Jan 2006 18:31:50 -0000	1.3
@@ -1 +1 @@
-d3a9fff92ede1085643341179fd9263b  Class-Data-Inheritable-0.02.tar.gz
+49bc899e194c69bc014b14165437f1eb  Class-Data-Inheritable-0.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:45:36 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:45:36 -0500
Subject: rpms/perl-CGI-Untaint-date/FC-3 perl-CGI-Untaint-date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091846.k09Ik9BH008032@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint-date/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978/FC-3

Modified Files:
	perl-CGI-Untaint-date.spec sources 
Log Message:

Bump to 1.00



Index: perl-CGI-Untaint-date.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-3/perl-CGI-Untaint-date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint-date.spec	24 Aug 2005 16:34:21 -0000	1.1
+++ perl-CGI-Untaint-date.spec	9 Jan 2006 18:45:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-date
-Version:        0.03
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Validate a date
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Tue Aug 23 2005 Paul Howarth <paul at city-fan.org> 0.03-3
 - add BR: perl(Date::Simple) and perl(Date::Manip)
 - add license text for GPL and Artistic licenses


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2005 16:34:21 -0000	1.2
+++ sources	9 Jan 2006 18:45:36 -0000	1.3
@@ -1 +1 @@
-8244770c2a93e8c1f08085bfffa64d4a  CGI-Untaint-date-0.03.tar.gz
+d042ddc051a289514943860e7effb56e  CGI-Untaint-date-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:45:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:45:42 -0500
Subject: rpms/perl-CGI-Untaint-date/FC-4 perl-CGI-Untaint-date.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091846.k09IkFxq008036@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint-date/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978/FC-4

Modified Files:
	perl-CGI-Untaint-date.spec sources 
Log Message:

Bump to 1.00



Index: perl-CGI-Untaint-date.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-4/perl-CGI-Untaint-date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint-date.spec	24 Aug 2005 16:34:21 -0000	1.1
+++ perl-CGI-Untaint-date.spec	9 Jan 2006 18:45:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-date
-Version:        0.03
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Validate a date
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Tue Aug 23 2005 Paul Howarth <paul at city-fan.org> 0.03-3
 - add BR: perl(Date::Simple) and perl(Date::Manip)
 - add license text for GPL and Artistic licenses


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2005 16:34:21 -0000	1.2
+++ sources	9 Jan 2006 18:45:42 -0000	1.3
@@ -1 +1 @@
-8244770c2a93e8c1f08085bfffa64d4a  CGI-Untaint-date-0.03.tar.gz
+d042ddc051a289514943860e7effb56e  CGI-Untaint-date-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:45:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:45:48 -0500
Subject: rpms/perl-CGI-Untaint-date/devel .cvsignore, 1.2,
	1.3 perl-CGI-Untaint-date.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091846.k09IkKrZ008041@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-CGI-Untaint-date/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7978/devel

Modified Files:
	.cvsignore perl-CGI-Untaint-date.spec sources 
Log Message:

Bump to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Aug 2005 16:34:21 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:45:48 -0000	1.3
@@ -1 +1,2 @@
 CGI-Untaint-date-0.03.tar.gz
+CGI-Untaint-date-1.00.tar.gz


Index: perl-CGI-Untaint-date.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/devel/perl-CGI-Untaint-date.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-CGI-Untaint-date.spec	24 Aug 2005 16:34:21 -0000	1.1
+++ perl-CGI-Untaint-date.spec	9 Jan 2006 18:45:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-CGI-Untaint-date
-Version:        0.03
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Validate a date
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Tue Aug 23 2005 Paul Howarth <paul at city-fan.org> 0.03-3
 - add BR: perl(Date::Simple) and perl(Date::Manip)
 - add license text for GPL and Artistic licenses


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CGI-Untaint-date/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Aug 2005 16:34:21 -0000	1.2
+++ sources	9 Jan 2006 18:45:48 -0000	1.3
@@ -1 +1 @@
-8244770c2a93e8c1f08085bfffa64d4a  CGI-Untaint-date-0.03.tar.gz
+d042ddc051a289514943860e7effb56e  CGI-Untaint-date-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:50:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:50:33 -0500
Subject: rpms/perl-Class-DBI-SQLite/FC-3 perl-Class-DBI-SQLite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091851.k09Ip5CZ008573@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521/FC-3

Modified Files:
	perl-Class-DBI-SQLite.spec sources 
Log Message:

Bump to 0.11



Index: perl-Class-DBI-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-3/perl-Class-DBI-SQLite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-SQLite.spec	4 Sep 2005 21:43:49 -0000	1.1
+++ perl-Class-DBI-SQLite.spec	9 Jan 2006 18:50:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-SQLite
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Extension to Class::DBI for sqlite
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.11-1
+- bump to 0.11
+
 * Sun Sep  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
 - add R: perl(DBD::SQLite)
 - remove R: perl(Class::DBI)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2005 21:43:49 -0000	1.2
+++ sources	9 Jan 2006 18:50:33 -0000	1.3
@@ -1 +1 @@
-13ee636b0bfd08e0b9c6cf0e7429810a  Class-DBI-SQLite-0.10.tar.gz
+25e80b9d2f2d66e6fc51d487f0894802  Class-DBI-SQLite-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:50:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:50:39 -0500
Subject: rpms/perl-Class-DBI-SQLite/FC-4 perl-Class-DBI-SQLite.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601091851.k09IpBBc008577@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521/FC-4

Modified Files:
	perl-Class-DBI-SQLite.spec sources 
Log Message:

Bump to 0.11



Index: perl-Class-DBI-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-4/perl-Class-DBI-SQLite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-SQLite.spec	4 Sep 2005 21:43:49 -0000	1.1
+++ perl-Class-DBI-SQLite.spec	9 Jan 2006 18:50:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-SQLite
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Extension to Class::DBI for sqlite
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.11-1
+- bump to 0.11
+
 * Sun Sep  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
 - add R: perl(DBD::SQLite)
 - remove R: perl(Class::DBI)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2005 21:43:49 -0000	1.2
+++ sources	9 Jan 2006 18:50:38 -0000	1.3
@@ -1 +1 @@
-13ee636b0bfd08e0b9c6cf0e7429810a  Class-DBI-SQLite-0.10.tar.gz
+25e80b9d2f2d66e6fc51d487f0894802  Class-DBI-SQLite-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 18:50:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 13:50:45 -0500
Subject: rpms/perl-Class-DBI-SQLite/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-SQLite.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601091851.k09IpHbo008582@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8521/devel

Modified Files:
	.cvsignore perl-Class-DBI-SQLite.spec sources 
Log Message:

Bump to 0.11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Sep 2005 21:43:49 -0000	1.2
+++ .cvsignore	9 Jan 2006 18:50:44 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-SQLite-0.10.tar.gz
+Class-DBI-SQLite-0.11.tar.gz


Index: perl-Class-DBI-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/perl-Class-DBI-SQLite.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-SQLite.spec	4 Sep 2005 21:43:49 -0000	1.1
+++ perl-Class-DBI-SQLite.spec	9 Jan 2006 18:50:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-SQLite
-Version:        0.10
-Release:        2%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Extension to Class::DBI for sqlite
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.11-1
+- bump to 0.11
+
 * Sun Sep  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
 - add R: perl(DBD::SQLite)
 - remove R: perl(Class::DBI)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-SQLite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Sep 2005 21:43:49 -0000	1.2
+++ sources	9 Jan 2006 18:50:44 -0000	1.3
@@ -1 +1 @@
-13ee636b0bfd08e0b9c6cf0e7429810a  Class-DBI-SQLite-0.10.tar.gz
+25e80b9d2f2d66e6fc51d487f0894802  Class-DBI-SQLite-0.11.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:14:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:14:37 -0500
Subject: rpms/gxemul/FC-3 gxemul.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601091915.k09JFQEP010573@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gxemul/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10519/FC-3

Modified Files:
	gxemul.spec sources 
Log Message:

Bump to 0.3.7



Index: gxemul.spec
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-3/gxemul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gxemul.spec	29 Jul 2005 16:51:26 -0000	1.1
+++ gxemul.spec	9 Jan 2006 19:14:37 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		gxemul
-Version:	0.3.4
+Version:	0.3.7
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
@@ -7,6 +7,7 @@
 URL:		http://gavare.se/gxemul
 Source0:	http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	xorg-x11-devel
 
 %description
 GXemul is an experimental instruction-level machine emulator. It can be
@@ -20,7 +21,7 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-all
 make %{?_smp_mflags}
 
 %install
@@ -40,5 +41,9 @@
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.7-1
+- bump to 0.3.7
+- enable all the cpu types by default (MIPS, ARM, PPC are primary)
+
 * Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.4-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jul 2005 16:51:26 -0000	1.2
+++ sources	9 Jan 2006 19:14:37 -0000	1.3
@@ -1 +1 @@
-dbf7ef59d2bb8f1e3082d0fa5fb434af  gxemul-0.3.4.tar.gz
+48301bcba8ee51c0f6bcf462277668c5  gxemul-0.3.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:14:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:14:56 -0500
Subject: rpms/gxemul/FC-4 gxemul.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601091915.k09JFURa010575@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gxemul/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10519/FC-4

Modified Files:
	gxemul.spec sources 
Log Message:

Bump to 0.3.7



Index: gxemul.spec
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-4/gxemul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gxemul.spec	29 Jul 2005 16:51:26 -0000	1.1
+++ gxemul.spec	9 Jan 2006 19:14:56 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		gxemul
-Version:	0.3.4
+Version:	0.3.7
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
@@ -7,6 +7,7 @@
 URL:		http://gavare.se/gxemul
 Source0:	http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	xorg-x11-devel
 
 %description
 GXemul is an experimental instruction-level machine emulator. It can be
@@ -20,7 +21,7 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-all
 make %{?_smp_mflags}
 
 %install
@@ -40,5 +41,9 @@
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.7-1
+- bump to 0.3.7
+- enable all the cpu types by default (MIPS, ARM, PPC are primary)
+
 * Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.4-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxemul/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jul 2005 16:51:26 -0000	1.2
+++ sources	9 Jan 2006 19:14:56 -0000	1.3
@@ -1 +1 @@
-dbf7ef59d2bb8f1e3082d0fa5fb434af  gxemul-0.3.4.tar.gz
+48301bcba8ee51c0f6bcf462277668c5  gxemul-0.3.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:15:10 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:15:10 -0500
Subject: rpms/gxemul/devel .cvsignore, 1.2, 1.3 gxemul.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601091915.k09JFgl2010582@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/gxemul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10519/devel

Modified Files:
	.cvsignore gxemul.spec sources 
Log Message:

Bump to 0.3.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jul 2005 16:51:26 -0000	1.2
+++ .cvsignore	9 Jan 2006 19:15:09 -0000	1.3
@@ -1 +1,2 @@
 gxemul-0.3.4.tar.gz
+gxemul-0.3.7.tar.gz


Index: gxemul.spec
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/gxemul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gxemul.spec	29 Jul 2005 16:51:26 -0000	1.1
+++ gxemul.spec	9 Jan 2006 19:15:09 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		gxemul
-Version:	0.3.4
+Version:	0.3.7
 Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
@@ -7,6 +7,7 @@
 URL:		http://gavare.se/gxemul
 Source0:	http://gavare.se/gxemul/src/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libX11-devel, xorg-x11-proto-devel
 
 %description
 GXemul is an experimental instruction-level machine emulator. It can be
@@ -20,7 +21,7 @@
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure
+CFLAGS="$RPM_OPT_FLAGS" ./configure --enable-all
 make %{?_smp_mflags}
 
 %install
@@ -40,5 +41,9 @@
 %{_mandir}/man1/gxemul.*
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.7-1
+- bump to 0.3.7
+- enable all the cpu types by default (MIPS, ARM, PPC are primary)
+
 * Thu Jul 28 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.3.4-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gxemul/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jul 2005 16:51:26 -0000	1.2
+++ sources	9 Jan 2006 19:15:09 -0000	1.3
@@ -1 +1 @@
-dbf7ef59d2bb8f1e3082d0fa5fb434af  gxemul-0.3.4.tar.gz
+48301bcba8ee51c0f6bcf462277668c5  gxemul-0.3.7.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 19:26:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:26:13 -0500
Subject: rpms/R/FC-3 R.spec,1.12,1.13
Message-ID: <200601091926.k09JQl77010810@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763/FC-3

Modified Files:
	R.spec 
Log Message:

fix BR: XFree86-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- R.spec	31 Dec 2005 21:29:40 -0000	1.12
+++ R.spec	9 Jan 2006 19:26:12 -0000	1.13
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-3
+- fix BR: XFree86-devel for FC-5
+
 * Sat Dec 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-2
 - missing BR: libXt-devel for FC-5
 



From fedora-extras-commits at redhat.com  Mon Jan  9 19:26:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:26:25 -0500
Subject: rpms/R/FC-4 R.spec,1.11,1.12
Message-ID: <200601091926.k09JQwHV010813@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763/FC-4

Modified Files:
	R.spec 
Log Message:

fix BR: XFree86-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- R.spec	31 Dec 2005 21:29:46 -0000	1.11
+++ R.spec	9 Jan 2006 19:26:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-3
+- fix BR: XFree86-devel for FC-5
+
 * Sat Dec 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-2
 - missing BR: libXt-devel for FC-5
 



From fedora-extras-commits at redhat.com  Mon Jan  9 19:26:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 14:26:31 -0500
Subject: rpms/R/devel R.spec,1.11,1.12
Message-ID: <200601091927.k09JR4dn010816@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10763/devel

Modified Files:
	R.spec 
Log Message:

fix BR: XFree86-devel for FC-5



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- R.spec	31 Dec 2005 21:29:52 -0000	1.11
+++ R.spec	9 Jan 2006 19:26:31 -0000	1.12
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -70,7 +70,7 @@
 # You need all the BuildRequires for the development version
 Requires: gcc-c++, gcc-gfortran, tetex-latex, texinfo 
 Requires: libpng-devel, libjpeg-devel, readline-devel, libtermcap-devel
-Requires: XFree86-devel
+Requires: libSM-devel, libX11-devel, libICE-devel, libXt-devel
 Requires: tcl-devel, tk-devel
 
 %description devel
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-3
+- fix BR: XFree86-devel for FC-5
+
 * Sat Dec 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.1-2
 - missing BR: libXt-devel for FC-5
 



From fedora-extras-commits at redhat.com  Mon Jan  9 20:51:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 15:51:25 -0500
Subject: rpms/scalapack/FC-3 scalapack.spec,1.7,1.8
Message-ID: <200601092051.k09KpvnP012862@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-3

Modified Files:
	scalapack.spec 
Log Message:

Fix BR.



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- scalapack.spec	19 Dec 2005 23:49:05 -0000	1.7
+++ scalapack.spec	9 Jan 2006 20:51:25 -0000	1.8
@@ -1,12 +1,12 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack, blas, lam, blacs
+BuildRequires: lapack, blas, lam, blacs-devel
 BuildRequires: gcc-g77
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
+- fix BR
+
 * Mon Dec 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-8
 - rebuild for gcc4.1
 



From fedora-extras-commits at redhat.com  Mon Jan  9 20:51:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 15:51:31 -0500
Subject: rpms/scalapack/FC-4 scalapack.spec,1.9,1.10
Message-ID: <200601092052.k09Kq3s9012865@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-4

Modified Files:
	scalapack.spec 
Log Message:

Fix BR.



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scalapack.spec	19 Dec 2005 23:49:11 -0000	1.9
+++ scalapack.spec	9 Jan 2006 20:51:30 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack, blas, lam, blacs
+BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
 BuildRequires: gcc-gfortran
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
+- fix BR
+
 * Mon Dec 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-8
 - rebuild for gcc4.1
 



From fedora-extras-commits at redhat.com  Mon Jan  9 20:51:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 15:51:37 -0500
Subject: rpms/scalapack/devel scalapack.spec,1.9,1.10
Message-ID: <200601092052.k09Kq9FJ012868@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/scalapack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/devel

Modified Files:
	scalapack.spec 
Log Message:

Fix BR.



Index: scalapack.spec
===================================================================
RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scalapack.spec	19 Dec 2005 23:49:16 -0000	1.9
+++ scalapack.spec	9 Jan 2006 20:51:36 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers
 Name: scalapack
 Version: 1.7
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/scalapack/scalapack_home.html
 Source0: http://www.netlib.org/scalapack/scalapack.tgz
-BuildRequires: lapack, blas, lam, blacs
+BuildRequires: lapack-devel, blas-devel, lam, blacs-devel
 BuildRequires: gcc-gfortran
 Requires: lapack, blas, lam, blacs
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -72,6 +72,9 @@
 %{_libdir}/libscalapack.a
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-9
+- fix BR
+
 * Mon Dec 19 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.7-8
 - rebuild for gcc4.1
 



From fedora-extras-commits at redhat.com  Mon Jan  9 21:12:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 16:12:02 -0500
Subject: rpms/perl-Class-DBI-mysql/FC-3 perl-Class-DBI-mysql.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601092112.k09LCYJo014780@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14697/FC-3

Modified Files:
	perl-Class-DBI-mysql.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-3/perl-Class-DBI-mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-mysql.spec	7 Sep 2005 18:30:08 -0000	1.1
+++ perl-Class-DBI-mysql.spec	9 Jan 2006 21:12:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-mysql
-Version:        0.23
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Extensions to Class::DBI for MySQL
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Fri Sep  2 2005 Paul Howarth <paul at city-fan.org> 0.23-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:30:08 -0000	1.2
+++ sources	9 Jan 2006 21:12:01 -0000	1.3
@@ -1 +1 @@
-6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz
+3bee2423ba61348a54201f4aca25e79b  Class-DBI-mysql-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 21:12:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 16:12:08 -0500
Subject: rpms/perl-Class-DBI-mysql/FC-4 perl-Class-DBI-mysql.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601092112.k09LCeWO014784@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14697/FC-4

Modified Files:
	perl-Class-DBI-mysql.spec sources 
Log Message:

Bump to 1.00



Index: perl-Class-DBI-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-4/perl-Class-DBI-mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-mysql.spec	7 Sep 2005 18:30:08 -0000	1.1
+++ perl-Class-DBI-mysql.spec	9 Jan 2006 21:12:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-mysql
-Version:        0.23
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Extensions to Class::DBI for MySQL
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Fri Sep  2 2005 Paul Howarth <paul at city-fan.org> 0.23-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:30:08 -0000	1.2
+++ sources	9 Jan 2006 21:12:08 -0000	1.3
@@ -1 +1 @@
-6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz
+3bee2423ba61348a54201f4aca25e79b  Class-DBI-mysql-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 21:12:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 16:12:14 -0500
Subject: rpms/perl-Class-DBI-mysql/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-mysql.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092112.k09LCkYl014789@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-mysql/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14697/devel

Modified Files:
	.cvsignore perl-Class-DBI-mysql.spec sources 
Log Message:

Bump to 1.00



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Sep 2005 18:30:08 -0000	1.2
+++ .cvsignore	9 Jan 2006 21:12:14 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-mysql-0.23.tar.gz
+Class-DBI-mysql-1.00.tar.gz


Index: perl-Class-DBI-mysql.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/perl-Class-DBI-mysql.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-mysql.spec	7 Sep 2005 18:30:08 -0000	1.1
+++ perl-Class-DBI-mysql.spec	9 Jan 2006 21:12:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-mysql
-Version:        0.23
-Release:        3%{?dist}
+Version:        1.00
+Release:        1%{?dist}
 Summary:        Extensions to Class::DBI for MySQL
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.00-1
+- bump to 1.00
+
 * Fri Sep  2 2005 Paul Howarth <paul at city-fan.org> 0.23-3
 - remove redundant BR: perl
 - honor %%{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-mysql/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Sep 2005 18:30:08 -0000	1.2
+++ sources	9 Jan 2006 21:12:14 -0000	1.3
@@ -1 +1 @@
-6e7c969b87643af08e46053bd538308c  Class-DBI-mysql-0.23.tar.gz
+3bee2423ba61348a54201f4aca25e79b  Class-DBI-mysql-1.00.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 22:51:30 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Mon,  9 Jan 2006 17:51:30 -0500
Subject: rpms/gnome-applet-netspeed/devel gnome-applet-netspeed.spec, 1.6,
	1.7
Message-ID: <200601092252.k09Mq2r8016945@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/gnome-applet-netspeed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16924

Modified Files:
	gnome-applet-netspeed.spec 
Log Message:
Proper soname rebuild



Index: gnome-applet-netspeed.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applet-netspeed/devel/gnome-applet-netspeed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-applet-netspeed.spec	9 Jan 2006 08:22:17 -0000	1.6
+++ gnome-applet-netspeed.spec	9 Jan 2006 22:51:29 -0000	1.7
@@ -1,6 +1,6 @@
 Name: gnome-applet-netspeed    
 Version: 0.13
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: GNOME applet that shows traffic on a network device
 
 Group: Applications/Internet
@@ -53,6 +53,9 @@
 %{_datadir}/omf/netspeed_applet/
 
 %changelog
+* Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-4
+-Proper soname rebuild
+
 * Mon Jan 09 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 0.13-3
 - Rebuild for libgtop soname change
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:00:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:00:28 -0500
Subject: rpms/pychart/FC-3 pychart-1.39-mkhowto.patch, NONE, 1.1 pychart.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092301.k09N10AJ017254@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17011/FC-3

Modified Files:
	pychart.spec sources 
Added Files:
	pychart-1.39-mkhowto.patch 
Log Message:

Bump to 1.39.


pychart-1.39-mkhowto.patch:

--- NEW FILE pychart-1.39-mkhowto.patch ---
--- PyChart/doc/Makefile.BAD	2006-01-09 16:16:34.000000000 -0600
+++ PyChart/doc/Makefile	2006-01-09 16:17:00.000000000 -0600
@@ -1,5 +1,5 @@
 PYCHART_DIR=..
-PYTHON_DOC_DIR=$(HOME)/Python-2.4.2/Doc
+PYTHON_DOC_DIR=$(PYCHART_DIR)/Doc
 all: pychart examples
 
 pychart: pychart.tex


Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/pychart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pychart.spec	22 Sep 2005 18:15:41 -0000	1.1
+++ pychart.spec	9 Jan 2006 23:00:27 -0000	1.2
@@ -1,16 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pychart
-Version:	1.38
-Release:	2%{?dist}
+Version:	1.39
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
 URL:		http://home.gna.org/pychart/
-Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+# This is the good upstream source. Unfortunately, we need to remove the dot to make latex2html happy.
+# Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+Source0:	PyChart-1_39.tar.gz
+# Fedora Core Python doesn't include the Doc/* directory in any binary package, so we can't build without
+# it as an addon source tarball. This is BZ #177350
+Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ghostscript-devel
 BuildArch:	noarch
+Patch0:		pychart-1.39-mkhowto.patch
 
 %description
 PyChart is a Python library for creating high quality Encapsulated Postscript,
@@ -33,11 +39,14 @@
 that tell you how to program with the pychart library.
 
 %prep
-%setup -q -n PyChart-%{version}
+%setup -q -n PyChart-1_39 -T -b 0 -a 1
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-cd doc/
+cd demos/
+make colorps colorpdf colorpng
+cd ../doc
 make
 
 %install
@@ -57,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
+- bump to 1.39
+
 * Mon Sep 19 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.38-2
 - Create a doc subpackage with the developers documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 18:15:41 -0000	1.2
+++ sources	9 Jan 2006 23:00:27 -0000	1.3
@@ -1 +1,2 @@
-30b41cb4e0cd4957a8e54b0a58ee48a2  PyChart-1.38.tar.gz
+6e5aa0836a3ccfb2c558072e067fd5a6  PyChart-1_39.tar.gz
+d5db2c4d2c0af6c3fc84ce013954ce4c  python-2.4.2-Doc.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:00:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:00:33 -0500
Subject: rpms/pychart/FC-4 pychart-1.39-mkhowto.patch, NONE, 1.1 pychart.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092301.k09N16fB018463@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17011/FC-4

Modified Files:
	pychart.spec sources 
Added Files:
	pychart-1.39-mkhowto.patch 
Log Message:

Bump to 1.39.


pychart-1.39-mkhowto.patch:

--- NEW FILE pychart-1.39-mkhowto.patch ---
--- PyChart/doc/Makefile.BAD	2006-01-09 16:16:34.000000000 -0600
+++ PyChart/doc/Makefile	2006-01-09 16:17:00.000000000 -0600
@@ -1,5 +1,5 @@
 PYCHART_DIR=..
-PYTHON_DOC_DIR=$(HOME)/Python-2.4.2/Doc
+PYTHON_DOC_DIR=$(PYCHART_DIR)/Doc
 all: pychart examples
 
 pychart: pychart.tex


Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/pychart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pychart.spec	22 Sep 2005 18:15:41 -0000	1.1
+++ pychart.spec	9 Jan 2006 23:00:33 -0000	1.2
@@ -1,16 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pychart
-Version:	1.38
-Release:	2%{?dist}
+Version:	1.39
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
 URL:		http://home.gna.org/pychart/
-Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+# This is the good upstream source. Unfortunately, we need to remove the dot to make latex2html happy.
+# Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+Source0:	PyChart-1_39.tar.gz
+# Fedora Core Python doesn't include the Doc/* directory in any binary package, so we can't build without
+# it as an addon source tarball. This is BZ #177350
+Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ghostscript-devel
 BuildArch:	noarch
+Patch0:		pychart-1.39-mkhowto.patch
 
 %description
 PyChart is a Python library for creating high quality Encapsulated Postscript,
@@ -33,11 +39,14 @@
 that tell you how to program with the pychart library.
 
 %prep
-%setup -q -n PyChart-%{version}
+%setup -q -n PyChart-1_39 -T -b 0 -a 1
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-cd doc/
+cd demos/
+make colorps colorpdf colorpng
+cd ../doc
 make
 
 %install
@@ -57,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
+- bump to 1.39
+
 * Mon Sep 19 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.38-2
 - Create a doc subpackage with the developers documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 18:15:41 -0000	1.2
+++ sources	9 Jan 2006 23:00:33 -0000	1.3
@@ -1 +1,2 @@
-30b41cb4e0cd4957a8e54b0a58ee48a2  PyChart-1.38.tar.gz
+6e5aa0836a3ccfb2c558072e067fd5a6  PyChart-1_39.tar.gz
+d5db2c4d2c0af6c3fc84ce013954ce4c  python-2.4.2-Doc.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:00:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:00:39 -0500
Subject: rpms/pychart/devel pychart-1.39-mkhowto.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 pychart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092301.k09N1CjD018467@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17011/devel

Modified Files:
	.cvsignore pychart.spec sources 
Added Files:
	pychart-1.39-mkhowto.patch 
Log Message:

Bump to 1.39.


pychart-1.39-mkhowto.patch:

--- NEW FILE pychart-1.39-mkhowto.patch ---
--- PyChart/doc/Makefile.BAD	2006-01-09 16:16:34.000000000 -0600
+++ PyChart/doc/Makefile	2006-01-09 16:17:00.000000000 -0600
@@ -1,5 +1,5 @@
 PYCHART_DIR=..
-PYTHON_DOC_DIR=$(HOME)/Python-2.4.2/Doc
+PYTHON_DOC_DIR=$(PYCHART_DIR)/Doc
 all: pychart examples
 
 pychart: pychart.tex


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Sep 2005 18:15:41 -0000	1.2
+++ .cvsignore	9 Jan 2006 23:00:39 -0000	1.3
@@ -1 +1,3 @@
 PyChart-1.38.tar.gz
+PyChart-1_39.tar.gz
+python-2.4.2-Doc.tar.gz


Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/pychart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pychart.spec	22 Sep 2005 18:15:41 -0000	1.1
+++ pychart.spec	9 Jan 2006 23:00:39 -0000	1.2
@@ -1,16 +1,22 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		pychart
-Version:	1.38
-Release:	2%{?dist}
+Version:	1.39
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
 URL:		http://home.gna.org/pychart/
-Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+# This is the good upstream source. Unfortunately, we need to remove the dot to make latex2html happy.
+# Source0:	http://download.gna.org/pychart/PyChart-%{version}.tar.gz
+Source0:	PyChart-1_39.tar.gz
+# Fedora Core Python doesn't include the Doc/* directory in any binary package, so we can't build without
+# it as an addon source tarball. This is BZ #177350
+Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ghostscript-devel
 BuildArch:	noarch
+Patch0:		pychart-1.39-mkhowto.patch
 
 %description
 PyChart is a Python library for creating high quality Encapsulated Postscript,
@@ -33,11 +39,14 @@
 that tell you how to program with the pychart library.
 
 %prep
-%setup -q -n PyChart-%{version}
+%setup -q -n PyChart-1_39 -T -b 0 -a 1
+%patch0 -p1
 
 %build
 %{__python} setup.py build
-cd doc/
+cd demos/
+make colorps colorpdf colorpng
+cd ../doc
 make
 
 %install
@@ -57,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
+- bump to 1.39
+
 * Mon Sep 19 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.38-2
 - Create a doc subpackage with the developers documentation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Sep 2005 18:15:41 -0000	1.2
+++ sources	9 Jan 2006 23:00:39 -0000	1.3
@@ -1 +1,2 @@
-30b41cb4e0cd4957a8e54b0a58ee48a2  PyChart-1.38.tar.gz
+6e5aa0836a3ccfb2c558072e067fd5a6  PyChart-1_39.tar.gz
+d5db2c4d2c0af6c3fc84ce013954ce4c  python-2.4.2-Doc.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:08:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:08:34 -0500
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-3
	perl-Class-DBI-Loader-Relationship.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092309.k09N9eno018913@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/FC-3

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec sources 
Log Message:

Bump to 1.3



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader-Relationship.spec	14 Sep 2005 18:30:34 -0000	1.1
+++ perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader-Relationship
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        Distributable
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
+- bump to 1.3
+
 * Wed Sep 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-4
 - set license to Distributable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:30:34 -0000	1.2
+++ sources	9 Jan 2006 23:08:17 -0000	1.3
@@ -1 +1 @@
-d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz
+2eef3eb51e740067f3aceddac31b0190  Class-DBI-Loader-Relationship-1.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:08:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:08:42 -0500
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-4
	perl-Class-DBI-Loader-Relationship.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601092309.k09N9iHb018915@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/FC-4

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec sources 
Log Message:

Bump to 1.3



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader-Relationship.spec	14 Sep 2005 18:30:34 -0000	1.1
+++ perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader-Relationship
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        Distributable
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
+- bump to 1.3
+
 * Wed Sep 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-4
 - set license to Distributable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:30:34 -0000	1.2
+++ sources	9 Jan 2006 23:08:41 -0000	1.3
@@ -1 +1 @@
-d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz
+2eef3eb51e740067f3aceddac31b0190  Class-DBI-Loader-Relationship-1.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:09:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:09:12 -0500
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Loader-Relationship.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601092309.k09N9mYa018918@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18846/devel

Modified Files:
	.cvsignore perl-Class-DBI-Loader-Relationship.spec sources 
Log Message:

Bump to 1.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2005 18:30:34 -0000	1.2
+++ .cvsignore	9 Jan 2006 23:09:12 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Loader-Relationship-1.2.tar.gz
+Class-DBI-Loader-Relationship-1.3.tar.gz


Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader-Relationship.spec	14 Sep 2005 18:30:34 -0000	1.1
+++ perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:09:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader-Relationship
-Version:        1.2
-Release:        4%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
 License:        Distributable
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
+- bump to 1.3
+
 * Wed Sep 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2-4
 - set license to Distributable
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:30:34 -0000	1.2
+++ sources	9 Jan 2006 23:09:12 -0000	1.3
@@ -1 +1 @@
-d5a3262146ee4c63a46a5c87205c5619  Class-DBI-Loader-Relationship-1.2.tar.gz
+2eef3eb51e740067f3aceddac31b0190  Class-DBI-Loader-Relationship-1.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan  9 23:10:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:10:45 -0500
Subject: rpms/pychart/FC-3 pychart.spec,1.2,1.3
Message-ID: <200601092311.k09NBpjA019087@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18957/FC-3

Modified Files:
	pychart.spec 
Log Message:

Fix missing BR



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/pychart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pychart.spec	9 Jan 2006 23:00:27 -0000	1.2
+++ pychart.spec	9 Jan 2006 23:10:45 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel
+BuildRequires:	ghostscript-devel, tetex-latex, latex2html
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
+- BR: tetex-latex, latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
 - bump to 1.39
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:11:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:11:30 -0500
Subject: rpms/pychart/devel pychart.spec,1.2,1.3
Message-ID: <200601092312.k09NC3IM019103@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18957/devel

Modified Files:
	pychart.spec 
Log Message:

Fix missing BR



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/pychart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pychart.spec	9 Jan 2006 23:00:39 -0000	1.2
+++ pychart.spec	9 Jan 2006 23:11:13 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel
+BuildRequires:	ghostscript-devel, tetex-latex, latex2html
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
+- BR: tetex-latex, latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
 - bump to 1.39
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:10:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  9 Jan 2006 18:10:53 -0500
Subject: rpms/pychart/FC-4 pychart.spec,1.2,1.3
Message-ID: <200601092312.k09NC0Bb019097@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18957/FC-4

Modified Files:
	pychart.spec 
Log Message:

Fix missing BR



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/pychart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pychart.spec	9 Jan 2006 23:00:33 -0000	1.2
+++ pychart.spec	9 Jan 2006 23:10:53 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel
+BuildRequires:	ghostscript-devel, tetex-latex, latex2html
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
+- BR: tetex-latex, latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-1
 - bump to 1.39
 



From fedora-extras-commits at redhat.com  Mon Jan  9 23:26:41 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  9 Jan 2006 18:26:41 -0500
Subject: rpms/clamav/FC-3 clamav.spec,1.19,1.20 sources,1.11,1.12
Message-ID: <200601092327.k09NRDlb019448@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19411/FC-3

Modified Files:
	clamav.spec sources 
Log Message:
- updated to 0.88
- added pseudo-versions for the 'init(...)' provides as a first step
  for the support of alternative initmethods



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- clamav.spec	4 Nov 2005 12:55:19 -0000	1.19
+++ clamav.spec	9 Jan 2006 23:26:40 -0000	1.20
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.87.1
+Version:	0.88
 Release:	%release_func 1
 
 License:	GPL
@@ -84,7 +84,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
-Provides:	init(clamav-server)
+Provides:	init(clamav-server) = sysv
 Requires:	data(clamav)
 Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
@@ -96,7 +96,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-milter)
-Provides:	init(clamav-milter)
+Provides:	init(clamav-milter) = sysv
 %{!?_without_milter:BuildRequires:	sendmail-devel}
 Requires:		sendmail
 Requires(pre):		%_initrddir
@@ -426,6 +426,11 @@
 %endif	# _without_milter
 
 %changelog
+* Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
+- updated to 0.88
+- added pseudo-versions for the 'init(...)' provides as a first step
+  for the support of alternative initmethods
+
 * Fri Nov  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-1
 - updated to 0.87.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	4 Nov 2005 12:55:19 -0000	1.11
+++ sources	9 Jan 2006 23:26:40 -0000	1.12
@@ -1,2 +1,2 @@
-bf9f038edf0b6d5f76552e1b8d014b81  clamav-0.87.1.tar.gz
-4685754c9888f14dfa0bd879002566b3  clamav-0.87.1.tar.gz.sig
+5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
+12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jan  9 23:26:47 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  9 Jan 2006 18:26:47 -0500
Subject: rpms/clamav/FC-4 clamav.spec,1.29,1.30 sources,1.13,1.14
Message-ID: <200601092327.k09NRJs3019452@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19411/FC-4

Modified Files:
	clamav.spec sources 
Log Message:
- updated to 0.88
- added pseudo-versions for the 'init(...)' provides as a first step
  for the support of alternative initmethods



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- clamav.spec	4 Nov 2005 12:46:23 -0000	1.29
+++ clamav.spec	9 Jan 2006 23:26:46 -0000	1.30
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.87.1
+Version:	0.88
 Release:	%release_func 1
 
 License:	GPL
@@ -84,7 +84,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
-Provides:	init(clamav-server)
+Provides:	init(clamav-server) = sysv
 Requires:	data(clamav)
 Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
@@ -96,7 +96,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-milter)
-Provides:	init(clamav-milter)
+Provides:	init(clamav-milter) = sysv
 %{!?_without_milter:BuildRequires:	sendmail-devel}
 Requires:		sendmail
 Requires(pre):		%_initrddir
@@ -426,6 +426,11 @@
 %endif	# _without_milter
 
 %changelog
+* Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
+- updated to 0.88
+- added pseudo-versions for the 'init(...)' provides as a first step
+  for the support of alternative initmethods
+
 * Fri Nov  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-1
 - updated to 0.87.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Nov 2005 12:46:23 -0000	1.13
+++ sources	9 Jan 2006 23:26:46 -0000	1.14
@@ -1,2 +1,2 @@
-bf9f038edf0b6d5f76552e1b8d014b81  clamav-0.87.1.tar.gz
-4685754c9888f14dfa0bd879002566b3  clamav-0.87.1.tar.gz.sig
+5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
+12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig



From fedora-extras-commits at redhat.com  Mon Jan  9 23:27:47 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon,  9 Jan 2006 18:27:47 -0500
Subject: rpms/clamav/devel clamav.spec,1.30,1.31 sources,1.13,1.14
Message-ID: <200601092328.k09NSJZE019479@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19458/devel

Modified Files:
	clamav.spec sources 
Log Message:
- updated to 0.88
- added pseudo-versions for the 'init(...)' provides as a first step
  for the support of alternative initmethods
- moved 'freshclam.conf.5' man page into the -update subpackage (#173221)
- ship 'clamd.conf.5' man page in the -server subpackage *too*. The
  same file is contained in multiple packages now, but this man-page
  can not be removed from the base package because it also applies to
  'clamdscan' there (#173221).



Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- clamav.spec	4 Nov 2005 12:55:25 -0000	1.30
+++ clamav.spec	9 Jan 2006 23:27:46 -0000	1.31
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.87.1
+Version:	0.88
 Release:	%release_func 1
 
 License:	GPL
@@ -84,7 +84,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-server)
-Provides:	init(clamav-server)
+Provides:	init(clamav-server) = sysv
 Requires:	data(clamav)
 Requires:	clamav-lib = %{version}-%{release}
 Requires(pre):		%_initrddir
@@ -96,7 +96,7 @@
 ## For now, use this as a placeholder. Later, generate separate -sysv
 ## and -minit subpackages
 Requires:	init(clamav-milter)
-Provides:	init(clamav-milter)
+Provides:	init(clamav-milter) = sysv
 %{!?_without_milter:BuildRequires:	sendmail-devel}
 Requires:		sendmail
 Requires(pre):		%_initrddir
@@ -348,7 +348,7 @@
 %{_bindir}/*
 %exclude %_bindir/clamav-config
 %exclude %_bindir/freshclam
-%exclude %_mandir/man1/freshclam*
+%exclude %_mandir/*/freshclam*
 
 ## -----------------------
 
@@ -384,7 +384,7 @@
 %files update
 %defattr(-,root,root,-)
 %_bindir/freshclam
-%_mandir/man1/freshclam*
+%_mandir/*/freshclam*
 %pkgdatadir/freshclam-sleep
 %config(noreplace) %verify(not mtime)    %_sysconfdir/freshclam.conf
 %config(noreplace) %verify(not mtime)    %_sysconfdir/logrotate.d/*
@@ -398,7 +398,7 @@
 %files server
 %defattr(-,root,root,-)
 %doc _doc_server/*
-%doc %{_mandir}/man8/*
+%doc %_mandir/*/clamd*
 %{_sbindir}/*
 %_initrddir/clamd-wrapper
 %dir %pkgdatadir
@@ -426,6 +426,18 @@
 %endif	# _without_milter
 
 %changelog
+* Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
+- updated to 0.88
+- added pseudo-versions for the 'init(...)' provides as a first step
+  for the support of alternative initmethods
+
+* Tue Nov 15 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-2
+- moved 'freshclam.conf.5' man page into the -update subpackage (#173221)
+- ship 'clamd.conf.5' man page in the -server subpackage *too*. The
+  same file is contained in multiple packages now, but this man-page
+  can not be removed from the base package because it also applies to
+  'clamdscan' there (#173221).
+
 * Fri Nov  4 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.87.1-1
 - updated to 0.87.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	4 Nov 2005 12:55:25 -0000	1.13
+++ sources	9 Jan 2006 23:27:46 -0000	1.14
@@ -1,2 +1,2 @@
-bf9f038edf0b6d5f76552e1b8d014b81  clamav-0.87.1.tar.gz
-4685754c9888f14dfa0bd879002566b3  clamav-0.87.1.tar.gz.sig
+5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
+12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig



From fedora-extras-commits at redhat.com  Tue Jan 10 00:00:32 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  9 Jan 2006 19:00:32 -0500
Subject: rpms/moodle/FC-4 moodle-1.5.3-SA18267.patch, NONE, 1.1 moodle.spec, 
	1.2, 1.3
Message-ID: <200601100001.k0A014dH021305@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19761/FC-4

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.5.3-SA18267.patch 
Log Message:
Add security patch for adodb (SA18267)

moodle-1.5.3-SA18267.patch:

--- NEW FILE moodle-1.5.3-SA18267.patch ---
diff -urN moodle/lib/adodb/server.php moodle.adodb/lib/adodb/server.php
--- moodle/lib/adodb/server.php	2005-11-10 21:05:24.000000000 -0500
+++ moodle.adodb/lib/adodb/server.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,98 +1,10 @@
 <?php
 
-/** 
- * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- */
- 
-/* Documentation on usage is at http://php.weblogs.com/adodb_csv
- *
- * Legal query string parameters:
- * 
- * sql = holds sql string
- * nrows = number of rows to return 
- * offset = skip offset rows of data
- * fetch = $ADODB_FETCH_MODE
- * 
- * example:
- *
- * http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
- */
+require_once('../../config.php');
+require_once('../weblib.php');
 
-
-/* 
- * Define the IP address you want to accept requests from 
- * as a security measure. If blank we accept anyone promisciously!
- */
-$ACCEPTIP = '';
-
-/*
- * Connection parameters
- */
-$driver = 'mysql';
-$host = 'localhost'; // DSN for odbc
-$uid = 'root';
-$pwd = '';
-$database = 'test';
-
-/*============================ DO NOT MODIFY BELOW HERE =================================*/
-// $sep must match csv2rs() in adodb.inc.php
-$sep = ' :::: ';
-
-include('./adodb.inc.php');
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-
-function err($s)
-{
-	die('**** '.$s.' ');
-}
-
-// undo stupid magic quotes
-function undomq(&$m) 
-{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-		
-	}
-	return $m;
-}
-
-///////////////////////////////////////// DEFINITIONS
-
-
-$remote = $_SERVER["REMOTE_ADDR"]; 
- 
-if (empty($_REQUEST['sql'])) err('No SQL');
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
- 	err("Unauthorised client: '$remote'");
-
-
-$conn = &ADONewConnection($driver);
-
-if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($_REQUEST['sql']);
-
-if (isset($_REQUEST['fetch']))
-	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
-	
-if (isset($_REQUEST['nrows'])) {
-	$nrows = $_REQUEST['nrows'];
-	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
-	//$rs->timeToLive = 1;
-	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
-} else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/server.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/adodb/server.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/server.php');
 
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/benchmark.php moodle.adodb/lib/adodb/tests/benchmark.php
--- moodle/lib/adodb/tests/benchmark.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/benchmark.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>ADODB Benchmarks</title>
-</head> 
-
-<body>
-<?php 
-/*
-V4.66 28 Sept 2005  (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Benchmark code to test the speed to the ADODB library with different databases.
-  This is a simplistic benchmark to be used as the basis for further testing.
-  It should not be used as proof of the superiority of one database over the other.
-*/ 
- 
-$testmssql = true;
-//$testvfp = true;
-$testoracle = true;
-$testado = true; 
-$testibase = true;
-$testaccess = true;
-$testmysql = true;
-$testsqlite = true;;
-
-set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_version,$ADODB_FETCH_MODE;
-
-	adodb_backtrace();
-	
-	$max = 100;
-	$sql = 'select * from ADOXYZ';
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	//print "<h3>ADODB Version: $ADODB_version Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i></h3>";
-	
-	// perform query once to cache results so we are only testing throughput 
-	$rs = $db->Execute($sql);
-	if (!$rs){
-		print "Error in recordset<p>";
-		return;
-	}	
-	$arr = $rs->GetArray();
-	//$db->debug = true;
-	global $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	$start = microtime();
-	for ($i=0; $i < $max; $i++) {
-		$rs =& $db->Execute($sql);	
-		$arr =& $rs->GetArray();
-	   //		 print $arr[0][1];
-	}
-	$end =  microtime();
-	$start = explode(' ',$start);
-	$end = explode(' ',$end);
-	
-	//print_r($start);
-	//print_r($end);
-	
-	  //  print_r($arr);
-	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
-	printf ("<p>seconds = %8.2f for %d iterations each with %d records</p>",$total,$max, sizeof($arr));
-	flush();
-
-
-		//$db->Close();
-}
-include("testdatabases.inc.php");
-
-?>
-
-
-</body>
-</html>
diff -urN moodle/lib/adodb/tests/client.php moodle.adodb/lib/adodb/tests/client.php
--- moodle/lib/adodb/tests/client.php	2004-07-12 23:13:35.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/client.php	1969-12-31 19:00:00.000000000 -0500
[...3782 lines suppressed...]
-			print "<p>Random session destroy</p>";
-			session_destroy();
-		}
-	}
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/test-xmlschema.php moodle.adodb/lib/adodb/tests/test-xmlschema.php
--- moodle/lib/adodb/tests/test-xmlschema.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/test-xmlschema.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,54 +0,0 @@
-<?PHP
-
-// V4.50 6 July 2004
-
-error_reporting(E_ALL);
-include_once( "../adodb.inc.php" );
-include_once( "../adodb-xmlschema.inc.php" );
-
-// To build the schema, start by creating a normal ADOdb connection:
-$db = ADONewConnection( 'mysql' );
-$db->Connect( 'localhost', 'root', '', 'schematest' );
-
-// To create a schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// To upgrade an existing schema object, use the following 
-// To upgrade an existing database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-print "<b>SQL to build xmlschema.xml</b>:\n<pre>";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
-
-
-
-print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-$db2->debug=1;
-
-foreach ($sql as $s)
-$db2->Execute($s);
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/time.php moodle.adodb/lib/adodb/tests/time.php
--- moodle/lib/adodb/tests/time.php	2003-10-22 04:52:42.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/time.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,17 +0,0 @@
-<?php
-
-include_once('../adodb-time.inc.php');
-//adodb_date_test();
-?>
-<?php 
-//require("adodb-time.inc.php"); 
-
-$datestring = "1963-12-04"; // string normally from mySQL 
-$stringArray = explode("-", $datestring);
-$date = adodb_mktime(0,0,0,$stringArray[1],$stringArray[2],$stringArray[0]); 
-
-$convertedDate = date("d-M-Y", $date); // converted string to UK style date
-
-echo( "Birthday: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
-
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/tmssql.php moodle.adodb/lib/adodb/tests/tmssql.php
--- moodle/lib/adodb/tests/tmssql.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/tmssql.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,65 +1,10 @@
 <?php
-error_reporting(E_ALL);
-ini_set('mssql.datetimeconvert',0); 
 
-function tmssql()
-{
-	print "<h3>mssql</h3>";
-	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
-	mssql_select_db('northwind',$db);
-	
-	$rs = mssql_query('select getdate() as date',$db);
-	$o = mssql_fetch_row($rs);
-	print_r($o);
-	mssql_free_result($rs);
-	
-	print "<p>Delete</p>"; flush();
-	$rs2 = mssql_query('delete from adoxyz',$db);
-	$p = mssql_num_rows($rs2);
-	mssql_free_result($rs2);
+require_once('../../../config.php');
+require_once('../../weblib.php');
 
-}
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/tests/tmssql.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/tests/tmssql.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/tests/tmssql.php');
 
-function tpear()
-{
-include_once('DB.php');
-
-	print "<h3>PEAR</h3>";
-	$username = 'adodb';
-	$password = 'natsoft';
-	$hostname = 'JAGUAR\vsdotnet';
-	$databasename = 'northwind';
-	
-	$dsn = "mssql://$username:$password@$hostname/$databasename";
-	$conn = &DB::connect($dsn);
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	@$conn->query('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->query('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-
-function tadodb()
-{
-include_once('../adodb.inc.php');
-
-	print "<h3>ADOdb</h3>";
-	$conn = NewADOConnection('mssql');
-	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-//	$conn->debug=1;
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	$conn->Execute('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->Execute('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-?>
-<a href=tmssql.php?do=tmssql>mssql</a>
-<a href=tmssql.php?do=tpear>pear</a>
-<a href=tmssql.php?do=tadodb>adodb</a>
-<?php
-if (!empty($_GET['do'])) {
-	$do = $_GET['do'];
-	$do();
-}
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/xmlschema.xml moodle.adodb/lib/adodb/tests/xmlschema.xml
--- moodle/lib/adodb/tests/xmlschema.xml	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/xmlschema.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.2">
-  <table name="mytable">
-    <field name="row1" type="I">
-      <descr>An integer row that's a primary key and autoincrements</descr>
-      <KEY/>
-      <AUTOINCREMENT/>
-    </field>
-    <field name="row2" type="C" size="16">
-      <descr>A 16 character varchar row that can't be null</descr>
-      <NOTNULL/>
-    </field>
-    <index name="myindex">
-      <col>row1</col>
-      <col>row2</col>
-    </index>
-  </table>
-  <sql>
-    <descr>SQL to be executed only on specific platforms</descr>
-    <query platform="postgres|postgres7">
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    </query>
-    <query platform="mysql">
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    </query>
-	<query platform="mssql">
-      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
-    </query>
-  </sql>
-  <table name="obsoletetable">
-    <DROP/>
-  </table>
-</schema>
\ No newline at end of file


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/FC-4/moodle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- moodle.spec	12 Dec 2005 21:05:20 -0000	1.2
+++ moodle.spec	10 Jan 2006 00:00:32 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -24,6 +24,7 @@
 Source6:        moodle-README-rpm
 Patch0:         moodle-1.5.2-mimetex-linux.patch
 Patch1:         moodle-1.5.2-mimetex-fedora.patch
+Patch2:         moodle-1.5.3-SA18267.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -628,6 +629,7 @@
 %setup -q -n %{name}
 %patch0 -p1 -b .mimetex-linux
 %patch1 -p1 -b .mimetex-fedora
+%patch2 -p1 -b .SA18267
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
@@ -692,6 +694,9 @@
 %endif
 
 %changelog
+* Mon Jan  9 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-2
+- Add security patch for adodb (SA18267)
+
 * Sat Dec 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-1
 - Update to 1.5.3
 - Split off spell check package due to lack of Text::Aspell



From fedora-extras-commits at redhat.com  Tue Jan 10 00:00:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon,  9 Jan 2006 19:00:38 -0500
Subject: rpms/moodle/devel moodle-1.5.3-SA18267.patch, NONE, 1.1 moodle.spec,
	1.2, 1.3
Message-ID: <200601100001.k0A01AXB021433@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/moodle/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19761/devel

Modified Files:
	moodle.spec 
Added Files:
	moodle-1.5.3-SA18267.patch 
Log Message:
Add security patch for adodb (SA18267)

moodle-1.5.3-SA18267.patch:

--- NEW FILE moodle-1.5.3-SA18267.patch ---
diff -urN moodle/lib/adodb/server.php moodle.adodb/lib/adodb/server.php
--- moodle/lib/adodb/server.php	2005-11-10 21:05:24.000000000 -0500
+++ moodle.adodb/lib/adodb/server.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,98 +1,10 @@
 <?php
 
-/** 
- * @version V4.66 28 Sept 2005 (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence. 
- */
- 
-/* Documentation on usage is at http://php.weblogs.com/adodb_csv
- *
- * Legal query string parameters:
- * 
- * sql = holds sql string
- * nrows = number of rows to return 
- * offset = skip offset rows of data
- * fetch = $ADODB_FETCH_MODE
- * 
- * example:
- *
- * http://localhost/php/server.php?select+*+from+table&nrows=10&offset=2
- */
+require_once('../../config.php');
+require_once('../weblib.php');
 
-
-/* 
- * Define the IP address you want to accept requests from 
- * as a security measure. If blank we accept anyone promisciously!
- */
-$ACCEPTIP = '';
-
-/*
- * Connection parameters
- */
-$driver = 'mysql';
-$host = 'localhost'; // DSN for odbc
-$uid = 'root';
-$pwd = '';
-$database = 'test';
-
-/*============================ DO NOT MODIFY BELOW HERE =================================*/
-// $sep must match csv2rs() in adodb.inc.php
-$sep = ' :::: ';
-
-include('./adodb.inc.php');
-include_once(ADODB_DIR.'/adodb-csvlib.inc.php');
-
-function err($s)
-{
-	die('**** '.$s.' ');
-}
-
-// undo stupid magic quotes
-function undomq(&$m) 
-{
-	if (get_magic_quotes_gpc()) {
-		// undo the damage
-		$m = str_replace('\\\\','\\',$m);
-		$m = str_replace('\"','"',$m);
-		$m = str_replace('\\\'','\'',$m);
-		
-	}
-	return $m;
-}
-
-///////////////////////////////////////// DEFINITIONS
-
-
-$remote = $_SERVER["REMOTE_ADDR"]; 
- 
-if (empty($_REQUEST['sql'])) err('No SQL');
-
-if (!empty($ACCEPTIP))
- if ($remote != '127.0.0.1' && $remote != $ACCEPTIP) 
- 	err("Unauthorised client: '$remote'");
-
-
-$conn = &ADONewConnection($driver);
-
-if (!$conn->Connect($host,$uid,$pwd,$database)) err($conn->ErrorNo(). $sep . $conn->ErrorMsg());
-$sql = undomq($_REQUEST['sql']);
-
-if (isset($_REQUEST['fetch']))
-	$ADODB_FETCH_MODE = $_REQUEST['fetch'];
-	
-if (isset($_REQUEST['nrows'])) {
-	$nrows = $_REQUEST['nrows'];
-	$offset = isset($_REQUEST['offset']) ? $_REQUEST['offset'] : -1;
-	$rs = $conn->SelectLimit($sql,$nrows,$offset);
-} else 
-	$rs = $conn->Execute($sql);
-if ($rs){ 
-	//$rs->timeToLive = 1;
-	echo _rs2serialize($rs,$conn,$sql);
-	$rs->Close();
-} else
-	err($conn->ErrorNo(). $sep .$conn->ErrorMsg());
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/server.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/adodb/server.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/server.php');
 
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/benchmark.php moodle.adodb/lib/adodb/tests/benchmark.php
--- moodle/lib/adodb/tests/benchmark.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/benchmark.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<title>ADODB Benchmarks</title>
-</head> 
-
-<body>
-<?php 
-/*
-V4.66 28 Sept 2005  (c) 2000-2005 John Lim (jlim at natsoft.com.my). All rights reserved.
-  Released under both BSD license and Lesser GPL library license. 
-  Whenever there is any discrepancy between the two licenses, 
-  the BSD license will take precedence.
-  
-  Benchmark code to test the speed to the ADODB library with different databases.
-  This is a simplistic benchmark to be used as the basis for further testing.
-  It should not be used as proof of the superiority of one database over the other.
-*/ 
- 
-$testmssql = true;
-//$testvfp = true;
-$testoracle = true;
-$testado = true; 
-$testibase = true;
-$testaccess = true;
-$testmysql = true;
-$testsqlite = true;;
-
-set_time_limit(240); // increase timeout
-
-include("../tohtml.inc.php");
-include("../adodb.inc.php");
-
-function testdb(&$db,$createtab="create table ADOXYZ (id int, firstname char(24), lastname char(24), created date)")
-{
-GLOBAL $ADODB_version,$ADODB_FETCH_MODE;
-
-	adodb_backtrace();
-	
-	$max = 100;
-	$sql = 'select * from ADOXYZ';
-	$ADODB_FETCH_MODE = ADODB_FETCH_NUM;
-	
-	//print "<h3>ADODB Version: $ADODB_version Host: <i>$db->host</i> &nbsp; Database: <i>$db->database</i></h3>";
-	
-	// perform query once to cache results so we are only testing throughput 
-	$rs = $db->Execute($sql);
-	if (!$rs){
-		print "Error in recordset<p>";
-		return;
-	}	
-	$arr = $rs->GetArray();
-	//$db->debug = true;
-	global $ADODB_COUNTRECS;
-	$ADODB_COUNTRECS = false;
-	$start = microtime();
-	for ($i=0; $i < $max; $i++) {
-		$rs =& $db->Execute($sql);	
-		$arr =& $rs->GetArray();
-	   //		 print $arr[0][1];
-	}
-	$end =  microtime();
-	$start = explode(' ',$start);
-	$end = explode(' ',$end);
-	
-	//print_r($start);
-	//print_r($end);
-	
-	  //  print_r($arr);
-	$total = $end[0]+trim($end[1]) - $start[0]-trim($start[1]);
-	printf ("<p>seconds = %8.2f for %d iterations each with %d records</p>",$total,$max, sizeof($arr));
-	flush();
-
-
-		//$db->Close();
-}
-include("testdatabases.inc.php");
-
-?>
-
-
-</body>
-</html>
diff -urN moodle/lib/adodb/tests/client.php moodle.adodb/lib/adodb/tests/client.php
--- moodle/lib/adodb/tests/client.php	2004-07-12 23:13:35.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/client.php	1969-12-31 19:00:00.000000000 -0500
[...3782 lines suppressed...]
-			print "<p>Random session destroy</p>";
-			session_destroy();
-		}
-	}
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/test-xmlschema.php moodle.adodb/lib/adodb/tests/test-xmlschema.php
--- moodle/lib/adodb/tests/test-xmlschema.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/test-xmlschema.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,54 +0,0 @@
-<?PHP
-
-// V4.50 6 July 2004
-
-error_reporting(E_ALL);
-include_once( "../adodb.inc.php" );
-include_once( "../adodb-xmlschema.inc.php" );
-
-// To build the schema, start by creating a normal ADOdb connection:
-$db = ADONewConnection( 'mysql' );
-$db->Connect( 'localhost', 'root', '', 'schematest' );
-
-// To create a schema object and build the query array.
-$schema = new adoSchema( $db );
-
-// To upgrade an existing schema object, use the following 
-// To upgrade an existing database to the provided schema,
-// uncomment the following line:
-#$schema->upgradeSchema();
-
-print "<b>SQL to build xmlschema.xml</b>:\n<pre>";
-// Build the SQL array
-$sql = $schema->ParseSchema( "xmlschema.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-// Execute the SQL on the database
-//$result = $schema->ExecuteSchema( $sql );
-
-// Finally, clean up after the XML parser
-// (PHP won't do this for you!)
-//$schema->Destroy();
-
-
-
-print "<b>SQL to build xmlschema-mssql.xml</b>:\n<pre>";
-
-$db2 = ADONewConnection('mssql');
-$db2->Connect('','adodb','natsoft','northwind') || die("Fail 2");
-
-$db2->Execute("drop table simple_table");
-
-$schema = new adoSchema( $db2 );
-$sql = $schema->ParseSchema( "xmlschema-mssql.xml" );
-
-print_r( $sql );
-print "</pre>\n";
-
-$db2->debug=1;
-
-foreach ($sql as $s)
-$db2->Execute($s);
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/time.php moodle.adodb/lib/adodb/tests/time.php
--- moodle/lib/adodb/tests/time.php	2003-10-22 04:52:42.000000000 -0400
+++ moodle.adodb/lib/adodb/tests/time.php	1969-12-31 19:00:00.000000000 -0500
@@ -1,17 +0,0 @@
-<?php
-
-include_once('../adodb-time.inc.php');
-//adodb_date_test();
-?>
-<?php 
-//require("adodb-time.inc.php"); 
-
-$datestring = "1963-12-04"; // string normally from mySQL 
-$stringArray = explode("-", $datestring);
-$date = adodb_mktime(0,0,0,$stringArray[1],$stringArray[2],$stringArray[0]); 
-
-$convertedDate = date("d-M-Y", $date); // converted string to UK style date
-
-echo( "Birthday: $convertedDate" ); //why is string returned as one day (3 not 4) less for this example??
-
-?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/tmssql.php moodle.adodb/lib/adodb/tests/tmssql.php
--- moodle/lib/adodb/tests/tmssql.php	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/tmssql.php	2006-01-03 21:07:46.000000000 -0500
@@ -1,65 +1,10 @@
 <?php
-error_reporting(E_ALL);
-ini_set('mssql.datetimeconvert',0); 
 
-function tmssql()
-{
-	print "<h3>mssql</h3>";
-	$db = mssql_connect('JAGUAR\vsdotnet','adodb','natsoft') or die('No Connection');
-	mssql_select_db('northwind',$db);
-	
-	$rs = mssql_query('select getdate() as date',$db);
-	$o = mssql_fetch_row($rs);
-	print_r($o);
-	mssql_free_result($rs);
-	
-	print "<p>Delete</p>"; flush();
-	$rs2 = mssql_query('delete from adoxyz',$db);
-	$p = mssql_num_rows($rs2);
-	mssql_free_result($rs2);
+require_once('../../../config.php');
+require_once('../../weblib.php');
 
-}
+add_to_log(0, 'adodb', 'intrusion attempt', 'lib/adodb/tests/tmssql.php');
+trigger_error('SECURITY WARNING: intrusion attempt against lib/tests/tmssql.php from ' . getremoteaddr());
+error('SECURITY WARNING: logged intrusion attempt against lib/adodb/tests/tmssql.php');
 
-function tpear()
-{
-include_once('DB.php');
-
-	print "<h3>PEAR</h3>";
-	$username = 'adodb';
-	$password = 'natsoft';
-	$hostname = 'JAGUAR\vsdotnet';
-	$databasename = 'northwind';
-	
-	$dsn = "mssql://$username:$password@$hostname/$databasename";
-	$conn = &DB::connect($dsn);
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	@$conn->query('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->query('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-
-function tadodb()
-{
-include_once('../adodb.inc.php');
-
-	print "<h3>ADOdb</h3>";
-	$conn = NewADOConnection('mssql');
-	$conn->Connect('JAGUAR\vsdotnet','adodb','natsoft','northwind');
-//	$conn->debug=1;
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-	$conn->Execute('create table tester (id integer)');
-	print "<p>Delete</p>"; flush();
-	$rs = $conn->Execute('delete from tester');
-	print "date=".$conn->GetOne('select getdate()')."<br>";
-}
-?>
-<a href=tmssql.php?do=tmssql>mssql</a>
-<a href=tmssql.php?do=tpear>pear</a>
-<a href=tmssql.php?do=tadodb>adodb</a>
-<?php
-if (!empty($_GET['do'])) {
-	$do = $_GET['do'];
-	$do();
-}
 ?>
\ No newline at end of file
diff -urN moodle/lib/adodb/tests/xmlschema.xml moodle.adodb/lib/adodb/tests/xmlschema.xml
--- moodle/lib/adodb/tests/xmlschema.xml	2005-11-10 21:05:25.000000000 -0500
+++ moodle.adodb/lib/adodb/tests/xmlschema.xml	1969-12-31 19:00:00.000000000 -0500
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<schema version="0.2">
-  <table name="mytable">
-    <field name="row1" type="I">
-      <descr>An integer row that's a primary key and autoincrements</descr>
-      <KEY/>
-      <AUTOINCREMENT/>
-    </field>
-    <field name="row2" type="C" size="16">
-      <descr>A 16 character varchar row that can't be null</descr>
-      <NOTNULL/>
-    </field>
-    <index name="myindex">
-      <col>row1</col>
-      <col>row2</col>
-    </index>
-  </table>
-  <sql>
-    <descr>SQL to be executed only on specific platforms</descr>
-    <query platform="postgres|postgres7">
-      insert into mytable ( row1, row2 ) values ( 12, 'postgres stuff' )
-    </query>
-    <query platform="mysql">
-      insert into mytable ( row1, row2 ) values ( 12, 'mysql stuff' )
-    </query>
-	<query platform="mssql">
-      insert into mytable ( row1, row2 ) values ( 12, 'Microsoft stuff' )
-    </query>
-  </sql>
-  <table name="obsoletetable">
-    <DROP/>
-  </table>
-</schema>
\ No newline at end of file


Index: moodle.spec
===================================================================
RCS file: /cvs/extras/rpms/moodle/devel/moodle.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- moodle.spec	12 Dec 2005 21:05:20 -0000	1.2
+++ moodle.spec	10 Jan 2006 00:00:38 -0000	1.3
@@ -9,7 +9,7 @@
 
 Name:           moodle
 Version:        1.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Course Management System
 
 Group:          Applications/Publishing
@@ -24,6 +24,7 @@
 Source6:        moodle-README-rpm
 Patch0:         moodle-1.5.2-mimetex-linux.patch
 Patch1:         moodle-1.5.2-mimetex-fedora.patch
+Patch2:         moodle-1.5.3-SA18267.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -628,6 +629,7 @@
 %setup -q -n %{name}
 %patch0 -p1 -b .mimetex-linux
 %patch1 -p1 -b .mimetex-fedora
+%patch2 -p1 -b .SA18267
 cp %{SOURCE6} README-rpm
 find $RPM_BUILD_DIR/%{name} -name \*.bak -exec rm {} \;
 find $RPM_BUILD_DIR/%{name} -type f -exec chmod a-x {} \;
@@ -692,6 +694,9 @@
 %endif
 
 %changelog
+* Mon Jan  9 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-2
+- Add security patch for adodb (SA18267)
+
 * Sat Dec 10 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.5.3-1
 - Update to 1.5.3
 - Split off spell check package due to lack of Text::Aspell



From fedora-extras-commits at redhat.com  Tue Jan 10 07:27:09 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Jan 2006 02:27:09 -0500
Subject: rpms/obby/FC-4 obby.spec,1.10,1.11
Message-ID: <200601100727.k0A7RfSW001941@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/FC-4

Modified Files:
	obby.spec 
Log Message:
Remove libsigc++ from BuildRequires since this dep is filled by net6


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/FC-4/obby.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- obby.spec	8 Jan 2006 06:48:17 -0000	1.10
+++ obby.spec	10 Jan 2006 07:27:08 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           obby
 Version:        0.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@
 Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
+BuildRequires:  net6-devel, gmp-devel, gettext-devel
 
 %description
 libobby is a library which provides synced document buffers. It supports
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
+- Remove libsigc++ from BuildRequires
+
 * Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
 - Rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan 10 07:27:15 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Jan 2006 02:27:15 -0500
Subject: rpms/obby/devel obby.spec,1.12,1.13
Message-ID: <200601100727.k0A7RlXn001944@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1909/devel

Modified Files:
	obby.spec 
Log Message:
Remove libsigc++ from BuildRequires since this dep is filled by net6


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- obby.spec	22 Dec 2005 08:56:58 -0000	1.12
+++ obby.spec	10 Jan 2006 07:27:15 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           obby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
@@ -9,7 +9,7 @@
 Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  net6-devel, gmp-devel, gettext-devel, libsigc++
+BuildRequires:  net6-devel, gmp-devel, gettext-devel
 
 %description
 libobby is a library which provides synced document buffers. It supports
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Remove libsigc++ from BuildRequires
+
 * Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 



From fedora-extras-commits at redhat.com  Tue Jan 10 08:11:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:11:01 -0500
Subject: rpms/perl-Digest-MD2 - New directory
Message-ID: <200601100811.k0A8B3ix003832@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3824/perl-Digest-MD2

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD2 added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 08:11:07 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:11:07 -0500
Subject: rpms/perl-Digest-MD2/devel - New directory
Message-ID: <200601100811.k0A8B9Tq003847@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3824/perl-Digest-MD2/devel

Log Message:
Directory /cvs/extras/rpms/perl-Digest-MD2/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 08:12:14 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:12:14 -0500
Subject: rpms/perl-Digest-MD2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601100812.k0A8CIjo003888@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3876

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Digest-MD2


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Digest-MD2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 10 08:12:32 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:12:32 -0500
Subject: rpms/perl-Digest-MD2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601100812.k0A8CY3k003911@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3876/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Digest-MD2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 10 08:14:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:14:29 -0500
Subject: rpms/perl-Digest-MD2 import.log,1.1,1.2
Message-ID: <200601100815.k0A8F1O5004027@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3983

Modified Files:
	import.log 
Log Message:
auto-import perl-Digest-MD2-2.03-1 on branch devel from perl-Digest-MD2-2.03-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Jan 2006 08:12:13 -0000	1.1
+++ import.log	10 Jan 2006 08:14:28 -0000	1.2
@@ -0,0 +1 @@
+perl-Digest-MD2-2_03-1:HEAD:perl-Digest-MD2-2.03-1.src.rpm:1136880856



From fedora-extras-commits at redhat.com  Tue Jan 10 08:14:35 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:14:35 -0500
Subject: rpms/perl-Digest-MD2/devel perl-Digest-MD2.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601100815.k0A8F8Jg004031@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Digest-MD2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3983/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Digest-MD2.spec 
Log Message:
auto-import perl-Digest-MD2-2.03-1 on branch devel from perl-Digest-MD2-2.03-1.src.rpm


--- NEW FILE perl-Digest-MD2.spec ---
Summary:	Perl interface to the MD2 Algorithm
Name:		perl-Digest-MD2
Version:	2.03
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Digest-MD2/
Source0:	http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Digest-MD2-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Digest::MD2 module allows you to use the RSA Data Security Inc. MD2 Message
Digest algorithm from within Perl programs. The algorithm takes as input a
message of arbitrary length and produces as output a 128-bit "fingerprint" or
"message digest" of the input.

The Digest::MD2 programming interface is identical to the interface of
Digest::MD5.

%prep
%setup -q -n Digest-MD2-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc README Changes rfc1319.txt 
%{perl_vendorarch}/Digest/
%{perl_vendorarch}/auto/Digest/
%{_mandir}/man3/Digest::MD2.3pm*

%changelog
* Mon Dec  5 2005 Paul Howarth <paul at city-fan.org> 2.03-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Jan 2006 08:12:31 -0000	1.1
+++ .cvsignore	10 Jan 2006 08:14:34 -0000	1.2
@@ -0,0 +1 @@
+Digest-MD2-2.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Digest-MD2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Jan 2006 08:12:31 -0000	1.1
+++ sources	10 Jan 2006 08:14:34 -0000	1.2
@@ -0,0 +1 @@
+feecf9faa1b0a499a48fce214a309a78  Digest-MD2-2.03.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 08:18:58 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 10 Jan 2006 03:18:58 -0500
Subject: owners owners.list,1.519,1.520
Message-ID: <200601100819.k0A8JUhk004131@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4114

Modified Files:
	owners.list 
Log Message:
Add perl-Digest-MD2



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -r1.519 -r1.520
--- owners.list	9 Jan 2006 16:31:59 -0000	1.519
+++ owners.list	10 Jan 2006 08:18:57 -0000	1.520
@@ -782,6 +782,7 @@
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Digest-MD2|Perl interface to the MD2 Algorithm|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-MD4|Perl interface to the MD4 Algorithm|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 10 14:22:08 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Tue, 10 Jan 2006 09:22:08 -0500
Subject: rpms/chmlib/devel chmlib-chm_lib_c-ppc-patch.diff, 1.1,
	1.2 chmlib.spec, 1.6, 1.7
Message-ID: <200601101422.k0AEMf9m016188@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/chmlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16166

Modified Files:
	chmlib-chm_lib_c-ppc-patch.diff chmlib.spec 
Log Message:

Next try to fix builds for powerpc



chmlib-chm_lib_c-ppc-patch.diff:

Index: chmlib-chm_lib_c-ppc-patch.diff
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib-chm_lib_c-ppc-patch.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- chmlib-chm_lib_c-ppc-patch.diff	9 Jan 2006 14:26:30 -0000	1.1
+++ chmlib-chm_lib_c-ppc-patch.diff	10 Jan 2006 14:22:07 -0000	1.2
@@ -5,7 +5,7 @@
  /* MIPS         */
  /* PPC          */
 -#elif __i386__ || __sun || __sgi || __ppc__
-+#elif __i386__ || __sun || __sgi || __ppc__ || ppc
++#elif __i386__ || __sun || __sgi || __ppc__ || __powerpc__
  typedef unsigned char           UChar;
  typedef short                   Int16;
  typedef unsigned short          UInt16;


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- chmlib.spec	9 Jan 2006 14:55:56 -0000	1.6
+++ chmlib.spec	10 Jan 2006 14:22:07 -0000	1.7
@@ -1,7 +1,7 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.37.4
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License: 	LGPL
 Group: 		Development/Libraries
 Url: 		http://66.93.236.84/~jedwin/projects/chmlib/
@@ -56,6 +56,9 @@
 
 %changelog
 
+* Tue Jan 10 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-4%{?dist}
+- Next try to fix powerpc-arch 
+
 * Mon Jan 09 2006 Peter Lemenkov <lemenkov at newmail.ru> 0.37.4-3%{?dist}
 - Typo fix
 



From fedora-extras-commits at redhat.com  Tue Jan 10 14:39:23 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 10 Jan 2006 09:39:23 -0500
Subject: fedora-security/audit fc4,1.122,1.123 fc5,1.32,1.33
Message-ID: <200601101439.k0AEdNKv016273@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16253

Modified Files:
	fc4 fc5 
Log Message:
Note a PHP CVE id that we can safely ignore.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc4	9 Jan 2006 13:54:05 -0000	1.122
+++ fc4	10 Jan 2006 14:39:15 -0000	1.123
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fc5	9 Jan 2006 13:54:05 -0000	1.32
+++ fc5	10 Jan 2006 14:39:15 -0000	1.33
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]



From fedora-extras-commits at redhat.com  Tue Jan 10 15:07:53 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 10 Jan 2006 10:07:53 -0500
Subject: fedora-security/audit fc4,1.123,1.124 fc5,1.33,1.34
Message-ID: <200601101507.k0AF7rC2018020@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17999

Modified Files:
	fc4 fc5 
Log Message:
Note an rxvt-unicode issue that doesn't affect us.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fc4	10 Jan 2006 14:39:15 -0000	1.123
+++ fc4	10 Jan 2006 15:07:25 -0000	1.124
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- fc5	10 Jan 2006 14:39:15 -0000	1.33
+++ fc5	10 Jan 2006 15:07:25 -0000	1.34
@@ -12,6 +12,7 @@
 
 ** are items that need attention
 
+CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)



From fedora-extras-commits at redhat.com  Tue Jan 10 15:23:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:23:44 -0500
Subject: rpms/pychart/FC-3 pychart.spec,1.3,1.4
Message-ID: <200601101524.k0AFOGOX018145@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18063/FC-3

Modified Files:
	pychart.spec 
Log Message:

Fix FC-3 build.



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-3/pychart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pychart.spec	9 Jan 2006 23:10:45 -0000	1.3
+++ pychart.spec	10 Jan 2006 15:23:40 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -14,7 +14,7 @@
 # it as an addon source tarball. This is BZ #177350
 Source1:	python-2.4.2-Doc.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghostscript-devel, tetex-latex, latex2html
+BuildRequires:	ghostscript-devel, tetex-latex
 BuildArch:	noarch
 Patch0:		pychart-1.39-mkhowto.patch
 
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-3
+- FC3 doesn't need latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
 - BR: tetex-latex, latex2html
 



From fedora-extras-commits at redhat.com  Tue Jan 10 15:23:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:23:50 -0500
Subject: rpms/pychart/FC-4 pychart.spec,1.3,1.4
Message-ID: <200601101524.k0AFOMZD018148@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18063/FC-4

Modified Files:
	pychart.spec 
Log Message:

Fix FC-3 build.



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/FC-4/pychart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pychart.spec	9 Jan 2006 23:10:53 -0000	1.3
+++ pychart.spec	10 Jan 2006 15:23:49 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-3
+- FC3 doesn't need latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
 - BR: tetex-latex, latex2html
 



From fedora-extras-commits at redhat.com  Tue Jan 10 15:23:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:23:56 -0500
Subject: rpms/pychart/devel pychart.spec,1.3,1.4
Message-ID: <200601101524.k0AFOSJc018151@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/pychart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18063/devel

Modified Files:
	pychart.spec 
Log Message:

Fix FC-3 build.



Index: pychart.spec
===================================================================
RCS file: /cvs/extras/rpms/pychart/devel/pychart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pychart.spec	9 Jan 2006 23:11:13 -0000	1.3
+++ pychart.spec	10 Jan 2006 15:23:56 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:		pychart
 Version:	1.39
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		System Environment/Libraries
 Summary:	Python library for generating chart images
@@ -66,6 +66,9 @@
 %doc doc/examples doc/pychart
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-3
+- FC3 doesn't need latex2html
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.39-2
 - BR: tetex-latex, latex2html
 



From fedora-extras-commits at redhat.com  Tue Jan 10 15:35:36 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 10 Jan 2006 10:35:36 -0500
Subject: fedora-security/audit fc4,1.124,1.125 fc5,1.34,1.35
Message-ID: <200601101535.k0AFZaiB018310@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18290

Modified Files:
	fc4 fc5 
Log Message:
Fixup a kernel issue
Don't bother mentioning things in these files that we don't ship



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fc4	10 Jan 2006 15:07:25 -0000	1.124
+++ fc4	10 Jan 2006 15:35:28 -0000	1.125
@@ -3,12 +3,11 @@
 
 ** are items that need attention
 
-CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
-CVE-2005-4618 VULNERABLE (kernel)
+CVE-2005-4618 verson (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
 CVE-2005-4585 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006]
 CVE-2005-4442 version (openldap) gentoo only


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- fc5	10 Jan 2006 15:07:25 -0000	1.34
+++ fc5	10 Jan 2006 15:35:28 -0000	1.35
@@ -12,12 +12,11 @@
 
 ** are items that need attention
 
-CVE-2006-0126 ignore (rxvt-unicode) not shipped
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
-CVE-2005-4618 VULNERABLE (kernel)
+CVE-2005-4618 VULNERABLE (kernel, fixed 2.6.15)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
 CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only



From fedora-extras-commits at redhat.com  Tue Jan 10 15:39:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:39:03 -0500
Subject: rpms/perl-Ima-DBI/FC-3 perl-Ima-DBI.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601101539.k0AFdZr4018377@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Ima-DBI/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18325/FC-3

Modified Files:
	perl-Ima-DBI.spec sources 
Log Message:

Bump to 0.34



Index: perl-Ima-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-3/perl-Ima-DBI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ima-DBI.spec	18 Aug 2005 04:28:25 -0000	1.1
+++ perl-Ima-DBI.spec	10 Jan 2006 15:39:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Ima-DBI
-Version:        0.33
-Release:        3%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Database connection caching and organization
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,9 +10,12 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Data::Inheritable) 
-BuildRequires:  perl(Class::WhiteHole)
+# No longer needed as of 0.34
+# BuildRequires:  perl(Class::WhiteHole)
 BuildRequires:  perl(DBIx::ContextualFetch)
-Requires:  perl(Class::Data::Inheritable), perl(Class::WhiteHole) 
+Requires:  perl(Class::Data::Inheritable)
+# No longer needed as of 0.34
+# Requires: perl(Class::WhiteHole) 
 Requires:  perl(DBIx::ContextualFetch)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,6 +50,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.34-1
+- bump to 0.34
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 04:28:25 -0000	1.2
+++ sources	10 Jan 2006 15:39:03 -0000	1.3
@@ -1 +1 @@
-3d72cfbca2aa5e2b631020122858e3ae  Ima-DBI-0.33.tar.gz
+1ccc6eb89ec4beb1b231fc69209b87c6  Ima-DBI-0.34.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:39:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:39:09 -0500
Subject: rpms/perl-Ima-DBI/FC-4 perl-Ima-DBI.spec,1.1,1.2 sources,1.2,1.3
Message-ID: <200601101539.k0AFdf9R018381@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Ima-DBI/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18325/FC-4

Modified Files:
	perl-Ima-DBI.spec sources 
Log Message:

Bump to 0.34



Index: perl-Ima-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-4/perl-Ima-DBI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ima-DBI.spec	18 Aug 2005 04:28:25 -0000	1.1
+++ perl-Ima-DBI.spec	10 Jan 2006 15:39:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Ima-DBI
-Version:        0.33
-Release:        3%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Database connection caching and organization
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,9 +10,12 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Data::Inheritable) 
-BuildRequires:  perl(Class::WhiteHole)
+# No longer needed as of 0.34
+# BuildRequires:  perl(Class::WhiteHole)
 BuildRequires:  perl(DBIx::ContextualFetch)
-Requires:  perl(Class::Data::Inheritable), perl(Class::WhiteHole) 
+Requires:  perl(Class::Data::Inheritable)
+# No longer needed as of 0.34
+# Requires: perl(Class::WhiteHole) 
 Requires:  perl(DBIx::ContextualFetch)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,6 +50,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.34-1
+- bump to 0.34
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 04:28:25 -0000	1.2
+++ sources	10 Jan 2006 15:39:09 -0000	1.3
@@ -1 +1 @@
-3d72cfbca2aa5e2b631020122858e3ae  Ima-DBI-0.33.tar.gz
+1ccc6eb89ec4beb1b231fc69209b87c6  Ima-DBI-0.34.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:39:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:39:15 -0500
Subject: rpms/perl-Ima-DBI/devel .cvsignore, 1.2, 1.3 perl-Ima-DBI.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101539.k0AFdlRV018386@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Ima-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18325/devel

Modified Files:
	.cvsignore perl-Ima-DBI.spec sources 
Log Message:

Bump to 0.34



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 04:28:25 -0000	1.2
+++ .cvsignore	10 Jan 2006 15:39:15 -0000	1.3
@@ -1 +1,2 @@
 Ima-DBI-0.33.tar.gz
+Ima-DBI-0.34.tar.gz


Index: perl-Ima-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/perl-Ima-DBI.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Ima-DBI.spec	18 Aug 2005 04:28:25 -0000	1.1
+++ perl-Ima-DBI.spec	10 Jan 2006 15:39:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Ima-DBI
-Version:        0.33
-Release:        3%{?dist}
+Version:        0.34
+Release:        1%{?dist}
 Summary:        Database connection caching and organization
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,9 +10,12 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Data::Inheritable) 
-BuildRequires:  perl(Class::WhiteHole)
+# No longer needed as of 0.34
+# BuildRequires:  perl(Class::WhiteHole)
 BuildRequires:  perl(DBIx::ContextualFetch)
-Requires:  perl(Class::Data::Inheritable), perl(Class::WhiteHole) 
+Requires:  perl(Class::Data::Inheritable)
+# No longer needed as of 0.34
+# Requires: perl(Class::WhiteHole) 
 Requires:  perl(DBIx::ContextualFetch)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -47,6 +50,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.34-1
+- bump to 0.34
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.33-3
 - minor cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Ima-DBI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 04:28:25 -0000	1.2
+++ sources	10 Jan 2006 15:39:15 -0000	1.3
@@ -1 +1 @@
-3d72cfbca2aa5e2b631020122858e3ae  Ima-DBI-0.33.tar.gz
+1ccc6eb89ec4beb1b231fc69209b87c6  Ima-DBI-0.34.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:52:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:52:56 -0500
Subject: rpms/perl-Image-ExifTool/FC-3 perl-Image-ExifTool.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101553.k0AFrS4X018632@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568/FC-3

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 5.89



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/perl-Image-ExifTool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Image-ExifTool.spec	4 Aug 2005 20:55:50 -0000	1.1
+++ perl-Image-ExifTool.spec	10 Jan 2006 15:52:56 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	5.53
+Version:	5.89
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 5.89-1
+- bump to 5.89
+
 * Thu Aug  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 5.53-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 20:55:50 -0000	1.2
+++ sources	10 Jan 2006 15:52:56 -0000	1.3
@@ -1 +1 @@
-61cb796b444d16d2af7bb1c9c4d4991d  Image-ExifTool-5.53.tar.gz
+93c9a877256b0a2c2847346528bb18ca  Image-ExifTool-5.89.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:53:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:53:02 -0500
Subject: rpms/perl-Image-ExifTool/FC-4 perl-Image-ExifTool.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101553.k0AFrYuC018636@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568/FC-4

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 5.89



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/perl-Image-ExifTool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Image-ExifTool.spec	4 Aug 2005 20:55:50 -0000	1.1
+++ perl-Image-ExifTool.spec	10 Jan 2006 15:53:02 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	5.53
+Version:	5.89
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 5.89-1
+- bump to 5.89
+
 * Thu Aug  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 5.53-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 20:55:50 -0000	1.2
+++ sources	10 Jan 2006 15:53:02 -0000	1.3
@@ -1 +1 @@
-61cb796b444d16d2af7bb1c9c4d4991d  Image-ExifTool-5.53.tar.gz
+93c9a877256b0a2c2847346528bb18ca  Image-ExifTool-5.89.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 15:53:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 10:53:08 -0500
Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.2,
	1.3 perl-Image-ExifTool.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601101553.k0AFrekK018641@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568/devel

Modified Files:
	.cvsignore perl-Image-ExifTool.spec sources 
Log Message:

bump to 5.89



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Aug 2005 20:55:50 -0000	1.2
+++ .cvsignore	10 Jan 2006 15:53:08 -0000	1.3
@@ -1 +1,2 @@
 Image-ExifTool-5.53.tar.gz
+Image-ExifTool-5.89.tar.gz


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Image-ExifTool.spec	4 Aug 2005 20:55:50 -0000	1.1
+++ perl-Image-ExifTool.spec	10 Jan 2006 15:53:08 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	5.53
+Version:	5.89
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,5 +49,8 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 5.89-1
+- bump to 5.89
+
 * Thu Aug  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 5.53-1
 - initial package for Fedora Extras


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Aug 2005 20:55:50 -0000	1.2
+++ sources	10 Jan 2006 15:53:08 -0000	1.3
@@ -1 +1 @@
-61cb796b444d16d2af7bb1c9c4d4991d  Image-ExifTool-5.53.tar.gz
+93c9a877256b0a2c2847346528bb18ca  Image-ExifTool-5.89.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:03:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 11:03:43 -0500
Subject: rpms/ebtables/FC-3 ebtables.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200601101604.k0AG4Nem020464@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20412/FC-3

Modified Files:
	ebtables.spec sources 
Log Message:

v2.0.8-rc1



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ebtables.spec	4 Jul 2005 17:09:41 -0000	1.4
+++ ebtables.spec	10 Jan 2006 16:03:38 -0000	1.5
@@ -1,14 +1,14 @@
+%define prever	rc1
+
 Name:		ebtables
-Version:	2.0.6
-Release:	7%{?dist}
+Version:	2.0.8
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
 URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz
+Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-%{prever}.tar.gz
 Source1:	ebtables.sysv
-Patch0:		ebtables-2.0.6-gcc34.patch
-Patch1:		ebtables-2.0.6-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq:		/sbin/chkconfig
 PreReq:		/sbin/service
@@ -25,9 +25,7 @@
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -n ebtables-v%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n ebtables-v%{version}-%{prever}
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -55,7 +53,7 @@
 fi
 
 %postun
-if [ $1 -ge 1 ]
+if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
 
@@ -71,6 +69,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc1
+- bump to 2.0.8-rc1
+
 * Mon Jul  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-7
 - buildsystem error requires artificial release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2005 16:03:23 -0000	1.2
+++ sources	10 Jan 2006 16:03:38 -0000	1.3
@@ -1 +1 @@
-c4559af2366c764c6c42a3fdd40d60d3  ebtables-v2.0.6.tar.gz
+e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:03:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 11:03:55 -0500
Subject: rpms/ebtables/FC-4 ebtables.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200601101604.k0AG4RGV020468@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20412/FC-4

Modified Files:
	ebtables.spec sources 
Log Message:

v2.0.8-rc1



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ebtables.spec	4 Jul 2005 17:09:41 -0000	1.4
+++ ebtables.spec	10 Jan 2006 16:03:54 -0000	1.5
@@ -1,14 +1,14 @@
+%define prever	rc1
+
 Name:		ebtables
-Version:	2.0.6
-Release:	7%{?dist}
+Version:	2.0.8
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
 URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz
+Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-%{prever}.tar.gz
 Source1:	ebtables.sysv
-Patch0:		ebtables-2.0.6-gcc34.patch
-Patch1:		ebtables-2.0.6-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq:		/sbin/chkconfig
 PreReq:		/sbin/service
@@ -25,9 +25,7 @@
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -n ebtables-v%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n ebtables-v%{version}-%{prever}
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -55,7 +53,7 @@
 fi
 
 %postun
-if [ $1 -ge 1 ]
+if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
 
@@ -71,6 +69,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc1
+- bump to 2.0.8-rc1
+
 * Mon Jul  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-7
 - buildsystem error requires artificial release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2005 16:03:23 -0000	1.2
+++ sources	10 Jan 2006 16:03:54 -0000	1.3
@@ -1 +1 @@
-c4559af2366c764c6c42a3fdd40d60d3  ebtables-v2.0.6.tar.gz
+e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:04:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 11:04:01 -0500
Subject: rpms/ebtables/devel .cvsignore, 1.2, 1.3 ebtables.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601101604.k0AG4YTW020473@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20412/devel

Modified Files:
	.cvsignore ebtables.spec sources 
Log Message:

v2.0.8-rc1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Jul 2005 16:03:23 -0000	1.2
+++ .cvsignore	10 Jan 2006 16:04:01 -0000	1.3
@@ -1 +1,2 @@
 ebtables-v2.0.6.tar.gz
+ebtables-v2.0.8-rc1.tar.gz


Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ebtables.spec	4 Jul 2005 17:09:46 -0000	1.4
+++ ebtables.spec	10 Jan 2006 16:04:01 -0000	1.5
@@ -1,14 +1,14 @@
+%define prever	rc1
+
 Name:		ebtables
-Version:	2.0.6
-Release:	7%{?dist}
+Version:	2.0.8
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
 URL:		http://ebtables.sourceforge.net/
-Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}.tar.gz
+Source0:	http://dl.sf.net/ebtables/ebtables-v%{version}-%{prever}.tar.gz
 Source1:	ebtables.sysv
-Patch0:		ebtables-2.0.6-gcc34.patch
-Patch1:		ebtables-2.0.6-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq:		/sbin/chkconfig
 PreReq:		/sbin/service
@@ -25,9 +25,7 @@
 like iptables. There are no known incompatibility issues.
 
 %prep
-%setup -n ebtables-v%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n ebtables-v%{version}-%{prever}
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -55,7 +53,7 @@
 fi
 
 %postun
-if [ $1 -ge 1 ]
+if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
 
@@ -71,6 +69,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc1
+- bump to 2.0.8-rc1
+
 * Mon Jul  4 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.6-7
 - buildsystem error requires artificial release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Jul 2005 16:03:23 -0000	1.2
+++ sources	10 Jan 2006 16:04:01 -0000	1.3
@@ -1 +1 @@
-c4559af2366c764c6c42a3fdd40d60d3  ebtables-v2.0.6.tar.gz
+e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 16:56:56 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 11:56:56 -0500
Subject: rpms/apcupsd/devel .cvsignore, 1.3, 1.4 apcupsd.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200601101657.k0AGvSgU020826@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20805

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
Update to 3.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 00:09:56 -0000	1.3
+++ .cvsignore	10 Jan 2006 16:56:55 -0000	1.4
@@ -1 +1 @@
-apcupsd-3.12.0.tar.gz
+apcupsd-3.12.1.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/apcupsd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- apcupsd.spec	5 Jan 2006 00:09:56 -0000	1.6
+++ apcupsd.spec	10 Jan 2006 16:56:55 -0000	1.7
@@ -1,5 +1,5 @@
 Name:         apcupsd
-Version:      3.12.0
+Version:      3.12.1
 Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.1-1
+- Update to 3.12.1
+
 * Wed Jan  4 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.0-1
 - Update to 3.12.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 00:09:56 -0000	1.3
+++ sources	10 Jan 2006 16:56:55 -0000	1.4
@@ -1 +1 @@
-7adb6274ede9dfaec7b6641105ae7a3a  apcupsd-3.12.0.tar.gz
+d2e710176430a28d624500e145d9ffe3  apcupsd-3.12.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:04:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 12:04:57 -0500
Subject: rpms/apcupsd/FC-4 .cvsignore, 1.2, 1.3 apcupsd.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601101705.k0AH5TTI022554@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/apcupsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22528

Modified Files:
	.cvsignore apcupsd.spec sources 
Log Message:
Update to 3.12.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 02:59:11 -0000	1.2
+++ .cvsignore	10 Jan 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-apcupsd-3.10.18.tar.gz
+apcupsd-3.12.1.tar.gz


Index: apcupsd.spec
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/apcupsd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apcupsd.spec	4 Nov 2005 23:41:36 -0000	1.3
+++ apcupsd.spec	10 Jan 2006 17:04:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:         apcupsd
-Version:      3.10.18
-Release:      4%{?dist}
+Version:      3.12.1
+Release:      1%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -43,7 +43,7 @@
 %prep
 %setup -q
 %patch -p1 -b .init
-dos2unix examples/*status
+dos2unix examples/*status examples/*.c
 
 
 %build
@@ -92,7 +92,7 @@
 install -d %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
-chmod -x examples/*.conf
+chmod -x examples/*.conf examples/*.c
 rm examples/*.in
 
 
@@ -102,7 +102,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING ChangeLog doc/README.apcaccess doc/developers_manual examples ReleaseNotes
+%doc COPYING ChangeLog examples ReleaseNotes
 %dir %{_sysconfdir}/apcupsd
 %{_initrddir}/apcupsd
 %config(noreplace) %{_sysconfdir}/apcupsd/apcupsd.conf
@@ -112,8 +112,8 @@
 %{_sysconfdir}/apcupsd/changeme
 %{_sysconfdir}/apcupsd/commfailure
 %{_sysconfdir}/apcupsd/commok
+%{_sysconfdir}/apcupsd/offbattery
 %{_sysconfdir}/apcupsd/onbattery
-%{_sysconfdir}/apcupsd/mainsback
 %{_sysconfdir}/apcupsd/masterconnect
 %{_sysconfdir}/apcupsd/mastertimeout
 %config(noreplace) %{_sysconfdir}/logrotate.d/apcupsd
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 - Orion Poplawski <orion at cora.nwra.com> - 3.12.1-1
+- Update to 3.12.1
+
 * Fri Nov  4 2005 - Orion Poplawski <orion at cora.nwra.com> - 3.10.18-4
 - Add logrotate script for /var/log/apcupsd.events
 - Add apache configuration script and change cgi directory to


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apcupsd/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 02:59:11 -0000	1.2
+++ sources	10 Jan 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-64104a1fface0253e77318ca84948bac  apcupsd-3.10.18.tar.gz
+d2e710176430a28d624500e145d9ffe3  apcupsd-3.12.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:55:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 12:55:13 -0500
Subject: rpms/perl-Class-Trigger/FC-3 perl-Class-Trigger.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101755.k0AHtjFp022841@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Trigger/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22786/FC-3

Modified Files:
	perl-Class-Trigger.spec sources 
Log Message:

0.10



Index: perl-Class-Trigger.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-3/perl-Class-Trigger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Trigger.spec	18 Aug 2005 03:10:55 -0000	1.1
+++ perl-Class-Trigger.spec	10 Jan 2006 17:55:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Trigger
-Version:        0.09
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Mixin to add / call inheritable triggers
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
+- bump to 0.10
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.09-3
 - fix missing BR: perl(Class::Data::Inheritable)
 - use %{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:10:55 -0000	1.2
+++ sources	10 Jan 2006 17:55:12 -0000	1.3
@@ -1 +1 @@
-7f7ce8d219003dcf64258d5da78d2d47  Class-Trigger-0.09.tar.gz
+5fbf56437f75b8f51debfa241c808846  Class-Trigger-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:55:19 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 12:55:19 -0500
Subject: rpms/perl-Class-Trigger/FC-4 perl-Class-Trigger.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101755.k0AHtpBd022845@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Trigger/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22786/FC-4

Modified Files:
	perl-Class-Trigger.spec sources 
Log Message:

0.10



Index: perl-Class-Trigger.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-4/perl-Class-Trigger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Trigger.spec	18 Aug 2005 03:10:55 -0000	1.1
+++ perl-Class-Trigger.spec	10 Jan 2006 17:55:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Trigger
-Version:        0.09
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Mixin to add / call inheritable triggers
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
+- bump to 0.10
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.09-3
 - fix missing BR: perl(Class::Data::Inheritable)
 - use %{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:10:55 -0000	1.2
+++ sources	10 Jan 2006 17:55:18 -0000	1.3
@@ -1 +1 @@
-7f7ce8d219003dcf64258d5da78d2d47  Class-Trigger-0.09.tar.gz
+5fbf56437f75b8f51debfa241c808846  Class-Trigger-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 17:55:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 12:55:24 -0500
Subject: rpms/perl-Class-Trigger/devel .cvsignore, 1.2,
	1.3 perl-Class-Trigger.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601101755.k0AHtvTf022850@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-Trigger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22786/devel

Modified Files:
	.cvsignore perl-Class-Trigger.spec sources 
Log Message:

0.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Aug 2005 03:10:55 -0000	1.2
+++ .cvsignore	10 Jan 2006 17:55:24 -0000	1.3
@@ -1 +1,2 @@
 Class-Trigger-0.09.tar.gz
+Class-Trigger-0.10.tar.gz


Index: perl-Class-Trigger.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/perl-Class-Trigger.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-Trigger.spec	18 Aug 2005 03:10:55 -0000	1.1
+++ perl-Class-Trigger.spec	10 Jan 2006 17:55:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-Trigger
-Version:        0.09
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Mixin to add / call inheritable triggers
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
+- bump to 0.10
+
 * Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.09-3
 - fix missing BR: perl(Class::Data::Inheritable)
 - use %{_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Trigger/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Aug 2005 03:10:55 -0000	1.2
+++ sources	10 Jan 2006 17:55:24 -0000	1.3
@@ -1 +1 @@
-7f7ce8d219003dcf64258d5da78d2d47  Class-Trigger-0.09.tar.gz
+5fbf56437f75b8f51debfa241c808846  Class-Trigger-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:00:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:00:35 -0500
Subject: rpms/perl-Class-DBI-Pager/FC-3 perl-Class-DBI-Pager.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101801.k0AI18En024673@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22992/FC-3

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

0.07



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/perl-Class-DBI-Pager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Pager.spec	8 Sep 2005 15:09:28 -0000	1.1
+++ perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Mon Sep  5 2005 Paul Howarth <paul at city-fan.org> 0.06-3
 - remove redundant BR: perl
 - add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:09:28 -0000	1.2
+++ sources	10 Jan 2006 18:00:35 -0000	1.3
@@ -1 +1 @@
-358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz
+611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:00:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:00:41 -0500
Subject: rpms/perl-Class-DBI-Pager/FC-4 perl-Class-DBI-Pager.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601101801.k0AI1Dm7024675@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22992/FC-4

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

0.07



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/perl-Class-DBI-Pager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Pager.spec	8 Sep 2005 15:09:28 -0000	1.1
+++ perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Mon Sep  5 2005 Paul Howarth <paul at city-fan.org> 0.06-3
 - remove redundant BR: perl
 - add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:09:28 -0000	1.2
+++ sources	10 Jan 2006 18:00:41 -0000	1.3
@@ -1 +1 @@
-358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz
+611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:00:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:00:47 -0500
Subject: rpms/perl-Class-DBI-Pager/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Pager.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601101801.k0AI1JJs024682@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22992/devel

Modified Files:
	.cvsignore perl-Class-DBI-Pager.spec sources 
Log Message:

0.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:09:28 -0000	1.2
+++ .cvsignore	10 Jan 2006 18:00:47 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Pager-0.06.tar.gz
+Class-DBI-Pager-0.07.tar.gz


Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/perl-Class-DBI-Pager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Pager.spec	8 Sep 2005 15:09:28 -0000	1.1
+++ perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.06
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Mon Sep  5 2005 Paul Howarth <paul at city-fan.org> 0.06-3
 - remove redundant BR: perl
 - add BR: perl(Data::Page), perl(Exporter::Lite), perl(DBD::SQLite)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:09:28 -0000	1.2
+++ sources	10 Jan 2006 18:00:47 -0000	1.3
@@ -1 +1 @@
-358429211e6264779d37834ecf728ac1  Class-DBI-Pager-0.06.tar.gz
+611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:15:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:15:21 -0500
Subject: rpms/perl-Spreadsheet-WriteExcel/FC-3
	perl-Spreadsheet-WriteExcel.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601101815.k0AIFsuE024924@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/FC-3

Modified Files:
	perl-Spreadsheet-WriteExcel.spec sources 
Log Message:

2.15



Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Spreadsheet-WriteExcel.spec	11 May 2005 15:20:02 -0000	1.7
+++ perl-Spreadsheet-WriteExcel.spec	10 Jan 2006 18:15:08 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			perl-Spreadsheet-WriteExcel
-Version:		2.14
+Version:		2.15
 Release:		1%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.15-1
+- bump to 2.15
+
 * Wed May 11 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.14-1
 - Update
 - Add a complete URL for Source0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2005 13:34:16 -0000	1.3
+++ sources	10 Jan 2006 18:15:08 -0000	1.4
@@ -1 +1 @@
-9b4b058b3b79d33c073b0ec025a509cc  Spreadsheet-WriteExcel-2.13.tar.gz
+abcb3c39fc48febbbc2a3094bb2933c9  Spreadsheet-WriteExcel-2.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:15:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:15:27 -0500
Subject: rpms/perl-Spreadsheet-WriteExcel/FC-4
	perl-Spreadsheet-WriteExcel.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200601101816.k0AIG0fr024928@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/FC-4

Modified Files:
	perl-Spreadsheet-WriteExcel.spec sources 
Log Message:

2.15



Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Spreadsheet-WriteExcel.spec	11 May 2005 15:11:05 -0000	1.7
+++ perl-Spreadsheet-WriteExcel.spec	10 Jan 2006 18:15:27 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			perl-Spreadsheet-WriteExcel
-Version:		2.14
+Version:		2.15
 Release:		1%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.15-1
+- bump to 2.15
+
 * Wed May 11 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.14-1
 - Update
 - Add a complete URL for Source0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 May 2005 15:11:05 -0000	1.4
+++ sources	10 Jan 2006 18:15:27 -0000	1.5
@@ -1 +1 @@
-2a2ff55a0b8a41bdfd0f8adf9925394a  Spreadsheet-WriteExcel-2.14.tar.gz
+abcb3c39fc48febbbc2a3094bb2933c9  Spreadsheet-WriteExcel-2.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:15:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:15:34 -0500
Subject: rpms/perl-Spreadsheet-WriteExcel/devel .cvsignore, 1.4,
	1.5 perl-Spreadsheet-WriteExcel.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200601101816.k0AIG6Uj024933@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24870/devel

Modified Files:
	.cvsignore perl-Spreadsheet-WriteExcel.spec sources 
Log Message:

2.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 May 2005 15:11:05 -0000	1.4
+++ .cvsignore	10 Jan 2006 18:15:33 -0000	1.5
@@ -1 +1,2 @@
 Spreadsheet-WriteExcel-2.14.tar.gz
+Spreadsheet-WriteExcel-2.15.tar.gz


Index: perl-Spreadsheet-WriteExcel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/perl-Spreadsheet-WriteExcel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Spreadsheet-WriteExcel.spec	11 May 2005 15:11:05 -0000	1.7
+++ perl-Spreadsheet-WriteExcel.spec	10 Jan 2006 18:15:33 -0000	1.8
@@ -1,5 +1,5 @@
 Name:			perl-Spreadsheet-WriteExcel
-Version:		2.14
+Version:		2.15
 Release:		1%{?dist}
 Summary:		Write formatted text and numbers to a cross-platform Excel binary file
 
@@ -63,6 +63,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.15-1
+- bump to 2.15
+
 * Wed May 11 2005 Oliver Falk <oliver at linux-kernel.at>		- 2.14-1
 - Update
 - Add a complete URL for Source0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 May 2005 15:11:05 -0000	1.4
+++ sources	10 Jan 2006 18:15:33 -0000	1.5
@@ -1 +1 @@
-2a2ff55a0b8a41bdfd0f8adf9925394a  Spreadsheet-WriteExcel-2.14.tar.gz
+abcb3c39fc48febbbc2a3094bb2933c9  Spreadsheet-WriteExcel-2.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:17:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:17:51 -0500
Subject: rpms/perl-version - New directory
Message-ID: <200601101817.k0AIHrju025111@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25103/perl-version

Log Message:
Directory /cvs/extras/rpms/perl-version added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 18:17:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:17:57 -0500
Subject: rpms/perl-version/devel - New directory
Message-ID: <200601101817.k0AIHxYF025126@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25103/perl-version/devel

Log Message:
Directory /cvs/extras/rpms/perl-version/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:12 -0500
Subject: rpms/perl-version Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601101818.k0AIIEo6025160@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-version


--- NEW FILE Makefile ---
# Top level Makefile for module perl-version
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:18 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:18 -0500
Subject: rpms/perl-version/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601101818.k0AIIKpl025180@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-version


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:44 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:44 -0500
Subject: rpms/perl-version import.log,1.1,1.2
Message-ID: <200601101819.k0AIJHbS025268@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25218

Modified Files:
	import.log 
Log Message:
auto-import perl-version-0.51-3 on branch devel from perl-version-0.51-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-version/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Jan 2006 18:18:12 -0000	1.1
+++ import.log	10 Jan 2006 18:18:44 -0000	1.2
@@ -0,0 +1 @@
+perl-version-0_51-3:HEAD:perl-version-0.51-3.src.rpm:1136917108



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:50 -0500
Subject: rpms/perl-version/devel perl-version.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601101819.k0AIJNLb025272@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-version/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25218/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-version.spec 
Log Message:
auto-import perl-version-0.51-3 on branch devel from perl-version-0.51-3.src.rpm


--- NEW FILE perl-version.spec ---
Name:           perl-version
Version:        0.51
Release:        3%{?dist}
Summary:        Perl extension for Version Objects
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/version
Source0:        http://search.cpan.org/CPAN/authors/id/J/JP/JPEACOCK/version-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	perl(Module::Build) >= 0.2611
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
%{summary}

%prep
%setup -q -n version-%{version}
sed -i "s|#!perl|#!%{__perl}|" lib/version.pm lib/version/vxs.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
chmod u+x blib/lib/version.pm blib/lib/version/vxs.pm
make install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%doc %{perl_vendorarch}/version.pod
%{perl_vendorarch}/auto/version/
%{perl_vendorarch}/version/
%{perl_vendorarch}/version.pm
%{_mandir}/man3/*.3*


%changelog
* Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.51-3
- one sed line only, not global, using __perl

* Sun Jan  8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.51-2
- clean up scripty bits of some .pm files

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.51-1
- bump to 0.51
- pod file is doc

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.50-2
- don't pass optflags twice
- remove .bs files

* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.50-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-version/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Jan 2006 18:18:18 -0000	1.1
+++ .cvsignore	10 Jan 2006 18:18:50 -0000	1.2
@@ -0,0 +1 @@
+version-0.51.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-version/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Jan 2006 18:18:18 -0000	1.1
+++ sources	10 Jan 2006 18:18:50 -0000	1.2
@@ -0,0 +1 @@
+76e97f1d2d19f93fa28179fdc7704d95  version-0.51.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 18:18:54 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 10 Jan 2006 13:18:54 -0500
Subject: owners owners.list,1.520,1.521
Message-ID: <200601101819.k0AIJQl2025301@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25216

Modified Files:
	owners.list 
Log Message:

perl-version



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.520
retrieving revision 1.521
diff -u -r1.520 -r1.521
--- owners.list	10 Jan 2006 08:18:57 -0000	1.520
+++ owners.list	10 Jan 2006 18:18:53 -0000	1.521
@@ -950,6 +950,7 @@
 Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Statgrab|Perl extension for collecting information about the machine|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-version|Perl extension for Version Objects|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Want|Perl module implementing a generalisation of wantarray|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-WWW-Mechanize|Automates web page form & link interaction|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:26 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:26 -0500
Subject: rpms/trac - New directory
Message-ID: <200601101953.k0AJrS8f027788@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27778/trac

Log Message:
Directory /cvs/extras/rpms/trac added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:32 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:32 -0500
Subject: rpms/trac/devel - New directory
Message-ID: <200601101953.k0AJrYgu027803@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27778/trac/devel

Log Message:
Directory /cvs/extras/rpms/trac/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:53 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:53 -0500
Subject: rpms/trac Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601101953.k0AJrtX3027839@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27826

Added Files:
	Makefile import.log 
Log Message:
Setup of module trac


--- NEW FILE Makefile ---
# Top level Makefile for module trac
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 10 19:53:59 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:53:59 -0500
Subject: rpms/trac/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601101954.k0AJs1Oo027859@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27826/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module trac


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 10 19:54:46 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:54:46 -0500
Subject: rpms/trac import.log,1.1,1.2
Message-ID: <200601101955.k0AJtJKE027933@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27898

Modified Files:
	import.log 
Log Message:
auto-import trac-0.9.3-2 on branch devel from trac-0.9.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/trac/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Jan 2006 19:53:53 -0000	1.1
+++ import.log	10 Jan 2006 19:54:46 -0000	1.2
@@ -0,0 +1 @@
+trac-0_9_3-2:HEAD:trac-0.9.3-2.src.rpm:1136922876



From fedora-extras-commits at redhat.com  Tue Jan 10 19:54:52 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:54:52 -0500
Subject: rpms/trac/devel trac.conf, NONE, 1.1 trac.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601101955.k0AJtPpS027937@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27898/devel

Modified Files:
	.cvsignore sources 
Added Files:
	trac.conf trac.spec 
Log Message:
auto-import trac-0.9.3-2 on branch devel from trac-0.9.3-2.src.rpm


--- NEW FILE trac.conf ---
# Replace all occurrences of /path/to/trac_env with your trac root below
# and uncomment the respective SetEnv and PythonOption directives.
<Location /cgi-bin/trac.cgi>
    #SetEnv TRAC_ENV /path/to/trac_env
<IfModule mod_python.c>
    SetHandler mod_python
    PythonHandler trac.web.modpython_frontend
    #PythonOption TracEnv /path/to/trac_env
</IfModule>
</Location>


--- NEW FILE trac.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           trac
Version:        0.9.3
Release:        2%{?dist}
Summary:        Enhanced wiki and issue tracking system

Group:          Applications/Internet
License:        BSD
URL:            http://trac.edgewall.com/
Source0:        http://ftp.edgewall.com/pub/trac/%{name}-%{version}.tar.gz
Source1:        trac.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  sed >= 3.95
Requires:       python-clearsilver >= 0.9.3
Requires:       subversion >= 1.1
Requires:       httpd
Requires:       python-sqlite >= 1.0

%description
Trac is an integrated system for managing software projects, an
enhanced wiki, a flexible web-based issue tracker, and an interface to
the Subversion revision control system.  At the core of Trac lies an
integrated wiki and issue/bug database. Using wiki markup, all objects
managed by Trac can directly link to other issues/bug reports, code
changesets, documentation and files.  Around the core lies other
modules, providing additional features and tools to make software
development more streamlined and effective.

%prep
%setup -q
chmod -x contrib/*
sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
chmod -x htdocs/js/wikitoolbar.js
rm trac/test.py scripts/tracd.1

%build
%{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT

# --skip-build causes bad stuff in siteconfig.py as of 0.8.4
%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.cgi \
  $RPM_BUILD_ROOT%{_var}/www/cgi-bin
rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin

install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
rm $RPM_BUILD_ROOT%{_bindir}/tracd

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/
%{_bindir}/trac-admin
%{_bindir}/tracdb2env
%dir %{python_sitelib}/trac/
%{python_sitelib}/trac/*.py
%{python_sitelib}/trac/*.pyc
%ghost %{python_sitelib}/trac/*.pyo
%dir %{python_sitelib}/trac/mimeview/
%{python_sitelib}/trac/mimeview/*.py
%{python_sitelib}/trac/mimeview/*.pyc
%ghost %{python_sitelib}/trac/mimeview/*.pyo
%dir %{python_sitelib}/trac/scripts/
%{python_sitelib}/trac/scripts/*.py
%{python_sitelib}/trac/scripts/*.pyc
%ghost %{python_sitelib}/trac/scripts/*.pyo
%dir %{python_sitelib}/trac/ticket/
%{python_sitelib}/trac/ticket/*.py
%{python_sitelib}/trac/ticket/*.pyc
%ghost %{python_sitelib}/trac/ticket/*.pyo
%dir %{python_sitelib}/trac/upgrades/
%{python_sitelib}/trac/upgrades/*.py
%{python_sitelib}/trac/upgrades/*.pyc
%ghost %{python_sitelib}/trac/upgrades/*.pyo
%dir %{python_sitelib}/trac/versioncontrol/
%{python_sitelib}/trac/versioncontrol/*.py
%{python_sitelib}/trac/versioncontrol/*.pyc
%ghost %{python_sitelib}/trac/versioncontrol/*.pyo
%dir %{python_sitelib}/trac/versioncontrol/web_ui/
%{python_sitelib}/trac/versioncontrol/web_ui/*.py
%{python_sitelib}/trac/versioncontrol/web_ui/*.pyc
%ghost %{python_sitelib}/trac/versioncontrol/web_ui/*.pyo
%dir %{python_sitelib}/trac/web/
%{python_sitelib}/trac/web/*.py
%{python_sitelib}/trac/web/*.pyc
%ghost %{python_sitelib}/trac/web/*.pyo
%dir %{python_sitelib}/trac/wiki/
%{python_sitelib}/trac/wiki/*.py
%{python_sitelib}/trac/wiki/*.pyc
%ghost %{python_sitelib}/trac/wiki/*.pyo
%config(noreplace) /etc/httpd/conf.d/trac.conf
%{_datadir}/trac/
%{_var}/www/cgi-bin/trac.cgi
%{_mandir}/man1/trac-admin.1*
%{_mandir}/man1/tracdb2env.1*

%changelog
* Tue Jan 10 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-2
- removed trac.fcgi (bugzilla #174546, comment #11)
- applied patch (bugzilla #174546, attachment id=123008)

* Mon Jan  9 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-1
- 0.9.3
- removed tracd (bugzilla #174546, comment #6)
- added trac.conf for httpd
- removed %%{python_sitelib}/trac/test.py
- removed comments

* Tue Dec  6 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.2-2
- added /etc/init.d/tracd
- added /etc/sysconfig/tracd

* Tue Dec  6 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.2-1
- 0.9.2
- fixes SQL Injection Vulnerability in ticket search module.
- fixes broken ticket email notifications.

* Sat Dec  3 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.1-1
- 0.9.1
- fixes SQL Injection Vulnerability

* Tue Nov 29 2005 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9-1
- Rebuild for Fedora Extras

* Tue Nov  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.9-1
- 0.9.

* Mon Jun 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.4-0.1
- 0.8.4.
- Move tracd to %%{_sbindir} and man page to section 8.

* Thu Jun 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.3-0.1
- 0.8.3.

* Wed Jun  1 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.2-0.1
- 0.8.2.

* Sun May 29 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.2
- Rebuild for FC4.

* Fri Apr  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.1-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Jan 2006 19:53:59 -0000	1.1
+++ .cvsignore	10 Jan 2006 19:54:52 -0000	1.2
@@ -0,0 +1 @@
+trac-0.9.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Jan 2006 19:53:59 -0000	1.1
+++ sources	10 Jan 2006 19:54:52 -0000	1.2
@@ -0,0 +1 @@
+fce39070081f259020b4d60f044d9082  trac-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 19:59:11 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 10 Jan 2006 14:59:11 -0500
Subject: owners owners.list,1.521,1.522
Message-ID: <200601101959.k0AJxjcV027992@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27975

Modified Files:
	owners.list 
Log Message:
added Trac, an integrated system for managing software projects



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -r1.521 -r1.522
--- owners.list	10 Jan 2006 18:18:53 -0000	1.521
+++ owners.list	10 Jan 2006 19:59:11 -0000	1.522
@@ -1230,6 +1230,7 @@
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info



From fedora-extras-commits at redhat.com  Tue Jan 10 21:14:22 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 16:14:22 -0500
Subject: rpms/perl-Module-Build/FC-4 .cvsignore, 1.7,
	1.8 perl-Module-Build.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200601102114.k0ALEsL8031766@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Build/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31745

Modified Files:
	.cvsignore perl-Module-Build.spec sources 
Log Message:
Update to 0.2611.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Apr 2005 12:31:28 -0000	1.7
+++ .cvsignore	10 Jan 2006 21:14:21 -0000	1.8
@@ -1 +1 @@
-Module-Build-0.2610.tar.gz
+Module-Build-0.2611.tar.gz


Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/perl-Module-Build.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Module-Build.spec	7 May 2005 19:06:22 -0000	1.11
+++ perl-Module-Build.spec	10 Jan 2006 21:14:21 -0000	1.12
@@ -1,57 +1,62 @@
 Name:           perl-Module-Build
-Version:        0.2610
-Release:        3
+Version:        0.2611
+Release:        2%{?dist}
 Summary:        Perl module for building and installing Perl modules
-
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Module-Build/
 Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
 Requires:       perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Perl module for building and installing Perl modules, a replacement to
 ExtUtils::MakeMaker.
 
-
 %prep
 %setup -q -n Module-Build-%{version}
 
-
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
 
-%check || :
-./Build test
+chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
+perldoc -t perlgpl > COPYING
+perldoc -t perlartistic > Artistic
+
+%check
+./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README COPYING Artistic
 %{_bindir}/config_data
 %{perl_vendorlib}/Module
 %{_mandir}/man1/config_data.1*
 %{_mandir}/man3/Module::Build*.3*
 
-
 %changelog
+* Mon Sep 05 2005 Steven Pritchard <steve at kspei.com> - 0.2611-2
+- Minor spec cleanup.
+- Add COPYING and Artistic.
+
+* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> - 0.2611-1
+- Update to 0.2611.
+
 * Sat May  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2610-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Apr 2005 12:31:28 -0000	1.7
+++ sources	10 Jan 2006 21:14:21 -0000	1.8
@@ -1 +1 @@
-a21addf2dbd1725b6b035fbfe65cb30f  Module-Build-0.2610.tar.gz
+d0fa9a7917ed43d1c1f8b707e86b6061  Module-Build-0.2611.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 21:26:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 16:26:54 -0500
Subject: rpms/perl-Module-Build/FC-3 .cvsignore, 1.7,
	1.8 perl-Module-Build.spec, 1.8, 1.9 sources, 1.7, 1.8
Message-ID: <200601102127.k0ALRRVU031877@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Build/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31856

Modified Files:
	.cvsignore perl-Module-Build.spec sources 
Log Message:
Update to 0.2611.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	16 Apr 2005 12:31:28 -0000	1.7
+++ .cvsignore	10 Jan 2006 21:26:54 -0000	1.8
@@ -1 +1 @@
-Module-Build-0.2610.tar.gz
+Module-Build-0.2611.tar.gz


Index: perl-Module-Build.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-3/perl-Module-Build.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Module-Build.spec	16 Apr 2005 12:31:28 -0000	1.8
+++ perl-Module-Build.spec	10 Jan 2006 21:26:54 -0000	1.9
@@ -1,62 +1,71 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Module-Build
-Version:        0.2610
-Release:        1
-Epoch:          0
+Version:        0.2611
+Release:        2%{?dist}
 Summary:        Perl module for building and installing Perl modules
-
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Module-Build/
 Source0:        http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
 Requires:       perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Perl module for building and installing Perl modules, a replacement to
 ExtUtils::MakeMaker.
 
-
 %prep
 %setup -q -n Module-Build-%{version}
 
-
 %build
 %{__perl} Build.PL installdirs=vendor
 ./Build
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
+
 ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-chmod -R u+w $RPM_BUILD_ROOT/*
 
+find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;
 
-%check || :
-./Build test
+chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
+perldoc -t perlgpl > COPYING
+perldoc -t perlartistic > Artistic
+
+%check
+./Build test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr(-,root,root,-)
-%doc Changes README
+%doc Changes README COPYING Artistic
 %{_bindir}/config_data
 %{perl_vendorlib}/Module
 %{_mandir}/man1/config_data.1*
 %{_mandir}/man3/Module::Build*.3*
 
-
 %changelog
-* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2610-1
+* Mon Sep 05 2005 Steven Pritchard <steve at kspei.com> - 0.2611-2
+- Minor spec cleanup.
+- Add COPYING and Artistic.
+
+* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> - 0.2611-1
+- Update to 0.2611.
+
+* Sat May  7 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2610-3
+- Rebuild.
+
+* Sat Apr 16 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.2610-2
 - 0.2610.
+- Trust that %%{perl_vendorlib} is defined.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
 
 * Thu Jan 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.2608-1
 - Update to 0.2608, Test::Harness kludge no longer needed.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Build/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	16 Apr 2005 12:31:28 -0000	1.7
+++ sources	10 Jan 2006 21:26:54 -0000	1.8
@@ -1 +1 @@
-a21addf2dbd1725b6b035fbfe65cb30f  Module-Build-0.2610.tar.gz
+d0fa9a7917ed43d1c1f8b707e86b6061  Module-Build-0.2611.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 22:20:43 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 17:20:43 -0500
Subject: owners owners.list,1.522,1.523
Message-ID: <200601102221.k0AMLG2u001318@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1301/owners

Modified Files:
	owners.list 
Log Message:
updating email for Chris Wright for git-core, cogito, asciidoc



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.522
retrieving revision 1.523
diff -u -r1.522 -r1.523
--- owners.list	10 Jan 2006 19:59:11 -0000	1.522
+++ owners.list	10 Jan 2006 22:20:42 -0000	1.523
@@ -44,7 +44,7 @@
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at osdl.org|extras-qa at fedoraproject.org|
+Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -111,7 +111,7 @@
 Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|clisp|Common Lisp (ANSI CL) implementation|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at osdl.org|extras-qa at fedoraproject.org|
+Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|colorscheme|Generate a variety of colorschemes from a single starting color|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -280,7 +280,7 @@
 Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu||extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|git-core|A distributed SCM|chrisw at osdl.org|extras-qa at fedoraproject.org|
+Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 10 22:27:32 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 10 Jan 2006 17:27:32 -0500
Subject: rpms/gobby/FC-4 gobby.spec,1.7,1.8
Message-ID: <200601102228.k0AMS4FL001804@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1417

Modified Files:
	gobby.spec 
Log Message:
rebuild


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/FC-4/gobby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gobby.spec	9 Jan 2006 00:07:55 -0000	1.7
+++ gobby.spec	10 Jan 2006 22:27:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gobby
 Version:        0.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -66,6 +66,9 @@
 
 
 %changelog
+* Tue Jan 10 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-2
+- Rebuild
+
 * Sun Jan 08 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
 - 0.3.0
 



From fedora-extras-commits at redhat.com  Tue Jan 10 22:41:42 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 17:41:42 -0500
Subject: rpms/python-matplotlib/devel .cvsignore, 1.6,
	1.7 python-matplotlib.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200601102242.k0AMgF0d001912@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1884

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Log Message:
Update to 0.86



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Nov 2005 17:25:38 -0000	1.6
+++ .cvsignore	10 Jan 2006 22:41:42 -0000	1.7
@@ -1 +1 @@
-matplotlib-0.85.tar.gz
+matplotlib-0.86.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-matplotlib.spec	23 Dec 2005 00:03:38 -0000	1.12
+++ python-matplotlib.spec	10 Jan 2006 22:41:42 -0000	1.13
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.85
-Release:        2%{?dist}
+Version:        0.86
+Release:        1%{?dist}
 Summary:        Python plotting library
 
 Group:          Development/Libraries
@@ -24,6 +24,7 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
+chmod -x images/*.svg
 
 %build
 %{__python} setup.py build
@@ -32,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
-chmod -x $RPM_BUILD_ROOT%{_datadir}/matplotlib/*.svg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,9 +45,11 @@
 %doc NUMARRAY_ISSUES PKG-INFO TODO
 %{python_sitearch}/matplotlib/
 %{python_sitearch}/pylab.py*
-%{_datadir}/matplotlib/
 
 %changelog
+* Tue Jan 10 2006 Orion Poplawski <orion at cora.nwra.com> 0.86-1
+- Update to 0.86
+
 * Thu Dec 22 2005 Orion Poplawski <orion at cora.nwra.com> 0.85-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Nov 2005 17:25:38 -0000	1.6
+++ sources	10 Jan 2006 22:41:42 -0000	1.7
@@ -1 +1 @@
-4890ef6bd7a1a83acf579d4cbb6d237c  matplotlib-0.85.tar.gz
+4770cbcddabcbab72d48fbb237ed5d8c  matplotlib-0.86.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 22:48:37 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 10 Jan 2006 17:48:37 -0500
Subject: rpms/python-matplotlib/FC-4 .cvsignore, 1.6,
	1.7 python-matplotlib.spec, 1.11, 1.12 sources, 1.6, 1.7
Message-ID: <200601102249.k0AMn9dA002004@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/python-matplotlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1978

Modified Files:
	.cvsignore python-matplotlib.spec sources 
Log Message:
Update to 0.86



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Nov 2005 18:21:46 -0000	1.6
+++ .cvsignore	10 Jan 2006 22:48:37 -0000	1.7
@@ -1 +1 @@
-matplotlib-0.85.tar.gz
+matplotlib-0.86.tar.gz


Index: python-matplotlib.spec
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/python-matplotlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- python-matplotlib.spec	20 Nov 2005 18:21:46 -0000	1.11
+++ python-matplotlib.spec	10 Jan 2006 22:48:37 -0000	1.12
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-matplotlib
-Version:        0.85
+Version:        0.86
 Release:        1%{?dist}
 Summary:        Python plotting library
 
@@ -24,6 +24,7 @@
 
 %prep
 %setup -q -n matplotlib-%{version}
+chmod -x images/*.svg
 
 %build
 %{__python} setup.py build
@@ -32,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 chmod +x $RPM_BUILD_ROOT%{python_sitearch}/matplotlib/dates.py
-chmod -x $RPM_BUILD_ROOT%{_datadir}/matplotlib/*.svg
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,9 +45,11 @@
 %doc NUMARRAY_ISSUES PKG-INFO TODO
 %{python_sitearch}/matplotlib/
 %{python_sitearch}/pylab.py*
-%{_datadir}/matplotlib/
 
 %changelog
+* Tue Jan 10 2006 Orion Poplawski <orion at cora.nwra.com> 0.86-1
+- Update to 0.86
+
 * Sun Nov 20 2005 Orion Poplawski <orion at cora.nwra.com> 0.85-1
 - New upstream version 0.85
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-matplotlib/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Nov 2005 18:21:46 -0000	1.6
+++ sources	10 Jan 2006 22:48:37 -0000	1.7
@@ -1 +1 @@
-4890ef6bd7a1a83acf579d4cbb6d237c  matplotlib-0.85.tar.gz
+4770cbcddabcbab72d48fbb237ed5d8c  matplotlib-0.86.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 10 23:42:15 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 18:42:15 -0500
Subject: rpms/git-core/devel git.spec, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 git-core.spec, 1.12, NONE
Message-ID: <200601102342.k0ANglkA003967@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3931

Modified Files:
	.cvsignore sources 
Added Files:
	git.spec 
Removed Files:
	git-core.spec 
Log Message:
Update git 1.1.0



--- NEW FILE git.spec ---
# Pass --without docs to rpmbuild if you don't want the documentation
# Pass --with email to rpmbuild if you want git-email (more perl dependencies)
Name: 		git
Version: 	1.1.0
Release: 	1%{?dist}
Summary:  	Git core and tools
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/git/
Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk

%description
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

This is a dummy package which brings in all subpackages.

%package core
Summary:	Core git tools
Group:		Development/Tools
Requires:	zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
%description core
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

These are the core tools with minimal dependencies.

%package svn
Summary:        Git tools for importing Subversion repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, subversion
%description svn
Git tools for importing Subversion repositories.

%package cvs
Summary:        Git tools for importing CVS repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, cvs, cvsps
%description cvs
Git tools for importing CVS repositories.

%package arch
Summary:        Git tools for importing Arch repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tla
%description arch
Git tools for importing Arch repositories.

%if %{?_with_email:1}0
%package email
Summary:        Git tools for sending email
Group:          Development/Tools
Requires:	git-core = %{version}-%{release} 
%description email
Git tools for sending email.
%endif

%package -n gitk
Summary:        Git revision tree visualiser ('gitk')
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tk >= 8.4
%description -n gitk
Git revision tree visualiser ('gitk')

%prep
%setup -q

%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} all %{!?_without_docs: doc}

%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} mandir=%{_mandir} \
     install %{!?_without_docs: install-doc}

(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
# These are no files in the root package

%files svn
%defattr(-,root,root)
%{_bindir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }

%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }

%files arch
%defattr(-,root,root)
%doc Documentation/*arch*.txt
%{_bindir}/*arch*
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
%{!?_without_docs: %doc Documentation/*arch*.html }

%if %{?_with_email:1}0
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{_bindir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%endif

%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/*gitk*
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }

%files core -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }

%changelog
* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
- Update to latest git-1.1.0 (drop git-email for now)
- Now creates multiple packages:
-	 git-core, git-svn, git-cvs, git-arch, gitk

* Mon Nov 14 2005 H. Peter Anvin <hpa at zytor.com> 0.99.9j-1
- Change subpackage names to git-<name> instead of git-core-<name>
- Create empty root package which brings in all subpackages
- Rename git-tk -> gitk

* Thu Nov 10 2005 Chris Wright <chrisw at osdl.org> 0.99.9g-1
- zlib dependency fix
- Minor cleanups from split
- Move arch import to separate package as well

* Tue Sep 27 2005 Jim Radford <radford at blackbean.org>
- Move programs with non-standard dependencies (svn, cvs, email)
  into separate packages

* Tue Sep 27 2005 H. Peter Anvin <hpa at zytor.com>
- parallelize build
- COPTS -> CFLAGS

* Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.99.6-1
- update to 0.99.6

* Fri Sep 16 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Linus noticed that less is required, added to the dependencies

* Sun Sep 11 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Updated dependencies
- Don't assume manpages are gzipped

* Thu Aug 18 2005 Chris Wright <chrisw at osdl.org> 0.99.4-4
- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
- use RPM_OPT_FLAGS in spec file, drop patch0

* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.99.4-3
- use dist tag to differentiate between branches
- use rpm optflags by default (patch0)
- own %{_datadir}/git-core/

* Mon Aug 15 2005 Chris Wright <chrisw at osdl.org>
- update spec file to fix Buildroot, Requires, and drop Vendor

* Sun Aug 07 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Redid the description
- Cut overlong make line, loosened changelog a bit
- I think Junio (or perhaps OSDL?) should be vendor...

* Thu Jul 14 2005 Eric Biederman <ebiederm at xmission.com>
- Add the man pages, and the --without docs build option

* Wed Jul 7 2005 Chris Wright <chris at osdl.org>
- initial git spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Oct 2005 06:17:33 -0000	1.12
+++ .cvsignore	10 Jan 2006 23:42:14 -0000	1.13
@@ -1 +1 @@
-git-core-0.99.9a.tar.gz
+git-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2005 06:17:33 -0000	1.12
+++ sources	10 Jan 2006 23:42:14 -0000	1.13
@@ -1 +1 @@
-c7e8d98eb5b260c9d4d0d4fcad64a92f  git-core-0.99.9a.tar.gz
+8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz


--- git-core.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 10 23:44:40 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 18:44:40 -0500
Subject: rpms/git-core/FC-4 git.spec, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 git-core.spec, 1.11, NONE
Message-ID: <200601102345.k0ANjCHe004054@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4032

Modified Files:
	.cvsignore sources 
Added Files:
	git.spec 
Removed Files:
	git-core.spec 
Log Message:
Update git to 1.1.0



--- NEW FILE git.spec ---
# Pass --without docs to rpmbuild if you don't want the documentation
# Pass --with email to rpmbuild if you want git-email (more perl dependencies)
Name: 		git
Version: 	1.1.0
Release: 	1%{?dist}
Summary:  	Git core and tools
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/git/
Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk

%description
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

This is a dummy package which brings in all subpackages.

%package core
Summary:	Core git tools
Group:		Development/Tools
Requires:	zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
%description core
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

These are the core tools with minimal dependencies.

%package svn
Summary:        Git tools for importing Subversion repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, subversion
%description svn
Git tools for importing Subversion repositories.

%package cvs
Summary:        Git tools for importing CVS repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, cvs, cvsps
%description cvs
Git tools for importing CVS repositories.

%package arch
Summary:        Git tools for importing Arch repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tla
%description arch
Git tools for importing Arch repositories.

%if %{?_with_email:1}0
%package email
Summary:        Git tools for sending email
Group:          Development/Tools
Requires:	git-core = %{version}-%{release} 
%description email
Git tools for sending email.
%endif

%package -n gitk
Summary:        Git revision tree visualiser ('gitk')
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tk >= 8.4
%description -n gitk
Git revision tree visualiser ('gitk')

%prep
%setup -q

%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} all %{!?_without_docs: doc}

%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} mandir=%{_mandir} \
     install %{!?_without_docs: install-doc}

(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
# These are no files in the root package

%files svn
%defattr(-,root,root)
%{_bindir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }

%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }

%files arch
%defattr(-,root,root)
%doc Documentation/*arch*.txt
%{_bindir}/*arch*
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
%{!?_without_docs: %doc Documentation/*arch*.html }

%if %{?_with_email:1}0
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{_bindir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%endif

%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/*gitk*
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }

%files core -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }

%changelog
* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
- Update to latest git-1.1.0 (drop git-email for now)
- Now creates multiple packages:
-	 git-core, git-svn, git-cvs, git-arch, gitk

* Mon Nov 14 2005 H. Peter Anvin <hpa at zytor.com> 0.99.9j-1
- Change subpackage names to git-<name> instead of git-core-<name>
- Create empty root package which brings in all subpackages
- Rename git-tk -> gitk

* Thu Nov 10 2005 Chris Wright <chrisw at osdl.org> 0.99.9g-1
- zlib dependency fix
- Minor cleanups from split
- Move arch import to separate package as well

* Tue Sep 27 2005 Jim Radford <radford at blackbean.org>
- Move programs with non-standard dependencies (svn, cvs, email)
  into separate packages

* Tue Sep 27 2005 H. Peter Anvin <hpa at zytor.com>
- parallelize build
- COPTS -> CFLAGS

* Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.99.6-1
- update to 0.99.6

* Fri Sep 16 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Linus noticed that less is required, added to the dependencies

* Sun Sep 11 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Updated dependencies
- Don't assume manpages are gzipped

* Thu Aug 18 2005 Chris Wright <chrisw at osdl.org> 0.99.4-4
- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
- use RPM_OPT_FLAGS in spec file, drop patch0

* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.99.4-3
- use dist tag to differentiate between branches
- use rpm optflags by default (patch0)
- own %{_datadir}/git-core/

* Mon Aug 15 2005 Chris Wright <chrisw at osdl.org>
- update spec file to fix Buildroot, Requires, and drop Vendor

* Sun Aug 07 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Redid the description
- Cut overlong make line, loosened changelog a bit
- I think Junio (or perhaps OSDL?) should be vendor...

* Thu Jul 14 2005 Eric Biederman <ebiederm at xmission.com>
- Add the man pages, and the --without docs build option

* Wed Jul 7 2005 Chris Wright <chris at osdl.org>
- initial git spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Oct 2005 06:16:10 -0000	1.12
+++ .cvsignore	10 Jan 2006 23:44:39 -0000	1.13
@@ -1 +1 @@
-git-core-0.99.9a.tar.gz
+git-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2005 06:16:10 -0000	1.12
+++ sources	10 Jan 2006 23:44:39 -0000	1.13
@@ -1 +1 @@
-c7e8d98eb5b260c9d4d0d4fcad64a92f  git-core-0.99.9a.tar.gz
+8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz


--- git-core.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 10 23:46:19 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 18:46:19 -0500
Subject: rpms/git-core/FC-3 git.spec, NONE, 1.1 .cvsignore, 1.12,
	1.13 sources, 1.12, 1.13 git-core.spec, 1.11, NONE
Message-ID: <200601102346.k0ANkpBt004134@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4114

Modified Files:
	.cvsignore sources 
Added Files:
	git.spec 
Removed Files:
	git-core.spec 
Log Message:
Update git to 1.1.0



--- NEW FILE git.spec ---
# Pass --without docs to rpmbuild if you don't want the documentation
# Pass --with email to rpmbuild if you want git-email (more perl dependencies)
Name: 		git
Version: 	1.1.0
Release: 	1%{?dist}
Summary:  	Git core and tools
License: 	GPL
Group: 		Development/Tools
URL: 		http://kernel.org/pub/software/scm/git/
Source: 	http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	git-core, git-svn, git-cvs, git-arch, %{?_with_email: git-email}, gitk

%description
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

This is a dummy package which brings in all subpackages.

%package core
Summary:	Core git tools
Group:		Development/Tools
Requires:	zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
%description core
This is a stupid (but extremely fast) directory content manager.  It
doesn't do a whole lot, but what it _does_ do is track directory
contents efficiently. It is intended to be the base of an efficient,
distributed source code management system. This package includes
rudimentary tools that can be used as a SCM, but you should look
elsewhere for tools for ordinary humans layered on top of this.

These are the core tools with minimal dependencies.

%package svn
Summary:        Git tools for importing Subversion repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, subversion
%description svn
Git tools for importing Subversion repositories.

%package cvs
Summary:        Git tools for importing CVS repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, cvs, cvsps
%description cvs
Git tools for importing CVS repositories.

%package arch
Summary:        Git tools for importing Arch repositories
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tla
%description arch
Git tools for importing Arch repositories.

%if %{?_with_email:1}0
%package email
Summary:        Git tools for sending email
Group:          Development/Tools
Requires:	git-core = %{version}-%{release} 
%description email
Git tools for sending email.
%endif

%package -n gitk
Summary:        Git revision tree visualiser ('gitk')
Group:          Development/Tools
Requires:       git-core = %{version}-%{release}, tk >= 8.4
%description -n gitk
Git revision tree visualiser ('gitk')

%prep
%setup -q

%build
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} all %{!?_without_docs: doc}

%install
rm -rf $RPM_BUILD_ROOT
make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease %{?_with_email:WITH_SEND_EMAIL=1} \
     prefix=%{_prefix} mandir=%{_mandir} \
     install %{!?_without_docs: install-doc}

(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|%{?_with_email:email|}gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%files
# These are no files in the root package

%files svn
%defattr(-,root,root)
%{_bindir}/*svn*
%doc Documentation/*svn*.txt
%{!?_without_docs: %{_mandir}/man1/*svn*.1*}
%{!?_without_docs: %doc Documentation/*svn*.html }

%files cvs
%defattr(-,root,root)
%doc Documentation/*git-cvs*.txt
%{_bindir}/*cvs*
%{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
%{!?_without_docs: %doc Documentation/*git-cvs*.html }

%files arch
%defattr(-,root,root)
%doc Documentation/*arch*.txt
%{_bindir}/*arch*
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
%{!?_without_docs: %doc Documentation/*arch*.html }

%if %{?_with_email:1}0
%files email
%defattr(-,root,root)
%doc Documentation/*email*.txt
%{_bindir}/*email*
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
%{!?_without_docs: %doc Documentation/*email*.html }
%endif

%files -n gitk
%defattr(-,root,root)
%doc Documentation/*gitk*.txt
%{_bindir}/*gitk*
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
%{!?_without_docs: %doc Documentation/*gitk*.html }

%files core -f bin-man-doc-files
%defattr(-,root,root)
%{_datadir}/git-core/
%doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html }

%changelog
* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
- Update to latest git-1.1.0 (drop git-email for now)
- Now creates multiple packages:
-	 git-core, git-svn, git-cvs, git-arch, gitk

* Mon Nov 14 2005 H. Peter Anvin <hpa at zytor.com> 0.99.9j-1
- Change subpackage names to git-<name> instead of git-core-<name>
- Create empty root package which brings in all subpackages
- Rename git-tk -> gitk

* Thu Nov 10 2005 Chris Wright <chrisw at osdl.org> 0.99.9g-1
- zlib dependency fix
- Minor cleanups from split
- Move arch import to separate package as well

* Tue Sep 27 2005 Jim Radford <radford at blackbean.org>
- Move programs with non-standard dependencies (svn, cvs, email)
  into separate packages

* Tue Sep 27 2005 H. Peter Anvin <hpa at zytor.com>
- parallelize build
- COPTS -> CFLAGS

* Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.99.6-1
- update to 0.99.6

* Fri Sep 16 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Linus noticed that less is required, added to the dependencies

* Sun Sep 11 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Updated dependencies
- Don't assume manpages are gzipped

* Thu Aug 18 2005 Chris Wright <chrisw at osdl.org> 0.99.4-4
- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
- use RPM_OPT_FLAGS in spec file, drop patch0

* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.99.4-3
- use dist tag to differentiate between branches
- use rpm optflags by default (patch0)
- own %{_datadir}/git-core/

* Mon Aug 15 2005 Chris Wright <chrisw at osdl.org>
- update spec file to fix Buildroot, Requires, and drop Vendor

* Sun Aug 07 2005 Horst H. von Brand <vonbrand at inf.utfsm.cl>
- Redid the description
- Cut overlong make line, loosened changelog a bit
- I think Junio (or perhaps OSDL?) should be vendor...

* Thu Jul 14 2005 Eric Biederman <ebiederm at xmission.com>
- Add the man pages, and the --without docs build option

* Wed Jul 7 2005 Chris Wright <chris at osdl.org>
- initial git spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Oct 2005 06:14:32 -0000	1.12
+++ .cvsignore	10 Jan 2006 23:46:18 -0000	1.13
@@ -1 +1 @@
-git-core-0.99.9a.tar.gz
+git-1.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	31 Oct 2005 06:14:32 -0000	1.12
+++ sources	10 Jan 2006 23:46:18 -0000	1.13
@@ -1 +1 @@
-c7e8d98eb5b260c9d4d0d4fcad64a92f  git-core-0.99.9a.tar.gz
+8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz


--- git-core.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Jan 11 01:00:29 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 20:00:29 -0500
Subject: rpms/perl-HTML-Mason/devel .cvsignore, 1.2, 1.3 perl-HTML-Mason.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601110101.k0B111V5007072@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6238

Modified Files:
	.cvsignore perl-HTML-Mason.spec sources 
Log Message:
Update to 1.32.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2005 02:09:55 -0000	1.2
+++ .cvsignore	11 Jan 2006 01:00:28 -0000	1.3
@@ -1 +1 @@
-HTML-Mason-1.3101.tar.gz
+HTML-Mason-1.32.tar.gz


Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-HTML-Mason.spec	16 Sep 2005 20:17:49 -0000	1.2
+++ perl-HTML-Mason.spec	11 Jan 2006 01:00:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Mason
-Version:        1.3101
-Release:        3%{?dist}
+Version:        1.32
+Release:        1%{?dist}
 Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -80,6 +80,9 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 1.32-1
+- Update to 1.32
+
 * Thu Sep 15 2005 Steven Pritchard <steve at kspei.com> 1.3101-3
 - Filter bogus provides/requires introduced by eg/ and samples/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2005 02:09:55 -0000	1.2
+++ sources	11 Jan 2006 01:00:28 -0000	1.3
@@ -1 +1 @@
-4904681296efeb9c58bf0d9926d37407  HTML-Mason-1.3101.tar.gz
+b0abfdd869d828a0ebbf2f64cfb9d094  HTML-Mason-1.32.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:19:53 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:19:53 -0500
Subject: rpms/cogito/devel .cvsignore, 1.4, 1.5 cogito.spec, 1.5, 1.6 sources,
	1.4, 1.5
Message-ID: <200601110120.k0B1KPnn008089@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8066

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2005 01:36:52 -0000	1.4
+++ .cvsignore	11 Jan 2006 01:19:52 -0000	1.5
@@ -1 +1 @@
-cogito-0.15.1.tar.gz
+cogito-0.16.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cogito.spec	11 Oct 2005 01:36:52 -0000	1.5
+++ cogito.spec	11 Jan 2006 01:19:52 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.15.1
+Version: 	0.16.2
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,8 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 0.99.7
+Requires: 	git-core >= 0.99.9
+BuildRequires: 	asciidoc
 BuildArch:	noarch
 
 %description
@@ -21,11 +22,13 @@
 
 %build
 
-make
+make all doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito mandir=%{_mandir} \
+	install install-doc
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/doc/cogito/txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,9 +38,19 @@
 %{_bindir}/*
 %dir %{_libdir}/cogito
 %{_libdir}/cogito/*
-%doc README COPYING Documentation/*
+%{_mandir}/man*/*
+%doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
+- 0.16.2
+
+* Tue Nov 1 2005 Pavel Roskin <proski at gnu.org> 0.15.1-1
+- generate and include manuals
+
+* Tue Oct 11 2005 Chris Wright <chrisw at osdl.org> 0.15.1-1
+- use %dist
+
 * Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.14.1-2
 - fix _libdir breakage on 64-bit, the irony...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Oct 2005 01:36:52 -0000	1.4
+++ sources	11 Jan 2006 01:19:52 -0000	1.5
@@ -1 +1 @@
-a0aa1db2e90b991d52e848be0926a74c  cogito-0.15.1.tar.gz
+94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:23:15 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:23:15 -0500
Subject: rpms/cogito/FC-4 .cvsignore, 1.4, 1.5 cogito.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601110123.k0B1NlNF008188@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8159

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2005 01:38:02 -0000	1.4
+++ .cvsignore	11 Jan 2006 01:23:14 -0000	1.5
@@ -1 +1 @@
-cogito-0.15.1.tar.gz
+cogito-0.16.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cogito.spec	11 Oct 2005 01:38:02 -0000	1.4
+++ cogito.spec	11 Jan 2006 01:23:14 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.15.1
+Version: 	0.16.2
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,8 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 0.99.7
+Requires: 	git-core >= 0.99.9
+BuildRequires: 	asciidoc
 BuildArch:	noarch
 
 %description
@@ -21,11 +22,13 @@
 
 %build
 
-make
+make all doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito mandir=%{_mandir} \
+	install install-doc
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/doc/cogito/txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,9 +38,19 @@
 %{_bindir}/*
 %dir %{_libdir}/cogito
 %{_libdir}/cogito/*
-%doc README COPYING Documentation/*
+%{_mandir}/man*/*
+%doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
+- 0.16.2
+
+* Tue Nov 1 2005 Pavel Roskin <proski at gnu.org> 0.15.1-1
+- generate and include manuals
+
+* Tue Oct 11 2005 Chris Wright <chrisw at osdl.org> 0.15.1-1
+- use %dist
+
 * Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.14.1-2
 - fix _libdir breakage on 64-bit, the irony...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Oct 2005 01:38:02 -0000	1.4
+++ sources	11 Jan 2006 01:23:14 -0000	1.5
@@ -1 +1 @@
-a0aa1db2e90b991d52e848be0926a74c  cogito-0.15.1.tar.gz
+94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:25:44 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:25:44 -0500
Subject: rpms/cogito/FC-3 .cvsignore, 1.4, 1.5 cogito.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601110126.k0B1QG6O008274@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8251

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.16.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Oct 2005 01:40:21 -0000	1.4
+++ .cvsignore	11 Jan 2006 01:25:44 -0000	1.5
@@ -1 +1 @@
-cogito-0.15.1.tar.gz
+cogito-0.16.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cogito.spec	11 Oct 2005 01:40:21 -0000	1.4
+++ cogito.spec	11 Jan 2006 01:25:44 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		cogito
-Version: 	0.15.1
+Version: 	0.16.2
 Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
@@ -7,7 +7,8 @@
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: 	git-core >= 0.99.7
+Requires: 	git-core >= 0.99.9
+BuildRequires: 	asciidoc
 BuildArch:	noarch
 
 %description
@@ -21,11 +22,13 @@
 
 %build
 
-make
+make all doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito mandir=%{_mandir} \
+	install install-doc
+rm -rf $RPM_BUILD_ROOT/%{_prefix}/share/doc/cogito/txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -35,9 +38,19 @@
 %{_bindir}/*
 %dir %{_libdir}/cogito
 %{_libdir}/cogito/*
-%doc README COPYING Documentation/*
+%{_mandir}/man*/*
+%doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
+- 0.16.2
+
+* Tue Nov 1 2005 Pavel Roskin <proski at gnu.org> 0.15.1-1
+- generate and include manuals
+
+* Tue Oct 11 2005 Chris Wright <chrisw at osdl.org> 0.15.1-1
+- use %dist
+
 * Fri Sep 16 2005 Chris Wright <chrisw at osdl.org> 0.14.1-2
 - fix _libdir breakage on 64-bit, the irony...
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Oct 2005 01:40:21 -0000	1.4
+++ sources	11 Jan 2006 01:25:44 -0000	1.5
@@ -1 +1 @@
-a0aa1db2e90b991d52e848be0926a74c  cogito-0.15.1.tar.gz
+94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 01:43:39 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:43:39 -0500
Subject: rpms/cogito/FC-3 cogito.spec,1.5,1.6
Message-ID: <200601110144.k0B1iBGS008434@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8413

Modified Files:
	cogito.spec 
Log Message:
Add xlmto build dependency



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cogito.spec	11 Jan 2006 01:25:44 -0000	1.5
+++ cogito.spec	11 Jan 2006 01:43:39 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.16.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -8,7 +8,7 @@
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: 	git-core >= 0.99.9
-BuildRequires: 	asciidoc
+BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
 %description
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
+- add xmlto to BuildRequires
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
 - 0.16.2
 



From fedora-extras-commits at redhat.com  Wed Jan 11 01:51:12 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:51:12 -0500
Subject: rpms/cogito/FC-4 cogito.spec,1.5,1.6
Message-ID: <200601110151.k0B1pirl008532@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8511

Modified Files:
	cogito.spec 
Log Message:
Add xlmto build dependency



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cogito.spec	11 Jan 2006 01:23:14 -0000	1.5
+++ cogito.spec	11 Jan 2006 01:51:12 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.16.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -8,7 +8,7 @@
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: 	git-core >= 0.99.9
-BuildRequires: 	asciidoc
+BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
 %description
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
+- add xmlto to BuildRequires
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
 - 0.16.2
 



From fedora-extras-commits at redhat.com  Wed Jan 11 01:52:43 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 10 Jan 2006 20:52:43 -0500
Subject: rpms/cogito/devel cogito.spec,1.6,1.7
Message-ID: <200601110153.k0B1rFp9008621@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8600

Modified Files:
	cogito.spec 
Log Message:
Add xlmto build dependency



Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cogito.spec	11 Jan 2006 01:19:52 -0000	1.6
+++ cogito.spec	11 Jan 2006 01:52:42 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		cogito
 Version: 	0.16.2
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -8,7 +8,7 @@
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: 	git-core >= 0.99.9
-BuildRequires: 	asciidoc
+BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
 %description
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
+- add xmlto to BuildRequires
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-1
 - 0.16.2
 



From fedora-extras-commits at redhat.com  Wed Jan 11 02:26:50 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 21:26:50 -0500
Subject: rpms/perl-Exception-Class/devel .cvsignore, 1.2,
	1.3 perl-Exception-Class.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601110227.k0B2RMli010640@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Exception-Class/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10619

Modified Files:
	.cvsignore perl-Exception-Class.spec sources 
Log Message:
Update to 1.22.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Aug 2005 22:51:45 -0000	1.2
+++ .cvsignore	11 Jan 2006 02:26:49 -0000	1.3
@@ -1 +1 @@
-Exception-Class-1.21.tar.gz
+Exception-Class-1.22.tar.gz


Index: perl-Exception-Class.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Exception-Class.spec	6 Sep 2005 00:33:52 -0000	1.3
+++ perl-Exception-Class.spec	11 Jan 2006 02:26:49 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Exception-Class
-Version:        1.21
-Release:        3%{?dist}
+Version:        1.22
+Release:        1%{?dist}
 Summary:        Exception::Class Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 1.22-1
+- Update to 1.22
+
 * Mon Sep 05 2005 Steven Pritchard <steve at kspei.com> 1.21-3
 - Remove explicit core module dependencies
 - Add COPYING and Artistic


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Aug 2005 22:51:45 -0000	1.2
+++ sources	11 Jan 2006 02:26:49 -0000	1.3
@@ -1 +1 @@
-3268817e7fa4367209f666bd8e33037c  Exception-Class-1.21.tar.gz
+ad8bb64e8473ba5817a2b329ec7dde42  Exception-Class-1.22.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 02:47:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 21:47:43 -0500
Subject: rpms/perl-DateTime/devel .cvsignore, 1.2, 1.3 perl-DateTime.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601110248.k0B2mFs9010734@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-DateTime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10713

Modified Files:
	.cvsignore perl-DateTime.spec sources 
Log Message:
Update DateTime to 0.30.
Update DateTime::TimeZone to 0.40.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Sep 2005 20:15:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 02:47:43 -0000	1.3
@@ -1,3 +1,3 @@
-DateTime-0.2901.tar.gz
+DateTime-0.30.tar.gz
 DateTime-Locale-0.22.tar.gz
-DateTime-TimeZone-0.37.tar.gz
+DateTime-TimeZone-0.40.tar.gz


Index: perl-DateTime.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/perl-DateTime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-DateTime.spec	16 Sep 2005 20:15:06 -0000	1.1
+++ perl-DateTime.spec	11 Jan 2006 02:47:43 -0000	1.2
@@ -1,14 +1,14 @@
-%define DTTimeZone_version 0.37
+%define DTTimeZone_version 0.40
 %define DTLocale_version 0.22
 
 Name:           perl-DateTime
-Version:        0.2901
-Release:        2%{?dist}
+Version:        0.30
+Release:        1%{?dist}
 Summary:        DateTime Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/DateTime/
-Source0:        http://www.cpan.org/modules/by-module/DateTime/DateTime-0.2901.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/DateTime/DateTime-%{version}.tar.gz
 Source1:        http://www.cpan.org/modules/by-module/DateTime/DateTime-TimeZone-%{DTTimeZone_version}.tar.gz
 Source2:        http://www.cpan.org/modules/by-module/DateTime/DateTime-Locale-%{DTLocale_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -125,6 +125,10 @@
 %{perl_vendorarch}/DateTime*.pm
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 0.30-1
+- Update DateTime to 0.30
+- Update DateTime::TimeZone to 0.40
+
 * Fri Sep 16 2005 Paul Howarth <paul at city-fan.org> 0.2901-2
 - Unpack each tarball only once
 - Use Module::Build's build script where available


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DateTime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Sep 2005 20:15:06 -0000	1.2
+++ sources	11 Jan 2006 02:47:43 -0000	1.3
@@ -1,3 +1,3 @@
-f96816e634700ae3c8bd849f97856861  DateTime-0.2901.tar.gz
+18cf4a7cece737e0a153c6585320730f  DateTime-0.30.tar.gz
 bcf9fa78efa8d00fad1293b9d860ce75  DateTime-Locale-0.22.tar.gz
-1adf3f14eda8faccaf5564437eadcfd5  DateTime-TimeZone-0.37.tar.gz
+63aac436ede010ebcb472f3b41215ed0  DateTime-TimeZone-0.40.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 02:57:48 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 10 Jan 2006 21:57:48 -0500
Subject: rpms/perl-BerkeleyDB/devel .cvsignore, 1.2, 1.3 perl-BerkeleyDB.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200601110258.k0B2wKm0010836@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-BerkeleyDB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10815

Modified Files:
	.cvsignore perl-BerkeleyDB.spec sources 
Log Message:
Update to 0.27.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Aug 2005 23:43:35 -0000	1.2
+++ .cvsignore	11 Jan 2006 02:57:47 -0000	1.3
@@ -1 +1 @@
-BerkeleyDB-0.26.tar.gz
+BerkeleyDB-0.27.tar.gz


Index: perl-BerkeleyDB.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/perl-BerkeleyDB.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-BerkeleyDB.spec	12 Oct 2005 16:18:47 -0000	1.5
+++ perl-BerkeleyDB.spec	11 Jan 2006 02:57:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-BerkeleyDB
-Version:        0.26
-Release:        6%{?dist}
+Version:        0.27
+Release:        1%{?dist}
 Summary:        BerkeleyDB Perl module
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -60,6 +60,9 @@
 %{_bindir}/*
 
 %changelog
+* Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 0.27-1
+- Update to 0.27
+
 * Wed Oct 12 2005 Steven Pritchard <steve at kspei.com> 0.26-6
 - Another rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-BerkeleyDB/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Aug 2005 23:43:35 -0000	1.2
+++ sources	11 Jan 2006 02:57:47 -0000	1.3
@@ -1 +1 @@
-6e9882f4e4bac48b24079d082af30e6c  BerkeleyDB-0.26.tar.gz
+43aa72c0c6941af0d656d749ad543e96  BerkeleyDB-0.27.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 05:59:22 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 11 Jan 2006 00:59:22 -0500
Subject: rpms/git-core/devel .cvsignore, 1.13, 1.14 git.spec, 1.1,
	1.2 sources, 1.13, 1.14
Message-ID: <200601110559.k0B5xtRs016688@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16667

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update git to 1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Jan 2006 23:42:14 -0000	1.13
+++ .cvsignore	11 Jan 2006 05:59:22 -0000	1.14
@@ -1 +1 @@
-git-1.1.0.tar.gz
+git-1.1.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.spec	10 Jan 2006 23:42:14 -0000	1.1
+++ git.spec	11 Jan 2006 05:59:22 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.0
+Version: 	1.1.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
+- git-1.1.1
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Jan 2006 23:42:14 -0000	1.13
+++ sources	11 Jan 2006 05:59:22 -0000	1.14
@@ -1 +1 @@
-8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz
+f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 06:01:34 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 11 Jan 2006 01:01:34 -0500
Subject: rpms/git-core/FC-4 .cvsignore, 1.13, 1.14 git.spec, 1.1, 1.2 sources,
	1.13, 1.14
Message-ID: <200601110602.k0B626Up018378@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18348

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Jan 2006 23:44:39 -0000	1.13
+++ .cvsignore	11 Jan 2006 06:01:32 -0000	1.14
@@ -1 +1 @@
-git-1.1.0.tar.gz
+git-1.1.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.spec	10 Jan 2006 23:44:39 -0000	1.1
+++ git.spec	11 Jan 2006 06:01:32 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.0
+Version: 	1.1.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
+- git-1.1.1
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Jan 2006 23:44:39 -0000	1.13
+++ sources	11 Jan 2006 06:01:32 -0000	1.14
@@ -1 +1 @@
-8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz
+f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 06:05:47 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 11 Jan 2006 01:05:47 -0500
Subject: rpms/git-core/FC-3 .cvsignore, 1.13, 1.14 git.spec, 1.1, 1.2 sources,
	1.13, 1.14
Message-ID: <200601110606.k0B66KBR018510@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	10 Jan 2006 23:46:18 -0000	1.13
+++ .cvsignore	11 Jan 2006 06:05:47 -0000	1.14
@@ -1 +1 @@
-git-1.1.0.tar.gz
+git-1.1.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- git.spec	10 Jan 2006 23:46:18 -0000	1.1
+++ git.spec	11 Jan 2006 06:05:47 -0000	1.2
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.0
+Version: 	1.1.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
+- git-1.1.1
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.0-1
 - Update to latest git-1.1.0 (drop git-email for now)
 - Now creates multiple packages:


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	10 Jan 2006 23:46:18 -0000	1.13
+++ sources	11 Jan 2006 06:05:47 -0000	1.14
@@ -1 +1 @@
-8dce75185c3b7fb59113c09f1899c38d  git-1.1.0.tar.gz
+f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 06:13:52 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Wed, 11 Jan 2006 01:13:52 -0500
Subject: rpms/paps/devel .cvsignore, 1.5, 1.6 paps.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200601110614.k0B6EOtl018641@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18616

Modified Files:
	.cvsignore paps.spec sources 
Log Message:
* Wed Jan 11 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.3-1
- New upstream release.
- paps-0.6.2-fix-bufferoverflow.patch: removed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 09:39:00 -0000	1.5
+++ .cvsignore	11 Jan 2006 06:13:52 -0000	1.6
@@ -5,3 +5,4 @@
 paps-0.5.tgz
 paps-0.6.1.tar.gz
 paps-0.6.2.tar.gz
+paps-0.6.3.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- paps.spec	21 Dec 2005 09:39:00 -0000	1.4
+++ paps.spec	11 Jan 2006 06:13:52 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		paps
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?dist}
 
 License:	LGPL
@@ -8,7 +8,6 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
 Patch0:		paps-0.6.1-makefile.patch
-Patch1:		paps-0.6.2-fix-bufferoverflow.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -19,7 +18,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .overflow
 aclocal
 automake
 autoconf
@@ -46,6 +44,10 @@
 
 
 %changelog
+* Wed Jan 11 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.3-1
+- New upstream release.
+- paps-0.6.2-fix-bufferoverflow.patch: removed.
+
 * Wed Dec 21 2005 Akira TAGOH <tagoh at redhat.com> - 0.6.2-1
 - New upstream release.
   - the bitmap font is now ignored. (#176206)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 09:39:00 -0000	1.5
+++ sources	11 Jan 2006 06:13:52 -0000	1.6
@@ -1 +1 @@
-06268e6796e3869275ddeec42d9cfd53  paps-0.6.2.tar.gz
+6f36fd52b6254c99ac2710527ef413d6  paps-0.6.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:25:45 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:25:45 -0500
Subject: rpms/perl-File-Remove/devel .cvsignore, 1.2,
	1.3 perl-File-Remove.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601111426.k0BEQIFP001826@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1805

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 14:25:45 -0000	1.3
@@ -1 +1 @@
-File-Remove-0.30.tar.gz
+File-Remove-0.31.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/perl-File-Remove.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
+++ perl-File-Remove.spec	11 Jan 2006 14:25:45 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -37,11 +37,14 @@
 %files
 %defattr(-,root,root,-)
 # For license text(s), see the perl package.
-%doc Changes README
+%doc CHANGES README
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Corsepius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Tue Sep 13 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.30-2
 - Change %%summary according to Ville's preference.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:44:06 -0000	1.2
+++ sources	11 Jan 2006 14:25:45 -0000	1.3
@@ -1 +1 @@
-3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz
+8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:27:51 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:27:51 -0500
Subject: rpms/perl-File-Remove/FC-4 .cvsignore, 1.2,
	1.3 perl-File-Remove.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601111428.k0BESQ8b001904@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 14:27:51 -0000	1.3
@@ -1 +1 @@
-File-Remove-0.30.tar.gz
+File-Remove-0.31.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/perl-File-Remove.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
+++ perl-File-Remove.spec	11 Jan 2006 14:27:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -37,11 +37,14 @@
 %files
 %defattr(-,root,root,-)
 # For license text(s), see the perl package.
-%doc Changes README
+%doc CHANGES README
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Corsepius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Tue Sep 13 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.30-2
 - Change %%summary according to Ville's preference.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:44:06 -0000	1.2
+++ sources	11 Jan 2006 14:27:51 -0000	1.3
@@ -1 +1 @@
-3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz
+8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:29:08 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:29:08 -0500
Subject: rpms/perl-File-Remove/FC-3 .cvsignore, 1.2,
	1.3 perl-File-Remove.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601111429.k0BETe0j001986@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-File-Remove/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1965

Modified Files:
	.cvsignore perl-File-Remove.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:44:06 -0000	1.2
+++ .cvsignore	11 Jan 2006 14:29:08 -0000	1.3
@@ -1 +1 @@
-File-Remove-0.30.tar.gz
+File-Remove-0.31.tar.gz


Index: perl-File-Remove.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-3/perl-File-Remove.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-File-Remove.spec	13 Sep 2005 16:47:52 -0000	1.2
+++ perl-File-Remove.spec	11 Jan 2006 14:29:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		perl-File-Remove
-Version:	0.30
-Release:	2%{?dist}
+Version:	0.31
+Release:	1%{?dist}
 Summary:	Convenience module for removing files and directories
 License:	GPL or Artistic
 Group:		Development/Libraries
@@ -37,11 +37,14 @@
 %files
 %defattr(-,root,root,-)
 # For license text(s), see the perl package.
-%doc Changes README
+%doc CHANGES README
 %{perl_vendorlib}/File
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Corsepius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Tue Sep 13 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.30-2
 - Change %%summary according to Ville's preference.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Remove/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:44:06 -0000	1.2
+++ sources	11 Jan 2006 14:29:08 -0000	1.3
@@ -1 +1 @@
-3973fd86f5d82a52255bde3c1fd63486  File-Remove-0.30.tar.gz
+8dbe965298ffe80415c3460635bb923f  File-Remove-0.31.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:36:42 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:36:42 -0500
Subject: rpms/perl-Params-Util/FC-3 .cvsignore, 1.5,
	1.6 perl-Params-Util.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200601111437.k0BEbEn5002171@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/FC-3

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:33:14 -0000	1.5
+++ .cvsignore	11 Jan 2006 14:36:42 -0000	1.6
@@ -1 +1 @@
-Params-Util-0.08.tar.gz
+Params-Util-0.09.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/perl-Params-Util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Params-Util.spec	21 Dec 2005 08:33:14 -0000	1.4
+++ perl-Params-Util.spec	11 Jan 2006 14:36:42 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+- Upstream update.
+
 * Wed Dec 21 2005 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:33:14 -0000	1.5
+++ sources	11 Jan 2006 14:36:42 -0000	1.6
@@ -1 +1 @@
-f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz
+5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:36:48 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:36:48 -0500
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.5,
	1.6 perl-Params-Util.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200601111437.k0BEbKDl002176@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/FC-4

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:31:26 -0000	1.5
+++ .cvsignore	11 Jan 2006 14:36:48 -0000	1.6
@@ -1 +1 @@
-Params-Util-0.08.tar.gz
+Params-Util-0.09.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Params-Util.spec	21 Dec 2005 08:31:26 -0000	1.4
+++ perl-Params-Util.spec	11 Jan 2006 14:36:48 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+- Upstream update.
+
 * Wed Dec 21 2005 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:31:26 -0000	1.5
+++ sources	11 Jan 2006 14:36:48 -0000	1.6
@@ -1 +1 @@
-f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz
+5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:36:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:36:54 -0500
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.5,
	1.6 perl-Params-Util.spec, 1.4, 1.5 sources, 1.5, 1.6
Message-ID: <200601111437.k0BEbQQ3002184@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2114/devel

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 08:30:03 -0000	1.5
+++ .cvsignore	11 Jan 2006 14:36:54 -0000	1.6
@@ -1 +1 @@
-Params-Util-0.08.tar.gz
+Params-Util-0.09.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Params-Util.spec	21 Dec 2005 08:30:03 -0000	1.4
+++ perl-Params-Util.spec	11 Jan 2006 14:36:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+- Upstream update.
+
 * Wed Dec 21 2005 Ralf Cors??pius <rc040203 at freenet.de> - 0.08-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 08:30:03 -0000	1.5
+++ sources	11 Jan 2006 14:36:54 -0000	1.6
@@ -1 +1 @@
-f67b9a6361526901e33a47a45719a61b  Params-Util-0.08.tar.gz
+5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 14:56:40 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 09:56:40 -0500
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.4,
	1.5 perl-DBIx-SearchBuilder.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200601111457.k0BEvCtg002427@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2402

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
- Upstream update.
- Spec cleanup.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	5 Dec 2005 14:16:43 -0000	1.4
+++ .cvsignore	11 Jan 2006 14:56:40 -0000	1.5
@@ -1,3 +1 @@
-DBIx-SearchBuilder-1.27.tar.gz
-DBIx-SearchBuilder-1.33.tar.gz
-DBIx-SearchBuilder-1.36.tar.gz
+DBIx-SearchBuilder-1.38.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-SearchBuilder.spec	14 Nov 2005 06:48:44 -0000	1.5
+++ perl-DBIx-SearchBuilder.spec	11 Jan 2006 14:56:40 -0000	1.6
@@ -6,7 +6,7 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.33
+Version: 	1.38
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
@@ -17,26 +17,22 @@
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
-BuildRequires: 	perl(Want)
-BuildRequires: 	perl(Cache::Simple::TimedExpiry) >= 0.21
-BuildRequires: 	perl(Class::ReturnValue) >= 0.4
-BuildRequires: 	perl(DBD::SQLite)
+BuildRequires:	perl(Want)
+BuildRequires:	perl(Cache::Simple::TimedExpiry) >= 0.21
+BuildRequires:	perl(Class::ReturnValue) >= 0.4
+BuildRequires:	perl(DBD::SQLite)
+BuildRequires:	perl(DBI)
+BuildRequires:	perl(ExtUtils::AutoInstall) >= 0.49
+BuildRequires:	perl(Test::More) >= 0.52
+BuildRequires:	perl(Class::Accessor)
 
 # Improved tests:
 BuildRequires:	perl(Test::Pod)
 
-%if "%version" > "1.27"
-BuildRequires: 	perl(ExtUtils::AutoInstall) >= 0.49
-BuildRequires:	perl(Test::More) >= 0.52
-BuildRequires:	perl(Class::Accessor)
 # Optional features
 BuildRequires:	perl(DBIx::DBSchema)
 BuildRequires:	perl(capitalization) >= 0.03
-%endif
-%if "%version" > "1.33"
-# Missing in Fedora
-BuildRequires: 	perl(Clone)
-%endif
+BuildRequires:	perl(Clone)
 
 %description
 This module provides an object-oriented mechanism for retrieving and
@@ -48,13 +44,7 @@
 find -name '*.pm' -exec chmod -x {} \;
 
 %build
-%if "%version" > "1.27"
-# --skipdeps causes ExtUtils::AutoInstall not to try auto-installing 
-# missing optional features
-%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
-%else
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-%endif
 make %{?_smp_mflags}
 
 %install
@@ -74,9 +64,7 @@
 %defattr(-,root,root,-)
 # 
 %doc Changes
-%if "%{version}" > "1.27"
 %doc README ROADMAP
-%endif
 %{perl_vendorlib}/DBIx
 %{_mandir}/man3/*
 %exclude %{perl_vendorlib}/DBIx/SearchBuilder/Handle/Oracle*
@@ -98,6 +86,10 @@
 %endif
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-1
+- Upstream update.
+- Spec cleanup.
+
 * Mon Nov 14 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.33-1
 - Upstream update to 1.33.
 
@@ -108,12 +100,6 @@
 - BR: perl(DBIx::DBSchema) and perl(capitalization) for 1.33
   (Now in FE >= 5).
 
-* Tue Oct 11 2005 Ralf Corsepius <rc040203 at freenet.de>
-- Preps for update to 1.33.
-
-* Tue Oct 11 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.27-3
-- Spec file cleanup.
-
 * Mon Oct 10 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.27-2
 - chmod -x *.pm.
 - BR: perl(Test::Pod).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Dec 2005 14:16:43 -0000	1.4
+++ sources	11 Jan 2006 14:56:40 -0000	1.5
@@ -1,3 +1 @@
-b3bc442e5e447e8a02417c417cff7371  DBIx-SearchBuilder-1.27.tar.gz
-f9a11fe46b311d783a53d3c04a3d9246  DBIx-SearchBuilder-1.33.tar.gz
-bef0e6a1affb4ad79bcf52205ca793a3  DBIx-SearchBuilder-1.36.tar.gz
+409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 15:04:25 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 11 Jan 2006 10:04:25 -0500
Subject: rpms/perl-DBIx-SearchBuilder/devel perl-DBIx-SearchBuilder.spec, 1.6,
	1.7
Message-ID: <200601111504.k0BF4vTl004194@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4177

Modified Files:
	perl-DBIx-SearchBuilder.spec 
Log Message:
Re-add --skipdeps


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-DBIx-SearchBuilder.spec	11 Jan 2006 14:56:40 -0000	1.6
+++ perl-DBIx-SearchBuilder.spec	11 Jan 2006 15:04:24 -0000	1.7
@@ -44,7 +44,10 @@
 find -name '*.pm' -exec chmod -x {} \;
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+# --skipdeps causes ExtUtils::AutoInstall not to try auto-installing 
+# missing optional features
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
+
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Wed Jan 11 15:06:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 11 Jan 2006 10:06:58 -0500
Subject: rpms/python-feedparser/FC-4 .cvsignore, 1.2,
	1.3 python-feedparser.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601111507.k0BF7Ub9004320@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4251/FC-4

Modified Files:
	.cvsignore python-feedparser.spec sources 
Log Message:
Version 4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2006 05:19:24 -0000	1.2
+++ .cvsignore	11 Jan 2006 15:06:57 -0000	1.3
@@ -1 +1 @@
-feedparser-4.0.2.zip
+feedparser-4.1.zip


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/FC-4/python-feedparser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-feedparser.spec	7 Jan 2006 05:19:24 -0000	1.1
+++ python-feedparser.spec	11 Jan 2006 15:06:57 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-feedparser
-Version:        4.0.2
-Release:        2%{?dist}
+Version:        4.1
+Release:        1%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -34,7 +34,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-cp -a docs html
+mv docs html
 chmod 0644 LICENSE README
  
 %clean
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 11 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-1
+- Version 4.1
+
 * Sat Jan 07 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-2
 - Set sane permissions on doc files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2006 05:19:24 -0000	1.2
+++ sources	11 Jan 2006 15:06:57 -0000	1.3
@@ -1 +1 @@
-85cc43faf40f8aefdb5885bdabc1a94c  feedparser-4.0.2.zip
+7ab1140c1e29d4cd52ab20fa7b1f8640  feedparser-4.1.zip



From fedora-extras-commits at redhat.com  Wed Jan 11 15:07:10 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Wed, 11 Jan 2006 10:07:10 -0500
Subject: rpms/python-feedparser/devel .cvsignore, 1.2,
	1.3 python-feedparser.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601111507.k0BF7hDE004336@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-feedparser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4251/devel

Modified Files:
	.cvsignore python-feedparser.spec sources 
Log Message:
Version 4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Jan 2006 05:19:24 -0000	1.2
+++ .cvsignore	11 Jan 2006 15:07:10 -0000	1.3
@@ -1 +1 @@
-feedparser-4.0.2.zip
+feedparser-4.1.zip


Index: python-feedparser.spec
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/python-feedparser.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-feedparser.spec	7 Jan 2006 05:19:24 -0000	1.1
+++ python-feedparser.spec	11 Jan 2006 15:07:10 -0000	1.2
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-feedparser
-Version:        4.0.2
-Release:        2%{?dist}
+Version:        4.1
+Release:        1%{?dist}
 Summary:        Parse RSS and Atom feeds in Python
 
 Group:          Development/Languages
@@ -34,7 +34,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-cp -a docs html
+mv docs html
 chmod 0644 LICENSE README
  
 %clean
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 11 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.1-1
+- Version 4.1
+
 * Sat Jan 07 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 4.0.2-2
 - Set sane permissions on doc files.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-feedparser/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Jan 2006 05:19:24 -0000	1.2
+++ sources	11 Jan 2006 15:07:10 -0000	1.3
@@ -1 +1 @@
-85cc43faf40f8aefdb5885bdabc1a94c  feedparser-4.0.2.zip
+7ab1140c1e29d4cd52ab20fa7b1f8640  feedparser-4.1.zip



From fedora-extras-commits at redhat.com  Wed Jan 11 15:07:16 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 11 Jan 2006 10:07:16 -0500
Subject: rpms/awstats/FC-4 awstats.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <200601111507.k0BF7mWq004344@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4285/FC-4

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.5 final


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-4/awstats.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- awstats.spec	22 Aug 2005 10:18:16 -0000	1.8
+++ awstats.spec	11 Jan 2006 15:07:15 -0000	1.9
@@ -1,12 +1,12 @@
 Name:       awstats
 Version:    6.5
-Release:    0.1.050822%{?dist}
+Release:    1%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-#Source0:    http://dl.sf.net/awstats/awstats-6.5.tgz
-Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -151,6 +151,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Wed Jan 11 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
+- version 6.5 final
+
 * Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
 - version 6.5 (beta), fixes CAN-2005-1527
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Aug 2005 10:18:16 -0000	1.7
+++ sources	11 Jan 2006 15:07:15 -0000	1.8
@@ -1 +1 @@
-a990f9dcdf26e585a326b316a79e5436  awstats-6.5.tar.gz
+aef00b2ff5c5413bd2a868299cabd69a  awstats-6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 15:07:29 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 11 Jan 2006 10:07:29 -0500
Subject: rpms/awstats/devel awstats.spec,1.8,1.9 sources,1.7,1.8
Message-ID: <200601111508.k0BF870T004350@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4285/devel

Modified Files:
	awstats.spec sources 
Log Message:
- version 6.5 final


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- awstats.spec	22 Aug 2005 10:18:17 -0000	1.8
+++ awstats.spec	11 Jan 2006 15:07:29 -0000	1.9
@@ -1,12 +1,12 @@
 Name:       awstats
 Version:    6.5
-Release:    0.1.050822%{?dist}
+Release:    1%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
 URL:        http://awstats.sourceforge.net
-#Source0:    http://dl.sf.net/awstats/awstats-6.5.tgz
-Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
+Source0:    http://dl.sf.net/awstats/awstats-6.5.tar.gz
+#Source0:   http://awstats.sourceforge.net/files/awstats-6.5.tar.gz
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
@@ -151,6 +151,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* Wed Jan 11 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
+- version 6.5 final
+
 * Mon Aug 22 2005 Aurelien Bompard <gauret[AT]free.fr> 6.5-1
 - version 6.5 (beta), fixes CAN-2005-1527
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Aug 2005 10:18:17 -0000	1.7
+++ sources	11 Jan 2006 15:07:29 -0000	1.8
@@ -1 +1 @@
-a990f9dcdf26e585a326b316a79e5436  awstats-6.5.tar.gz
+aef00b2ff5c5413bd2a868299cabd69a  awstats-6.5.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 16:06:27 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 11 Jan 2006 11:06:27 -0500
Subject: rpms/python-psyco/FC-3 python-psyco.spec,1.5,1.6
Message-ID: <200601111607.k0BG7TSw006641@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6586/FC-3

Modified Files:
	python-psyco.spec 
Log Message:
Add a description.  Can't believe I didn't have one before.



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/FC-3/python-psyco.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-psyco.spec	2 Nov 2005 18:34:12 -0000	1.5
+++ python-psyco.spec	11 Jan 2006 16:06:26 -0000	1.6
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -19,6 +19,13 @@
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
+Psyco is a kind of just-in-time (JIT) compiler, a little bit like what exists
+for other languages, that emit machine code on the fly instead of interpreting
+your Python program step by step. The difference with the traditional approach
+to JIT compilers is that Psyco writes several version of the same blocks
+(a block is a bit of a function), which are optimized by being specialized to
+some kinds of variables (a "kind" can mean a type, but it is more general). The
+result is that your unmodified Python programs run faster.
 
 
 %prep
@@ -48,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Wed Jan 11 2006 Shahms E. King <shahms at shahms.com> 1.5-3
+- Add a description and rebuild.  Ooops.
+
 * Wed Nov 02 2005 Shahms E. King <shahms at shahms.com> 1.5-2
 - Don't package INSTALL.txt which no longer exists
 



From fedora-extras-commits at redhat.com  Wed Jan 11 16:06:56 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 11 Jan 2006 11:06:56 -0500
Subject: rpms/python-psyco/FC-4 python-psyco.spec,1.6,1.7
Message-ID: <200601111607.k0BG7Tot006640@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6586/FC-4

Modified Files:
	python-psyco.spec 
Log Message:
Add a description.  Can't believe I didn't have one before.



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/FC-4/python-psyco.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-psyco.spec	2 Nov 2005 18:34:17 -0000	1.6
+++ python-psyco.spec	11 Jan 2006 16:06:56 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -19,6 +19,13 @@
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
+Psyco is a kind of just-in-time (JIT) compiler, a little bit like what exists
+for other languages, that emit machine code on the fly instead of interpreting
+your Python program step by step. The difference with the traditional approach
+to JIT compilers is that Psyco writes several version of the same blocks
+(a block is a bit of a function), which are optimized by being specialized to
+some kinds of variables (a "kind" can mean a type, but it is more general). The
+result is that your unmodified Python programs run faster.
 
 
 %prep
@@ -48,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Wed Jan 11 2006 Shahms E. King <shahms at shahms.com> 1.5-3
+- Add a description and rebuild.  Ooops.
+
 * Wed Nov 02 2005 Shahms E. King <shahms at shahms.com> 1.5-2
 - Don't package INSTALL.txt which no longer exists
 



From fedora-extras-commits at redhat.com  Wed Jan 11 16:07:04 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 11 Jan 2006 11:07:04 -0500
Subject: rpms/python-psyco/devel python-psyco.spec,1.6,1.7
Message-ID: <200601111607.k0BG7tjL006646@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-psyco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6586/devel

Modified Files:
	python-psyco.spec 
Log Message:
Add a description.  Can't believe I didn't have one before.



Index: python-psyco.spec
===================================================================
RCS file: /cvs/extras/rpms/python-psyco/devel/python-psyco.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-psyco.spec	2 Nov 2005 18:34:22 -0000	1.6
+++ python-psyco.spec	11 Jan 2006 16:07:03 -0000	1.7
@@ -4,7 +4,7 @@
 
 Name:           python-%{srcname}
 Version:        1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        The Python Specialing Compiler
 
@@ -19,6 +19,13 @@
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
 %description
+Psyco is a kind of just-in-time (JIT) compiler, a little bit like what exists
+for other languages, that emit machine code on the fly instead of interpreting
+your Python program step by step. The difference with the traditional approach
+to JIT compilers is that Psyco writes several version of the same blocks
+(a block is a bit of a function), which are optimized by being specialized to
+some kinds of variables (a "kind" can mean a type, but it is more general). The
+result is that your unmodified Python programs run faster.
 
 
 %prep
@@ -48,6 +55,9 @@
 %ghost %{python_sitearch}/psyco/*.pyo
 
 %changelog
+* Wed Jan 11 2006 Shahms E. King <shahms at shahms.com> 1.5-3
+- Add a description and rebuild.  Ooops.
+
 * Wed Nov 02 2005 Shahms E. King <shahms at shahms.com> 1.5-2
 - Don't package INSTALL.txt which no longer exists
 



From fedora-extras-commits at redhat.com  Wed Jan 11 18:37:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 11 Jan 2006 13:37:34 -0500
Subject: rpms/digikamimageplugins/FC-3 .cvsignore, 1.2,
	1.3 digikamimageplugins.spec, 1.8, 1.9 sources, 1.2, 1.3
Message-ID: <200601111838.k0BIc60i010551@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/digikamimageplugins/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10526

Modified Files:
	.cvsignore digikamimageplugins.spec sources 
Log Message:
* Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.0-1
- 0.8.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Oct 2005 20:21:44 -0000	1.2
+++ .cvsignore	11 Jan 2006 18:37:33 -0000	1.3
@@ -1 +1 @@
-digikamimageplugins-0.7.4.tar.bz2
+digikamimageplugins-0.8.0.tar.bz2


Index: digikamimageplugins.spec
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-3/digikamimageplugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- digikamimageplugins.spec	10 Nov 2005 18:51:10 -0000	1.8
+++ digikamimageplugins.spec	11 Jan 2006 18:37:33 -0000	1.9
@@ -1,13 +1,13 @@
 
 Name:    digikamimageplugins
 Summary: Plugins for Digikam
-Version: 0.7.4
-Release: 10%{?dist}
+Version: 0.8.0
+Release: 1%{?dist} 
 
 License: GPL
 Group:   Applications/Multimedia
 URL:     http://extragear.kde.org/apps/digikamimageplugins/ 
-Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-0.7.4.tar.bz2	
+Source:  http://dl.sourceforge.net/sourceforge/digikam/digikamimageplugins-%{version}.tar.bz2	
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes: digikamplugins < %{version}
@@ -17,7 +17,7 @@
 BuildRequires: kdelibs-devel >= 6:3.4
 BuildRequires: digikam-devel = %{version}
 
-Requires: digikam = %{version}
+Requires: digikam >= %{version}
 Requires: ImageMagick 
 
 
@@ -102,7 +102,6 @@
 done
 fi
 
-
 cat *.lang > %{name}.list
 
 
@@ -130,9 +129,17 @@
 
 
 %changelog
-* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-10
+* Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.0-1
+- 0.8.0
+
+* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.0-0.1.rc
+- 0.8.0-rc
+
+* Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-11 
 - abs->relative symlinks
 - simplify configure
+
+* Fri Nov 04 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-10 
 - Req/BR: digikam = %%version
 
 * Fri Oct 28 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikamimageplugins/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Oct 2005 20:21:44 -0000	1.2
+++ sources	11 Jan 2006 18:37:33 -0000	1.3
@@ -1 +1 @@
-5ea3c0dd6e6f1eb99211e75d0bf17d3d  digikamimageplugins-0.7.4.tar.bz2
+6670e0411dbf71ec9faeee087fc4f79a  digikamimageplugins-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 11 18:57:41 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Wed, 11 Jan 2006 13:57:41 -0500
Subject: fedora-release fedora-release.spec,1.15,1.16
Message-ID: <200601111857.k0BIvfqg010860@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10842

Modified Files:
	fedora-release.spec 
Log Message:
bump to 4.91


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- fedora-release.spec	21 Nov 2005 02:59:35 -0000	1.15
+++ fedora-release.spec	11 Jan 2006 18:57:33 -0000	1.16
@@ -1,4 +1,4 @@
-%define release_version 4.90
+%define release_version 4.91
 %define release_name Pre-FC5
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide



From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:13 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:13 -0500
Subject: rpms/xmldiff - New directory
Message-ID: <200601112256.k0BMuFkm018511@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18503/xmldiff

Log Message:
Directory /cvs/extras/rpms/xmldiff added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:19 -0500
Subject: rpms/xmldiff/devel - New directory
Message-ID: <200601112256.k0BMuLdN018526@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18503/xmldiff/devel

Log Message:
Directory /cvs/extras/rpms/xmldiff/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:34 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:34 -0500
Subject: rpms/xmldiff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601112256.k0BMua4F018560@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18548

Added Files:
	Makefile import.log 
Log Message:
Setup of module xmldiff


--- NEW FILE Makefile ---
# Top level Makefile for module xmldiff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 11 22:56:40 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:56:40 -0500
Subject: rpms/xmldiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601112256.k0BMugf2018580@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18548/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmldiff


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 11 22:57:12 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:57:12 -0500
Subject: rpms/xmldiff import.log,1.1,1.2
Message-ID: <200601112257.k0BMvjg1018688@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18625

Modified Files:
	import.log 
Log Message:
auto-import xmldiff-0.6.7-5 on branch devel from xmldiff-0.6.7-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Jan 2006 22:56:34 -0000	1.1
+++ import.log	11 Jan 2006 22:57:12 -0000	1.2
@@ -0,0 +1 @@
+xmldiff-0_6_7-5:HEAD:xmldiff-0.6.7-5.src.rpm:1137020208



From fedora-extras-commits at redhat.com  Wed Jan 11 22:57:18 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:57:18 -0500
Subject: rpms/xmldiff/devel GPL, NONE, 1.1 xmldiff-0.6.7-xsldata.patch, NONE,
	1.1 xmldiff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601112257.k0BMvpaJ018700@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18625/devel

Modified Files:
	.cvsignore sources 
Added Files:
	GPL xmldiff-0.6.7-xsldata.patch xmldiff.spec 
Log Message:
auto-import xmldiff-0.6.7-5 on branch devel from xmldiff-0.6.7-5.src.rpm


--- NEW FILE GPL ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                          675 Mass Ave, Cambridge, MA 02139, 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

	Appendix: 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) 19yy  <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., 675 Mass Ave, Cambridge, MA 02139, 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) 19yy 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.

xmldiff-0.6.7-xsldata.patch:

--- NEW FILE xmldiff-0.6.7-xsldata.patch ---
diff -uNr xmldiff-0.6.7-original/__pkginfo__.py xmldiff-0.6.7/__pkginfo__.py
--- xmldiff-0.6.7-original/__pkginfo__.py	2005-05-03 11:42:29.000000000 -0400
+++ xmldiff-0.6.7/__pkginfo__.py	2006-01-10 21:21:30.000000000 -0500
@@ -54,7 +54,7 @@
 except:
     pass
 
-data_files = [("share/sgml/stylesheet/xmldiff",
+data_files = [("share/xml/xmldiff",
                ['xsl/docbook_rev.xsl', 'xsl/xmlrev.xslt'])
               ]
 
diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev
--- xmldiff-0.6.7-original/bin/xmlrev	2005-05-03 11:42:29.000000000 -0400
+++ xmldiff-0.6.7/bin/xmlrev	2006-01-10 21:21:30.000000000 -0500
@@ -107,7 +107,7 @@
     echo "      show difference between revisions as xupdate"
 }
 
-ML_DIR=/usr/share/sgml/stylesheet/xmldiff
+ML_DIR=/usr/share/xml/xmldiff
 
 case "$1" in
     --help)


--- NEW FILE xmldiff.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           xmldiff
Version:        0.6.7
Release:        5%{?dist}
Summary:        Tree to tree correction between XML documents

Group:          Applications/Text
License:        GPL
URL:            http://www.logilab.org/projects/xmldiff
Source0:        ftp://ftp.logilab.org/pub/xmldiff/%{name}-%{version}.tar.gz
# No license in original tarball, but referenced in docs
Source1:	GPL
Patch0:		xmldiff-0.6.7-xsldata.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python
BuildRequires:  python-devel
BuildRequires:	python-logilab-common
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires:   docbook-style-xsl
Requires:   /usr/bin/sgmlnorm
Requires:   /usr/bin/xsltproc


%description
The xmldiff utility extracts differences between two XML files. It
returns a set of primitives to apply on source tree to obtain the
destination tree.  The implementation is based on _Change detection in
hierarchically structured information_, by S. Chawathe, A. Rajaraman,
H. Garcia-Molina and J. Widom (Stanford University, 1996).


%prep
%setup -q
%patch0 -p1
for i in man/*.1 __pkginfo__.py doc/*.txt
do
	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
done
install -pm 644 %{SOURCE1} COPYING


%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
# strip tests
rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/xmldiff/test
mkdir -p ${RPM_BUILD_ROOT}{%{_mandir}/man1,%{_docdir}/%{name}-%{version}}
install -m 644 man/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1
# quiet rpmlint
chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/xmldiff/main.py


%check
cd test
PYTHONPATH=$(ls -1d ${PWD}/../build/lib.*) %{__python} runtests.py

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README README.xmlrev doc/*.html doc/*.txt
%dir %{_datadir}/xml/xmldiff
%dir %{python_sitearch}/xmldiff
%{_bindir}/xmldiff
%{_bindir}/xmlrev
%{python_sitearch}/xmldiff/*.py
%{python_sitearch}/xmldiff/*.pyc
%{python_sitearch}/xmldiff/*.so
%{_datadir}/xml/xmldiff/*
%{_mandir}/man1/*
%ghost %{python_sitearch}/xmldiff/*.pyo


%changelog
* Wed Jan 11 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
- xmlrev: use proper XSL location

* Tue Jan 10 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-4
- Convert additional files to UTF-8
- Include documentation properly
- Reseat XSL files

* Sun Jan  8 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-3
- Convert manpages in %%prep
- Enable tests in %%check
- Make BuildRequires more robust

* Fri Jan  6 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-2
- Fix Requires
- Drop test suite due to external dependencies
- convert man pages to UTF-8

* Thu Jan  5 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-1
- Initial RPM version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Jan 2006 22:56:40 -0000	1.1
+++ .cvsignore	11 Jan 2006 22:57:18 -0000	1.2
@@ -0,0 +1 @@
+xmldiff-0.6.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Jan 2006 22:56:40 -0000	1.1
+++ sources	11 Jan 2006 22:57:18 -0000	1.2
@@ -0,0 +1 @@
+07b97c97a0b83d605f37c712400e24ff  xmldiff-0.6.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 11 22:57:30 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 11 Jan 2006 17:57:30 -0500
Subject: owners owners.list,1.523,1.524
Message-ID: <200601112258.k0BMw2WM018708@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18669

Modified Files:
	owners.list 
Log Message:
Added xmldiff (#177083)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.523
retrieving revision 1.524
diff -u -r1.523 -r1.524
--- owners.list	10 Jan 2006 22:20:42 -0000	1.523
+++ owners.list	11 Jan 2006 22:57:30 -0000	1.524
@@ -1330,6 +1330,7 @@
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|xmldiff|Tree to tree correction between XML documents|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 01:13:00 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 11 Jan 2006 20:13:00 -0500
Subject: rpms/gparted/devel .cvsignore, 1.2, 1.3 gparted.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601120113.k0C1DWLZ024475@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24450

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
 New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Nov 2005 22:41:08 -0000	1.2
+++ .cvsignore	12 Jan 2006 01:12:59 -0000	1.3
@@ -1 +1 @@
-gparted-0.0.9.tar.bz2
+gparted-0.1.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gparted.spec	28 Nov 2005 15:41:48 -0000	1.2
+++ gparted.spec	12 Jan 2006 01:12:59 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.0.9
-Release: 3%{?dist}
+Version: 0.1
+Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Jan 11 2006 Deji Akingunola <dakingun at gmail.com> - 0.1-1
+- New release
+
 * Fri Nov 25 2005 Deji Akingunola <dakingun at gmail.com> - 0.0.9-3
 - Use correct source url
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Nov 2005 22:41:08 -0000	1.2
+++ sources	12 Jan 2006 01:12:59 -0000	1.3
@@ -1 +1 @@
-0f36fc93e1908418be0b99c5db7ac184  gparted-0.0.9.tar.bz2
+f0e212b8f03918b320ca6b4ad86d4afb  gparted-0.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 01:17:47 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:17:47 -0500
Subject: rpms/tclxml/devel tclxml.patch,1.1,1.2
Message-ID: <200601120118.k0C1IK3J024596@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24576

Modified Files:
	tclxml.patch 
Log Message:
Fix quoting bug that only appears with bash >= 3.1.  Adjust some *Config.sh values.



tclxml.patch:

Index: tclxml.patch
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclxml.patch	5 Dec 2005 17:56:35 -0000	1.1
+++ tclxml.patch	12 Jan 2006 01:17:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur --exclude '*.swp' tclxml-3.1/configure tclxml-3.1.new/configure
 --- tclxml-3.1/configure	2005-11-03 22:26:33.000000000 -0800
-+++ tclxml-3.1.new/configure	2005-11-26 23:47:56.000000000 -0800
++++ tclxml-3.1.new/configure	2006-01-11 16:59:27.000000000 -0800
 @@ -1530,7 +1530,8 @@
  
  	    # check in a few common install locations
@@ -11,9 +11,18 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3771,7 +3772,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 diff -Naur --exclude '*.swp' tclxml-3.1/expat/configure tclxml-3.1.new/expat/configure
 --- tclxml-3.1/expat/configure	2004-08-14 00:41:11.000000000 -0700
-+++ tclxml-3.1.new/expat/configure	2005-11-26 23:50:36.000000000 -0800
++++ tclxml-3.1.new/expat/configure	2006-01-11 17:07:15.000000000 -0800
 @@ -1532,7 +1532,8 @@
  
  	    # check in a few common install locations
@@ -24,6 +33,15 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3860,7 +3861,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 diff -Naur --exclude '*.swp' tclxml-3.1/expat/Makefile.in tclxml-3.1.new/expat/Makefile.in
 --- tclxml-3.1/expat/Makefile.in	2002-10-09 14:17:21.000000000 -0700
 +++ tclxml-3.1.new/expat/Makefile.in	2005-11-27 12:46:23.000000000 -0800
@@ -37,7 +55,7 @@
  	-I$(srcdir)/xmlwf
 diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure tclxml-3.1.new/libxml2/configure
 --- tclxml-3.1/libxml2/configure	2005-11-03 22:26:52.000000000 -0800
-+++ tclxml-3.1.new/libxml2/configure	2005-11-26 23:55:32.000000000 -0800
++++ tclxml-3.1.new/libxml2/configure	2006-01-11 17:07:25.000000000 -0800
 @@ -1540,7 +1540,8 @@
  
  	    # check in a few common install locations
@@ -48,6 +66,15 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
+@@ -3912,7 +3913,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 @@ -5468,7 +5469,9 @@
  for d in                \
      $with_xml2lib       \
@@ -58,9 +85,21 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
+@@ -5603,9 +5606,9 @@
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
+ else
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
+ fi
+ tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
+ tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
 diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in
 --- tclxml-3.1/libxml2/configure.in	2004-08-14 00:41:11.000000000 -0700
-+++ tclxml-3.1.new/libxml2/configure.in	2005-11-26 23:54:28.000000000 -0800
++++ tclxml-3.1.new/libxml2/configure.in	2005-12-17 20:53:20.000000000 -0800
 @@ -247,7 +247,9 @@
  for d in                \
      $with_xml2lib       \
@@ -71,6 +110,76 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
+@@ -347,9 +349,9 @@
+ # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
+ eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
+ if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
+ else
+-    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
++    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
+ fi
+ tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
+ tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
+diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/Makefile.in tclxml-3.1.new/libxml2/Makefile.in
+--- tclxml-3.1/libxml2/Makefile.in	2003-12-03 12:06:35.000000000 -0800
++++ tclxml-3.1.new/libxml2/Makefile.in	2005-12-17 19:58:39.000000000 -0800
+@@ -232,6 +232,8 @@
+ 	    echo "Installing $$i" ; \
+ 	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/tclxml-libxml2 ; \
+ 	done;
++	@mkdir -p $(DESTDIR)$(pkglibdir)
++	$(INSTALL_DATA) tcllibxml2Config.sh $(DESTDIR)$(libdir)
+ 	@echo "libraries done"
+ 
+ #========================================================================
+diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/tcllibxml2Config.sh.in tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in
+--- tclxml-3.1/libxml2/tcllibxml2Config.sh.in	2003-12-03 12:06:35.000000000 -0800
++++ tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in	2005-12-17 20:25:15.000000000 -0800
+@@ -18,34 +18,34 @@
+ tclxml_libxml2_RELEASE_LEVEL='@PATCHLEVEL@'
+ 
+ # The name of the TclXML/libxml2 library (may be either a .a file or a shared library):
+-tclxml_libxml2_LIB_FILE=@tcldomxml_LIB_FILE@
++tclxml_libxml2_LIB_FILE=@tcllibxml2_LIB_FILE@
+ 
+ # String to pass to linker to pick up the tcldomxml library from its
+ # build directory.
+-tclxml_libxml2_BUILD_LIB_SPEC='@tclxml_libxml2_BUILD_LIB_SPEC@'
++tclxml_libxml2_BUILD_LIB_SPEC='@tcllibxml2_BUILD_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 library from its
+ # installed directory.
+-tclxml_libxml2_LIB_SPEC='@tclxml_libxml2_LIB_SPEC@'
++tclxml_libxml2_LIB_SPEC='@tcllibxml2_LIB_SPEC@'
+ 
+ # The name of the TclXML/libxml2 stub library (a .a file):
+-tclxml_libxml2_STUB_LIB_FILE=@tclxml_libxml2_stub_LIB_FILE@
++tclxml_libxml2_STUB_LIB_FILE=@tcllibxml2_stub_LIB_FILE@
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # build directory.
+-tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tclxml_libxml2_BUILD_STUB_LIB_SPEC@'
++tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tcllibxml2_BUILD_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # installed directory.
+-tclxml_libxml2_STUB_LIB_SPEC='@tclxml_libxml2_STUB_LIB_SPEC@'
++tclxml_libxml2_STUB_LIB_SPEC='@tcllibxml2_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # build directory.
+-tclxml_libxml2_BUILD_STUB_LIB_PATH='@tclxml_libxml2_BUILD_STUB_LIB_PATH@'
++tclxml_libxml2_BUILD_STUB_LIB_PATH='@tcllibxml2_BUILD_STUB_LIB_PATH@'
+ 
+ # String to pass to linker to pick up the TclXML/libxml2 stub library from its
+ # installed directory.
+-tclxml_libxml2_STUB_LIB_PATH='@tclxml_libxml2_STUB_LIB_PATH@'
++tclxml_libxml2_STUB_LIB_PATH='@tcllibxml2_STUB_LIB_PATH@'
+ 
+ # Location of the top-level source directories from which TclXML/libxml2
+ # was built.  This is the directory that contains generic, unix, etc.
 diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4
 --- tclxml-3.1/tclconfig/tcl.m4	2003-12-03 12:06:35.000000000 -0800
 +++ tclxml-3.1.new/tclconfig/tcl.m4	2005-11-27 11:58:42.000000000 -0800



From fedora-extras-commits at redhat.com  Thu Jan 12 01:20:15 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:20:15 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.2,1.3
Message-ID: <200601120120.k0C1Kmn9024695@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24675

Modified Files:
	tclxml.spec 
Log Message:
Bump release for new patch.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclxml.spec	9 Jan 2006 02:59:50 -0000	1.2
+++ tclxml.spec	12 Jan 2006 01:20:15 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/



From fedora-extras-commits at redhat.com  Thu Jan 12 01:23:24 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:23:24 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.3,1.4
Message-ID: <200601120123.k0C1NuOa024827@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24808

Modified Files:
	tclxml.spec 
Log Message:
Bump release number to fix tag problem.




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclxml.spec	12 Jan 2006 01:20:15 -0000	1.3
+++ tclxml.spec	12 Jan 2006 01:23:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/



From fedora-extras-commits at redhat.com  Thu Jan 12 01:28:34 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:28:34 -0500
Subject: rpms/tclxml/devel tclxml.spec,1.4,1.5
Message-ID: <200601120129.k0C1T7VF024917@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24896

Modified Files:
	tclxml.spec 
Log Message:
Added missing ChangeLog entries.  Doh!




Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tclxml.spec	12 Jan 2006 01:23:24 -0000	1.4
+++ tclxml.spec	12 Jan 2006 01:28:34 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -122,6 +122,12 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-5
+- Added missing ChangeLog entries.
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-4
+- Retag to fix tag problem.
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-3
+- Updated patch to fix quoting bug with bash >= 3.1
 * Sun Jan 8 2006 Wart <wart at kobold.org> - 3.1-2
 - Package now owns the directories that it creates.
 * Sat Nov 26 2005 Wart <wart at kobold.org> - 3.1-1



From fedora-extras-commits at redhat.com  Thu Jan 12 01:43:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 20:43:48 -0500
Subject: rpms/tclxml/devel tclxml.patch,1.2,1.3 tclxml.spec,1.5,1.6
Message-ID: <200601120144.k0C1iLQe025007@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24985

Modified Files:
	tclxml.patch tclxml.spec 
Log Message:
Remove broken parts of patch
Clean up build root before installing.



tclxml.patch:

Index: tclxml.patch
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclxml.patch	12 Jan 2006 01:17:47 -0000	1.2
+++ tclxml.patch	12 Jan 2006 01:43:48 -0000	1.3
@@ -85,18 +85,6 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
-@@ -5603,9 +5606,9 @@
- # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
- else
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
- fi
- tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
- tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
 diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/configure.in tclxml-3.1.new/libxml2/configure.in
 --- tclxml-3.1/libxml2/configure.in	2004-08-14 00:41:11.000000000 -0700
 +++ tclxml-3.1.new/libxml2/configure.in	2005-12-17 20:53:20.000000000 -0800
@@ -110,76 +98,6 @@
      /usr/local/lib
  do
      if test -f "$d/libxml2.so" ; then
-@@ -347,9 +349,9 @@
- # pkglibdir must be a fully qualified path and (not ${exec_prefix}/lib)
- eval pkglibdir="${libdir}/${PACKAGE}${VERSION}"
- if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2${VERSION}${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2${VERSION}${DBGX}"
- else
--    eval tcllibxml2_LIB_FLAG="-ltcllibxml2`echo ${VERSION} | tr -d .`${DBGX}"
-+    eval tcllibxml2_LIB_FLAG="-lTclXML_libxml2`echo ${VERSION} | tr -d .`${DBGX}"
- fi
- tcllibxml2_BUILD_LIB_SPEC="-L`pwd` ${tcllibxml2_LIB_FLAG}"
- tcllibxml2_LIB_SPEC="-L${pkglibdir} ${tcllibxml2_LIB_FLAG}"
-diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/Makefile.in tclxml-3.1.new/libxml2/Makefile.in
---- tclxml-3.1/libxml2/Makefile.in	2003-12-03 12:06:35.000000000 -0800
-+++ tclxml-3.1.new/libxml2/Makefile.in	2005-12-17 19:58:39.000000000 -0800
-@@ -232,6 +232,8 @@
- 	    echo "Installing $$i" ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(includedir)/tclxml-libxml2 ; \
- 	done;
-+	@mkdir -p $(DESTDIR)$(pkglibdir)
-+	$(INSTALL_DATA) tcllibxml2Config.sh $(DESTDIR)$(libdir)
- 	@echo "libraries done"
- 
- #========================================================================
-diff -Naur --exclude '*.swp' tclxml-3.1/libxml2/tcllibxml2Config.sh.in tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in
---- tclxml-3.1/libxml2/tcllibxml2Config.sh.in	2003-12-03 12:06:35.000000000 -0800
-+++ tclxml-3.1.new/libxml2/tcllibxml2Config.sh.in	2005-12-17 20:25:15.000000000 -0800
-@@ -18,34 +18,34 @@
- tclxml_libxml2_RELEASE_LEVEL='@PATCHLEVEL@'
- 
- # The name of the TclXML/libxml2 library (may be either a .a file or a shared library):
--tclxml_libxml2_LIB_FILE=@tcldomxml_LIB_FILE@
-+tclxml_libxml2_LIB_FILE=@tcllibxml2_LIB_FILE@
- 
- # String to pass to linker to pick up the tcldomxml library from its
- # build directory.
--tclxml_libxml2_BUILD_LIB_SPEC='@tclxml_libxml2_BUILD_LIB_SPEC@'
-+tclxml_libxml2_BUILD_LIB_SPEC='@tcllibxml2_BUILD_LIB_SPEC@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 library from its
- # installed directory.
--tclxml_libxml2_LIB_SPEC='@tclxml_libxml2_LIB_SPEC@'
-+tclxml_libxml2_LIB_SPEC='@tcllibxml2_LIB_SPEC@'
- 
- # The name of the TclXML/libxml2 stub library (a .a file):
--tclxml_libxml2_STUB_LIB_FILE=@tclxml_libxml2_stub_LIB_FILE@
-+tclxml_libxml2_STUB_LIB_FILE=@tcllibxml2_stub_LIB_FILE@
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # build directory.
--tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tclxml_libxml2_BUILD_STUB_LIB_SPEC@'
-+tclxml_libxml2_BUILD_STUB_LIB_SPEC='@tcllibxml2_BUILD_STUB_LIB_SPEC@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # installed directory.
--tclxml_libxml2_STUB_LIB_SPEC='@tclxml_libxml2_STUB_LIB_SPEC@'
-+tclxml_libxml2_STUB_LIB_SPEC='@tcllibxml2_STUB_LIB_SPEC@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # build directory.
--tclxml_libxml2_BUILD_STUB_LIB_PATH='@tclxml_libxml2_BUILD_STUB_LIB_PATH@'
-+tclxml_libxml2_BUILD_STUB_LIB_PATH='@tcllibxml2_BUILD_STUB_LIB_PATH@'
- 
- # String to pass to linker to pick up the TclXML/libxml2 stub library from its
- # installed directory.
--tclxml_libxml2_STUB_LIB_PATH='@tclxml_libxml2_STUB_LIB_PATH@'
-+tclxml_libxml2_STUB_LIB_PATH='@tcllibxml2_STUB_LIB_PATH@'
- 
- # Location of the top-level source directories from which TclXML/libxml2
- # was built.  This is the directory that contains generic, unix, etc.
 diff -Naur --exclude '*.swp' tclxml-3.1/tclconfig/tcl.m4 tclxml-3.1.new/tclconfig/tcl.m4
 --- tclxml-3.1/tclconfig/tcl.m4	2003-12-03 12:06:35.000000000 -0800
 +++ tclxml-3.1.new/tclconfig/tcl.m4	2005-11-27 11:58:42.000000000 -0800


Index: tclxml.spec
===================================================================
RCS file: /cvs/extras/rpms/tclxml/devel/tclxml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclxml.spec	12 Jan 2006 01:28:34 -0000	1.5
+++ tclxml.spec	12 Jan 2006 01:43:48 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: TclXML is a package that provides XML parsing for the Tcl scripting language
 Name: tclxml
 Version: 3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -83,6 +83,7 @@
 make %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 cd expat
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -122,6 +123,9 @@
 %{_libdir}/Tclxml%{version}/*.a
 
 %changelog
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-6
+- Remove broken parts of patch
+- Clean up build root before installing.
 * Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-5
 - Added missing ChangeLog entries.
 * Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-4



From fedora-extras-commits at redhat.com  Thu Jan 12 04:21:44 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Wed, 11 Jan 2006 23:21:44 -0500
Subject: rpms/tcldom/devel tcldom.patch,1.1,1.2 tcldom.spec,1.1,1.2
Message-ID: <200601120422.k0C4MG6F030548@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tcldom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30498

Modified Files:
	tcldom.patch tcldom.spec 
Log Message:
Fix quoting bug that is exposed by bash >= 3.1



tcldom.patch:

Index: tcldom.patch
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/tcldom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcldom.patch	15 Dec 2005 04:58:00 -0000	1.1
+++ tcldom.patch	12 Jan 2006 04:21:43 -0000	1.2
@@ -29,7 +29,7 @@
  namespace eval xmlswitch {
 diff -Naur --exclude '*.swp' tcldom-3.1/src/configure tcldom-3.1.new/src/configure
 --- tcldom-3.1/src/configure	2003-04-04 14:07:50.000000000 -0800
-+++ tcldom-3.1.new/src/configure	2005-11-27 13:50:34.000000000 -0800
++++ tcldom-3.1.new/src/configure	2006-01-11 20:13:39.000000000 -0800
 @@ -1898,10 +1898,12 @@
  
  	    # check in a few common install locations
@@ -44,9 +44,18 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
+@@ -2249,7 +2251,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 diff -Naur --exclude '*.swp' tcldom-3.1/src-libxml2/configure tcldom-3.1.new/src-libxml2/configure
 --- tcldom-3.1/src-libxml2/configure	2005-11-03 22:36:59.000000000 -0800
-+++ tcldom-3.1.new/src-libxml2/configure	2005-11-27 13:40:37.000000000 -0800
++++ tcldom-3.1.new/src-libxml2/configure	2006-01-11 20:14:10.000000000 -0800
 @@ -1539,10 +1539,12 @@
  
  	    # check in a few common install locations
@@ -61,6 +70,15 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
+@@ -3780,7 +3782,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
 @@ -5330,9 +5332,11 @@
  
  LIBXML2_LIBDIR=""
@@ -90,7 +108,7 @@
      if test -f "$d/libxml2.so" ; then
 diff -Naur --exclude '*.swp' tcldom-3.1/tclconfig/tcl.m4 tcldom-3.1.new/tclconfig/tcl.m4
 --- tcldom-3.1/tclconfig/tcl.m4	2003-12-03 12:18:44.000000000 -0800
-+++ tcldom-3.1.new/tclconfig/tcl.m4	2005-11-27 13:37:00.000000000 -0800
++++ tcldom-3.1.new/tclconfig/tcl.m4	2006-01-11 20:13:52.000000000 -0800
 @@ -73,10 +73,12 @@
  
  	    # check in a few common install locations
@@ -105,3 +123,12 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
+@@ -759,7 +761,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`


Index: tcldom.spec
===================================================================
RCS file: /cvs/extras/rpms/tcldom/devel/tcldom.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcldom.spec	15 Dec 2005 04:58:00 -0000	1.1
+++ tcldom.spec	12 Jan 2006 04:21:43 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: TclDOM is a package that provides a DOM binding for the Tcl scripting language
 Name: tcldom
 Version: 3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Libraries
 URL:	http://tclxml.sourceforge.net/
@@ -78,6 +78,8 @@
 %{_libdir}/%{name}_libxml2%{version}/*.a
 
 %changelog
+* Wed Jan 11 2006 Wart <wart at kobold.org> - 3.1-3
+- Fix quoting bug that is exposed by bash >= 3.1
 * Tue Dec 13 2005 Wart <wart at kobold.org> - 3.1-2
 - Update patch to fix version numbers that weren't updated upstream
 * Sun Nov 27 2005 Wart <wart at kobold.org> - 3.1-1



From fedora-extras-commits at redhat.com  Thu Jan 12 06:17:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 12 Jan 2006 01:17:02 -0500
Subject: rpms/rekall/FC-3 rekall-2.4.0-64bitfix.patch, NONE,
	1.1 rekall-2.4.0-gcc4.patch, NONE,
	1.1 rekall-2.4.0-noldconfig.patch, NONE,
	1.1 rekall-2.4.0-qtfix.patch, NONE, 1.1 rekall.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200601120617.k0C6HYlR002022@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931/FC-3

Modified Files:
	rekall.spec sources 
Added Files:
	rekall-2.4.0-64bitfix.patch rekall-2.4.0-gcc4.patch 
	rekall-2.4.0-noldconfig.patch rekall-2.4.0-qtfix.patch 
Log Message:

Painful bump to 2.4.0. Like giving birth to a whale.


rekall-2.4.0-64bitfix.patch:

--- NEW FILE rekall-2.4.0-64bitfix.patch ---
--- rekall-2.2.3/libs/el32/hash.cpp.BAD	2005-09-22 13:34:45.000000000 -0500
+++ rekall-2.2.3/libs/el32/hash.cpp	2005-09-22 13:34:53.000000000 -0500
@@ -141,7 +141,7 @@
 			/* otherwise use just the tag (pretty useless	*/
 			/* but so what, not a common case).		*/
 			if ((key.tag->flags & TF_SHARED) == 0)
-				hval	= (int)key.val.shared ;
+				hval	= (long)key.val.shared ;
 			else	hval	= key.tag->tag ;
 			break	;
 	}
--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD	2005-09-22 14:29:36.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_parse.cpp	2005-09-22 14:29:52.000000000 -0500
@@ -971,7 +971,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 
 		sep	= true	;
@@ -1025,7 +1025,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 	}
 
@@ -1043,7 +1043,7 @@
 				receiver,
 				SLOT (newNode(int)),
 				0,
-				(int)exItem
+				(long)exItem
 			)	;
 		)
 
--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD	2005-09-22 15:53:11.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_link.cpp	2005-09-22 15:53:53.000000000 -0500
@@ -849,21 +849,21 @@
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecTable
+		(long)&nodeSpecTable
 	)	;
 	lp->insertItem
 	(	TR("Query link"),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecQuery
+		(long)&nodeSpecQuery
 	)	;
 	lp->insertItem
 	(	TR("SQL link"  ),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecSQL
+		(long)&nodeSpecSQL
 	) 	;
 
 	popup->insertItem (TR("New &Link"), lp) ;
--- rekall-2.4.0/libs/kbase/kb_overridedlg.cpp.BAD	2006-01-10 10:37:02.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_overridedlg.cpp	2006-01-10 10:37:22.000000000 -0600
@@ -360,7 +360,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvOverride->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/libs/kbase/kb_configdlg.cpp.BAD	2006-01-10 10:37:46.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_configdlg.cpp	2006-01-10 10:37:59.000000000 -0600
@@ -312,7 +312,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/script/python/tkc_pydebugbase.cpp.BAD	2006-01-10 10:38:42.000000000 -0600
+++ rekall-2.4.0/script/python/tkc_pydebugbase.cpp	2006-01-10 10:39:07.000000000 -0600
@@ -553,7 +553,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if (findTracePoint (pyObj, lineNo) == 0)
 		{
-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
 			enable	() ;
 		}
@@ -576,7 +576,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
 		{
-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.remove (tp) ;
 			delete	tp ;
 			disable	() ;

rekall-2.4.0-gcc4.patch:

--- NEW FILE rekall-2.4.0-gcc4.patch ---
--- rekall-2.4.0/support/xbase/ntx.h.BAD	2006-01-10 11:27:56.000000000 -0600
+++ rekall-2.4.0/support/xbase/ntx.h	2006-01-10 11:28:06.000000000 -0600
@@ -218,7 +218,7 @@
    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
    xbShort  KeyExists( xbDouble );
 
-   xbShort xbNtx::AllocKeyBufs(void);
+   xbShort AllocKeyBufs(void);
 
    virtual void GetExpression(char *buf, int len);
 };

rekall-2.4.0-noldconfig.patch:

--- NEW FILE rekall-2.4.0-noldconfig.patch ---
--- rekall-2.4.0/scons/Makefile.BAD	2006-01-10 15:25:03.000000000 -0600
+++ rekall-2.4.0/scons/Makefile	2006-01-10 15:25:13.000000000 -0600
@@ -3,11 +3,9 @@
 
 install:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 inst:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 clean:
 		PYTHONPATH=scons/ scons -Q --clean

rekall-2.4.0-qtfix.patch:

--- NEW FILE rekall-2.4.0-qtfix.patch ---
--- rekall-2.4.0/parts/report/kb_reportviewer.h.BAD	2006-01-10 14:14:14.000000000 -0600
+++ rekall-2.4.0/parts/report/kb_reportviewer.h	2006-01-10 14:14:28.000000000 -0600
@@ -15,6 +15,7 @@
 
 #include	<qscrollview.h>
 #include	<qguardedptr.h>
+#include	<qcombobox.h>
 
 #include 	"kb_classes.h"
 #include	"kb_viewer.h"


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rekall.spec	6 Oct 2005 17:09:50 -0000	1.7
+++ rekall.spec	12 Jan 2006 06:17:01 -0000	1.8
@@ -1,20 +1,24 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.2.4
-Release:	8%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
-Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
-Patch0:		rekall-2.2.3-py24.patch
-Patch1:		rekall-2.2.3-norpath3.patch
-Patch2:		rekall-2.2.3-64bitfix.patch
+Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tar.gz
+Patch1:		rekall-2.4.0-64bitfix.patch
+Patch2:		rekall-2.4.0-gcc4.patch
+Patch3:		rekall-2.4.0-qtfix.patch
+Patch4:		rekall-2.4.0-noldconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
+BuildRequires:	python-devel, mysql-devel, postgresql-devel
 BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
+BuildRequires:  scons
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-devel = %{version}-%{release}
+Obsoletes:	rekall-devel
 
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
@@ -33,14 +37,6 @@
 This package contains a set of common libraries that both rekall and 
 rekall-runtime require to function.
 
-%package devel
-Summary: Rekall development libraries and headers
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Headers and libraries for compiling programs that use Rekall.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -101,40 +97,34 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
 export KDEDIR=%{_prefix}
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
+echo "prefix=%{_prefix}" >> scons/settings.qt3
+cp scons/settings.qt3 settings
+cp scons/Makefile .
 
-%configure				\
-	--with-qlib-loader		\
-	--with-gui=kde			\
-	--disable-rpath			\
-	--enable-docs=yes		\
-	--enable-odbc=yes		\
-	--enable-iodbc=yes		\
-	--enable-runtime=yes		\
-	--enable-debug=yes		\
-	--with-qt-dir=%{_libdir}/qt-3.3	\
-%ifarch x86_64 ia64 sparc64 ppc64 
-	--enable-libsuffix=64		\
-%endif
-	--with-sgml-prefix=%{_prefix}
-
-make %{?_smp_mflags}
+make config
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Normally, we'd nuke the .la files, but rekall actually seems to want them...
-# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
+install -m0644 kbase/rekallrt.desktop $RPM_BUILD_ROOT%{_datadir}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -155,13 +145,15 @@
   $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
 
 # No need to have this file twice.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE
-
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
 cd $RPM_BUILD_ROOT%{_datadir}
-ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
-cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
+cp apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_bindir}/rekallqt rekall
+ln -s %{_bindir}/rekallqtManual rekallManual
+ln -s %{_bindir}/rekallqtrt rekallrt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,136 +198,120 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root, 0755)
 %doc LICENSE
-%{_libdir}/libel_*.so.*
-%{_libdir}/libel_*.la
-%{_libdir}/libkbase.so.*
-%{_libdir}/libkbase.la
-%{_libdir}/libkbase_*.so.*
-%exclude %{_libdir}/libkbase_common.so.*
-%exclude %{_libdir}/libkbase_kde.so.*
-%exclude %{_libdir}/libkbase_tkwidgets.so.*
-%{_libdir}/libkbase_*.la
-%{_libdir}/librekall.so.*
-%{_libdir}/librekall.la
+%{_libdir}/librekallqt.so
 %{_bindir}/rekall
+%{_bindir}/rekallqt
 %{_datadir}/pixmaps/rekall.png
-%dir %{_datadir}/apps/rekall
-%{_datadir}/apps/rekall/dict/*
-%{_datadir}/apps/rekall/help/*
-%{_datadir}/apps/rekall/highlight/*
-%{_datadir}/apps/rekall/icons/*
-%{_datadir}/apps/rekall/keymap
-%{_datadir}/apps/rekall/pics/*
-%{_datadir}/apps/rekall/rekall.png
-%{_datadir}/apps/rekall/rekallui.*
-%{_datadir}/apps/rekall/services/kdeparts.lst
-%{_datadir}/apps/rekall/services/rekall_component.desktop
-%{_datadir}/apps/rekall/services/rekall_copier.desktop
-%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
-%{_datadir}/apps/rekall/services/rekall_dummy.desktop
-%{_datadir}/apps/rekall/services/rekall_editor.desktop
-%{_datadir}/apps/rekall/services/rekall_form.desktop
-%{_datadir}/apps/rekall/services/rekall_macro.desktop
-%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
-%{_datadir}/apps/rekall/services/rekall_query.desktop
-%{_datadir}/apps/rekall/services/rekall_report.desktop
-%{_datadir}/apps/rekall/services/rekall_table.desktop
-%{_datadir}/apps/rekall/wizards/*
+%dir %{_datadir}/apps/rekallqt
+%{_datadir}/apps/rekallqt/dict/
+%{_datadir}/apps/rekallqt/gui/
+%{_datadir}/apps/rekallqt/help/
+%{_datadir}/apps/rekallqt/highlights/
+%{_datadir}/apps/rekallqt/icons/
+%{_datadir}/apps/rekallqt/keymap*
+%{_datadir}/apps/rekallqt/pics/
+%{_datadir}/apps/rekallqt/rekall.png
+%{_datadir}/apps/rekallqt/rekall_lite.png
+%{_datadir}/apps/rekallqt/services/rekall_component.desktop
+%{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
+%{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
+%{_datadir}/apps/rekallqt/services/rekall_editor.desktop
+%{_datadir}/apps/rekallqt/services/rekall_form.desktop
+%{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_query.desktop
+%{_datadir}/apps/rekallqt/services/rekall_report.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs_client.desktop
+%{_datadir}/apps/rekallqt/services/rekall_table.desktop
+%{_datadir}/apps/rekallqt/script/
+%{_datadir}/apps/rekallqt/stock/
+%{_datadir}/apps/rekallqt/test/
+%{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
-%{_libdir}/libkbase_componentview.so
-%{_libdir}/libkbase_copierview.so
-%{_libdir}/libkbase_editor.so
-%{_libdir}/libkbase_formview.so
-%{_libdir}/libkbase_macroview.so
-%{_libdir}/libkbase_queryview.so
-%{_libdir}/libkbase_reportview.so
-%{_libdir}/libkbase_tableview.so
+%{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_componentview.so
+%{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_xbase.so
+%{_libdir}/librekallqt_editor.so
+%{_libdir}/librekallqt_el32.so
+%{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_macroview.so
+%{_libdir}/librekallqt_queryview.so
+%{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_xbase.so
+%{_libdir}/librekallqt_support_xbsql.so
+%{_libdir}/librekallqt_wizard.so
 
 %files common
 %defattr(-, root, root, 0755)
-%{_libdir}/libkbase_common.so.*
-%{_libdir}/libkbase_kde.so.*
-%{_libdir}/libkbase_tkwidgets.so.*
-
-%files devel
-%defattr(-, root, root, 0755)
-%{_includedir}/*
-%{_libdir}/libel_compile.so
-%{_libdir}/libel_interp.so
-%{_libdir}/libkbase.so
-%{_libdir}/libkbase_app.so
-%{_libdir}/libkbase_common.so
-%{_libdir}/libkbase_driver_xbase.so
-%{_libdir}/libkbase_driver_xbase.la
-%{_libdir}/libkbase_kde.so
-%{_libdir}/libkbase_plugin_kde.so
-%{_libdir}/libkbase_tkwidgets.so
-%{_libdir}/libkbase_wizard.so
-%{_libdir}/librekall.so
+%{_libdir}/librekallqt_common.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
+%{_libdir}/librekallqt_script_kjs.so
 
 %files docs
 %defattr(-, root, root, 0755)
-%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
+%doc AUTHORS README.FIRST Release.Notes
+%{_bindir}/rekallManual
+%{_bindir}/rekallqtManual
 %{_docdir}/%{name}-%{version}/*
+%{_datadir}/apps/rekallqt/manual/
 
 %files extra
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
-%{_libdir}/libkbase_plugin_extra.so
-%{_libdir}/libkbase_plugin_extra.la
+%{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
+%{_libdir}/librekallqt_plugin_extra.so
 
 %files mysql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
-%{_libdir}/libkbase_driver_mysql.so
-%{_libdir}/libkbase_driver_mysql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
+%{_libdir}/librekallqt_driver_mysql.so
 
 %files postgresql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
-%{_libdir}/libkbase_driver_pgsql.so
-%{_libdir}/libkbase_driver_pgsql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
+%{_libdir}/librekallqt_driver_pgsql.so
 
 %files python
 %defattr(-, root, root, 0755)
-%dir %{_datadir}/apps/rekall/stock/component/py
-%{_datadir}/apps/rekall/stock/component/py/*
-%dir %{_datadir}/apps/rekall/script/py
-%{_datadir}/apps/rekall/script/py/*
-%{_datadir}/apps/rekall/services/rekall_script_py.desktop
-%{_libdir}/libkbase_script_py.so
-%{_libdir}/libkbase_script_pysys.so
+%dir %{_datadir}/apps/rekallqt/stock/component/py
+%{_datadir}/apps/rekallqt/stock/component/py/*
+%dir %{_datadir}/apps/rekallqt/script/py
+%{_datadir}/apps/rekallqt/script/py/*
+%{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
+%{_libdir}/librekallqt_script_py.so
 
 %files runtime
 %defattr(-, root, root, 0755)
 %{_bindir}/rekallrt
-%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
-%{_datadir}/apps/rekall/services/rekallrt_form.desktop
-%{_datadir}/apps/rekall/services/rekallrt_query.desktop
-%{_datadir}/apps/rekall/services/rekallrt_report.desktop
-%{_datadir}/apps/rekall/services/rekallrt_table.desktop
-%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
-%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
-%{_datadir}/apps/rekallrt
+%{_bindir}/rekallqtrt
+%{_datadir}/apps/rekallqt/services/rekallrt_form.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_query.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_report.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_table.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_plugin_extra.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_script_py.desktop
+%{_datadir}/apps/rekallqtrt
 %{_datadir}/applications/fedora-rekallrt.desktop
 %{_datadir}/pixmaps/rekallrt.png
-%{_libdir}/libkbasert_plugin_extra.so
-%{_libdir}/libkbasert_script_py.so
-%{_libdir}/libkbasert_script_pysys.so
-%{_libdir}/libkbasert.so*
-%{_libdir}/libkbasert_app.so*
-%{_libdir}/libkbasert_formview.so
-%{_libdir}/libkbasert_queryview.so
-%{_libdir}/libkbasert_reportview.so
-%{_libdir}/libkbasert_tableview.so
-%{_libdir}/libkbasert*.la
-%{_libdir}/librekallrt.so*
-%{_libdir}/librekallrt.la
+%{_libdir}/librekallqtrt_plugin_extra.so
+%{_libdir}/librekallqtrt_script_py.so
+%{_libdir}/librekallqtrt.so*
+%{_libdir}/librekallqtrt_app.so*
+%{_libdir}/librekallqtrt_formview.so
+%{_libdir}/librekallqtrt_queryview.so
+%{_libdir}/librekallqtrt_reportview.so
+%{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump to 2.4.0
+
 * Thu Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
 - FC-3 is held together with duct-tape
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2005 18:46:14 -0000	1.3
+++ sources	12 Jan 2006 06:17:01 -0000	1.4
@@ -1 +1 @@
-437b45a98884cd9e192ff8c0a5a7e286  rekall-2.2.4-2.tar.gz
+0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 06:17:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 12 Jan 2006 01:17:08 -0500
Subject: rpms/rekall/FC-4 rekall-2.4.0-64bitfix.patch, NONE,
	1.1 rekall-2.4.0-gcc4.patch, NONE,
	1.1 rekall-2.4.0-noldconfig.patch, NONE,
	1.1 rekall-2.4.0-qtfix.patch, NONE, 1.1 rekall.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200601120617.k0C6HeDZ002026@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931/FC-4

Modified Files:
	rekall.spec sources 
Added Files:
	rekall-2.4.0-64bitfix.patch rekall-2.4.0-gcc4.patch 
	rekall-2.4.0-noldconfig.patch rekall-2.4.0-qtfix.patch 
Log Message:

Painful bump to 2.4.0. Like giving birth to a whale.


rekall-2.4.0-64bitfix.patch:

--- NEW FILE rekall-2.4.0-64bitfix.patch ---
--- rekall-2.2.3/libs/el32/hash.cpp.BAD	2005-09-22 13:34:45.000000000 -0500
+++ rekall-2.2.3/libs/el32/hash.cpp	2005-09-22 13:34:53.000000000 -0500
@@ -141,7 +141,7 @@
 			/* otherwise use just the tag (pretty useless	*/
 			/* but so what, not a common case).		*/
 			if ((key.tag->flags & TF_SHARED) == 0)
-				hval	= (int)key.val.shared ;
+				hval	= (long)key.val.shared ;
 			else	hval	= key.tag->tag ;
 			break	;
 	}
--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD	2005-09-22 14:29:36.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_parse.cpp	2005-09-22 14:29:52.000000000 -0500
@@ -971,7 +971,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 
 		sep	= true	;
@@ -1025,7 +1025,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 	}
 
@@ -1043,7 +1043,7 @@
 				receiver,
 				SLOT (newNode(int)),
 				0,
-				(int)exItem
+				(long)exItem
 			)	;
 		)
 
--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD	2005-09-22 15:53:11.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_link.cpp	2005-09-22 15:53:53.000000000 -0500
@@ -849,21 +849,21 @@
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecTable
+		(long)&nodeSpecTable
 	)	;
 	lp->insertItem
 	(	TR("Query link"),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecQuery
+		(long)&nodeSpecQuery
 	)	;
 	lp->insertItem
 	(	TR("SQL link"  ),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecSQL
+		(long)&nodeSpecSQL
 	) 	;
 
 	popup->insertItem (TR("New &Link"), lp) ;
--- rekall-2.4.0/libs/kbase/kb_overridedlg.cpp.BAD	2006-01-10 10:37:02.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_overridedlg.cpp	2006-01-10 10:37:22.000000000 -0600
@@ -360,7 +360,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvOverride->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/libs/kbase/kb_configdlg.cpp.BAD	2006-01-10 10:37:46.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_configdlg.cpp	2006-01-10 10:37:59.000000000 -0600
@@ -312,7 +312,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/script/python/tkc_pydebugbase.cpp.BAD	2006-01-10 10:38:42.000000000 -0600
+++ rekall-2.4.0/script/python/tkc_pydebugbase.cpp	2006-01-10 10:39:07.000000000 -0600
@@ -553,7 +553,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if (findTracePoint (pyObj, lineNo) == 0)
 		{
-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
 			enable	() ;
 		}
@@ -576,7 +576,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
 		{
-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.remove (tp) ;
 			delete	tp ;
 			disable	() ;

rekall-2.4.0-gcc4.patch:

--- NEW FILE rekall-2.4.0-gcc4.patch ---
--- rekall-2.4.0/support/xbase/ntx.h.BAD	2006-01-10 11:27:56.000000000 -0600
+++ rekall-2.4.0/support/xbase/ntx.h	2006-01-10 11:28:06.000000000 -0600
@@ -218,7 +218,7 @@
    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
    xbShort  KeyExists( xbDouble );
 
-   xbShort xbNtx::AllocKeyBufs(void);
+   xbShort AllocKeyBufs(void);
 
    virtual void GetExpression(char *buf, int len);
 };

rekall-2.4.0-noldconfig.patch:

--- NEW FILE rekall-2.4.0-noldconfig.patch ---
--- rekall-2.4.0/scons/Makefile.BAD	2006-01-10 15:25:03.000000000 -0600
+++ rekall-2.4.0/scons/Makefile	2006-01-10 15:25:13.000000000 -0600
@@ -3,11 +3,9 @@
 
 install:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 inst:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 clean:
 		PYTHONPATH=scons/ scons -Q --clean

rekall-2.4.0-qtfix.patch:

--- NEW FILE rekall-2.4.0-qtfix.patch ---
--- rekall-2.4.0/parts/report/kb_reportviewer.h.BAD	2006-01-10 14:14:14.000000000 -0600
+++ rekall-2.4.0/parts/report/kb_reportviewer.h	2006-01-10 14:14:28.000000000 -0600
@@ -15,6 +15,7 @@
 
 #include	<qscrollview.h>
 #include	<qguardedptr.h>
+#include	<qcombobox.h>
 
 #include 	"kb_classes.h"
 #include	"kb_viewer.h"


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rekall.spec	6 Oct 2005 17:09:51 -0000	1.7
+++ rekall.spec	12 Jan 2006 06:17:07 -0000	1.8
@@ -1,20 +1,24 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.2.4
-Release:	8%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
-Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
-Patch0:		rekall-2.2.3-py24.patch
-Patch1:		rekall-2.2.3-norpath3.patch
-Patch2:		rekall-2.2.3-64bitfix.patch
+Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tar.gz
+Patch1:		rekall-2.4.0-64bitfix.patch
+Patch2:		rekall-2.4.0-gcc4.patch
+Patch3:		rekall-2.4.0-qtfix.patch
+Patch4:		rekall-2.4.0-noldconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
+BuildRequires:	python-devel, mysql-devel, postgresql-devel
 BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
+BuildRequires:  scons
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-devel = %{version}-%{release}
+Obsoletes:	rekall-devel
 
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
@@ -33,14 +37,6 @@
 This package contains a set of common libraries that both rekall and 
 rekall-runtime require to function.
 
-%package devel
-Summary: Rekall development libraries and headers
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Headers and libraries for compiling programs that use Rekall.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -101,40 +97,34 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
 export KDEDIR=%{_prefix}
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
+echo "prefix=%{_prefix}" >> scons/settings.qt3
+cp scons/settings.qt3 settings
+cp scons/Makefile .
 
-%configure				\
-	--with-qlib-loader		\
-	--with-gui=kde			\
-	--disable-rpath			\
-	--enable-docs=yes		\
-	--enable-odbc=yes		\
-	--enable-iodbc=yes		\
-	--enable-runtime=yes		\
-	--enable-debug=yes		\
-	--with-qt-dir=%{_libdir}/qt-3.3	\
-%ifarch x86_64 ia64 sparc64 ppc64 
-	--enable-libsuffix=64		\
-%endif
-	--with-sgml-prefix=%{_prefix}
-
-make %{?_smp_mflags}
+make config
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Normally, we'd nuke the .la files, but rekall actually seems to want them...
-# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
+install -m0644 kbase/rekallrt.desktop $RPM_BUILD_ROOT%{_datadir}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -155,13 +145,15 @@
   $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
 
 # No need to have this file twice.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE
-
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
 cd $RPM_BUILD_ROOT%{_datadir}
-ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
-cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
+cp apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_bindir}/rekallqt rekall
+ln -s %{_bindir}/rekallqtManual rekallManual
+ln -s %{_bindir}/rekallqtrt rekallrt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,136 +198,120 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root, 0755)
 %doc LICENSE
-%{_libdir}/libel_*.so.*
-%{_libdir}/libel_*.la
-%{_libdir}/libkbase.so.*
-%{_libdir}/libkbase.la
-%{_libdir}/libkbase_*.so.*
-%exclude %{_libdir}/libkbase_common.so.*
-%exclude %{_libdir}/libkbase_kde.so.*
-%exclude %{_libdir}/libkbase_tkwidgets.so.*
-%{_libdir}/libkbase_*.la
-%{_libdir}/librekall.so.*
-%{_libdir}/librekall.la
+%{_libdir}/librekallqt.so
 %{_bindir}/rekall
+%{_bindir}/rekallqt
 %{_datadir}/pixmaps/rekall.png
-%dir %{_datadir}/apps/rekall
-%{_datadir}/apps/rekall/dict/*
-%{_datadir}/apps/rekall/help/*
-%{_datadir}/apps/rekall/highlight/*
-%{_datadir}/apps/rekall/icons/*
-%{_datadir}/apps/rekall/keymap
-%{_datadir}/apps/rekall/pics/*
-%{_datadir}/apps/rekall/rekall.png
-%{_datadir}/apps/rekall/rekallui.*
-%{_datadir}/apps/rekall/services/kdeparts.lst
-%{_datadir}/apps/rekall/services/rekall_component.desktop
-%{_datadir}/apps/rekall/services/rekall_copier.desktop
-%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
-%{_datadir}/apps/rekall/services/rekall_dummy.desktop
-%{_datadir}/apps/rekall/services/rekall_editor.desktop
-%{_datadir}/apps/rekall/services/rekall_form.desktop
-%{_datadir}/apps/rekall/services/rekall_macro.desktop
-%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
-%{_datadir}/apps/rekall/services/rekall_query.desktop
-%{_datadir}/apps/rekall/services/rekall_report.desktop
-%{_datadir}/apps/rekall/services/rekall_table.desktop
-%{_datadir}/apps/rekall/wizards/*
+%dir %{_datadir}/apps/rekallqt
+%{_datadir}/apps/rekallqt/dict/
+%{_datadir}/apps/rekallqt/gui/
+%{_datadir}/apps/rekallqt/help/
+%{_datadir}/apps/rekallqt/highlights/
+%{_datadir}/apps/rekallqt/icons/
+%{_datadir}/apps/rekallqt/keymap*
+%{_datadir}/apps/rekallqt/pics/
+%{_datadir}/apps/rekallqt/rekall.png
+%{_datadir}/apps/rekallqt/rekall_lite.png
+%{_datadir}/apps/rekallqt/services/rekall_component.desktop
+%{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
+%{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
+%{_datadir}/apps/rekallqt/services/rekall_editor.desktop
+%{_datadir}/apps/rekallqt/services/rekall_form.desktop
+%{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_query.desktop
+%{_datadir}/apps/rekallqt/services/rekall_report.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs_client.desktop
+%{_datadir}/apps/rekallqt/services/rekall_table.desktop
+%{_datadir}/apps/rekallqt/script/
+%{_datadir}/apps/rekallqt/stock/
+%{_datadir}/apps/rekallqt/test/
+%{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
-%{_libdir}/libkbase_componentview.so
-%{_libdir}/libkbase_copierview.so
-%{_libdir}/libkbase_editor.so
-%{_libdir}/libkbase_formview.so
-%{_libdir}/libkbase_macroview.so
-%{_libdir}/libkbase_queryview.so
-%{_libdir}/libkbase_reportview.so
-%{_libdir}/libkbase_tableview.so
+%{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_componentview.so
+%{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_xbase.so
+%{_libdir}/librekallqt_editor.so
+%{_libdir}/librekallqt_el32.so
+%{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_macroview.so
+%{_libdir}/librekallqt_queryview.so
+%{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_xbase.so
+%{_libdir}/librekallqt_support_xbsql.so
+%{_libdir}/librekallqt_wizard.so
 
 %files common
 %defattr(-, root, root, 0755)
-%{_libdir}/libkbase_common.so.*
-%{_libdir}/libkbase_kde.so.*
-%{_libdir}/libkbase_tkwidgets.so.*
-
-%files devel
-%defattr(-, root, root, 0755)
-%{_includedir}/*
-%{_libdir}/libel_compile.so
-%{_libdir}/libel_interp.so
-%{_libdir}/libkbase.so
-%{_libdir}/libkbase_app.so
-%{_libdir}/libkbase_common.so
-%{_libdir}/libkbase_driver_xbase.so
-%{_libdir}/libkbase_driver_xbase.la
-%{_libdir}/libkbase_kde.so
-%{_libdir}/libkbase_plugin_kde.so
-%{_libdir}/libkbase_tkwidgets.so
-%{_libdir}/libkbase_wizard.so
-%{_libdir}/librekall.so
+%{_libdir}/librekallqt_common.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
+%{_libdir}/librekallqt_script_kjs.so
 
 %files docs
 %defattr(-, root, root, 0755)
-%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
+%doc AUTHORS README.FIRST Release.Notes
+%{_bindir}/rekallManual
+%{_bindir}/rekallqtManual
 %{_docdir}/%{name}-%{version}/*
+%{_datadir}/apps/rekallqt/manual/
 
 %files extra
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
-%{_libdir}/libkbase_plugin_extra.so
-%{_libdir}/libkbase_plugin_extra.la
+%{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
+%{_libdir}/librekallqt_plugin_extra.so
 
 %files mysql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
-%{_libdir}/libkbase_driver_mysql.so
-%{_libdir}/libkbase_driver_mysql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
+%{_libdir}/librekallqt_driver_mysql.so
 
 %files postgresql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
-%{_libdir}/libkbase_driver_pgsql.so
-%{_libdir}/libkbase_driver_pgsql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
+%{_libdir}/librekallqt_driver_pgsql.so
 
 %files python
 %defattr(-, root, root, 0755)
-%dir %{_datadir}/apps/rekall/stock/component/py
-%{_datadir}/apps/rekall/stock/component/py/*
-%dir %{_datadir}/apps/rekall/script/py
-%{_datadir}/apps/rekall/script/py/*
-%{_datadir}/apps/rekall/services/rekall_script_py.desktop
-%{_libdir}/libkbase_script_py.so
-%{_libdir}/libkbase_script_pysys.so
+%dir %{_datadir}/apps/rekallqt/stock/component/py
+%{_datadir}/apps/rekallqt/stock/component/py/*
+%dir %{_datadir}/apps/rekallqt/script/py
+%{_datadir}/apps/rekallqt/script/py/*
+%{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
+%{_libdir}/librekallqt_script_py.so
 
 %files runtime
 %defattr(-, root, root, 0755)
 %{_bindir}/rekallrt
-%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
-%{_datadir}/apps/rekall/services/rekallrt_form.desktop
-%{_datadir}/apps/rekall/services/rekallrt_query.desktop
-%{_datadir}/apps/rekall/services/rekallrt_report.desktop
-%{_datadir}/apps/rekall/services/rekallrt_table.desktop
-%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
-%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
-%{_datadir}/apps/rekallrt
+%{_bindir}/rekallqtrt
+%{_datadir}/apps/rekallqt/services/rekallrt_form.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_query.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_report.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_table.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_plugin_extra.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_script_py.desktop
+%{_datadir}/apps/rekallqtrt
 %{_datadir}/applications/fedora-rekallrt.desktop
 %{_datadir}/pixmaps/rekallrt.png
-%{_libdir}/libkbasert_plugin_extra.so
-%{_libdir}/libkbasert_script_py.so
-%{_libdir}/libkbasert_script_pysys.so
-%{_libdir}/libkbasert.so*
-%{_libdir}/libkbasert_app.so*
-%{_libdir}/libkbasert_formview.so
-%{_libdir}/libkbasert_queryview.so
-%{_libdir}/libkbasert_reportview.so
-%{_libdir}/libkbasert_tableview.so
-%{_libdir}/libkbasert*.la
-%{_libdir}/librekallrt.so*
-%{_libdir}/librekallrt.la
+%{_libdir}/librekallqtrt_plugin_extra.so
+%{_libdir}/librekallqtrt_script_py.so
+%{_libdir}/librekallqtrt.so*
+%{_libdir}/librekallqtrt_app.so*
+%{_libdir}/librekallqtrt_formview.so
+%{_libdir}/librekallqtrt_queryview.so
+%{_libdir}/librekallqtrt_reportview.so
+%{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump to 2.4.0
+
 * Thu Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
 - FC-3 is held together with duct-tape
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2005 18:46:15 -0000	1.3
+++ sources	12 Jan 2006 06:17:07 -0000	1.4
@@ -1 +1 @@
-437b45a98884cd9e192ff8c0a5a7e286  rekall-2.2.4-2.tar.gz
+0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 06:17:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Thu, 12 Jan 2006 01:17:14 -0500
Subject: rpms/rekall/devel rekall-2.4.0-64bitfix.patch, NONE,
	1.1 rekall-2.4.0-gcc4.patch, NONE,
	1.1 rekall-2.4.0-noldconfig.patch, NONE,
	1.1 rekall-2.4.0-qtfix.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 rekall.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601120617.k0C6Hk0l002031@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931/devel

Modified Files:
	.cvsignore rekall.spec sources 
Added Files:
	rekall-2.4.0-64bitfix.patch rekall-2.4.0-gcc4.patch 
	rekall-2.4.0-noldconfig.patch rekall-2.4.0-qtfix.patch 
Log Message:

Painful bump to 2.4.0. Like giving birth to a whale.


rekall-2.4.0-64bitfix.patch:

--- NEW FILE rekall-2.4.0-64bitfix.patch ---
--- rekall-2.2.3/libs/el32/hash.cpp.BAD	2005-09-22 13:34:45.000000000 -0500
+++ rekall-2.2.3/libs/el32/hash.cpp	2005-09-22 13:34:53.000000000 -0500
@@ -141,7 +141,7 @@
 			/* otherwise use just the tag (pretty useless	*/
 			/* but so what, not a common case).		*/
 			if ((key.tag->flags & TF_SHARED) == 0)
-				hval	= (int)key.val.shared ;
+				hval	= (long)key.val.shared ;
 			else	hval	= key.tag->tag ;
 			break	;
 	}
--- rekall-2.2.4/libs/kbase/kb_parse.cpp.BAD	2005-09-22 14:29:36.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_parse.cpp	2005-09-22 14:29:52.000000000 -0500
@@ -971,7 +971,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 
 		sep	= true	;
@@ -1025,7 +1025,7 @@
 			receiver,
 			SLOT (newNode(int)),
 			0,
-			(int)nsItem
+			(long)nsItem
 		)	;
 	}
 
@@ -1043,7 +1043,7 @@
 				receiver,
 				SLOT (newNode(int)),
 				0,
-				(int)exItem
+				(long)exItem
 			)	;
 		)
 
--- rekall-2.2.4/libs/kbase/kb_link.cpp.BAD	2005-09-22 15:53:11.000000000 -0500
+++ rekall-2.2.4/libs/kbase/kb_link.cpp	2005-09-22 15:53:53.000000000 -0500
@@ -849,21 +849,21 @@
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecTable
+		(long)&nodeSpecTable
 	)	;
 	lp->insertItem
 	(	TR("Query link"),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecQuery
+		(long)&nodeSpecQuery
 	)	;
 	lp->insertItem
 	(	TR("SQL link"  ),
 		receiver,
 		SLOT(newNode(int)),
 		0,
-		(int)&nodeSpecSQL
+		(long)&nodeSpecSQL
 	) 	;
 
 	popup->insertItem (TR("New &Link"), lp) ;
--- rekall-2.4.0/libs/kbase/kb_overridedlg.cpp.BAD	2006-01-10 10:37:02.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_overridedlg.cpp	2006-01-10 10:37:22.000000000 -0600
@@ -360,7 +360,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvOverride->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/libs/kbase/kb_configdlg.cpp.BAD	2006-01-10 10:37:46.000000000 -0600
+++ rekall-2.4.0/libs/kbase/kb_configdlg.cpp	2006-01-10 10:37:59.000000000 -0600
@@ -312,7 +312,7 @@
 	old.clear () ;
 
 	QListViewItem	*item	= m_lvConfigs->firstChild() ;
-	uint		ident	= 0x000ffffff & (uint)(void *)item ;
+	uint		ident	= 0x000ffffff & (unsigned long)(void *)item ;
 
 	while (item != 0)
 	{
--- rekall-2.4.0/script/python/tkc_pydebugbase.cpp.BAD	2006-01-10 10:38:42.000000000 -0600
+++ rekall-2.4.0/script/python/tkc_pydebugbase.cpp	2006-01-10 10:39:07.000000000 -0600
@@ -553,7 +553,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if (findTracePoint (pyObj, lineNo) == 0)
 		{
-			fprintf	(stderr, "Set trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Set trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.append (new TKCPyTracePoint (pyObj, userPtr, lineNo)) ;
 			enable	() ;
 		}
@@ -576,7 +576,7 @@
 	if (PyModule_Check (pyObj) || PyCode_Check (pyObj))
 		if ((tp = findTracePoint (pyObj, lineNo)) != 0)
 		{
-			fprintf	(stderr, "Rem trace: %08x:%d\n", (uint)pyObj, lineNo) ;
+			fprintf	(stderr, "Rem trace: %08x:%d\n", (unsigned long)pyObj, lineNo) ;
 			tracePoints.remove (tp) ;
 			delete	tp ;
 			disable	() ;

rekall-2.4.0-gcc4.patch:

--- NEW FILE rekall-2.4.0-gcc4.patch ---
--- rekall-2.4.0/support/xbase/ntx.h.BAD	2006-01-10 11:27:56.000000000 -0600
+++ rekall-2.4.0/support/xbase/ntx.h	2006-01-10 11:28:06.000000000 -0600
@@ -218,7 +218,7 @@
    xbShort  KeyExists( char * Key ) { return FindKey( Key, strlen( Key ), 0 ); }
    xbShort  KeyExists( xbDouble );
 
-   xbShort xbNtx::AllocKeyBufs(void);
+   xbShort AllocKeyBufs(void);
 
    virtual void GetExpression(char *buf, int len);
 };

rekall-2.4.0-noldconfig.patch:

--- NEW FILE rekall-2.4.0-noldconfig.patch ---
--- rekall-2.4.0/scons/Makefile.BAD	2006-01-10 15:25:03.000000000 -0600
+++ rekall-2.4.0/scons/Makefile	2006-01-10 15:25:13.000000000 -0600
@@ -3,11 +3,9 @@
 
 install:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 inst:
 		PYTHONPATH=scons/ scons -Q install
-		[ `id -u` = 0 ] && ldconfig
 
 clean:
 		PYTHONPATH=scons/ scons -Q --clean

rekall-2.4.0-qtfix.patch:

--- NEW FILE rekall-2.4.0-qtfix.patch ---
--- rekall-2.4.0/parts/report/kb_reportviewer.h.BAD	2006-01-10 14:14:14.000000000 -0600
+++ rekall-2.4.0/parts/report/kb_reportviewer.h	2006-01-10 14:14:28.000000000 -0600
@@ -15,6 +15,7 @@
 
 #include	<qscrollview.h>
 #include	<qguardedptr.h>
+#include	<qcombobox.h>
 
 #include 	"kb_classes.h"
 #include	"kb_viewer.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Sep 2005 18:46:20 -0000	1.3
+++ .cvsignore	12 Jan 2006 06:17:13 -0000	1.4
@@ -1,2 +1,3 @@
 rekall-2.2.3-2.tar.gz
 rekall-2.2.4-2.tar.gz
+rekall-2.4.0.tar.gz


Index: rekall.spec
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rekall.spec	6 Oct 2005 17:09:52 -0000	1.7
+++ rekall.spec	12 Jan 2006 06:17:13 -0000	1.8
@@ -1,20 +1,24 @@
 Name:		rekall
 Summary:	A KDE database front-end application
-Version:	2.2.4
-Release:	8%{?dist}
+Version:	2.4.0
+Release:	1%{?dist}
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.rekallrevealed.org/
-Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}-2.tar.gz
-Patch0:		rekall-2.2.3-py24.patch
-Patch1:		rekall-2.2.3-norpath3.patch
-Patch2:		rekall-2.2.3-64bitfix.patch
+Source0: 	http://www.rekallrevealed.org/packages/%{name}-%{version}.tar.gz
+Patch1:		rekall-2.4.0-64bitfix.patch
+Patch2:		rekall-2.4.0-gcc4.patch
+Patch3:		rekall-2.4.0-qtfix.patch
+Patch4:		rekall-2.4.0-noldconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xbsql-devel, python-devel, mysql-devel, postgresql-devel
+BuildRequires:	python-devel, mysql-devel, postgresql-devel
 BuildRequires:	kdelibs-devel, desktop-file-utils, libacl-devel
+BuildRequires:  scons
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 Requires:	rekall-common = %{version}-%{release}
+Provides:	rekall-devel = %{version}-%{release}
+Obsoletes:	rekall-devel
 
 %description
 Rekall is a database front-end, however, Rekall is not itself a 
@@ -33,14 +37,6 @@
 This package contains a set of common libraries that both rekall and 
 rekall-runtime require to function.
 
-%package devel
-Summary: Rekall development libraries and headers
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-Headers and libraries for compiling programs that use Rekall.
-
 %package docs
 Summary: Rekall documentation
 Group: Documentation
@@ -101,40 +97,34 @@
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
 %build
 export KDEDIR=%{_prefix}
+PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"`
+sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
+echo "prefix=%{_prefix}" >> scons/settings.qt3
+cp scons/settings.qt3 settings
+cp scons/Makefile .
 
-%configure				\
-	--with-qlib-loader		\
-	--with-gui=kde			\
-	--disable-rpath			\
-	--enable-docs=yes		\
-	--enable-odbc=yes		\
-	--enable-iodbc=yes		\
-	--enable-runtime=yes		\
-	--enable-debug=yes		\
-	--with-qt-dir=%{_libdir}/qt-3.3	\
-%ifarch x86_64 ia64 sparc64 ppc64 
-	--enable-libsuffix=64		\
-%endif
-	--with-sgml-prefix=%{_prefix}
-
-make %{?_smp_mflags}
+make config
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# Normally, we'd nuke the .la files, but rekall actually seems to want them...
-# rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 mv $RPM_BUILD_ROOT%{_datadir}/doc/HTML $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+install -m0644 kbase/rekall.desktop $RPM_BUILD_ROOT%{_datadir}
+install -m0644 kbase/rekallrt.desktop $RPM_BUILD_ROOT%{_datadir}
+
 desktop-file-install --vendor fedora --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
@@ -155,13 +145,15 @@
   $RPM_BUILD_ROOT%{_datadir}/%{name}rt.desktop
 
 # No need to have this file twice.
-rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekall/LICENSE
-
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/rekallqt/LICENSE
 
 cd $RPM_BUILD_ROOT%{_datadir}
-ln -s %{_datadir}/apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
-cp apps/rekall/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+ln -s %{_datadir}/apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekall.png
+cp apps/rekallqt/icons/hicolor/32x32/apps/rekall.png pixmaps/rekallrt.png
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s %{_bindir}/rekallqt rekall
+ln -s %{_bindir}/rekallqtManual rekallManual
+ln -s %{_bindir}/rekallqtrt rekallrt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,136 +198,120 @@
   update-desktop-database %{_datadir}/applications &> /dev/null
 fi
 
-%files -f %{name}.lang
+%files
 %defattr(-, root, root, 0755)
 %doc LICENSE
-%{_libdir}/libel_*.so.*
-%{_libdir}/libel_*.la
-%{_libdir}/libkbase.so.*
-%{_libdir}/libkbase.la
-%{_libdir}/libkbase_*.so.*
-%exclude %{_libdir}/libkbase_common.so.*
-%exclude %{_libdir}/libkbase_kde.so.*
-%exclude %{_libdir}/libkbase_tkwidgets.so.*
-%{_libdir}/libkbase_*.la
-%{_libdir}/librekall.so.*
-%{_libdir}/librekall.la
+%{_libdir}/librekallqt.so
 %{_bindir}/rekall
+%{_bindir}/rekallqt
 %{_datadir}/pixmaps/rekall.png
-%dir %{_datadir}/apps/rekall
-%{_datadir}/apps/rekall/dict/*
-%{_datadir}/apps/rekall/help/*
-%{_datadir}/apps/rekall/highlight/*
-%{_datadir}/apps/rekall/icons/*
-%{_datadir}/apps/rekall/keymap
-%{_datadir}/apps/rekall/pics/*
-%{_datadir}/apps/rekall/rekall.png
-%{_datadir}/apps/rekall/rekallui.*
-%{_datadir}/apps/rekall/services/kdeparts.lst
-%{_datadir}/apps/rekall/services/rekall_component.desktop
-%{_datadir}/apps/rekall/services/rekall_copier.desktop
-%{_datadir}/apps/rekall/services/rekall_driver_xbase.desktop
-%{_datadir}/apps/rekall/services/rekall_dummy.desktop
-%{_datadir}/apps/rekall/services/rekall_editor.desktop
-%{_datadir}/apps/rekall/services/rekall_form.desktop
-%{_datadir}/apps/rekall/services/rekall_macro.desktop
-%{_datadir}/apps/rekall/services/rekall_plugin_kde.desktop
-%{_datadir}/apps/rekall/services/rekall_query.desktop
-%{_datadir}/apps/rekall/services/rekall_report.desktop
-%{_datadir}/apps/rekall/services/rekall_table.desktop
-%{_datadir}/apps/rekall/wizards/*
+%dir %{_datadir}/apps/rekallqt
+%{_datadir}/apps/rekallqt/dict/
+%{_datadir}/apps/rekallqt/gui/
+%{_datadir}/apps/rekallqt/help/
+%{_datadir}/apps/rekallqt/highlights/
+%{_datadir}/apps/rekallqt/icons/
+%{_datadir}/apps/rekallqt/keymap*
+%{_datadir}/apps/rekallqt/pics/
+%{_datadir}/apps/rekallqt/rekall.png
+%{_datadir}/apps/rekallqt/rekall_lite.png
+%{_datadir}/apps/rekallqt/services/rekall_component.desktop
+%{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
+%{_datadir}/apps/rekallqt/services/rekall_dummy.desktop
+%{_datadir}/apps/rekallqt/services/rekall_editor.desktop
+%{_datadir}/apps/rekallqt/services/rekall_form.desktop
+%{_datadir}/apps/rekallqt/services/rekall_macro.desktop
+%{_datadir}/apps/rekallqt/services/rekall_query.desktop
+%{_datadir}/apps/rekallqt/services/rekall_report.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs.desktop
+%{_datadir}/apps/rekallqt/services/rekall_script_kjs_client.desktop
+%{_datadir}/apps/rekallqt/services/rekall_table.desktop
+%{_datadir}/apps/rekallqt/script/
+%{_datadir}/apps/rekallqt/stock/
+%{_datadir}/apps/rekallqt/test/
+%{_datadir}/apps/rekallqt/wizards/
 %{_datadir}/applications/fedora-rekall.desktop
-%{_libdir}/libkbase_componentview.so
-%{_libdir}/libkbase_copierview.so
-%{_libdir}/libkbase_editor.so
-%{_libdir}/libkbase_formview.so
-%{_libdir}/libkbase_macroview.so
-%{_libdir}/libkbase_queryview.so
-%{_libdir}/libkbase_reportview.so
-%{_libdir}/libkbase_tableview.so
+%{_libdir}/librekallqt_app.so
+%{_libdir}/librekallqt_componentview.so
+%{_libdir}/librekallqt_copierview.so
+%{_libdir}/librekallqt_driver_xbase.so
+%{_libdir}/librekallqt_editor.so
+%{_libdir}/librekallqt_el32.so
+%{_libdir}/librekallqt_formview.so
+%{_libdir}/librekallqt_macroview.so
+%{_libdir}/librekallqt_queryview.so
+%{_libdir}/librekallqt_reportview.so
+%{_libdir}/librekallqt_tableview.so
+%{_libdir}/librekallqt_support_xbase.so
+%{_libdir}/librekallqt_support_xbsql.so
+%{_libdir}/librekallqt_wizard.so
 
 %files common
 %defattr(-, root, root, 0755)
-%{_libdir}/libkbase_common.so.*
-%{_libdir}/libkbase_kde.so.*
-%{_libdir}/libkbase_tkwidgets.so.*
-
-%files devel
-%defattr(-, root, root, 0755)
-%{_includedir}/*
-%{_libdir}/libel_compile.so
-%{_libdir}/libel_interp.so
-%{_libdir}/libkbase.so
-%{_libdir}/libkbase_app.so
-%{_libdir}/libkbase_common.so
-%{_libdir}/libkbase_driver_xbase.so
-%{_libdir}/libkbase_driver_xbase.la
-%{_libdir}/libkbase_kde.so
-%{_libdir}/libkbase_plugin_kde.so
-%{_libdir}/libkbase_tkwidgets.so
-%{_libdir}/libkbase_wizard.so
-%{_libdir}/librekall.so
+%{_libdir}/librekallqt_common.so
+%{_libdir}/librekallqt_kde.so
+%{_libdir}/librekallqt_kjs.so
+%{_libdir}/librekallqt_script_kjs.so
 
 %files docs
 %defattr(-, root, root, 0755)
-%doc AUTHORS INSTALL.KDE README.FIRST Release.Notes
+%doc AUTHORS README.FIRST Release.Notes
+%{_bindir}/rekallManual
+%{_bindir}/rekallqtManual
 %{_docdir}/%{name}-%{version}/*
+%{_datadir}/apps/rekallqt/manual/
 
 %files extra
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_plugin_extra.desktop
-%{_libdir}/libkbase_plugin_extra.so
-%{_libdir}/libkbase_plugin_extra.la
+%{_datadir}/apps/rekallqt/services/rekall_plugin_extra.desktop
+%{_libdir}/librekallqt_plugin_extra.so
 
 %files mysql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_mysql.desktop
-%{_libdir}/libkbase_driver_mysql.so
-%{_libdir}/libkbase_driver_mysql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
+%{_libdir}/librekallqt_driver_mysql.so
 
 %files postgresql
 %defattr(-, root, root, 0755)
-%{_datadir}/apps/rekall/services/rekall_driver_pgsql.desktop
-%{_libdir}/libkbase_driver_pgsql.so
-%{_libdir}/libkbase_driver_pgsql.la
+%{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
+%{_libdir}/librekallqt_driver_pgsql.so
 
 %files python
 %defattr(-, root, root, 0755)
-%dir %{_datadir}/apps/rekall/stock/component/py
-%{_datadir}/apps/rekall/stock/component/py/*
-%dir %{_datadir}/apps/rekall/script/py
-%{_datadir}/apps/rekall/script/py/*
-%{_datadir}/apps/rekall/services/rekall_script_py.desktop
-%{_libdir}/libkbase_script_py.so
-%{_libdir}/libkbase_script_pysys.so
+%dir %{_datadir}/apps/rekallqt/stock/component/py
+%{_datadir}/apps/rekallqt/stock/component/py/*
+%dir %{_datadir}/apps/rekallqt/script/py
+%{_datadir}/apps/rekallqt/script/py/*
+%{_datadir}/apps/rekallqt/services/rekall_script_py.desktop
+%{_libdir}/librekallqt_script_py.so
 
 %files runtime
 %defattr(-, root, root, 0755)
 %{_bindir}/rekallrt
-%{_datadir}/apps/rekall/services/rekallrt_copier.desktop
-%{_datadir}/apps/rekall/services/rekallrt_form.desktop
-%{_datadir}/apps/rekall/services/rekallrt_query.desktop
-%{_datadir}/apps/rekall/services/rekallrt_report.desktop
-%{_datadir}/apps/rekall/services/rekallrt_table.desktop
-%{_datadir}/apps/rekall/services/rekallrt_plugin_extra.desktop
-%{_datadir}/apps/rekall/services/rekallrt_script_py.desktop
-%{_datadir}/apps/rekallrt
+%{_bindir}/rekallqtrt
+%{_datadir}/apps/rekallqt/services/rekallrt_form.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_query.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_report.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_table.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_plugin_extra.desktop
+%{_datadir}/apps/rekallqt/services/rekallrt_script_py.desktop
+%{_datadir}/apps/rekallqtrt
 %{_datadir}/applications/fedora-rekallrt.desktop
 %{_datadir}/pixmaps/rekallrt.png
-%{_libdir}/libkbasert_plugin_extra.so
-%{_libdir}/libkbasert_script_py.so
-%{_libdir}/libkbasert_script_pysys.so
-%{_libdir}/libkbasert.so*
-%{_libdir}/libkbasert_app.so*
-%{_libdir}/libkbasert_formview.so
-%{_libdir}/libkbasert_queryview.so
-%{_libdir}/libkbasert_reportview.so
-%{_libdir}/libkbasert_tableview.so
-%{_libdir}/libkbasert*.la
-%{_libdir}/librekallrt.so*
-%{_libdir}/librekallrt.la
+%{_libdir}/librekallqtrt_plugin_extra.so
+%{_libdir}/librekallqtrt_script_py.so
+%{_libdir}/librekallqtrt.so*
+%{_libdir}/librekallqtrt_app.so*
+%{_libdir}/librekallqtrt_formview.so
+%{_libdir}/librekallqtrt_queryview.so
+%{_libdir}/librekallqtrt_reportview.so
+%{_libdir}/librekallqtrt_tableview.so
 
 %changelog
+* Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.0-1
+- bump to 2.4.0
+
 * Thu Oct  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.2.4-8
 - FC-3 is held together with duct-tape
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rekall/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Sep 2005 18:46:20 -0000	1.3
+++ sources	12 Jan 2006 06:17:13 -0000	1.4
@@ -1 +1 @@
-437b45a98884cd9e192ff8c0a5a7e286  rekall-2.2.4-2.tar.gz
+0d90d4bbe3e470b0764b10e8c9b81559  rekall-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 07:59:33 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 02:59:33 -0500
Subject: rpms/kbibtex - New directory
Message-ID: <200601120759.k0C7xaYR004155@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4147/kbibtex

Log Message:
Directory /cvs/extras/rpms/kbibtex added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 07:59:39 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 02:59:39 -0500
Subject: rpms/kbibtex/devel - New directory
Message-ID: <200601120759.k0C7xfDx004170@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4147/kbibtex/devel

Log Message:
Directory /cvs/extras/rpms/kbibtex/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 08:00:12 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:00:12 -0500
Subject: rpms/kbibtex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601120800.k0C80Ehv004212@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4200

Added Files:
	Makefile import.log 
Log Message:
Setup of module kbibtex


--- NEW FILE Makefile ---
# Top level Makefile for module kbibtex
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 12 08:00:18 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:00:18 -0500
Subject: rpms/kbibtex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601120800.k0C80Knc004232@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4200/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kbibtex


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 12 08:02:56 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:02:56 -0500
Subject: rpms/kbibtex import.log,1.1,1.2
Message-ID: <200601120804.k0C84Nem005950@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5912

Modified Files:
	import.log 
Log Message:
auto-import kbibtex-0.1.3-3 on branch devel from kbibtex-0.1.3-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jan 2006 08:00:11 -0000	1.1
+++ import.log	12 Jan 2006 08:02:55 -0000	1.2
@@ -0,0 +1 @@
+kbibtex-0_1_3-3:HEAD:kbibtex-0.1.3-3.src.rpm:1137052951



From fedora-extras-commits at redhat.com  Thu Jan 12 08:03:21 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:03:21 -0500
Subject: rpms/kbibtex/devel kbibtex-qualifier.patch, NONE, 1.1 kbibtex.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601120804.k0C84NcF005951@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5912/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kbibtex-qualifier.patch kbibtex.spec 
Log Message:
auto-import kbibtex-0.1.3-3 on branch devel from kbibtex-0.1.3-3.src.rpm

kbibtex-qualifier.patch:

--- NEW FILE kbibtex-qualifier.patch ---
--- kbibtex-0.1.3/src/kbibtexlistview.h	2005-11-29 13:43:15.000000000 +0100
+++ kbibtex-0.1.3/src/kbibtexlistview.h.qualifier	2005-12-23 11:39:35.000000000 +0100
@@ -62,7 +62,7 @@
     //     BibTeX::BibTeXFile *selectedElements();
 
     void enabledActions();
-    bool KBibTeXListView::acceptDrag( QDropEvent *event ) const;
+    bool acceptDrag( QDropEvent *event ) const;
 
 public slots:
     void filterText( const QString&text );


--- NEW FILE kbibtex.spec ---
Name:		kbibtex
Version:	0.1.3
Release:	3%{?dist}
Summary:	A BibTeX editor for KDE  

Group:		Applications/Editors
License:	GPL
URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
Patch:		kbibtex-qualifier.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
#Requires:       
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils

%description
KBibTeX is a BibTeX editor for KDE

%prep
%setup -q
%patch -p1 -b .qualifier


%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure --disable-rpath --disable-debug
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

#
# Replace original .desktop files with proper ones
#
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
	--delete-original	\
	${RPM_BUILD_ROOT}%{_datadir}/services/kbibtex_part.desktop

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
	--delete-original \
	${RPM_BUILD_ROOT}%{_datadir}/applnk/Office/kbibtex.desktop

#
# Install the icons into the hicolor folder
#
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/128x128/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/128x128/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/128x128/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/16x16/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/16x16/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/16x16/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/22x22/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/22x22/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/22x22/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/32x32/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/32x32/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/32x32/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/48x48/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/48x48/apps/kbibtex.png
install -D ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/64x64/apps/kbibtex.png \
	${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/64x64/apps/kbibtex.png
rm  ${RPM_BUILD_ROOT}%{_datadir}/icons/crystalsvg/64x64/apps/kbibtex.png

%post
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%clean
rm -rf $RPM_BUILD_ROOT

%postun
update-desktop-database &> /dev/null ||:

touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README TODO

%{_bindir}/kbibtex

%{_libdir}/kde3/libkbibtexpart.la
%{_libdir}/kde3/libkbibtexpart.so

%{_datadir}/apps/kbibtexpart/ 
%{_datadir}/apps/kbibtex/ 
%{_docdir}/HTML/en/kbibtex/ 
%{_datadir}/icons/hicolor/128x128/apps/kbibtex.png
%{_datadir}/icons/hicolor/16x16/apps/kbibtex.png
%{_datadir}/icons/hicolor/22x22/apps/kbibtex.png
%{_datadir}/icons/hicolor/32x32/apps/kbibtex.png
%{_datadir}/icons/hicolor/48x48/apps/kbibtex.png
%{_datadir}/icons/hicolor/64x64/apps/kbibtex.png

%{_mandir}/man1/kbibtex.1.gz

%{_datadir}/applications/fedora-kbibtex.desktop
%{_datadir}/applications/fedora-kbibtex_part.desktop

%changelog
* Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
- Patch to resolve an error when this package is compiled with gcc 4.1.0

* Tue Dec 13 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-2
- BUG 17556 - package review: fixed all problems

* Mon Dec 12 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-1
- Version 0.1.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2006 08:00:18 -0000	1.1
+++ .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
@@ -0,0 +1 @@
+kbibtex-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2006 08:00:18 -0000	1.1
+++ sources	12 Jan 2006 08:03:21 -0000	1.2
@@ -0,0 +1 @@
+ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 08:21:57 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 12 Jan 2006 03:21:57 -0500
Subject: owners owners.list,1.524,1.525
Message-ID: <200601120822.k0C8MTpo006058@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5994/owners

Modified Files:
	owners.list 
Log Message:
Added ownership for kbibtex



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- owners.list	11 Jan 2006 22:57:30 -0000	1.524
+++ owners.list	12 Jan 2006 08:21:57 -0000	1.525
@@ -440,6 +440,7 @@
 Fedora Extras|kasablanca|Graphical FTP client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|kbibtex|A BibTeX editor for KDE|ch.nolte at fh-wolfenbuettel.de|extras-qa at fedoraproject.org|
 Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 09:37:05 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:37:05 -0500
Subject: rpms/licq - New directory
Message-ID: <200601120937.k0C9b7aT008541@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8533/licq

Log Message:
Directory /cvs/extras/rpms/licq added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 09:37:11 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:37:11 -0500
Subject: rpms/licq/devel - New directory
Message-ID: <200601120937.k0C9bDAn008556@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8533/licq/devel

Log Message:
Directory /cvs/extras/rpms/licq/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 09:38:38 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:38:38 -0500
Subject: rpms/licq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601120938.k0C9cew0008590@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8578

Added Files:
	Makefile import.log 
Log Message:
Setup of module licq


--- NEW FILE Makefile ---
# Top level Makefile for module licq
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 12 09:38:44 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:38:44 -0500
Subject: rpms/licq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601120938.k0C9ckgY008610@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8578/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module licq


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 12 09:39:34 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:39:34 -0500
Subject: rpms/licq import.log,1.1,1.2
Message-ID: <200601120940.k0C9e6wt008684@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644

Modified Files:
	import.log 
Log Message:
auto-import licq-1.3.2-1 on branch devel from licq-1.3.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/licq/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jan 2006 09:38:38 -0000	1.1
+++ import.log	12 Jan 2006 09:39:34 -0000	1.2
@@ -0,0 +1 @@
+licq-1_3_2-1:HEAD:licq-1.3.2-1.src.rpm:1137080345



From fedora-extras-commits at redhat.com  Thu Jan 12 09:39:40 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 04:39:40 -0500
Subject: rpms/licq/devel licq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601120940.k0C9eCGm008688@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	licq.spec 
Log Message:
auto-import licq-1.3.2-1 on branch devel from licq-1.3.2-1.src.rpm


--- NEW FILE licq.spec ---
Name: licq
Version: 1.3.2
Release: 1
License: GPL
Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
URL: http://www.licq.org/
Summary: Licq - A graphical ICQ Client for Linux
Group: Applications/Internet
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel
BuildRequires: gpgme-devel libgpg-error-devel 
BuildRequires: openssl-devel
BuildRequires: desktop-file-utils

%package kde
Summary: Licq plugin for KDE
Group: Applications/Internet
Requires: %name = %version-%release
BuildRequires: kdelibs-devel

%package osd
Summary: OSD (On Screen Display) plugin for Licq
Group: Applications/Internet
Requires: %name = %version-%release
BuildRequires: xosd-devel

%description
Licq is a ICQ Client for the common ICQ network. It provides a graphical
user interface based on QT and is enhanceable with many powerful plugins.
For more information visit Licq's Homepage http://www.licq.org

%description kde
This is the KDE based GUI plugin for Licq.
To run this plugin, you will have to
issue the command "licq -p kde-gui"

%description osd
This is a small plugin, which uses libxosd2 to
display new arriving messages as OSD (On Screen Display)
text on your desktop.

%prep
%setup -q
#remove cvs 
rm -rf `find . -name CVS`

%configure --enable-gpgme --enable-openssl
cd plugins
cp -r qt-gui kde-gui
cd kde-gui
%configure --with-kde
cd ../qt-gui
%configure
cd ../osd
%configure

%build
export OPT="$RPM_OPT_FLAGS"
make
cd plugins/kde-gui
make
cd ../qt-gui
make
#create Qt qm files
cd po
lrelease *.ts
cd ../../osd
make

%install
rm -rf $RPM_BUILD_ROOT
export DESTDIR="$RPM_BUILD_ROOT"
make install
cd plugins/qt-gui
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        share/licq.desktop
make install
%find_lang licq
cd ../kde-gui
make install
cd ../osd
make install
%find_lang licq_osd_plugin

#remove devel 
rm $RPM_BUILD_ROOT/%{_includedir}/licq/*
rm $RPM_BUILD_ROOT/%{_libdir}/licq/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%files -f plugins/qt-gui/licq.lang
%defattr(-,root,root)
%{_bindir}/licq
%{_bindir}/viewurl-lynx.sh
%{_bindir}/viewurl-mozilla.sh
%{_bindir}/viewurl-ncftp.sh
%{_bindir}/viewurl-netscape.sh
%{_bindir}/viewurl-opera.sh
%{_bindir}/viewurl-w3m.sh
%dir %{_libdir}/licq
%{_libdir}/licq/licq_qt-gui.so
%{_datadir}/licq
%lang(bg) %{_datadir}/licq/qt-gui/locale/bg_BG.qm
%lang(cs) %{_datadir}/licq/qt-gui/locale/cs_CZ.qm
%lang(cs) %{_datadir}/licq/qt-gui/locale/cs.qm
%lang(de) %{_datadir}/licq/qt-gui/locale/de.qm
%lang(es) %{_datadir}/licq/qt-gui/locale/es.qm
%lang(fi) %{_datadir}/licq/qt-gui/locale/fi.qm
%lang(fr) %{_datadir}/licq/qt-gui/locale/fr.qm
%lang(hu) %{_datadir}/licq/qt-gui/locale/hu_HU.qm
%lang(it) %{_datadir}/licq/qt-gui/locale/it.qm
%lang(ja) %{_datadir}/licq/qt-gui/locale/ja_JP.eucJP.qm
%lang(pl) %{_datadir}/licq/qt-gui/locale/pl.qm
%lang(pt) %{_datadir}/licq/qt-gui/locale/pt_BR.qm
%lang(pt) %{_datadir}/licq/qt-gui/locale/pt.qm
%lang(ru) %{_datadir}/licq/qt-gui/locale/ru.qm
%lang(sr) %{_datadir}/licq/qt-gui/locale/sr.qm
%lang(sv) %{_datadir}/licq/qt-gui/locale/sv.qm
%lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
%lang(uk) %{_datadir}/licq/qt-gui/locale/uk.qm
%{_datadir}/applications/fedora-licq.desktop
%doc doc/ upgrade/ ChangeLog README* LICENSE

%files kde
%defattr(-,root,root)
%{_libdir}/licq/licq_kde-gui.so
%doc plugins/kde-gui/README.KDE

%files osd -f plugins/osd/licq_osd_plugin.lang
%defattr(-,root,root)
%{_libdir}/licq/licq_osd.so
%doc plugins/osd*/{AUTHORS,TODO,README,changelog}

%changelog
* Wed Nov 23 2005 Peter Vrabec <pvrabec at redhat.com> 1.3.2-1
- initial package 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2006 09:38:44 -0000	1.1
+++ .cvsignore	12 Jan 2006 09:39:40 -0000	1.2
@@ -0,0 +1 @@
+licq-1.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2006 09:38:44 -0000	1.1
+++ sources	12 Jan 2006 09:39:40 -0000	1.2
@@ -0,0 +1 @@
+0471bb8fed91eefb23dfe153c9a4a806  licq-1.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 10:00:03 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 05:00:03 -0500
Subject: owners owners.list,1.525,1.526
Message-ID: <200601121000.k0CA0Z4A008792@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8766

Modified Files:
	owners.list 
Log Message:
add licq



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- owners.list	12 Jan 2006 08:21:57 -0000	1.525
+++ owners.list	12 Jan 2006 10:00:02 -0000	1.526
@@ -1363,3 +1363,5 @@
 Fedora Extras|zoo|File archiving utility with compression|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
+



From fedora-extras-commits at redhat.com  Thu Jan 12 10:56:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 12 Jan 2006 05:56:33 -0500
Subject: fedora-security/audit fc4,1.125,1.126 fc5,1.35,1.36
Message-ID: <200601121056.k0CAuXp2010671@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10651

Modified Files:
	fc4 fc5 
Log Message:
Deal with poppler and kernel issues



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fc4	10 Jan 2006 15:35:28 -0000	1.125
+++ fc4	12 Jan 2006 10:56:26 -0000	1.126
@@ -1,11 +1,14 @@
-Up to date CVE as of CVE email 20060108
-Up to date FC4 as of 20060108
+Up to date CVE as of CVE email 20060111
+Up to date FC4 as of 20060111
 
 ** are items that need attention
 
 CVE-2006-0097 ignore (php) Windows only
+CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2006-0035 VULNERABLE (kernel)
+CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 verson (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]
@@ -50,24 +53,24 @@
 CVE-2005-3631 version (udev)
 CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3628 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3628 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
-CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3627 backport (cups) [since FEDORA-2006-010]
-CVE-2005-3627 VULNERABLE (poppler) bz#176873
-CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
+CVE-2005-3626 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3626 backport (cups) [since FEDORA-2006-010]
-CVE-2005-3626 VULNERABLE (poppler) bz#176873
-CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
+CVE-2005-3625 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3625 backport (cups) [since FEDORA-2006-010]
-CVE-2005-3625 VULNERABLE (poppler) bz#176873
-CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
+CVE-2005-3624 backport (xpdf) [since FEDORA-2005-027]
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
-CVE-2005-3624 VULNERABLE (poppler) bz#176873
+CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3624 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3623 backport (kernel, fixed 2.6.14.5) [since FEDORA-2006-013]
 CVE-2005-3582 version (ImageMagick) gentoo only
@@ -107,17 +110,17 @@
 CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011]
 CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3193 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3193 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3193 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3193 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3192 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3192 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3192 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3192 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169]
 CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126]
-CVE-2005-3191 backport (poppler) [since FEDORA-2005-1171]
+CVE-2005-3191 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171
 CVE-2005-3191 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3191 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- fc5	10 Jan 2006 15:35:28 -0000	1.35
+++ fc5	12 Jan 2006 10:56:26 -0000	1.36
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060104
+Up to date CVE as of CVE email 20060111
 Up to date FC5 as of FC5-Test1-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -13,8 +13,11 @@
 ** are items that need attention
 
 CVE-2006-0097 ignore (php) Windows only
+CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2006-0035 VULNERABLE (kernel)
+CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 VULNERABLE (kernel, fixed 2.6.15)
 CVE-2005-4605 VULNERABLE (kernel) bz#176814
@@ -58,26 +61,26 @@
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3628 VULNERABLE (xpdf)
-CVE-2005-3628 VULNERABLE (poppler)
+CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3628 VULNERABLE (kdegraphics)
 CVE-2005-3628 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (xpdf)
-CVE-2005-3627 VULNERABLE (poppler)
+CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3627 VULNERABLE (kdegraphics)
 CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (xpdf)
-CVE-2005-3626 VULNERABLE (poppler)
+CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3626 VULNERABLE (kdegraphics)
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (xpdf)
-CVE-2005-3625 VULNERABLE (poppler)
+CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3625 VULNERABLE (kdegraphics)
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3624 VULNERABLE (xpdf)
-CVE-2005-3624 VULNERABLE (poppler)
+CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3624 VULNERABLE (kdegraphics)
 CVE-2005-3624 VULNERABLE (cups)
 CVE-2005-3623 VULNERABLE (kernel, fixed 2.6.14.5)
@@ -117,15 +120,15 @@
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
 CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler)
+CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3193 VULNERABLE (kdegraphics)
 CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler)
+CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3192 VULNERABLE (kdegraphics)
 CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
 CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler)
+CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3191 VULNERABLE (kdegraphics)
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3186 backport (gdk-pixbuf)



From fedora-extras-commits at redhat.com  Thu Jan 12 11:46:27 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 12 Jan 2006 06:46:27 -0500
Subject: rpms/grace/FC-3 grace.spec,1.1,1.2
Message-ID: <200601121146.k0CBkxcf012455@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12438

Modified Files:
	grace.spec 
Log Message:
fix summary, fortran compiler and do not set env. variable


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/grace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grace.spec	9 Jan 2006 16:15:12 -0000	1.1
+++ grace.spec	12 Jan 2006 11:46:26 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           grace
 Version:        5.1.18
-Release:        7%{?dist}
-Summary:        Numerical Data Processing and Visualization Tool (grace)
+Release:        8%{?dist}
+Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
 # Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
@@ -9,8 +9,8 @@
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Source3:        %{name}.sh
-Source4:        %{name}.csh
+#Source3:        %{name}.sh
+#Source4:        %{name}.csh
 Source5:	cephes-license.email
 Source6:	LICENSE.cephes
 Patch:          %{name}-gracerc-no_auxiliary.diff
@@ -19,7 +19,7 @@
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel
-BuildRequires:  openmotif-devel, gcc-gfortran
+BuildRequires:  openmotif-devel, gcc-g77
 BuildRequires:  desktop-file-utils, font-utils
 Requires:	nedit
 Requires(post): chkfontpath
@@ -57,7 +57,6 @@
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
     --with-x \
-    --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
     --with-extra-ldpath=%{_libdir}/netcdf-3
     
@@ -78,8 +77,9 @@
     %{buildroot}%{_datadir}/pixmaps         \
     %{buildroot}%{_datadir}/applications    \
     %{buildroot}%{_mandir}/man1             \
-    %{buildroot}%{_sysconfdir}/profile.d    \
     %{buildroot}%{_sysconfdir}/%{name}
+#    %{buildroot}%{_sysconfdir}/profile.d    \
+
 ##
 # Let's have some sanity
 #
@@ -121,8 +121,8 @@
 ##
 # Profile scripts
 #
-install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
-install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
+#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
 
 
 %clean
@@ -142,7 +142,7 @@
 %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
-%{_sysconfdir}/profile.d/*
+#%{_sysconfdir}/profile.d/*
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -163,6 +163,11 @@
 
 
 %changelog
+* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.18-8
+- remove name from Summary
+- disable setting environment variable GRACE_HOME
+- use g77 as the fortran compiler
+
 * Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
 - put config files in /etc
 - licence is GPL and not BSD/GPL, as it is not dual licensed



From fedora-extras-commits at redhat.com  Thu Jan 12 12:30:59 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 12 Jan 2006 07:30:59 -0500
Subject: rpms/grace/FC-3 .cvsignore, 1.2, 1.3 grace.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601121231.k0CCVVbc014342@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14321

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
+++ .cvsignore	12 Jan 2006 12:30:59 -0000	1.3
@@ -1 +1 @@
-grace-5.1.18.tar.gz
+grace-5.1.19.tar.gz


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/grace.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- grace.spec	12 Jan 2006 11:46:26 -0000	1.2
+++ grace.spec	12 Jan 2006 12:30:59 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           grace
-Version:        5.1.18
-Release:        8%{?dist}
+Version:        5.1.19
+Release:        1%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -163,6 +163,9 @@
 
 
 %changelog
+* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
+- new upstream version
+
 * Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.18-8
 - remove name from Summary
 - disable setting environment variable GRACE_HOME


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2006 16:15:12 -0000	1.2
+++ sources	12 Jan 2006 12:30:59 -0000	1.3
@@ -1 +1 @@
-9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz
+0745c262ba4d0d1d82fee5972065aefc  grace-5.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 12:38:15 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 12 Jan 2006 07:38:15 -0500
Subject: rpms/grace/FC-4 .cvsignore, 1.2, 1.3 grace.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200601121238.k0CCclYJ014400@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14379

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
- new upstream version
- remove name from Summary
- disable setting environment variable GRACE_HOME



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
+++ .cvsignore	12 Jan 2006 12:38:15 -0000	1.3
@@ -1 +1 @@
-grace-5.1.18.tar.gz
+grace-5.1.19.tar.gz


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/grace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grace.spec	9 Jan 2006 16:15:12 -0000	1.1
+++ grace.spec	12 Jan 2006 12:38:15 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           grace
-Version:        5.1.18
-Release:        7%{?dist}
-Summary:        Numerical Data Processing and Visualization Tool (grace)
+Version:        5.1.19
+Release:        1%{?dist}
+Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
 # Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
@@ -9,8 +9,8 @@
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Source3:        %{name}.sh
-Source4:        %{name}.csh
+#Source3:        %{name}.sh
+#Source4:        %{name}.csh
 Source5:	cephes-license.email
 Source6:	LICENSE.cephes
 Patch:          %{name}-gracerc-no_auxiliary.diff
@@ -78,8 +78,9 @@
     %{buildroot}%{_datadir}/pixmaps         \
     %{buildroot}%{_datadir}/applications    \
     %{buildroot}%{_mandir}/man1             \
-    %{buildroot}%{_sysconfdir}/profile.d    \
     %{buildroot}%{_sysconfdir}/%{name}
+#    %{buildroot}%{_sysconfdir}/profile.d    \
+
 ##
 # Let's have some sanity
 #
@@ -121,8 +122,8 @@
 ##
 # Profile scripts
 #
-install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
-install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
+#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
 
 
 %clean
@@ -142,7 +143,7 @@
 %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
-%{_sysconfdir}/profile.d/*
+#%{_sysconfdir}/profile.d/*
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -163,6 +164,11 @@
 
 
 %changelog
+* Thu Jan 12 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
+- new upstream version
+- remove name from Summary
+- disable setting environment variable GRACE_HOME
+
 * Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
 - put config files in /etc
 - licence is GPL and not BSD/GPL, as it is not dual licensed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2006 16:15:12 -0000	1.2
+++ sources	12 Jan 2006 12:38:15 -0000	1.3
@@ -1 +1 @@
-9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz
+0745c262ba4d0d1d82fee5972065aefc  grace-5.1.19.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 13:27:51 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Thu, 12 Jan 2006 08:27:51 -0500
Subject: owners owners.list,1.526,1.527
Message-ID: <200601121328.k0CDSOWK016390@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16371

Modified Files:
	owners.list 
Log Message:
Deji Akingunola takes over babobab from me; he maintains several other Extras Packages already


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.526
retrieving revision 1.527
diff -u -r1.526 -r1.527
--- owners.list	12 Jan 2006 10:00:02 -0000	1.526
+++ owners.list	12 Jan 2006 13:27:51 -0000	1.527
@@ -56,7 +56,7 @@
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
-Fedora Extras|baobab|Graphical tool to analyse directory trees|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|barcode|Generates barcodes from text strings|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|bash-completion|Programmable completion for Bash|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|basket|Notes taker for KDE|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 15:10:16 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 10:10:16 -0500
Subject: rpms/licq/devel licq-1.3.2-gcc-4_1-patch, NONE, 1.1 licq.spec, 1.1,
	1.2
Message-ID: <200601121510.k0CFAnEs020105@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20087

Modified Files:
	licq.spec 
Added Files:
	licq-1.3.2-gcc-4_1-patch 
Log Message:
compile with gcc-4.1.0



--- NEW FILE licq-1.3.2-gcc-4_1-patch ---
--- licq-1.3.2/src/icqd.cpp.gcc-4_1	2005-09-09 18:16:24.000000000 +0200
+++ licq-1.3.2/src/icqd.cpp	2006-01-12 15:12:06.000000000 +0100
@@ -39,6 +39,7 @@
 #include "licq_packets.h"
 #include "licq_plugind.h"
 #include "licq_gpg.h"    // ##
+#include "licq_threads.h"
 #include "licq.h"
 #include "support.h"
 
--- licq-1.3.2/src/icqd-srv.cpp.gcc-4_1	2005-10-20 13:18:25.000000000 +0200
+++ licq-1.3.2/src/icqd-srv.cpp	2006-01-12 15:13:03.000000000 +0100
@@ -26,6 +26,7 @@
 #include "time-fix.h"
 
 #include "licq_icqd.h"
+#include "licq_threads.h"
 #include "licq_translate.h"
 #include "licq_packets.h"
 #include "licq_socket.h"
--- licq-1.3.2/include/licq_buffer.h.gcc-4_1	2006-01-12 15:07:18.000000000 +0100
+++ licq-1.3.2/include/licq_buffer.h	2006-01-12 15:07:45.000000000 +0100
@@ -62,7 +62,7 @@
 
    char *Pack(CBuffer *);
    char *Pack(const char *data, int size);
-   char *CBuffer::PackLNTS(const char *);
+   char *PackLNTS(const char *);
    char *PackString(const char *data, unsigned short max = 0);
    char *PackUnsignedShort(unsigned short data);
    char *PackUnsignedLong(unsigned long data);
--- licq-1.3.2/include/licq_threads.h.gcc-4_1	2006-01-12 15:09:47.000000000 +0100
+++ licq-1.3.2/include/licq_threads.h	2006-01-12 15:09:17.000000000 +0100
@@ -0,0 +1,14 @@
+
+#ifndef THREADS_H
+#define THREADS_H
+
+void *MonitorSockets_tep(void *p);
+void *Ping_tep(void *p);
+void *ProcessRunningEvent_Server_tep(void *p);
+void *ProcessRunningEvent_Client_tep(void *p);
+void *UpdateUsers_tep(void *p);
+void *Shutdown_tep(void *p);
+void *ReverseConnectToUser_tep(void *v);
+
+#endif
+


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- licq.spec	12 Jan 2006 09:39:40 -0000	1.1
+++ licq.spec	12 Jan 2006 15:10:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 1
+Release: 2
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -11,6 +11,7 @@
 BuildRequires: gpgme-devel libgpg-error-devel 
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
+Patch1: licq-1.3.2-gcc-4_1-patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -41,9 +42,11 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b gcc-4_1
 #remove cvs 
 rm -rf `find . -name CVS`
 
+%build
 %configure --enable-gpgme --enable-openssl
 cd plugins
 cp -r qt-gui kde-gui
@@ -54,8 +57,8 @@
 cd ../osd
 %configure
 
-%build
 export OPT="$RPM_OPT_FLAGS"
+cd ../..
 make
 cd plugins/kde-gui
 make
@@ -135,6 +138,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-2
+- compile with gcc-4.1.0
+
 * Wed Nov 23 2005 Peter Vrabec <pvrabec at redhat.com> 1.3.2-1
 - initial package 
 



From fedora-extras-commits at redhat.com  Thu Jan 12 15:34:54 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 12 Jan 2006 10:34:54 -0500
Subject: rpms/ipython/FC-3 .cvsignore, 1.4, 1.5 ipython.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200601121535.k0CFZQ4L020389@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331/FC-3

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to new upstream version 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 16:40:21 -0000	1.4
+++ .cvsignore	12 Jan 2006 15:34:54 -0000	1.5
@@ -1 +1 @@
-ipython-0.6.15.tar.gz
+ipython-0.7.0.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ipython.spec	13 Jun 2005 16:40:21 -0000	1.4
+++ ipython.spec	12 Jan 2006 15:34:54 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.6.15
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
+- Update to new upstream 0.7.0
+
 * Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> 0.6.15-1
 - Add dist tag
 - Update to new upstream (0.6.15)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2005 16:40:21 -0000	1.5
+++ sources	12 Jan 2006 15:34:54 -0000	1.6
@@ -1 +1 @@
-3b777c86f6afba52343ac9ec3ec3eef7  ipython-0.6.15.tar.gz
+3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 15:35:00 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 12 Jan 2006 10:35:00 -0500
Subject: rpms/ipython/FC-4 .cvsignore, 1.5, 1.6 ipython.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601121535.k0CFZW5R020394@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331/FC-4

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to new upstream version 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2005 16:40:03 -0000	1.5
+++ .cvsignore	12 Jan 2006 15:35:00 -0000	1.6
@@ -1 +1 @@
-ipython-0.6.15.tar.gz
+ipython-0.7.0.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/ipython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ipython.spec	13 Jun 2005 16:40:03 -0000	1.6
+++ ipython.spec	12 Jan 2006 15:35:00 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.6.15
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
+- Update to new upstream 0.7.0
+
 * Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> 0.6.15-1
 - Add dist tag
 - Update to new upstream (0.6.15)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2005 16:40:03 -0000	1.5
+++ sources	12 Jan 2006 15:35:00 -0000	1.6
@@ -1 +1 @@
-3b777c86f6afba52343ac9ec3ec3eef7  ipython-0.6.15.tar.gz
+3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 15:35:17 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 12 Jan 2006 10:35:17 -0500
Subject: rpms/ipython/devel .cvsignore, 1.5, 1.6 ipython.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601121535.k0CFZnm1020401@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20331/devel

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to new upstream version 0.7.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	13 Jun 2005 16:39:20 -0000	1.5
+++ .cvsignore	12 Jan 2006 15:35:16 -0000	1.6
@@ -1 +1 @@
-ipython-0.6.15.tar.gz
+ipython-0.7.0.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ipython.spec	13 Jun 2005 16:39:20 -0000	1.6
+++ ipython.spec	12 Jan 2006 15:35:16 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.6.15
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
+- Update to new upstream 0.7.0
+
 * Mon Jun 13 2005 Shahms E. King <shahms at shahms.com> 0.6.15-1
 - Add dist tag
 - Update to new upstream (0.6.15)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	13 Jun 2005 16:39:20 -0000	1.5
+++ sources	12 Jan 2006 15:35:16 -0000	1.6
@@ -1 +1 @@
-3b777c86f6afba52343ac9ec3ec3eef7  ipython-0.6.15.tar.gz
+3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 15:39:28 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Thu, 12 Jan 2006 10:39:28 -0500
Subject: rpms/licq/devel licq.spec,1.2,1.3
Message-ID: <200601121540.k0CFe13a020563@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540

Modified Files:
	licq.spec 
Log Message:
remove devel stuff with rm -rf



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- licq.spec	12 Jan 2006 15:10:14 -0000	1.2
+++ licq.spec	12 Jan 2006 15:39:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 2
+Release: 3
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -88,8 +88,8 @@
 %find_lang licq_osd_plugin
 
 #remove devel 
-rm $RPM_BUILD_ROOT/%{_includedir}/licq/*
-rm $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +138,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-3
+- remove devel stuff with rm -rf
+
 * Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-2
 - compile with gcc-4.1.0
 



From fedora-extras-commits at redhat.com  Thu Jan 12 15:53:42 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 12 Jan 2006 10:53:42 -0500
Subject: rpms/xmldiff/FC-4 xmldiff.spec,1.1,1.2
Message-ID: <200601121554.k0CFsF8K020758@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20726/FC-4

Modified Files:
	xmldiff.spec 
Log Message:
Fix spec file, missed a line in bug comments


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmldiff.spec	11 Jan 2006 22:57:18 -0000	1.1
+++ xmldiff.spec	12 Jan 2006 15:53:42 -0000	1.2
@@ -19,6 +19,7 @@
 BuildRequires:	python-logilab-common
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   docbook-style-xsl
+Requires:   file
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
@@ -81,7 +82,8 @@
 
 
 %changelog
-* Wed Jan 11 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+* Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+- Add Requires: file
 - xmlrev: use proper XSL location
 
 * Tue Jan 10 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-4



From fedora-extras-commits at redhat.com  Thu Jan 12 15:53:48 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Thu, 12 Jan 2006 10:53:48 -0500
Subject: rpms/xmldiff/devel xmldiff.spec,1.1,1.2
Message-ID: <200601121554.k0CFsLH1020761@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20726/devel

Modified Files:
	xmldiff.spec 
Log Message:
Fix spec file, missed a line in bug comments


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmldiff.spec	11 Jan 2006 22:57:18 -0000	1.1
+++ xmldiff.spec	12 Jan 2006 15:53:48 -0000	1.2
@@ -19,6 +19,7 @@
 BuildRequires:	python-logilab-common
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   docbook-style-xsl
+Requires:   file
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
@@ -81,7 +82,8 @@
 
 
 %changelog
-* Wed Jan 11 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+* Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
+- Add Requires: file
 - xmlrev: use proper XSL location
 
 * Tue Jan 10 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-4



From fedora-extras-commits at redhat.com  Thu Jan 12 16:25:01 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:25:01 -0500
Subject: rpms/gazpacho/FC-4 .cvsignore, 1.8, 1.9 gazpacho.spec, 1.14,
	1.15 sources, 1.8, 1.9
Message-ID: <200601121625.k0CGPXdA022693@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22655/FC-4

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Jan 2006 19:00:40 -0000	1.8
+++ .cvsignore	12 Jan 2006 16:24:57 -0000	1.9
@@ -1,2 +1 @@
-gazpacho-0.6.3.tar.bz2
-gazpacho-0.6.1-nox.patch
+gazpacho-0.6.4.tar.bz2


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/gazpacho.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gazpacho.spec	5 Jan 2006 19:00:40 -0000	1.14
+++ gazpacho.spec	12 Jan 2006 16:24:57 -0000	1.15
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.3
+Version:        0.6.4
 Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.4-1
+- Version 0.6.4
+
 * Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
 - Version 0.6.3
 - .nox patch no longer needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	5 Jan 2006 19:00:40 -0000	1.8
+++ sources	12 Jan 2006 16:24:59 -0000	1.9
@@ -1 +1 @@
-12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2
+2c7f482ead7f7fb304d92262f686a124  gazpacho-0.6.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 16:25:07 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:25:07 -0500
Subject: rpms/gazpacho/devel .cvsignore, 1.9, 1.10 gazpacho.spec, 1.15,
	1.16 sources, 1.9, 1.10
Message-ID: <200601121625.k0CGPdXV022698@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/gazpacho/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22655/devel

Modified Files:
	.cvsignore gazpacho.spec sources 
Log Message:
Version 0.6.4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 19:00:46 -0000	1.9
+++ .cvsignore	12 Jan 2006 16:25:06 -0000	1.10
@@ -1,2 +1 @@
-gazpacho-0.6.3.tar.bz2
-gazpacho-0.6.1-nox.patch
+gazpacho-0.6.4.tar.bz2


Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gazpacho.spec	5 Jan 2006 19:00:46 -0000	1.15
+++ gazpacho.spec	12 Jan 2006 16:25:07 -0000	1.16
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           gazpacho
-Version:        0.6.3
+Version:        0.6.4
 Release:        1%{?dist}
 Summary:        Glade Interface Creator
 
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.4-1
+- Version 0.6.4
+
 * Thu Jan 05 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.6.3-1
 - Version 0.6.3
 - .nox patch no longer needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 19:00:46 -0000	1.9
+++ sources	12 Jan 2006 16:25:07 -0000	1.10
@@ -1 +1 @@
-12fd05319f2fdb01ecf57263a18837e1  gazpacho-0.6.3.tar.bz2
+2c7f482ead7f7fb304d92262f686a124  gazpacho-0.6.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 16:44:22 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 12 Jan 2006 11:44:22 -0500
Subject: fedora-security/audit fc4,1.126,1.127 fc5,1.36,1.37
Message-ID: <200601121644.k0CGiM10022863@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22843

Modified Files:
	fc4 fc5 
Log Message:
kernel issues and tetex



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fc4	12 Jan 2006 10:56:26 -0000	1.126
+++ fc4	12 Jan 2006 16:44:15 -0000	1.127
@@ -7,6 +7,8 @@
 CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.2.0)
+CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
+CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
 CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
@@ -57,18 +59,22 @@
 CVE-2005-3628 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3628 backport (cups) [since FEDORA-2005-1142]
 CVE-2005-3627 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3627 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3627 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3627 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3626 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3626 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3626 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3626 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3625 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3625 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3625 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3625 backport (cups) [since FEDORA-2006-010]
 CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3624 backport (xpdf) [since FEDORA-2005-027]
+CVE-2005-3624 backport (tetex) [since FEDORA-2006-028]
 CVE-2005-3624 backport (kdegraphics) [since FEDORA-2005-1160]
 CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026]
 CVE-2005-3624 backport (cups) [since FEDORA-2006-010]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fc5	12 Jan 2006 10:56:26 -0000	1.36
+++ fc5	12 Jan 2006 16:44:15 -0000	1.37
@@ -16,6 +16,8 @@
 CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
+CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
+CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
 CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
@@ -61,25 +63,27 @@
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
 CVE-2005-3628 VULNERABLE (xpdf)
+CVE-2005-3628 VULNERABLE (tetex)
 CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3628 VULNERABLE (kdegraphics)
 CVE-2005-3628 VULNERABLE (cups)
 CVE-2005-3627 VULNERABLE (xpdf)
+CVE-2005-3627 VULNERABLE (tetex)
 CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3627 VULNERABLE (kdegraphics)
 CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (cups)
 CVE-2005-3626 VULNERABLE (xpdf)
+CVE-2005-3626 VULNERABLE (tetex)
 CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3626 VULNERABLE (kdegraphics)
 CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (cups)
 CVE-2005-3625 VULNERABLE (xpdf)
+CVE-2005-3625 VULNERABLE (tetex)
 CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3625 VULNERABLE (kdegraphics)
 CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (cups)
 CVE-2005-3624 VULNERABLE (xpdf)
+CVE-2005-3624 VULNERABLE (tetex)
 CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4)
 CVE-2005-3624 VULNERABLE (kdegraphics)
 CVE-2005-3624 VULNERABLE (cups)



From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:01 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:01 -0500
Subject: rpms/mysql-administrator - New directory
Message-ID: <200601121647.k0CGl3XA022926@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22918/mysql-administrator

Log Message:
Directory /cvs/extras/rpms/mysql-administrator added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:06 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:06 -0500
Subject: rpms/mysql-administrator/devel - New directory
Message-ID: <200601121647.k0CGl9Kh022941@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22918/mysql-administrator/devel

Log Message:
Directory /cvs/extras/rpms/mysql-administrator/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:24 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:24 -0500
Subject: rpms/mysql-administrator/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601121647.k0CGlQ5L022995@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22963/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mysql-administrator


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 12 16:47:18 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:47:18 -0500
Subject: rpms/mysql-administrator Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601121647.k0CGlKAv022975@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22963

Added Files:
	Makefile import.log 
Log Message:
Setup of module mysql-administrator


--- NEW FILE Makefile ---
# Top level Makefile for module mysql-administrator
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 12 16:51:23 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:51:23 -0500
Subject: rpms/mysql-administrator import.log,1.1,1.2
Message-ID: <200601121651.k0CGptWV023106@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23054

Modified Files:
	import.log 
Log Message:
auto-import mysql-administrator-1.1.5-3 on branch devel from mysql-administrator-1.1.5-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Jan 2006 16:47:18 -0000	1.1
+++ import.log	12 Jan 2006 16:51:23 -0000	1.2
@@ -0,0 +1 @@
+mysql-administrator-1_1_5-3:HEAD:mysql-administrator-1.1.5-3.src.rpm:1137084685



From fedora-extras-commits at redhat.com  Thu Jan 12 16:51:29 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 11:51:29 -0500
Subject: rpms/mysql-administrator/devel
	mysql-administrator-1.1.5-gcc41.patch, 
	NONE, 1.1 mysql-administrator-1.1.5-shellbang.patch, NONE,
	1.1 mysql-administrator.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601121652.k0CGq1iH023110@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23054/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mysql-administrator-1.1.5-gcc41.patch 
	mysql-administrator-1.1.5-shellbang.patch 
	mysql-administrator.spec 
Log Message:
auto-import mysql-administrator-1.1.5-3 on branch devel from mysql-administrator-1.1.5-3.src.rpm

mysql-administrator-1.1.5-gcc41.patch:

--- NEW FILE mysql-administrator-1.1.5-gcc41.patch ---
diff -Nur mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MACatalogsPanel.cc mysql-administrator-1.1.5/mysql-administrator/source/linux/MACatalogsPanel.cc
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MACatalogsPanel.cc	2005-12-06 22:08:02.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/MACatalogsPanel.cc	2006-01-07 23:43:32.000000000 -0600
@@ -67,7 +67,7 @@
     }
     
   protected:    
-    void CellRendererProgress::render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
+    void render_vfunc(const Glib::RefPtr<Gdk::Window>& window,
                                               Gtk::Widget& widget,
                                               const Gdk::Rectangle& bg_area,
                                               const Gdk::Rectangle& cell_area,
diff -Nur mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MDataInterface.h mysql-administrator-1.1.5/mysql-administrator/source/linux/MDataInterface.h
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/MDataInterface.h	2005-10-07 09:53:54.000000000 -0500
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/MDataInterface.h	2006-01-07 23:26:39.000000000 -0600
@@ -84,7 +84,7 @@
 
     MYX_SCHEMA_TABLE_STATUS *get_schema_table_status(const Glib::ustring &catalog_name,
                                                      const Glib::ustring &schema_name);
-    MYX_SCHEMA_ENTITY_STATUS *MDataInterface::get_schema_entity_status(
+    MYX_SCHEMA_ENTITY_STATUS *get_schema_entity_status(
                                                 const Glib::ustring &catalog_name,
                                                 const Glib::ustring &schema_name);
 
diff -Nur mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MCrontab.h mysql-administrator-1.1.5/mysql-gui-common/source/linux/MCrontab.h
--- mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MCrontab.h	2005-03-13 07:16:59.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-gui-common/source/linux/MCrontab.h	2006-01-07 23:21:17.000000000 -0600
@@ -41,7 +41,7 @@
   public:
     bool find_entry_by_comment(const std::string &comment, Entry &entry);
 
-    bool MCrontab::remove_entry_with_comment(const std::string &comment,
+    bool remove_entry_with_comment(const std::string &comment,
                                              const std::string &command="");
     
     void add_entry(Entry &entry, const std::string &comment);
diff -Nur mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MGPreferences.h mysql-administrator-1.1.5/mysql-gui-common/source/linux/MGPreferences.h
--- mysql-administrator-1.1.5-orig/mysql-gui-common/source/linux/MGPreferences.h	2005-03-13 07:16:59.000000000 -0600
+++ mysql-administrator-1.1.5/mysql-gui-common/source/linux/MGPreferences.h	2006-01-07 23:09:05.000000000 -0600
@@ -40,7 +40,7 @@
     virtual MYX_APPLICATION_OPTIONS *prepare_options()= 0;
 
     const char *find_value(MYX_OPTION_GROUP *group, const char *name);
-    std::list<const char *>MGOptions::find_values(MYX_OPTION_GROUP *group, const char *name);
+    std::list<const char *>find_values(MYX_OPTION_GROUP *group, const char *name);
 
     void add_group(MYX_APPLICATION_OPTIONS *options, const char *name,
                    const std::list<ValuePair> &values);

mysql-administrator-1.1.5-shellbang.patch:

--- NEW FILE mysql-administrator-1.1.5-shellbang.patch ---
--- mysql-administrator-1.1.5-orig/mysql-administrator/source/linux/mysql-administrator	2005-06-01 08:34:16.000000000 -0500
+++ mysql-administrator-1.1.5/mysql-administrator/source/linux/mysql-administrator	2006-01-11 16:55:53.000000000 -0600
@@ -1,3 +1,4 @@
+#!/bin/sh
 PRG="$0"
                                                                                                     
 # need this for relative symlinks


--- NEW FILE mysql-administrator.spec ---
Name:           mysql-administrator
Version:        1.1.5
Release:        3%{?dist}
Summary:        GUI to manage mysql Databases

Group:          Applications/Databases
License:        GPL
URL:            http://www.mysql.com/products/tools/administrator/index.html
Source0:        http://dev.mysql.com/get/Downloads/MySQLAdministrationSuite/mysql-administrator-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0:		mysql-administrator-1.1.5-gcc41.patch
Patch1:		mysql-administrator-1.1.5-shellbang.patch

BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils
Requires:       mysql >= 4.0, gtkmm24, mysql-gui-common

%description
MySQL Administrator enables developers and DBAs to easily perform 
all the command line operations visually including configuring servers,
administering users, and dynamically monitoring database health. Other 
common administrative tasks such as monitoring replication status, 
backup and restore, and viewing logs can also be performed through the 
MySQL Administrator graphical console.

%package     -n mysql-gui-common
Summary:        Common libraries and data shared among the MySQL GUI Suites
Group:          System Environment/Libraries

%description -n mysql-gui-common
This package contains several common libraries and data shared among the MySQL
GUI Suites in all platforms.



%prep
%setup -q
%if "%{?fedora}" > "4"
%patch0 -p1 -b .gcc41
%endif
%patch1 -p1 -b .shellbang

%build
pushd  mysql-gui-common
%configure
make %{?_smp_mflags}
popd


pushd mysql-administrator
%configure
make %{?_smp_mflags}
popd

%install
rm -rf $RPM_BUILD_ROOT
pushd mysql-gui-common
chmod 644 COPYING README
make install DESTDIR=$RPM_BUILD_ROOT
popd

pushd mysql-administrator
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
sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
sed -i 's/\r//' mysql-administrator/COPYING mysql-gui-common/COPYING mysql-gui-common/README

desktop-file-install --vendor=fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category SystemSetup \
  --add-category Application \
  --add-category X-Fedora \
  --delete-original \
  $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop

%find_lang mysql-gui-common


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc mysql-administrator/COPYING 
%{_bindir}/mabackup
%{_bindir}/mysql-administrator
%{_bindir}/mysql-administrator-bin
%{_datadir}/applications/fedora-MySQLAdministrator.desktop
%{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
%dir %{_datadir}/mysql-gui/administrator
%{_datadir}/mysql-gui/administrator/*


%files -n mysql-gui-common -f mysql-gui-common.lang
%defattr(-,root,root,-)
%doc mysql-gui-common/COPYING mysql-gui-common/README
%dir %{_datadir}/mysql-gui
%{_datadir}/mysql-gui/common

%changelog
* Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-3
- apply gcc4.1 patch only on fc5 
* Wed Jan 11 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-2
- fix lang files and trailing /
* Sat Jan 07 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-1
- update to 1.1.5
* Fri Oct 28 2005 Dennis Gilmore <dennis at ausil.us> - 1.1.4-1
- update to 1.1.4  update build requires to gtkmm24-devel
* Wed Sep 28 2005 Dennis Gilmore <dennis at ausil.us> - 1.1.2-1
- Initial Build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jan 2006 16:47:24 -0000	1.1
+++ .cvsignore	12 Jan 2006 16:51:29 -0000	1.2
@@ -0,0 +1 @@
+mysql-administrator-1.1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Jan 2006 16:47:24 -0000	1.1
+++ sources	12 Jan 2006 16:51:29 -0000	1.2
@@ -0,0 +1 @@
+f50a3505d50e024e8a775c2cd4a2ecf6  mysql-administrator-1.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:52:29 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:52:29 -0500
Subject: rpms/pylint/FC-4 .cvsignore, 1.4, 1.5 pylint.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601121653.k0CGr2Zt023195@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pylint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23155/FC-4

Modified Files:
	.cvsignore pylint.spec sources 
Log Message:
Version 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pylint/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Nov 2005 01:51:38 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:52:29 -0000	1.5
@@ -1 +1 @@
-pylint-0.8.1.tar.gz
+pylint-0.9.0.tar.gz


Index: pylint.spec
===================================================================
RCS file: /cvs/extras/rpms/pylint/FC-4/pylint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pylint.spec	14 Nov 2005 01:51:38 -0000	1.4
+++ pylint.spec	12 Jan 2006 16:52:29 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pylint
-Version:        0.8.1
+Version:        0.9.0
 Release:        1%{?dist}
 Summary:        Analyzes Python code looking for bugs and signs of poor quality
 
@@ -59,7 +59,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/*.txt README ChangeLog TODO examples elisp
+%doc doc/*.txt README ChangeLog TODO examples elisp COPYING
 %dir %{_python_sitelib}/pylint
 %dir %{_python_sitelib}/pylint/checkers
 %dir %{_python_sitelib}/pylint/reporters
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.9.0-1
+- Version 0.9.0
+- Add COPYING to docs
+
 * Sun Nov 13 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.8.1-1
 - Version 0.8.1
 - Add dependency on python-astng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pylint/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2005 01:51:38 -0000	1.4
+++ sources	12 Jan 2006 16:52:29 -0000	1.5
@@ -1 +1 @@
-f04addb7496a2a3e26675d36026718d7  pylint-0.8.1.tar.gz
+c7d69b110be9e64bb4f3f9b7dcbbf98c  pylint-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:52:35 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:52:35 -0500
Subject: rpms/pylint/devel .cvsignore, 1.4, 1.5 pylint.spec, 1.4, 1.5 sources,
	1.4, 1.5
Message-ID: <200601121653.k0CGr7Di023202@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/pylint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23155/devel

Modified Files:
	.cvsignore pylint.spec sources 
Log Message:
Version 0.9.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Nov 2005 01:54:19 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:52:35 -0000	1.5
@@ -1 +1 @@
-pylint-0.8.1.tar.gz
+pylint-0.9.0.tar.gz


Index: pylint.spec
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pylint.spec	14 Nov 2005 01:54:19 -0000	1.4
+++ pylint.spec	12 Jan 2006 16:52:35 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           pylint
-Version:        0.8.1
+Version:        0.9.0
 Release:        1%{?dist}
 Summary:        Analyzes Python code looking for bugs and signs of poor quality
 
@@ -59,7 +59,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc doc/*.txt README ChangeLog TODO examples elisp
+%doc doc/*.txt README ChangeLog TODO examples elisp COPYING
 %dir %{_python_sitelib}/pylint
 %dir %{_python_sitelib}/pylint/checkers
 %dir %{_python_sitelib}/pylint/reporters
@@ -84,6 +84,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.9.0-1
+- Version 0.9.0
+- Add COPYING to docs
+
 * Sun Nov 13 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.8.1-1
 - Version 0.8.1
 - Add dependency on python-astng


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pylint/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Nov 2005 01:54:19 -0000	1.4
+++ sources	12 Jan 2006 16:52:35 -0000	1.5
@@ -1 +1 @@
-f04addb7496a2a3e26675d36026718d7  pylint-0.8.1.tar.gz
+c7d69b110be9e64bb4f3f9b7dcbbf98c  pylint-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:53:35 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:53:35 -0500
Subject: rpms/python-logilab-common/FC-4 .cvsignore, 1.4,
	1.5 python-logilab-common.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200601121654.k0CGs7hm023262@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-common/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23224/FC-4

Modified Files:
	.cvsignore python-logilab-common.spec sources 
Log Message:
Version 0.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 15:08:07 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:53:34 -0000	1.5
@@ -1 +1 @@
-common-0.12.0.tar.gz
+common-0.13.0.tar.gz


Index: python-logilab-common.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/python-logilab-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-logilab-common.spec	17 Nov 2005 15:08:08 -0000	1.3
+++ python-logilab-common.spec	12 Jan 2006 16:53:34 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-common
-Version:        0.12.0
+Version:        0.13.0
 Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
 
@@ -44,7 +44,6 @@
 %doc doc/* README ChangeLog
 %dir %{_python_sitelib}/logilab
 %dir %{_python_sitelib}/logilab/common
-%dir %{_python_sitelib}/logilab/common/astng
 %dir %{_python_sitelib}/logilab/common/ureports
 %{_python_sitelib}/logilab/*.py
 %{_python_sitelib}/logilab/common/*.py
@@ -56,6 +55,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.0-1
+- Version 0.13.0
+- astng no longer part of the package
+
 * Thu Nov 17 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.12.0-1
 - Version 0.12.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 15:08:08 -0000	1.4
+++ sources	12 Jan 2006 16:53:34 -0000	1.5
@@ -1 +1 @@
-97d263de68c2ee73cc123969a91f6e7e  common-0.12.0.tar.gz
+9b6500c2a23660edfabe65bf73137a51  common-0.13.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:53:41 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:53:41 -0500
Subject: rpms/python-logilab-common/devel .cvsignore, 1.4,
	1.5 python-logilab-common.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200601121654.k0CGsDD0023267@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-logilab-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23224/devel

Modified Files:
	.cvsignore python-logilab-common.spec sources 
Log Message:
Version 0.13.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Nov 2005 15:09:29 -0000	1.4
+++ .cvsignore	12 Jan 2006 16:53:40 -0000	1.5
@@ -1 +1 @@
-common-0.12.0.tar.gz
+common-0.13.0.tar.gz


Index: python-logilab-common.spec
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-logilab-common.spec	17 Nov 2005 15:09:29 -0000	1.3
+++ python-logilab-common.spec	12 Jan 2006 16:53:40 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-logilab-common
-Version:        0.12.0
+Version:        0.13.0
 Release:        1%{?dist}
 Summary:        Common libraries for Logilab projects
 
@@ -44,7 +44,6 @@
 %doc doc/* README ChangeLog
 %dir %{_python_sitelib}/logilab
 %dir %{_python_sitelib}/logilab/common
-%dir %{_python_sitelib}/logilab/common/astng
 %dir %{_python_sitelib}/logilab/common/ureports
 %{_python_sitelib}/logilab/*.py
 %{_python_sitelib}/logilab/common/*.py
@@ -56,6 +55,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.0-1
+- Version 0.13.0
+- astng no longer part of the package
+
 * Thu Nov 17 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.12.0-1
 - Version 0.12.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Nov 2005 15:09:29 -0000	1.4
+++ sources	12 Jan 2006 16:53:40 -0000	1.5
@@ -1 +1 @@
-97d263de68c2ee73cc123969a91f6e7e  common-0.12.0.tar.gz
+9b6500c2a23660edfabe65bf73137a51  common-0.13.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:55:35 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:55:35 -0500
Subject: rpms/python-astng/FC-4 .cvsignore, 1.3, 1.4 python-astng.spec, 1.4, 
	1.5 sources, 1.3, 1.4
Message-ID: <200601121656.k0CGu893023316@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-astng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278/FC-4

Modified Files:
	.cvsignore python-astng.spec sources 
Log Message:
Version 0.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-astng/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Nov 2005 20:53:43 -0000	1.3
+++ .cvsignore	12 Jan 2006 16:55:35 -0000	1.4
@@ -1,2 +1 @@
-astng-0.13.1.tar.gz
-astng-0.13.1-modname.patch
+astng-0.14.0.tar.gz


Index: python-astng.spec
===================================================================
RCS file: /cvs/extras/rpms/python-astng/FC-4/python-astng.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-astng.spec	16 Nov 2005 20:53:43 -0000	1.4
+++ python-astng.spec	12 Jan 2006 16:55:35 -0000	1.5
@@ -1,17 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-astng
-Version:        0.13.1
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        Python Abstract Syntax Tree New Generation
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.logilab.org/projects/astng/
 Source0:        ftp://ftp.logilab.org/pub/astng/astng-%{version}.tar.gz
-                # This should be upstream in the CVS version,
-                # but without this fix pylint is pretty much unusable.
-Patch0:         astng-0.13.1-modname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,7 +25,6 @@
 
 %prep
 %setup -q -n astng-%{version}
-%patch0 -p0
 
 
 %build
@@ -57,6 +53,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.14.0-1
+- Version 0.14.0
+- Drop the modname patch
+
 * Tue Nov 15 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.1-2
 - Patch for the modname traceback
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-astng/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2005 20:53:43 -0000	1.3
+++ sources	12 Jan 2006 16:55:35 -0000	1.4
@@ -1,2 +1 @@
-57b899fb6caf7b88f33161b89ee1e6fa  astng-0.13.1.tar.gz
-ab22a610844f1c4a72ebb2c7d96ec15d  astng-0.13.1-modname.patch
+29fa137d44eeed6a69e2e3feb07cff0a  astng-0.14.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 16:55:41 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 12 Jan 2006 11:55:41 -0500
Subject: rpms/python-astng/devel .cvsignore, 1.3, 1.4 python-astng.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601121656.k0CGuEqk023321@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/python-astng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23278/devel

Modified Files:
	.cvsignore python-astng.spec sources 
Log Message:
Version 0.14.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-astng/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Nov 2005 20:51:24 -0000	1.3
+++ .cvsignore	12 Jan 2006 16:55:41 -0000	1.4
@@ -1,2 +1 @@
-astng-0.13.1.tar.gz
-astng-0.13.1-modname.patch
+astng-0.14.0.tar.gz


Index: python-astng.spec
===================================================================
RCS file: /cvs/extras/rpms/python-astng/devel/python-astng.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-astng.spec	16 Nov 2005 20:51:24 -0000	1.4
+++ python-astng.spec	12 Jan 2006 16:55:41 -0000	1.5
@@ -1,17 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-astng
-Version:        0.13.1
-Release:        2%{?dist}
+Version:        0.14.0
+Release:        1%{?dist}
 Summary:        Python Abstract Syntax Tree New Generation
 
 Group:          Development/Languages
 License:        GPL
 URL:            http://www.logilab.org/projects/astng/
 Source0:        ftp://ftp.logilab.org/pub/astng/astng-%{version}.tar.gz
-                # This should be upstream in the CVS version,
-                # but without this fix pylint is pretty much unusable.
-Patch0:         astng-0.13.1-modname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,7 +25,6 @@
 
 %prep
 %setup -q -n astng-%{version}
-%patch0 -p0
 
 
 %build
@@ -57,6 +53,10 @@
 
 
 %changelog
+* Thu Jan 12 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.14.0-1
+- Version 0.14.0
+- Drop the modname patch
+
 * Tue Nov 15 2005 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.13.1-2
 - Patch for the modname traceback
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-astng/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Nov 2005 20:51:24 -0000	1.3
+++ sources	12 Jan 2006 16:55:41 -0000	1.4
@@ -1,2 +1 @@
-57b899fb6caf7b88f33161b89ee1e6fa  astng-0.13.1.tar.gz
-ab22a610844f1c4a72ebb2c7d96ec15d  astng-0.13.1-modname.patch
+29fa137d44eeed6a69e2e3feb07cff0a  astng-0.14.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 17:11:30 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Thu, 12 Jan 2006 12:11:30 -0500
Subject: owners owners.list,1.527,1.528
Message-ID: <200601121712.k0CHC23h025301@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25255

Modified Files:
	owners.list 
Log Message:
added mysql-administrator



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- owners.list	12 Jan 2006 13:27:51 -0000	1.527
+++ owners.list	12 Jan 2006 17:11:29 -0000	1.528
@@ -631,6 +631,7 @@
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 12 17:36:55 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 12 Jan 2006 12:36:55 -0500
Subject: rpms/baobab/devel .cvsignore, 1.7, 1.8 baobab.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200601121737.k0CHbScE025804@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/baobab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25725

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
- Take over packaging from Thorsten Leemhuis
- Update to 2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 15:29:45 -0000	1.7
+++ .cvsignore	12 Jan 2006 17:36:55 -0000	1.8
@@ -1 +1 @@
-baobab-2.3.0.tar.gz
+baobab-2.3.1.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- baobab.spec	6 Jan 2006 15:36:09 -0000	1.10
+++ baobab.spec	12 Jan 2006 17:36:55 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.3.0
-Release:        2%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -56,6 +56,10 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
+- Take over packaging from Thorsten Leemhuis
+- Update to 2.3.1
+
 * Fri Jan 06 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-2
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 15:29:45 -0000	1.7
+++ sources	12 Jan 2006 17:36:55 -0000	1.8
@@ -1 +1 @@
-b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz
+474f95940d90474b2bc15fa989f17393  baobab-2.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 17:39:44 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Thu, 12 Jan 2006 12:39:44 -0500
Subject: rpms/baobab/FC-4 .cvsignore, 1.7, 1.8 baobab.spec, 1.7, 1.8 sources,
	1.7, 1.8
Message-ID: <200601121740.k0CHeGCm025890@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/baobab/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25864

Modified Files:
	.cvsignore baobab.spec sources 
Log Message:
* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
- Take over packaging from Thorsten Leemhuis
- Update to 2.3.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 15:29:39 -0000	1.7
+++ .cvsignore	12 Jan 2006 17:39:44 -0000	1.8
@@ -1 +1 @@
-baobab-2.3.0.tar.gz
+baobab-2.3.1.tar.gz


Index: baobab.spec
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- baobab.spec	1 Jan 2006 15:29:39 -0000	1.7
+++ baobab.spec	12 Jan 2006 17:39:44 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           baobab
-Version:        2.3.0
+Version:        2.3.1
 Release:        1%{?dist}
 Summary:        Graphical tool to analyse directory trees 
 
 Group:          Applications/System
 License:        GPL
 URL:            http://www.marzocca.net/linux/baobab.html
-Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.0.tar.gz
+Source0:        http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -57,6 +57,10 @@
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Thu Jan 12 2006 Deji Akingunola <dakingun at gmail.com> - 2.3.1-1
+- Take over packaging from Thorsten Leemhuis
+- Update to 2.3.1
+
 * Sun Jan 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 2.3.0-1
 - Update to 2.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 15:29:39 -0000	1.7
+++ sources	12 Jan 2006 17:39:44 -0000	1.8
@@ -1 +1 @@
-b25b2e0a63cfa5e7dbcb6b05fc2a7846  baobab-2.3.0.tar.gz
+474f95940d90474b2bc15fa989f17393  baobab-2.3.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 18:10:23 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 12 Jan 2006 13:10:23 -0500
Subject: rpms/shorewall/devel .cvsignore, 1.10, 1.11 shorewall.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200601121810.k0CIAtQW027746@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27725

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.0.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Jan 2006 19:23:54 -0000	1.10
+++ .cvsignore	12 Jan 2006 18:10:23 -0000	1.11
@@ -1 +1 @@
-shorewall-3.0.3.tar.bz2
+shorewall-3.0.4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- shorewall.spec	3 Jan 2006 19:23:54 -0000	1.16
+++ shorewall.spec	12 Jan 2006 18:10:23 -0000	1.17
@@ -1,5 +1,5 @@
 Name: shorewall
-Version: 3.0.3
+Version: 3.0.4
 Release: 1%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
@@ -68,6 +68,7 @@
 %{_datadir}/shorewall/macro.*
 %{_datadir}/shorewall/rfc1918
 %{_datadir}/shorewall/version
+%{_datadir}/shorewall/Limit
 
 %attr(0754,root,root) %{_datadir}/shorewall/firewall
 %attr(0754,root,root) %{_datadir}/shorewall/functions
@@ -79,6 +80,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Thu Jan 12 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.4-1
+- Update to upstream 3.0.4
+
 * Tue Jan 03 2006 Robert Marcano <robert at marcanoonline.com> - 3.0.3-1
 - Update to upstream 3.0.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Jan 2006 19:23:54 -0000	1.10
+++ sources	12 Jan 2006 18:10:23 -0000	1.11
@@ -1 +1 @@
-2f1ef054cf1c6dbfe0e15d982f90fe11  shorewall-3.0.3.tar.bz2
+2745e8e5c2143c3d9f5836b964c67721  shorewall-3.0.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 12 19:03:57 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 12 Jan 2006 14:03:57 -0500
Subject: rpms/psi/devel .cvsignore, 1.6, 1.7 psi.spec, 1.13, 1.14 sources,
	1.7, 1.8
Message-ID: <200601121904.k0CJ4Yuw029732@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29694/devel

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
- version 0.10 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Dec 2005 23:23:56 -0000	1.6
+++ .cvsignore	12 Jan 2006 19:03:55 -0000	1.7
@@ -1,5 +1,5 @@
+psi-0.10.tar.bz2
 emoticons-0.9.3.tar.gz
-psi-0.10-test3.tar.bz2
-psi-lang-packs-0.9.3.tar.gz
-rostericons-0.9.3.tar.gz
 systemicons-0.9.3.tar.gz
+rostericons-0.9.3.tar.gz
+psi-lang-packs-0.9.3.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- psi.spec	4 Dec 2005 23:23:56 -0000	1.13
+++ psi.spec	12 Jan 2006 19:03:56 -0000	1.14
@@ -3,13 +3,13 @@
 
 Name:       psi
 Version:    0.10
-Release:    0.2.test3%{?dist}
+Release:    1%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
 #Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
-Source0:    http://dl.sf.net/psi/psi-0.10-test3.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-0.10.tar.bz2
 Source2:    psi-uicwrapper.sh
 Patch1:     psi-0.9.2-strip.patch
 #Patch2:     psi-0.9.2-mach-build.patch
@@ -72,7 +72,7 @@
 
 
 %prep
-%setup -q -n psi-%{version}-test3
+%setup -q
 # (ugly) hack to enable debuginfo subrpm
 %patch1 -p1 -b .strip
 # needed to build with mach
@@ -89,7 +89,7 @@
 ./configure                        \
         --prefix=%{_prefix}        \
         --bindir=%{_bindir}        \
-        --libdir=%{_datadir}/%name \
+        --datadir=%{_datadir}      \
         --qtdir=$QTDIR
 
 # Fix build for FC1
@@ -165,6 +165,12 @@
 
 
 %changelog
+* Thu Jan 12 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-1
+- version 0.10 final
+
+* Tue Jan 03 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.3.test4
+- version 0.10 test4
+
 * Thu Nov 03 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test3
 - version 0.10 test3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Dec 2005 23:23:56 -0000	1.7
+++ sources	12 Jan 2006 19:03:56 -0000	1.8
@@ -1,5 +1,5 @@
+f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
 0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
-6de947394d0e6a34dbf73694476ab129  psi-0.10-test3.tar.bz2
-57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz
-79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
+79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
+57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 19:03:33 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 12 Jan 2006 14:03:33 -0500
Subject: rpms/psi/FC-4 .cvsignore, 1.5, 1.6 psi.spec, 1.12, 1.13 sources, 1.6,
	1.7
Message-ID: <200601121904.k0CJ4fPS029735@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29694/FC-4

Modified Files:
	.cvsignore psi.spec sources 
Log Message:
- version 0.10 final


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Jan 2005 21:11:58 -0000	1.5
+++ .cvsignore	12 Jan 2006 19:03:32 -0000	1.6
@@ -1,19 +1,5 @@
-psi_ca.qm.bz2
-psi_cs.qm.bz2
-psi_el.qm.bz2
-psi_es.qm.bz2
-psi_it.qm.bz2
-psi_mk.qm.bz2
-psi_se.qm.bz2
-psi-0.9.3.tar.bz2
-psi_de.qm.bz2
-psi_ee.qm.bz2
-psi_et.qm.bz2
-psi_fi.qm.bz2
-psi_fr.qm.bz2
-psi_nl.qm.bz2
-psi_pl.qm.bz2
-psi_ru.qm.bz2
-psi_sk.qm.bz2
-psi_sw.qm.bz2
-psi_zh.qm.bz2
+psi-0.10.tar.bz2
+emoticons-0.9.3.tar.gz
+systemicons-0.9.3.tar.gz
+rostericons-0.9.3.tar.gz
+psi-lang-packs-0.9.3.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/psi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- psi.spec	1 Jun 2005 09:16:06 -0000	1.12
+++ psi.spec	12 Jan 2006 19:03:32 -0000	1.13
@@ -2,22 +2,21 @@
 %{!?_without_kde:%define with_kde 1}
 
 Name:       psi
-Version:    0.9.3
-Release:    4%{?dist}
-Summary:    Jabber client using Qt 3
+Version:    0.10
+Release:    1%{?dist}
+Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
 URL:        http://psi.affinix.com/
-Source0:    http://dl.sf.net/psi/psi-0.9.3.tar.bz2
+#Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-0.10.tar.bz2
 Source2:    psi-uicwrapper.sh
 Patch1:     psi-0.9.2-strip.patch
-Patch2:     psi-0.9.2-mach-build.patch
-Patch3:     psi-0.9.3-gcc4.patch
+#Patch2:     psi-0.9.2-mach-build.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt-devel >= 1:3.1.1
-BuildRequires:  XFree86-devel
 BuildRequires:  zlib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  qca-devel
@@ -29,49 +28,13 @@
 Requires:    gnupg
 
 # Language packs
-Source50:    psi_pl.qm.bz2
-#Source51:    psi_sr.qm.bz2
-Source52:    psi_fr.qm.bz2
-#Source53:    psi_eo.qm.bz2
-#Source54:    psi_sr at Latn.qm.bz2
-Source55:    psi_fi.qm.bz2
-Source56:    psi_cs.qm.bz2
-Source57:    psi_ru.qm.bz2
-Source58:    psi_de.qm.bz2
-Source59:    psi_es.qm.bz2
-Source60:    psi_mk.qm.bz2
-Source61:    psi_nl.qm.bz2
-Source62:    psi_sk.qm.bz2
-Source63:    psi_el.qm.bz2
-Source64:    psi_it.qm.bz2
-Source65:    psi_se.qm.bz2
-Source66:    psi_ca.qm.bz2
-Source67:    psi_zh.qm.bz2
-Source68:    psi_sw.qm.bz2
-Source69:    psi_ee.qm.bz2
-Source70:    psi_et.qm.bz2
-
-# Emoticonsets
-Source100:   Chibi.jisp
-Source101:   KMess-Cartoon-1.0.jisp
-Source102:   shinyicons.jisp
-Source103:   yahoo_messenger.jisp
-Source104:   kreativ_squareheads.jisp
-Source105:   tlen.pl-3.73.jisp
-Source106:   apple_ichat-1.0.jisp
-Source107:   trill-extra-symbols.jisp
-Source108:   trill-extra-smileys.jisp
-Source109:   Ninja.jisp
-Source110:   webmessenger.jisp
-
-# Rostericonsets
-Source130:   weather.jisp
-Source131:   icqG.jisp
-Source132:   gaduGaduG.jisp
-Source133:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_roster.jisp
+Source10:   psi-lang-packs-0.9.3.tar.gz
+
+# Iconsets
+Source11:   emoticons-0.9.3.tar.gz
+Source12:   rostericons-0.9.3.tar.gz
+Source13:   systemicons-0.9.3.tar.gz
 
-# System iconsets
-Source160:   http://www.cs.kuleuven.ac.be/~remko/psi/crystal/crystal_system.jisp
 
 
 %description
@@ -113,8 +76,7 @@
 # (ugly) hack to enable debuginfo subrpm
 %patch1 -p1 -b .strip
 # needed to build with mach
-%patch2 -p1 -b .mach-build
-%patch3 -p1 -b .gcc4
+#%patch2 -p1 -b .mach-build
 
 
 %build
@@ -127,16 +89,15 @@
 ./configure                        \
         --prefix=%{_prefix}        \
         --bindir=%{_bindir}        \
-        --libdir=%{_datadir}/%name \
+        --datadir=%{_datadir}      \
         --qtdir=$QTDIR
 
 # Fix build for FC1
-make qmake
-install -m 755 %{SOURCE2} src/uic-wrapper
-sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
+#make qmake
+#install -m 755 %{SOURCE2} src/uic-wrapper
+#sed -i 's|\$(QTDIR)/bin/uic|./uic-wrapper|' src/Makefile
 
 make %{?_smp_mflags}
-#lrelease psi.pro
 
 
 %install
@@ -144,78 +105,52 @@
 
 export INSTALL_ROOT=$RPM_BUILD_ROOT
 make install
-#rm -f $RPM_BUILD_ROOT%{_datadir}/%name/{README,COPYING}
 cp -p libpsi/iconset/ICONSET-HOWTO $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/
 
 # Install language packs
-%__bzip2 -dck %{SOURCE50} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_pl.qm
-#%__bzip2 -dck %{SOURCE51} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr.qm
-%__bzip2 -dck %{SOURCE52} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fr.qm
-#%__bzip2 -dck %{SOURCE53} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_eo.qm
-#%__bzip2 -dck %{SOURCE54} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sr at Latn.qm
-%__bzip2 -dck %{SOURCE55} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_fi.qm
-%__bzip2 -dck %{SOURCE56} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_cs.qm
-%__bzip2 -dck %{SOURCE57} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ru.qm
-%__bzip2 -dck %{SOURCE58} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_de.qm
-%__bzip2 -dck %{SOURCE59} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_es.qm
-%__bzip2 -dck %{SOURCE60} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_mk.qm
-%__bzip2 -dck %{SOURCE61} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_nl.qm
-%__bzip2 -dck %{SOURCE62} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sk.qm
-%__bzip2 -dck %{SOURCE63} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_el.qm
-%__bzip2 -dck %{SOURCE64} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_it.qm
-%__bzip2 -dck %{SOURCE65} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_se.qm
-%__bzip2 -dck %{SOURCE66} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ca.qm
-%__bzip2 -dck %{SOURCE67} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_zh.qm
-%__bzip2 -dck %{SOURCE68} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_sw.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_ee.qm
-%__bzip2 -dck %{SOURCE69} > $RPM_BUILD_ROOT%{_datadir}/%name/%{name}_et.qm
+tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
 
 ## Install iconsets
-install -p %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE101} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE102} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE103} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE104} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE105} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE106} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE107} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE108} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE109} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-install -p %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
-
-install -p %{SOURCE130} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE131} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE132} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-install -p %{SOURCE133} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
+tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
+tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
-install -p %{SOURCE160} $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
 # Menu
-perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
+#perl -pi -e 's/Icon=psi/Icon=psi.png/' $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
 desktop-file-install --vendor fedora \
-                     --dir $RPM_BUILD_ROOT%{_datadir}/applications\
-                     --add-category Application\
-                     --add-category X-Fedora\
-                     --add-category Network\
-                     --delete-original\
-                     $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/%{name}.desktop
-
-# icon
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -s ../icons/hicolor/48x48/apps/psi.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%name.png
+       --dir $RPM_BUILD_ROOT%{_datadir}/applications\
+       --add-category Application\
+       --add-category X-Fedora\
+       --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
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(0644,root,root,0755)
+# Needed by psi for the help dialog
 #%doc README COPYING libpsi/iconset/ICONSET-HOWTO
 %attr(0755,root,root) %{_bindir}/psi
 %{_datadir}/%{name}
 %_datadir/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%name.png
-%{_datadir}/pixmaps/%name.png
 %exclude %{_datadir}/%{name}/*.qm
 %exclude %{_datadir}/%{name}/iconsets/*/*.jisp
 
@@ -230,6 +165,24 @@
 
 
 %changelog
+* Thu Jan 12 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-1
+- version 0.10 final
+
+* Tue Jan 03 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.3.test4
+- version 0.10 test4
+
+* Thu Nov 03 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test3
+- version 0.10 test3
+
+* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.2.test2
+- version 0.10 test2
+- drop patch 3 (applied upstream)
+- drop icon symlink (useless)
+
+* Thu Aug 25 2005 Aurelien Bompard <gauret[AT]free.fr> 0.10-0.1.test1
+- version 0.10 test1
+- spec cleanups
+
 * Wed Jun  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.3-4
 - patch it for 64-bit/GCC 4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Jan 2005 05:27:23 -0000	1.6
+++ sources	12 Jan 2006 19:03:32 -0000	1.7
@@ -1,35 +1,5 @@
-1689645b1e2bf181c6fc2d68f070cf0d  psi_ca.qm.bz2
-69f88fc4768d963bed4cd3ebfbb75a28  psi_cs.qm.bz2
-da61ff1ec70cf90357d78f6c81d0ad86  psi_el.qm.bz2
-c831c0924c363e8bac42aab577f6982d  psi_es.qm.bz2
-022996fd1f35f26a777f07d667071421  psi_it.qm.bz2
-3e1ac01eaf5451f1b1d0968b2f911983  psi_mk.qm.bz2
-8cc619e6752d6c4db5093eca5d458f0a  psi_se.qm.bz2
-d20f3bb530235a246bc2d92308089744  psi-0.9.3.tar.bz2
-52611e036dd0b7cb2ecadcf16eeb9632  psi_de.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_ee.qm.bz2
-2e19193ebcfd59f80badf011714a2c82  psi_et.qm.bz2
-74053f86b57bd74be4b2866dd02b730d  psi_fi.qm.bz2
-dd8f83f3c3fc1c20d094f6570acaad4b  psi_fr.qm.bz2
-a0cc2e82074a2be17c5ad0004747ac43  psi_nl.qm.bz2
-d3418d4383e47f37f7fedbbc9591db6c  psi_pl.qm.bz2
-5e701ee8f56b01c65f3097f5ba13f63c  psi_ru.qm.bz2
-784e291e51e4746b602e182ab9ec3ac2  psi_sk.qm.bz2
-a5570c823cfbe33ee602110b89cf4e16  psi_sw.qm.bz2
-38629928c813dc54fc04b38de5e6dcee  psi_zh.qm.bz2
-259f0351152852d8091b092440557bab  apple_ichat-1.0.jisp
-6d98db4a5fab3c5909a422d983ed336f  Chibi.jisp
-14f8bdbea1873b2972d56726c4c011cf  crystal_roster.jisp
-ee56b25a85ec3ddef64339e177f7028d  crystal_system.jisp
-a4aada51bbf57c17c2bfda5ba52717ec  gaduGaduG.jisp
-9d8b4be36909c235657d61698846aee1  icqG.jisp
-459d5feae7cf05210f10ffd8df9ac93f  KMess-Cartoon-1.0.jisp
-f1760382d3aea32199aeb7303493a9ea  kreativ_squareheads.jisp
-cbe6f581bf32a2cb56e8bf5871db639d  Ninja.jisp
-9ec2c600f390dc725e4793383ff50ec2  shinyicons.jisp
-099c70f9ca25623c89e3ba5b44af2e6d  tlen.pl-3.73.jisp
-6a3065d33b072e15decbfb3673028df6  trill-extra-smileys.jisp
-b743f3f65dfe526b6d730044031d5c78  trill-extra-symbols.jisp
-be98902383c572fd3cd6876a6940a73e  weather.jisp
-0a2ce25ab4506d563bf65da372c9f8f4  webmessenger.jisp
-747a785fdaae8dc5a5ee78a3253035ab  yahoo_messenger.jisp
+f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
+0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
+a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
+79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
+57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 12 21:39:17 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 12 Jan 2006 16:39:17 -0500
Subject: extras-buildsys/server ArchJob.py,1.22,1.23
Message-ID: <200601122139.k0CLdHIE001347@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1326/server

Modified Files:
	ArchJob.py 
Log Message:
Ignore transient errors when trying to kill a job


Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ArchJob.py	26 Nov 2005 06:10:22 -0000	1.22
+++ ArchJob.py	12 Jan 2006 21:39:08 -0000	1.23
@@ -294,7 +294,10 @@
         user_requested = self._die_user_requested
         self._die_lock.release()
         if should_die:
-            self._server.die(self.jobid)
+            try:
+                self._server.die(self.jobid)
+            except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error):
+                pass
             if self._status == 'repo_wait':
                 self._repo.cancel_unlock_request(self)
             self._set_status('done')



From fedora-extras-commits at redhat.com  Fri Jan 13 00:14:53 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:14:53 -0500
Subject: rpms/z88dk - New directory
Message-ID: <200601130014.k0D0EtM0006987@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979/z88dk

Log Message:
Directory /cvs/extras/rpms/z88dk added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:15:00 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:15:00 -0500
Subject: rpms/z88dk/devel - New directory
Message-ID: <200601130015.k0D0FJ64007007@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6979/z88dk/devel

Log Message:
Directory /cvs/extras/rpms/z88dk/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:15:56 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:15:56 -0500
Subject: rpms/z88dk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130015.k0D0FwFb007041@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7029

Added Files:
	Makefile import.log 
Log Message:
Setup of module z88dk


--- NEW FILE Makefile ---
# Top level Makefile for module z88dk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:16:02 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:16:02 -0500
Subject: rpms/z88dk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601130016.k0D0G4A6007061@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7029/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module z88dk


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:19:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:19:34 -0500
Subject: rpms/z88dk/devel z88dk.spec, NONE, 1.1 z88make.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601130020.k0D0K85M007153@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7109/devel

Modified Files:
	.cvsignore sources 
Added Files:
	z88dk.spec z88make.patch 
Log Message:
auto-import z88dk-1.6-7 on branch devel from z88dk-1.6-7.src.rpm


--- NEW FILE z88dk.spec ---
Summary: A Z80 cross compiler
Name: z88dk
Version: 1.6
Release: 7%{?dist}
License: Artistic
Group: Development/Tools
Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz
Patch: z88make.patch
URL: http://z88dk.sourceforge.net/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
z88dk is a Z80 cross compiler capable of generating binary files for a variety
of Z80 based machines (such as the ZX81, Spectrum and Jupiter Ace).

%prep
%setup -q -n z88dk
%patch0 -p0 -b Makefile
/usr/bin/find . -depth -name CVS -type d -exec %{__rm} -rf {} \;
%{__mkdir} bin
# Separate manpages from other docs and fix their permissions
%{__mv} doc/netman .
%{__chmod} 644 netman/man3z/*
# Put files in %{_datadir}/z88dk rather than /usr/lib/z88dk
%{__sed} -i -e 's@[$][(]prefix[)]/lib/z88dk@$(datadir)/z88dk at g' \
	    -e 's@[$][{]prefix[}][$]/lib/z88dk@%{_datadir}/z88dk at g' Makefile
# Fix files with wrong line endings and bad permissions
/usr/bin/find doc examples src -type f -exec %{__sed} -i -e 's/\r*$//' {} \;
/usr/bin/find doc examples src -type f -exec %{__chmod} 644 {} \;

%build
export Z80_OZFILES=%{_builddir}/z88dk/lib/
export ZCCCFG=%{_builddir}/z88dk/lib/config/
export PATH=%{_builddir}/z88dk/bin:$PATH
export CC=gcc
export CFLAGS="%{optflags}"
ExcludeArch=x86_64
# Note: do not use %{?_smp_mflags} with make because the Makefiles don't support parallel builds
%{__make} clean
%{__make} -e
%{__make} -e libs

%install
export Z80_OZFILES=%{_datadir}/z88dk-%{version}/lib/
export ZCCCFG=%{_datadir}/z88dk-%{version}/lib/config/
%{__rm} -rf %{buildroot}
%{makeinstall} install-libs
%{__mkdir_p} %{buildroot}%{_mandir}/man3z
%{__cp} -p netman/man3z/* %{buildroot}%{_mandir}/man3z

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc doc/*.html doc/*.gif doc/copt.man
%doc doc/compile.txt doc/cpc.txt doc/embedded.txt doc/error.txt doc/farmods.txt
%doc doc/fileio.txt doc/lib3d.txt doc/options.txt doc/packages.txt
%doc doc/platforms.txt doc/retarget.txt doc/stdio.txt doc/ti.txt doc/z80asm.txt
%doc doc/zxscrdrv.txt
%doc EXTENSIONS LICENSE www
# Examples might be worth putting in subpackage
%doc examples
%{_bindir}/appmake
%{_bindir}/copt
%{_bindir}/sccz80
%{_bindir}/z80asm
%{_bindir}/zcc
%{_bindir}/zcpp
%{_datadir}/z88dk/
%{_mandir}/man3z/

%changelog
* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.6-7
- Add ExcludeArch for x86_64 machines

* Mon Oct 17 2005 Paul Howarth <paul at city-fan.org> - 1.6-6
- Use full URL for upstream tarball location
- Don't use macros in build-time command paths (see #170506 for discussion)
- Tarball expands to directory z88dk, not z88dk-%%{version}

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-5
- Modified the spec file to fix the rpmlint problems

* Wed Sep 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-4
- Add diff for makefile and patch aspect to spec
- rebuilt

* Wed Sep 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.6-3
- Fixed the spec file as it was constantly looking to /var/tmp!
- Fixed the source to point to /usr/share/z88dk for configs
- Removed `pwd` as it was causing problems

* Tue Sep 13 2005 Paul Howarth <paul at city-fan.org> - 1.6-2
- Use macros consistently
- Clean out buildroot in %%install rather than %%prep
- Include additional docs
- Tidy summary and description
- Honor %%{optflags}
- Remove CVS cruft
- Separate manpages from rest of docs
- Put target libraries, include files etc. under %%{_datadir}, not /usr/lib
- No scriptlets needed
- Fix file permissions and line endings
- Remove vendor and packager tags
- Use "Artistic" in license tag

* Tue Sep 13 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk>
- Fixes to spec file

* Mon Sep 12 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk>
- initial import and rpm builds

z88make.patch:

--- NEW FILE z88make.patch ---
--- Makefile	2004-10-08 10:47:51.000000000 +0100
+++ z88dk-1.6/Makefile	2005-09-14 17:00:23.000000000 +0100
@@ -7,7 +7,7 @@
 
 # ---> Configurable parameters are below his point
 
-prefix = /usr/local
+prefix = /usr
 
 # The default machine, the lib/config/DEFAULT.cfg file is copied to zcc.cfg
 DEFAULT = z88
@@ -50,7 +50,7 @@
 
 
 setup:
-	echo '#define PREFIX "${prefix}$"/lib/z88dk"' > src/config.h
+	echo '#define PREFIX "${prefix}$"/share/z88dk"' > src/config.h
 	echo '#define UNIX 1' >> src/config.h
 
 appmake:
@@ -86,29 +86,28 @@
 	cd libsrc ; $(MAKE) install
 
 install-libs:
-	mkdir -p $(prefix)/lib/z88dk/lib/clibs
-	cp -R lib/clibs/* $(prefix)/lib/z88dk/lib/clibs/
-	find $(prefix)/lib/z88dk/lib/clibs -type f | xargs chmod 644
+	mkdir -p $(prefix)/share/z88dk/lib/clibs
+	cp -R lib/clibs/* $(prefix)/share/z88dk/lib/clibs/
+	find $(prefix)/share/z88dk/lib/clibs -type f | xargs chmod 644
 
 
 install:
 	mkdir -p -m 755 $(prefix)/bin $(prefix)/lib 
-	mkdir -p -m 755 $(prefix)/lib/z88dk  $(prefix)/lib/z88dk/lib
-	mkdir -p -m 755 $(prefix)/lib/z88dk/lib/clibs  $(prefix)/lib/z88dk/lib/config
+	mkdir -p -m 755 $(prefix)/share/z88dk  $(prefix)/share/z88dk/lib
+	mkdir -p -m 755 $(prefix)/share/z88dk/lib/clibs  $(prefix)/share/z88dk/lib/config
 	cd src/appmake ; $(MAKE) PREFIX=$(prefix) install
 	cd src/copt ; $(MAKE) PREFIX=$(prefix) install
 	cd src/cpp ; $(MAKE) PREFIX=$(prefix) install
 	cd src/sccz80 ; $(MAKE) PREFIX=$(prefix) install
 	cd src/z80asm ; $(MAKE) PREFIX=$(prefix) install
 	cd src/zcc ; $(MAKE) PREFIX=$(prefix) install
-	./config.sh $(prefix)/lib/z88dk/ $(DEFAULT)
-	cp -R -p include $(prefix)/lib/z88dk
-	cp -R -p lib $(prefix)/lib/z88dk
-	find $(prefix)/lib/z88dk/include -name '*.h' | xargs chmod 644
-	find $(prefix)/lib/z88dk/include -type d | xargs chmod 755
-	find $(prefix)/lib/z88dk/lib -type f | xargs chmod 644
-	find $(prefix)/lib/z88dk/lib -type d | xargs chmod 755
-
+	./config.sh /usr/share/z88dk/ $(DEFAULT)
+	cp -R -p include $(prefix)/share/z88dk
+	cp -R -p lib $(prefix)/share/z88dk
+	find $(prefix)/share/z88dk/lib -type f | xargs chmod 644
+	find $(prefix)/share/z88dk/lib -type d | xargs chmod 755
+	find $(prefix)/share/z88dk/include -name '*.h' | xargs chmod 644
+	find $(prefix)/share/z88dk/include -type d | xargs chmod 755
 
 
 clean: clean-bins


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 00:16:02 -0000	1.1
+++ .cvsignore	13 Jan 2006 00:19:34 -0000	1.2
@@ -0,0 +1 @@
+z88dk-src-1.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/z88dk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 00:16:02 -0000	1.1
+++ sources	13 Jan 2006 00:19:34 -0000	1.2
@@ -0,0 +1 @@
+5fd75dea26da3c3d863b9e15f6524af9  z88dk-src-1.6.tgz



From fedora-extras-commits at redhat.com  Fri Jan 13 00:19:17 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:19:17 -0500
Subject: rpms/z88dk import.log,1.1,1.2
Message-ID: <200601130020.k0D0K8U3007155@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/z88dk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7109

Modified Files:
	import.log 
Log Message:
auto-import z88dk-1.6-7 on branch devel from z88dk-1.6-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/z88dk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 00:15:56 -0000	1.1
+++ import.log	13 Jan 2006 00:19:16 -0000	1.2
@@ -0,0 +1 @@
+z88dk-1_6-7:HEAD:z88dk-1.6-7.src.rpm:1137111538



From fedora-extras-commits at redhat.com  Fri Jan 13 00:49:44 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:49:44 -0500
Subject: rpms/fuse import.log,1.2,1.3
Message-ID: <200601130050.k0D0oG3T007473@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7434

Modified Files:
	import.log 
Log Message:
auto-import fuse-0.7.0-5 on branch devel from fuse-0.7.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	23 Nov 2005 19:29:30 -0000	1.2
+++ import.log	13 Jan 2006 00:49:44 -0000	1.3
@@ -1 +1,2 @@
 fuse-2_4_2-1:HEAD:fuse-2.4.2-1.src.rpm:1132774168
+fuse-0_7_0-5:HEAD:fuse-0.7.0-5.src.rpm:1137113371



From fedora-extras-commits at redhat.com  Fri Jan 13 00:49:50 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:49:50 -0500
Subject: rpms/fuse/devel README.z88sdk, NONE, 1.1 fuse-emulator-0.7.0.spec, 
	NONE, 1.1 fuse-sound.patch, NONE, 1.1 fuse.png, NONE,
	1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 fuse-README.fedora,
	1.1, NONE fuse-makedev.d-fuse, 1.1, NONE fuse-mount.fuse.patch,
	1.1, NONE fuse-udev.nodes, 1.1, NONE fuse-udev_rules.patch, 1.1,
	NONE fuse.spec, 1.2, NONE
Message-ID: <200601130050.k0D0oMQN007477@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7434/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.z88sdk fuse-emulator-0.7.0.spec fuse-sound.patch 
	fuse.png 
Removed Files:
	fuse-README.fedora fuse-makedev.d-fuse fuse-mount.fuse.patch 
	fuse-udev.nodes fuse-udev_rules.patch fuse.spec 
Log Message:
auto-import fuse-0.7.0-5 on branch devel from fuse-0.7.0-5.src.rpm


--- NEW FILE README.z88sdk ---
HOW TO USE THE Z88SDK WITH FUSE
-------------------------------

Using the Z88 SDK with fuse is a very simple operation. Grab a copy of the rpm, install and write your code, as you would, in C.

Next, compile and target the ZX Spectrum

zcc +zx <your-source>.c -o <output-name>.bin -lndos

Assuming all is well, your code will be generated. THIS IS NOT AN EXECUTABLE!

Load up Fuse. Click on File, move to "Open Binary Data". The usual filer window opens. Select the file you've just compiled and click "Open". The filer closes and you're presented with another window asking for a start address. You can enter any number from about 25000. For this explaination, I would use 32768. Click OK. Your .bin file is now in memory.

To run the code, press the following keys

T, ctrl + shift (the cursor turns to a white on black E), L 32768 return.

On screen you will see the words RANDOMISE USR 32768 before you press return. When you press return, the code will be executed.

That's about it!


--- NEW FILE fuse-emulator-0.7.0.spec ---
%define packagename fuse-emulator

Summary: The Free UNIX Spectrum Emulator
Name: fuse
Version: 0.7.0
Release: 5%{?dist}
License: GPL
Group: Applications/Emulators
Source: http://kent.dl.sourceforge.net/sourceforge/fuse-emulator/%{name}-%{version}.tar.gz
Source1: fuse.png
Source2: README.z88sdk
Patch: fuse-sound.patch
URL: http://fuse-emulator.sourceforge.net/
BuildRoot: %{_tmppath}/%{packagename}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdsk-devel
BuildRequires: lib765-devel
BuildRequires: gtk2-devel
BuildRequires: libxml2-devel
BuildRequires: libpng-devel
BuildRequires: libspectrum-devel
BuildRequires: bison
BuildRequires: flex

# The SRPM created from this spec file deliberately does not include the 
# ROMS required to run the emulator. For the location of the ROMS, see
# the ROMS readme file.

%description
Fuse is a spectrum emulator which emulates multiple models, including the 16K,
48K, 128K, +2, +2A, +3 and various clones.

%prep
rm -rf ${RPM_BUILD_ROOT}
%setup -q
%patch -p1 -b sound.c

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fuse
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps

install -m0644 man/fuse.1 ${RPM_BUILD_ROOT}%{_mandir}/man1

install -c fuse ${RPM_BUILD_ROOT}%{_bindir}/fuse
cp lib/*.z80 ${RPM_BUILD_ROOT}%{_datadir}/fuse/
cp lib/*.bmp ${RPM_BUILD_ROOT}%{_datadir}/fuse/
cp lib/*.scr ${RPM_BUILD_ROOT}%{_datadir}/fuse/
install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png 
cp %{SOURCE2} README.z88sdk

%clean
rm -rf ${RPM_BUILD_ROOT}

%post

%postun

%files
%defattr(-,root,root)
%{_mandir}/man1/fuse.1.gz
%{_bindir}/fuse
%{_datadir}/fuse/
%{_datadir}/pixmaps/%{name}.png
%doc AUTHORS ChangeLog COPYING README THANKS ROMS README.z88sdk

%changelog
* Wed Oct 26 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-5
- Altered package name to fuse-emulator (macro)
- Removed BR: zlib-devel and BR: glibc-devel and both Requires
- Included comment regarding the SRPM not containing the ROMS
- Added README.z88sdk file to the archive
- Made the source of the tarball a valid one!
- Removed a comma from after xml2-devel

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-4
- Minor alteration to spec file (Build require=perl gone)
- Addition of sound.c patch file

* Fri Sep 02 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-3.fc
- Removal of ROMS and addition to documentation of where to get ROMS

* Mon Aug 29 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-2.fc
- Fixes to both the source and spec for FC

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 0.7.0-2.iss
- Rebuild for newer version of lib765 (0.3.3)

* Mon Jul 16 2004 Ian Chapman <packages at amiga-hardware.com> - 0.7.0-1.iss
- Updated to version 0.7.0
- Updated for Fedora Core 2
- Added a graphic for the menu icon

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 0.6.1.1-2
- Minor fixes to changelog
- Improved use of macros
- Removed most explicit library dependancies
- Added menu icon

* Sun Nov 30 2003 Ian Chapman <packages at amiga-hardware.com> - 0.6.1.1-1
- Initial Release

fuse-sound.patch:

--- NEW FILE fuse-sound.patch ---
--- sound.c	2005-10-17 23:20:45.000000000 +0100
+++ fuse-0.7.0/sound.c	2005-08-20 23:46:32.000000000 +0100
@@ -58,8 +58,8 @@
 int sound_stereo_ay_abc=0;	/* (AY stereo) true for ABC stereo, else ACB */
 int sound_stereo_ay_narrow=0;	/* (AY stereo) true for narrow AY st. sep. */
 
-static int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
-static int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
+int sound_stereo_ay=0;	/* local copy of settings_current.stereo_ay */
+int sound_stereo_beeper=0;   /* and settings_current.stereo_beeper */
 
 
 /* assume all three tone channels together match the beeper volume (ish).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Nov 2005 19:29:35 -0000	1.2
+++ .cvsignore	13 Jan 2006 00:49:50 -0000	1.3
@@ -1 +1 @@
-fuse-2.4.2.tar.gz
+fuse-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Nov 2005 19:29:35 -0000	1.2
+++ sources	13 Jan 2006 00:49:50 -0000	1.3
@@ -1 +1 @@
-6e3d9a580c45ddf4a06558c135c158c2  fuse-2.4.2.tar.gz
+ebb124e808e6467630efaae01fe03b64  fuse-0.7.0.tar.gz


--- fuse-README.fedora DELETED ---


--- fuse-makedev.d-fuse DELETED ---


--- fuse-mount.fuse.patch DELETED ---


--- fuse-udev.nodes DELETED ---


--- fuse-udev_rules.patch DELETED ---


--- fuse.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:10 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:10 -0500
Subject: rpms/lib765 - New directory
Message-ID: <200601130057.k0D0vCAH007632@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7624/lib765

Log Message:
Directory /cvs/extras/rpms/lib765 added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:16 -0500
Subject: rpms/lib765/devel - New directory
Message-ID: <200601130057.k0D0vIPH007647@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7624/lib765/devel

Log Message:
Directory /cvs/extras/rpms/lib765/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:45 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:45 -0500
Subject: rpms/lib765 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130057.k0D0vmCQ007681@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7669

Added Files:
	Makefile import.log 
Log Message:
Setup of module lib765


--- NEW FILE Makefile ---
# Top level Makefile for module lib765
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:57:51 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:57:51 -0500
Subject: rpms/lib765/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601130057.k0D0vtdN007703@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7669/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lib765


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 00:58:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:58:43 -0500
Subject: rpms/lib765 import.log,1.1,1.2
Message-ID: <200601130059.k0D0xFGi007771@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7737

Modified Files:
	import.log 
Log Message:
auto-import lib765-0.3.3-3 on branch devel from lib765-0.3.3-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lib765/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 00:57:45 -0000	1.1
+++ import.log	13 Jan 2006 00:58:43 -0000	1.2
@@ -0,0 +1 @@
+lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910



From fedora-extras-commits at redhat.com  Fri Jan 13 00:58:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 19:58:49 -0500
Subject: rpms/lib765/devel lib765.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601130059.k0D0xL8b007775@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7737/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lib765.spec 
Log Message:
auto-import lib765-0.3.3-3 on branch devel from lib765-0.3.3-3.src.rpm


--- NEW FILE lib765.spec ---
Summary: A library for emulating the uPD765a floppy controller
Name: lib765
Version: 0.3.3
Release: 3%{?dist}
License: LGPL
Group: System Environment/Libraries
Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz
URL: http://www.seasip.demon.co.uk/Unix/LibDsk/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libdsk-devel

%description
A library for emulating the uPD765a floppy controller as found on the Spectrum
+3, Amstrad CPC and PCW.

%package devel
Summary: Development files for lib765.
Group: Development/Libraries
Requires: libdsk-devel

%description devel
Development files for lib765.

%prep
%setup -q

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%{_libdir}/lib765.so.*
%doc doc/765.txt doc/COPYING.LIB ChangeLog

%files devel
%defattr(-,root,root)
%{_libdir}/lib765.so
%{_includedir}/765.h
%exclude %{_libdir}/lib765.la

%changelog
* Mon Nov 14 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.3-3
- now uses %{?_smp_mflags} during the make process

* Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.3-2
- renamed spec file

* Fri Nov 11 2005 Paul Howarth <paul at city-fan.org> - 0.3.3-2
- Removed vendor and packager tags
- Use FE standard buildroot
- Unpack tarball quietly
- Remove BuildRoot in %%install rather than %%prep
- Use DESTDIR with make instead of %%makeinstall
- Don't build static lubs
- Add libdsk-devel dep for -devel subpackage

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.3.3-1.2
- Many alterations to bring the spec into line with the rules
- removed *.la files, changes to rpm name and changed to %configure

* Mon Jul 11 2005 Paul Johnson <paul at all-the-johnsons.co.uk> - 0.3.3-1.1.FC4
- Changed version for FC4

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 0.3.3-1.iss
- Changelog was duplicated in spec file, fixed.
- Updated to version 0.3.3

* Mon Jul 16 2004 Ian Chapman <packages at amiga-hardware.com> - 0.3.1.1-3.iss
- Updated to Fedora Core 2

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 0.3.1.1-2
- Minor changes to changelog
- Moved a file from the main package to the devel package
- Improved use of macros

* Sat Dec 01 2003 Ian Chapman <packages at amiga-hardware.com> - 0.3.1.1-1
- Initial Release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 00:57:51 -0000	1.1
+++ .cvsignore	13 Jan 2006 00:58:49 -0000	1.2
@@ -0,0 +1 @@
+lib765-0.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 00:57:51 -0000	1.1
+++ sources	13 Jan 2006 00:58:49 -0000	1.2
@@ -0,0 +1 @@
+831929572120af53781322e0456c708b  lib765-0.3.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 01:03:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:03:41 -0500
Subject: rpms/libdsk - New directory
Message-ID: <200601130103.k0D13hvx009582@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9574/libdsk

Log Message:
Directory /cvs/extras/rpms/libdsk added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:03:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:03:47 -0500
Subject: rpms/libdsk/devel - New directory
Message-ID: <200601130103.k0D13om6009597@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9574/libdsk/devel

Log Message:
Directory /cvs/extras/rpms/libdsk/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:05:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:05:19 -0500
Subject: rpms/libdsk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601130105.k0D15L9F009649@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9619/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libdsk


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:05:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:05:01 -0500
Subject: rpms/libdsk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130105.k0D15HLs009632@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9619

Added Files:
	Makefile import.log 
Log Message:
Setup of module libdsk


--- NEW FILE Makefile ---
# Top level Makefile for module libdsk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:08:46 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:08:46 -0500
Subject: rpms/libdsk/devel libdsk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601130109.k0D19Kcj009720@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9685/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libdsk.spec 
Log Message:
auto-import libdsk-1.1.6-1 on branch devel from libdsk-1.1.6-1.src.rpm


--- NEW FILE libdsk.spec ---
Summary: Library for accessing disk images
Name: libdsk
Version: 1.1.6
Release: 1%{?dist}
License: GPL
Group: System Environment/Libraries
Source: http://www.seasip.demon.co.uk/Unix/LibDsk/libdsk-%{version}.tar.gz
URL: http://www.seasip.demon.co.uk/Unix/LibDsk/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel, bzip2-devel

%description
A library for accessing disk images, particularly for use with emulators.

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

%description devel
Development files for libdsk.

%package tools
Summary: Tools for use with libdsk
Group: Applications/System
Requires: libdsk = %{version}

%description tools
Tools for use with libdsk.

%prep
%setup -q

# Fix dodgy permissions on files that end up in debuginfo package
/usr/bin/find . -name '*.[ch]' | /usr/bin/xargs %{__chmod} 644

# Fix wrong line endings on files that end up in debuginfo package
%{__perl} -pi -e 's/\r*$//' lib/drivers.h

%build
%configure --disable-rpath --disable-static

# Is this actually needed?
#{__perl} -pi -e "s,hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec=\" -D__LIBTOOL_IS_A_FOOL__ \",g" libtool

%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%{_libdir}/libdsk.so.*
%doc README doc/COPYING ChangeLog TODO doc/*.html doc/libdsk.{pdf,txt}

%files tools
%{_bindir}/dskform
%{_bindir}/dskid
%{_bindir}/dsktrans
%{_bindir}/md3serial
%{_bindir}/dskdump
%{_bindir}/dskscan
%{_mandir}/man1/dskdump.1*
%{_mandir}/man1/dskscan.1*
%{_mandir}/man1/dskform.1*
%{_mandir}/man1/dskid.1*
%{_mandir}/man1/dsktrans.1*
%{_mandir}/man5/libdskrc.5*
%{_mandir}/man1/md3serial.1*

%files devel
%defattr(-,root,root)
%{_libdir}/libdsk.so
%{_includedir}/libdsk.h
%exclude %{_libdir}/libdsk.la

%changelog
* Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.6.1
- Removed packager
- Altered BR to remove requirement for sed
- Fixed BuildRoot to honour FC rules
- Altered licence to GPL
- Altered numbering scheme for version
- Renamed spec file
- Added in new binaries and man files for dskdump and dskscan
- Bumped to upstream version 1.1.6
- A couple of fiddly fixes suggested by Paul Howard

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.4-1.2
- Alterations to Requires: and name

* Mon Jul 11 2005 Paul Johnson <paul at all-the-johnsons.co.uk> - 1.1.4-1.1.FC4
- Changed version for FC4

* Mon May 22 2005 Ian Chapman <packages at amiga-hardware.com> - 1.1.4-1.iss
- Updated to version 1.1.4

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 1.1.3-1.iss
- Changelog duplicated in spec file, fixed.
- Updated to version 1.1.3
- Removed some install commands, no longer needed with this version

* Mon Jul 16 2004 Ian Chapman <packages at amiga-hardware.com> - 1.1.1-1.iss
- Updated to version to 1.1.1
- Updated for use with Fedora Core 2
- Split the tools from the main libdsk RPM

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 1.1.0-2
- Minor fixes to changelog
- Changed copyright to distributable
- Moved a file from the main package to the devel package

* Sat Dec 01 2003 Ian Chapman <packages at amiga-hardware.com> - 1.1.0-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 01:05:18 -0000	1.1
+++ .cvsignore	13 Jan 2006 01:08:43 -0000	1.2
@@ -0,0 +1 @@
+libdsk-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 01:05:18 -0000	1.1
+++ sources	13 Jan 2006 01:08:43 -0000	1.2
@@ -0,0 +1 @@
+8abf60a90ab13c7f9f57d4a94dcd2166  libdsk-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 01:08:19 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:08:19 -0500
Subject: rpms/libdsk import.log,1.1,1.2
Message-ID: <200601130109.k0D19Lfc009723@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9685

Modified Files:
	import.log 
Log Message:
auto-import libdsk-1.1.6-1 on branch devel from libdsk-1.1.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libdsk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 01:05:00 -0000	1.1
+++ import.log	13 Jan 2006 01:08:19 -0000	1.2
@@ -0,0 +1 @@
+libdsk-1_1_6-1:HEAD:libdsk-1.1.6-1.src.rpm:1137114439



From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:18 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:18 -0500
Subject: rpms/libspectrum - New directory
Message-ID: <200601130150.k0D1oKVh009981@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9973/libspectrum

Log Message:
Directory /cvs/extras/rpms/libspectrum added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:24 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:24 -0500
Subject: rpms/libspectrum/devel - New directory
Message-ID: <200601130150.k0D1oQCq009996@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9973/libspectrum/devel

Log Message:
Directory /cvs/extras/rpms/libspectrum/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:51 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:51 -0500
Subject: rpms/libspectrum Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130150.k0D1ortl010030@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10018

Added Files:
	Makefile import.log 
Log Message:
Setup of module libspectrum


--- NEW FILE Makefile ---
# Top level Makefile for module libspectrum
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:50:57 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:50:57 -0500
Subject: rpms/libspectrum/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601130150.k0D1oxMF010050@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10018/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libspectrum


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:52:00 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:52:00 -0500
Subject: rpms/libspectrum import.log,1.1,1.2
Message-ID: <200601130152.k0D1qWQE010149@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10112

Modified Files:
	import.log 
Log Message:
auto-import libspectrum-0.2.2-4 on branch devel from libspectrum-0.2.2-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libspectrum/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 01:50:51 -0000	1.1
+++ import.log	13 Jan 2006 01:52:00 -0000	1.2
@@ -0,0 +1 @@
+libspectrum-0_2_2-4:HEAD:libspectrum-0.2.2-4.src.rpm:1137117100



From fedora-extras-commits at redhat.com  Fri Jan 13 01:52:06 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:52:06 -0500
Subject: rpms/libspectrum/devel libspectrum.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200601130152.k0D1qcQ9010153@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libspectrum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10112/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libspectrum.spec 
Log Message:
auto-import libspectrum-0.2.2-4 on branch devel from libspectrum-0.2.2-4.src.rpm


--- NEW FILE libspectrum.spec ---
Summary:	A library for reading spectrum emulator file formats
Name:		libspectrum
License:	GPL
Version:	0.2.2
Release:	4%{?dist}
Group:		System Environment/Libraries
URL:		http://fuse-emulator.sourceforge.net/libspectrum.php
Source:		http://dl.sf.net/fuse-emulator/libspectrum-%{version}.tar.gz
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: 	zlib-devel, bzip2-devel, libgcrypt-devel, glib2-devel

%description
A library for reading various spectrum emulator file formats.

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

%description devel
Development files for libspectrum.

%prep
%setup -q

%build
%configure --disable-static
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%{_libdir}/libspectrum.so.*
%doc doc/libspectrum.txt README ChangeLog THANKS AUTHORS COPYING TODO

%files devel
%defattr(-,root,root)
%exclude %{_libdir}/libspectrum.la
%{_libdir}/libspectrum.so
%{_includedir}/libspectrum.h
%{_mandir}/man3/libspectrum.3*

%changelog
* Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.2.2-4
- Renamed spec file

* Fri Nov 11 2005 Paul Howarth <paul at city-fan.org> 0.2.2-3
- Remove Packager: tag
- Use full URL for source
- Use standard Fedora Extras buildroot
- Add buildreqs bzip2-devel, libgcrypt-devel, glib2-devel
- Add libgcrypt-devel req for -devel subpackage
- Unpack tarball quietly
- Don't build or include static library
- Use DESTDIR with make instead of %%makeinstall
- Honour %%{?_smp_mflags}
- Move manpage to -devel subpackage

* Mon Oct 17 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0-2.2-2.3
- Multiple fixes to the spec file to bring it into line with FC rules

* Mon Jul 11 2005 Paul Johnson <paul at all-the-johnsons.co.uk> - 0.2.2-2.iss
- Rebuild for Fedora Core 4
- Slight alteration to SPEC file for it to work with the Fedora RPM tools

* Mon Feb 28 2005 Ian Chapman <packages at amiga-hardware.com> - 0.2.2-2.iss
- Change log duplicated in spec file, fixed.

* Mon Jul 19 2004 Ian Chapman <packages at amiga-hardware.com> - 0.2.2-1.iss
- Upgraded to version 0.2.2
- RPM built for Fedora Core 2

* Fri Dec 05 2003 Ian Chapman <packages at amiga-hardware.com> - 0.2.0.1-2
- Minor changes to changelog
- Improved use of macros
- Moved appropriate files to devel package

* Sat Dec 01 2003 Ian Chapman <packages at amiga-hardware.com> - 0.2.0.1-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libspectrum/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 01:50:57 -0000	1.1
+++ .cvsignore	13 Jan 2006 01:52:06 -0000	1.2
@@ -0,0 +1 @@
+libspectrum-0.2.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libspectrum/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 01:50:57 -0000	1.1
+++ sources	13 Jan 2006 01:52:06 -0000	1.2
@@ -0,0 +1 @@
+30b0e5082b3b9d9f6fc430fd8912c0bd  libspectrum-0.2.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 01:57:27 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:57:27 -0500
Subject: rpms/fuse-utils - New directory
Message-ID: <200601130157.k0D1vTWD010332@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324/fuse-utils

Log Message:
Directory /cvs/extras/rpms/fuse-utils added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:57:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:57:33 -0500
Subject: rpms/fuse-utils/devel - New directory
Message-ID: <200601130157.k0D1vZRD010347@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10324/fuse-utils/devel

Log Message:
Directory /cvs/extras/rpms/fuse-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 13 01:58:34 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:58:34 -0500
Subject: rpms/fuse-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601130158.k0D1waXT010381@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10369

Added Files:
	Makefile import.log 
Log Message:
Setup of module fuse-utils


--- NEW FILE Makefile ---
# Top level Makefile for module fuse-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:58:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:58:40 -0500
Subject: rpms/fuse-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601130158.k0D1wgIi010401@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10369/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fuse-utils


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 13 01:59:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:59:31 -0500
Subject: rpms/fuse-utils import.log,1.1,1.2
Message-ID: <200601130200.k0D203c3010486@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10438

Modified Files:
	import.log 
Log Message:
auto-import fuse-utils-0.7.0-1 on branch devel from fuse-utils-0.7.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fuse-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Jan 2006 01:58:34 -0000	1.1
+++ import.log	13 Jan 2006 01:59:30 -0000	1.2
@@ -0,0 +1 @@
+fuse-utils-0_7_0-1:HEAD:fuse-utils-0.7.0-1.src.rpm:1137117558



From fedora-extras-commits at redhat.com  Fri Jan 13 01:59:36 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Thu, 12 Jan 2006 20:59:36 -0500
Subject: rpms/fuse-utils/devel fuse-utils-0.7.0.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601130200.k0D209nA010494@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10438/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fuse-utils-0.7.0.spec 
Log Message:
auto-import fuse-utils-0.7.0-1 on branch devel from fuse-utils-0.7.0-1.src.rpm


--- NEW FILE fuse-utils-0.7.0.spec ---
Summary: The Free UNIX Spectrum Emulator
Name: fuse-utils
Version: 0.7.0
Release: 1%{?dist}
License: GPL
Group: Applications/Emulators
Source: %{name}-%{version}.tar.gz
URL: ftp://ftp.worldofspectrum.org/pub/sinclair/emulators/unix/fuse-utils-0.7.0.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libspectrum-devel,

%description
Fuse-utils are a collection of utilities for the Fuse ZX-Spectrum emulator

%prep
rm -rf ${RPM_BUILD_ROOT}
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1

install -m0644 createhdf ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 listbasic ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 rzxcheck ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 rzxdump ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 rzxtool ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 scl2trd ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 snap2tzx ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 snapconv ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 tapeconv ${RPM_BUILD_ROOT}%{_bindir}/
install -m0644 tzxlist ${RPM_BUILD_ROOT}%{_bindir}/
cp  man/*.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root)
%{_mandir}/man1/createhdf.1.gz
%{_mandir}/man1/fuse-utils.1.gz
%{_mandir}/man1/listbasic.1.gz
%{_mandir}/man1/rzxcheck.1.gz
%{_mandir}/man1/rzxdump.1.gz
%{_mandir}/man1/rzxtool.1.gz
%{_mandir}/man1/scl2trd.1.gz
%{_mandir}/man1/snap2tzx.1.gz
%{_mandir}/man1/snapconv.1.gz
%{_mandir}/man1/tapeconv.1.gz
%{_mandir}/man1/tzxlist.1.gz
%{_bindir}/
%doc AUTHORS COPYING README 

%changelog
* Thu Sep 1 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 0.7.0-1.fc
- Initial build for FC



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2006 01:58:40 -0000	1.1
+++ .cvsignore	13 Jan 2006 01:59:36 -0000	1.2
@@ -0,0 +1 @@
+fuse-utils-0.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Jan 2006 01:58:40 -0000	1.1
+++ sources	13 Jan 2006 01:59:36 -0000	1.2
@@ -0,0 +1 @@
+9689134b4be1e4ff0b077f407ec76da9  fuse-utils-0.7.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 07:01:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 13 Jan 2006 02:01:00 -0500
Subject: rpms/perl-Config-General/devel .cvsignore, 1.4,
	1.5 perl-Config-General.spec, 1.8, 1.9 sources, 1.4, 1.5
Message-ID: <200601130701.k0D71gBQ021260@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Config-General/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19604

Modified Files:
	.cvsignore perl-Config-General.spec sources 
Log Message:
* Thu Jan 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.31-1
- 2.31.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Sep 2005 18:03:33 -0000	1.4
+++ .cvsignore	13 Jan 2006 07:00:58 -0000	1.5
@@ -1 +1 @@
-Config-General-2.30.tar.gz
+Config-General-2.31.tar.gz


Index: perl-Config-General.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/perl-Config-General.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-Config-General.spec	16 Sep 2005 18:03:34 -0000	1.8
+++ perl-Config-General.spec	13 Jan 2006 07:00:58 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           perl-Config-General
-Version:        2.30
+Version:        2.31
 Release:        1%{?dist}
 Summary:        Generic configuration module for Perl
 
@@ -63,6 +63,9 @@
 
 
 %changelog
+* 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
 - 2.30.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-General/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Sep 2005 18:03:34 -0000	1.4
+++ sources	13 Jan 2006 07:00:58 -0000	1.5
@@ -1 +1 @@
-289037b40ef5a78bd59f894bcc1d4f51  Config-General-2.30.tar.gz
+5d51723f6fb36cf943934b80c261d680  Config-General-2.31.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 16:58:27 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Fri, 13 Jan 2006 11:58:27 -0500
Subject: rpms/denyhosts/devel denyhosts-1.1.4-config.patch, NONE,
	1.1 .cvsignore, 1.13, 1.14 denyhosts.spec, 1.18, 1.19 sources,
	1.13, 1.14 denyhosts-1.1.3-config.patch, 1.1, NONE
Message-ID: <200601131658.k0DGwxxh007115@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7039

Modified Files:
	.cvsignore denyhosts.spec sources 
Added Files:
	denyhosts-1.1.4-config.patch 
Removed Files:
	denyhosts-1.1.3-config.patch 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
- Update to 1.1.4.


denyhosts-1.1.4-config.patch:

--- NEW FILE denyhosts-1.1.4-config.patch ---
--- denyhosts.cfg-dist.orig	2005-12-16 16:45:05.000000000 -0600
+++ denyhosts.cfg-dist	2006-01-13 10:56:34.762167881 -0600
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
 #######################################################################
 
 
@@ -115,7 +120,7 @@
 # Note: it is recommended that you use an absolute pathname
 # for this value (eg. /home/foo/denyhosts/data)
 #
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 
@@ -178,7 +183,7 @@
 # match your email address.  If you do not want to receive these reports
 # leave this field blank (or run with the --noemail option)
 #
-ADMIN_EMAIL = 
+ADMIN_EMAIL = root
 #
 #######################################################################
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	20 Nov 2005 17:21:48 -0000	1.13
+++ .cvsignore	13 Jan 2006 16:58:26 -0000	1.14
@@ -1 +1 @@
-DenyHosts-1.1.3.tar.gz
+DenyHosts-1.1.4.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- denyhosts.spec	20 Nov 2005 17:21:49 -0000	1.18
+++ denyhosts.spec	13 Jan 2006 16:58:26 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           denyhosts
-Version:        1.1.3
+Version:        1.1.4
 release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
@@ -13,7 +13,7 @@
 Source4:	denyhosts.sysconfig
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
-Patch0:		denyhosts-1.1.3-config.patch
+Patch0:		denyhosts-1.1.4-config.patch
 Patch1:		denyhosts-0.9.8-setup.patch
 Patch2:		denyhosts-1.0.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -125,6 +125,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
+- Update to 1.1.4.
+
 * Fri Nov 18 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.3-1
 - Update to 1.1.3
 - Update README.fedora to document what the package currently does.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	20 Nov 2005 17:21:49 -0000	1.13
+++ sources	13 Jan 2006 16:58:26 -0000	1.14
@@ -1 +1 @@
-bacc9e55a17572b832a19035129f7c12  DenyHosts-1.1.3.tar.gz
+f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz


--- denyhosts-1.1.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 13 17:26:13 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Fri, 13 Jan 2006 12:26:13 -0500
Subject: rpms/grace/devel .cvsignore, 1.2, 1.3 grace.spec, 1.1, 1.2 sources, 
	1.2, 1.3
Message-ID: <200601131726.k0DHQj7Z009194@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9173

Modified Files:
	.cvsignore grace.spec sources 
Log Message:
* Fri Jan 13 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
- new upstream version
- remove name from Summary
- disable setting environment variable GRACE_HOME
- replace x11-xorg-devel by libXpm-devel in BuildRequires



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Jan 2006 16:15:12 -0000	1.2
+++ .cvsignore	13 Jan 2006 17:26:12 -0000	1.3
@@ -1 +1 @@
-grace-5.1.18.tar.gz
+grace-5.1.19.tar.gz


Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grace.spec	9 Jan 2006 16:15:12 -0000	1.1
+++ grace.spec	13 Jan 2006 17:26:12 -0000	1.2
@@ -1,7 +1,7 @@
 Name:           grace
-Version:        5.1.18
-Release:        7%{?dist}
-Summary:        Numerical Data Processing and Visualization Tool (grace)
+Version:        5.1.19
+Release:        1%{?dist}
+Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
 # Xbae is BSD and cephes is LGPL, see also Source5 and Source6 
@@ -9,8 +9,8 @@
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
 Source2:        %{name}.png
-Source3:        %{name}.sh
-Source4:        %{name}.csh
+#Source3:        %{name}.sh
+#Source4:        %{name}.csh
 Source5:	cephes-license.email
 Source6:	LICENSE.cephes
 Patch:          %{name}-gracerc-no_auxiliary.diff
@@ -18,7 +18,7 @@
 Group:          Applications/Engineering
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
-BuildRequires:  zlib-devel, xorg-x11-devel, fftw-devel, t1lib-devel
+BuildRequires:  zlib-devel, libXpm-devel, fftw-devel, t1lib-devel
 BuildRequires:  openmotif-devel, gcc-gfortran
 BuildRequires:  desktop-file-utils, font-utils
 Requires:	nedit
@@ -78,8 +78,9 @@
     %{buildroot}%{_datadir}/pixmaps         \
     %{buildroot}%{_datadir}/applications    \
     %{buildroot}%{_mandir}/man1             \
-    %{buildroot}%{_sysconfdir}/profile.d    \
     %{buildroot}%{_sysconfdir}/%{name}
+#    %{buildroot}%{_sysconfdir}/profile.d    \
+
 ##
 # Let's have some sanity
 #
@@ -121,8 +122,8 @@
 ##
 # Profile scripts
 #
-install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
-install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
+#install -pm 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh
+#install -pm 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh
 
 
 %clean
@@ -142,7 +143,7 @@
 %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
-%{_sysconfdir}/profile.d/*
+#%{_sysconfdir}/profile.d/*
 %config(noreplace) %{_sysconfdir}/%{name}/
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -163,6 +164,12 @@
 
 
 %changelog
+* Fri Jan 13 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-1
+- new upstream version
+- remove name from Summary
+- disable setting environment variable GRACE_HOME
+- replace x11-xorg-devel by libXpm-devel in BuildRequires
+
 * Mon Jan  9 2006 Patrice Dumas <dumas at centre-cired.fr> - 5.1.18-7
 - put config files in /etc
 - licence is GPL and not BSD/GPL, as it is not dual licensed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Jan 2006 16:15:12 -0000	1.2
+++ sources	13 Jan 2006 17:26:12 -0000	1.3
@@ -1 +1 @@
-9f27cc76563d6fa1746333044a7c2a94  grace-5.1.18.tar.gz
+0745c262ba4d0d1d82fee5972065aefc  grace-5.1.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 13 20:46:10 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:46:10 -0500
Subject: rpms/gaim-meanwhile/FC-4 g-mw-empty-message-crash.patch, NONE,
	1.1 g-mw-empty-title-crash.patch, NONE, 1.1 gaim-meanwhile.spec,
	1.9, 1.10
Message-ID: <200601132046.k0DKkhKj014970@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14938

Modified Files:
	gaim-meanwhile.spec 
Added Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Fix two crashes

g-mw-empty-message-crash.patch:

--- NEW FILE g-mw-empty-message-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(text, -1);
+  esc = g_markup_escape_text(text? text: "", -1);
   serv_got_chat_in(gc, CONF_TO_ID(conf), who->user_id, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -3013,7 +3013,7 @@ static void mw_place_message(struct mwPl
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(msg, -1);
+  esc = g_markup_escape_text(msg? msg: "", -1);
   serv_got_chat_in(gc, PLACE_TO_ID(place), who->user, 0, esc, time(NULL));
   g_free(esc);
 }

g-mw-empty-title-crash.patch:

--- NEW FILE g-mw-empty-title-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
 	     NSTR(c_inviter), NSTR(c_name),
 	     NSTR(c_topic), NSTR(c_invitation));
 
+  if(! c_topic) c_topic = "(no title)";
+  if(! c_invitation) c_invitation = "(no message)";
   serv_got_chat_invite(gc, c_topic, c_inviter, c_invitation, ht);
 }
 
@@ -1828,6 +1830,7 @@ static void mw_conf_opened(struct mwConf
   GaimConversation *g_conf;
 
   const char *n = mwConference_getName(conf);
+  const char *t = mwConference_getTitle(conf);
 
   DEBUG_INFO("conf %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
@@ -1837,8 +1840,8 @@ static void mw_conf_opened(struct mwConf
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf),
-				mwConference_getTitle(conf));
+  if(! t) t = "(no title)";
+  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf), t);
 
   mwConference_setClientData(conf, GAIM_CONV_CHAT(g_conf), NULL);
 
@@ -2811,6 +2814,8 @@ static void mw_place_invite(struct mwCon
   g_hash_table_insert(ht, CHAT_KEY_INVITE, g_strdup(message));
   g_hash_table_insert(ht, CHAT_KEY_IS_PLACE, g_strdup("")); /* ugh */
 
+  if(! title) title = "(no title)";
+  if(! message) message = "(no message)";
   serv_got_chat_invite(pd->gc, title, idb->user, message, ht);
 
   mwConversation_close(conv, ERR_SUCCESS);
@@ -2882,6 +2887,7 @@ static void mw_place_opened(struct mwPla
   GList *members, *l;
 
   const char *n = mwPlace_getName(place);
+  const char *t = mwPlace_getTitle(place);
 
   srvc = mwPlace_getService(place);
   session = mwService_getSession(MW_SERVICE(srvc));
@@ -2893,8 +2899,8 @@ static void mw_place_opened(struct mwPla
   DEBUG_INFO("place %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
 
-  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place),
-			       mwPlace_getTitle(place));
+  if(! t) t = "(no title)";
+  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place), t);
 
   mwPlace_setClientData(place, gconf, NULL);
 


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gaim-meanwhile.spec	3 Jan 2006 18:07:29 -0000	1.9
+++ gaim-meanwhile.spec	13 Jan 2006 20:46:10 -0000	1.10
@@ -7,18 +7,22 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
+Patch0:         g-mw-empty-title-crash.patch
+Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -39,6 +43,10 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix crash with empty chat title
+- Fix crash with empty message in group chat
+
 * Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Fri Jan 13 20:50:09 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:50:09 -0500
Subject: rpms/gaim-meanwhile/devel g-mw-empty-message-crash.patch, NONE,
	1.1 g-mw-empty-title-crash.patch, NONE, 1.1 gaim-meanwhile.spec,
	1.9, 1.10
Message-ID: <200601132050.k0DKofOr015042@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15019

Modified Files:
	gaim-meanwhile.spec 
Added Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Fix two crashes

g-mw-empty-message-crash.patch:

--- NEW FILE g-mw-empty-message-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(text, -1);
+  esc = g_markup_escape_text(text? text: "", -1);
   serv_got_chat_in(gc, CONF_TO_ID(conf), who->user_id, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -3013,7 +3013,7 @@ static void mw_place_message(struct mwPl
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(msg, -1);
+  esc = g_markup_escape_text(msg? msg: "", -1);
   serv_got_chat_in(gc, PLACE_TO_ID(place), who->user, 0, esc, time(NULL));
   g_free(esc);
 }

g-mw-empty-title-crash.patch:

--- NEW FILE g-mw-empty-title-crash.patch ---
Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
===================================================================
--- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
@@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
 	     NSTR(c_inviter), NSTR(c_name),
 	     NSTR(c_topic), NSTR(c_invitation));
 
+  if(! c_topic) c_topic = "(no title)";
+  if(! c_invitation) c_invitation = "(no message)";
   serv_got_chat_invite(gc, c_topic, c_inviter, c_invitation, ht);
 }
 
@@ -1828,6 +1830,7 @@ static void mw_conf_opened(struct mwConf
   GaimConversation *g_conf;
 
   const char *n = mwConference_getName(conf);
+  const char *t = mwConference_getTitle(conf);
 
   DEBUG_INFO("conf %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
@@ -1837,8 +1840,8 @@ static void mw_conf_opened(struct mwConf
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf),
-				mwConference_getTitle(conf));
+  if(! t) t = "(no title)";
+  g_conf = serv_got_joined_chat(gc, CONF_TO_ID(conf), t);
 
   mwConference_setClientData(conf, GAIM_CONV_CHAT(g_conf), NULL);
 
@@ -2811,6 +2814,8 @@ static void mw_place_invite(struct mwCon
   g_hash_table_insert(ht, CHAT_KEY_INVITE, g_strdup(message));
   g_hash_table_insert(ht, CHAT_KEY_IS_PLACE, g_strdup("")); /* ugh */
 
+  if(! title) title = "(no title)";
+  if(! message) message = "(no message)";
   serv_got_chat_invite(pd->gc, title, idb->user, message, ht);
 
   mwConversation_close(conv, ERR_SUCCESS);
@@ -2882,6 +2887,7 @@ static void mw_place_opened(struct mwPla
   GList *members, *l;
 
   const char *n = mwPlace_getName(place);
+  const char *t = mwPlace_getTitle(place);
 
   srvc = mwPlace_getService(place);
   session = mwService_getSession(MW_SERVICE(srvc));
@@ -2893,8 +2899,8 @@ static void mw_place_opened(struct mwPla
   DEBUG_INFO("place %s opened, %u initial members\n",
 	     NSTR(n), g_list_length(members));
 
-  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place),
-			       mwPlace_getTitle(place));
+  if(! t) t = "(no title)";
+  gconf = serv_got_joined_chat(gc, PLACE_TO_ID(place), t);
 
   mwPlace_setClientData(place, gconf, NULL);
 


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gaim-meanwhile.spec	3 Jan 2006 18:07:49 -0000	1.9
+++ gaim-meanwhile.spec	13 Jan 2006 20:50:09 -0000	1.10
@@ -7,18 +7,22 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	1%{?dist}
+Release:	2%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
+Patch0:         g-mw-empty-title-crash.patch
+Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure
@@ -39,6 +43,10 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix crash with empty chat title
+- Fix crash with empty message in group chat
+
 * Tue Jan 3 2006 - jwboyer at jdub.homelinux.org 1.2.7-1
 - Update to latest release
 



From fedora-extras-commits at redhat.com  Fri Jan 13 20:57:30 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:57:30 -0500
Subject: rpms/gaim-meanwhile/FC-4 g-mw-empty-message-crash.patch, 1.1,
	1.2 g-mw-empty-title-crash.patch, 1.1, 1.2 gaim-meanwhile.spec,
	1.10, 1.11
Message-ID: <200601132058.k0DKw3Hm015151@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15124

Modified Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
	gaim-meanwhile.spec 
Log Message:
Fix patches

g-mw-empty-message-crash.patch:

Index: g-mw-empty-message-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/g-mw-empty-message-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-message-crash.patch	13 Jan 2006 20:46:10 -0000	1.1
+++ g-mw-empty-message-crash.patch	13 Jan 2006 20:57:30 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
    pd = mwSession_getClientData(session);
    gc = pd->gc;

g-mw-empty-title-crash.patch:

Index: g-mw-empty-title-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/g-mw-empty-title-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-title-crash.patch	13 Jan 2006 20:46:10 -0000	1.1
+++ g-mw-empty-title-crash.patch	13 Jan 2006 20:57:30 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
  	     NSTR(c_inviter), NSTR(c_name),
  	     NSTR(c_topic), NSTR(c_invitation));


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gaim-meanwhile.spec	13 Jan 2006 20:46:10 -0000	1.10
+++ gaim-meanwhile.spec	13 Jan 2006 20:57:30 -0000	1.11
@@ -7,7 +7,7 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 %changelog
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix patches to have the correct strip level.  Gah.
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
 - Fix crash with empty chat title
 - Fix crash with empty message in group chat
 



From fedora-extras-commits at redhat.com  Fri Jan 13 20:58:26 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Fri, 13 Jan 2006 15:58:26 -0500
Subject: rpms/gaim-meanwhile/devel g-mw-empty-message-crash.patch, 1.1,
	1.2 g-mw-empty-title-crash.patch, 1.1, 1.2 gaim-meanwhile.spec,
	1.10, 1.11
Message-ID: <200601132058.k0DKwwcG015189@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15157

Modified Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
	gaim-meanwhile.spec 
Log Message:
Fix patches

g-mw-empty-message-crash.patch:

Index: g-mw-empty-message-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/g-mw-empty-message-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-message-crash.patch	13 Jan 2006 20:50:09 -0000	1.1
+++ g-mw-empty-message-crash.patch	13 Jan 2006 20:58:25 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1941,7 +1941,7 @@ static void mw_conf_text(struct mwConfer
    pd = mwSession_getClientData(session);
    gc = pd->gc;

g-mw-empty-title-crash.patch:

Index: g-mw-empty-title-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/g-mw-empty-title-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- g-mw-empty-title-crash.patch	13 Jan 2006 20:50:09 -0000	1.1
+++ g-mw-empty-title-crash.patch	13 Jan 2006 20:58:25 -0000	1.2
@@ -1,7 +1,7 @@
-Index: FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+Index: gaim-meanwhile-1.2.7/src/mwgaim.c
 ===================================================================
---- FC-4.orig/gaim-meanwhile-1.2.7/src/mwgaim.c
-+++ FC-4/gaim-meanwhile-1.2.7/src/mwgaim.c
+--- gaim-meanwhile-1.2.7.orig/src/mwgaim.c
++++ gaim-meanwhile-1.2.7/src/mwgaim.c
 @@ -1780,6 +1780,8 @@ static void mw_conf_invited(struct mwCon
  	     NSTR(c_inviter), NSTR(c_name),
  	     NSTR(c_topic), NSTR(c_invitation));


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gaim-meanwhile.spec	13 Jan 2006 20:50:09 -0000	1.10
+++ gaim-meanwhile.spec	13 Jan 2006 20:58:25 -0000	1.11
@@ -7,7 +7,7 @@
 License:	GPL
 Group:		Applications/Internet
 Version:	1.2.7
-Release:	2%{?dist}
+Release:	3%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 %changelog
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+- Fix patches to have the correct strip level.  Gah.
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
 - Fix crash with empty chat title
 - Fix crash with empty message in group chat
 



From fedora-extras-commits at redhat.com  Fri Jan 13 23:44:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 13 Jan 2006 18:44:00 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.9, 1.10 rxvt-unicode.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200601132344.k0DNiW4t021182@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 09:03:11 -0000	1.9
+++ .cvsignore	13 Jan 2006 23:43:59 -0000	1.10
@@ -1 +1 @@
-rxvt-unicode-6.3.tar.bz2
+rxvt-unicode-7.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rxvt-unicode.spec	5 Jan 2006 09:03:11 -0000	1.11
+++ rxvt-unicode.spec	13 Jan 2006 23:43:59 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.3
+Version:        7.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.0-1
+- version upgrade
+
 * Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 09:03:11 -0000	1.9
+++ sources	13 Jan 2006 23:43:59 -0000	1.10
@@ -1 +1 @@
-411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2
+4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 13 23:44:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 13 Jan 2006 18:44:06 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.9, 1.10 rxvt-unicode.spec, 1.11,
	1.12 sources, 1.9, 1.10
Message-ID: <200601132344.k0DNicAC021187@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 09:03:19 -0000	1.9
+++ .cvsignore	13 Jan 2006 23:44:05 -0000	1.10
@@ -1 +1 @@
-rxvt-unicode-6.3.tar.bz2
+rxvt-unicode-7.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rxvt-unicode.spec	5 Jan 2006 09:03:19 -0000	1.11
+++ rxvt-unicode.spec	13 Jan 2006 23:44:05 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.3
+Version:        7.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.0-1
+- version upgrade
+
 * Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 09:03:19 -0000	1.9
+++ sources	13 Jan 2006 23:44:05 -0000	1.10
@@ -1 +1 @@
-411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2
+4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 13 23:44:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 13 Jan 2006 18:44:12 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.9, 1.10 rxvt-unicode.spec,
	1.14, 1.15 sources, 1.9, 1.10
Message-ID: <200601132344.k0DNiiv9021192@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21115/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	5 Jan 2006 09:03:42 -0000	1.9
+++ .cvsignore	13 Jan 2006 23:44:11 -0000	1.10
@@ -1 +1 @@
-rxvt-unicode-6.3.tar.bz2
+rxvt-unicode-7.0.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rxvt-unicode.spec	5 Jan 2006 09:03:42 -0000	1.14
+++ rxvt-unicode.spec	13 Jan 2006 23:44:11 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        6.3
+Version:        7.0
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.0-1
+- version upgrade
+
 * Thu Jan 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 6.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	5 Jan 2006 09:03:42 -0000	1.9
+++ sources	13 Jan 2006 23:44:11 -0000	1.10
@@ -1 +1 @@
-411799866fa89ab31f2b19662c36e7ce  rxvt-unicode-6.3.tar.bz2
+4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 00:31:04 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 13 Jan 2006 19:31:04 -0500
Subject: rpms/repoview/devel .cvsignore, 1.4, 1.5 repoview.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200601140031.k0E0VMKR023202@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23164/devel

Modified Files:
	.cvsignore repoview.spec sources 
Log Message:
Version 0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Oct 2005 18:22:15 -0000	1.4
+++ .cvsignore	14 Jan 2006 00:31:04 -0000	1.5
@@ -1 +1 @@
-repoview-0.4.1.tar.gz
+repoview-0.5.tar.gz


Index: repoview.spec
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/repoview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repoview.spec	9 Oct 2005 18:22:15 -0000	1.4
+++ repoview.spec	14 Jan 2006 00:31:04 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           repoview
-Version:        0.4.1
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Creates a set of static HTML pages in a yum repository
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jan 13 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.5-1
+- Version 0.5
+
 * Sun Oct 09 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 0.4.1-1
 - Version 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Oct 2005 18:22:15 -0000	1.4
+++ sources	14 Jan 2006 00:31:04 -0000	1.5
@@ -1 +1 @@
-c72b8c46579b49679dd751f7bc174a75  repoview-0.4.1.tar.gz
+d113c06a124029660c7436cc06563482  repoview-0.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 00:30:58 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Fri, 13 Jan 2006 19:30:58 -0500
Subject: rpms/repoview/FC-4 .cvsignore, 1.4, 1.5 repoview.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200601140031.k0E0VVTH023207@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/repoview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23164/FC-4

Modified Files:
	.cvsignore repoview.spec sources 
Log Message:
Version 0.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/repoview/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Oct 2005 18:13:55 -0000	1.4
+++ .cvsignore	14 Jan 2006 00:30:57 -0000	1.5
@@ -1 +1 @@
-repoview-0.4.1.tar.gz
+repoview-0.5.tar.gz


Index: repoview.spec
===================================================================
RCS file: /cvs/extras/rpms/repoview/FC-4/repoview.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repoview.spec	9 Oct 2005 18:13:55 -0000	1.4
+++ repoview.spec	14 Jan 2006 00:30:57 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           repoview
-Version:        0.4.1
+Version:        0.5
 Release:        1%{?dist}
 Summary:        Creates a set of static HTML pages in a yum repository
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Fri Jan 13 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 0.5-1
+- Version 0.5
+
 * Sun Oct 09 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 0.4.1-1
 - Version 0.4.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/repoview/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Oct 2005 18:13:55 -0000	1.4
+++ sources	14 Jan 2006 00:30:57 -0000	1.5
@@ -1 +1 @@
-c72b8c46579b49679dd751f7bc174a75  repoview-0.4.1.tar.gz
+d113c06a124029660c7436cc06563482  repoview-0.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:27:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:27:12 -0500
Subject: rpms/perl-Module-Refresh/FC-3 .cvsignore, 1.3,
	1.4 perl-Module-Refresh.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601140327.k0E3RirJ028882@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827/FC-3

Modified Files:
	.cvsignore perl-Module-Refresh.spec sources 
Log Message:
upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2005 13:07:19 -0000	1.3
+++ .cvsignore	14 Jan 2006 03:27:11 -0000	1.4
@@ -1 +1 @@
-Module-Refresh-0.08.tar.gz
+Module-Refresh-0.09.tar.gz


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/perl-Module-Refresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Refresh.spec	2 Nov 2005 13:07:19 -0000	1.2
+++ perl-Module-Refresh.spec	14 Jan 2006 03:27:11 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Module-Refresh
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Refresh %INC files when updated on disk
 License: 	GPL or Artistic
@@ -44,11 +44,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
-* Sat Aug 27 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-2
-- Spec cleanup.
-
-* Thu Aug 11 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-1
-- FE submission.
+* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2005 13:07:19 -0000	1.3
+++ sources	14 Jan 2006 03:27:11 -0000	1.4
@@ -1 +1 @@
-32303a4ba13a84fba61caaa706e7014a  Module-Refresh-0.08.tar.gz
+f6168601b3be9cf59c0ed1698df954a6  Module-Refresh-0.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:27:18 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:27:18 -0500
Subject: rpms/perl-Module-Refresh/FC-4 .cvsignore, 1.3,
	1.4 perl-Module-Refresh.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601140327.k0E3Ros1028887@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827/FC-4

Modified Files:
	.cvsignore perl-Module-Refresh.spec sources 
Log Message:
upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2005 13:08:05 -0000	1.3
+++ .cvsignore	14 Jan 2006 03:27:18 -0000	1.4
@@ -1 +1 @@
-Module-Refresh-0.08.tar.gz
+Module-Refresh-0.09.tar.gz


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/perl-Module-Refresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Refresh.spec	2 Nov 2005 13:08:05 -0000	1.2
+++ perl-Module-Refresh.spec	14 Jan 2006 03:27:18 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Module-Refresh
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Refresh %INC files when updated on disk
 License: 	GPL or Artistic
@@ -44,11 +44,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
-* Sat Aug 27 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-2
-- Spec cleanup.
-
-* Thu Aug 11 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-1
-- FE submission.
+* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2005 13:08:05 -0000	1.3
+++ sources	14 Jan 2006 03:27:18 -0000	1.4
@@ -1 +1 @@
-32303a4ba13a84fba61caaa706e7014a  Module-Refresh-0.08.tar.gz
+f6168601b3be9cf59c0ed1698df954a6  Module-Refresh-0.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:27:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:27:24 -0500
Subject: rpms/perl-Module-Refresh/devel .cvsignore, 1.3,
	1.4 perl-Module-Refresh.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601140327.k0E3RuMJ028892@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827/devel

Modified Files:
	.cvsignore perl-Module-Refresh.spec sources 
Log Message:
upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Nov 2005 13:08:16 -0000	1.3
+++ .cvsignore	14 Jan 2006 03:27:24 -0000	1.4
@@ -1 +1 @@
-Module-Refresh-0.08.tar.gz
+Module-Refresh-0.09.tar.gz


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Module-Refresh.spec	2 Nov 2005 13:08:16 -0000	1.2
+++ perl-Module-Refresh.spec	14 Jan 2006 03:27:24 -0000	1.3
@@ -1,5 +1,5 @@
 Name: 		perl-Module-Refresh
-Version: 	0.08
+Version: 	0.09
 Release: 	1%{?dist}
 Summary: 	Refresh %INC files when updated on disk
 License: 	GPL or Artistic
@@ -44,11 +44,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
-* Sat Aug 27 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-2
-- Spec cleanup.
-
-* Thu Aug 11 2005 Ralf Corsepius <ralf at links2linux.de> - 0.06-1
-- FE submission.
+* Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Nov 2005 13:08:16 -0000	1.3
+++ sources	14 Jan 2006 03:27:24 -0000	1.4
@@ -1 +1 @@
-32303a4ba13a84fba61caaa706e7014a  Module-Refresh-0.08.tar.gz
+f6168601b3be9cf59c0ed1698df954a6  Module-Refresh-0.09.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 03:46:55 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:46:55 -0500
Subject: rpms/perl-Module-Refresh/devel perl-Module-Refresh.spec,1.3,1.4
Message-ID: <200601140347.k0E3lRKA029082@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29035/devel

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
I love changelogs ;)


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/devel/perl-Module-Refresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Refresh.spec	14 Jan 2006 03:27:24 -0000	1.3
+++ perl-Module-Refresh.spec	14 Jan 2006 03:46:55 -0000	1.4
@@ -44,7 +44,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
 * Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1



From fedora-extras-commits at redhat.com  Sat Jan 14 03:47:01 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:47:01 -0500
Subject: rpms/perl-Module-Refresh/FC-3 perl-Module-Refresh.spec,1.3,1.4
Message-ID: <200601140347.k0E3lXM8029085@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29035/FC-3

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
I love changelogs ;)


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-3/perl-Module-Refresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Refresh.spec	14 Jan 2006 03:27:11 -0000	1.3
+++ perl-Module-Refresh.spec	14 Jan 2006 03:47:01 -0000	1.4
@@ -44,7 +44,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
 * Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1



From fedora-extras-commits at redhat.com  Sat Jan 14 03:47:07 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 13 Jan 2006 22:47:07 -0500
Subject: rpms/perl-Module-Refresh/FC-4 perl-Module-Refresh.spec,1.3,1.4
Message-ID: <200601140347.k0E3ld4F029088@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Module-Refresh/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29035/FC-4

Modified Files:
	perl-Module-Refresh.spec 
Log Message:
I love changelogs ;)


Index: perl-Module-Refresh.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Refresh/FC-4/perl-Module-Refresh.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Module-Refresh.spec	14 Jan 2006 03:27:18 -0000	1.3
+++ perl-Module-Refresh.spec	14 Jan 2006 03:47:07 -0000	1.4
@@ -44,7 +44,7 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jan 02 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 
 * Wed Nov 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 0.08-1



From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:02 -0500
Subject: rpms/wine-docs - New directory
Message-ID: <200601140816.k0E8G4BD006240@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6228/wine-docs

Log Message:
Directory /cvs/extras/rpms/wine-docs added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:08 -0500
Subject: rpms/wine-docs/devel - New directory
Message-ID: <200601140816.k0E8GAQr006262@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6228/wine-docs/devel

Log Message:
Directory /cvs/extras/rpms/wine-docs/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:28 -0500
Subject: rpms/wine-docs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601140816.k0E8GU0L006321@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6305

Added Files:
	Makefile import.log 
Log Message:
Setup of module wine-docs


--- NEW FILE Makefile ---
# Top level Makefile for module wine-docs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 08:16:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:16:34 -0500
Subject: rpms/wine-docs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601140816.k0E8GaC5006349@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6305/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wine-docs


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 08:17:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:17:21 -0500
Subject: rpms/wine-docs import.log,1.1,1.2
Message-ID: <200601140817.k0E8Hs1w006528@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6442

Modified Files:
	import.log 
Log Message:
auto-import wine-docs-0.9.5-2 on branch devel from wine-docs-0.9.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 08:16:28 -0000	1.1
+++ import.log	14 Jan 2006 08:17:21 -0000	1.2
@@ -0,0 +1 @@
+wine-docs-0_9_5-2:HEAD:wine-docs-0.9.5-2.src.rpm:1137226632



From fedora-extras-commits at redhat.com  Sat Jan 14 08:17:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:17:27 -0500
Subject: rpms/wine-docs/devel wine-docs.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601140817.k0E8HxqV006539@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6442/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wine-docs.spec 
Log Message:
auto-import wine-docs-0.9.5-2 on branch devel from wine-docs-0.9.5-2.src.rpm


--- NEW FILE wine-docs.spec ---
Name:           wine-docs
Version:        0.9.5
Release:        2
Summary:        Documentation for wine

Group:          Documentation
License:        LGPL
URL:            http://www.winehq.org
Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  docbook-utils-pdf
BuildRequires:  openjade

%description
This package is Wine's documentation repository. It consists of 
various guides and their translations.

%prep
%setup -q


%build
./configure
make


%install
rm -rf $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB

%changelog
* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.5-2
- fix license field
- include license as doc

* Fri Jan 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.5-1
- version upgrade

* Sat Dec 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.4-1
- version upgrade

* Mon Dec 12 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.3-1
- version upgrade

* Tue Nov 29 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.9.2-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 08:16:33 -0000	1.1
+++ .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
@@ -0,0 +1 @@
+wine-docs-0.9.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 08:16:33 -0000	1.1
+++ sources	14 Jan 2006 08:17:27 -0000	1.2
@@ -0,0 +1 @@
+0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 08:25:18 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:25:18 -0500
Subject: rpms/wine-docs/devel wine-docs.spec,1.1,1.2
Message-ID: <200601140825.k0E8Po8p007263@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7187

Modified Files:
	wine-docs.spec 
Log Message:
- add dist



Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-docs.spec	14 Jan 2006 08:17:27 -0000	1.1
+++ wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wine-docs
 Version:        0.9.5
-Release:        2
+Release:        3%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
@@ -38,6 +38,10 @@
 
 %changelog
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.5-3
+- add dist
+
+* Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix license field
 - include license as doc



From fedora-extras-commits at redhat.com  Sat Jan 14 08:43:14 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 14 Jan 2006 03:43:14 -0500
Subject: owners owners.list,1.528,1.529
Message-ID: <200601140843.k0E8hl1L008804@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8721

Modified Files:
	owners.list 
Log Message:
- add wine-docs



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.528
retrieving revision 1.529
diff -u -r1.528 -r1.529
--- owners.list	12 Jan 2006 17:11:29 -0000	1.528
+++ owners.list	14 Jan 2006 08:43:14 -0000	1.529
@@ -1271,6 +1271,7 @@
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wmacpi|Dockapp for laptop acpi/apm information|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmapmload|Wmapmload monitors your apm status in an lcd display fashion|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 13:59:43 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sat, 14 Jan 2006 08:59:43 -0500
Subject: rpms/gstreamer-python/FC-4 .cvsignore, 1.3,
	1.4 gstreamer-python.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200601141400.k0EE0FqP018866@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer-python/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18832

Modified Files:
	.cvsignore gstreamer-python.spec sources 
Log Message:
updating to new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Feb 2005 18:47:33 -0000	1.3
+++ .cvsignore	14 Jan 2006 13:59:42 -0000	1.4
@@ -1 +1 @@
-gst-python-0.8.1.tar.bz2
+gst-python-0.8.3.tar.bz2


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/gstreamer-python.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gstreamer-python.spec	19 May 2005 15:46:32 -0000	1.8
+++ gstreamer-python.spec	14 Jan 2006 13:59:42 -0000	1.9
@@ -3,8 +3,8 @@
 %define         gstreamer       gstreamer
 
 Name:           %{gstreamer}-python
-Version:        0.8.1
-Release:        6
+Version:        0.8.3
+Release:        1
 Summary:        Python bindings for GStreamer.
 
 Group:          Development/Languages
@@ -15,8 +15,8 @@
 
 Requires:       python >= 2
 Requires:       pygtk2 >= 2.4.0
-Requires:       %{gstreamer} >= %{_gst_minver}
-Requires:       %{gstreamer}-plugins >= %{_gstp_minver}
+Requires:       %{gstreamer} >= %{gst_minver}
+Requires:       %{gstreamer}-plugins >= %{gstp_minver}
 
 BuildRequires:  python >= 2
 BuildRequires:  python-devel >= 2
@@ -25,8 +25,8 @@
 # xwindowlistener needs X11 headers
 BuildRequires:  XFree86-devel
 
-BuildRequires:  %{gstreamer}-devel >= %{_gst_minver}
-BuildRequires:  %{gstreamer}-plugins-devel >= %{_gstp_minver}
+BuildRequires:  %{gstreamer}-devel >= %{gst_minver}
+BuildRequires:  %{gstreamer}-plugins-devel >= %{gstp_minver}
 
 # sigh, libtool
 BuildRequires:  gcc-c++
@@ -53,11 +53,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-# The __init__.py* files go into lib instead of lib64, so fix that
-if [ "%{_lib}" != "lib" ]; then
-    %{__mv} %{buildroot}%{_prefix}/lib/python?.?/site-packages/gst/__init__.* \
-            %{buildroot}%{_libdir}/python?.?/site-packages/gst/
-fi
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
@@ -76,6 +71,11 @@
 %{_libdir}/pkgconfig/gst-python-0.8.pc
 
 %changelog
+* Sat Jan 14 2006 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.3-1
+- fix requires and buildrequires which were using an underscore
+- update to 0.8.3 version
+- remove the lib64 hack, should be fixed upstream now
+
 * Thu May 19 2005 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.1-6
 - disable docs build - they're already in the tarball
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Feb 2005 18:47:33 -0000	1.3
+++ sources	14 Jan 2006 13:59:42 -0000	1.4
@@ -1 +1 @@
-4a7e23b885c6ec8a7d300714f2106ba2  gst-python-0.8.1.tar.bz2
+f33f6b95d3911e7ad355199abea8d0ff  gst-python-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 14:17:52 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sat, 14 Jan 2006 09:17:52 -0500
Subject: rpms/abiword/devel abiword.spec,1.27,1.28
Message-ID: <200601141418.k0EEIOHv020620@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20603

Modified Files:
	abiword.spec 
Log Message:
Remove redundant requires




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- abiword.spec	5 Jan 2006 15:00:16 -0000	1.27
+++ abiword.spec	14 Jan 2006 14:17:51 -0000	1.28
@@ -3,17 +3,12 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
 Source: http://www.abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.bz2
 Source11: abiword.mime
-Requires: libwmf >= 0.2.8.3
-Requires: libxml2 >= 2.6.8
-Requires: aiksaurus-gtk >= 1.2.1
-Requires: libgnomedb >= 1.0.4
-Requires: enchant
 Requires: mathml-fonts
 PreReq: desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -141,6 +136,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sat Jan 14 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-3.fc5
+- Remove redundant requires - bug 177305
+
 * Thu Jan 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc5
 - Bump release, forgot to add desktop patch
 



From fedora-extras-commits at redhat.com  Sat Jan 14 17:44:11 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sat, 14 Jan 2006 12:44:11 -0500
Subject: rpms/denyhosts/FC-4 denyhosts-1.1.4-config.patch, NONE,
	1.1 denyhosts.spec, 1.6, 1.7 sources, 1.7,
	1.8 denyhosts-1.1.3-config.patch, 1.1, NONE
Message-ID: <200601141744.k0EHihQV026382@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26360

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-1.1.4-config.patch 
Removed Files:
	denyhosts-1.1.3-config.patch 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
- Clean up %post script; just call condrestart and don't bother with
  the call to --upgrade099.

* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
- Update to 1.1.4.


denyhosts-1.1.4-config.patch:

--- NEW FILE denyhosts-1.1.4-config.patch ---
--- denyhosts.cfg-dist.orig	2005-12-16 16:45:05.000000000 -0600
+++ denyhosts.cfg-dist	2006-01-13 10:56:34.762167881 -0600
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
 #######################################################################
 
 
@@ -115,7 +120,7 @@
 # Note: it is recommended that you use an absolute pathname
 # for this value (eg. /home/foo/denyhosts/data)
 #
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 
@@ -178,7 +183,7 @@
 # match your email address.  If you do not want to receive these reports
 # leave this field blank (or run with the --noemail option)
 #
-ADMIN_EMAIL = 
+ADMIN_EMAIL = root
 #
 #######################################################################
 


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- denyhosts.spec	21 Nov 2005 23:23:12 -0000	1.6
+++ denyhosts.spec	14 Jan 2006 17:44:10 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        1.1.3
-release:	1%{?dist}
+Version:        1.1.4
+release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -13,7 +13,7 @@
 Source4:	denyhosts.sysconfig
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
-Patch0:		denyhosts-1.1.3-config.patch
+Patch0:		denyhosts-1.1.4-config.patch
 Patch1:		denyhosts-0.9.8-setup.patch
 Patch2:		denyhosts-1.0.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,13 +82,7 @@
 # sure that all of the hosts.deny entries were created by denyhosts
 %post
 /sbin/chkconfig --add denyhosts
-
-RUNNING=`/sbin/service denyhosts status | grep "is running"`
-/sbin/service denyhosts stop > /dev/null 2>&1 || :
-%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || :
-if [ -n "$RUNNING" ]; then
-  /sbin/service denyhosts start > /dev/null 2>&1
-fi
+/sbin/service denyhosts condrestart
 exit 0
 
 
@@ -125,6 +119,13 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
+- Clean up %post script; just call condrestart and don't bother with
+  the call to --upgrade099.
+
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
+- Update to 1.1.4.
+
 * Fri Nov 18 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.3-1
 - Update to 1.1.3
 - Update README.fedora to document what the package currently does.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2005 23:23:12 -0000	1.7
+++ sources	14 Jan 2006 17:44:10 -0000	1.8
@@ -1 +1 @@
-bacc9e55a17572b832a19035129f7c12  DenyHosts-1.1.3.tar.gz
+f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz


--- denyhosts-1.1.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 14 17:47:12 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sat, 14 Jan 2006 12:47:12 -0500
Subject: rpms/denyhosts/FC-3 denyhosts-1.1.4-config.patch, NONE,
	1.1 denyhosts.spec, 1.6, 1.7 sources, 1.7,
	1.8 denyhosts-1.1.3-config.patch, 1.1, NONE
Message-ID: <200601141747.k0EHljOf026465@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26443

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-1.1.4-config.patch 
Removed Files:
	denyhosts-1.1.3-config.patch 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
- Clean up %post script; just call condrestart and don't bother with
  the call to --upgrade099.

* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
- Update to 1.1.4.


denyhosts-1.1.4-config.patch:

--- NEW FILE denyhosts-1.1.4-config.patch ---
--- denyhosts.cfg-dist.orig	2005-12-16 16:45:05.000000000 -0600
+++ denyhosts.cfg-dist	2006-01-13 10:56:34.762167881 -0600
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
 #######################################################################
 
 
@@ -115,7 +120,7 @@
 # Note: it is recommended that you use an absolute pathname
 # for this value (eg. /home/foo/denyhosts/data)
 #
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 
@@ -178,7 +183,7 @@
 # match your email address.  If you do not want to receive these reports
 # leave this field blank (or run with the --noemail option)
 #
-ADMIN_EMAIL = 
+ADMIN_EMAIL = root
 #
 #######################################################################
 


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- denyhosts.spec	21 Nov 2005 23:21:10 -0000	1.6
+++ denyhosts.spec	14 Jan 2006 17:47:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        1.1.3
-release:	1%{?dist}
+Version:        1.1.4
+release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -13,7 +13,7 @@
 Source4:	denyhosts.sysconfig
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
-Patch0:		denyhosts-1.1.3-config.patch
+Patch0:		denyhosts-1.1.4-config.patch
 Patch1:		denyhosts-0.9.8-setup.patch
 Patch2:		denyhosts-1.0.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -82,13 +82,7 @@
 # sure that all of the hosts.deny entries were created by denyhosts
 %post
 /sbin/chkconfig --add denyhosts
-
-RUNNING=`/sbin/service denyhosts status | grep "is running"`
-/sbin/service denyhosts stop > /dev/null 2>&1 || :
-%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || :
-if [ -n "$RUNNING" ]; then
-  /sbin/service denyhosts start > /dev/null 2>&1
-fi
+/sbin/service denyhosts condrestart
 exit 0
 
 
@@ -125,6 +119,13 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
+- Clean up %post script; just call condrestart and don't bother with
+  the call to --upgrade099.
+
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
+- Update to 1.1.4.
+
 * Fri Nov 18 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.3-1
 - Update to 1.1.3
 - Update README.fedora to document what the package currently does.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Nov 2005 23:21:10 -0000	1.7
+++ sources	14 Jan 2006 17:47:12 -0000	1.8
@@ -1 +1 @@
-bacc9e55a17572b832a19035129f7c12  DenyHosts-1.1.3.tar.gz
+f4b9beb55cc36ab44fb7fe0c96210734  DenyHosts-1.1.4.tar.gz


--- denyhosts-1.1.3-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 14 17:49:50 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Sat, 14 Jan 2006 12:49:50 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.19,1.20
Message-ID: <200601141750.k0EHoNc1026531@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26514

Modified Files:
	denyhosts.spec 
Log Message:
* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
- Clean up %post script; just call condrestart and don't bother with
  the call to --upgrade099.



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- denyhosts.spec	13 Jan 2006 16:58:26 -0000	1.19
+++ denyhosts.spec	14 Jan 2006 17:49:50 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	1%{?dist}
+release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -82,13 +82,7 @@
 # sure that all of the hosts.deny entries were created by denyhosts
 %post
 /sbin/chkconfig --add denyhosts
-
-RUNNING=`/sbin/service denyhosts status | grep "is running"`
-/sbin/service denyhosts stop > /dev/null 2>&1 || :
-%{_bindir}/denyhosts.py -c /etc/denyhosts.conf --upgrade099 > /dev/null 2>&1 || :
-if [ -n "$RUNNING" ]; then
-  /sbin/service denyhosts start > /dev/null 2>&1
-fi
+/sbin/service denyhosts condrestart
 exit 0
 
 
@@ -125,6 +119,10 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
+- Clean up %post script; just call condrestart and don't bother with
+  the call to --upgrade099.
+
 * Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-1
 - Update to 1.1.4.
 



From fedora-extras-commits at redhat.com  Sat Jan 14 18:05:33 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:05:33 -0500
Subject: rpms/python-sqlite2 - New directory
Message-ID: <200601141805.k0EI5ZTA028326@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318/python-sqlite2

Log Message:
Directory /cvs/extras/rpms/python-sqlite2 added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 18:05:57 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:05:57 -0500
Subject: rpms/python-sqlite2/devel - New directory
Message-ID: <200601141805.k0EI5xLf028341@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318/python-sqlite2/devel

Log Message:
Directory /cvs/extras/rpms/python-sqlite2/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 18:07:46 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:07:46 -0500
Subject: rpms/python-sqlite2/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601141807.k0EI7m3c028393@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28363/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-sqlite2


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 18:07:27 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:07:27 -0500
Subject: rpms/python-sqlite2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601141807.k0EI7TGO028375@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28363

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-sqlite2


--- NEW FILE Makefile ---
# Top level Makefile for module python-sqlite2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 18:10:10 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:10:10 -0500
Subject: rpms/python-sqlite2/devel python-sqlite2.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601141810.k0EIAgEW028467@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28430/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-sqlite2.spec 
Log Message:
auto-import python-sqlite2-2.0.5-2 on branch devel from python-sqlite2-2.0.5-2.src.rpm


--- NEW FILE python-sqlite2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           python-sqlite2
Version:        2.0.5
Release:        2%{?dist}
Summary:        DB-API 2.0 interface for SQLite 3.x

Group:          Development/Languages
License:        zlib/libpng
URL:            http://pysqlite.org/
Source0:        http://initd.org/pub/software/pysqlite/releases/2.0/%{version}/pysqlite-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  dos2unix
BuildRequires:  python-devel
BuildRequires:  sqlite-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
pysqlite is an interface to the SQLite 3.x embedded relational database
engine. It is almost fully compliant with the Python database API version
2.0 also exposes the unique features of SQLite.


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


%build
CFLAGS="%{optflags}" %{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
%{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
%{__rm} documentation/install-source.{html,txt}
%{__rm} documentation/usage-guide.txt
dos2unix documentation/{silvercity.css,code/*}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc LICENSE documentation/*
%{_bindir}/test-pysqlite
%dir %{python_sitearch}/pysqlite2
%{python_sitearch}/pysqlite2/__init__.py
%{python_sitearch}/pysqlite2/__init__.pyc
%{python_sitearch}/pysqlite2/dbapi2.py
%{python_sitearch}/pysqlite2/dbapi2.pyc
%{python_sitearch}/pysqlite2/_sqlite.so
%dir %{python_sitearch}/pysqlite2/test
%{python_sitearch}/pysqlite2/test/dbapi.py
%{python_sitearch}/pysqlite2/test/dbapi.pyc
%{python_sitearch}/pysqlite2/test/factory.py
%{python_sitearch}/pysqlite2/test/factory.pyc
%{python_sitearch}/pysqlite2/test/__init__.py
%{python_sitearch}/pysqlite2/test/__init__.pyc
%{python_sitearch}/pysqlite2/test/transactions.py
%{python_sitearch}/pysqlite2/test/transactions.pyc
%{python_sitearch}/pysqlite2/test/types.py
%{python_sitearch}/pysqlite2/test/types.pyc
%{python_sitearch}/pysqlite2/test/userfunctions.py
%{python_sitearch}/pysqlite2/test/userfunctions.pyc
%ghost %{python_sitearch}/pysqlite2/__init__.pyo
%ghost %{python_sitearch}/pysqlite2/dbapi2.pyo
%ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo
%ghost %{python_sitearch}/pysqlite2/test/factory.pyo
%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
%ghost %{python_sitearch}/pysqlite2/test/transactions.pyo
%ghost %{python_sitearch}/pysqlite2/test/types.pyo
%ghost %{python_sitearch}/pysqlite2/test/userfunctions.pyo


%changelog
* Sat Jan 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.0.5-2
- Fix missing BR: sqlite-devel (Chris Chabot, #176653)

* Wed Dec 28 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.0.5-1
- Initial RPM release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 18:07:46 -0000	1.1
+++ .cvsignore	14 Jan 2006 18:10:09 -0000	1.2
@@ -0,0 +1 @@
+pysqlite-2.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 18:07:46 -0000	1.1
+++ sources	14 Jan 2006 18:10:09 -0000	1.2
@@ -0,0 +1 @@
+574bbb4f7b3a077506689cbab0d9bf7f  pysqlite-2.0.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 18:09:52 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:09:52 -0500
Subject: rpms/python-sqlite2 import.log,1.1,1.2
Message-ID: <200601141811.k0EIB0fr028470@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28430

Modified Files:
	import.log 
Log Message:
auto-import python-sqlite2-2.0.5-2 on branch devel from python-sqlite2-2.0.5-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 18:07:26 -0000	1.1
+++ import.log	14 Jan 2006 18:09:52 -0000	1.2
@@ -0,0 +1 @@
+python-sqlite2-2_0_5-2:HEAD:python-sqlite2-2.0.5-2.src.rpm:1137262264



From fedora-extras-commits at redhat.com  Sat Jan 14 18:19:55 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sat, 14 Jan 2006 13:19:55 -0500
Subject: owners owners.list,1.529,1.530
Message-ID: <200601141820.k0EIKRPe028604@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28585

Modified Files:
	owners.list 
Log Message:
Added python-sqlite2



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- owners.list	14 Jan 2006 08:43:14 -0000	1.529
+++ owners.list	14 Jan 2006 18:19:54 -0000	1.530
@@ -1050,6 +1050,7 @@
 Fedora Extras|python-simpletal|Alternative implementation of Zope Page Templates|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-simpy|Python simulation framework|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlite|Python bindings for SQLite|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-sqlite2|DB-API 2.0 interface for SQLite 3.x|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-sqlobject|SQLObject is an object-relational mapper for python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-tpg|Toy Parser Generator|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-twisted|Event-driven networking framework written in Python|thomas at apestaart.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 19:08:36 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:08:36 -0500
Subject: owners owners.list,1.530,1.531
Message-ID: <200601141909.k0EJ9YHj030496@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30477

Modified Files:
	owners.list 
Log Message:
Added libtorrent entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -r1.530 -r1.531
--- owners.list	14 Jan 2006 18:19:54 -0000	1.530
+++ owners.list	14 Jan 2006 19:08:36 -0000	1.531
@@ -558,6 +558,7 @@
 Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtorrent|BitTorrent library with a focus on high performance & good code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libtunepimp|A library for creating MusicBrainz enabled tagging applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 19:11:49 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:11:49 -0500
Subject: rpms/libtorrent - New directory
Message-ID: <200601141911.k0EJBpuY030556@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30548/libtorrent

Log Message:
Directory /cvs/extras/rpms/libtorrent added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 19:11:55 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:11:55 -0500
Subject: rpms/libtorrent/devel - New directory
Message-ID: <200601141911.k0EJBvh9030571@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30548/libtorrent/devel

Log Message:
Directory /cvs/extras/rpms/libtorrent/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 19:13:20 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:13:20 -0500
Subject: rpms/libtorrent Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601141913.k0EJDcjx030608@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30593

Added Files:
	Makefile import.log 
Log Message:
Setup of module libtorrent


--- NEW FILE Makefile ---
# Top level Makefile for module libtorrent
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 19:13:54 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:13:54 -0500
Subject: rpms/libtorrent/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601141913.k0EJDus4030641@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30593/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libtorrent


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 19:15:06 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:15:06 -0500
Subject: rpms/libtorrent import.log,1.1,1.2
Message-ID: <200601141915.k0EJFc7l030733@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699

Modified Files:
	import.log 
Log Message:
auto-import libtorrent-0.8.2-2 on branch devel from libtorrent-0.8.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 19:13:03 -0000	1.1
+++ import.log	14 Jan 2006 19:15:05 -0000	1.2
@@ -0,0 +1 @@
+libtorrent-0_8_2-2:HEAD:libtorrent-0.8.2-2.src.rpm:1137266104



From fedora-extras-commits at redhat.com  Sat Jan 14 19:15:12 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 14:15:12 -0500
Subject: rpms/libtorrent/devel libtorrent.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601141915.k0EJFk4r030737@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/libtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30699/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libtorrent.spec 
Log Message:
auto-import libtorrent-0.8.2-2 on branch devel from libtorrent-0.8.2-2.src.rpm


--- NEW FILE libtorrent.spec ---
Name:          libtorrent
License:       GPL
Group:         System Environment/Libraries
Version:       0.8.2
Release:       2%{?dist}
Summary:       BitTorrent library with a focus on high performance & good code
URL:           http://libtorrent.rakshasa.no/
Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig, openssl-devel, libsigc++20-devel

%description
LibTorrent is a BitTorrent library written in C++ for *nix, with a focus 
on high performance and good code. The library differentiates itself 
from other implementations by transfering directly from file pages to 
the network stack. On high-bandwidth connections it is able to seed at 
3 times the speed of the official client.

%package devel
Summary: Libtorrent development environment
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Header and library definition files for developing applications                                               
with the libtorrent libraries.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README NEWS TODO
%{_libdir}/libtorrent.so.*

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

%changelog
* Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.8.2-2
- Improved general summary & devel package description 
- Simplified devel package includedir files section
- Removed openssl as requires, its implied by .so dependency
- Correct devel package Group

* Wed Jan 11 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.8.2-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 19:13:38 -0000	1.1
+++ .cvsignore	14 Jan 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+libtorrent-0.8.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libtorrent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 19:13:38 -0000	1.1
+++ sources	14 Jan 2006 19:15:11 -0000	1.2
@@ -0,0 +1 @@
+c1f7bf1b34cbfca252becf9ff734d112  libtorrent-0.8.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 19:34:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 14 Jan 2006 14:34:32 -0500
Subject: rpms/lirc/devel .cvsignore, 1.8, 1.9 lirc.spec, 1.12, 1.13 sources, 
	1.8, 1.9
Message-ID: <200601141935.k0EJZ5ZX031245@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31224

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
- 0.8.0pre4.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Jan 2006 18:42:40 -0000	1.8
+++ .cvsignore	14 Jan 2006 19:34:32 -0000	1.9
@@ -1 +1 @@
-lirc-0.8.0pre3.tar.bz2
+lirc-0.8.0pre4.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- lirc.spec	1 Jan 2006 18:42:40 -0000	1.12
+++ lirc.spec	14 Jan 2006 19:34:32 -0000	1.13
@@ -10,14 +10,14 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre3%{?dist}
+Release:        0.2.pre4%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre3.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre4.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre3
+%setup -q -n %{name}-%{version}pre4
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +139,9 @@
 
 
 %changelog
+* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
+- 0.8.0pre4.
+
 * Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
 - 0.8.0pre3.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Jan 2006 18:42:40 -0000	1.8
+++ sources	14 Jan 2006 19:34:32 -0000	1.9
@@ -1 +1 @@
-c20cf756b0b5cad96437bc25e81b166a  lirc-0.8.0pre3.tar.bz2
+8e69494b32a14d7513499bd7d4a350d2  lirc-0.8.0pre4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:14 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:14 -0500
Subject: rpms/rtorrent - New directory
Message-ID: <200601142128.k0ELSGKw002608@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2600/rtorrent

Log Message:
Directory /cvs/extras/rpms/rtorrent added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:20 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:20 -0500
Subject: rpms/rtorrent/devel - New directory
Message-ID: <200601142128.k0ELSMxN002623@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2600/rtorrent/devel

Log Message:
Directory /cvs/extras/rpms/rtorrent/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:48 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:48 -0500
Subject: rpms/rtorrent Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601142128.k0ELSpVE002659@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2647

Added Files:
	Makefile import.log 
Log Message:
Setup of module rtorrent


--- NEW FILE Makefile ---
# Top level Makefile for module rtorrent
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 14 21:28:55 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:28:55 -0500
Subject: rpms/rtorrent/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601142128.k0ELSvXc002679@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2647/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rtorrent


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 14 21:29:59 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:29:59 -0500
Subject: rpms/rtorrent import.log,1.1,1.2
Message-ID: <200601142130.k0ELUWeV002773@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2720

Modified Files:
	import.log 
Log Message:
auto-import rtorrent-0.4.2-2 on branch devel from rtorrent-0.4.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	14 Jan 2006 21:28:48 -0000	1.1
+++ import.log	14 Jan 2006 21:29:59 -0000	1.2
@@ -0,0 +1 @@
+rtorrent-0_4_2-2:HEAD:rtorrent-0.4.2-2.src.rpm:1137274197



From fedora-extras-commits at redhat.com  Sat Jan 14 21:30:05 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:30:05 -0500
Subject: owners owners.list,1.531,1.532
Message-ID: <200601142130.k0ELUbLY002776@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2733

Modified Files:
	owners.list 
Log Message:
Added rtorrent


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- owners.list	14 Jan 2006 19:08:36 -0000	1.531
+++ owners.list	14 Jan 2006 21:30:04 -0000	1.532
@@ -1104,6 +1104,7 @@
 Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
@@ -1368,4 +1369,3 @@
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
-



From fedora-extras-commits at redhat.com  Sat Jan 14 21:30:06 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:30:06 -0500
Subject: rpms/rtorrent/devel rtorrent.rc.example, NONE, 1.1 rtorrent.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601142130.k0ELUcjC002780@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2720/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rtorrent.rc.example rtorrent.spec 
Log Message:
auto-import rtorrent-0.4.2-2 on branch devel from rtorrent-0.4.2-2.src.rpm


--- NEW FILE rtorrent.rc.example ---
# This is an example resource file for rTorrent. Copy to
# ~/.rtorrent.rc and enable/modify the options as needed. Remember to
# uncomment the options you wish to enable.

# Maximum and minimum number of peers to connect to per torrent.
#min_peers = 40
#max_peers = 100

# Maximum number of simultanious uploads per torrent.
#max_uploads = 15

# Global upload and download rate in KiB. "0" for unlimited.
#download_rate = 0
#upload_rate = 0

# Default directory to save the downloaded torrents.
#directory = ./

# Default session directory. Make sure you don't run multiple instance
# of rtorrent using the same session directory. Perhaps using a
# relative path?
#session = ./session

# Watch a directory for new torrents, and stop those that have been
# deleted.
#schedule = watch_directory,5,5,load_start=./watch/*.torrent
#schedule = untied_directory,5,5,stop_untied=

# The ip address reported to the tracker.
#ip = rakshasa

# The ip address the listening socket and outgoing connections is
# bound to.
#bind = rakshasa

# Port range to use for listening.
#port_range = 6890-6999

# Start opening ports at a random position within the port range.
#port_random = no

# Check hash for finished torrents. Might be usefull until the bug is
# fixed that causes lack of diskspace not to be properly reported.
#check_hash = no

# Set whetever the client should try to connect to UDP trackers.
#use_udp_trackers = yes

# Alternative calls to bind and ip that should handle dynamic ip's.
#schedule = ip_tick,0,1800,ip=rakshasa
#schedule = bind_tick,0,1800,bind=rakshasa

#
# Do not modify the following parameters unless you know what you're doing.
#

# Hash read-ahead controls how many MB to request the kernel to read
# ahead. If the value is too low the disk may not be fully utilized,
# while if too high the kernel might not be able to keep the read
# pages in memory thus end up trashing.
#hash_read_ahead = 10

# Interval between attempts to check the hash, in milliseconds.
#hash_interval = 100

# Number of attempts to check the hash while using the mincore status,
# before forcing. Overworked systems might need lower values to get a
# decent hash checking rate.
#hash_max_tries = 10

# Max number of files to keep open simultaniously.
#max_open_files = 128

# Number of sockets to simultaneously keep open.
#max_open_sockets = <no default>


# Example of scheduling commands: Switch between two ip's every 5
# seconds.
#schedule = "ip_tick1,5,10,ip=torretta"
#schedule = "ip_tick2,10,10,ip=lampedusa"

# Remove a scheduled event.
#schedule_remove = "ip_tick1"


--- NEW FILE rtorrent.spec ---
Name:          rtorrent
License:       GPL
Group:         Applications/Internet
Version:       0.4.2
Release:       2%{?dist}
Summary:       BitTorrent client based on libtorrent 
URL:           http://rtorrent.rakshasa.no/
Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
Source1:       rtorrent.rc.example
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.8.2, curl-devel

%description
A BitTorrent client using libtorrent, which on high-bandwidth connections is 
able to seed at 3 times the speed of the official client. Using
ncurses its ideal for use with screen or dtach. It supports 
saving of sessions and allows the user to add and remove torrents and scanning
of directories for torrent files to seed and/or download.

%prep
%setup -q

%build
install -m 644 %{SOURCE1} .
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall

%clean
rm -rf $RPM_BUILD_ROOT
		  
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING INSTALL README TODO rtorrent.rc.example 
%{_bindir}/rtorrent
%{_mandir}/man1/rtorrent*

%changelog
* Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-2
- Improved summary & description
- Removed explicit requires, leaving to rpm
- Changed mode of rtorrent.rc.example to 644

* Wed Jan 11 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-1
- Initial version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	14 Jan 2006 21:28:54 -0000	1.1
+++ .cvsignore	14 Jan 2006 21:30:05 -0000	1.2
@@ -0,0 +1 @@
+rtorrent-0.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	14 Jan 2006 21:28:54 -0000	1.1
+++ sources	14 Jan 2006 21:30:05 -0000	1.2
@@ -0,0 +1 @@
+2e6cc9fe0008da3ff4e3462e59386064  rtorrent-0.4.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 14 21:42:00 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sat, 14 Jan 2006 16:42:00 -0500
Subject: rpms/rtorrent/devel rtorrent.spec,1.1,1.2
Message-ID: <200601142142.k0ELgXEi002994@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/rtorrent/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2977

Modified Files:
	rtorrent.spec 
Log Message:
fixed ncurses requirement booboo


Index: rtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rtorrent/devel/rtorrent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rtorrent.spec	14 Jan 2006 21:30:05 -0000	1.1
+++ rtorrent.spec	14 Jan 2006 21:42:00 -0000	1.2
@@ -2,13 +2,13 @@
 License:       GPL
 Group:         Applications/Internet
 Version:       0.4.2
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 Source1:       rtorrent.rc.example
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.8.2, curl-devel
+BuildRequires: pkgconfig, libsigc++20-devel, libtorrent-devel >= 0.8.2, curl-devel, ncurses-devel
 
 %description
 A BitTorrent client using libtorrent, which on high-bandwidth connections is 
@@ -39,6 +39,9 @@
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-3
+- Added ncurses-devel to buildrequirements
+
 * Sat Jan 14 2006 - Chris Chabot <chabotc at xs4all.nl> - 0.4.2-2
 - Improved summary & description
 - Removed explicit requires, leaving to rpm



From fedora-extras-commits at redhat.com  Sat Jan 14 22:10:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Jan 2006 17:10:20 -0500
Subject: owners owners.list,1.532,1.533
Message-ID: <200601142211.k0EMBA20004821@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4804

Modified Files:
	owners.list 
Log Message:
Taking over perl-YAML.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- owners.list	14 Jan 2006 21:30:04 -0000	1.532
+++ owners.list	14 Jan 2006 22:10:20 -0000	1.533
@@ -965,7 +965,7 @@
 Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-YAML|YAML Ain't Markup Language (tm)|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 14 22:16:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 14 Jan 2006 17:16:05 -0500
Subject: rpms/celestia/devel celestia.spec,1.10,1.11
Message-ID: <200601142216.k0EMGcRp004999@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4982

Modified Files:
	celestia.spec 
Log Message:
BR xorg-x11-proto-devel and libXt-devel.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- celestia.spec	26 Dec 2005 22:50:48 -0000	1.10
+++ celestia.spec	14 Jan 2006 22:16:05 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           celestia
 Version:        1.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        OpenGL real-time visual space simulation
 
@@ -18,6 +18,8 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libGL-devel
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  libXt-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Thu Jan 05 2006 Steven Pritchard <steve at kspei.com> 1.4.0-2
+- Add BR: xorg-x11-proto-devel, libXt-devel
+
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0
 - Remove celestia-1.3.2-compile.patch (seems to be applied upstream)



From fedora-extras-commits at redhat.com  Sat Jan 14 22:20:51 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 17:20:51 -0500
Subject: rpms/geos/devel geos.spec,1.1,1.2
Message-ID: <200601142221.k0EMLNYf005033@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5016

Modified Files:
	geos.spec 
Log Message:
Added patch for gcc4




Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geos.spec	7 Jan 2006 18:00:46 -0000	1.1
+++ geos.spec	14 Jan 2006 22:20:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name: geos
 Version: 2.2.1
-Release: 1
+Release: 2%{?dist}
 Summary: GEOS is a C++ port of the Java Topology Suite
 
 Group: Applications/Engineering
@@ -8,6 +8,7 @@
 URL: http://geos.refractions.net
 Source0: http://geos.refractions.net/%{name}-%{version}.tar.bz2
 Patch0: geos-config.in.patch
+Patch1: geos-2.2.1-gcc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: doxygen
 
@@ -36,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .buildroot 
+%patch1 -p1
 
 %build
 %configure --disable-static --disable-dependency-tracking
@@ -71,6 +73,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.2.1-2
+- Add gcc4 patch
+
 * Sat Dec 31 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-1
 - Updated to address review comments in bug 17039
 



From fedora-extras-commits at redhat.com  Sat Jan 14 22:23:47 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 17:23:47 -0500
Subject: rpms/geos/devel geos-2.2.1-gcc4.patch,NONE,1.1
Message-ID: <200601142223.k0EMNnSo005080@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5065

Added Files:
	geos-2.2.1-gcc4.patch 
Log Message:
Added patch file



geos-2.2.1-gcc4.patch:

--- NEW FILE geos-2.2.1-gcc4.patch ---
--- source/headers/geos/geom.h~	2005-11-29 09:52:21.000000000 -0800
+++ source/headers/geos/geom.h	2006-01-13 21:37:04.000000000 -0800
@@ -358,52 +358,52 @@
 	//double distance(Coordinate& p);
 	static Coordinate nullCoord;
 
-	void Coordinate::setNull() {
+	void setNull() {
 		x=DoubleNotANumber;
 		y=DoubleNotANumber;
 		z=DoubleNotANumber;
 	}
 
-	static Coordinate& Coordinate::getNull() {
+	static Coordinate& getNull() {
 		return nullCoord;
 	}
 
-	Coordinate::Coordinate() {
+	Coordinate() {
 		x=0.0;
 		y=0.0;
 		z=DoubleNotANumber;
 	}
 
-	Coordinate::Coordinate(double xNew, double yNew, double zNew) {
+	Coordinate(double xNew, double yNew, double zNew) {
 		x=xNew;
 		y=yNew;
 		z=zNew;
 	}
 
 #ifndef PROFILE_COORDINATE_COPIES
-	Coordinate::Coordinate(const Coordinate& c){
+	Coordinate(const Coordinate& c){
 		x=c.x;
 		y=c.y;
 		z=c.z;
 	}
 #else
-	Coordinate::Coordinate(const Coordinate& c);
+	Coordinate(const Coordinate& c);
 	Coordinate &operator=(const Coordinate &c);
 #endif
 
-	Coordinate::Coordinate(double xNew, double yNew){
+	Coordinate(double xNew, double yNew){
 		x=xNew;
 		y=yNew;
 		z=DoubleNotANumber;
 	}
 
-	void Coordinate::setCoordinate(const Coordinate& other) {
+	void setCoordinate(const Coordinate& other) {
 		x = other.x;
 		y = other.y;
 		z = other.z;
 	}
 
-	bool Coordinate::equals2D(const Coordinate& other) const {
+	bool equals2D(const Coordinate& other) const {
 		if (x != other.x) {
 		return false;
 		}
@@ -413,7 +413,7 @@
 		return true;
 	}
 
-	int Coordinate::compareTo(const Coordinate& other) const {
+	int compareTo(const Coordinate& other) const {
 		if (x < other.x) {
 		return -1;
 		}
@@ -429,22 +429,22 @@
 		return 0;
 	}
 
-	bool Coordinate::equals3D(const Coordinate& other) const {
+	bool equals3D(const Coordinate& other) const {
 		return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z)));
 	}
 
-	void Coordinate::makePrecise(const PrecisionModel *precisionModel) {
+	void makePrecise(const PrecisionModel *precisionModel) {
 		x = precisionModel->makePrecise(x);
 		y = precisionModel->makePrecise(y);
 	}
 
-	double Coordinate::distance(const Coordinate& p) const {
+	double distance(const Coordinate& p) const {
 		double dx = x - p.x;
 		double dy = y - p.y;
 		return sqrt(dx * dx + dy * dy);
 	}
 
-	int Coordinate::hashCode() {
+	int hashCode() {
 		//Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
 		int result = 17;
 		result = 37 * result + hashCode(x);
@@ -456,7 +456,7 @@
 	* Returns a hash code for a double value, using the algorithm from
 	* Joshua Bloch's book <i>Effective Java</i>
 	*/
-	static int Coordinate::hashCode(double x) {
+	static int hashCode(double x) {
 		int64 f = (int64)(x);
 		return (int)(f^(f>>32));
 	}



From fedora-extras-commits at redhat.com  Sat Jan 14 23:02:33 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 18:02:33 -0500
Subject: rpms/geos/devel geos-2.2.1-gcc4.patch,1.1,1.2
Message-ID: <200601142303.k0EN36pB006941@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6921

Modified Files:
	geos-2.2.1-gcc4.patch 
Log Message:
Updated patch file with correct path to source file



geos-2.2.1-gcc4.patch:

Index: geos-2.2.1-gcc4.patch
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos-2.2.1-gcc4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- geos-2.2.1-gcc4.patch	14 Jan 2006 22:23:47 -0000	1.1
+++ geos-2.2.1-gcc4.patch	14 Jan 2006 23:02:32 -0000	1.2
@@ -1,5 +1,5 @@
---- source/headers/geos/geom.h~	2005-11-29 09:52:21.000000000 -0800
-+++ source/headers/geos/geom.h	2006-01-13 21:37:04.000000000 -0800
+--- geos-2.2.1.orig/source/headers/geos/geom.h	2006-01-14 14:40:33.000000000 -0800
++++ geos-2.2.1/source/headers/geos/geom.h	2006-01-14 14:41:12.000000000 -0800
 @@ -358,52 +358,52 @@
  	//double distance(Coordinate& p);
  	static Coordinate nullCoord;



From fedora-extras-commits at redhat.com  Sat Jan 14 23:11:09 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 18:11:09 -0500
Subject: rpms/geos/devel geos.spec,1.2,1.3
Message-ID: <200601142311.k0ENBiAf007029@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7009

Modified Files:
	geos.spec 
Log Message:
Updated to rev 3 due to patch file change



Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geos.spec	14 Jan 2006 22:20:51 -0000	1.2
+++ geos.spec	14 Jan 2006 23:11:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name: geos
 Version: 2.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: GEOS is a C++ port of the Java Topology Suite
 
 Group: Applications/Engineering
@@ -73,6 +73,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Jan 14 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-3
+- Updated gcc4 patch
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.2.1-2
 - Add gcc4 patch
 



From fedora-extras-commits at redhat.com  Sat Jan 14 23:14:25 2006
From: fedora-extras-commits at redhat.com (Shawn McCann (smccann))
Date: Sat, 14 Jan 2006 18:14:25 -0500
Subject: rpms/geos/devel geos.spec,1.3,1.4
Message-ID: <200601142314.k0ENEvaD007094@cvs-int.fedora.redhat.com>

Author: smccann

Update of /cvs/extras/rpms/geos/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7070

Modified Files:
	geos.spec 
Log Message:
Corrected wrong year in changelog



Index: geos.spec
===================================================================
RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geos.spec	14 Jan 2006 23:11:09 -0000	1.3
+++ geos.spec	14 Jan 2006 23:14:24 -0000	1.4
@@ -73,7 +73,7 @@
 %exclude %{_libdir}/*.la
 
 %changelog
-* Sat Jan 14 2005 Shawn McCann <smccann at canasoft.ca> - 2.2.1-3
+* Sat Jan 14 2006 Shawn McCann <smccann at canasoft.ca> - 2.2.1-3
 - Updated gcc4 patch
 
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.2.1-2



From fedora-extras-commits at redhat.com  Sun Jan 15 06:24:52 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 01:24:52 -0500
Subject: rpms/perl-DBIx-SearchBuilder/FC-4
	DBIx-SearchBuilder-1.38-fc4-hacks.diff, NONE, 1.1 .cvsignore,
	1.2, 1.3 perl-DBIx-SearchBuilder.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601150625.k0F6PS9s021830@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21806

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Added Files:
	DBIx-SearchBuilder-1.38-fc4-hacks.diff 
Log Message:
tmp

DBIx-SearchBuilder-1.38-fc4-hacks.diff:

--- NEW FILE DBIx-SearchBuilder-1.38-fc4-hacks.diff ---
diff -uNr DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Module.pm DBIx-SearchBuilder-1.38/inc/Test/Builder/Module.pm
--- DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Module.pm	1970-01-01 01:00:00.000000000 +0100
+++ DBIx-SearchBuilder-1.38/inc/Test/Builder/Module.pm	2005-10-08 08:56:17.000000000 +0200
@@ -0,0 +1,182 @@
+package Test::Builder::Module;
+
+use Test::Builder;
+
+require Exporter;
+ at ISA = qw(Exporter);
+
+$VERSION = '0.03';
+
+use strict;
+
+# 5.004's Exporter doesn't have export_to_level.
+my $_export_to_level = sub {
+      my $pkg = shift;
+      my $level = shift;
+      (undef) = shift;                  # redundant arg
+      my $callpkg = caller($level);
+      $pkg->export($callpkg, @_);
+};
+
+
+=head1 NAME
+
+Test::Builder::Module - Base class for test modules
+
+=head1 SYNOPSIS
+
+  # Emulates Test::Simple
+  package Your::Module;
+
+  my $CLASS = __PACKAGE__;
+
+  use base 'Test::Builder::Module';
+  @EXPORT = qw(ok);
+
+  sub ok ($;$) {
+      my $tb = $CLASS->builder;
+      return $tb->ok(@_);
+  }
+  
+  1;
+
+
+=head1 DESCRIPTION
+
+This is a superclass for Test::Builder-based modules.  It provides a
+handful of common functionality and a method of getting at the underlying
+Test::Builder object.
+
+
+=head2 Importing
+
+Test::Builder::Module is a subclass of Exporter which means your
+module is also a subclass of Exporter.  @EXPORT, @EXPORT_OK, etc...
+all act normally.
+
+A few methods are provided to do the C<use Your::Module tests => 23> part
+for you.
+
+=head3 import
+
+Test::Builder::Module provides an import() method which acts in the
+same basic way as Test::More's, setting the plan and controling
+exporting of functions and variables.  This allows your module to set
+the plan independent of Test::More.
+
+All arguments passed to import() are passed onto 
+C<< Your::Module->builder->plan() >> with the exception of 
+C<import =>[qw(things to import)]>.
+
+    use Your::Module import => [qw(this that)], tests => 23;
+
+says to import the functions this() and that() as well as set the plan
+to be 23 tests.
+
+import() also sets the exported_to() attribute of your builder to be
+the caller of the import() function.
+
+Additional behaviors can be added to your import() method by overriding
+import_extra().
+
+=cut
+
+sub import {
+    my($class) = shift;
+
+    my $test = $class->builder;
+
+    my $caller = caller;
+
+    $test->exported_to($caller);
+
+    $class->import_extra(\@_);
+    my(@imports) = $class->_strip_imports(\@_);
+
+    $test->plan(@_);
+
+    $class->$_export_to_level(1, $class, @imports);
+}
+
+
+sub _strip_imports {
+    my $class = shift;
+    my $list  = shift;
+
+    my @imports = ();
+    my @other   = ();
+    my $idx = 0;
+    while( $idx <= $#{$list} ) {
+        my $item = $list->[$idx];
+
+        if( defined $item and $item eq 'import' ) {
+            push @imports, @{$list->[$idx+1]};
+            $idx++;
+        }
+        else {
+            push @other, $item;
+        }
+
+        $idx++;
+    }
+
+    @$list = @other;
+
+    return @imports;
+}
+
+
+=head3 import_extra
+
+    Your::Module->import_extra(\@import_args);
+
+import_extra() is called by import().  It provides an opportunity for you
+to add behaviors to your module based on its import list.
+
+Any extra arguments which shouldn't be passed on to plan() should be 
+stripped off by this method.
+
+See Test::More for an example of its use.
+
+B<NOTE> This mechanism is I<VERY ALPHA AND LIKELY TO CHANGE> as it
+feels like a bit of an ugly hack in its current form.
+
+=cut
+
+sub import_extra {}
+
+
+=head2 Builder
+
+Test::Builder::Module provides some methods of getting at the underlying
+Test::Builder object.
+
+=head3 builder
+
+  my $builder = Your::Class->builder;
+
+This method returns the Test::Builder object associated with Your::Class.
+It is not a constructor so you can call it as often as you like.
+
+This is the preferred way to get the Test::Builder object.  You should
+I<not> get it via C<< Test::Builder->new >> as was previously
+recommended.
+
+The object returned by builder() may change at runtime so you should
+call builder() inside each function rather than store it in a global.
+
+  sub ok {
+      my $builder = Your::Class->builder;
+
+      return $builder->ok(@_);
+  }
+
+
+=cut
+
+sub builder {
+    return Test::Builder->new;
+}
+
+
+1;
diff -uNr DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Tester/Color.pm DBIx-SearchBuilder-1.38/inc/Test/Builder/Tester/Color.pm
--- DBIx-SearchBuilder-1.38.orig/inc/Test/Builder/Tester/Color.pm	1970-01-01 01:00:00.000000000 +0100
+++ DBIx-SearchBuilder-1.38/inc/Test/Builder/Tester/Color.pm	2005-10-08 08:56:17.000000000 +0200
@@ -0,0 +1,50 @@
+package Test::Builder::Tester::Color;
+
+use strict;
+
+require Test::Builder::Tester;
+
+=head1 NAME
+
+Test::Builder::Tester::Color - turn on colour in Test::Builder::Tester
[...4012 lines suppressed...]
+
+This is an extremely simple, extremely basic module for writing tests
+suitable for CPAN modules and other pursuits.  If you wish to do more
+complicated testing, use the Test::More module (a drop-in replacement
+for this one).
+
+The basic unit of Perl testing is the ok.  For each thing you want to
+test your program will print out an "ok" or "not ok" to indicate pass
+or fail.  You do this with the ok() function (see below).
+
+The only other constraint is you must pre-declare how many tests you
+plan to run.  This is in case something goes horribly wrong during the
+test and your test program aborts, or skips a test or whatever.  You
+do this like so:
+
+    use Test::Simple tests => 23;
+
+You must have a plan.
+
+
+=over 4
+
+=item B<ok>
+
+  ok( $foo eq $bar, $name );
+  ok( $foo eq $bar );
+
+ok() is given an expression (in this case C<$foo eq $bar>).  If it's
+true, the test passed.  If it's false, it didn't.  That's about it.
+
+ok() prints out either "ok" or "not ok" along with a test number (it
+keeps track of that for you).
+
+  # This produces "ok 1 - Hell not yet frozen over" (or not ok)
+  ok( get_temperature($hell) > 0, 'Hell not yet frozen over' );
+
+If you provide a $name, that will be printed along with the "ok/not
+ok" to make it easier to find your test when if fails (just search for
+the name).  It also makes it easier for the next guy to understand
+what your test is for.  It's highly recommended you use test names.
+
+All tests are run in scalar context.  So this:
+
+    ok( @stuff, 'I have some stuff' );
+
+will do what you mean (fail if stuff is empty)
+
+=cut
+
+sub ok ($;$) {
+    $CLASS->builder->ok(@_);
+}
+
+
+=back
+
+Test::Simple will start by printing number of tests run in the form
+"1..M" (so "1..5" means you're going to run 5 tests).  This strange
+format lets Test::Harness know how many tests you plan on running in
+case something goes horribly wrong.
+
+If all your tests passed, Test::Simple will exit with zero (which is
+normal).  If anything failed it will exit with how many failed.  If
+you run less (or more) tests than you planned, the missing (or extras)
+will be considered failures.  If no tests were ever run Test::Simple
+will throw a warning and exit with 255.  If the test died, even after
+having successfully completed all its tests, it will still be
+considered a failure and will exit with 255.
+
+So the exit codes are...
+
+    0                   all tests successful
+    255                 test died or all passed but wrong # of tests run
+    any other number    how many failed (including missing or extras)
+
+If you fail more than 254 tests, it will be reported as 254.
+
+This module is by no means trying to be a complete testing system.
+It's just to get you started.  Once you're off the ground its
+recommended you look at L<Test::More>.
+
+
+=head1 EXAMPLE
+
+Here's an example of a simple .t file for the fictional Film module.
+
+    use Test::Simple tests => 5;
+
+    use Film;  # What you're testing.
+
+    my $btaste = Film->new({ Title    => 'Bad Taste',
+                             Director => 'Peter Jackson',
+                             Rating   => 'R',
+                             NumExplodingSheep => 1
+                           });
+    ok( defined($btaste) && ref $btaste eq 'Film,     'new() works' );
+
+    ok( $btaste->Title      eq 'Bad Taste',     'Title() get'    );
+    ok( $btaste->Director   eq 'Peter Jackson', 'Director() get' );
+    ok( $btaste->Rating     eq 'R',             'Rating() get'   );
+    ok( $btaste->NumExplodingSheep == 1,        'NumExplodingSheep() get' );
+
+It will produce output like this:
+
+    1..5
+    ok 1 - new() works
+    ok 2 - Title() get
+    ok 3 - Director() get
+    not ok 4 - Rating() get
+    #   Failed test 'Rating() get'
+    #   in t/film.t at line 14.
+    ok 5 - NumExplodingSheep() get
+    # Looks like you failed 1 tests of 5
+
+Indicating the Film::Rating() method is broken.
+
+
+=head1 CAVEATS
+
+Test::Simple will only report a maximum of 254 failures in its exit
+code.  If this is a problem, you probably have a huge test script.
+Split it into multiple files.  (Otherwise blame the Unix folks for
+using an unsigned short integer as the exit status).
+
+Because VMS's exit codes are much, much different than the rest of the
+universe, and perl does horrible mangling to them that gets in my way,
+it works like this on VMS.
+
+    0     SS$_NORMAL        all tests successful
+    4     SS$_ABORT         something went wrong
+
+Unfortunately, I can't differentiate any further.
+
+
+=head1 NOTES
+
+Test::Simple is B<explicitly> tested all the way back to perl 5.004.
+
+Test::Simple is thread-safe in perl 5.8.0 and up.
+
+=head1 HISTORY
+
+This module was conceived while talking with Tony Bowden in his
+kitchen one night about the problems I was having writing some really
+complicated feature into the new Testing module.  He observed that the
+main problem is not dealing with these edge cases but that people hate
+to write tests B<at all>.  What was needed was a dead simple module
+that took all the hard work out of testing and was really, really easy
+to learn.  Paul Johnson simultaneously had this idea (unfortunately,
+he wasn't in Tony's kitchen).  This is it.
+
+
+=head1 SEE ALSO
+
+=over 4
+
+=item L<Test::More>
+
+More testing functions!  Once you outgrow Test::Simple, look at
+Test::More.  Test::Simple is 100% forward compatible with Test::More
+(i.e. you can just use Test::More instead of Test::Simple in your
+programs and things will still work).
+
+=item L<Test>
+
+The original Perl testing module.
+
+=item L<Test::Unit>
+
+Elaborate unit testing.
+
+=item L<Test::Inline>, L<SelfTest>
+
+Embed tests in your code!
+
+=item L<Test::Harness>
+
+Interprets the output of your test program.
+
+=back
+
+
+=head1 AUTHORS
+
+Idea by Tony Bowden and Paul Johnson, code by Michael G Schwern
+E<lt>schwern at pobox.comE<gt>, wardrobe by Calvin Klein.
+
+
+=head1 COPYRIGHT
+
+Copyright 2001, 2002, 2004 by Michael G Schwern E<lt>schwern at pobox.comE<gt>.
+
+This program is free software; you can redistribute it and/or 
+modify it under the same terms as Perl itself.
+
+See F<http://www.perl.com/perl/misc/Artistic.html>
+
+=cut
+
+1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Oct 2005 01:42:57 -0000	1.2
+++ .cvsignore	15 Jan 2006 06:24:51 -0000	1.3
@@ -1 +1 @@
-DBIx-SearchBuilder-1.27.tar.gz
+DBIx-SearchBuilder-1.38.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-DBIx-SearchBuilder.spec	11 Oct 2005 01:58:08 -0000	1.2
+++ perl-DBIx-SearchBuilder.spec	15 Jan 2006 06:24:51 -0000	1.3
@@ -6,29 +6,36 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.27
-Release: 	3%{?dist}
+Version: 	1.38
+Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/DBIx-SearchBuilder/
 Source0: 	http://search.cpan.org/CPAN/authors/id/J/JE/JESSE/DBIx-SearchBuilder-%{version}.tar.gz
+# A private copy of Test::Simple to work around PR #166475. 
+Patch0:         DBIx-SearchBuilder-1.38-fc4-hacks.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildArch: 	noarch
-BuildRequires: 	perl(Want)
-BuildRequires: 	perl(Cache::Simple::TimedExpiry) >= 0.21
-BuildRequires: 	perl(Class::ReturnValue) >= 0.4
-BuildRequires: 	perl(DBD::SQLite)
+BuildRequires:	perl(Want)
+BuildRequires:	perl(Cache::Simple::TimedExpiry) >= 0.21
+BuildRequires:	perl(Class::ReturnValue) >= 0.4
+BuildRequires:	perl(DBD::SQLite)
+BuildRequires:	perl(DBI)
+BuildRequires:	perl(ExtUtils::AutoInstall) >= 0.49
+# PR #166475
+BuildConflicts: perl(Test::More) >= 0.52
+BuildRequires:	perl(Class::Accessor)
 
 # Improved tests:
 BuildRequires:	perl(Test::Pod)
 
-%if "%version" > "1.27"
-BuildRequires: 	perl(ExtUtils::AutoInstall) >= 0.49
-BuildRequires:	perl(Test::More) >= 0.52
-%endif
+# Optional features
+BuildRequires:	perl(DBIx::DBSchema)
+BuildRequires:	perl(capitalization) >= 0.03
+BuildRequires:	perl(Clone)
 
 %description
 This module provides an object-oriented mechanism for retrieving and
@@ -39,8 +46,13 @@
 chmod -x Changes
 find -name '*.pm' -exec chmod -x {} \;
 
+%patch0 -p1
+
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor
+# --skipdeps causes ExtUtils::AutoInstall not to try auto-installing 
+# missing optional features
+%{__perl} Makefile.PL INSTALLDIRS=vendor --skipdeps
+
 make %{?_smp_mflags}
 
 %install
@@ -60,9 +72,7 @@
 %defattr(-,root,root,-)
 # 
 %doc Changes
-%if "%{version}" > "1.27"
 %doc README ROADMAP
-%endif
 %{perl_vendorlib}/DBIx
 %{_mandir}/man3/*
 %exclude %{perl_vendorlib}/DBIx/SearchBuilder/Handle/Oracle*
@@ -84,6 +94,10 @@
 %endif
 
 %changelog
+* Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-1
+- Update to 1.38.
+- Add a private copy of Test-Simple-0.62 to work around PR #166475.
+
 * Tue Oct 11 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.27-3
 - Spec file cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Oct 2005 01:42:58 -0000	1.2
+++ sources	15 Jan 2006 06:24:51 -0000	1.3
@@ -1 +1 @@
-b3bc442e5e447e8a02417c417cff7371  DBIx-SearchBuilder-1.27.tar.gz
+409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 15 06:37:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 01:37:24 -0500
Subject: rpms/rt3/devel .cvsignore,1.2,1.3 rt3.spec,1.6,1.7 sources,1.2,1.3
Message-ID: <200601150637.k0F6buT9021918@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/rt3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21897

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Oct 2005 01:46:42 -0000	1.2
+++ .cvsignore	15 Jan 2006 06:37:23 -0000	1.3
@@ -1 +1 @@
-rt-3.4.4.tar.gz
+rt-3.4.5.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/rt3.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rt3.spec	7 Dec 2005 12:36:19 -0000	1.6
+++ rt3.spec	15 Jan 2006 06:37:23 -0000	1.7
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,8 +12,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.4.4
-Release:	11%{?dist}
+Version:	3.4.5
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -235,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.5-1
+- Upstream update.
+
 * Wed Dec 07 2005 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.4-11
 - Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Oct 2005 01:46:42 -0000	1.2
+++ sources	15 Jan 2006 06:37:23 -0000	1.3
@@ -1 +1 @@
-769d77eea39006be643cbd2db4820ba3  rt-3.4.4.tar.gz
+16c8007cba54669e6c9de95cfc680b2a  rt-3.4.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 15 10:13:23 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 15 Jan 2006 05:13:23 -0500
Subject: rpms/fuse/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 fuse-emulator-0.7.0.spec, 1.1, NONE
Message-ID: <200601151013.k0FADtBb000805@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv786

Modified Files:
	.cvsignore sources 
Removed Files:
	fuse-emulator-0.7.0.spec 
Log Message:
revert back to fuse (the filesystem) 2.4.2-2 ; pfj overwrote is accidentally


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2006 00:49:50 -0000	1.3
+++ .cvsignore	15 Jan 2006 10:13:21 -0000	1.4
@@ -1 +1 @@
-fuse-0.7.0.tar.gz
+fuse-2.4.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fuse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2006 00:49:50 -0000	1.3
+++ sources	15 Jan 2006 10:13:22 -0000	1.4
@@ -1 +1 @@
-ebb124e808e6467630efaae01fe03b64  fuse-0.7.0.tar.gz
+6e3d9a580c45ddf4a06558c135c158c2  fuse-2.4.2.tar.gz


--- fuse-emulator-0.7.0.spec DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:16:27 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 15 Jan 2006 05:16:27 -0500
Subject: rpms/fuse/devel fuse-README.fedora, 1.2, 1.3 fuse-makedev.d-fuse,
	1.2, 1.3 fuse-mount.fuse.patch, 1.2, 1.3 fuse-udev.nodes, 1.2,
	1.3 fuse-udev_rules.patch, 1.2, 1.3 fuse.spec, 1.3,
	1.4 README.z88sdk, 1.1, NONE fuse-sound.patch, 1.1,
	NONE fuse.png, 1.1, NONE
Message-ID: <200601151016.k0FAGxWL000899@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/fuse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv866

Added Files:
	fuse-README.fedora fuse-makedev.d-fuse fuse-mount.fuse.patch 
	fuse-udev.nodes fuse-udev_rules.patch fuse.spec 
Removed Files:
	README.z88sdk fuse-sound.patch fuse.png 
Log Message:
revert back to fuse (the filesystem) 2.4.2-2 ; pfj overwrote is accidentally (second part)


Index: fuse-README.fedora
===================================================================
RCS file: fuse-README.fedora
diff -N fuse-README.fedora
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-README.fedora	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1,17 @@
+This fuse package for security reasons only allows members of the group "fuse"
+to (u)mount fuse filesystems. If you for example want to allow the user "foo" 
+to mount fuse filesystems you have to add him to the fuse group by running
+
+# /usr/sbin/usermod -a -G fuse foo
+
+Or use tools like "system-config-users" to add user "foo" to the fuse group.
+
+Note that the user has to re-login after he was added to the group.
+
+
+If you don't want to add all users to the fuse group you can also run
+
+# chmod 4755 /usr/bin/fusermount
+
+to allow everyone to mount fuse filesystems. You have to re-run that command
+after each fuse update.


Index: fuse-makedev.d-fuse
===================================================================
RCS file: fuse-makedev.d-fuse
diff -N fuse-makedev.d-fuse
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-makedev.d-fuse	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1 @@
+c 660 root     fuse      10 229  1   1 fuse

fuse-mount.fuse.patch:

Index: fuse-mount.fuse.patch
===================================================================
RCS file: fuse-mount.fuse.patch
diff -N fuse-mount.fuse.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-mount.fuse.patch	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1,23 @@
+diff -u util.org/mount.fuse util/mount.fuse
+--- util.org/mount.fuse	2005-11-02 20:52:12.000000000 +0100
++++ util/mount.fuse	2005-11-02 20:59:51.000000000 +0100
+@@ -5,6 +5,7 @@
+ # Thanks to Miklos Szeredi <miklos at szeredi.hu>
+ # to kick me to the right way
+ #
++export PATH
+ 
+ VERSION="0.0.1"
+ PRGNAME=`basename $0`
+@@ -40,9 +41,9 @@
+ shift
+ shift
+ 
+-OPTIONS="$@"
++# If there is a better regex that can remove all user from a sting like "-o user,rw,noexec,user,nosuid,nodev,user" tell me, thx
++OPTIONS="`echo $@ | sed 's|,user$|| ; s| user,| | ; s|,user,|,|'`"
+ 
+-export PATH
+ ${FSTYPE} ${MOUNTPATH} ${MOUNTPOINT} ${OPTIONS}
+ 
+ 


Index: fuse-udev.nodes
===================================================================
RCS file: fuse-udev.nodes
diff -N fuse-udev.nodes
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-udev.nodes	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1 @@
+fuse

fuse-udev_rules.patch:

Index: fuse-udev_rules.patch
===================================================================
RCS file: fuse-udev_rules.patch
diff -N fuse-udev_rules.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse-udev_rules.patch	15 Jan 2006 10:16:27 -0000	1.3
@@ -0,0 +1,6 @@
+diff -u util.org/udev.rules util/udev.rules
+--- util.org/udev.rules	2005-11-03 19:38:05.000000000 +0100
++++ util/udev.rules	2005-11-03 19:38:13.000000000 +0100
+@@ -1 +1 @@
+-KERNEL="fuse", NAME="%k", MODE="0666"
++KERNEL="fuse", NAME="%k", MODE="0660",OWNER="root" GROUP="fuse"


Index: fuse.spec
===================================================================
RCS file: fuse.spec
diff -N fuse.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ fuse.spec	15 Jan 2006 10:16:27 -0000	1.4
@@ -0,0 +1,140 @@
+Name:           fuse
+Version:        2.4.2
+Release:        2%{?dist}
+Summary:        File System in Userspace (FUSE) utilities
+
+Group:          System Environment/Base
+License:        GPL
+URL:            http://fuse.sf.net
+Source0:        http://dl.sourceforge.net/sourceforge/fuse/fuse-2.4.2.tar.gz
+Source1:	fuse-udev.nodes
+Source2:	fuse-makedev.d-fuse
+Source3:	fuse-README.fedora
+
+Patch0:		fuse-mount.fuse.patch
+Patch1:		fuse-udev_rules.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:	kernel >= 2.6.14
+Requires(pre):	  %{_sbindir}/groupadd
+Requires(post):   /sbin/MAKEDEV
+Requires(postun): %{_sbindir}/groupdel
+
+%description
+With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains the FUSE userspace tools to 
+mount a FUSE filesystem.
+
+Note: For security reasons only members of the group "fuse" are allowed to
+(u)mount fuse filesystems. You can find more details on this issue in
+%{_docdir}/%{name}-%{version}/README.fedora
+
+
+%package libs
+Summary:        File System in Userspace (FUSE) libraries
+Group:          System Environment/Libraries
+License:        LGPL
+
+%description libs
+Devel With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains the FUSE libraries. 
+
+
+%package devel
+Summary:        File System in Userspace (FUSE) devel files
+Group:          Development/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+License:        LGPL
+
+%description devel
+With FUSE it is possible to implement a fully functional filesystem in a 
+userspace program. This package contains development files (headers, 
+pgk-config) to develop FUSE based applications/filesystems.
+
+
+%prep
+%setup -q
+#disable device creation during build/install
+sed -i 's|mknod|echo Disabled: mknod |g' util/Makefile.in
+%patch0 -b .patch0
+%patch1 -b .patch1
+cp %{SOURCE3} README.fedora
+
+%build
+%configure \
+ --disable-static \
+ --disable-kernel-module 
+make %{?_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 {} ';'
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+install -D -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/makedev.d/z-fuse
+# change from 4755 to 0755 to allow stripping -- fixed later in files
+chmod 0755 $RPM_BUILD_ROOT/%{_bindir}/fusermount
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre 
+if [ $1 -eq 1 ]; then
+     %{_sbindir}/groupadd -r fuse &>/dev/null || :
+fi
+
+%post
+/sbin/MAKEDEV fuse
+
+%postun 
+if [ $1 = 0 ]; then
+ %{_sbindir}/groupdel fuse || :
+fi
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+
+%files
+%doc AUTHORS ChangeLog COPYING FAQ Filesystems NEWS README README.NFS README.fedora
+/sbin/mount.fuse
+%attr(4754,root,fuse) %{_bindir}/fusermount
+%{_sysconfdir}/makedev.d/z-fuse
+%{_sysconfdir}/udev/rules.d/40-fuse.rules
+%{_sysconfdir}/udev/makedev.d/40-fuse.nodes
+
+%files libs
+%doc COPYING.LIB
+%{_libdir}/libfuse.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libfuse.so
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/fuse.h
+%{_includedir}/fuse
+
+%changelog
+* Wed Nov 23 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.2-1
+- Use dist
+
+* Wed Nov 23 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.2-1
+- Update to 2.4.2 (solves CVE-2005-3531)
+- Update README.fedora
+
+* Sat Nov 12 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-3
+- Add README.fedora
+- Add hint to README.fedora and that you have to be member of the group "fuse"
+  in the description
+- Use groupadd instead of fedora-groupadd
+
+* Fri Nov 04 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-2
+- Rename packages a bit
+- use makedev.d/40-fuse.nodes
+- fix /sbin/mount.fuse
+- Use a fuse group to restict access to fuse-filesystems
+
+* Fri Oct 28 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.4.1-1
+- Initial RPM release.


--- README.z88sdk DELETED ---


--- fuse-sound.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:07 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:07 -0500
Subject: rpms/wavpack - New directory
Message-ID: <200601151050.k0FAo93k001044@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1036/wavpack

Log Message:
Directory /cvs/extras/rpms/wavpack added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:13 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:13 -0500
Subject: rpms/wavpack/devel - New directory
Message-ID: <200601151050.k0FAoFCE001059@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1036/wavpack/devel

Log Message:
Directory /cvs/extras/rpms/wavpack/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:40 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:40 -0500
Subject: rpms/wavpack Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601151050.k0FAogpk001093@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1081

Added Files:
	Makefile import.log 
Log Message:
Setup of module wavpack


--- NEW FILE Makefile ---
# Top level Makefile for module wavpack
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:50:46 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:50:46 -0500
Subject: rpms/wavpack/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601151050.k0FAom0B001113@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1081/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wavpack


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 15 10:51:55 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:51:55 -0500
Subject: rpms/wavpack import.log,1.1,1.2
Message-ID: <200601151052.k0FAqSKa001220@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1183

Modified Files:
	import.log 
Log Message:
auto-import wavpack-4.31-1 on branch devel from wavpack-4.31-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wavpack/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Jan 2006 10:50:40 -0000	1.1
+++ import.log	15 Jan 2006 10:51:55 -0000	1.2
@@ -0,0 +1 @@
+wavpack-4_31-1:HEAD:wavpack-4.31-1.src.rpm:1137322302



From fedora-extras-commits at redhat.com  Sun Jan 15 10:52:01 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:52:01 -0500
Subject: rpms/wavpack/devel wavpack-wavpack_pc_in.patch, NONE,
	1.1 wavpack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601151052.k0FAqYtq001224@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/rpms/wavpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1183/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wavpack-wavpack_pc_in.patch wavpack.spec 
Log Message:
auto-import wavpack-4.31-1 on branch devel from wavpack-4.31-1.src.rpm

wavpack-wavpack_pc_in.patch:

--- NEW FILE wavpack-wavpack_pc_in.patch ---
--- wavpack.pc.in	2005-03-20 10:09:14.000000000 +0300
+++ wavpack.pc.in	2006-01-07 17:49:56.000000000 +0300
@@ -1,5 +1,5 @@
 prefix=@prefix@
-libdir=${prefix}/lib
+libdir=@libdir@
 includedir=${prefix}/include
 
 Name: wavpack
@@ -7,5 +7,5 @@
 Version: @PACKAGE_VERSION@
 Requires:
 Conflicts:
-Libs: -L${libdir} -lwavpack @ICONV@
-Cflags: -I${includedir} -DPACK -DUNPACK -DUSE_FSTREAMS -DTAGS -DSEEKING -DVER3
+Libs: -lwavpack @ICONV@
+Cflags: -DPACK -DUNPACK -DUSE_FSTREAMS -DTAGS -DSEEKING -DVER3


--- NEW FILE wavpack.spec ---
Name: 		wavpack
Summary: 	A completely open audiocodec
Version: 	4.31
Release: 	1%{?dist}
License: 	BSD
Group: 		Applications/Multimedia
Url: 		http://www.wavpack.com/
Source: 	http://www.wavpack.com/%{name}-%{version}.tar.bz2
Patch0:		wavpack-wavpack_pc_in.patch
Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
WavPack is a completely open audio compression format providing lossless, 
high-quality lossy, and a unique hybrid compression mode. Although the 
technology is loosely based on previous versions of WavPack, the new 
version 4 format has been designed from the ground up to offer unparalleled 
performance and functionality.

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

%description devel
Files needed for developing apps using wavpack

%prep
%setup -q
%patch0 -p0

%build
%configure --disable-static 
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall
%{__rm} -f %{buildroot}/%{_libdir}/*.la

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/libwavpack.so.*
%doc license.txt 

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*
%{_libdir}/libwavpack.so
%doc ChangeLog format.txt README

%changelog
* Sat Jan 07 2006 Peter Lemenkov <lemenkov at newmail.ru> 4.31-1
- Fixed several issues with wavpack.pc.in
- Cosmetic fixes.
- Version 4.31

* Sun Nov 13 2005 Peter Lemenkov <lemenkov at newmail.ru> 4.3-1
- Initial build for FC-Extras
- Version 4.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wavpack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Jan 2006 10:50:46 -0000	1.1
+++ .cvsignore	15 Jan 2006 10:52:01 -0000	1.2
@@ -0,0 +1 @@
+wavpack-4.31.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wavpack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Jan 2006 10:50:46 -0000	1.1
+++ sources	15 Jan 2006 10:52:01 -0000	1.2
@@ -0,0 +1 @@
+9d0edccd1556feebb3355f61828ea85f  wavpack-4.31.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 15 10:57:14 2006
From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter))
Date: Sun, 15 Jan 2006 05:57:14 -0500
Subject: owners owners.list,1.533,1.534
Message-ID: <200601151057.k0FAvkli001297@cvs-int.fedora.redhat.com>

Author: peter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1280

Modified Files:
	owners.list 
Log Message:

Added wavpack package




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -r1.533 -r1.534
--- owners.list	14 Jan 2006 22:10:20 -0000	1.533
+++ owners.list	15 Jan 2006 10:57:13 -0000	1.534
@@ -1269,6 +1269,7 @@
 Fedora Extras|vpnc|IPSec VPN client compatible with Cisco equipment|tmraz at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|w3c-markup-validator|W3C Markup Validator|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wavpack|A completely open audiocodec|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|wbxml2|Library and tools to parse, encode and handle WBXML documents|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net
 Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 15 11:33:23 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Jan 2006 06:33:23 -0500
Subject: rpms/meld/FC-4 .cvsignore, 1.6, 1.7 meld.spec, 1.11, 1.12 sources,
	1.6, 1.7 meld-1.0.0-fedora-162403.patch, 1.1,
	NONE meld-1.0.0-po_fr.patch, 1.1, NONE
Message-ID: <200601151133.k0FBXtOB003381@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3359

Modified Files:
	.cvsignore meld.spec sources 
Removed Files:
	meld-1.0.0-fedora-162403.patch meld-1.0.0-po_fr.patch 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Aug 2005 12:55:39 -0000	1.6
+++ .cvsignore	15 Jan 2006 11:33:23 -0000	1.7
@@ -1 +1 @@
-meld-1.0.0.tar.bz2
+meld-1.1.2.tar.bz2


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- meld.spec	20 Aug 2005 12:55:39 -0000	1.11
+++ meld.spec	15 Jan 2006 11:33:23 -0000	1.12
@@ -1,15 +1,13 @@
 Name:             meld
-Version:          1.0.0
-Release:          0.1%{?dist}
+Version:          1.1.2
+Release:          1%{?dist}
 Summary:          Visual diff and merge tool
 
 Group:            Development/Tools
 License:          GPL
 URL:              http://meld.sourceforge.net/
-Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.0/meld-%{version}.tar.bz2
+Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
-Patch1:           meld-1.0.0-po_fr.patch
-Patch2:           meld-1.0.0-fedora-162403.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -38,8 +36,6 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
-%patch1 -p1 -b .po_fr
-%patch2 -p1 -b .fedora-162403
 
 
 %build
@@ -86,9 +82,8 @@
 
 
 %changelog
-* Sat Aug 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-0.1
-- Work around missing gnome-python2-gnomeprint dependency in
-  gnome-python2-gtksourceview package for FC4 and FC3 (#162403).
+* Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
+- Update to 1.1.2.
 
 * Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
 - Update to 1.0.0.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Aug 2005 12:55:39 -0000	1.6
+++ sources	15 Jan 2006 11:33:23 -0000	1.7
@@ -1 +1 @@
-ccde817f0396d39e9e40f31a3a7611f6  meld-1.0.0.tar.bz2
+a00473f852c32db0bcd48c84b0f27869  meld-1.1.2.tar.bz2


--- meld-1.0.0-fedora-162403.patch DELETED ---


--- meld-1.0.0-po_fr.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 11:48:19 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Jan 2006 06:48:19 -0500
Subject: rpms/meld/FC-4 meld.spec,1.12,1.13
Message-ID: <200601151148.k0FBmpgS003482@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3461

Modified Files:
	meld.spec 
Log Message:



Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- meld.spec	15 Jan 2006 11:33:23 -0000	1.12
+++ meld.spec	15 Jan 2006 11:48:19 -0000	1.13
@@ -20,6 +20,9 @@
 Requires:         pygtk2 >= 1.99.15
 Requires:         pygtk2-libglade
 
+# Ugly work-around for a packaging bug in Fedora Core 4 (#162403).
+Requires: gnome-python2-gtksourceview, gnome-python2-gnomeprint
+
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -82,6 +85,10 @@
 
 
 %changelog
+* Sun Jan 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
+- Add an ugly work-around for a packaging bug in Fedora Core 4 (#162403).
+- Deliberately not bumping release.
+
 * Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
 - Update to 1.1.2.
 



From fedora-extras-commits at redhat.com  Sun Jan 15 12:01:41 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 15 Jan 2006 07:01:41 -0500
Subject: rpms/meld/FC-4 meld-1.0.0-fedora-162403.patch, 1.2, 1.3 meld.spec, 
	1.13, 1.14
Message-ID: <200601151202.k0FC2Eop005357@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5325

Modified Files:
	meld.spec 
Added Files:
	meld-1.0.0-fedora-162403.patch 
Log Message:
bring back the patch that works around #162403

meld-1.0.0-fedora-162403.patch:

Index: meld-1.0.0-fedora-162403.patch
===================================================================
RCS file: meld-1.0.0-fedora-162403.patch
diff -N meld-1.0.0-fedora-162403.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ meld-1.0.0-fedora-162403.patch	15 Jan 2006 12:01:41 -0000	1.3
@@ -0,0 +1,66 @@
+diff -Nur meld-1.0.0-orig/filediff.py meld-1.0.0/filediff.py
+--- meld-1.0.0-orig/filediff.py	2005-06-23 20:41:08.000000000 +0200
++++ meld-1.0.0/filediff.py	2005-08-20 14:48:24.000000000 +0200
+@@ -38,13 +38,22 @@
+ 
+ sourceview_available = 0
+ 
+-for sourceview in "gtksourceview sourceview".split():
+-    try:
+-        gsv = __import__(sourceview)
+-        sourceview_available = 1
+-        break
+-    except ImportError:
+-        pass
++# Work around missing strict dependency in gnome-python2-gtksourceview.
++gnomeprint_available = 0
++try:
++	__import__("gnomeprint")
++	gnomeprint_available = 1
++except ImportError:
++	pass
++
++if gnomeprint_available == 1:
++	for sourceview in "gtksourceview sourceview".split():
++		try:
++			gsv = __import__(sourceview)
++			sourceview_available = 1
++			break
++		except ImportError:
++			pass
+ 
+ if sourceview_available:
+     def set_highlighting_enabled(buf, fname, enabled):
+diff -Nur meld-1.0.0-orig/meldapp.py meld-1.0.0/meldapp.py
+--- meld-1.0.0-orig/meldapp.py	2005-07-01 20:32:08.000000000 +0200
++++ meld-1.0.0/meldapp.py	2005-08-20 14:46:21.000000000 +0200
+@@ -37,13 +37,22 @@
+ # optional
+ sourceview_available = 0
+ 
+-for sourceview in "gtksourceview sourceview".split():
+-    try:
+-        __import__(sourceview)
+-        sourceview_available = 1
+-        break
+-    except ImportError:
+-        pass
++# Work around missing strict dependency in gnome-python2-gtksourceview.
++gnomeprint_available = 0
++try:
++	__import__("gnomeprint")
++	gnomeprint_available = 1
++except ImportError:
++	pass
++
++if gnomeprint_available == 1:
++	for sourceview in "gtksourceview sourceview".split():
++		try:
++			__import__(sourceview)
++			sourceview_available = 1
++			break
++		except ImportError:
++			pass
+ 
+ version = "1.0.0"
+ 


Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/FC-4/meld.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- meld.spec	15 Jan 2006 11:48:19 -0000	1.13
+++ meld.spec	15 Jan 2006 12:01:41 -0000	1.14
@@ -8,6 +8,7 @@
 URL:              http://meld.sourceforge.net/
 Source0:          http://ftp.gnome.org/pub/gnome/sources/meld/1.1/meld-%{version}.tar.bz2
 Patch0:           desktop.patch
+Patch1:           meld-1.0.0-fedora-162403.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    desktop-file-utils
@@ -20,9 +21,6 @@
 Requires:         pygtk2 >= 1.99.15
 Requires:         pygtk2-libglade
 
-# Ugly work-around for a packaging bug in Fedora Core 4 (#162403).
-Requires: gnome-python2-gtksourceview, gnome-python2-gnomeprint
-
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 
@@ -39,6 +37,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .desktop
+%patch1 -p1 -b .fedora-162403
 
 
 %build
@@ -86,12 +85,16 @@
 
 %changelog
 * Sun Jan 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
-- Add an ugly work-around for a packaging bug in Fedora Core 4 (#162403).
+- Bring back the patch from 1.0.0-0.1 (for #162403 in FC <= 4).
 - Deliberately not bumping release.
 
 * Sun Nov 13 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1.2-1
 - Update to 1.1.2.
 
+* Sat Aug 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-0.1
+- Work around missing gnome-python2-gnomeprint dependency in
+  gnome-python2-gtksourceview package for FC4 and FC3 (#162403).
+
 * Mon Jul 25 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.0-1
 - Update to 1.0.0.
 - Include fix for upstream bug #309408.



From fedora-extras-commits at redhat.com  Sun Jan 15 12:25:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 15 Jan 2006 07:25:19 -0500
Subject: rpms/perl-Net-SSLeay/devel .cvsignore, 1.2, 1.3 perl-Net-SSLeay.spec,
	1.5, 1.6 sources, 1.2, 1.3
Message-ID: <200601151225.k0FCPpeT005563@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Net-SSLeay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5540

Modified Files:
	.cvsignore perl-Net-SSLeay.spec sources 
Log Message:
* Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.30-1
- 1.30.
- Optionally run the test suite during build with "--with tests".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Dec 2004 17:25:07 -0000	1.2
+++ .cvsignore	15 Jan 2006 12:25:16 -0000	1.3
@@ -1 +1 @@
-Net_SSLeay.pm-1.26.tar.gz
+Net_SSLeay.pm-1.30.tar.gz


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Net-SSLeay.spec	9 Nov 2005 21:28:33 -0000	1.5
+++ perl-Net-SSLeay.spec	15 Jan 2006 12:25:16 -0000	1.6
@@ -1,12 +1,12 @@
 Name:           perl-Net-SSLeay
-Version:        1.26
-Release:        3%{?dist}
+Version:        1.30
+Release:        1%{?dist}
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries
 License:        BSDish
 URL:            http://search.cpan.org/dist/Net_SSLeay.pm/
-Source0:        http://www.fas.harvard.edu/~behrooz/Net_SSLeay.pm-1.26.tar.gz
+Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Net_SSLeay.pm-%{version}.tar.gz
 Patch0:         %{name}-test14.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,7 +27,7 @@
 %setup -q -n Net_SSLeay.pm-%{version}
 %patch0 -p0
 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle
-chmod 644 examples/*
+chmod -c 644 examples/*
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl
 iconv -f iso-8859-1 -t utf-8 SSLeay.pm > SSLeay.pm.utf8
 mv SSLeay.pm.utf8 SSLeay.pm
@@ -49,7 +49,7 @@
 
 
 %check
-# make test # spawns servers, contacts external sites...
+%{?_with_tests:make test} # spawns servers, contacts external sites...
 
 
 %clean
@@ -65,6 +65,10 @@
 
 
 %changelog
+* Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.30-1
+- 1.30.
+- Optionally run the test suite during build with "--with tests".
+
 * Wed Nov  9 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.26-3
 - Rebuild for new OpenSSL.
 - Cosmetic cleanups.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Dec 2004 17:25:07 -0000	1.2
+++ sources	15 Jan 2006 12:25:19 -0000	1.3
@@ -1 +1 @@
-6b7b044f553d089a1bce9fa0ef4c6615  Net_SSLeay.pm-1.26.tar.gz
+b0cd6c1681bbc0695d81be5cd852d1d0  Net_SSLeay.pm-1.30.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 15 14:23:44 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sun, 15 Jan 2006 09:23:44 -0500
Subject: rpms/digikam/devel digikam.spec,1.15,1.16
Message-ID: <200601151424.k0FEOLUM009687@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9670

Modified Files:
	digikam.spec 
Log Message:
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
- Add --disable-dependency-tracking & --enable-final



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- digikam.spec	14 Dec 2005 00:47:43 -0000	1.15
+++ digikam.spec	15 Jan 2006 14:23:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	11%{?dist}
+Release:	12%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -42,12 +42,14 @@
 %patch0 -p1
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -118,6 +120,10 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-dependency-tracking & --enable-final
+
 * Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-11
 - Add libart_lgpl-devel and gamin-devel to BR
 



From fedora-extras-commits at redhat.com  Sun Jan 15 14:38:16 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Sun, 15 Jan 2006 09:38:16 -0500
Subject: rpms/krusader/devel krusader.spec,1.7,1.8
Message-ID: <200601151438.k0FEcnUX009814@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9794

Modified Files:
	krusader.spec 
Log Message:
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
- Add --disable-debug --disable-dependency-tracking & --enable-final



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- krusader.spec	13 Dec 2005 23:47:57 -0000	1.7
+++ krusader.spec	15 Jan 2006 14:38:16 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -40,12 +40,14 @@
 %patch2 -p1
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
-	--disable-rpath
-
+	--disable-rpath \
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -96,13 +98,17 @@
 %{_datadir}/apps/konqueror/servicemenus/isoservice.desktop
 %{_datadir}/apps/krusader/
 %{_datadir}/config/kio_isorc
-%{_datadir}/doc/HTML/en/*
+%{_datadir}/doc/HTML/en/krusader/
 %{_datadir}/icons/hicolor/*/apps/*
 %{_mandir}/man1/krusader.1*
 %{_datadir}/services/iso.protocol
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 1.60.1-4
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-debug --disable-dependency-tracking & --enable-final
+
 * Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 1.60.1-3
 - Add to BR libacl-devel
 



From fedora-extras-commits at redhat.com  Sun Jan 15 16:11:54 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Sun, 15 Jan 2006 11:11:54 -0500
Subject: rpms/gajim/devel gajim-0.9.1.modularX.patch, NONE, 1.1 .cvsignore,
	1.4, 
	1.5 gajim.spec, 1.6, 1.7 sources, 1.4, 1.5 gajim-0.8.aplay.patch,
	1.1, NONE
Message-ID: <200601151612.k0FGCRcm013792@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13758

Modified Files:
	.cvsignore gajim.spec sources 
Added Files:
	gajim-0.9.1.modularX.patch 
Removed Files:
	gajim-0.8.aplay.patch 
Log Message:
- update to 0.9.1 (Eric Tanguy, #176614)
- drop aplay.patch
- fix compilation with modular X.Org X11R7


gajim-0.9.1.modularX.patch:

--- NEW FILE gajim-0.9.1.modularX.patch ---
diff -Nurp gajim-0.9.orig/src/common/Makefile gajim-0.9/src/common/Makefile
--- gajim-0.9.orig/src/common/Makefile	2005-12-23 14:20:58.000000000 +0100
+++ gajim-0.9/src/common/Makefile	2005-12-26 18:11:32.000000000 +0100
@@ -1,12 +1,12 @@
 # Set the C flags to include the GTK+ and Python libraries
 PYTHONVER = `python -c 'import sys; print sys.version[:3]'`
-CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0` -fpic -I/usr/include/python$(PYTHONVER) -I.
-LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0`
+CFLAGS = `pkg-config --cflags gtk+-2.0 pygtk-2.0 xscrnsaver` -fpic -I/usr/include/python$(PYTHONVER) -I.
+LDFLAGS = `pkg-config --libs gtk+-2.0 pygtk-2.0 xscrnsaver`
 
 all: idle.so
 
 idle.so:
-	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@ -L/usr/X11R6$(LIBDIR) -lX11 -lXss -lXext
+	$(CC) $(OPTFLAGS) $(CFLAGS) $(LDFLAGS) -shared idle.c $^ -o $@
 
 clean:
 	rm -f *.so


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Sep 2005 20:38:00 -0000	1.4
+++ .cvsignore	15 Jan 2006 16:11:52 -0000	1.5
@@ -1 +1 @@
-gajim-0.8.2.tar.bz2
+gajim-0.9.1.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gajim.spec	6 Sep 2005 20:38:00 -0000	1.6
+++ gajim.spec	15 Jan 2006 16:11:52 -0000	1.7
@@ -2,7 +2,7 @@
 %define         use_internal_modules   0
 
 Name:           gajim
-Version:        0.8.2
+Version:        0.9.1
 Release:        1%{?dist}
 Summary:        Jabber client written in PyGTK
 
@@ -10,12 +10,14 @@
 License:        GPL
 URL:            http://gajim.org/
 Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.8.aplay.patch
+Patch0:         gajim-0.9.1.modularX.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel
+BuildRequires:  intltool
+BuildRequires:  libXScrnSaver-devel
 BuildRequires:  pkgconfig
 BuildRequires:  pygtk2-devel
 BuildRequires:  python-devel
@@ -28,8 +30,10 @@
 %endif
 
 Requires:       dbus-python
-Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
+Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+Requires:       python-sqlite2
 
 %description
 Gajim is a Jabber client written in PyGTK. The goal of Gajim's developers is
@@ -41,12 +45,16 @@
 %setup -q
 %patch0 -p1
 
+sed -i -e 's/install\: all/install\:/' Makefile
+# gajim wants to handle executables; why?
+sed -i -e '/MimeType/d' gajim.desktop.in
 
 %build
 make \
 %if ! %{use_internal_modules}
 	translation \
 	idle \
+	gajim.desktop \
 %endif
 	CC="%{__cc}" \
 	LIBDIR="/%{_lib}" \
@@ -80,14 +88,21 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS Changelog
-%{_bindir}/*
+%{_bindir}/gajim
+%{_bindir}/gajim-remote
 %{_libdir}/gajim/
 %{_datadir}/applications/*gajim.desktop
 %{_datadir}/gajim/
 %{_datadir}/pixmaps/gajim*
-%{_mandir}/man1/gajim*
+%{_mandir}/man1/gajim.1*
+%{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Sun Jan 15 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-1
+- update to 0.9.1 (Eric Tanguy, #176614)
+- drop aplay.patch
+- fix compilation with modular X.Org X11R7
+
 * Tue Sep  6 2005 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.8.2-1
 - new version 0.8.2
 - remove patches .cflags, .po, .x86_64, .remote (pushed upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Sep 2005 20:38:00 -0000	1.4
+++ sources	15 Jan 2006 16:11:53 -0000	1.5
@@ -1 +1 @@
-14b00f8ed7d84d90793782db7df40ec1  gajim-0.8.2.tar.bz2
+ca82dfb7ab5c51984357ea7bab0e99af  gajim-0.9.1.tar.bz2


--- gajim-0.8.aplay.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 18:40:10 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 15 Jan 2006 13:40:10 -0500
Subject: rpms/qof/FC-4 qof-0.6.1-build.patch, NONE,
	1.1 qof-dependencies.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 qof.spec, 1.9, 1.10 sources, 1.2,
	1.3 qof-libxml-dependency.patch, 1.1,
	NONE qof-linker-dependency.patch, 1.1, NONE
Message-ID: <200601151840.k0FIehwU018155@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18128

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Removed Files:
	qof-libxml-dependency.patch qof-linker-dependency.patch 
Log Message:
* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
- Upgrade to 0.6.1.
- Drop patches integrated upstream.
- Remove static libs.
- Patch to add dependencies to the pkgconfig file and linked to the library.
- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
  used.  Also fix the make targets to build tests separately from the library.
- Enable %check as it works with the previous patch.
  
* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
- Upgrade to 0.6.0.
- Drop patches integrated upstream.
- Small patches for x86_64 and gcc4.
- Patch to work around upstream thinko regarding how gmodule works.


qof-0.6.1-build.patch:

--- NEW FILE qof-0.6.1-build.patch ---
Index: qof-0.6.1/qof/test/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.am
+++ qof-0.6.1/qof/test/Makefile.am
@@ -21,7 +21,6 @@ LDADD = \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
    ${LIBGDA_LIBS} \
-   -lltdl \
    -lm
 else
 LDADD = \
@@ -31,7 +30,6 @@ LDADD = \
    ${GLIB_LIBS} \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
-   -lltdl \
    -lm
 endif
 
@@ -60,7 +58,7 @@ test_querynew_SOURCES = \
   test-stuff.c \
   test-querynew.c
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
   test-book-merge \
   test-date \
   test-guid \
Index: qof-0.6.1/qof/test/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.in
+++ qof-0.6.1/qof/test/Makefile.in
@@ -36,9 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-book-merge$(EXEEXT) test-date$(EXEEXT) \
-	test-guid$(EXEEXT) test-numeric$(EXEEXT) test-object$(EXEEXT) \
-	test-querynew$(EXEEXT)
+noinst_PROGRAMS =
 subdir = qof/test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -356,7 +354,6 @@ INCLUDES = \
 @USE_LIBGDA_FALSE@   ${GLIB_LIBS} \
 @USE_LIBGDA_FALSE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_FALSE@   ${GOBJECT_LIBS} \
- at USE_LIBGDA_FALSE@   -lltdl \
 @USE_LIBGDA_FALSE@   -lm
 
 @USE_LIBGDA_TRUE at LDADD = \
@@ -366,7 +363,6 @@ INCLUDES = \
 @USE_LIBGDA_TRUE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_TRUE@   ${GOBJECT_LIBS} \
 @USE_LIBGDA_TRUE@   ${LIBGDA_LIBS} \
- at USE_LIBGDA_TRUE@   -lltdl \
 @USE_LIBGDA_TRUE@   -lm
 
 test_book_merge_SOURCES = \

qof-dependencies.patch:

--- NEW FILE qof-dependencies.patch ---
Index: qof-0.6.1/configure.in
===================================================================
--- qof-0.6.1.orig/configure.in
+++ qof-0.6.1/configure.in
@@ -127,20 +127,23 @@ if test "x$LIBGDA_LIBS" = x; then
   AC_MSG_RESULT([No, GDA not found; will build using internal SQL library.])
 	LIBQOFSQL_LIBRARY_VERSION=1:1:0
 	ADD_PKG_LIB="-lqofsql"
+	GDA_PKG_LIB=""
 	AC_SUBST(LIBQOFSQL_LIBRARY_VERSION)
 else
     GDA_VERSION=`$PKG_CONFIG --modversion libgda`
     AC_MSG_RESULT([yes, using GDA: ${GDA_VERSION}])
     AC_DEFINE(HAVE_GDA,,[We have found GDA])
-	ADD_PKG_LIB="-lgda-2"
+    ADD_PKG_LIB=""
+    GDA_PKG_LIB="libgda"
     HAVE_GDA="use_gda"
-	AC_SUBST(GDA_VERSION)
+    AC_SUBST(GDA_VERSION)
 fi
 
 AM_CONDITIONAL(USE_LIBGDA, [ test x"$HAVE_GDA" != x])
 AM_CONDITIONAL(USE_LIBGDA, [ test "$HAVE_GDA" = "use_gda"])
 AC_SUBST(USE_LIBGDA)
 AC_SUBST(ADD_PKG_LIB)
+AC_SUBST(GDA_PKG_LIB)
 
 dnl **************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics.
Index: qof-0.6.1/qof-1.pc.in
===================================================================
--- qof-0.6.1.orig/qof-1.pc.in
+++ qof-0.6.1/qof-1.pc.in
@@ -8,7 +8,7 @@ added_libs=@ADD_PKG_LIB@
 
 Name: QOF
 Description: QOF Query Object Framework Library.
-Requires: glib-2.0 libxml-2.0 >= 2-2.5.10
+Requires: glib-2.0 libxml-2.0 >= 2-2.5.10 gobject-2.0 gmodule-2.0 @GDA_PKG_LIB@
 Version: @VERSION@
-Libs: -L${libdir} -lqof ${added_libs}
+Libs: -L${libdir} -lqof -lm ${added_libs}
 Cflags: -I${includedir}/qof
Index: qof-0.6.1/qof/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/Makefile.am
+++ qof-0.6.1/qof/Makefile.am
@@ -96,10 +96,12 @@ INCLUDES = \
   -DDATADIR=\""$(datadir)"\"
 endif
 
-LDADD = \
+libqof_la_LIBADD = \
   ${LIBGDA_LIBS} \
   ${GMODULE_LIBS} \
-  ${GLIB_LIBS}
+  ${GOBJECT_LIBS} \
+  ${GLIB_LIBS} \
+  -lm
 
 EXTRA_DIST = \
   qofla-dir.h.in \
Index: qof-0.6.1/qof/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/Makefile.in
+++ qof-0.6.1/qof/Makefile.in
@@ -61,7 +61,11 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libqof_la_LIBADD =
+libqof_la_LIBADD = ${LIBGDA_LIBS} \
+		   ${GMODULE_LIBS} \
+		   ${GOBJECT_LIBS} \
+		   ${GLIB_LIBS} \
+		   -lm
 am_libqof_la_OBJECTS = gnc-date.lo gnc-engine-util.lo gnc-numeric.lo \
 	gnc-event.lo qoflog.lo guid.lo kvp_frame.lo kvp-util.lo md5.lo \
 	qofbackend.lo qofclass.lo qofchoice.lo qofgobj.lo qofid.lo \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:59 -0000	1.2
+++ .cvsignore	15 Jan 2006 18:40:10 -0000	1.3
@@ -1 +1 @@
-qof-0.5.0.tar.gz
+qof-0.6.1.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/qof.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qof.spec	23 Mar 2005 13:06:11 -0000	1.9
+++ qof.spec	15 Jan 2006 18:40:10 -0000	1.10
@@ -1,27 +1,24 @@
 Name:           qof
-Version:        0.5.0
-Release:        5
-Summary:        QOF provides a query engine library for C objects
+Version:        0.6.1
+Release:        1%{?dist}
+Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Adds libxml-2.0 as a dependent library to the pkg-config entry.
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/qof-libxml-dependency.patch
-# Adds libxml2 and glib to the library link so rpm can auto-detect depends.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/qof-linker-dependency.patch
+Patch0:		qof-0.6.1-build.patch
+Patch1:		qof-dependencies.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
+BuildRequires: libgda-devel
 BuildRequires: intltool
-# These are needed to compile the example programs.  I don't want the compiled
-# programs anyway so when we disable that we can get rid of these two.
-BuildRequires: libtool-ltdl-devel
-BuildRequires: gtk2-devel
-# Patch1 changes a Makefile.am so we have to regenerate the build files.
-BuildRequires: libtool
+# qof doesn't ship with pre-built documentation
+BuildRequires: doxygen
+# Patch1 modifies configure.in so we have to use autoconf
+BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -35,12 +32,26 @@
 query engine can be backed by an actual database, so that instances
 of local objects can act as a 'cache' to a much larger SQL database.
 
+%package	docs
+Summary:	API documentation for libqof
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+%description	docs
+QOF - The Query Object Framework is a C library that provides a query engine
+to C applications.  This allows SQL-like queries to be performes on a
+collection of C/C++ objects (which act like SQL tables).
+
+This package contains API documentation for programming against libqof.
+Install this package if you need information on writing a program that uses
+libqof.
+
 %package        devel
 Summary:        Development tools for programs which will use the qof library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
 Requires:       glib2-devel
+Requires:	libgda-devel
 Requires:       pkgconfig
 
 %description    devel
@@ -48,25 +59,25 @@
 to C applications.  This allows SQL-like queries to be performes on a
 collection of C/C++ objects (which act like SQL tables).
 
-This package contains the header files, static libraries, examples, and
-documentation to develop programs that will use the qof library.  You should
+This package contains the header files and  static libraries to develop
+programs that will use the qof library.  You should
 install this package if you need to develop programs which will use the qof
 library functions.  You'll also need to install the qof package.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-# The build architecture in the 0.5.0 release is somewhat broken.  Upstream
-# cvs has moved files from src/ to qof/ to address this.  This symlink
-# simulates that until a fixed version is released.
-ln -sf src qof
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf --force --install
-%configure
+autoconf --force
+%configure --disable-static
 make
 
+# qof doesn't build the documentation unless you build the doc target.
+# The doc target isn't written correctly either.
+cd doc; make doc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,16 +87,12 @@
 
 # Get documentation ready to ship
 mv doc/html .
-cd examples
-make clean
-rm -rf .deps .cvsignore
-cd gobject
-rm -rf .deps .cvsignore
+rm html/installdox
 
-%check || :
-#make test
-#make check
+%find_lang %{name}
 
+%check || :
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,20 +101,43 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_libdir}/*.so.*
+%{_datadir}/xml/qof/
 
 %files devel
 %defattr(-,root,root,0755)
-%doc html examples
+%doc ChangeLog
 %{_includedir}/qof
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files docs
+%defattr(-,root,root,-)
+%doc html
+
 %changelog
+* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
+- Upgrade to 0.6.1.
+- Drop patches integrated upstream.
+- Remove static libs.
+- Patch to add dependencies to the pkgconfig file and linked to the library.
+- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
+  used.  Also fix the make targets to build tests separately from the library.
+- Enable %%check as it works with the previous patch.
+  
+* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
+- Upgrade to 0.6.0.
+- Drop patches integrated upstream.
+- Small patches for x86_64 and gcc4.
+- Patch to work around upstream thinko regarding how gmodule works.
+
+* Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-6
+- Add dist tag.
+- Rebuild for devel (FC5).
+
 * Wed Mar 23 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-5
 - ltdl-devel package is libtool-ltdl-devel.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:59 -0000	1.2
+++ sources	15 Jan 2006 18:40:10 -0000	1.3
@@ -1 +1 @@
-a4937d0ad42d3b776b58bb7ee2505823  qof-0.5.0.tar.gz
+2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz


--- qof-libxml-dependency.patch DELETED ---


--- qof-linker-dependency.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 18:50:01 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 15 Jan 2006 13:50:01 -0500
Subject: rpms/qof/devel qof-0.6.1-build.patch, NONE,
	1.1 qof-dependencies.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 qof.spec, 1.10, 1.11 sources, 1.2,
	1.3 qof-libxml-dependency.patch, 1.1,
	NONE qof-linker-dependency.patch, 1.1, NONE
Message-ID: <200601151850.k0FIoYEg018254@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18227

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Removed Files:
	qof-libxml-dependency.patch qof-linker-dependency.patch 
Log Message:
* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
- Upgrade to 0.6.1.
- Drop patches integrated upstream.
- Remove static libs.
- Patch to add dependencies to the pkgconfig file and linked to the library.
- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
  used.  Also fix the make targets to build tests separately from the library.
- Enable %check as it works with the previous patch.
  
* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
- Upgrade to 0.6.0.
- Drop patches integrated upstream.
- Small patches for x86_64 and gcc4.
- Patch to work around upstream thinko regarding how gmodule works.


qof-0.6.1-build.patch:

--- NEW FILE qof-0.6.1-build.patch ---
Index: qof-0.6.1/qof/test/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.am
+++ qof-0.6.1/qof/test/Makefile.am
@@ -21,7 +21,6 @@ LDADD = \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
    ${LIBGDA_LIBS} \
-   -lltdl \
    -lm
 else
 LDADD = \
@@ -31,7 +30,6 @@ LDADD = \
    ${GLIB_LIBS} \
    ${GMODULE_LIBS} \
    ${GOBJECT_LIBS} \
-   -lltdl \
    -lm
 endif
 
@@ -60,7 +58,7 @@ test_querynew_SOURCES = \
   test-stuff.c \
   test-querynew.c
 
-noinst_PROGRAMS = \
+check_PROGRAMS = \
   test-book-merge \
   test-date \
   test-guid \
Index: qof-0.6.1/qof/test/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/test/Makefile.in
+++ qof-0.6.1/qof/test/Makefile.in
@@ -36,9 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = test-book-merge$(EXEEXT) test-date$(EXEEXT) \
-	test-guid$(EXEEXT) test-numeric$(EXEEXT) test-object$(EXEEXT) \
-	test-querynew$(EXEEXT)
+noinst_PROGRAMS =
 subdir = qof/test
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -356,7 +354,6 @@ INCLUDES = \
 @USE_LIBGDA_FALSE@   ${GLIB_LIBS} \
 @USE_LIBGDA_FALSE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_FALSE@   ${GOBJECT_LIBS} \
- at USE_LIBGDA_FALSE@   -lltdl \
 @USE_LIBGDA_FALSE@   -lm
 
 @USE_LIBGDA_TRUE at LDADD = \
@@ -366,7 +363,6 @@ INCLUDES = \
 @USE_LIBGDA_TRUE@   ${GMODULE_LIBS} \
 @USE_LIBGDA_TRUE@   ${GOBJECT_LIBS} \
 @USE_LIBGDA_TRUE@   ${LIBGDA_LIBS} \
- at USE_LIBGDA_TRUE@   -lltdl \
 @USE_LIBGDA_TRUE@   -lm
 
 test_book_merge_SOURCES = \

qof-dependencies.patch:

--- NEW FILE qof-dependencies.patch ---
Index: qof-0.6.1/configure.in
===================================================================
--- qof-0.6.1.orig/configure.in
+++ qof-0.6.1/configure.in
@@ -127,20 +127,23 @@ if test "x$LIBGDA_LIBS" = x; then
   AC_MSG_RESULT([No, GDA not found; will build using internal SQL library.])
 	LIBQOFSQL_LIBRARY_VERSION=1:1:0
 	ADD_PKG_LIB="-lqofsql"
+	GDA_PKG_LIB=""
 	AC_SUBST(LIBQOFSQL_LIBRARY_VERSION)
 else
     GDA_VERSION=`$PKG_CONFIG --modversion libgda`
     AC_MSG_RESULT([yes, using GDA: ${GDA_VERSION}])
     AC_DEFINE(HAVE_GDA,,[We have found GDA])
-	ADD_PKG_LIB="-lgda-2"
+    ADD_PKG_LIB=""
+    GDA_PKG_LIB="libgda"
     HAVE_GDA="use_gda"
-	AC_SUBST(GDA_VERSION)
+    AC_SUBST(GDA_VERSION)
 fi
 
 AM_CONDITIONAL(USE_LIBGDA, [ test x"$HAVE_GDA" != x])
 AM_CONDITIONAL(USE_LIBGDA, [ test "$HAVE_GDA" = "use_gda"])
 AC_SUBST(USE_LIBGDA)
 AC_SUBST(ADD_PKG_LIB)
+AC_SUBST(GDA_PKG_LIB)
 
 dnl **************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics.
Index: qof-0.6.1/qof-1.pc.in
===================================================================
--- qof-0.6.1.orig/qof-1.pc.in
+++ qof-0.6.1/qof-1.pc.in
@@ -8,7 +8,7 @@ added_libs=@ADD_PKG_LIB@
 
 Name: QOF
 Description: QOF Query Object Framework Library.
-Requires: glib-2.0 libxml-2.0 >= 2-2.5.10
+Requires: glib-2.0 libxml-2.0 >= 2-2.5.10 gobject-2.0 gmodule-2.0 @GDA_PKG_LIB@
 Version: @VERSION@
-Libs: -L${libdir} -lqof ${added_libs}
+Libs: -L${libdir} -lqof -lm ${added_libs}
 Cflags: -I${includedir}/qof
Index: qof-0.6.1/qof/Makefile.am
===================================================================
--- qof-0.6.1.orig/qof/Makefile.am
+++ qof-0.6.1/qof/Makefile.am
@@ -96,10 +96,12 @@ INCLUDES = \
   -DDATADIR=\""$(datadir)"\"
 endif
 
-LDADD = \
+libqof_la_LIBADD = \
   ${LIBGDA_LIBS} \
   ${GMODULE_LIBS} \
-  ${GLIB_LIBS}
+  ${GOBJECT_LIBS} \
+  ${GLIB_LIBS} \
+  -lm
 
 EXTRA_DIST = \
   qofla-dir.h.in \
Index: qof-0.6.1/qof/Makefile.in
===================================================================
--- qof-0.6.1.orig/qof/Makefile.in
+++ qof-0.6.1/qof/Makefile.in
@@ -61,7 +61,11 @@ am__strip_dir = `echo $$p | sed -e 's|^.
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(qofincludedir)"
 libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libqof_la_LIBADD =
+libqof_la_LIBADD = ${LIBGDA_LIBS} \
+		   ${GMODULE_LIBS} \
+		   ${GOBJECT_LIBS} \
+		   ${GLIB_LIBS} \
+		   -lm
 am_libqof_la_OBJECTS = gnc-date.lo gnc-engine-util.lo gnc-numeric.lo \
 	gnc-event.lo qoflog.lo guid.lo kvp_frame.lo kvp-util.lo md5.lo \
 	qofbackend.lo qofclass.lo qofchoice.lo qofgobj.lo qofid.lo \


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:17:59 -0000	1.2
+++ .cvsignore	15 Jan 2006 18:50:01 -0000	1.3
@@ -1 +1 @@
-qof-0.5.0.tar.gz
+qof-0.6.1.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qof.spec	17 Aug 2005 17:22:15 -0000	1.10
+++ qof.spec	15 Jan 2006 18:50:01 -0000	1.11
@@ -1,27 +1,24 @@
 Name:           qof
-Version:        0.5.0
-Release:        6%{?dist}
-Summary:        QOF provides a query engine library for C objects
+Version:        0.6.1
+Release:        1%{?dist}
+Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Adds libxml-2.0 as a dependent library to the pkg-config entry.
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/qof-libxml-dependency.patch
-# Adds libxml2 and glib to the library link so rpm can auto-detect depends.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/qof-linker-dependency.patch
+Patch0:		qof-0.6.1-build.patch
+Patch1:		qof-dependencies.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
 BuildRequires: glib2-devel
+BuildRequires: libgda-devel
 BuildRequires: intltool
-# These are needed to compile the example programs.  I don't want the compiled
-# programs anyway so when we disable that we can get rid of these two.
-BuildRequires: libtool-ltdl-devel
-BuildRequires: gtk2-devel
-# Patch1 changes a Makefile.am so we have to regenerate the build files.
-BuildRequires: libtool
+# qof doesn't ship with pre-built documentation
+BuildRequires: doxygen
+# Patch1 modifies configure.in so we have to use autoconf
+BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -35,12 +32,26 @@
 query engine can be backed by an actual database, so that instances
 of local objects can act as a 'cache' to a much larger SQL database.
 
+%package	docs
+Summary:	API documentation for libqof
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+%description	docs
+QOF - The Query Object Framework is a C library that provides a query engine
+to C applications.  This allows SQL-like queries to be performes on a
+collection of C/C++ objects (which act like SQL tables).
+
+This package contains API documentation for programming against libqof.
+Install this package if you need information on writing a program that uses
+libqof.
+
 %package        devel
 Summary:        Development tools for programs which will use the qof library
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       libxml2-devel
 Requires:       glib2-devel
+Requires:	libgda-devel
 Requires:       pkgconfig
 
 %description    devel
@@ -48,25 +59,25 @@
 to C applications.  This allows SQL-like queries to be performes on a
 collection of C/C++ objects (which act like SQL tables).
 
-This package contains the header files, static libraries, examples, and
-documentation to develop programs that will use the qof library.  You should
+This package contains the header files and  static libraries to develop
+programs that will use the qof library.  You should
 install this package if you need to develop programs which will use the qof
 library functions.  You'll also need to install the qof package.
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-# The build architecture in the 0.5.0 release is somewhat broken.  Upstream
-# cvs has moved files from src/ to qof/ to address this.  This symlink
-# simulates that until a fixed version is released.
-ln -sf src qof
+%patch0 -p1
+%patch1 -p1
 
 %build
-autoreconf --force --install
-%configure
+autoconf --force
+%configure --disable-static
 make
 
+# qof doesn't build the documentation unless you build the doc target.
+# The doc target isn't written correctly either.
+cd doc; make doc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,16 +87,12 @@
 
 # Get documentation ready to ship
 mv doc/html .
-cd examples
-make clean
-rm -rf .deps .cvsignore
-cd gobject
-rm -rf .deps .cvsignore
+rm html/installdox
 
-%check || :
-#make test
-#make check
+%find_lang %{name}
 
+%check || :
+make check
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,20 +101,39 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
+%doc AUTHORS COPYING NEWS README TODO
 %{_libdir}/*.so.*
+%{_datadir}/xml/qof/
 
 %files devel
 %defattr(-,root,root,0755)
-%doc html examples
+%doc ChangeLog
 %{_includedir}/qof
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files docs
+%defattr(-,root,root,-)
+%doc html
+
 %changelog
+* Sat Jan 14 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-1
+- Upgrade to 0.6.1.
+- Drop patches integrated upstream.
+- Remove static libs.
+- Patch to add dependencies to the pkgconfig file and linked to the library.
+- Patch to remove ltdl from the tests.  This is linked in but apparently isn't
+  used.  Also fix the make targets to build tests separately from the library.
+- Enable %%check as it works with the previous patch.
+  
+* Sun Oct 23 2005 Toshio Kuratomi <toshio-tiki-lunge.com> - 0.6.0-1
+- Upgrade to 0.6.0.
+- Drop patches integrated upstream.
+- Small patches for x86_64 and gcc4.
+- Patch to work around upstream thinko regarding how gmodule works.
+
 * Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.5.0-6
 - Add dist tag.
 - Rebuild for devel (FC5).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:17:59 -0000	1.2
+++ sources	15 Jan 2006 18:50:01 -0000	1.3
@@ -1 +1 @@
-a4937d0ad42d3b776b58bb7ee2505823  qof-0.5.0.tar.gz
+2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz


--- qof-libxml-dependency.patch DELETED ---


--- qof-linker-dependency.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 15 19:28:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 15 Jan 2006 14:28:19 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tkcvs.spec, 
	1.10, 1.11
Message-ID: <200601151928.k0FJSp8O020228@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/FC-3

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:48:21 -0000	1.5
+++ .cvsignore	15 Jan 2006 19:28:18 -0000	1.6
@@ -1 +1 @@
-tkcvs_8_0.tar.gz
+tkcvs_8_0_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 22:48:21 -0000	1.5
+++ sources	15 Jan 2006 19:28:18 -0000	1.6
@@ -1 +1 @@
-6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz
+cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tkcvs.spec	2 Jan 2006 22:48:21 -0000	1.10
+++ tkcvs.spec	15 Jan 2006 19:28:18 -0000	1.11
@@ -1,13 +1,13 @@
 Name:		tkcvs
-Version:	8.0
-Release:	2%{?dist}
+Version:	8.0.1
+Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0
+%setup -q -n tkcvs_8_0_1
 
 
 %build
@@ -64,6 +64,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
+- new version 8.0.1
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
 - new version 8.0
 



From fedora-extras-commits at redhat.com  Sun Jan 15 19:28:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 15 Jan 2006 14:28:24 -0500
Subject: rpms/tkcvs/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tkcvs.spec, 
	1.13, 1.14
Message-ID: <200601151928.k0FJSv6Q020233@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/FC-4

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Jan 2006 22:48:27 -0000	1.6
+++ .cvsignore	15 Jan 2006 19:28:24 -0000	1.7
@@ -1 +1 @@
-tkcvs_8_0.tar.gz
+tkcvs_8_0_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2006 22:48:27 -0000	1.6
+++ sources	15 Jan 2006 19:28:24 -0000	1.7
@@ -1 +1 @@
-6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz
+cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tkcvs.spec	2 Jan 2006 22:48:27 -0000	1.13
+++ tkcvs.spec	15 Jan 2006 19:28:24 -0000	1.14
@@ -1,13 +1,13 @@
 Name:		tkcvs
-Version:	8.0
-Release:	2%{?dist}
+Version:	8.0.1
+Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0
+%setup -q -n tkcvs_8_0_1
 
 
 %build
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
+- new version 8.0.1
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
 - new version 8.0
 



From fedora-extras-commits at redhat.com  Sun Jan 15 19:28:30 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 15 Jan 2006 14:28:30 -0500
Subject: rpms/tkcvs/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tkcvs.spec, 
	1.13, 1.14
Message-ID: <200601151929.k0FJT3T4020242@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/devel

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Jan 2006 22:48:33 -0000	1.6
+++ .cvsignore	15 Jan 2006 19:28:30 -0000	1.7
@@ -1 +1 @@
-tkcvs_8_0.tar.gz
+tkcvs_8_0_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2006 22:48:33 -0000	1.6
+++ sources	15 Jan 2006 19:28:30 -0000	1.7
@@ -1 +1 @@
-6ec5065548ac00e40d8d42b61d1c2dda  tkcvs_8_0.tar.gz
+cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tkcvs.spec	2 Jan 2006 22:48:33 -0000	1.13
+++ tkcvs.spec	15 Jan 2006 19:28:30 -0000	1.14
@@ -1,13 +1,13 @@
 Name:		tkcvs
-Version:	8.0
-Release:	2%{?dist}
+Version:	8.0.1
+Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0.tar.gz
+Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -33,13 +33,14 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0
+%setup -q -n tkcvs_8_0_1
 
 
 %build
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
 perl -pi -e 's|\[file join \$TclRoot tkcvs bitmaps\]|\[file join \$TCDIR bitmaps\]|' tkcvs/tkcvs.tcl
 
+
 %install
 install -d ${RPM_BUILD_ROOT}%{_datadir}
 install -d ${RPM_BUILD_ROOT}%{_bindir}
@@ -53,9 +54,11 @@
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
@@ -63,7 +66,11 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
+- new version 8.0.1
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0
 - new version 8.0
 



From fedora-extras-commits at redhat.com  Sun Jan 15 19:29:03 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 15 Jan 2006 14:29:03 -0500
Subject: rpms/gnome-blog/devel gnome-blog.spec,1.9,1.10
Message-ID: <200601151929.k0FJTaEn020308@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20247

Modified Files:
	gnome-blog.spec 
Log Message:
* Sun Jan 15 2006 Brian Pepple <bdpepple at ameritech.net> - 0.8-10
- Bump for FC5 rebuild.
- Added some macros.



Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnome-blog.spec	22 May 2005 14:10:11 -0000	1.9
+++ gnome-blog.spec	15 Jan 2006 19:29:03 -0000	1.10
@@ -4,15 +4,15 @@
 
 Name:		gnome-blog
 Version:	0.8
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	GNOME panel object for posting blog entries
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://www.gnome.org/~seth/gnome-blog/		
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.8/gnome-blog-0.8.tar.gz
-Patch1:		gnome-blog_makefile.patch
-Patch2:		gnome-blog-poster.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/%{name}/%{version}/%{name}-%{version}.tar.gz
+Patch1:		%{name}_makefile.patch
+Patch2:		%{name}-poster.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -55,14 +55,14 @@
 
 # gnome-blog makefile installs this, but we have to add some extra stuff for
 # fedora compliance
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnome-blog.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor=fedora			\
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
   --add-category=X-Fedora --add-category=Network	\
   %{name}.desktop
 
 # This is a program file and doesn't need to be placed in the library path
-rm -f $RPM_BUILD_ROOT/%{python_sitelib}/gnomeblog/gnome-blog-poster
+rm -f $RPM_BUILD_ROOT/%{python_sitelib}/gnomeblog/%{name}-poster
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,6 +93,10 @@
 %ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Brian Pepple <bdpepple at ameritech.net> - 0.8-10
+- Bump for FC5 rebuild.
+- Added some macros.
+
 * Sun May 22 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-9
 - Bump release > than FC3 version.
 - Add requires for gnome-python2-gtkspell.



From fedora-extras-commits at redhat.com  Mon Jan 16 01:35:32 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 15 Jan 2006 20:35:32 -0500
Subject: rpms/tclhttpd/devel tclhttpd.spec, 1.1, 1.2 tclhttpd_fedora.1.patch,
	1.1, 1.2
Message-ID: <200601160136.k0G1a5Mo032314@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32292

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Use ghosted files for runtime state files.
Update patch to remove build dependency on autoconf.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd.spec	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd.spec	16 Jan 2006 01:35:32 -0000	1.2
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch0:		tclhttpd_fedora.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: tcl-devel autoconf
+BuildRequires: tcl-devel
 Requires: tcl tclx tcllib fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -26,8 +26,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch -p1
-# Needed to pick up the changes to tcl.m4 in the patch.
-autoreconf
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -76,6 +74,11 @@
 rm $RPM_BUILD_ROOT/%{contentdir}/htdocs/cgi-bin/env
 mv $RPM_BUILD_ROOT/%{_prefix}/bin/httpd.tcl $RPM_BUILD_ROOT/%{_prefix}/bin/tclhttpd
 
+# Creating ghosted files
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lock/subsys
+touch $RPM_BUILD_ROOT/%{_var}/lock/subsys/tclhttpd
+touch $RPM_BUILD_ROOT/%{_var}/run/tclhttpd/tclhttpd.pid
+
 # Fix some file permissions.
 find $RPM_BUILD_ROOT/%{contentdir}/htdocs -type f -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT/%{contentdir}/custom -type f -exec chmod a-x {} \;
@@ -94,15 +97,12 @@
 if [ "$1" = "0" ]; then
     /sbin/service tclhttpd stop > /dev/null 2>&1
     /sbin/chkconfig --del tclhttpd
-    rm -f %_var/run/tclhttpd/tclhttpd.pid
-    rm -f %_var/lock/subsys/tclhttpd
 fi
 
 %postun
 
 if [ "$1" = "0" ]; then
     /usr/sbin/fedora-userdel tclhttpd
-    rm -rf %_var/log/tclhttpd
 elif [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
@@ -118,14 +118,19 @@
 %config(noreplace) %attr(-,tclhttpd,tclhttpd) %{_sysconfdir}/%{name}
 %{_mandir}/man1/*
 %config(noreplace) %contentdir
-%attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
+%dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
 %{_libdir}/crypt1.0
 %{_libdir}/limit1.0
 %doc src/README
+%ghost %{_var}/lock/subsys/tclhttpd
+%ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
+- Use ghosted files for runtime state files.
+- Update patch to remove build dependency on autoconf.
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd_fedora.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd_fedora.1.patch	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd_fedora.1.patch	16 Jan 2006 01:35:32 -0000	1.2
@@ -273,6 +273,19 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` ; do
  		    if test -f "$i/tkConfig.sh" ; then
+diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/configure tclhttpd3.5.1.new/configure
+--- tclhttpd3.5.1/configure	2004-05-28 14:00:58.000000000 -0700
++++ tclhttpd3.5.1.new/configure	2006-01-15 17:27:29.000000000 -0800
+@@ -1222,7 +1222,8 @@
+ 
+ 	    # check in a few common install locations
+ 	    if test x"${ac_cv_c_tclconfig}" = x ; then
+-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
++		for i in `ls -d ${libdir} 2>/dev/null` \
++		        `ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` ; do
+ 		    if test -f "$i/tclConfig.sh" ; then
 diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/lib/utils.tcl tclhttpd3.5.1.new/lib/utils.tcl
 --- tclhttpd3.5.1/lib/utils.tcl	2004-05-26 18:25:19.000000000 -0700
 +++ tclhttpd3.5.1.new/lib/utils.tcl	2004-10-30 16:37:33.000000000 -0700



From fedora-extras-commits at redhat.com  Mon Jan 16 01:48:32 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 15 Jan 2006 20:48:32 -0500
Subject: rpms/tclhttpd/FC-3 tclhttpd.spec, 1.1, 1.2 tclhttpd_fedora.1.patch, 
	1.1, 1.2
Message-ID: <200601160149.k0G1n4gj032400@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32362/FC-3

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Use ghosted files for runtime state files.
Update patch to remove build dependency on autoconf.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd.spec	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd.spec	16 Jan 2006 01:48:31 -0000	1.2
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch0:		tclhttpd_fedora.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: tcl-devel autoconf
+BuildRequires: tcl-devel
 Requires: tcl tclx tcllib fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -26,8 +26,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch -p1
-# Needed to pick up the changes to tcl.m4 in the patch.
-autoreconf
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -76,6 +74,11 @@
 rm $RPM_BUILD_ROOT/%{contentdir}/htdocs/cgi-bin/env
 mv $RPM_BUILD_ROOT/%{_prefix}/bin/httpd.tcl $RPM_BUILD_ROOT/%{_prefix}/bin/tclhttpd
 
+# Creating ghosted files
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lock/subsys
+touch $RPM_BUILD_ROOT/%{_var}/lock/subsys/tclhttpd
+touch $RPM_BUILD_ROOT/%{_var}/run/tclhttpd/tclhttpd.pid
+
 # Fix some file permissions.
 find $RPM_BUILD_ROOT/%{contentdir}/htdocs -type f -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT/%{contentdir}/custom -type f -exec chmod a-x {} \;
@@ -94,15 +97,12 @@
 if [ "$1" = "0" ]; then
     /sbin/service tclhttpd stop > /dev/null 2>&1
     /sbin/chkconfig --del tclhttpd
-    rm -f %_var/run/tclhttpd/tclhttpd.pid
-    rm -f %_var/lock/subsys/tclhttpd
 fi
 
 %postun
 
 if [ "$1" = "0" ]; then
     /usr/sbin/fedora-userdel tclhttpd
-    rm -rf %_var/log/tclhttpd
 elif [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
@@ -118,14 +118,19 @@
 %config(noreplace) %attr(-,tclhttpd,tclhttpd) %{_sysconfdir}/%{name}
 %{_mandir}/man1/*
 %config(noreplace) %contentdir
-%attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
+%dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
 %{_libdir}/crypt1.0
 %{_libdir}/limit1.0
 %doc src/README
+%ghost %{_var}/lock/subsys/tclhttpd
+%ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
+- Use ghosted files for runtime state files.
+- Update patch to remove build dependency on autoconf.
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd_fedora.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd_fedora.1.patch	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd_fedora.1.patch	16 Jan 2006 01:48:31 -0000	1.2
@@ -273,6 +273,19 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` ; do
  		    if test -f "$i/tkConfig.sh" ; then
+diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/configure tclhttpd3.5.1.new/configure
+--- tclhttpd3.5.1/configure	2004-05-28 14:00:58.000000000 -0700
++++ tclhttpd3.5.1.new/configure	2006-01-15 17:27:29.000000000 -0800
+@@ -1222,7 +1222,8 @@
+ 
+ 	    # check in a few common install locations
+ 	    if test x"${ac_cv_c_tclconfig}" = x ; then
+-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
++		for i in `ls -d ${libdir} 2>/dev/null` \
++		        `ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` ; do
+ 		    if test -f "$i/tclConfig.sh" ; then
 diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/lib/utils.tcl tclhttpd3.5.1.new/lib/utils.tcl
 --- tclhttpd3.5.1/lib/utils.tcl	2004-05-26 18:25:19.000000000 -0700
 +++ tclhttpd3.5.1.new/lib/utils.tcl	2004-10-30 16:37:33.000000000 -0700



From fedora-extras-commits at redhat.com  Mon Jan 16 01:48:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 15 Jan 2006 20:48:38 -0500
Subject: rpms/tclhttpd/FC-4 tclhttpd.spec, 1.1, 1.2 tclhttpd_fedora.1.patch, 
	1.1, 1.2
Message-ID: <200601160149.k0G1nAYN032407@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32362/FC-4

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Use ghosted files for runtime state files.
Update patch to remove build dependency on autoconf.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd.spec	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd.spec	16 Jan 2006 01:48:37 -0000	1.2
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -11,7 +11,7 @@
 Patch0:		tclhttpd_fedora.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: tcl-devel autoconf
+BuildRequires: tcl-devel
 Requires: tcl tclx tcllib fedora-usermgmt
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/service
@@ -26,8 +26,6 @@
 %prep
 %setup -q -n %{name}%{version}
 %patch -p1
-# Needed to pick up the changes to tcl.m4 in the patch.
-autoreconf
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -76,6 +74,11 @@
 rm $RPM_BUILD_ROOT/%{contentdir}/htdocs/cgi-bin/env
 mv $RPM_BUILD_ROOT/%{_prefix}/bin/httpd.tcl $RPM_BUILD_ROOT/%{_prefix}/bin/tclhttpd
 
+# Creating ghosted files
+mkdir -p $RPM_BUILD_ROOT/%{_var}/lock/subsys
+touch $RPM_BUILD_ROOT/%{_var}/lock/subsys/tclhttpd
+touch $RPM_BUILD_ROOT/%{_var}/run/tclhttpd/tclhttpd.pid
+
 # Fix some file permissions.
 find $RPM_BUILD_ROOT/%{contentdir}/htdocs -type f -exec chmod a-x {} \;
 find $RPM_BUILD_ROOT/%{contentdir}/custom -type f -exec chmod a-x {} \;
@@ -94,15 +97,12 @@
 if [ "$1" = "0" ]; then
     /sbin/service tclhttpd stop > /dev/null 2>&1
     /sbin/chkconfig --del tclhttpd
-    rm -f %_var/run/tclhttpd/tclhttpd.pid
-    rm -f %_var/lock/subsys/tclhttpd
 fi
 
 %postun
 
 if [ "$1" = "0" ]; then
     /usr/sbin/fedora-userdel tclhttpd
-    rm -rf %_var/log/tclhttpd
 elif [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
@@ -118,14 +118,19 @@
 %config(noreplace) %attr(-,tclhttpd,tclhttpd) %{_sysconfdir}/%{name}
 %{_mandir}/man1/*
 %config(noreplace) %contentdir
-%attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
+%dir %attr(-,tclhttpd,tclhttpd) %{_var}/run/tclhttpd
 %attr(-,tclhttpd,tclhttpd) %{_var}/log/tclhttpd
 %{_initrddir}/tclhttpd
 %{_libdir}/crypt1.0
 %{_libdir}/limit1.0
 %doc src/README
+%ghost %{_var}/lock/subsys/tclhttpd
+%ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
+- Use ghosted files for runtime state files.
+- Update patch to remove build dependency on autoconf.
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd_fedora.1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tclhttpd_fedora.1.patch	26 Nov 2005 00:23:05 -0000	1.1
+++ tclhttpd_fedora.1.patch	16 Jan 2006 01:48:37 -0000	1.2
@@ -273,6 +273,19 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` ; do
  		    if test -f "$i/tkConfig.sh" ; then
+diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/configure tclhttpd3.5.1.new/configure
+--- tclhttpd3.5.1/configure	2004-05-28 14:00:58.000000000 -0700
++++ tclhttpd3.5.1.new/configure	2006-01-15 17:27:29.000000000 -0800
+@@ -1222,7 +1222,8 @@
+ 
+ 	    # check in a few common install locations
+ 	    if test x"${ac_cv_c_tclconfig}" = x ; then
+-		for i in `ls -d ${prefix}/lib 2>/dev/null` \
++		for i in `ls -d ${libdir} 2>/dev/null` \
++		        `ls -d ${prefix}/lib 2>/dev/null` \
+ 			`ls -d /usr/lib 2>/dev/null` \
+ 			`ls -d /usr/local/lib 2>/dev/null` ; do
+ 		    if test -f "$i/tclConfig.sh" ; then
 diff -Naur --exclude '*.swp' --exclude tclhttpd.spec tclhttpd3.5.1/lib/utils.tcl tclhttpd3.5.1.new/lib/utils.tcl
 --- tclhttpd3.5.1/lib/utils.tcl	2004-05-26 18:25:19.000000000 -0700
 +++ tclhttpd3.5.1.new/lib/utils.tcl	2004-10-30 16:37:33.000000000 -0700



From fedora-extras-commits at redhat.com  Mon Jan 16 03:16:56 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 15 Jan 2006 22:16:56 -0500
Subject: rpms/gnotime/FC-4 gnotime-qof-0.6.patch, NONE, 1.1 .cvsignore, 1.2, 
	1.3 gnotime.spec, 1.9, 1.10 sources, 1.2,
	1.3 gnotime-desktop.patch, 1.1,
	NONE gnotime-gtkhtml3.6-qof.patch, 1.1,
	NONE gnotime-help-error.patch, 1.1, NONE gnotime-help.patch, 1.1,
	NONE gnotime-idle.patch, 1.1, NONE gnotime-popup-menus.patch,
	1.1, NONE gnotime-qof-include.patch, 1.1,
	NONE gnotime-separate-timeouts.patch, 1.1,
	NONE gnotime-wordwrap.patch, 1.1, NONE gtt_restartwin.png, 1.1,
	NONE gtt_startprojwin.png, 1.1, NONE
Message-ID: <200601160317.k0G3HSuO003738@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnotime/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3714

Modified Files:
	.cvsignore gnotime.spec sources 
Added Files:
	gnotime-qof-0.6.patch 
Removed Files:
	gnotime-desktop.patch gnotime-gtkhtml3.6-qof.patch 
	gnotime-help-error.patch gnotime-help.patch gnotime-idle.patch 
	gnotime-popup-menus.patch gnotime-qof-include.patch 
	gnotime-separate-timeouts.patch gnotime-wordwrap.patch 
	gtt_restartwin.png gtt_startprojwin.png 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
- Rebuild against new qof-0.6.1.
- Remove previous patches (merged upstream).
- Patch to fix the build for the qof-0.6 series.


gnotime-qof-0.6.patch:

--- NEW FILE gnotime-qof-0.6.patch ---
Index: gnotime-2.2.2/configure.in
===================================================================
--- gnotime-2.2.2.orig/configure.in
+++ gnotime-2.2.2/configure.in
@@ -52,7 +52,6 @@ LIBXML2_REQUIRED=2.0.0
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
 dnl Doesn't compile w/ qof-0.5.0
 LIBQOF_REQUIRED_MIN=0.6.0
-LIBQOF_REQUIRED_MAX=0.6.0
 
 
 dnl *******************************
@@ -169,7 +168,7 @@ AC_HELP_STRING([--with-system-qof],
 
 [
 if test x$withval = "xyes"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic.
@@ -180,8 +179,8 @@ else
 fi
 ],
 [
-if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2004 17:34:07 -0000	1.2
+++ .cvsignore	16 Jan 2006 03:16:54 -0000	1.3
@@ -1 +1 @@
-gnotime-2.2.1.tar.gz
+gnotime-2.2.2.tar.gz


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-4/gnotime.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnotime.spec	4 May 2005 00:07:12 -0000	1.9
+++ gnotime.spec	16 Jan 2006 03:16:54 -0000	1.10
@@ -1,36 +1,13 @@
 Name:           gnotime
-Version:        2.2.1
-Release:        8
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://gttr.sourceforge.net/
 Source0:        http://dl.sf.net/gttr/%{name}-%{version}.tar.gz
-# Images to go with the help files.
-Source1:        http://www.tiki-lounge.com/~toshio/fedora/gtt_restartwin.png
-Source2:        http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
-# Simple patch to make the .desktop more complete
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
-# Combined patch allowing builds with gtkhtml3.0 or 3.1 and
-# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.6-qof.patch
-# Fixes includes of qof headers in source files.
-Patch2:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
-# Fixes the idle timer for kernel 2.6.
-Patch3:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-idle.patch
-# Fixes problems with calls to gnome_help
-Patch4:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help.patch
-# Fixes problems with popup menus failing to pass data arguments to callbacks
-Patch5:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-popup-menus.patch
-# Fixes problem with gnome_help being invoked when the toplevel is unknown
-Patch6:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help-error.patch
-# Add wordwrapping to textviews
-Patch7:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
-# Adapt a patch from the gnotime issue tracker to separate the idle timeout
-# from the no project running timeout.
-Patch8:		http://www.tiki-lounge.com/~toshio/fedora/gnotime-separate-timeouts.patch
-
+Patch0:		gnotime-qof-0.6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
@@ -38,10 +15,11 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  qof-devel >= 0.5.0
-BuildRequires:  qof-devel < 0.6.0
-# Because we modify configure.in, we need to BR the auto* tools.
-BuildRequires:  libtool
+BuildRequires:  qof-devel >= 0.6.0
+# Patch0 modifies configure.in so we need autoconf
+BuildRequires: autoconf
+# To get rid of rpath, we need to use a fedora libtool
+BuildRequires: libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -61,30 +39,18 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
-
-cp $RPM_SOURCE_DIR/gtt_restartwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-cp $RPM_SOURCE_DIR/gtt_startprojwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-
-# Copy the images to the correct position
+%patch0 -p1
 
 %build
-autoreconf --install --force
-%GNUconfigure
-make
+autoconf
+%configure
+# Fix hardcoded rpath by using Fedora libtool
+make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Gnotime puts it's locale translations into gnotime-2.0.mo but it's gnome
@@ -110,9 +76,6 @@
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
-  # If applicable:
-  # gconftool-2 --makefile-uninstall-rule \
-  #  %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :
   killall -HUP gconfd-2 || :
   unset GCONF_CONFIG_SOURCE
 fi
@@ -148,6 +111,28 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
+- Rebuild against new qof-0.6.1.
+- Patch to fix the build for the qof-0.6 series.
+
+* Fri Sep 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-0
+- Update to 2.2.2.
+- Remove all patches as they've been merged upstream.
+- Build with internal qof as gnotime now depends on 0.6.0 which has not yet
+  been released.  Only build for devel/testing until we can use a released
+  version of qof.
+
+* Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-11
+- Fix the patch level on the new gtkhtml3 patch.
+
+* Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-10
+- Fix build for gtkhtml3-3.7.
+- Fix gtkhtml test to fail if gtkhtml3 is not installed.
+  
+* Wed Aug 17 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-9
+- Add dist tag.
+- Rebuild for devel.
+ 
 * Mon May 2 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-8
 - Add a patch adapted from the gnotime tracker.  Original patch by
   goedson-users.sf.net.  SF Tracker: 1171394.  This allows separate setting


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnotime/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2004 17:34:07 -0000	1.2
+++ sources	16 Jan 2006 03:16:54 -0000	1.3
@@ -1 +1 @@
-e2aad191b62b41da7f2176a028f1aaf9  gnotime-2.2.1.tar.gz
+8c05509f57a278de03a97fae110de3f5  gnotime-2.2.2.tar.gz


--- gnotime-desktop.patch DELETED ---


--- gnotime-gtkhtml3.6-qof.patch DELETED ---


--- gnotime-help-error.patch DELETED ---


--- gnotime-help.patch DELETED ---


--- gnotime-idle.patch DELETED ---


--- gnotime-popup-menus.patch DELETED ---


--- gnotime-qof-include.patch DELETED ---


--- gnotime-separate-timeouts.patch DELETED ---


--- gnotime-wordwrap.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 03:49:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 22:49:24 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon.spec,1.2,1.3
Message-ID: <200601160349.k0G3nu2O003847@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3830

Modified Files:
	SIMVoleon.spec 
Log Message:
Spec cleanup.


Index: SIMVoleon.spec
===================================================================
RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SIMVoleon.spec	27 May 2005 05:04:40 -0000	1.2
+++ SIMVoleon.spec	16 Jan 2006 03:49:24 -0000	1.3
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,7 +13,7 @@
 Summary: Volume rendering library for Coin
 Name: SIMVoleon
 Version: %{rpmvers}
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -94,28 +94,15 @@
 %doc %{coin_htmldir}/*
 
 %changelog
+* Mon Jan 15  2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.0.1-2
+- Rebuild.
+- Spec cleanup.
+
 * Sat May 21  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-1
 - FE submission candidate.
 
-* Sat May 21  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0.pm.3
-- Add x86_64 fixes.
-
-* Sat Mar 26  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0.pm.2
-- Provide SimVoleon and SimVoleon-devel.
-- Fix Copyright notice.
-
-* Fri Mar 25  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0.pm.1
-- Let *-devel Obsolete SimVoleon-devel.
-
-* Wed Mar 16  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-0
-- Upstream update for FC3.
-- Drop Epoch.
-
 * Mon Oct 11  2004 Ralf Corsepius <ralf at links2linux.de> - 0:2.0.0-0.fdr.1
 - Upstream update.
 
 * Tue Jul 27  2004 Ralf Corsepius <ralf at links2linux.de> - 0:1.0.0-0.fdr.1
 - Initial Fedora RPM.
-
-* Tue Jul 27  2004 Ralf Corsepius <ralf at links2linux.de> - 0:1.0.0-0.fdr.1
-- Initial Fedora RPM.



From fedora-extras-commits at redhat.com  Mon Jan 16 04:48:34 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Sun, 15 Jan 2006 23:48:34 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.24,1.25
Message-ID: <200601160449.k0G4n60f005894@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5877

Modified Files:
	Coin2.spec 
Log Message:
Add R: freetype-devel to devel package.


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Coin2.spec	22 Dec 2005 11:41:43 -0000	1.24
+++ Coin2.spec	16 Jan 2006 04:48:34 -0000	1.25
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2004, 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2004, 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -48,6 +48,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel bzip2-devel
+Requires: freetype-devel
 Requires: libGLU-devel
 
 %description devel
@@ -115,6 +116,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Mon Jan 16 2006 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-7
+- Add R: freetype-devel to devel package.
+
 * Thu Dec 22 2005 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-6
 - Remove hacks to mesa/X11 packaging bugs now reported to be fixed.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 05:03:53 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:03:53 -0500
Subject: rpms/git-core/devel .cvsignore, 1.14, 1.15 git.spec, 1.2,
	1.3 sources, 1.14, 1.15
Message-ID: <200601160504.k0G54Pc5007714@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7693

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Jan 2006 05:59:22 -0000	1.14
+++ .cvsignore	16 Jan 2006 05:03:53 -0000	1.15
@@ -1 +1 @@
-git-1.1.1.tar.gz
+git-1.1.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git.spec	11 Jan 2006 05:59:22 -0000	1.2
+++ git.spec	16 Jan 2006 05:03:53 -0000	1.3
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.1
+Version: 	1.1.2
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
+- git-1.1.2
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
 - git-1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Jan 2006 05:59:22 -0000	1.14
+++ sources	16 Jan 2006 05:03:53 -0000	1.15
@@ -1 +1 @@
-f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz
+b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:07:14 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:07:14 -0500
Subject: rpms/git-core/FC-4 .cvsignore, 1.14, 1.15 git.spec, 1.2, 1.3 sources,
	1.14, 1.15
Message-ID: <200601160507.k0G57l0r007806@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7785

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Jan 2006 06:01:32 -0000	1.14
+++ .cvsignore	16 Jan 2006 05:07:14 -0000	1.15
@@ -1 +1 @@
-git-1.1.1.tar.gz
+git-1.1.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git.spec	11 Jan 2006 06:01:32 -0000	1.2
+++ git.spec	16 Jan 2006 05:07:14 -0000	1.3
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.1
+Version: 	1.1.2
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
+- git-1.1.2
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
 - git-1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Jan 2006 06:01:32 -0000	1.14
+++ sources	16 Jan 2006 05:07:14 -0000	1.15
@@ -1 +1 @@
-f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz
+b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:09:22 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:09:22 -0500
Subject: rpms/git-core/FC-3 .cvsignore, 1.14, 1.15 git.spec, 1.2, 1.3 sources,
	1.14, 1.15
Message-ID: <200601160509.k0G59tdW007885@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7861

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	11 Jan 2006 06:05:47 -0000	1.14
+++ .cvsignore	16 Jan 2006 05:09:22 -0000	1.15
@@ -1 +1 @@
-git-1.1.1.tar.gz
+git-1.1.2.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- git.spec	11 Jan 2006 06:05:47 -0000	1.2
+++ git.spec	16 Jan 2006 05:09:22 -0000	1.3
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.1
+Version: 	1.1.2
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
+- git-1.1.2
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 1.1.1-1
 - git-1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	11 Jan 2006 06:05:47 -0000	1.14
+++ sources	16 Jan 2006 05:09:22 -0000	1.15
@@ -1 +1 @@
-f62fc5276642108469fccb45e020cb95  git-1.1.1.tar.gz
+b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:28:17 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:28:17 -0500
Subject: rpms/cogito/devel .cvsignore, 1.5, 1.6 cogito.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200601160528.k0G5So16008040@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 01:19:52 -0000	1.5
+++ .cvsignore	16 Jan 2006 05:28:15 -0000	1.6
@@ -1 +1 @@
-cogito-0.16.2.tar.gz
+cogito-0.16.3.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- cogito.spec	11 Jan 2006 01:52:42 -0000	1.7
+++ cogito.spec	16 Jan 2006 05:28:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.16.2
-Release: 	2%{?dist}
+Version: 	0.16.3
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 0.16.3-1
+- 0.16.3
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
 - add xmlto to BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 01:19:52 -0000	1.5
+++ sources	16 Jan 2006 05:28:15 -0000	1.6
@@ -1 +1 @@
-94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz
+e4773a360087b8c012519fba9a7b5205  cogito-0.16.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:30:16 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:30:16 -0500
Subject: rpms/cogito/FC-4 .cvsignore, 1.5, 1.6 cogito.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200601160530.k0G5Unf8008126@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8101

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 01:23:14 -0000	1.5
+++ .cvsignore	16 Jan 2006 05:30:16 -0000	1.6
@@ -1 +1 @@
-cogito-0.16.2.tar.gz
+cogito-0.16.3.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cogito.spec	11 Jan 2006 01:51:12 -0000	1.6
+++ cogito.spec	16 Jan 2006 05:30:16 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.16.2
-Release: 	2%{?dist}
+Version: 	0.16.3
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 0.16.3-1
+- 0.16.3
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
 - add xmlto to BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 01:23:14 -0000	1.5
+++ sources	16 Jan 2006 05:30:16 -0000	1.6
@@ -1 +1 @@
-94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz
+e4773a360087b8c012519fba9a7b5205  cogito-0.16.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:32:38 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 16 Jan 2006 00:32:38 -0500
Subject: rpms/cogito/FC-3 .cvsignore, 1.5, 1.6 cogito.spec, 1.6, 1.7 sources,
	1.5, 1.6
Message-ID: <200601160533.k0G5XANr008205@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8183

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update to cogito-0.16.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 01:25:44 -0000	1.5
+++ .cvsignore	16 Jan 2006 05:32:37 -0000	1.6
@@ -1 +1 @@
-cogito-0.16.2.tar.gz
+cogito-0.16.3.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cogito.spec	11 Jan 2006 01:43:39 -0000	1.6
+++ cogito.spec	16 Jan 2006 05:32:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.16.2
-Release: 	2%{?dist}
+Version: 	0.16.3
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -42,6 +42,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 0.16.3-1
+- 0.16.3
+
 * Tue Jan 10 2006 Chris Wright <chrisw at redhat.com> 0.16.2-2
 - add xmlto to BuildRequires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 01:25:44 -0000	1.5
+++ sources	16 Jan 2006 05:32:37 -0000	1.6
@@ -1 +1 @@
-94715ed584a24502a4a90702d60c1c21  cogito-0.16.2.tar.gz
+e4773a360087b8c012519fba9a7b5205  cogito-0.16.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 05:52:28 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 00:52:28 -0500
Subject: rpms/Coin2/devel Coin2.spec,1.25,1.26
Message-ID: <200601160553.k0G5r1Ye008379@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/Coin2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8362

Modified Files:
	Coin2.spec 
Log Message:
Add R: fontconfig-devel to devel.


Index: Coin2.spec
===================================================================
RCS file: /cvs/extras/rpms/Coin2/devel/Coin2.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Coin2.spec	16 Jan 2006 04:48:34 -0000	1.25
+++ Coin2.spec	16 Jan 2006 05:52:28 -0000	1.26
@@ -13,7 +13,7 @@
 Summary: High-level 3D visualization library
 Name: Coin2
 Version: 2.4.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Group: System Environment/Libraries
@@ -48,6 +48,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: zlib-devel bzip2-devel
+Requires: fontconfig-devel
 Requires: freetype-devel
 Requires: libGLU-devel
 
@@ -116,6 +117,9 @@
 %doc %{coin_htmldir}
 
 %changelog
+* Mon Jan 16 2006 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-8
+- Add R: fontconfig-devel to devel package.
+
 * Mon Jan 16 2006 Ralf Corsepius <rc040203 at freenet.de> - 2.4.4-7
 - Add R: freetype-devel to devel package.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 06:31:27 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 01:31:27 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon-2.0.1-gcc4.1.diff,NONE,1.1
Message-ID: <200601160631.k0G6VTLm010266@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10254

Added Files:
	SIMVoleon-2.0.1-gcc4.1.diff 
Log Message:
New.

SIMVoleon-2.0.1-gcc4.1.diff:

--- NEW FILE SIMVoleon-2.0.1-gcc4.1.diff ---
--- SIMVoleon-2.0.1.orig/lib/VolumeViz/misc/CvrCLUT.h	2004-12-20 15:54:48.000000000 +0100
+++ SIMVoleon-2.0.1/lib/VolumeViz/misc/CvrCLUT.h	2006-01-16 07:27:49.000000000 +0100
@@ -72,7 +72,7 @@
   void regenerateGLColorData(void);
 
   struct GLContextStorage {
-    GLContextStorage::GLContextStorage(uint32_t id)
+    GLContextStorage(uint32_t id)
     {
       this->texture1Dclut = 0;
       this->ctxid = id;
@@ -83,7 +83,7 @@
   };
   SbList<struct GLContextStorage *> contextlist;
   struct GlobalGLContextStorage {
-    GlobalGLContextStorage::GlobalGLContextStorage(void)
+    GlobalGLContextStorage(void)
     {
       this->fragmentprogramid[0] = this->fragmentprogramid[1] = 0;
     }



From fedora-extras-commits at redhat.com  Mon Jan 16 06:31:59 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:31:59 -0500
Subject: rpms/dejavu-fonts import.log,1.22,1.23
Message-ID: <200601160632.k0G6WWBW010320@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10283

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-1.fc5 on branch devel from dejavu-fonts-2.2-1.fc5.src.rpm
2.2 + fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- import.log	28 Dec 2005 20:45:48 -0000	1.22
+++ import.log	16 Jan 2006 06:31:59 -0000	1.23
@@ -19,3 +19,4 @@
 dejavu-fonts-2_1-1_fc5:HEAD:dejavu-fonts-2.1-1.fc5.src.rpm:1135802501
 dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614
 dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732
+dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042



From fedora-extras-commits at redhat.com  Mon Jan 16 06:32:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:32:05 -0500
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.7,
	1.8 sources, 1.7, 1.8
Message-ID: <200601160632.k0G6WbvQ010325@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10283/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-1.fc5 on branch devel from dejavu-fonts-2.2-1.fc5.src.rpm
2.2 + fontconfig changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:42:02 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:32:05 -0000	1.8
@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	28 Dec 2005 20:42:02 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 06:32:05 -0000	1.8
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.1
+Version:   2.2
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -11,6 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Conflicts: fontconfig < 2.3.93
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -30,11 +31,6 @@
 install -d -m 0755 %{buildroot}%{fontdir}
 install -m 0644 *.ttf  %{buildroot}%{fontdir}
 
-# "touch" all files we've got flagged as %ghost  but which are not 
-# present in the RPM_BUILD_ROOT when RPM looks for files
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-1
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-2
-
 %clean
 /bin/rm -rf %{buildroot}
 
@@ -59,10 +55,11 @@
 
 %dir %{fontdir}
 %{fontdir}/*.ttf
-%ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:42:02 -0000	1.7
+++ sources	16 Jan 2006 06:32:05 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 06:33:16 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 01:33:16 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon.spec,1.3,1.4
Message-ID: <200601160633.k0G6Xn3K010348@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10331

Modified Files:
	SIMVoleon.spec 
Log Message:
Add gcc4.1 patch.


Index: SIMVoleon.spec
===================================================================
RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SIMVoleon.spec	16 Jan 2006 03:49:24 -0000	1.3
+++ SIMVoleon.spec	16 Jan 2006 06:33:16 -0000	1.4
@@ -26,6 +26,7 @@
 Patch0: SIMVoleon-2.0.1-doxyfixes.diff
 Patch1: SIMVoleon-2.0.1-simacros.diff.bz2
 Patch2: SIMVoleon-2.0.1-libtool.diff.bz2
+Patch3: SIMVoleon-2.0.1-gcc4.1.diff
 
 BuildRequires: Coin2-devel
 BuildRequires: doxygen
@@ -53,6 +54,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 chmod +x cfg/doxy4win.pl
 
@@ -94,8 +96,9 @@
 %doc %{coin_htmldir}/*
 
 %changelog
-* Mon Jan 15  2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.0.1-2
+* Mon Jan 16  2006 Ralf Cors??pius <rc040203 at freenet.de> - 2.0.1-2
 - Rebuild.
+- Add gcc4.1 patch.
 - Spec cleanup.
 
 * Sat May 21  2005 Ralf Corsepius <ralf at links2linux.de> - 2.0.1-1



From fedora-extras-commits at redhat.com  Mon Jan 16 06:35:33 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:35:33 -0500
Subject: rpms/dejavu-fonts import.log,1.23,1.24
Message-ID: <200601160636.k0G6a5b5010475@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10414

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-1.fc4 on branch FC-4 from dejavu-fonts-2.2-1.fc4.src.rpm
2.2 + fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- import.log	16 Jan 2006 06:31:59 -0000	1.23
+++ import.log	16 Jan 2006 06:35:32 -0000	1.24
@@ -20,3 +20,4 @@
 dejavu-fonts-2_1-1_fc4:FC-4:dejavu-fonts-2.1-1.fc4.src.rpm:1135802614
 dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732
 dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042
+dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322



From fedora-extras-commits at redhat.com  Mon Jan 16 06:35:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:35:38 -0500
Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.6, 
	1.7 sources, 1.7, 1.8
Message-ID: <200601160636.k0G6aB6s010480@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10414/FC-4

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-1.fc4 on branch FC-4 from dejavu-fonts-2.2-1.fc4.src.rpm
2.2 + fontconfig changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:43:55 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:35:38 -0000	1.8
@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejavu-fonts.spec	28 Dec 2005 20:43:55 -0000	1.6
+++ dejavu-fonts.spec	16 Jan 2006 06:35:38 -0000	1.7
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.1
+Version:   2.2
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -11,6 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Conflicts: fontconfig > = 2.3.93
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -63,6 +64,10 @@
 %ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+- Conflict on newer fontconfig (yes you have to use the FC5 rpm with this one)
+
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:43:55 -0000	1.7
+++ sources	16 Jan 2006 06:35:38 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 06:44:28 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 01:44:28 -0500
Subject: rpms/SIMVoleon/devel SIMVoleon-2.0.1-gcc4.1.diff,1.1,1.2
Message-ID: <200601160645.k0G6j0JS010546@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/SIMVoleon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10521

Modified Files:
	SIMVoleon-2.0.1-gcc4.1.diff 
Log Message:
Add lib/VolumeViz/render/common/CvrTextureObject.h

SIMVoleon-2.0.1-gcc4.1.diff:

Index: SIMVoleon-2.0.1-gcc4.1.diff
===================================================================
RCS file: /cvs/extras/rpms/SIMVoleon/devel/SIMVoleon-2.0.1-gcc4.1.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SIMVoleon-2.0.1-gcc4.1.diff	16 Jan 2006 06:31:27 -0000	1.1
+++ SIMVoleon-2.0.1-gcc4.1.diff	16 Jan 2006 06:44:27 -0000	1.2
@@ -18,3 +18,14 @@
      {
        this->fragmentprogramid[0] = this->fragmentprogramid[1] = 0;
      }
+--- SIMVoleon-2.0.1.orig/lib/VolumeViz/render/common/CvrTextureObject.h	2004-12-20 15:54:48.000000000 +0100
++++ SIMVoleon-2.0.1/lib/VolumeViz/render/common/CvrTextureObject.h	2006-01-16 07:43:01.000000000 +0100
+@@ -106,7 +106,7 @@
+ 
+   static CvrTextureObject * findInstanceMatch(const SoType t,
+                                               const struct CvrTextureObject::EqualityComparison & cmp);
+-  unsigned long CvrTextureObject::hashKey(void) const;
++  unsigned long hashKey(void) const;
+   static unsigned long hashKey(const struct CvrTextureObject::EqualityComparison & cmp);
+ };
+ 



From fedora-extras-commits at redhat.com  Mon Jan 16 06:47:49 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:47:49 -0500
Subject: rpms/dejavu-fonts import.log,1.24,1.25
Message-ID: <200601160648.k0G6mLjO010638@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10604

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-1.fc3 on branch FC-3 from dejavu-fonts-2.2-1.fc3.src.rpm
2.2 + fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- import.log	16 Jan 2006 06:35:32 -0000	1.24
+++ import.log	16 Jan 2006 06:47:49 -0000	1.25
@@ -21,3 +21,4 @@
 dejavu-fonts-2_1-1_fc3:FC-3:dejavu-fonts-2.1-1.fc3.src.rpm:1135802732
 dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042
 dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322
+dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980



From fedora-extras-commits at redhat.com  Mon Jan 16 06:47:55 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 01:47:55 -0500
Subject: rpms/dejavu-fonts/FC-3 .cvsignore, 1.7, 1.8 dejavu-fonts.spec, 1.6, 
	1.7 sources, 1.7, 1.8
Message-ID: <200601160648.k0G6mRNc010643@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10604/FC-3

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.2-1.fc3 on branch FC-3 from dejavu-fonts-2.2-1.fc3.src.rpm
2.2 + fontconfig changes


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	28 Dec 2005 20:45:53 -0000	1.7
+++ .cvsignore	16 Jan 2006 06:47:54 -0000	1.8
@@ -1 +1 @@
-dejavu-ttf-2.1.tar.gz
+dejavu-ttf-2.2.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dejavu-fonts.spec	28 Dec 2005 20:45:53 -0000	1.6
+++ dejavu-fonts.spec	16 Jan 2006 06:47:54 -0000	1.7
@@ -2,7 +2,7 @@
 %define fontdir         %{_datadir}/fonts/dejavu
 
 Name:      dejavu-fonts
-Version:   2.1
+Version:   2.2
 Release:   1%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
@@ -33,7 +33,6 @@
 # "touch" all files we've got flagged as %ghost  but which are not 
 # present in the RPM_BUILD_ROOT when RPM looks for files
 /bin/touch %{buildroot}%{fontdir}/fonts.cache-1
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-2
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -60,9 +59,14 @@
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
+- 2.2
+- should conflict with the fontconfig version where fonts.cache-2 was 
+  introduces, but this is FC-3 and I don't care
+- probably last FC-3 package
+
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	28 Dec 2005 20:45:53 -0000	1.7
+++ sources	16 Jan 2006 06:47:54 -0000	1.8
@@ -1 +1 @@
-3cfda3005e611319ee12d8d418976595  dejavu-ttf-2.1.tar.gz
+cfd45d17c2bffc761997cfcb00040e1f  dejavu-ttf-2.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 08:27:05 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 16 Jan 2006 03:27:05 -0500
Subject: rpms/showimg/FC-4 .cvsignore, 1.2, 1.3 showimg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601160827.k0G8RbDs014586@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14548/FC-4

Modified Files:
	.cvsignore showimg.spec sources 
Log Message:
- version 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2005 23:49:56 -0000	1.2
+++ .cvsignore	16 Jan 2006 08:27:04 -0000	1.3
@@ -1 +1 @@
-showimg-0.9.4-1.tar.bz2
+showimg-0.9.5.tar.bz2


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
+++ showimg.spec	16 Jan 2006 08:27:04 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           showimg
-Version:        0.9.4.1
-Release:        4%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.jalix.org/projects/showimg
-Source0:        http://www.jalix.org/projects/showimg/download/0.9.4-1/showimg-0.9.4-1.tar.bz2
+Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -14,6 +14,7 @@
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  libkipi-devel, libkexif-devel, libexif-devel
+BuildRequires:  mysql-devel, postgresql-devel, libpqxx-devel
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -25,8 +26,28 @@
 numerous image formats.
 
 
+%package mysql
+Summary:        MySQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description mysql
+This is the plugin to use MySQL as the backend for Showimg's image
+database
+
+
+%package pgsql
+Summary:        PostgreSQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description pgsql
+This is the plugin to use PostgreSQL as the backend for Showimg's image
+database
+
+
 %prep
-%setup -q -n %{name}-0.9.4-1
+%setup -q
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
 
@@ -34,6 +55,11 @@
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-rpath \
            --disable-debug \
+           --enable-libkipi \
+           --enable-mysql \
+           --enable-pgsql \
+           --with-kexif \
+           --with-showimgdb
 #           --enable-final \
 
 make %{?_smp_mflags}
@@ -66,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc showimg/AUTHORS showimg/COPYING showimg/ChangeLog showimg/NEWS showimg/README
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/%{name}
@@ -75,14 +101,28 @@
 %{_datadir}/apps/showimgpart/showimgpart.rc
 %{_datadir}/services/showimgpart.desktop
 %{_datadir}/icons/*/*/apps/*
-%{_mandir}/man1/*
 %{_datadir}/doc/HTML/*/%{name}
 %{_datadir}/mimelnk/image/*.desktop
 %{_libdir}/kde3/libshowimgpart.*
 %{_libdir}/libshowimgcore.*
+%{_libdir}/kde3/showimg_kexidb_sqlite*driver.*
+%{_libdir}/libshowimgkexi*
+%{_datadir}/services/showimg_kexidb_sqlite*driver.desktop
+%{_datadir}/servicetypes/showimg_kexidb_driver.desktop
+
+%files mysql
+%{_libdir}/kde3/showimg_kexidb_mysqldriver.*
+%{_datadir}/services/showimg_kexidb_mysqldriver.desktop
+
+%files pgsql
+%{_libdir}/kde3/showimg_kexidb_pqxxsqldriver.*
+%{_datadir}/services/showimg_kexidb_pqxxsqldriver.desktop
 
 
 %changelog
+* Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
+- version 0.9.5
+
 * Sun Jul 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0.9.4.1-4
 - rebuild for libexif
 - use dist tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jan 2005 23:49:56 -0000	1.2
+++ sources	16 Jan 2006 08:27:04 -0000	1.3
@@ -1 +1 @@
-d6cebe9a627aaa4f0ec57e95f403d5fa  showimg-0.9.4-1.tar.bz2
+281c5f5e65ca14c69810d2099c43a4b8  showimg-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 16 08:27:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 16 Jan 2006 03:27:11 -0500
Subject: rpms/showimg/devel .cvsignore, 1.2, 1.3 showimg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601160827.k0G8RhKg014591@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14548/devel

Modified Files:
	.cvsignore showimg.spec sources 
Log Message:
- version 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jan 2005 23:49:56 -0000	1.2
+++ .cvsignore	16 Jan 2006 08:27:10 -0000	1.3
@@ -1 +1 @@
-showimg-0.9.4-1.tar.bz2
+showimg-0.9.5.tar.bz2


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- showimg.spec	24 Jul 2005 11:07:39 -0000	1.4
+++ showimg.spec	16 Jan 2006 08:27:10 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           showimg
-Version:        0.9.4.1
-Release:        4%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.jalix.org/projects/showimg
-Source0:        http://www.jalix.org/projects/showimg/download/0.9.4-1/showimg-0.9.4-1.tar.bz2
+Source0:        http://www.jalix.org/projects/showimg/download/0.9.5/showimg-0.9.5.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -14,6 +14,7 @@
 BuildRequires:  gettext
 BuildRequires:  glib2-devel
 BuildRequires:  libkipi-devel, libkexif-devel, libexif-devel
+BuildRequires:  mysql-devel, postgresql-devel, libpqxx-devel
 
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -25,8 +26,28 @@
 numerous image formats.
 
 
+%package mysql
+Summary:        MySQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description mysql
+This is the plugin to use MySQL as the backend for Showimg's image
+database
+
+
+%package pgsql
+Summary:        PostgreSQL plugin for the Showimg image database
+Group:          Applications/Multimedia
+Requires:       %{name} = %{version}
+
+%description pgsql
+This is the plugin to use PostgreSQL as the backend for Showimg's image
+database
+
+
 %prep
-%setup -q -n %{name}-0.9.4-1
+%setup -q
 #perl -pi -e 's/KDE_DOCS=AUTO/KDE_DOCS=showimg/g' doc/??/Makefile.am
 
 
@@ -34,6 +55,11 @@
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 %configure --disable-rpath \
            --disable-debug \
+           --enable-libkipi \
+           --enable-mysql \
+           --enable-pgsql \
+           --with-kexif \
+           --with-showimgdb
 #           --enable-final \
 
 make %{?_smp_mflags}
@@ -66,7 +92,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc showimg/AUTHORS showimg/COPYING showimg/ChangeLog showimg/NEWS showimg/README
 %{_bindir}/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/%{name}
@@ -75,14 +101,28 @@
 %{_datadir}/apps/showimgpart/showimgpart.rc
 %{_datadir}/services/showimgpart.desktop
 %{_datadir}/icons/*/*/apps/*
-%{_mandir}/man1/*
 %{_datadir}/doc/HTML/*/%{name}
 %{_datadir}/mimelnk/image/*.desktop
 %{_libdir}/kde3/libshowimgpart.*
 %{_libdir}/libshowimgcore.*
+%{_libdir}/kde3/showimg_kexidb_sqlite*driver.*
+%{_libdir}/libshowimgkexi*
+%{_datadir}/services/showimg_kexidb_sqlite*driver.desktop
+%{_datadir}/servicetypes/showimg_kexidb_driver.desktop
+
+%files mysql
+%{_libdir}/kde3/showimg_kexidb_mysqldriver.*
+%{_datadir}/services/showimg_kexidb_mysqldriver.desktop
+
+%files pgsql
+%{_libdir}/kde3/showimg_kexidb_pqxxsqldriver.*
+%{_datadir}/services/showimg_kexidb_pqxxsqldriver.desktop
 
 
 %changelog
+* Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
+- version 0.9.5
+
 * Sun Jul 24 2005 Aurelien Bompard <gauret[AT]free.fr> 0.9.4.1-4
 - rebuild for libexif
 - use dist tags


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jan 2005 23:49:56 -0000	1.2
+++ sources	16 Jan 2006 08:27:10 -0000	1.3
@@ -1 +1 @@
-d6cebe9a627aaa4f0ec57e95f403d5fa  showimg-0.9.4-1.tar.bz2
+281c5f5e65ca14c69810d2099c43a4b8  showimg-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 16 09:29:40 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 04:29:40 -0500
Subject: rpms/perl-HTML-Tree/devel .cvsignore, 1.2, 1.3 perl-HTML-Tree.spec, 
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601160930.k0G9UCG3017152@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-HTML-Tree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17129

Modified Files:
	.cvsignore perl-HTML-Tree.spec sources 
Log Message:
- Spec cleanup.
- Filter Provides: perl(main).
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Feb 2005 19:36:38 -0000	1.2
+++ .cvsignore	16 Jan 2006 09:29:39 -0000	1.3
@@ -1 +1 @@
-HTML-Tree-3.18.tar.gz
+HTML-Tree-3.1901.tar.gz


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTML-Tree.spec	6 Apr 2005 22:12:45 -0000	1.3
+++ perl-HTML-Tree.spec	16 Jan 2006 09:29:39 -0000	1.4
@@ -1,19 +1,19 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-HTML-Tree
-Version:        3.18
-Release:        3
+Version:        3.1901
+Release:        1%{?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/S/SB/SBURKE/HTML-Tree-3.18.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1 perl(HTML::Parser)
+BuildRequires:  perl(HTML::Parser) >= 2.19
+BuildRequires:  perl(HTML::Tagset) >= 3.02
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -28,6 +28,14 @@
 %setup -q -n HTML-Tree-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(main)$/d'
+EOF
+%define __perl_provides %{_builddir}/HTML-Tree-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -42,7 +50,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +66,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-1
+- Spec cleanup.
+- Filter Provides: perl(main).
+- Upstream update.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Feb 2005 19:36:38 -0000	1.2
+++ sources	16 Jan 2006 09:29:39 -0000	1.3
@@ -1 +1 @@
-6a9e4e565648c9772e7d8ec6d4392497  HTML-Tree-3.18.tar.gz
+9b41dfed97605891829746433e6d2d7b  HTML-Tree-3.1901.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 09:40:22 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 04:40:22 -0500
Subject: rpms/perl-HTML-Tree/devel perl-HTML-Tree.spec,1.4,1.5
Message-ID: <200601160940.k0G9esfP017236@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-HTML-Tree/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213

Modified Files:
	perl-HTML-Tree.spec 
Log Message:
- BR: perl(Test::Pod).




Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/devel/perl-HTML-Tree.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Tree.spec	16 Jan 2006 09:29:39 -0000	1.4
+++ perl-HTML-Tree.spec	16 Jan 2006 09:40:22 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-HTML-Tree
 Version:        3.1901
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        HTML tree handling modules for Perl
 
@@ -14,6 +14,9 @@
 BuildRequires:  perl(HTML::Parser) >= 2.19
 BuildRequires:  perl(HTML::Tagset) >= 3.02
 
+# For improved tests
+BuildRequires:	perl(Test::Pod) >= 1.00
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -66,6 +69,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-2
+- BR: perl(Test::Pod).
+
 * Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-1
 - Spec cleanup.
 - Filter Provides: perl(main).



From fedora-extras-commits at redhat.com  Mon Jan 16 09:52:25 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 04:52:25 -0500
Subject: rpms/perl-HTML-Tree/FC-4 .cvsignore, 1.2, 1.3 perl-HTML-Tree.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601160952.k0G9qwrX017373@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-HTML-Tree/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17352

Modified Files:
	.cvsignore perl-HTML-Tree.spec sources 
Log Message:
Backport from devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Feb 2005 19:36:38 -0000	1.2
+++ .cvsignore	16 Jan 2006 09:52:25 -0000	1.3
@@ -1 +1 @@
-HTML-Tree-3.18.tar.gz
+HTML-Tree-3.1901.tar.gz


Index: perl-HTML-Tree.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-4/perl-HTML-Tree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTML-Tree.spec	6 Apr 2005 22:12:45 -0000	1.3
+++ perl-HTML-Tree.spec	16 Jan 2006 09:52:25 -0000	1.4
@@ -1,19 +1,22 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-HTML-Tree
-Version:        3.18
-Release:        3
+Version:        3.1901
+Release:        2%{?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/S/SB/SBURKE/HTML-Tree-3.18.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/HTML-Tree-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1 perl(HTML::Parser)
+BuildRequires:  perl(HTML::Parser) >= 2.19
+BuildRequires:  perl(HTML::Tagset) >= 3.02
+
+# For improved tests
+BuildRequires:	perl(Test::Pod) >= 1.00
+
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -28,6 +31,14 @@
 %setup -q -n HTML-Tree-%{version}
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' htmltree
 
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+    sed -e '/^perl(main)$/d'
+EOF
+%define __perl_provides %{_builddir}/HTML-Tree-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -42,7 +53,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -58,6 +69,14 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-2
+- BR: perl(Test::Pod).
+
+* Mon Jan 16 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.1901-1
+- Spec cleanup.
+- Filter Provides: perl(main).
+- Upstream update.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Tree/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Feb 2005 19:36:38 -0000	1.2
+++ sources	16 Jan 2006 09:52:25 -0000	1.3
@@ -1 +1 @@
-6a9e4e565648c9772e7d8ec6d4392497  HTML-Tree-3.18.tar.gz
+9b41dfed97605891829746433e6d2d7b  HTML-Tree-3.1901.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 10:19:03 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 16 Jan 2006 05:19:03 -0500
Subject: rpms/lighttpd/devel .cvsignore, 1.12, 1.13 lighttpd.spec, 1.17,
	1.18 sources, 1.12, 1.13
Message-ID: <200601161019.k0GAJcjC019192@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19167

Modified Files:
	.cvsignore lighttpd.spec sources 
Log Message:
Update to 1.4.9.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Nov 2005 14:54:32 -0000	1.12
+++ .cvsignore	16 Jan 2006 10:18:56 -0000	1.13
@@ -1 +1 @@
-lighttpd-1.4.8.tar.gz
+lighttpd-1.4.9.tar.gz


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lighttpd.spec	23 Nov 2005 14:54:32 -0000	1.17
+++ lighttpd.spec	16 Jan 2006 10:18:56 -0000	1.18
@@ -2,7 +2,7 @@
 
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
-Version: 1.4.8
+Version: 1.4.9
 Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
@@ -173,6 +173,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-1
+- Update to 1.4.9.
+
 * Wed Nov 23 2005 Matthias Saou <http://freshrpms.net/> 1.4.8-1
 - Update to 1.4.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Nov 2005 14:54:32 -0000	1.12
+++ sources	16 Jan 2006 10:18:56 -0000	1.13
@@ -1 +1 @@
-7d7790ef95ff5755f73bfcda4f13696d  lighttpd-1.4.8.tar.gz
+20a171774a0615069de3704db52483aa  lighttpd-1.4.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 11:17:22 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Mon, 16 Jan 2006 06:17:22 -0500
Subject: rpms/licq/devel licq-1.3.2-libdir.patch,NONE,1.1 licq.spec,1.3,1.4
Message-ID: <200601161117.k0GBHsbw021255@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21229

Modified Files:
	licq.spec 
Added Files:
	licq-1.3.2-libdir.patch 
Log Message:
compile on x86-64


licq-1.3.2-libdir.patch:

--- NEW FILE licq-1.3.2-libdir.patch ---
--- licq-1.3.2/plugins/osd/src/Makefile.am.libdir	2006-01-13 15:06:36.000000000 +0100
+++ licq-1.3.2/plugins/osd/src/Makefile.am	2006-01-13 15:06:51.000000000 +0100
@@ -1,4 +1,4 @@
-libdir=$(prefix)/lib/licq
+#libdir=$(prefix)/lib/licq
 localedir=$(datadir)/locale
 
 AM_CXXFLAGS =  -I$(LICQ_INCLUDES) -I.. @LIBXOSD_CFLAGS@ -DLOCALEDIR=\"$(localedir)\"
--- licq-1.3.2/plugins/qt-gui/src/Makefile.am.libdir	2006-01-13 15:07:26.000000000 +0100
+++ licq-1.3.2/plugins/qt-gui/src/Makefile.am	2006-01-13 15:07:34.000000000 +0100
@@ -1,7 +1,7 @@
 EXTRA_DIST = xpm
 
 #hack, FIXME this in a clean manner
-libdir=$(prefix)/lib/licq
+#libdir=$(prefix)/lib/licq
 licq_incdir = $(LICQ_INCLUDES)
 
 AM_CPPFLAGS = -D_REENTRANT \


Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- licq.spec	12 Jan 2006 15:39:28 -0000	1.3
+++ licq.spec	16 Jan 2006 11:17:21 -0000	1.4
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 3
+Release: 4
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -12,6 +12,7 @@
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
 Patch1: licq-1.3.2-gcc-4_1-patch
+Patch2: licq-1.3.2-libdir.patch
 
 %package kde
 Summary: Licq plugin for KDE
@@ -42,33 +43,40 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b gcc-4_1
-#remove cvs 
+%patch1 -p1 -b .gcc-4_1
+%patch2 -p1 -b .libdir
+
+#remove cvs stuff
 rm -rf `find . -name CVS`
 
 %build
-%configure --enable-gpgme --enable-openssl
-cd plugins
-cp -r qt-gui kde-gui
-cd kde-gui
-%configure --with-kde
-cd ../qt-gui
 %configure
-cd ../osd
-%configure
-
-export OPT="$RPM_OPT_FLAGS"
-cd ../..
-make
-cd plugins/kde-gui
 make
+cd plugins
+  cp -r qt-gui kde-gui
+  cd kde-gui
+  aclocal
+  automake
+  perl am_edit {src/,share/,po/}Makefile.in
+  autoconf
+  export KDEDIR=/usr/%_lib
+  %configure --with-kde --libdir=%{_libdir}/licq
+  make
 cd ../qt-gui
-make
-#create Qt qm files
-cd po
-lrelease *.ts
+  aclocal
+  automake
+  perl am_edit {src/,share/,po/}Makefile.in
+  autoconf
+  %configure --libdir=%{_libdir}/licq
+  make
+  #create Qt qm files
+  cd po
+  lrelease *.ts
 cd ../../osd
-make
+  rm -rf autom4te.cache
+  ./build
+  %configure --libdir=%{_libdir}/licq
+  make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,6 +98,8 @@
 #remove devel 
 rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la
+#remove licq.desktop installed by makefile
+rm -f $RPM_BUILD_ROOT/%{_libdir}/share/applnk/Internet/licq.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +148,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Mon Jan 16 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-4
+- compile on x86-64
+
 * Thu Jan 12 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-3
 - remove devel stuff with rm -rf
 



From fedora-extras-commits at redhat.com  Mon Jan 16 11:42:26 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 06:42:26 -0500
Subject: rpms/krusader/devel krusader.spec,1.8,1.9
Message-ID: <200601161142.k0GBgwha021370@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21353

Modified Files:
	krusader.spec 
Log Message:
- Remove --disable-dependency-tracking



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- krusader.spec	15 Jan 2006 14:38:16 -0000	1.8
+++ krusader.spec	16 Jan 2006 11:42:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -46,7 +46,6 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
 	--enable-final
 make %{?_smp_mflags}
 
@@ -105,6 +104,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 1.60.1-5
+- Remove --disable-dependency-tracking
+
 * Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 1.60.1-4
 - Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
 - Add --disable-debug --disable-dependency-tracking & --enable-final



From fedora-extras-commits at redhat.com  Mon Jan 16 11:55:59 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 06:55:59 -0500
Subject: rpms/krusader/devel krusader.spec,1.9,1.10
Message-ID: <200601161156.k0GBuWRG021493@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/krusader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21476

Modified Files:
	krusader.spec 
Log Message:
- Remove --enable-final



Index: krusader.spec
===================================================================
RCS file: /cvs/extras/rpms/krusader/devel/krusader.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krusader.spec	16 Jan 2006 11:42:26 -0000	1.9
+++ krusader.spec	16 Jan 2006 11:55:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		krusader
 Version:	1.60.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -45,8 +45,7 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug \
-	--enable-final
+	--disable-debug
 make %{?_smp_mflags}
 
 %install
@@ -104,6 +103,9 @@
 %{_datadir}/services/krarc.protocol
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 1.60.1-6
+- Remove --enable-final
+
 * Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 1.60.1-5
 - Remove --disable-dependency-tracking
 



From fedora-extras-commits at redhat.com  Mon Jan 16 12:13:57 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 07:13:57 -0500
Subject: rpms/digikam/devel digikam.spec,1.16,1.17
Message-ID: <200601161214.k0GCEX0l023303@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23279

Modified Files:
	digikam.spec 
Log Message:
- Remove --enable-final (caused compilation errors)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- digikam.spec	15 Jan 2006 14:23:43 -0000	1.16
+++ digikam.spec	16 Jan 2006 12:13:56 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -48,8 +48,7 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -120,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
+- Remove --enable-final (caused compilation errors)
+
 * Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
 - Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
 - Add --disable-dependency-tracking & --enable-final



From fedora-extras-commits at redhat.com  Mon Jan 16 12:34:38 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 16 Jan 2006 07:34:38 -0500
Subject: rpms/digikam/devel digikam.spec,1.17,1.18
Message-ID: <200601161235.k0GCZA8w023443@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23426

Modified Files:
	digikam.spec 
Log Message:
- Remove --disable-dependency-tracking



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- digikam.spec	16 Jan 2006 12:13:56 -0000	1.17
+++ digikam.spec	16 Jan 2006 12:34:37 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -47,8 +47,7 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug \
-	--disable-dependency-tracking
+	--disable-debug
 make %{?_smp_mflags}
 
 %install
@@ -119,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
+- Remove --disable-dependency-tracking
+
 * Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
 - Remove --enable-final (caused compilation errors)
 



From fedora-extras-commits at redhat.com  Mon Jan 16 13:13:04 2006
From: fedora-extras-commits at redhat.com (Paul Nasrat (pnasrat))
Date: Mon, 16 Jan 2006 08:13:04 -0500
Subject: rpms/splint/devel splint.spec,1.3,1.4
Message-ID: <200601161313.k0GDDaeM025270@cvs-int.fedora.redhat.com>

Author: pnasrat

Update of /cvs/extras/rpms/splint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25253

Modified Files:
	splint.spec 
Log Message:
rebuild


Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- splint.spec	28 Jul 2005 19:13:20 -0000	1.3
+++ splint.spec	16 Jan 2006 13:13:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Sun Jan 15 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-11
+- Rebuild for FC5
+
 * Thu Jul 28 2005 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-10
 - Turn off parallel builds
 



From fedora-extras-commits at redhat.com  Mon Jan 16 13:14:38 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 16 Jan 2006 08:14:38 -0500
Subject: fedora-security/audit fc5,1.37,1.38
Message-ID: <200601161314.k0GDEcI0025352@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25314

Modified Files:
	fc5 
Log Message:
Bring fc5 file up to date with test2 (partial description of method
attached).  For future reference, this took 9 hours in total.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fc5	12 Jan 2006 16:44:15 -0000	1.37
+++ fc5	16 Jan 2006 13:14:31 -0000	1.38
@@ -1,110 +1,117 @@
-Up to date CVE as of CVE email 20060111
-Up to date FC5 as of FC5-Test1-RC
+Up to date CVE as of CVE email 20060115
+Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
 (iiimf, libungif, slocate)
 2. Verified all marked as 'version', inc tricky packages like openssl 
 and httpd
-3. Looked at those marked backport where we ship a newer version, manually
-looked at rest marked backport
+3. Looked at those markedbackport where we ship a newer version, manually
+looked at rest marked  backport
 4. Looked at CVE for any new packages added to FC5
 5. Filed tracking bugs for vulnerable issues
+6. Looked at extra packages in test2 which have had security issues
+(mono, nss, php-pear)
+7. Double check vulnerables and file fc5test2 bugs
 
 ** are items that need attention
 
+CVE-2006-0208 ** php
+CVE-2006-0207 ** php
+CVE-2006-0200 ** php (5.1.0, 5.1.1 only)
+CVE-2006-0197 ** xorg-x11
+CVE-2006-0144 ** php-pear
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root
-CVE-2006-0095 VULNERABLE (kernel)
+CVE-2006-0095 VULNERABLE (kernel) bz#177916
 CVE-2006-0082 version (ImageMagick, not 6.2.5.4)
-CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
-CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
-CVE-2006-0035 VULNERABLE (kernel)
-CVE-2005-4639 VULNERABLE (kernel)
-CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
-CVE-2005-4618 VULNERABLE (kernel, fixed 2.6.15)
-CVE-2005-4605 VULNERABLE (kernel) bz#176814
-CVE-2005-4585 VULNERABLE (ethereal, fixed 0.10.14)
+CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2005-4639 version (kernel, fixed 2.6.15)
+CVE-2005-4635 version (kernel, fixed 2.6.15)
+CVE-2005-4618 version (kernel, fixed 2.6.15)
+CVE-2005-4605 version (kernel, fixed 2.6.15)
+CVE-2005-4585 version (ethereal, fixed 0.10.14)
 CVE-2005-4442 version (openldap) gentoo only
-CVE-2005-4348 VULNERABLE (fetchmail, fixed 6.3.1)
-CVE-2005-4268 blocked (cpio) by FORTIFY_SOURCE
+CVE-2005-4348 version (fetchmail, fixed 6.3.1)
+CVE-2005-4268 backport (cpio) also blocked by FORTIFY_SOURCE
 CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment
 CVE-2005-4154 ignore (php) don't install untrusted pear packages
-CVE-2005-4153 VULNERABLE (mailman)
+CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch
 CVE-2005-4134 ignore (mozilla) http://www.mozilla.org/security/history-title.html
 CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html
 CVE-2005-4130 ** (HelixPlayer) no information available
 CVE-2005-4126 ** (HelixPlayer) no information available
-CVE-2005-4077 VULNERABLE (curl)
-CVE-2005-3964 VULNERABLE (openmotif)
-CVE-2005-3962 VULNERABLE (perl)
-CVE-2005-3912 ** (perl)
+CVE-2005-4077 version (curl, fixed 7.15.1)
+CVE-2005-3964 VULNERABLE (openmotif) bz#177915
+CVE-2005-3962 backport (perl) perl-5.8.7-CVE-2005-3962-bz174684.patch
 CVE-2005-3896 ignore (mozilla) recoverable DoS only
-CVE-2005-3883 VULNERABLE (php)
+CVE-2005-3883 version (php, fixed 5.1.1 at least)
 CVE-2005-3858 version (kernel, fixed 2.6.13)
-CVE-2005-3857 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1-git3
+CVE-2005-3857 version (kernel, fixed 2.6.15)
 CVE-2005-3848 version (kernel, fixed 2.6.13)
 CVE-2005-3847 version (kernel, fixed 2.6.12.6)
-CVE-2005-3810 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
-CVE-2005-3809 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
-CVE-2005-3808 VULNERABLE (kernel)
-CVE-2005-3807 backport (kernel) patch-2.6.15-rc1-git3
+CVE-2005-3810 version (kernel, fixed 2.6.15)
+CVE-2005-3809 version (kernel, fixed 2.6.15)
+CVE-2005-3808 version (kernel, fixed 2.6.15)
+CVE-2005-3807 version (kernel, fixed 2.6.15)
 CVE-2005-3806 version (kernel, fixed 2.6.14)
 CVE-2005-3805 version (kernel, fixed 2.6.14)
-CVE-2005-3784 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
-CVE-2005-3783 backport (kernel, fixed 2.6.15) patch-2.6.15-rc1
+CVE-2005-3784 version (kernel, fixed 2.6.15)
+CVE-2005-3783 version (kernel, fixed 2.6.15)
 CVE-2005-3753 version (kernel, fixed 2.6.14) also not a vuln
 CVE-2005-3745 ignore (struts, fixed 1.2.8) but not through tomcat
-CVE-2005-3732 VULNERABLE (ipsec-tools, fixed 0.6.3) BZ#174165
-CVE-2005-3675 VULNERABLE (kernel) optack
-CVE-2005-3671 VULNERABLE (openswan, fixed 2.4.4) BZ#174165
+CVE-2005-3732 version (ipsec-tools, fixed 0.6.3)
+CVE-2005-3675 VULNERABLE (kernel) optack, no upstream fix
+CVE-2005-3671 version (openswan, fixed 2.4.4)
 CVE-2005-3662 version (netpbm)
-CVE-2005-3656 VULNERABLE (mod_auth_pgsql, fixed 2.0.3)
-CVE-2005-3651 VULNERABLE (ethereal)
+CVE-2005-3656 version (mod_auth_pgsql, fixed 2.0.3)
+CVE-2005-3651 version (ethereal, fixed 0.10.14)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
-CVE-2005-3628 VULNERABLE (xpdf)
-CVE-2005-3628 VULNERABLE (tetex)
-CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3628 VULNERABLE (kdegraphics)
-CVE-2005-3628 VULNERABLE (cups)
-CVE-2005-3627 VULNERABLE (xpdf)
-CVE-2005-3627 VULNERABLE (tetex)
-CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3627 VULNERABLE (kdegraphics)
-CVE-2005-3627 VULNERABLE (cups)
-CVE-2005-3626 VULNERABLE (xpdf)
-CVE-2005-3626 VULNERABLE (tetex)
-CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3626 VULNERABLE (kdegraphics)
-CVE-2005-3626 VULNERABLE (cups)
-CVE-2005-3625 VULNERABLE (xpdf)
-CVE-2005-3625 VULNERABLE (tetex)
-CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3625 VULNERABLE (kdegraphics)
-CVE-2005-3625 VULNERABLE (cups)
-CVE-2005-3624 VULNERABLE (xpdf)
-CVE-2005-3624 VULNERABLE (tetex)
-CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3624 VULNERABLE (kdegraphics)
-CVE-2005-3624 VULNERABLE (cups)
-CVE-2005-3623 VULNERABLE (kernel, fixed 2.6.14.5)
+CVE-2005-3628 VULNERABLE (xpdf) bz#177911
+CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3628 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3627 VULNERABLE (xpdf) bz#177911
+CVE-2005-3627 VULNERABLE (tetex) bz#177912
+CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3627 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3626 VULNERABLE (xpdf) bz#177911
+CVE-2005-3626 VULNERABLE (tetex) bz#177912
+CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3626 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3625 VULNERABLE (xpdf) bz#177911
+CVE-2005-3625 VULNERABLE (tetex) bz#177912
+CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3625 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3624 VULNERABLE (xpdf) bz#177911
+CVE-2005-3624 VULNERABLE (tetex) bz#177912
+CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3624 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3623 version (kernel, fixed 2.6.14.5)
 CVE-2005-3582 version (ImageMagick) gentoo only
-CVE-2005-3573 VULNERABLE (mailman) not fixed 2.1.6 BZ#174166
+CVE-2005-3573 VULNERABLE (mailman, not fixed 2.1.6) bz#174166
 CVE-2005-3527 version (kernel, fixed 2.6.14 at least)
 CVE-2005-3402 ignore (thunderbird) mozilla say by design
 CVE-2005-3392 version (php, not 5.0)
 CVE-2005-3391 version (php, not 5.0)
-CVE-2005-3390 VULNERABLE (php) BZ#174167
-CVE-2005-3389 VULNERABLE (php) BZ#174168
-CVE-2005-3388 VULNERABLE (php) BZ#174169
+CVE-2005-3390 VULNERABLE (php) bz#174167
+CVE-2005-3389 version (php, fixed 5.1.1)
+CVE-2005-3388 version (php, fixed 5.1.1)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56, or 2.2.0)
+CVE-2005-3357 VULNERABLE (httpd, affects 2.2.0) bz#177914
 CVE-2005-3353 version (php, not 5.0)
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1)
+CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1) bz#177913
 CVE-2005-3351 version (spamassassin, fixed 3.1.0)
 CVE-2005-3322 version (squid) not upstream, SUSE only
 CVE-2005-3319 ignore (mod_php) no security consequence
-CVE-2005-3313 backport (ethereal, fixed after 0.10.13)
+CVE-2005-3313 version (ethereal, fixed after 0.10.13)
 CVE-2005-3276 version (kernel, fixed 2.6.12.4)
 CVE-2005-3275 version (kernel, fixed 2.6.13)
 CVE-2005-3274 version (kernel, fixed 2.6.13)
@@ -112,7 +119,7 @@
 CVE-2005-3272 version (kernel, fixed 2.6.13)
 CVE-2005-3271 version (kernel, fixed 2.6.9)
 CVE-2005-3258 version (squid, fixed 2.5STABLE12)
-CVE-2005-3257 backport (kernel, fixed 2.6.15-rc1) patch-2.6.15-rc1.bz2
+CVE-2005-3257 version (kernel, fixed 2.6.15)
 CVE-2005-3249 version (ethereal, fixed 0.10.13)
 CVE-2005-3248 version (ethereal, fixed 0.10.13)
 CVE-2005-3247 version (ethereal, fixed 0.10.13)
@@ -122,18 +129,21 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13)
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
-CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3193 VULNERABLE (tetex)
-CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3193 VULNERABLE (kdegraphics)
-CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3192 VULNERABLE (tetex)
-CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3192 VULNERABLE (kdegraphics)
-CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1)
-CVE-2005-3191 VULNERABLE (tetex)
-CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4)
-CVE-2005-3191 VULNERABLE (kdegraphics)
+CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3193 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3192 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
+CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch
+CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4) bz#177910
+CVE-2005-3191 VULNERABLE (kdegraphics) bz#177908
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
@@ -160,12 +170,12 @@
 CVE-2005-3011 backport (texinfo)
 CVE-2005-2991 ignore (ncompress) don't ship zdiff or zcmp scripts
 CVE-2005-2978 version (netpbm, fixed 10.25)
-CVE-2005-2977 backport (pam)
+CVE-2005-2977 version (pam, fixed 0.99.2.1 at least)
 CVE-2005-2976 backport (gdk-pixbuf)
 CVE-2005-2975 version (gtk2, fixed 2.8.7)
 CVE-2005-2975 backport (gdk-pixbuf)
 CVE-2005-2973 version (kernel, fixed 2.6.14 at least)
-CVE-2005-2970 VULNERABLE (httpd, fixed 2.0.55) BZ#174170
+CVE-2005-2970 version (httpd, fixed 2.0.55)
 CVE-2005-2969 version (openssl, fixed 0.9.8a)
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h)
 CVE-2005-2968 version (thunderbird)
@@ -173,7 +183,7 @@
 CVE-2005-2968 version (firefox)
 CVE-2005-2959 ignore (sudo) not a vulnerability
 CVE-2005-2946 version (openssl, fixed 0.9.8)
-CVE-2005-2933 VULNERABLE (libc-client) BZ#174171
+CVE-2005-2933 version (libc-client, fixed 2004g at least)
 CVE-2005-2929 backport (lynx)
 CVE-2005-2917 version (squid, fixed 2.5.STABLE11)
 CVE-2005-2876 version (util-linux, fixed 2.13-pre3)
@@ -190,9 +200,9 @@
 CVE-2005-2797 version (openssh, fixed 4.2)
 CVE-2005-2796 version (squid, fixed 2.5.STABLE11)
 CVE-2005-2794 version (squid, fixed 2.5.STABLE11)
-CVE-2005-2728 backport (httpd, fixed 2.0.55) 
+CVE-2005-2728 version (httpd, fixed 2.0.55) 
 CVE-2005-2710 version (HelixPlayer, fixed 1.0.6)
-CVE-2005-2709 VULNERABLE (kernel, fixed 2.6.14.3)
+CVE-2005-2709 version (kernel, fixed 2.6.14.3)
 CVE-2005-2708 ignore (kernel) not reproducable on x86_64
 CVE-2005-2707 version (thunderbird)
 CVE-2005-2707 version (mozilla, fixed 1.7.12)
@@ -214,7 +224,7 @@
 CVE-2005-2702 version (firefox, fixed 1.0.7)
 CVE-2005-2701 version (mozilla, fixed 1.7.12)
 CVE-2005-2701 version (firefox, fixed 1.0.7)
-CVE-2005-2700 backport (httpd, fixed 2.0.55) 
+CVE-2005-2700 version (httpd, fixed 2.0.55) 
 CVE-2005-2693 backport (cvs) cvs-1.11.19-tmp.patch
 CVE-2005-2672 backport (lm_sensors)
 CVE-2005-2666 version (openssh, fixed 4.0p1)
@@ -244,8 +254,8 @@
 CVE-2005-2491 ignore (php) php uses system pcre
 CVE-2005-2491 ignore (httpd) httpd uses system pcre
 CVE-2005-2490 version (kernel, fixed 2.6.13.1)
-CVE-2005-2475 backport (unzip)
-CVE-2005-2471 backport (netpbm, fixed 10.31 at least) netpbm-10.28-CAN-2005-2471.patch
+CVE-2005-2475 backport (unzip) unzip-5.52-toctou.patch
+CVE-2005-2471 verison (netpbm, fixed 10.31)
 CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible
 CVE-2005-2458 version (kernel, fixed 2.6.12.5)
 CVE-2005-2457 version (kernel, fixed 2.6.12.5)
@@ -310,7 +320,7 @@
 CVE-2005-2096 version (rpm, fixed 4.4.2)
 CVE-2005-2096 backport (zlib, fixed 1.2.2.4)
 CVE-2005-2095 version (squirrelmail, fixed 1.4.5)
-CVE-2005-2088 backport (httpd, fixed 2.0.55)
+CVE-2005-2088 version (httpd, fixed 2.0.55)
 CVE-2005-2069 version (nss_ldap, fixed pam_ldap:180)
 CVE-2005-2069 backport (openldap) openldap-2.2.13-tls-fix-connection-test.patch
 CVE-2005-2023 version (gnupg, fixed 1.9.15)
@@ -342,9 +352,9 @@
 CVE-2005-1751 ignore (ncpfs) part of shtool in ncpfs is not vulnerable
 CVE-2005-1740 version (net-snmp, fixed 5.2.2.rc5 at least)
 CVE-2005-1739 version (ImageMagick, fixed 6.2.2.3)
-CVE-2005-1705 backport (gdb)
+CVE-2005-1705 backport (gdb) gdb-6.3-security-errata-20050610.patch
 CVE-2005-1704 version (binutils, fixed 2.16.91.0.3 at least)
-CVE-2005-1704 backport (gdb)
+CVE-2005-1704 backport (gdb) gdb-6.3-security-errata-20050610.patch
 CVE-2005-1689 version (krb5, fixed 1.4.2)
 CVE-2005-1686 ignore (gedit) not a vulnerability
 CVE-2005-1636 version (mysql, fixed 4.1.12)
@@ -388,7 +398,7 @@
 CVE-2005-1277 ignore (dupe)
 CVE-2005-1275 version (ImageMagick, fixed 6.2.2)
 CVE-2005-1269 version (gaim, fixed 1.3.1)
-CVE-2005-1268 backport (httpd, fixed 2.0.55)
+CVE-2005-1268 version (httpd, fixed 2.0.55)
 CVE-2005-1267 version (tcpdump, fixed 3.9.4 at least)
 CVE-2005-1266 version (spamassassin, fixed 3.0.4)
 CVE-2005-1265 version (kernel)
@@ -459,7 +469,7 @@
 CVE-2005-0760 version (ImageMagick, fixed 6.0)
 CVE-2005-0759 version (ImageMagick, fixed 6.0)
 CVE-2005-0758 version (gzip, fixed 1.3.5)
-CVE-2005-0758 VULNERABLE (bzip2) BZ#174172
+CVE-2005-0758 backport (bzip2)
 CVE-2005-0757 version (kernel, not 2.6)
 CVE-2005-0756 version (kernel, fixed 2.6.12)
 CVE-2005-0755 version (HelixPlayer, fixed 10.0.4)
@@ -482,6 +492,7 @@
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10)
 CVE-2005-0605 version (libXpm, fixed 3.5.4 at least) 
+CVE-2005-0605 backport (openmotif)
 CVE-2005-0602 ignore (unzip, fixed 5.52) this is really expected behaviour
 CVE-2005-0596 version (php, fixed 5.0)
 CVE-2005-0593 version (mozilla)
@@ -515,6 +526,7 @@
 CVE-2005-0527 version (firefox, fixed 1.0.1)
 CVE-2005-0525 version (php, fixed 5.0.4)
 CVE-2005-0524 version (php, fixed 5.0.4)
+CVE-2005-0509 version (mono, not after 1.0.5)
 CVE-2005-0504 version (kernel, not 2.6) doesn't build in 2.6
 CVE-2005-0490 version (curl, fixed 7.13.1)
 CVE-2005-0488 backport (telnet)
@@ -631,7 +643,7 @@
 CVE-2005-0078 version (kde, fixed 3.0.5)
 CVE-2005-0077 version (perl-DBI, fixed 1.48 at least)
 CVE-2005-0075 version (squirrelmail, fixed 1.4.4)
-CVE-2005-0069 VULNERABLE (vim) fc4 fixes vim-6.3-tmpfile.patch BZ#174173
+CVE-2005-0069 backport (vim) vim-6.4-tmpfile.patch
 CVE-2005-0064 version (xpdf, fixed 3.0.1)
 CVE-2005-0064 version (tetex, fixed 3.0)
 CVE-2005-0064 version (kpdf, not 3.4)
@@ -737,7 +749,7 @@
 CVE-2004-1189 version (krb5, fixed 1.4)
 CVE-2004-1186 backport (enscript)
 CVE-2004-1185 backport (enscript)
-CVE-2004-1184 backport (enscript)
+CVE-2004-1184 version (enscript, fixed 1.6.4 at least)
 CVE-2004-1183 version (libtiff, fixed 3.7.2)
 CVE-2004-1180 version (rwho, fixed 0.17)
 CVE-2004-1177 version (mailman, fixed 2.1.6)
@@ -799,7 +811,7 @@
 CVE-2004-1004 version (mc, fixed 4.6.0)
 CVE-2004-1002 ignore (ppp) not a security issue
 CVE-2004-0996 backport (cscope) not fixed in 15.5
-CVE-2004-0990 VULNERABLE (gd)
+CVE-2004-0990 version (gd, fixed 2.0.33 at least)
 CVE-2004-0989 version (libxml2, fixed 2.6.15)
 CVE-2004-0986 version (iptables, fixed 1.2.12)
 CVE-2004-0983 version (ruby, fixed 1.8.2)
@@ -814,7 +826,7 @@
 CVE-2004-0970 version (gzip)
 CVE-2004-0969 version (groff, fixed 1.18.1.1)
 CVE-2004-0968 version (glibc, fixed 2.3.5 at least)
-CVE-2004-0967 backport (ghostscript) ghostscript-scripts.patch
+CVE-2004-0967 version (ghostscript, fixed 8.15.1)
 CVE-2004-0966 version (gettext, fixed 0.14.3 at least)
 CVE-2004-0961 version (freeradius, fixed 1.0.1)
 CVE-2004-0960 version (freeradius, fixed 1.0.1)
@@ -824,7 +836,7 @@
 CVE-2004-0956 version (mysql, fixed 4.0.20)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 VULNERABLE (gd) seems wasn't fixed upstream fc4bz#175414
+CVE-2004-0941 VULNERABLE (gd) bz#177907
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)
@@ -832,6 +844,7 @@
 CVE-2004-0923 version (cups, fixed 1.2.22)
 CVE-2004-0918 version (squid, fixed 2.4.STABLE7)
 CVE-2004-0914 version (xorg-x11, fixed after 6.8.1)
+CVE-2004-0914 backport (openmotif)
 CVE-2004-0909 version (thunderbird)
 CVE-2004-0909 version (mozilla)
 CVE-2004-0909 version (firefox)
@@ -869,6 +882,7 @@
 CVE-2004-0832 version (squid, fixed 2.5.STABLE7)
 CVE-2004-0829 version (samba, fixed 2.2.11)
 CVE-2004-0827 version (ImageMagick, fixed 6.0.6.2)
+CVE-2004-0826 ** NSS
 CVE-2004-0823 version (openldap, fixed after 2.1.19)
 CVE-2004-0817 version (imlib, fixed 2.1.20 at least)
 CVE-2004-0816 version (kernel, fixed 2.6.8)
@@ -1098,8 +1112,8 @@
 CVE-2004-0005 version (gaim, fixed 0.76)
 CVE-2004-0003 version (kernel, not 2.6)
 CVE-2004-0001 version (kernel, not 2.6)
-CVE-2003-1265 VULNERABLE (mozilla)
-CVE-2003-1265 VULNERABLE (firefox)
+CVE-2003-1265 VULNERABLE (mozilla) not fixed upstream
+CVE-2003-1265 VULNERABLE (firefox) not fixed upstream
 CVE-2003-1232 version (emacs, fixed 21.3)
 CVE-2003-1201 version (openldap, not 2.2)
 CVE-2003-1161 version (kernel, not released version)
@@ -1235,7 +1249,7 @@
 CVE-2003-0357 version (ethereal, fixed after 0.9.11)
 CVE-2003-0356 version (ethereal, fixed after 0.9.11)
 CVE-2003-0354 version (ghostscript, fixed 7.07)
-CVE-2003-0328 backport (epic, changelog)
+CVE-2003-0328 version (epic, fixed epic4-2.2 at least)
 CVE-2003-0300 ignore (sylpheed) only a crasher
 CVE-2003-0299 ignmore (mutt) only a crasher
 CVE-2003-0298 version (mozilla, fixed after 1.4a)
@@ -1326,7 +1340,7 @@
 
 CVE-2002-2204 ignore (rpm) by design
 CVE-2002-2196 version (samba, fixed 2.2.5)
-CVE-2002-2185 VULNERABLE (kernel)
+CVE-2002-2185 version (kernel, fixed 2.6.15)
 CVE-2002-2103 version (apache, not 2.0)
 CVE-2002-1963 version (kernel, not 2.6)
 CVE-2002-1976 ignore (ifconfig) "use ip"



From fedora-extras-commits at redhat.com  Mon Jan 16 13:15:27 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 16 Jan 2006 08:15:27 -0500
Subject: fedora-security/audit fc4,1.127,1.128
Message-ID: <200601161315.k0GDFTOm025394@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25376

Modified Files:
	fc4 
Log Message:
New things came up over the weekend but not investigated yet



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- fc4	12 Jan 2006 16:44:15 -0000	1.127
+++ fc4	16 Jan 2006 13:15:18 -0000	1.128
@@ -1,8 +1,12 @@
-Up to date CVE as of CVE email 20060111
-Up to date FC4 as of 20060111
+Up to date CVE as of CVE email 20060115
+Up to date FC4 as of 20060115
 
 ** are items that need attention
 
+CVE-2006-0208 ** php
+CVE-2006-0207 ** php
+CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
+CVE-2006-0197 ** xorg-x11
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root
 CVE-2006-0095 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Mon Jan 16 13:15:54 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 16 Jan 2006 08:15:54 -0500
Subject: rpms/ppracer/devel ppracer-0.3.1-c++.patch, NONE, 1.1 ppracer.spec, 
	1.12, 1.13
Message-ID: <200601161316.k0GDGR4M025444@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25424

Modified Files:
	ppracer.spec 
Added Files:
	ppracer-0.3.1-c++.patch 
Log Message:
fix build requirements, C++ member declaration (#177901)


ppracer-0.3.1-c++.patch:

--- NEW FILE ppracer-0.3.1-c++.patch ---
--- ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h.c++	2005-02-18 11:16:04.000000000 +0100
+++ ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h	2006-01-16 14:03:41.000000000 +0100
@@ -52,7 +52,7 @@
          * Reset the currently active texture to zero to get into a known state before
          * drawing a string. This is to get round possible threading issues.
          */
-        static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+        static void ResetActiveTexture(){ activeTextureID = 0;}
         
     private:
         /**


Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ppracer.spec	16 Mar 2005 12:27:22 -0000	1.12
+++ ppracer.spec	16 Jan 2006 13:15:54 -0000	1.13
@@ -1,12 +1,13 @@
 %define desktop_file_utils_version 0.2.90
 %define desktop_vendor fedora
 
-#define srcextraversion -2
+# Use --without modular_x to rebuild without modular X deps
+%define _modular_x 0%{!?_without_modular_x:1}
 
 Summary: 3D racing game featuring Tux
 Name: ppracer
 Version: 0.3.1
-Release: 4
+Release: 5
 License: GPL
 Group: Amusements/Games
 URL: http://racer.planetpenguin.de
@@ -17,14 +18,27 @@
 
 Patch0: PPRacer-0.1.9-ia64.patch
 Patch1: ppracer-0.3.1-lib64.patch
+Patch2: ppracer-0.3.1-c++.patch
 
+%if %_modular_x
+BuildRequires: libICE-devel
+BuildRequires: libSM-devel
+BuildRequires: libX11-devel
+BuildRequires: libXi-devel
+BuildRequires: libXext-devel
+BuildRequires: libXmu-devel
+BuildRequires: libXt-devel
+%else
 BuildRequires: xorg-x11-devel
+%endif
+BuildRequires: libGL-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
 BuildRequires: tcl-devel >= 8.4.9
 BuildRequires: autoconf
 BuildRequires: freetype-devel
 BuildRequires: libpng-devel
+BuildRequires: zlib-devel
 
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -40,6 +54,7 @@
 %setup -q
 %patch0 -p1 -b .ia64
 %patch1 -p1 -b .lib64
+%patch2 -p1 -b .c++
 
 %build
 autoconf
@@ -69,6 +84,9 @@
 %{_datadir}/applications/%{desktop_vendor}-%{name}.desktop
 
 %changelog
+* Mon Jan 16 2006 Nils Philippsen <nphilipp at redhat.com>
+- fix build requirements, C++ member declaration (#177901)
+
 * Wed Mar 16 2005 Nils Philippsen <nphilipp at redhat.com>
 - look in .../lib64 as well for tclConfig.sh
 



From fedora-extras-commits at redhat.com  Mon Jan 16 13:40:30 2006
From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp))
Date: Mon, 16 Jan 2006 08:40:30 -0500
Subject: rpms/ppracer/devel ppracer.spec,1.13,1.14
Message-ID: <200601161341.k0GDf2CQ025519@cvs-int.fedora.redhat.com>

Author: nphilipp

Update of /cvs/extras/rpms/ppracer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25502

Modified Files:
	ppracer.spec 
Log Message:
add libGLU-devel to build requirements



Index: ppracer.spec
===================================================================
RCS file: /cvs/extras/rpms/ppracer/devel/ppracer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ppracer.spec	16 Jan 2006 13:15:54 -0000	1.13
+++ ppracer.spec	16 Jan 2006 13:40:29 -0000	1.14
@@ -32,6 +32,7 @@
 BuildRequires: xorg-x11-devel
 %endif
 BuildRequires: libGL-devel
+BuildRequires: libGLU-devel
 BuildRequires: SDL-devel >= 1.2
 BuildRequires: SDL_mixer-devel >= 1.2
 BuildRequires: tcl-devel >= 8.4.9



From fedora-extras-commits at redhat.com  Mon Jan 16 15:18:33 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 16 Jan 2006 10:18:33 -0500
Subject: rpms/gmime/devel Makefile, 1.2, NONE gmime.spec, 1.6, NONE sources, 
	1.3, NONE
Message-ID: <200601161518.k0GFIZpD029257@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gmime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29248

Removed Files:
	Makefile gmime.spec sources 
Log Message:
gmime now in rawhide


--- Makefile DELETED ---


--- gmime.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 15:54:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 10:54:52 -0500
Subject: rpms/Glide3/devel Glide3-warn.patch,NONE,1.1 Glide3.spec,1.12,1.13
Message-ID: <200601161555.k0GFtPdm029542@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29522

Modified Files:
	Glide3.spec 
Added Files:
	Glide3-warn.patch 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-2
- Add modular Xorg BuildReqs
- Add a patch which fixes gcc4.1 warnings


Glide3-warn.patch:

--- NEW FILE Glide3-warn.patch ---
diff -ur Glide3.orig/cvg/glide3/src/fxgasm.c Glide3/cvg/glide3/src/fxgasm.c
--- Glide3.orig/cvg/glide3/src/fxgasm.c	2005-08-08 14:27:26.000000000 +0200
+++ Glide3/cvg/glide3/src/fxgasm.c	2006-01-16 16:43:14.000000000 +0100
@@ -210,8 +210,8 @@
     OFFSET (gr, pool.f1,    "pool_f1");
     OFFSET (gr, pool.f255,  "pool_f255");
 
-    OFFSET (gr, pool.ftemp1, "pool_fTemp1");
-    OFFSET (gr, pool.ftemp2, "pool_fTemp2");
+    OFFSET (gr, pool.temp1.f, "pool_fTemp1");
+    OFFSET (gr, pool.temp2.f, "pool_fTemp2");
 
     SIZEOF (gr,"GlideRoot");
     NEWLINE;
Only in Glide3/cvg/glide3/src: fxgasm.c.warn
diff -ur Glide3.orig/cvg/glide3/src/fxglide.h Glide3/cvg/glide3/src/fxglide.h
--- Glide3.orig/cvg/glide3/src/fxglide.h	2005-08-13 23:06:56.000000000 +0200
+++ Glide3/cvg/glide3/src/fxglide.h	2006-01-16 16:43:14.000000000 +0100
@@ -1370,7 +1370,9 @@
     float  fHalf;
     float  f1;
     float  f255;
-    float  ftemp1, ftemp2;       /* temps to convert floats to ints */
+    /* temps to convert floats to ints */
+    union { float f; FxI32 i; FxU32 u; } temp1;
+    union { float f; FxI32 i; FxU32 u; } temp2;
     float  fIntTruncBias;
 
 #if GLIDE_PACKED_RGB
@@ -2702,10 +2704,10 @@
  */
 #if GLIDE_PACKED_RGB
 #define RGBA_COMP(__fpVal, __fpBias, __fpShift, __fpMask) \
-((_GlideRoot.pool.ftemp1 = (float)((float)(__fpVal) + (float)(__fpBias))), \
+((_GlideRoot.pool.temp1.f = (float)((float)(__fpVal) + (float)(__fpBias))), \
  GR_ASSERT((__fpVal) >= 0.0f), \
  GR_ASSERT((__fpVal) < 256.0f), \
- (((*(const FxU32*)&_GlideRoot.pool.ftemp1) & (__fpMask)) << (__fpShift)))
+ ((_GlideRoot.pool.temp1.u & (__fpMask)) << (__fpShift)))
                                                   
 #define RGBA_COMP_CLAMP(__fpVal, __compToken) \
    RGBA_COMP(__fpVal, kPackBias##__compToken, kPackShift##__compToken, kPackMask##__compToken)
Only in Glide3/cvg/glide3/src: fxglide.h.warn
diff -ur Glide3.orig/cvg/glide3/src/gaa.c Glide3/cvg/glide3/src/gaa.c
--- Glide3.orig/cvg/glide3/src/gaa.c	2005-08-13 23:06:57.000000000 +0200
+++ Glide3/cvg/glide3/src/gaa.c	2006-01-16 16:43:14.000000000 +0100
@@ -273,34 +273,30 @@
 
   GR_BEGIN_NOFIFOCHECK(FN_NAME, 91);
 
-#define  DX _GlideRoot.pool.ftemp1
-#define ADY _GlideRoot.pool.ftemp2
+#define  DX _GlideRoot.pool.temp1
+#define ADY _GlideRoot.pool.temp2
 
   GR_FLUSH_STATE();
 
   {
-    FxI32 i, j;
-    FxU32 dataElem;
-    FxU32 vSize;
+    int i;
+    FxU32 vSize, dataElem;
     
     /*
     ** compute absolute deltas and draw from low Y to high Y
     */
-    ADY = FARRAY(b, 4) - FARRAY(a, 4);
-    i = *(int *)&ADY;
-    if (i < 0) {
+    ADY.f = FARRAY(b, 4) - FARRAY(a, 4);
+    if (ADY.i < 0) {
       const void *tv;
       tv = a; a = b; b = tv;
-      i ^= 0x80000000;            /* ady = -ady; */
-      /* (*(long *)&ADY) = i; */
+      ADY.i ^= 0x80000000;            /* ady = -ady; */
     }
     
-    DX = FARRAY(b, 0) - FARRAY(a, 0);
-    j = *(int *)&DX;
-    j &= 0x7fffffffL;            /* abs(adx) */
+    DX.f = FARRAY(b, 0) - FARRAY(a, 0);
+    DX.i &= 0x7fffffff;            /* abs(adx) */
     
     /* check for zero-length lines */
-    if ((j >= i) && (j == 0))
+    if ((DX.i >= ADY.i) && (DX.i == 0))
       return;
     
     vSize = gc->state.vData.vSize + 8;
@@ -308,7 +304,7 @@
     TRI_STRIP_BEGIN(kSetupCullDisable | kSetupStrip, 4, vSize, 
                     SSTCP_PKT3_BDDDDD | (1<<15));
     /* x major */
-    if (j >= i) {
+    if (DX.i >= ADY.i) {
       TRI_SETF(FARRAY(b, 0));
       dataElem = 0;
       TRI_SETF(FARRAY(b, 4) - _GlideRoot.pool.fHalf);
@@ -1391,35 +1387,31 @@
         dyBC = fb[yindex] - fc[yindex];
         
         /* Stash the area in the float pool for easy access */
-        _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+        _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
         
 #define FloatVal(__f) (((__f) < 786432.875) ? (__f) : ((__f) - 786432.875))
-        {
-          const FxI32 j = *(FxI32*)&_GlideRoot.pool.ftemp1;
-          
-          /* Zero-area triangles are BAD!! */
-          if ((j & 0x7FFFFFFF) == 0) {
-            GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
-                      FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
-                      FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
-                      FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
-                      _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
+        /* Zero-area triangles are BAD!! */
+        if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
 
-            goto done;
-          }
+          goto done;
+        }
+    
+        /* Backface culling, use sign bit as test */
+        if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
+            ((_GlideRoot.pool.temp1.i ^ (culltest << 31)) >= 0)) {
+      
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
       
-          /* Backface culling, use sign bit as test */
-          if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
-              ((j ^ (culltest << 31)) >= 0)) {
-        
-            GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
-                      FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
-                      FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
-                      FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
-                      _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
-        
-            goto done;
-          }
+          goto done;
         }
       }
     } /* end culling test */
@@ -1718,35 +1710,31 @@
         dyBC = fb[yindex] - fc[yindex];
         
         /* Stash the area in the float pool for easy access */
-        _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+        _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
         
 #define FloatVal(__f) (((__f) < 786432.875) ? (__f) : ((__f) - 786432.875))
-        {
-          const FxI32 j = *(FxI32*)&_GlideRoot.pool.ftemp1;
-          
-          /* Zero-area triangles are BAD!! */
-          if ((j & 0x7FFFFFFF) == 0) {
-            GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
-                      FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
-                      FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
-                      FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
-                      _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
+        /* Zero-area triangles are BAD!! */
+        if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
 
-            goto done;
-          }
+          goto done;
+        }
+    
+        /* Backface culling, use sign bit as test */
+        if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
+            ((_GlideRoot.pool.temp1.i ^ (culltest << 31)) >= 0)) {
+      
+          GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                    FloatVal(fa[xindex]), FloatVal(fa[yindex]), 
+                    FloatVal(fb[xindex]), FloatVal(fb[yindex]), 
+                    FloatVal(fc[xindex]), FloatVal(fc[yindex]), 
+                    _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
       
-          /* Backface culling, use sign bit as test */
[...1688 lines suppressed...]
Only in Glide3/sst1/glide3/src: gstrip.c.warn
diff -ur Glide3.orig/sst1/glide3/src/gxdraw.c Glide3/sst1/glide3/src/gxdraw.c
--- Glide3.orig/sst1/glide3/src/gxdraw.c	2005-06-09 20:32:35.000000000 +0200
+++ Glide3/sst1/glide3/src/gxdraw.c	2006-01-16 16:43:14.000000000 +0100
@@ -159,7 +159,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float ooa, dxAB, dxBC, dyAB, dyBC;
-  int i,j,culltest;
+  int i,culltest;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -239,16 +239,15 @@
   dyBC = snap_yb - snap_yc;
   
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.1 = dxAB * dyBC - dxBC * dyAB;
   
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0)
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0)
     return 0;
   
   /* Backface culling, use sign bit as test */
   if (gc->state.cull_mode != GR_CULL_DISABLE) {
-    if ((j ^ (culltest<<31)) >= 0) {
+    if ((_GlideRoot.pool.temp1.i ^ (culltest<<31)) >= 0) {
       return -1;
     }
   }
@@ -291,7 +290,7 @@
   SET_GW_CMD(    fifoPtr, 0, gc->hwDep.sst96Dep.gwCommand );
   SET_GW_HEADER( fifoPtr, 1, gc->hwDep.sst96Dep.gwHeaders[0] );
 
-  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.ftemp1;
+  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.temp1.f;
   /* GMT: note that we spread out our PCI writes */
   /* write out X & Y for vertex A */
   FSET_GW_ENTRY( fifoPtr, 2, snap_xa );
@@ -353,7 +352,7 @@
 
   /* write triangle command */
 triangle_command:
-  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.ftemp1 );
+  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.temp1.f );
   fifoPtr+=1;
   
   if (((FxU32)fifoPtr) & 0x7) {
@@ -433,7 +432,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float ooa, dxAB, dxBC, dyAB, dyBC;
-  int i,j,culltest;
+  int i,culltest;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -517,16 +516,15 @@
   dyBC = snap_yb - snap_yc;
   
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
   
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0)
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0)
     return 0;
   
   /* Backface culling, use sign bit as test */
   if (gc->state.cull_mode != GR_CULL_DISABLE) {
-    if ((j ^ (culltest<<31)) >= 0) {
+    if ((_GlideRoot.pool.temp1.i ^ (culltest<<31)) >= 0) {
       return -1;
     }
   }
@@ -535,7 +533,7 @@
 
   GR_SET_EXPECTED_SIZE(_GlideRoot.curTriSize);
   
-  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.ftemp1;
+  ooa = _GlideRoot.pool.f1 / _GlideRoot.pool.temp1.f;
   /* GMT: note that we spread out our PCI writes */
   /* write out X & Y for vertex A */
   GR_SETF( hw->FvA.x, snap_xa );
@@ -608,7 +606,7 @@
   }
 
   /* Draw the triangle by writing the area to the triangleCMD register */
-  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.ftemp1 ) );
+  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.temp1.f ) );
   _GlideRoot.stats.trisDrawn++;
 
   GR_CHECK_SIZE();
@@ -639,7 +637,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float dxAB, dxBC, dyAB, dyBC;
-  int i,j;
+  int i;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -713,12 +711,11 @@
   dyBC = snap_yb - snap_yc;
 
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
   _GlideRoot.stats.trisProcessed++;
 
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0) {
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
     return 0;
   }
 
@@ -795,7 +792,7 @@
   }
 
 triangle_command:
-  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.ftemp1 );
+  FSET_GW_ENTRY( fifoPtr, 0, _GlideRoot.pool.temp1.f );
   fifoPtr += 1;
 
   if (((FxU32)fifoPtr) & 0x7) {
@@ -862,7 +859,7 @@
   const float *fb = (const float *)vb + xindex;
   const float *fc = (const float *)vc + xindex;
   float dxAB, dxBC, dyAB, dyBC;
-  int i,j;
+  int i;
   union { float f; int i; } ay;
   union { float f; int i; } by;
   union { float f; int i; } cy;
@@ -950,12 +947,11 @@
    GR_SETF( hw->FvB.y, snap_yb );
 
   /* this is where we store the area */
-  _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
+  _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
   _GlideRoot.stats.trisProcessed++;
 
   /* Zero-area triangles are BAD!! */
-  j = *(long *)&_GlideRoot.pool.ftemp1;
-  if ((j & 0x7FFFFFFF) == 0) {
+  if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
     GR_CHECK_SIZE_SLOPPY();
     return 0;
   }
@@ -995,7 +991,7 @@
   }
 
   /* Draw the triangle by writing the area to the triangleCMD register */
-  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.ftemp1 ) );
+  P6FENCE_CMD( GR_SETF( hw->FtriangleCMD, _GlideRoot.pool.temp1.f ) );
   _GlideRoot.stats.trisDrawn++;
 
   GR_CHECK_SIZE();
Only in Glide3/sst1/glide3/src: gxdraw.c.warn
diff -ur Glide3.orig/sst1/incsrc/sst.h Glide3/sst1/incsrc/sst.h
--- Glide3.orig/sst1/incsrc/sst.h	2004-03-02 08:56:00.000000000 +0100
+++ Glide3/sst1/incsrc/sst.h	2006-01-16 16:43:14.000000000 +0100
@@ -1049,7 +1049,14 @@
 #define GET16(s) s
 #define SET(d,s) d = s
 #define SET16(d,s) d = s
-#define SETF(d,s) (*(float *)&(d)) = s
+#define SETF(d,s) *((float *)((void *)(&(d)))) = s
+/*
+do { \
+  union { float f; FxU32 u; } uni; \
+  uni.f = s; \
+  d = uni.u; \
+} while(0)
+*/
 
 // SET macros for FBI
 #define SET_FBI(d,s)    SET (*(&(d)+0x100),s)
Only in Glide3/sst1/incsrc: sst.h.warn
diff -ur Glide3.orig/sst1/init/initvg/sst1init.h Glide3/sst1/init/initvg/sst1init.h
--- Glide3.orig/sst1/init/initvg/sst1init.h	2005-05-25 10:53:23.000000000 +0200
+++ Glide3/sst1/init/initvg/sst1init.h	2006-01-16 16:49:31.000000000 +0100
@@ -105,8 +105,8 @@
 #define IGET(A)    A
 #define ISET(A,D)  A = (D)
 #else
-#define IGET(A)    sst1InitRead32((FxU32 *) &(A))
-#define ISET(A,D)  sst1InitWrite32((FxU32 *) &(A), D)  
+#define IGET(A)    sst1InitRead32((FxU32 *)(void *)&(A))
+#define ISET(A,D)  sst1InitWrite32((FxU32 *)(void *)&(A), D)  
 #endif
 
 /*
Only in Glide3/sst1/init/initvg: sst1init.h~


Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Glide3.spec	15 Aug 2005 13:13:56 -0000	1.12
+++ Glide3.spec	16 Jan 2006 15:54:52 -0000	1.13
@@ -1,6 +1,6 @@
 Name:    Glide3
 Version: 20050815
-Release: 1
+Release: 2
 Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
 # Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
 ExclusiveArch: %{ix86} alpha ia64 x86_64
@@ -17,8 +17,11 @@
 #   tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/
 Source0: %{name}-%{version}.tar.bz2
 Source1: glidelink.c
+Patch0: Glide3-warn.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel
+BuildRequires: libX11-devel xorg-x11-proto-devel 
+# Add these to try the experimental DGA support and add DGA=1 to %{glide_flags}
+# BuildRequires: libXxf86dga-devel libXxf86vm-devel
 %ifarch %{ix86}
 BuildRequires: nasm
 %endif
@@ -43,6 +46,7 @@
 
 %prep
 %setup -q -n Glide3
+%patch0 -p1 -z .warn
 
 
 %build
@@ -127,6 +131,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-2
+- Add modular Xorg BuildReqs
+- Add a patch which fixes gcc4.1 warnings
+
 * Mon Aug 15 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-1
 - Add -soname to linkerflags, so that we report the correct soname,
   otherwise rpm can't properly resolve dependencies because of the



From fedora-extras-commits at redhat.com  Mon Jan 16 16:05:34 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Jan 2006 11:05:34 -0500
Subject: rpms/gkrellmms/devel gkrellmms.spec,1.7,1.8
Message-ID: <200601161606.k0GG6xxP031309@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31289

Modified Files:
	gkrellmms.spec 
Log Message:
* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-4
- Add macros.
- Use standard buildroot.
- Add dist tag.
- Drop requires since they are pulled in from BR.



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gkrellmms.spec	9 May 2005 00:46:39 -0000	1.7
+++ gkrellmms.spec	16 Jan 2006 16:05:33 -0000	1.8
@@ -2,20 +2,19 @@
 
 Name:           gkrellmms
 Version:        2.1.22
-Release:        3
-
+Release:        4%{?dist}
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
 License:        GPL
-URL:            http://gkrellm.luon.net/gkrellmms.phtml
-Source0:        http://gkrellm.luon.net/files/gkrellmms-2.1.22.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL:            http://gkrellm.luon.net/%{name}.phtml
+Source0:        http://gkrellm.luon.net/files/%{name}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 
 BuildRequires:  gtk+-devel >= 1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1.2.8
 BuildRequires:  gkrellm-devel, gettext
 
-Requires:       gkrellm >= 2.0, xmms >= 1.2.8
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -51,6 +50,12 @@
 
 
 %changelog
+* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-4
+- Add macros.
+- Use standard buildroot.
+- Add dist tag.
+- Drop requires since they are pulled in from BR.
+
 * Sun May  8 2005 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-3
 - Rebuilt.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 17:00:53 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 16 Jan 2006 12:00:53 -0500
Subject: devel/gmime .cvsignore,1.3,NONE
Message-ID: <200601161700.k0GH0tsE031750@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/devel/gmime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31741/devel/gmime

Removed Files:
	.cvsignore 
Log Message:
completely remove gmime devel branch


--- .cvsignore DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 17:03:26 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 16 Jan 2006 12:03:26 -0500
Subject: rpms/rt3/FC-4 .cvsignore,1.2,1.3 rt3.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200601161704.k0GH4Kwp000982@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/rt3/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv961

Modified Files:
	.cvsignore rt3.spec sources 
Log Message:
Upstream update.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Oct 2005 01:46:42 -0000	1.2
+++ .cvsignore	16 Jan 2006 17:03:26 -0000	1.3
@@ -1 +1 @@
-rt-3.4.4.tar.gz
+rt-3.4.5.tar.gz


Index: rt3.spec
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/rt3.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rt3.spec	7 Dec 2005 12:57:42 -0000	1.4
+++ rt3.spec	16 Jan 2006 17:03:26 -0000	1.5
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005 Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005, 2006 Ralf Corsepius, Ulm, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,8 +12,8 @@
 %define RT3_LOCALSTATEDIR	%{_localstatedir}/lib/rt3
 
 Name:		rt3
-Version:	3.4.4
-Release:	11%{?dist}
+Version:	3.4.5
+Release:	1%{?dist}
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -235,6 +235,9 @@
 %ghost %{_prefix}/local/etc/rt3
 
 %changelog
+* Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.5-1
+- Upstream update.
+
 * Wed Dec 07 2005 Ralf Cors??pius <rc040203 at freenet.de> - 3.4.4-11
 - Require perl(HTML::FormatText), perl(HTML::TreeBuilder) (#175176).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rt3/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Oct 2005 01:46:42 -0000	1.2
+++ sources	16 Jan 2006 17:03:26 -0000	1.3
@@ -1 +1 @@
-769d77eea39006be643cbd2db4820ba3  rt-3.4.4.tar.gz
+16c8007cba54669e6c9de95cfc680b2a  rt-3.4.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 17:32:54 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 12:32:54 -0500
Subject: owners owners.list,1.534,1.535
Message-ID: <200601161733.k0GHXQnC001251@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1222

Modified Files:
	owners.list 
Log Message:
taking on the orphaned packages autotrace, gtranslator, t1lib, t1utils, and ttf2pt1.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -r1.534 -r1.535
--- owners.list	15 Jan 2006 10:57:13 -0000	1.534
+++ owners.list	16 Jan 2006 17:32:53 -0000	1.535
@@ -52,7 +52,7 @@
 Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -365,7 +365,7 @@
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|gtranslator|A gettext po file editor for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gurlchecker|A GNOME link validity checker|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -1189,8 +1189,8 @@
 Fedora Extras|syslog-ng|Syslog replacement daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|system-config-control|Centralized tool for Fedora configuration utilities|ankit644 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|system-switch-im|A utility for switching default IIIMF to XIM servers|llch at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|t1lib|PostScript Type 1 font rasterizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
-Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|t1lib|PostScript Type 1 font rasterizer|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
+Fedora Extras|t1utils|Collection of Type 1 and 2 font manipulation utilities|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|taarich|Display Hebrew date|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|taglib|Audio Meta-Data Library|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tagtool|Ogg Vorbis and MP3 tag manager|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1238,7 +1238,7 @@
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|roozbeh at farsiweb.info
+Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 16 18:04:21 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 13:04:21 -0500
Subject: rpms/autotrace/FC-4 autotrace.spec,1.8,1.9
Message-ID: <200601161804.k0GI4r2C003058@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3037

Modified Files:
	autotrace.spec 
Log Message:
- add %%{?dist} tag
- add a BuildRequire on bzip2-devel
- add ldconfig to %%post and %%postun




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/FC-4/autotrace.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- autotrace.spec	26 May 2005 18:31:51 -0000	1.8
+++ autotrace.spec	16 Jan 2006 18:04:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release: 7
+Release:        8%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -16,6 +16,7 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  bzip2-devel
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
@@ -60,6 +61,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO
@@ -79,6 +86,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
+- add %%{?dist} tag
+- add a BuildRequire on bzip2-devel
+- add ldconfig to %%post and %%postun
+
 * Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.31.1-7
 - and more buildrequires
 



From fedora-extras-commits at redhat.com  Mon Jan 16 18:20:15 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 13:20:15 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.8,1.9
Message-ID: <200601161820.k0GIKmdH003273@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3235

Modified Files:
	autotrace.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
- add %{?dist} tag
- add a BuildRequire on bzip2-devel
- add ldconfig to %post and %postun




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- autotrace.spec	26 May 2005 18:31:51 -0000	1.8
+++ autotrace.spec	16 Jan 2006 18:20:15 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release: 7
+Release:        8%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -16,6 +16,7 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  bzip2-devel
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
@@ -60,6 +61,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO
@@ -79,6 +86,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
+- add %%{?dist} tag
+- add a BuildRequire on bzip2-devel
+- add ldconfig to %%post and %%postun
+
 * Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.31.1-7
 - and more buildrequires
 



From fedora-extras-commits at redhat.com  Mon Jan 16 18:22:37 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 16 Jan 2006 13:22:37 -0500
Subject: fedora-security/audit fc4,1.128,1.129 fc5,1.38,1.39
Message-ID: <200601161822.k0GIMbsM003371@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3333

Modified Files:
	fc4 fc5 
Log Message:
Note an openoffice.org issue that doesn't affet FC[45].



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- fc4	16 Jan 2006 13:15:18 -0000	1.128
+++ fc4	16 Jan 2006 18:22:30 -0000	1.129
@@ -15,6 +15,7 @@
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
 CVE-2005-4639 VULNERABLE (kernel)
+CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4618 verson (kernel, fixed 2.6.15) [since FEDORA-2006-013]
 CVE-2005-4605 backport (kernel) [since FEDORA-2006-013]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- fc5	16 Jan 2006 13:14:31 -0000	1.38
+++ fc5	16 Jan 2006 18:22:30 -0000	1.39
@@ -28,6 +28,7 @@
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2005-4639 version (kernel, fixed 2.6.15)
+CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 version (kernel, fixed 2.6.15)
 CVE-2005-4618 version (kernel, fixed 2.6.15)
 CVE-2005-4605 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Mon Jan 16 18:39:06 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:39:06 -0500
Subject: rpms/dejavu-fonts import.log,1.25,1.26
Message-ID: <200601161839.k0GIdd4q003595@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3563

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-2.fc5 on branch devel from dejavu-fonts-2.2-2.fc5.src.rpm
version bump to follow FC4


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- import.log	16 Jan 2006 06:47:49 -0000	1.25
+++ import.log	16 Jan 2006 18:39:06 -0000	1.26
@@ -22,3 +22,4 @@
 dejavu-fonts-2_2-1_fc5:HEAD:dejavu-fonts-2.2-1.fc5.src.rpm:1137393042
 dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322
 dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980
+dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706



From fedora-extras-commits at redhat.com  Mon Jan 16 18:39:12 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:39:12 -0500
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.8,1.9
Message-ID: <200601161839.k0GIdjSR003598@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3563/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-2.fc5 on branch devel from dejavu-fonts-2.2-2.fc5.src.rpm
version bump to follow FC4


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dejavu-fonts.spec	16 Jan 2006 06:32:05 -0000	1.8
+++ dejavu-fonts.spec	16 Jan 2006 18:39:12 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -57,6 +57,9 @@
 %{fontdir}/*.ttf
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
+- bump release to ensure graceful FC4 -> FC5 update
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2
 



From fedora-extras-commits at redhat.com  Mon Jan 16 18:46:04 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:46:04 -0500
Subject: rpms/dejavu-fonts/FC-4 dejavu-fonts.spec,1.7,1.8
Message-ID: <200601161846.k0GIkbM5003652@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3626/FC-4

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-2.fc4 on branch FC-4 from dejavu-fonts-2.2-2.fc4.src.rpm
fontconfig changes


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	16 Jan 2006 06:35:38 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 18:46:04 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,7 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Conflicts: fontconfig > = 2.3.93
+Conflicts: fontconfig > = 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -34,7 +34,6 @@
 # "touch" all files we've got flagged as %ghost  but which are not 
 # present in the RPM_BUILD_ROOT when RPM looks for files
 /bin/touch %{buildroot}%{fontdir}/fonts.cache-1
-/bin/touch %{buildroot}%{fontdir}/fonts.cache-2
 
 %clean
 /bin/rm -rf %{buildroot}
@@ -61,9 +60,11 @@
 %dir %{fontdir}
 %{fontdir}/*.ttf
 %ghost %{fontdir}/fonts.cache-1
-%ghost %{fontdir}/fonts.cache-2
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
+- Seems FC-4 and FC-3 have the same needs after all
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2
 - Conflict on newer fontconfig (yes you have to use the FC5 rpm with this one)



From fedora-extras-commits at redhat.com  Mon Jan 16 18:48:00 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:48:00 -0500
Subject: rpms/dejavu-fonts import.log,1.26,1.27
Message-ID: <200601161848.k0GImW09003774@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3724

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-2.fc3 on branch FC-3 from dejavu-fonts-2.2-2.fc3.src.rpm
fontconfig changes


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- import.log	16 Jan 2006 18:39:06 -0000	1.26
+++ import.log	16 Jan 2006 18:48:00 -0000	1.27
@@ -23,3 +23,4 @@
 dejavu-fonts-2_2-1_fc4:FC-4:dejavu-fonts-2.2-1.fc4.src.rpm:1137393322
 dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980
 dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706
+dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269



From fedora-extras-commits at redhat.com  Mon Jan 16 18:48:06 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 13:48:06 -0500
Subject: rpms/dejavu-fonts/FC-3 dejavu-fonts.spec,1.7,1.8
Message-ID: <200601161848.k0GImcKq003782@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3724/FC-3

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-2.fc3 on branch FC-3 from dejavu-fonts-2.2-2.fc3.src.rpm
fontconfig changes


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dejavu-fonts.spec	16 Jan 2006 06:47:54 -0000	1.7
+++ dejavu-fonts.spec	16 Jan 2006 18:48:05 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,6 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
+Conflicts: fontconfig > = 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -61,11 +62,12 @@
 %ghost %{fontdir}/fonts.cache-1
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
+- Seems FC-4 and FC-3 have the same needs after all
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2
-- should conflict with the fontconfig version where fonts.cache-2 was 
-  introduces, but this is FC-3 and I don't care
-- probably last FC-3 package
+- Conflict on newer fontconfig (yes you have to use the FC5 rpm with this one)
 
 * Wed Dec 28 2005 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.1-1
 - 2.1



From fedora-extras-commits at redhat.com  Mon Jan 16 18:54:48 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon, 16 Jan 2006 13:54:48 -0500
Subject: rpms/t1utils/FC-4 t1utils.spec,1.8,1.9
Message-ID: <200601161855.k0GItKXR003956@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3925

Modified Files:
	t1utils.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
- add %{?dist} tag
- correct License




Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/FC-4/t1utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- t1utils.spec	22 May 2005 23:44:46 -0000	1.8
+++ t1utils.spec	16 Jan 2006 18:54:48 -0000	1.9
@@ -1,11 +1,11 @@
 Name:		t1utils
 Version:	1.32
-Release: 3
+Release:        4%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
 Group:		Applications/Publishing
-License:	Freely modifiable and distributable
+License:	Distributable
 URL:		http://www.lcdf.org/~eddietwo/type/
 Source0:	http://www.lcdf.org/~eddietwo/type/t1utils-1.32.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
+- add %%{?dist} tag
+- correct License
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.32-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Jan 16 19:13:23 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:13:23 -0500
Subject: rpms/trac/FC-4 trac.spec,1.1,1.2
Message-ID: <200601161913.k0GJDtVE005999@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5982

Modified Files:
	trac.spec 
Log Message:
re-added tracd and trac.fcgi by user request


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.spec	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.spec	16 Jan 2006 19:13:23 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -34,7 +34,8 @@
 chmod -x contrib/*
 sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
 chmod -x htdocs/js/wikitoolbar.js
-rm trac/test.py scripts/tracd.1
+sed -i -e 's/tracd 1/tracd 8/' scripts/tracd.1
+rm trac/test.py
 
 %build
 %{__python} setup.py build
@@ -46,12 +47,15 @@
 %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.cgi \
+mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.*cgi \
   $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin
 
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
-rm $RPM_BUILD_ROOT%{_bindir}/tracd
+install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd}
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man8
+mv $RPM_BUILD_ROOT%{_mandir}/{man1/tracd.1,man8/tracd.8}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,7 @@
 %doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/
 %{_bindir}/trac-admin
 %{_bindir}/tracdb2env
+%{_sbindir}/tracd
 %dir %{python_sitelib}/trac/
 %{python_sitelib}/trac/*.py
 %{python_sitelib}/trac/*.pyc
@@ -100,10 +105,15 @@
 %config(noreplace) /etc/httpd/conf.d/trac.conf
 %{_datadir}/trac/
 %{_var}/www/cgi-bin/trac.cgi
+%{_var}/www/cgi-bin/trac.fcgi
 %{_mandir}/man1/trac-admin.1*
 %{_mandir}/man1/tracdb2env.1*
+%{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
+- re-added tracd and trac.fcgi by user request.
+
 * Tue Jan 10 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-2
 - removed trac.fcgi (bugzilla #174546, comment #11)
 - applied patch (bugzilla #174546, attachment id=123008)



From fedora-extras-commits at redhat.com  Mon Jan 16 19:20:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Jan 2006 14:20:09 -0500
Subject: owners owners.list,1.535,1.536
Message-ID: <200601161920.k0GJKfC3006059@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6042

Modified Files:
	owners.list 
Log Message:
perl-HTML-Tree, perl-Pod-POM -> spot (thanks!)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- owners.list	16 Jan 2006 17:32:53 -0000	1.535
+++ owners.list	16 Jan 2006 19:20:08 -0000	1.536
@@ -824,7 +824,7 @@
 Fedora Extras|perl-HTML-Scrubber|Library for scrubbing/sanitizing html|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Template|Perl module to use HTML Templates|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTML-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -887,7 +887,7 @@
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Pod-POM|Object-oriented interface to Perl POD documents|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Simple|Framework for parsing POD documentation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Tests|Extract embedded tests and code examples from POD|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-prefork|Optimized module loading for forking or non-forking processes|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Jan 16 19:46:57 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:46:57 -0500
Subject: rpms/trac/devel trac.spec,1.1,1.2
Message-ID: <200601161947.k0GJlTYr006344@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6327

Modified Files:
	trac.spec 
Log Message:
re-added tracd and trac.fcgi by user request


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.spec	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.spec	16 Jan 2006 19:46:57 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -34,7 +34,8 @@
 chmod -x contrib/*
 sed -i -e 's|/var/svn/test|/srv/svn|' trac/scripts/admin.py
 chmod -x htdocs/js/wikitoolbar.js
-rm trac/test.py scripts/tracd.1
+sed -i -e 's/tracd 1/tracd 8/' scripts/tracd.1
+rm trac/test.py
 
 %build
 %{__python} setup.py build
@@ -46,12 +47,15 @@
 %{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_var}/www/cgi-bin
-mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.cgi \
+mv $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin/trac.*cgi \
   $RPM_BUILD_ROOT%{_var}/www/cgi-bin
 rm -r $RPM_BUILD_ROOT%{_datadir}/trac/cgi-bin
 
 install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf.d/trac.conf
-rm $RPM_BUILD_ROOT%{_bindir}/tracd
+install -dm 755 $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT{%{_bindir}/tracd,%{_sbindir}/tracd}
+install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man8
+mv $RPM_BUILD_ROOT%{_mandir}/{man1/tracd.1,man8/tracd.8}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +65,7 @@
 %doc AUTHORS ChangeLog COPYING INSTALL README* RELEASE THANKS UPGRADE contrib/
 %{_bindir}/trac-admin
 %{_bindir}/tracdb2env
+%{_sbindir}/tracd
 %dir %{python_sitelib}/trac/
 %{python_sitelib}/trac/*.py
 %{python_sitelib}/trac/*.pyc
@@ -100,10 +105,15 @@
 %config(noreplace) /etc/httpd/conf.d/trac.conf
 %{_datadir}/trac/
 %{_var}/www/cgi-bin/trac.cgi
+%{_var}/www/cgi-bin/trac.fcgi
 %{_mandir}/man1/trac-admin.1*
 %{_mandir}/man1/tracdb2env.1*
+%{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
+- re-added tracd and trac.fcgi by user request.
+
 * Tue Jan 10 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-2
 - removed trac.fcgi (bugzilla #174546, comment #11)
 - applied patch (bugzilla #174546, attachment id=123008)



From fedora-extras-commits at redhat.com  Mon Jan 16 19:57:01 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:57:01 -0500
Subject: rpms/trac/FC-4 trac.spec,1.2,1.3
Message-ID: <200601161957.k0GJvYVF006433@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6416

Modified Files:
	trac.spec 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac.spec	16 Jan 2006 19:13:23 -0000	1.2
+++ trac.spec	16 Jan 2006 19:57:01 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-4
+- updated trac.conf to allow for trac.*cgi 
+
 * Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
 - re-added tracd and trac.fcgi by user request.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 19:57:43 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:57:43 -0500
Subject: rpms/trac/FC-4 trac.conf,1.1,1.2
Message-ID: <200601161958.k0GJwFQQ006456@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6439

Modified Files:
	trac.conf 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.conf
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.conf	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.conf	16 Jan 2006 19:57:43 -0000	1.2
@@ -1,10 +1,12 @@
-# Replace all occurrences of /path/to/trac_env with your trac root below
+# Replace all occurrences of /srv/trac with your trac root below
 # and uncomment the respective SetEnv and PythonOption directives.
-<Location /cgi-bin/trac.cgi>
-    #SetEnv TRAC_ENV /path/to/trac_env
+<LocationMatch /cgi-bin/trac\.f?cgi>
+    #SetEnv TRAC_ENV /srv/trac
+</LocationMatch>
 <IfModule mod_python.c>
+<Location /cgi-bin/trac.cgi>
     SetHandler mod_python
     PythonHandler trac.web.modpython_frontend
-    #PythonOption TracEnv /path/to/trac_env
-</IfModule>
+    #PythonOption TracEnv /srv/trac
 </Location>
+</IfModule>



From fedora-extras-commits at redhat.com  Mon Jan 16 19:58:22 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:58:22 -0500
Subject: rpms/trac/devel trac.spec,1.2,1.3
Message-ID: <200601161958.k0GJwsIi006479@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6462

Modified Files:
	trac.spec 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- trac.spec	16 Jan 2006 19:46:57 -0000	1.2
+++ trac.spec	16 Jan 2006 19:58:22 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           trac
 Version:        0.9.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-4
+- updated trac.conf to allow for trac.*cgi 
+
 * Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-3
 - re-added tracd and trac.fcgi by user request.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 19:59:18 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Mon, 16 Jan 2006 14:59:18 -0500
Subject: rpms/trac/devel trac.conf,1.1,1.2
Message-ID: <200601161959.k0GJxoPR006506@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6487

Modified Files:
	trac.conf 
Log Message:
updated trac.conf to allow for trac.*cgi


Index: trac.conf
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac.conf	10 Jan 2006 19:54:52 -0000	1.1
+++ trac.conf	16 Jan 2006 19:59:17 -0000	1.2
@@ -1,10 +1,12 @@
-# Replace all occurrences of /path/to/trac_env with your trac root below
+# Replace all occurrences of /srv/trac with your trac root below
 # and uncomment the respective SetEnv and PythonOption directives.
-<Location /cgi-bin/trac.cgi>
-    #SetEnv TRAC_ENV /path/to/trac_env
+<LocationMatch /cgi-bin/trac\.f?cgi>
+    #SetEnv TRAC_ENV /srv/trac
+</LocationMatch>
 <IfModule mod_python.c>
+<Location /cgi-bin/trac.cgi>
     SetHandler mod_python
     PythonHandler trac.web.modpython_frontend
-    #PythonOption TracEnv /path/to/trac_env
-</IfModule>
+    #PythonOption TracEnv /srv/trac
 </Location>
+</IfModule>



From fedora-extras-commits at redhat.com  Mon Jan 16 20:39:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 15:39:33 -0500
Subject: rpms/Glide3/devel Glide3-warn.patch,1.1,1.2
Message-ID: <200601162040.k0GKe6PC008632@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8603

Modified Files:
	Glide3-warn.patch 
Log Message:
Fix non-asm compile in Glide3-warn.patch

Glide3-warn.patch:

Index: Glide3-warn.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3-warn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-warn.patch	16 Jan 2006 15:54:52 -0000	1.1
+++ Glide3-warn.patch	16 Jan 2006 20:39:33 -0000	1.2
@@ -393,9 +393,46 @@
              DA_SETF(fbx);
              DA_SETF(fby - _GlideRoot.pool.fHalf);
              DA_VP_SETFS(b,oowb);
-Only in Glide3/cvg/glide3/src: gdraw.c.warn
-Only in Glide3: debugfiles.list
-Only in Glide3: debugsources.list
+--- Glide3/cvg/glide3/src/gxdraw.c~	2006-01-16 21:33:38.000000000 +0100
++++ Glide3/cvg/glide3/src/gxdraw.c	2006-01-16 21:33:38.000000000 +0100
+@@ -213,31 +213,31 @@
+     dyBC = fb[yindex] - fc[yindex];
+     
+     /* Stash the area in the float pool for easy access */
+-    _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
++    _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
+     
+ #define FloatVal(__f) (((__f) < 786432.875) ? (__f) : ((__f) - 786432.875))
+     {
+-      const FxI32 j = *(FxI32*)&_GlideRoot.pool.ftemp1;
+       const FxU32 culltest = (gc->state.cull_mode << 31UL);
+       
+       /* Zero-area triangles are BAD!! */
+-      if ((j & 0x7FFFFFFF) == 0) {
++      if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
+         GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                   FloatVal(fa[0]), FloatVal(fa[1]), 
+                   FloatVal(fb[0]), FloatVal(fb[1]), 
+                   FloatVal(fc[0]), FloatVal(fc[1]), 
+-                  _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
++                  _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
+         
+         return 0;
+       }
+       
+       /* Backface culling, use sign bit as test */
+-      if ((gc->state.cull_mode != GR_CULL_DISABLE) && (((FxI32)(j ^ culltest)) >= 0)) {
++      if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
++          (((FxI32)(_GlideRoot.pool.temp1.i ^ culltest)) >= 0)) {
+         GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                   FloatVal(fa[0]), FloatVal(fa[1]), 
+                   FloatVal(fb[0]), FloatVal(fb[1]), 
+                   FloatVal(fc[0]), FloatVal(fc[1]), 
+-                  _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
++                  _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
+         
+         return -1;
+       }
 diff -ur Glide3.orig/h3/glide3/src/fxcmd.h Glide3/h3/glide3/src/fxcmd.h
 --- Glide3.orig/h3/glide3/src/fxcmd.h	2005-06-09 20:32:28.000000000 +0200
 +++ Glide3/h3/glide3/src/fxcmd.h	2006-01-16 16:43:14.000000000 +0100



From fedora-extras-commits at redhat.com  Mon Jan 16 20:43:26 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 15:43:26 -0500
Subject: rpms/dejavu-fonts import.log,1.27,1.28
Message-ID: <200601162043.k0GKhx9v008785@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8747

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-3.fc5 on branch devel from dejavu-fonts-2.2-3.fc5.src.rpm
stupid version bumping


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- import.log	16 Jan 2006 18:48:00 -0000	1.27
+++ import.log	16 Jan 2006 20:43:26 -0000	1.28
@@ -24,3 +24,4 @@
 dejavu-fonts-2_2-1_fc3:FC-3:dejavu-fonts-2.2-1.fc3.src.rpm:1137393980
 dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706
 dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269
+dejavu-fonts-2_2-3_fc5:HEAD:dejavu-fonts-2.2-3.fc5.src.rpm:1137444196



From fedora-extras-commits at redhat.com  Mon Jan 16 20:43:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 15:43:32 -0500
Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.9,1.10
Message-ID: <200601162044.k0GKi58v008788@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8747/devel

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-3.fc5 on branch devel from dejavu-fonts-2.2-3.fc5.src.rpm
stupid version bumping


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dejavu-fonts.spec	16 Jan 2006 18:39:12 -0000	1.9
+++ dejavu-fonts.spec	16 Jan 2006 20:43:32 -0000	1.10
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -59,6 +59,7 @@
 %changelog
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
 - bump release to ensure graceful FC4 -> FC5 update
+- bump again because of bas CVS tag
 
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-1
 - 2.2



From fedora-extras-commits at redhat.com  Mon Jan 16 20:47:22 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Jan 2006 15:47:22 -0500
Subject: rpms/perl-MIME-tools/devel .cvsignore, 1.4, 1.5 perl-MIME-tools.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200601162047.k0GKltEU008879@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8843

Modified Files:
	.cvsignore perl-MIME-tools.spec sources 
Log Message:
* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
- 5.419.
- Don't provide perl(main).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Oct 2005 19:20:30 -0000	1.4
+++ .cvsignore	16 Jan 2006 20:47:22 -0000	1.5
@@ -1 +1 @@
-MIME-tools-5.418.tar.gz
+MIME-tools-5.419.tar.gz


Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-MIME-tools.spec	4 Oct 2005 16:37:00 -0000	1.11
+++ perl-MIME-tools.spec	16 Jan 2006 20:47:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-MIME-tools
-Version:        5.418
-Release:        2%{?dist}
+Version:        5.419
+Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
 
 Group:          Development/Libraries
@@ -26,6 +26,13 @@
 %prep
 %setup -q -n MIME-tools-%{version}
 chmod 644 examples/* # avoid dependencies
+f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* | grep -v '^perl(main)$'
+EOF
+%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
 
 
 %build
@@ -43,8 +50,7 @@
 
 
 %check
-if %{__perl} -MMIME::QuotedPrint \
-  -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
   make test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
@@ -64,6 +70,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
+- 5.419.
+- Don't provide perl(main).
+
 * Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
 - License is same as perl (GPL or Artistic), not just Artistic
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Oct 2005 19:20:30 -0000	1.4
+++ sources	16 Jan 2006 20:47:22 -0000	1.5
@@ -1 +1 @@
-39bfa5efc92ef6838a932ee9fc0d437d  MIME-tools-5.418.tar.gz
+1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 20:50:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 16 Jan 2006 15:50:23 -0500
Subject: rpms/perl-MIME-tools/FC-4 .cvsignore, 1.3, 1.4 perl-MIME-tools.spec,
	1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601162050.k0GKot7V008924@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MIME-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8901

Modified Files:
	.cvsignore perl-MIME-tools.spec sources 
Log Message:
* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
- 5.419.
- Don't provide perl(main).

* Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
- License is same as perl (GPL or Artistic), not just Artistic

* Mon Oct  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.418-1
- 5.418.
- Cosmetic specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jan 2005 11:53:15 -0000	1.3
+++ .cvsignore	16 Jan 2006 20:50:23 -0000	1.4
@@ -1 +1 @@
-MIME-tools-5.417.tar.gz
+MIME-tools-5.419.tar.gz


Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/perl-MIME-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-MIME-tools.spec	6 Apr 2005 22:13:06 -0000	1.9
+++ perl-MIME-tools.spec	16 Jan 2006 20:50:23 -0000	1.10
@@ -1,20 +1,19 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-MIME-tools
-Version:        5.417
-Release:        2
-
+Version:        5.419
+Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
 
 Group:          Development/Libraries
-License:        Artistic
+License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:     http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.417.tar.gz
+Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy) perl(MIME::Base64) >= 2.20 perl-MailTools
-BuildRequires:  perl >= 1:5.6.1 perl(MIME::QuotedPrint)
+BuildRequires:  perl(IO::Stringy)
+BuildRequires:  perl(MIME::Base64) >= 2.20
+BuildRequires:  perl-MailTools
+BuildRequires:  perl(MIME::QuotedPrint)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -27,6 +26,13 @@
 %prep
 %setup -q -n MIME-tools-%{version}
 chmod 644 examples/* # avoid dependencies
+f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* | grep -v '^perl(main)$'
+EOF
+%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
 
 
 %build
@@ -43,9 +49,8 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
-if %{__perl} -MMIME::QuotedPrint \
-  -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then
+%check
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
   make test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
@@ -59,13 +64,24 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples
-%{perl_vendorlib}/MIME
+%doc ChangeLog COPYING README README-OR-DIE examples/
+%{perl_vendorlib}/MIME/
 %{_mandir}/man3/MIME::*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
+- 5.419.
+- Don't provide perl(main).
+
+* Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
+- License is same as perl (GPL or Artistic), not just Artistic
+
+* Mon Oct  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.418-1
+- 5.418.
+- Cosmetic specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.417-2
 - rebuilt
 
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.417-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2005 11:53:15 -0000	1.3
+++ sources	16 Jan 2006 20:50:23 -0000	1.4
@@ -1 +1 @@
-a92299db8729f0f7886ada6e3539b265  MIME-tools-5.417.tar.gz
+1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:19:38 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:19:38 -0500
Subject: rpms/Glide3-libGL - New directory
Message-ID: <200601162119.k0GLJeTw011008@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11000/Glide3-libGL

Log Message:
Directory /cvs/extras/rpms/Glide3-libGL added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 16 21:19:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:19:44 -0500
Subject: rpms/Glide3-libGL/devel - New directory
Message-ID: <200601162119.k0GLJkdT011023@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11000/Glide3-libGL/devel

Log Message:
Directory /cvs/extras/rpms/Glide3-libGL/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 16 21:20:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:20:29 -0500
Subject: rpms/Glide3-libGL Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601162120.k0GLKVAo011064@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11052

Added Files:
	Makefile import.log 
Log Message:
Setup of module Glide3-libGL


--- NEW FILE Makefile ---
# Top level Makefile for module Glide3-libGL
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 16 21:20:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:20:34 -0500
Subject: rpms/Glide3-libGL/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601162120.k0GLKadZ011084@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11052/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module Glide3-libGL


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 16 21:22:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:22:25 -0500
Subject: rpms/Glide3-libGL import.log,1.1,1.2
Message-ID: <200601162122.k0GLMv43011207@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11162

Modified Files:
	import.log 
Log Message:
auto-import Glide3-libGL-6.2.1-3 on branch devel from Glide3-libGL-6.2.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Jan 2006 21:20:28 -0000	1.1
+++ import.log	16 Jan 2006 21:22:24 -0000	1.2
@@ -0,0 +1 @@
+Glide3-libGL-6_2_1-3:HEAD:Glide3-libGL-6.2.1-3.src.rpm:1137447237



From fedora-extras-commits at redhat.com  Mon Jan 16 21:22:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:22:31 -0500
Subject: rpms/Glide3-libGL/devel Glide3-libGL-README, NONE,
	1.1 Glide3-libGL.sh, 
	NONE, 1.1 Glide3-libGL.spec, NONE, 1.1 Mesa-6.2.1-64bit.patch,
	NONE, 1.1 Mesa-6.2.1-antialias.patch, NONE,
	1.1 Mesa-6.2.1-config.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601162123.k0GLN3Na011211@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11162/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Glide3-libGL-README Glide3-libGL.sh Glide3-libGL.spec 
	Mesa-6.2.1-64bit.patch Mesa-6.2.1-antialias.patch 
	Mesa-6.2.1-config.patch 
Log Message:
auto-import Glide3-libGL-6.2.1-3 on branch devel from Glide3-libGL-6.2.1-3.src.rpm


--- NEW FILE Glide3-libGL-README ---
Glide3-libGL provides a version of Mesa compiled to render 3D graphics
through Glide3, thus allowing hardware accelerated OpenGL on 3Dfx's 3D only
Voodoo 1 & 2 cards. Even with Glide3-libGL installed OpenGL programs will
normally still use the regular (possibly unaccelerated) videocard.

To use Glide3-libGL to run an OpenGL application on your 3Dfx Voodoo 1 or 2
start your application with the Glide3-libGL wrapper:
Glide3-libGL <appname> [args]

For example if you want to run ppracer without any args use:
Glide3-libGL ppracer


--- NEW FILE Glide3-libGL.sh ---
#!/bin/bash
# Script to run a program using the Glide3 for V1 / V2 version of Mesa

if [ $# -lt 1 ]; then
  echo "`basename $0`, run a program using the Glide3 version of Mesa"
  echo "Usage:"
  echo "`basename $0` <program> [args]"
  exit 1
fi

if [ -f /lib64/libc.so.6 ]; then
  LIB=lib64
else
  LIB=lib
fi

export MESA_GLX_FX=f
export LD_LIBRARY_PATH=/usr/$LIB/Glide3-libGL

exec "$@"


--- NEW FILE Glide3-libGL.spec ---
Name:           Glide3-libGL
Version:        6.2.1
Release:        3
Summary:        Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards
Group:          System Environment/Libraries
License:        MIT/X11
URL:            http://www.mesa3d.org/
Source0:        http://dl.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
Source1:        Glide3-libGL.sh
Source2:        Glide3-libGL-README
Patch0:         Mesa-6.2.1-config.patch
Patch1:         Mesa-6.2.1-64bit.patch
Patch2:         Mesa-6.2.1-antialias.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libX11-devel libXext-devel libXt-devel libXi-devel libXmu-devel
BuildRequires:  xorg-x11-proto-devel Glide3-devel
ExclusiveArch:  %{ix86} x86_64
 
%description
This version of the Mesa OpenGL library renders 3D graphics using Glide3
for 3Dfx Voodoo 1 & 2 cards, thus allowing hardware accelerated OpenGL on
these 3D only cards. To start an OpenGL application on your Voodoo instead of
on your regular videocard type: "Glide3-libGL <appname> [args]".

You do NOT need this package if you have a 3Dfx Voodoo 3 or 5, the regular
mesa-libGL package supports these full (2D and 3D) video-cards through DRI
(For these 3Dfx cards you do need the regular Glide3 package though).

The Mesa 3D graphics library is a powerful and generic toolset for
creating hardware assisted computer graphics. To the extent that Mesa
utilizes the OpenGL command syntax or state machine, it is being used
with authorization from Silicon Graphics, Inc.  


%prep
%setup -q -n Mesa-%{version}
%patch0 -p1 -b .config
%patch1 -p1 -b .64bit
%patch2 -p1 -b .antialias
install -p -m 644 %{SOURCE2} README.fedora

 
%build
%ifarch %{ix86}
  TARGET=linux-x86-glide
%else
  TARGET=linux-glide
%endif
make %{?_smp_mflags} LIB_DIR=\$\(TOP\)/%{_lib} ${TARGET}
 
 
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}/
mkdir -p $RPM_BUILD_ROOT%{_libdir}/Glide3-libGL/
install -p -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/Glide3-libGL
cp -a %{_lib}/libGL.so* $RPM_BUILD_ROOT%{_libdir}/Glide3-libGL/

 
%clean
rm -rf $RPM_BUILD_ROOT
 
 
%files
%defattr(-,root,root,0755)
%doc README.fedora docs/license.html
%{_bindir}/Glide3-libGL
%{_libdir}/Glide3-libGL
 
 
%changelog
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-3
- Fixed up License.

* Sun Jan 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-2
- Recreated / redid patch0 and 1 as I lost them (stupid me).
- Added patch2 which adds proper support for anti-aliasing.
- Modified the BuildRequires and -config patch to work with modular-X.
- Changed name to Glide3-libGL, which IMHO really is the most correct name.

* Mon Aug 15 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-1
- Initial Fedora Extras package

Mesa-6.2.1-64bit.patch:

--- NEW FILE Mesa-6.2.1-64bit.patch ---
--- Mesa-6.2.1/include/GL/fxmesa.h.64bit	2004-02-10 08:46:07.000000000 +0100
+++ Mesa-6.2.1/include/GL/fxmesa.h	2006-01-15 09:48:06.000000000 +0100
@@ -66,11 +66,11 @@
 
 GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
 						  GrScreenRefresh_t,
-						  const GLint attribList[]);
+						  const long attribList[]);
 
 GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
 						      GLint width, GLint height,
-						      const GLint attribList[]);
+						      const long attribList[]);
 GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
 
 GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
--- Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c.64bit	2006-01-15 10:53:41.000000000 +0100
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c	2006-01-15 10:53:44.000000000 +0100
@@ -239,7 +239,7 @@
    tfxTexInfo *ti;
 
    if (TDFX_DEBUG & VERBOSE_DRIVER) {
-      fprintf(stderr, "fxDDTexBind(%d, %x)\n", tObj->Name, (GLuint)tObj->DriverData);
+      fprintf(stderr, "fxDDTexBind(%d, %lx)\n", tObj->Name, (unsigned long)tObj->DriverData);
    }
 
    if ((target != GL_TEXTURE_1D) && (target != GL_TEXTURE_2D))
@@ -295,8 +295,8 @@
    tfxTexInfo *ti;
 
    if (TDFX_DEBUG & VERBOSE_DRIVER) {
-      fprintf(stderr, "fxDDTexParam(%d, %x, %s, %s)\n",
-                      tObj->Name, (GLuint) tObj->DriverData,
+      fprintf(stderr, "fxDDTexParam(%d, %lx, %s, %s)\n",
+                      tObj->Name, (unsigned long) tObj->DriverData,
                       _mesa_lookup_enum_by_nr(pname),
                       _mesa_lookup_enum_by_nr(param));
    }
@@ -581,8 +581,8 @@
       /* per-texture palette */
       tfxTexInfo *ti;
       if (TDFX_DEBUG & VERBOSE_DRIVER) {
-	 fprintf(stderr, "fxDDTexPalette(%d, %x)\n",
-		 tObj->Name, (GLuint) tObj->DriverData);
+	 fprintf(stderr, "fxDDTexPalette(%d, %lx)\n",
+		 tObj->Name, (unsigned long) tObj->DriverData);
       }
       /* This might be a proxy texture. */
       if (!tObj->Palette.Table)
@@ -1801,7 +1801,7 @@
    for (i = 0; i < rows; i++) {
       MEMCPY(dest, data, srcRowStride);
       dest += destRowStride;
-      data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride);
+      data = (GLvoid *)((GLubyte*)data + srcRowStride);
    }
 
    /* [dBorca] Hack alert:
--- Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c.64bit	2004-09-24 16:31:55.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c	2006-01-15 09:48:06.000000000 +0100
@@ -267,7 +267,7 @@
 
 fxMesaContext GLAPIENTRY
 fxMesaCreateBestContext(GLuint win, GLint width, GLint height,
-			const GLint attribList[])
+			const long attribList[])
 {
  int res = fxBestResolution(width, height);
 
@@ -285,7 +285,7 @@
 fxMesaContext GLAPIENTRY
 fxMesaCreateContext(GLuint win,
 		    GrScreenResolution_t res,
-		    GrScreenRefresh_t ref, const GLint attribList[])
+		    GrScreenRefresh_t ref, const long attribList[])
 {
  fxMesaContext fxMesa = NULL;
  GLcontext *ctx = NULL, *shareCtx = NULL;
--- Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c.64bit	2004-04-30 11:44:22.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c	2006-01-15 09:48:06.000000000 +0100
@@ -1809,7 +1809,7 @@
    fxEnvVar = _mesa_getenv("MESA_GLX_FX");
    if (fxEnvVar) {
      if (fxEnvVar[0]!='d') {
-       int attribs[100];
+       long attribs[100];
        int numAttribs = 0;
        int hw;
        if (v->mesa_visual.depthBits > 0) {
@@ -1833,7 +1833,7 @@
        }
        if (1) {
          attribs[numAttribs++] = FXMESA_SHARE_CONTEXT;
-         attribs[numAttribs++] = (int) &(c->mesa);
+         attribs[numAttribs++] = (long) &(c->mesa);
        }
        attribs[numAttribs++] = FXMESA_NONE;
 
--- Mesa-6.2.1/src/mesa/main/texstore.c.64bit	2004-08-25 17:59:49.000000000 +0200
+++ Mesa-6.2.1/src/mesa/main/texstore.c	2006-01-15 09:48:06.000000000 +0100
@@ -1830,7 +1830,7 @@
    else {
       /* using a PBO */
       if ((const GLubyte *) pixels + imageSize >
-          (const GLubyte *) packing->BufferObj->Size) {
+          (const GLubyte *)(unsigned long) packing->BufferObj->Size) {
          /* out of bounds read! */
          return NULL;
       }
--- Mesa-6.2.1/src/mesa/main/bufferobj.c.64bit	2004-11-22 21:05:42.000000000 +0100
+++ Mesa-6.2.1/src/mesa/main/bufferobj.c	2006-01-15 09:48:06.000000000 +0100
@@ -412,11 +412,11 @@
                               format, type, depth-1, height-1, width);
 
 
-   if ((const GLubyte *) start > (const GLubyte *) pack->BufferObj->Size) {
+   if ((const GLubyte *) start > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
       /* This will catch negative values / wrap-around */
       return GL_FALSE;
    }
-   if ((const GLubyte *) end > (const GLubyte *) pack->BufferObj->Size) {
+   if ((const GLubyte *) end > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
       /* Image read goes beyond end of buffer */
       return GL_FALSE;
    }
--- Mesa-6.2.1/src/mesa/glapi/glapi.h.64bit	2004-12-08 16:07:30.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.h	2006-01-15 09:48:06.000000000 +0100
@@ -117,7 +117,7 @@
 _glapi_get_proc_offset(const char *funcName);
 
 
-extern const _glapi_proc
+extern _glapi_proc
 _glapi_get_proc_address(const char *funcName);
 
 
--- Mesa-6.2.1/src/mesa/glapi/glapi.c.64bit	2004-12-05 18:26:27.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.c	2006-01-15 09:48:06.000000000 +0100
@@ -532,7 +532,7 @@
  * Return pointer to the named static (built-in) function.
  * \return  NULL if function not found.
  */
-static const _glapi_proc
+static _glapi_proc
 get_static_proc_address(const char *funcName)
 {
    const glprocs_table_t * const f = find_entry( funcName );
@@ -837,7 +837,7 @@
  * in the name of static functions, try generating a new API entrypoint on
  * the fly with assembly language.
  */
-const _glapi_proc
+_glapi_proc
 _glapi_get_proc_address(const char *funcName)
 {
    GLuint i;

Mesa-6.2.1-antialias.patch:

--- NEW FILE Mesa-6.2.1-antialias.patch ---
--- Mesa-6.2.1/src/mesa/drivers/glide/fxsetup.c.antialias	2006-01-15 20:28:01.000000000 +0100
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxsetup.c	2006-01-15 20:38:46.000000000 +0100
@@ -2039,6 +2039,12 @@
 /****************************** DD Enable ******************************/
 /************************************************************************/
 
+/* from newer Glide3 fxglide.h, unfortunatly not in exported header files */
+#define GR_AA_ORDERED_OGL               0x00010000
+#define GR_AA_ORDERED_POINTS_OGL        GR_AA_ORDERED_OGL+1
+#define GR_AA_ORDERED_LINES_OGL         GR_AA_ORDERED_OGL+2
+#define GR_AA_ORDERED_TRIANGLES_OGL     GR_AA_ORDERED_OGL+3
+
 void
 fxDDEnable(GLcontext * ctx, GLenum cap, GLboolean state)
 {
@@ -2096,9 +2102,27 @@
       fxMesa->new_state |= FX_NEW_CULL;
       break;
    case GL_LINE_SMOOTH:
-   case GL_LINE_STIPPLE:
+      if (state)
+         grEnable(GR_AA_ORDERED_LINES_OGL);
+      else
+         grDisable(GR_AA_ORDERED_LINES_OGL);
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
    case GL_POINT_SMOOTH:
+      if (state)
+         grEnable(GR_AA_ORDERED_POINTS_OGL);
+      else
+         grDisable(GR_AA_ORDERED_POINTS_OGL);
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
    case GL_POLYGON_SMOOTH:
+      if (state)
+         grEnable(GR_AA_ORDERED_TRIANGLES_OGL);
+      else
+         grDisable(GR_AA_ORDERED_TRIANGLES_OGL);
+      fxMesa->new_state |= FX_NEW_TEXTURING;
+      break;
+   case GL_LINE_STIPPLE:
    case GL_TEXTURE_1D:
    case GL_TEXTURE_2D:
       fxMesa->new_state |= FX_NEW_TEXTURING;

Mesa-6.2.1-config.patch:

--- NEW FILE Mesa-6.2.1-config.patch ---
--- Mesa-6.2.1/configs/linux-x86-glide.config	2004-09-13 23:04:20.000000000 +0200
+++ Mesa-6.2.1/configs/linux-x86-glide	2006-01-15 09:26:18.000000000 +0100
@@ -8,9 +8,9 @@
 CC = gcc
 CXX = g++
 
-CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DFX -I/usr/include/glide3
 
-CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 
 GLUT_CFLAGS = -fexceptions
 
@@ -18,7 +18,7 @@
 ASM_SOURCES = $(X86_SOURCES) $(X86_API)
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm
--- Mesa-6.2.1/configs/default.config	2006-01-15 09:32:20.000000000 +0100
+++ Mesa-6.2.1/configs/default	2006-01-15 09:32:53.000000000 +0100
@@ -22,8 +22,8 @@
 
 # Misc tools and flags
 MKLIB_OPTIONS = 
-MKDEP = makedepend
-MKDEP_OPTIONS = -Y -fdepend
+MKDEP = gcc -M
+MKDEP_OPTIONS = -MF depend
 MAKE = make
 
 # Library names (base name)
--- Mesa-6.2.1/configs/linux-glide.config	2004-09-13 23:06:22.000000000 +0200
+++ Mesa-6.2.1/configs/linux-glide	2006-01-15 09:26:18.000000000 +0100
@@ -8,13 +8,13 @@
 CC = gcc
 CXX = g++
 
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
+CFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DFX -I/usr/include/glide3
+CXXFLAGS = $(RPM_OPT_FLAGS) -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
 GLUT_CFLAGS = -fexceptions
 
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
+GL_LIB_DEPS = -lX11 -lXext -lglide3 -lm -lpthread
+GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lglide3 -lm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Jan 2006 21:20:34 -0000	1.1
+++ .cvsignore	16 Jan 2006 21:22:30 -0000	1.2
@@ -0,0 +1 @@
+MesaLib-6.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Jan 2006 21:20:34 -0000	1.1
+++ sources	16 Jan 2006 21:22:30 -0000	1.2
@@ -0,0 +1 @@
+f43228cd2bf70f583ef3275c1c545421  MesaLib-6.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 16 21:23:16 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:23:16 -0500
Subject: rpms/fig2ps/devel .cvsignore, 1.2, 1.3 fig2ps.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601162123.k0GLNmXX011264@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fig2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11243

Modified Files:
	.cvsignore fig2ps.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2005 01:16:39 -0000	1.2
+++ .cvsignore	16 Jan 2006 21:23:15 -0000	1.3
@@ -1 +1 @@
-fig2ps_1.3.3.tar.gz
+fig2ps_1.3.5.tar.gz


Index: fig2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/devel/fig2ps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fig2ps.spec	21 Sep 2005 13:40:19 -0000	1.2
+++ fig2ps.spec	16 Jan 2006 21:23:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fig2ps
-Version:        1.3.3
-Release:        2
+Version:        1.3.5
+Release:        1
 Summary:        Utility for converting xfig pictures to PS/PDF
 
 Group:          Applications/Publishing
@@ -43,6 +43,9 @@
 %config(noreplace) /etc/fig2ps
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.5-1
+- New upstream release
+
 * Wed Sep 21 2005 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.3-2
 - fix make install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2005 01:16:39 -0000	1.2
+++ sources	16 Jan 2006 21:23:15 -0000	1.3
@@ -1 +1 @@
-24d2061f7491160e870beb6904672663  fig2ps_1.3.3.tar.gz
+e422a0587b0ca85a4fd8233bff7232ad  fig2ps_1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:26:20 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:26:20 -0500
Subject: rpms/fig2ps/FC-4 .cvsignore, 1.2, 1.3 fig2ps.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601162126.k0GLQqEj011342@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fig2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11321

Modified Files:
	.cvsignore fig2ps.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2005 01:16:39 -0000	1.2
+++ .cvsignore	16 Jan 2006 21:26:19 -0000	1.3
@@ -1 +1 @@
-fig2ps_1.3.3.tar.gz
+fig2ps_1.3.5.tar.gz


Index: fig2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-4/fig2ps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fig2ps.spec	21 Sep 2005 13:40:19 -0000	1.2
+++ fig2ps.spec	16 Jan 2006 21:26:19 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fig2ps
-Version:        1.3.3
-Release:        2
+Version:        1.3.5
+Release:        1
 Summary:        Utility for converting xfig pictures to PS/PDF
 
 Group:          Applications/Publishing
@@ -43,6 +43,9 @@
 %config(noreplace) /etc/fig2ps
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.5-1
+- New upstream release
+
 * Wed Sep 21 2005 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.3-2
 - fix make install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2005 01:16:39 -0000	1.2
+++ sources	16 Jan 2006 21:26:19 -0000	1.3
@@ -1 +1 @@
-24d2061f7491160e870beb6904672663  fig2ps_1.3.3.tar.gz
+e422a0587b0ca85a4fd8233bff7232ad  fig2ps_1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:27:54 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:27:54 -0500
Subject: rpms/fig2ps/FC-3 .cvsignore, 1.2, 1.3 fig2ps.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601162128.k0GLSQow011395@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fig2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11374

Modified Files:
	.cvsignore fig2ps.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Sep 2005 01:16:39 -0000	1.2
+++ .cvsignore	16 Jan 2006 21:27:53 -0000	1.3
@@ -1 +1 @@
-fig2ps_1.3.3.tar.gz
+fig2ps_1.3.5.tar.gz


Index: fig2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-3/fig2ps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fig2ps.spec	21 Sep 2005 13:40:19 -0000	1.2
+++ fig2ps.spec	16 Jan 2006 21:27:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fig2ps
-Version:        1.3.3
-Release:        2
+Version:        1.3.5
+Release:        1
 Summary:        Utility for converting xfig pictures to PS/PDF
 
 Group:          Applications/Publishing
@@ -43,6 +43,9 @@
 %config(noreplace) /etc/fig2ps
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.5-1
+- New upstream release
+
 * Wed Sep 21 2005 Quentin Spencer <qspencer at users.sourceforge.net> 1.3.3-2
 - fix make install command
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fig2ps/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Sep 2005 01:16:39 -0000	1.2
+++ sources	16 Jan 2006 21:27:53 -0000	1.3
@@ -1 +1 @@
-24d2061f7491160e870beb6904672663  fig2ps_1.3.3.tar.gz
+e422a0587b0ca85a4fd8233bff7232ad  fig2ps_1.3.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 21:36:43 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:36:43 -0500
Subject: rpms/cln/devel .cvsignore, 1.3, 1.4 cln.spec, 1.14, 1.15 sources,
	1.3, 1.4 cln-1.1.9-string.patch, 1.1, NONE
Message-ID: <200601162137.k0GLbFFc011592@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11571

Modified Files:
	.cvsignore cln.spec sources 
Removed Files:
	cln-1.1.9-string.patch 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 22:00:25 -0000	1.3
+++ .cvsignore	16 Jan 2006 21:36:43 -0000	1.4
@@ -1 +1 @@
-cln-1.1.10.tar.bz2
+cln-1.1.11.tar.bz2


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cln.spec	31 Oct 2005 22:00:25 -0000	1.14
+++ cln.spec	16 Jan 2006 21:36:43 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           cln
-Version:        1.1.10
+Version:        1.1.11
 Release:        1%{?dist}
 Summary:        Class Library for Numbers
 
@@ -78,6 +78,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
+- New upstream release.
+
 * Mon Oct 31 2005 Quentin Spencer <qspencer at users.sf.net> 1.1.10-1
 - New upstream release, incorporating previous patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 22:00:25 -0000	1.3
+++ sources	16 Jan 2006 21:36:43 -0000	1.4
@@ -1 +1 @@
-f194811dadcd2b1dca5f78a62370eb56  cln-1.1.10.tar.bz2
+7313dc20608ddc5dcfdae4d2f9138762  cln-1.1.11.tar.bz2


--- cln-1.1.9-string.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 21:40:27 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 16:40:27 -0500
Subject: rpms/cln/devel cln.spec,1.15,1.16
Message-ID: <200601162140.k0GLexja011685@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11651

Modified Files:
	cln.spec 
Log Message:
Updated source URL.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cln.spec	16 Jan 2006 21:36:43 -0000	1.15
+++ cln.spec	16 Jan 2006 21:40:26 -0000	1.16
@@ -1,12 +1,12 @@
 Name:           cln
 Version:        1.1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/CLN/
-Source0:        ftp://ftpthep.physik.uni-mainz.de/pub/gnu/%{name}-%{version}.tar.bz2
+Source0:        http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -78,6 +78,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-2
+- Update source URL.
+
 * Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 21:43:22 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 16:43:22 -0500
Subject: rpms/Glide3-libGL/devel Glide3-libGL.spec,1.1,1.2
Message-ID: <200601162143.k0GLhsAv011807@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3-libGL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11790

Modified Files:
	Glide3-libGL.spec 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-4
- Add libGL-devel to BR, to work around a bug in the Mesa makefiles
  where it tries to link against libGL before it has build it.



Index: Glide3-libGL.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3-libGL/devel/Glide3-libGL.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-libGL.spec	16 Jan 2006 21:22:30 -0000	1.1
+++ Glide3-libGL.spec	16 Jan 2006 21:43:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           Glide3-libGL
 Version:        6.2.1
-Release:        3
+Release:        4
 Summary:        Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards
 Group:          System Environment/Libraries
 License:        MIT/X11
@@ -13,7 +13,7 @@
 Patch2:         Mesa-6.2.1-antialias.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libX11-devel libXext-devel libXt-devel libXi-devel libXmu-devel
-BuildRequires:  xorg-x11-proto-devel Glide3-devel
+BuildRequires:  xorg-x11-proto-devel Glide3-devel libGL-devel
 ExclusiveArch:  %{ix86} x86_64
  
 %description
@@ -69,6 +69,10 @@
  
  
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-4
+- Add libGL-devel to BR, to work around a bug in the Mesa makefiles
+  where it tries to link against libGL before it has build it.
+
 * Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 6.2.1-3
 - Fixed up License.
 



From fedora-extras-commits at redhat.com  Mon Jan 16 21:51:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 16:51:38 -0500
Subject: rpms/freeze import.log,1.4,1.5
Message-ID: <200601162152.k0GLqBKv011964@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/freeze
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11918

Modified Files:
	import.log 
Log Message:
auto-import freeze-2.5.0-5.fc5 on branch devel from freeze-2.5.0-5.fc5.src.rpm
builds with gcc 4.1 -> what's more to ask ? (ok kill some warnings someday)


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/freeze/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:20:41 -0000	1.4
+++ import.log	16 Jan 2006 21:51:38 -0000	1.5
@@ -1,3 +1,4 @@
 freeze-2_5_0-0_fdr_1_rh90:HEAD:freeze-2.5.0-0.fdr.1.rh90.src.rpm:1099887629
 freeze-2_5_0-0_fdr_1_1:HEAD:freeze-2.5.0-0.fdr.1.1.src.rpm:1099887635
 freeze-2_5_0-0_fdr_1_2:HEAD:freeze-2.5.0-0.fdr.1.2.src.rpm:1099887641
+freeze-2_5_0-5_fc5:HEAD:freeze-2.5.0-5.fc5.src.rpm:1137448288



From fedora-extras-commits at redhat.com  Mon Jan 16 21:51:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 16:51:44 -0500
Subject: rpms/freeze/devel freeze.spec,1.7,1.8
Message-ID: <200601162152.k0GLqGlF011967@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/freeze/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11918/devel

Modified Files:
	freeze.spec 
Log Message:
auto-import freeze-2.5.0-5.fc5 on branch devel from freeze-2.5.0-5.fc5.src.rpm
builds with gcc 4.1 -> what's more to ask ? (ok kill some warnings someday)


Index: freeze.spec
===================================================================
RCS file: /cvs/extras/rpms/freeze/devel/freeze.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- freeze.spec	23 Jul 2005 18:27:16 -0000	1.7
+++ freeze.spec	16 Jan 2006 21:51:44 -0000	1.8
@@ -1,10 +1,11 @@
 Name:    freeze
 Version: 2.5.0
-Release: 4
+Release: 5%{?dist}
 Summary: freeze/melt/fcat compression utilities
 
 Group:     Applications/Archiving
 License:   Distributable
+# No one agrees on the canonical download site, everyone uses the same version
 Source:    http://www.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
 Patch0:    freeze-2.5.patch
 Patch1:    freeze-2.5.0-printf.patch
@@ -51,6 +52,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Jan 26 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.5.0-5
+- rebuild with gcc 4.1
+
 * Sat Jul 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.5.0-4
 - Fix bad printf string (#149613).
 - Fix default cnf file location in readme and man page.



From fedora-extras-commits at redhat.com  Mon Jan 16 22:03:37 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 16 Jan 2006 17:03:37 -0500
Subject: rpms/mysql-administrator/devel mysql-administrator.spec,1.1,1.2
Message-ID: <200601162204.k0GM490d013876@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13853

Modified Files:
	mysql-administrator.spec 
Log Message:
updated to 1.1.6



Index: mysql-administrator.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/mysql-administrator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-administrator.spec	12 Jan 2006 16:51:29 -0000	1.1
+++ mysql-administrator.spec	16 Jan 2006 22:03:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mysql-administrator
-Version:        1.1.5
-Release:        3%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        GUI to manage mysql Databases
 
 Group:          Applications/Databases
@@ -10,10 +10,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		mysql-administrator-1.1.5-gcc41.patch
 Patch1:		mysql-administrator-1.1.5-shellbang.patch
+#Patch2 from bugzilla https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177849
+Patch2:		mysql-administrator-gsprintf.patch
 
 BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
 BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils
-Requires:       mysql >= 4.0, gtkmm24, mysql-gui-common
+Requires:       mysql >= 4.0, mysql-gui-common
 
 %description
 MySQL Administrator enables developers and DBAs to easily perform 
@@ -24,14 +26,12 @@
 MySQL Administrator graphical console.
 
 %package     -n mysql-gui-common
-Summary:        Common libraries and data shared among the MySQL GUI Suites
+Summary:        Common data shared among the MySQL GUI Suites
 Group:          System Environment/Libraries
 
 %description -n mysql-gui-common
-This package contains several common libraries and data shared among the MySQL
-GUI Suites in all platforms.
-
-
+This package contains  glade files images and translations used by mysql tools
+at runtime
 
 %prep
 %setup -q
@@ -39,6 +39,7 @@
 %patch0 -p1 -b .gcc41
 %endif
 %patch1 -p1 -b .shellbang
+%patch2 -p0 -b .gsprintf
 
 %build
 pushd  mysql-gui-common
@@ -46,7 +47,6 @@
 make %{?_smp_mflags}
 popd
 
-
 pushd mysql-administrator
 %configure
 make %{?_smp_mflags}
@@ -64,6 +64,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
+cp -r mysql-administrator/doc/* $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
 # 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
 sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
@@ -71,20 +73,21 @@
 
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category SystemSetup \
+  --add-category System \
   --add-category Application \
   --add-category X-Fedora \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
 
 %find_lang mysql-gui-common
+%find_lang mysql-administrator
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f mysql-administrator.lang
 %defattr(-,root,root,-)
 %doc mysql-administrator/COPYING 
 %{_bindir}/mabackup
@@ -94,15 +97,21 @@
 %{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
 %dir %{_datadir}/mysql-gui/administrator
 %{_datadir}/mysql-gui/administrator/*
+%{_datadir}/mysql-gui/doc/*
 
 
 %files -n mysql-gui-common -f mysql-gui-common.lang
 %defattr(-,root,root,-)
 %doc mysql-gui-common/COPYING mysql-gui-common/README
 %dir %{_datadir}/mysql-gui
+%dir %{_datadir}/mysql-gui/doc
 %{_datadir}/mysql-gui/common
 
 %changelog
+* Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.6-1
+- update to 1.1.6 make mysql-gui-common description more appropriate
+- Fix Help,  apply patch for backup failure bugzilla #177849
+- add new lang files
 * Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-3
 - apply gcc4.1 patch only on fc5 
 * Wed Jan 11 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-2



From fedora-extras-commits at redhat.com  Mon Jan 16 22:04:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 17:04:11 -0500
Subject: rpms/libgda/devel libgda-1.9.100-sharp.patch, NONE, 1.1 libgda.spec,
	1.7, 1.8
Message-ID: <200601162204.k0GM4ihE013903@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13880

Modified Files:
	libgda.spec 
Added Files:
	libgda-1.9.100-sharp.patch 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
- Add BuildRequires for building libgda-sharp


libgda-1.9.100-sharp.patch:

--- NEW FILE libgda-1.9.100-sharp.patch ---
--- libgda-1.9.100/gda-sharp/gda-sharp.dll.config.in.sharp	2006-01-16 22:59:40.000000000 +0100
+++ libgda-1.9.100/gda-sharp/gda-sharp.dll.config.in	2006-01-16 23:00:11.000000000 +0100
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gda-3" target="libgda-2 at LIB_PREFIX@.1 at LIB_SUFFIX@"/>
+  <dllmap dll="gda-3" target="libgda-3 at LIB_PREFIX@.3 at LIB_SUFFIX@"/>
 </configuration>


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgda.spec	28 Nov 2005 16:07:38 -0000	1.7
+++ libgda.spec	16 Jan 2006 22:04:11 -0000	1.8
@@ -35,7 +35,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          1.9.100
-Release: 	  1
+Release: 	  2
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -43,19 +43,10 @@
 License:          LGPL
 BuildRoot:        %{_tmppath}/%{name}-%{version}-root
 BuildRequires:    pkgconfig >= 0.8
-Requires:         glib2 >= 2.0.0
-Requires:         libxml2
-Requires:         libxslt >= 1.0.9
-Requires:	  ncurses
 BuildRequires:    glib2-devel >= 2.0.0
-BuildRequires:    libxml2-devel
 BuildRequires:    libxslt-devel >= 1.0.9
-BuildRequires:    ncurses-devel
-BuildRequires:    scrollkeeper
-BuildRequires:    groff
-BuildRequires:    readline-devel
-BuildRequires:    db4-devel
-BuildRequires:    gtk-doc
+BuildRequires:    libxml2-devel ncurses-devel scrollkeeper groff readline-devel
+BuildRequires:    db4-devel gtk-doc mono-devel gtk-sharp2 gtk-sharp2-gapi
 
 %if %{FREETDS}
 BuildRequires:    freetds-devel
@@ -82,6 +73,7 @@
 %endif
 
 Patch0: libgda-1.9.100-configure.patch
+Patch1: libgda-1.9.100-sharp.patch
 
 %description
 libgda is a library that eases the task of writing
@@ -89,18 +81,27 @@
 
 
 %package devel
-Summary:          Development libraries and header files for libgda.
+Summary:          Development libraries and header files for libgda
 Group:            Development/Libraries
 Requires:         glib2-devel >= 2.0.0
-Requires:         libxml2-devel
 Requires:         libxslt-devel >= 1.0.9
-Requires:         db4-devel
+Requires:         db4-devel libxml2-devel
 Requires:	  %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
+
+%package sharp
+Summary:          Mono bindings for libgda
+Group:            System Environment/Libraries
+
+%description sharp
+This package contains the dll files needed to run (and compile) Mono
+applications which use libgda.
+
+
 %if %{FREETDS}
 %package freetds
 Summary:	libgda FreeTDS Provider
@@ -194,6 +195,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .configure
+%patch1 -p1 -b .sharp
 
 %build
 aclocal
@@ -253,7 +255,7 @@
 CONFIG="$CONFIG --without-ldap"
 %endif
 
-%configure $CONFIG --disable-gtk-doc
+%configure $CONFIG
 make
 
 %install
@@ -302,7 +304,12 @@
 %{_includedir}/*
 %{_libdir}/*.a
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/libgda-2.0.pc
+
+%files sharp
+%defattr(-,root,root)
+%{_libdir}/libgda
+%{_libdir}/pkgconfig/gda-sharp-2.0.pc
 
 %if %{FREETDS}
 %files freetds
@@ -360,6 +367,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
+- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
+- Add BuildRequires for building libgda-sharp
+
 * Sun Nov 27 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-1
 - New upstream version
 - Drop 4 intergrated patches



From fedora-extras-commits at redhat.com  Mon Jan 16 22:19:06 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 16 Jan 2006 17:19:06 -0500
Subject: rpms/cln/FC-4 .cvsignore, 1.3, 1.4 cln.spec, 1.10, 1.11 sources, 1.3,
	1.4 cln-1.1.9-string.patch, 1.1, NONE
Message-ID: <200601162219.k0GMJdSD014080@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14059

Modified Files:
	.cvsignore cln.spec sources 
Removed Files:
	cln-1.1.9-string.patch 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 21:59:26 -0000	1.3
+++ .cvsignore	16 Jan 2006 22:19:06 -0000	1.4
@@ -1 +1 @@
-cln-1.1.10.tar.bz2
+cln-1.1.11.tar.bz2


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cln.spec	31 Oct 2005 21:59:26 -0000	1.10
+++ cln.spec	16 Jan 2006 22:19:06 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           cln
-Version:        1.1.10
+Version:        1.1.11
 Release:        1%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/CLN/
-Source0:        ftp://ftpthep.physik.uni-mainz.de/pub/gnu/%{name}-%{version}.tar.bz2
+Source0:        http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -78,6 +78,10 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
+- New upstream release.
+- Updated source URL.
+
 * Mon Oct 31 2005 Quentin Spencer <qspencer at users.sf.net> 1.1.10-1
 - New upstream release, which incorporates previous patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 21:59:26 -0000	1.3
+++ sources	16 Jan 2006 22:19:06 -0000	1.4
@@ -1 +1 @@
-f194811dadcd2b1dca5f78a62370eb56  cln-1.1.10.tar.bz2
+7313dc20608ddc5dcfdae4d2f9138762  cln-1.1.11.tar.bz2


--- cln-1.1.9-string.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 16 22:27:00 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 16 Jan 2006 17:27:00 -0500
Subject: rpms/mysql-administrator/devel mysql-administrator-gsprintf.patch, 
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601162227.k0GMRX87014198@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14166

Modified Files:
	.cvsignore sources 
Added Files:
	mysql-administrator-gsprintf.patch 
Log Message:
patch for backups


mysql-administrator-gsprintf.patch:

--- NEW FILE mysql-administrator-gsprintf.patch ---
--- mysql-administrator/library/source/myx_backup.c.orig	2005-10-25 23:08:07.000000000 +0200
+++ mysql-administrator/library/source/myx_backup.c	2005-12-17 16:13:37.000000000 +0100
@@ -771,15 +772,15 @@
       int mode_entry_count = 0;
       if (status->options & MYX_B_ANSI_QUOTES)
       {
+	strcat(sql_mode_cmd, "ANSI_QUOTES");
         mode_entry_count++;
-        g_sprintf(sql_mode_cmd, "%sANSI_QUOTES", sql_mode_cmd);
       };
       if (status->options & MYX_B_COMPATIBILITY_MODE)
       {
-        g_sprintf(sql_mode_cmd, "%s%sMYSQL323", sql_mode_cmd, (mode_entry_count > 0) ? "," : "");
+	strcat(sql_mode_cmd, (mode_entry_count > 0 ? ",MYSQL323" : "MYSQL323"));
         mode_entry_count++;
       };
-      g_sprintf(sql_mode_cmd, "%s' */", sql_mode_cmd);
+      strcat(sql_mode_cmd, "' */");
 
       if (write_sql_file_header(status, error))
         return -1;
@@ -2448,10 +2450,10 @@
   SAFE_IO(fprintf(status->sql_file, "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n"));
 
   if (status->options & MYX_B_ANSI_QUOTES)
-    g_sprintf(Buffer, "%s,ANSI_QUOTES", Buffer);
+	strcat(Buffer, ",ANSI_QUOTES");
   if (status->options & MYX_B_COMPATIBILITY_MODE)
-    g_sprintf(Buffer, "%s,MYSQL323", Buffer);
-  g_sprintf(Buffer, "%s' */;\n\n\n", Buffer);
+	strcat(Buffer, ",MYSQL323");
+  strcat(Buffer, "' */;\n\n\n");
   SAFE_IO(fprintf(status->sql_file, Buffer));
 
   return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 16:51:29 -0000	1.2
+++ .cvsignore	16 Jan 2006 22:27:00 -0000	1.3
@@ -1 +1 @@
-mysql-administrator-1.1.5.tar.gz
+mysql-administrator-1.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 16:51:29 -0000	1.2
+++ sources	16 Jan 2006 22:27:00 -0000	1.3
@@ -1 +1 @@
-f50a3505d50e024e8a775c2cd4a2ecf6  mysql-administrator-1.1.5.tar.gz
+77c1c5a7b6f750b84873799bc9694ea5  mysql-administrator-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 22:30:51 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 16 Jan 2006 17:30:51 -0500
Subject: rpms/mysql-administrator/FC-4 mysql-administrator-gsprintf.patch,
	NONE, 1.1 .cvsignore, 1.2, 1.3 mysql-administrator.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601162231.k0GMVNgP014294@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/mysql-administrator/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14267

Modified Files:
	.cvsignore mysql-administrator.spec sources 
Added Files:
	mysql-administrator-gsprintf.patch 
Log Message:
add patch and update to 1.1.6


mysql-administrator-gsprintf.patch:

--- NEW FILE mysql-administrator-gsprintf.patch ---
--- mysql-administrator/library/source/myx_backup.c.orig	2005-10-25 23:08:07.000000000 +0200
+++ mysql-administrator/library/source/myx_backup.c	2005-12-17 16:13:37.000000000 +0100
@@ -771,15 +772,15 @@
       int mode_entry_count = 0;
       if (status->options & MYX_B_ANSI_QUOTES)
       {
+	strcat(sql_mode_cmd, "ANSI_QUOTES");
         mode_entry_count++;
-        g_sprintf(sql_mode_cmd, "%sANSI_QUOTES", sql_mode_cmd);
       };
       if (status->options & MYX_B_COMPATIBILITY_MODE)
       {
-        g_sprintf(sql_mode_cmd, "%s%sMYSQL323", sql_mode_cmd, (mode_entry_count > 0) ? "," : "");
+	strcat(sql_mode_cmd, (mode_entry_count > 0 ? ",MYSQL323" : "MYSQL323"));
         mode_entry_count++;
       };
-      g_sprintf(sql_mode_cmd, "%s' */", sql_mode_cmd);
+      strcat(sql_mode_cmd, "' */");
 
       if (write_sql_file_header(status, error))
         return -1;
@@ -2448,10 +2450,10 @@
   SAFE_IO(fprintf(status->sql_file, "/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;\n"));
 
   if (status->options & MYX_B_ANSI_QUOTES)
-    g_sprintf(Buffer, "%s,ANSI_QUOTES", Buffer);
+	strcat(Buffer, ",ANSI_QUOTES");
   if (status->options & MYX_B_COMPATIBILITY_MODE)
-    g_sprintf(Buffer, "%s,MYSQL323", Buffer);
-  g_sprintf(Buffer, "%s' */;\n\n\n", Buffer);
+	strcat(Buffer, ",MYSQL323");
+  strcat(Buffer, "' */;\n\n\n");
   SAFE_IO(fprintf(status->sql_file, Buffer));
 
   return 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 16:51:29 -0000	1.2
+++ .cvsignore	16 Jan 2006 22:30:50 -0000	1.3
@@ -1 +1 @@
-mysql-administrator-1.1.5.tar.gz
+mysql-administrator-1.1.6.tar.gz


Index: mysql-administrator.spec
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/mysql-administrator.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mysql-administrator.spec	12 Jan 2006 16:51:29 -0000	1.1
+++ mysql-administrator.spec	16 Jan 2006 22:30:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           mysql-administrator
-Version:        1.1.5
-Release:        3%{?dist}
+Version:        1.1.6
+Release:        1%{?dist}
 Summary:        GUI to manage mysql Databases
 
 Group:          Applications/Databases
@@ -10,10 +10,12 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		mysql-administrator-1.1.5-gcc41.patch
 Patch1:		mysql-administrator-1.1.5-shellbang.patch
+#Patch2 from bugzilla https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=177849
+Patch2:		mysql-administrator-gsprintf.patch
 
 BuildRequires:  libglade2-devel, gtkmm24-devel >= 2.6 , pcre-devel, mysql-devel >= 4.0
 BuildRequires:  openssl-devel, gtkhtml3-devel, desktop-file-utils
-Requires:       mysql >= 4.0, gtkmm24, mysql-gui-common
+Requires:       mysql >= 4.0, mysql-gui-common
 
 %description
 MySQL Administrator enables developers and DBAs to easily perform 
@@ -24,14 +26,12 @@
 MySQL Administrator graphical console.
 
 %package     -n mysql-gui-common
-Summary:        Common libraries and data shared among the MySQL GUI Suites
+Summary:        Common data shared among the MySQL GUI Suites
 Group:          System Environment/Libraries
 
 %description -n mysql-gui-common
-This package contains several common libraries and data shared among the MySQL
-GUI Suites in all platforms.
-
-
+This package contains  glade files images and translations used by mysql tools
+at runtime
 
 %prep
 %setup -q
@@ -39,6 +39,7 @@
 %patch0 -p1 -b .gcc41
 %endif
 %patch1 -p1 -b .shellbang
+%patch2 -p0 -b .gsprintf
 
 %build
 pushd  mysql-gui-common
@@ -46,7 +47,6 @@
 make %{?_smp_mflags}
 popd
 
-
 pushd mysql-administrator
 %configure
 make %{?_smp_mflags}
@@ -64,6 +64,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 popd
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
+cp -r mysql-administrator/doc/* $RPM_BUILD_ROOT/%{_datadir}/mysql-gui/doc/administrator
 # 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
 sed -i 's/\r//' $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
@@ -71,20 +73,21 @@
 
 desktop-file-install --vendor=fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category SystemSetup \
+  --add-category System \
   --add-category Application \
   --add-category X-Fedora \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/MySQLAdministrator.desktop
 
 %find_lang mysql-gui-common
+%find_lang mysql-administrator
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%files
+%files -f mysql-administrator.lang
 %defattr(-,root,root,-)
 %doc mysql-administrator/COPYING 
 %{_bindir}/mabackup
@@ -94,15 +97,21 @@
 %{_datadir}/mysql-gui/MySQLIcon_Admin_*.png
 %dir %{_datadir}/mysql-gui/administrator
 %{_datadir}/mysql-gui/administrator/*
+%{_datadir}/mysql-gui/doc/*
 
 
 %files -n mysql-gui-common -f mysql-gui-common.lang
 %defattr(-,root,root,-)
 %doc mysql-gui-common/COPYING mysql-gui-common/README
 %dir %{_datadir}/mysql-gui
+%dir %{_datadir}/mysql-gui/doc
 %{_datadir}/mysql-gui/common
 
 %changelog
+* Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.6-1
+- update to 1.1.6 make mysql-gui-common description more appropriate
+- Fix Help,  apply patch for backup failure bugzilla #177849
+- add new lang files
 * Thu Jan 12 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-3
 - apply gcc4.1 patch only on fc5 
 * Wed Jan 11 2006 Dennis Gilmore <dennis at ausil.us> - 1.1.5-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mysql-administrator/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 16:51:29 -0000	1.2
+++ sources	16 Jan 2006 22:30:50 -0000	1.3
@@ -1 +1 @@
-f50a3505d50e024e8a775c2cd4a2ecf6  mysql-administrator-1.1.5.tar.gz
+77c1c5a7b6f750b84873799bc9694ea5  mysql-administrator-1.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 22:35:39 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:35:39 -0500
Subject: rpms/nomarch import.log,1.4,1.5
Message-ID: <200601162236.k0GMaBUP014396@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/nomarch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14364

Modified Files:
	import.log 
Log Message:
auto-import nomarch-1.3-4.fc5 on branch devel from nomarch-1.3-4.fc5.src.rpm
same old version builds with gcc 4.1 without a single warning -> now that's clean code


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nomarch/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:55:37 -0000	1.4
+++ import.log	16 Jan 2006 22:35:39 -0000	1.5
@@ -1,3 +1,4 @@
 nomarch-1_3-0_fdr_1_rh90:HEAD:nomarch-1.3-0.fdr.1.rh90.src.rpm:1099889715
 nomarch-1_3-0_fdr_1_1:HEAD:nomarch-1.3-0.fdr.1.1.src.rpm:1099889721
 nomarch-1_3-0_fdr_1_2:HEAD:nomarch-1.3-0.fdr.1.2.src.rpm:1099889737
+nomarch-1_3-4_fc5:HEAD:nomarch-1.3-4.fc5.src.rpm:1137450929



From fedora-extras-commits at redhat.com  Mon Jan 16 22:35:45 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:35:45 -0500
Subject: rpms/nomarch/devel nomarch.spec,1.7,1.8
Message-ID: <200601162236.k0GMaHlX014399@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/nomarch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14364/devel

Modified Files:
	nomarch.spec 
Log Message:
auto-import nomarch-1.3-4.fc5 on branch devel from nomarch-1.3-4.fc5.src.rpm
same old version builds with gcc 4.1 without a single warning -> now that's clean code


Index: nomarch.spec
===================================================================
RCS file: /cvs/extras/rpms/nomarch/devel/nomarch.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nomarch.spec	22 May 2005 23:39:29 -0000	1.7
+++ nomarch.spec	16 Jan 2006 22:35:45 -0000	1.8
@@ -1,6 +1,6 @@
 Name:      nomarch
 Version:   1.3
-Release: 3
+Release:   4%{?dist}
 
 Summary:   GPLed Arc de-archiver
 
@@ -38,6 +38,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 1.3-4
+- me is gcc4.1-proof
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.3-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Mon Jan 16 22:42:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 16 Jan 2006 17:42:29 -0500
Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-sharp.patch, NONE,
	1.1 libgnomedb.spec, 1.9, 1.10
Message-ID: <200601162243.k0GMh2YI014478@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14458

Modified Files:
	libgnomedb.spec 
Added Files:
	libgnomedb-1.9.100-sharp.patch 
Log Message:
* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
- Add BuildRequires for building libgda-sharp


libgnomedb-1.9.100-sharp.patch:

--- NEW FILE libgnomedb-1.9.100-sharp.patch ---
--- libgnomedb-1.9.100/Makefile.am.sharp	2006-01-16 23:33:46.000000000 +0100
+++ libgnomedb-1.9.100/Makefile.am	2006-01-16 23:35:47.000000000 +0100
@@ -13,9 +13,9 @@
 endif
 
 if BUILD_GNOMEDB_SHARP
-GNOME_DIRECTORY=gnomedb-sharp
+GNOMEDB_SHARP_DIRECTORY=gnomedb-sharp
 else
-GNOME_DIRECTORY=
+GNOMEDB_SHARP_DIRECTORY=
 endif
 
 if ENABLE_GTK_DOC
--- libgnomedb-1.9.100/Makefile.in.sharp	2006-01-16 23:33:41.000000000 +0100
+++ libgnomedb-1.9.100/Makefile.in	2006-01-16 23:36:40.000000000 +0100
@@ -286,8 +286,8 @@
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 @HAVE_LIBGLADE_FALSE at LIBGLADE_DIRECTORY = 
 @HAVE_LIBGLADE_TRUE at LIBGLADE_DIRECTORY = glade
- at BUILD_GNOMEDB_SHARP_FALSE@GNOME_DIRECTORY = 
- at BUILD_GNOMEDB_SHARP_TRUE@GNOME_DIRECTORY = gnomedb-sharp
+ at BUILD_GNOMEDB_SHARP_FALSE@GNOMEDB_SHARP_DIRECTORY = 
+ at BUILD_GNOMEDB_SHARP_TRUE@GNOMEDB_SHARP_DIRECTORY = gnomedb-sharp
 @BUILD_WITH_GNOME_FALSE at GNOME_DIRECTORY = 
 @BUILD_WITH_GNOME_TRUE at GNOME_DIRECTORY = control-center
 @ENABLE_GTK_DOC_FALSE at DOC_DIRECTORY = 
--- libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp.dll.config.in.sharp	2006-01-16 23:34:13.000000000 +0100
+++ libgnomedb-1.9.100/gnomedb-sharp/gnomedb-sharp.dll.config.in	2006-01-16 23:35:04.000000000 +0100
@@ -1,3 +1,3 @@
 <configuration>
-  <dllmap dll="gnomedb-3" target="libgnomedb-2 at LIB_PREFIX@.1 at LIB_SUFFIX@"/>
+  <dllmap dll="gnomedb-3" target="libgnomedb-3 at LIB_PREFIX@.4 at LIB_SUFFIX@"/>
 </configuration>


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgnomedb.spec	30 Nov 2005 18:03:37 -0000	1.9
+++ libgnomedb.spec	16 Jan 2006 22:42:29 -0000	1.10
@@ -1,22 +1,22 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.9.100
-Release:         2
+Release:         3
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
 Group:           System Environment/Libraries
 License:         LGPL
 BuildRoot:       %{_tmppath}/%{name}-%{version}-root
-Requires:        gtk2 >= 1.3.6, libglade2, libgnomeui >= 1.103.0
-PreReq:          desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:   pkgconfig >= 0.8, libgnomeui-devel >= 1.103.0
 BuildRequires:   gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper
 BuildRequires:   desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires:   libgda-devel >= 1:1.9.99
 BuildRequires:   gtk-doc, openssl-devel, gtksourceview-devel
+BuildRequires:   mono-devel gtk-sharp2 gtk-sharp2-gapi libgda-sharp
 
 Patch0: libgnomedb-1.2.0-desktop.patch
+Patch1: libgnomedb-1.9.100-sharp.patch
 
 %description
 libgnomedb is a library that eases the task of writing
@@ -36,14 +36,27 @@
 This package contains the header files and libraries needed to write
 or compile programs that use libgda.
 
+
+%package sharp
+Summary:          Mono bindings for libgnomedb
+Group:            System Environment/Libraries
+
+%description sharp
+This package contains the dll files needed to run (and compile) Mono
+applications which use libgnomedb.
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .desktop.patch
+%patch1 -p1 -b .sharp
+
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 %makeinstall LIBGNOMEDB_DTDDIR=%{buildroot}%{_datadir}/libgnomedb/dtd
@@ -53,6 +66,10 @@
   --vendor fedora --add-category X-Fedora --delete-original \
   %{buildroot}%{_datadir}/applications/database-properties.desktop
 
+# install gnomedb-api.xml
+install -m 644 gnomedb-sharp/gnomedb-api.xml \
+   %{buildroot}%{_libdir}/libgnomedb/gnomedb-api.xml
+
 # remove unpackaged files
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.a
@@ -60,6 +77,7 @@
 rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.a
 rm -f %{buildroot}/%{_libdir}/libglade/2.0/*.la
 
+
 %post
 /sbin/ldconfig
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -68,17 +86,22 @@
 /usr/bin/gconftool-2 --makefile-install-rule $SCHEMA > /dev/null 2>&1
 done
 
+
 %postun -p /sbin/ldconfig
 
+
 %post devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+
 %postun devel
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files -f libgnomedb-3.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README NEWS
@@ -92,17 +115,29 @@
 %{_libdir}/libglade/2.0/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/libgnomedb-1.9
 %{_libdir}/*.a
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/pkgconfig/libgnomedb-2.0.pc
 %{_datadir}/omf
 %{_datadir}/gtk-doc/html/libgnomedb
 
 
+%files sharp
+%defattr(-,root,root)
+%{_libdir}/libgnomedb/gnomedb-api.xml
+%{_libdir}/libgnomedb/gnomedb-sharp.dll*
+%{_libdir}/pkgconfig/gnomedb-sharp-2.0.pc
+
+
 %changelog
+* Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
+- Remove unneeded requires (.so reqs are automaticly picked up by rpm).
+- Add BuildRequires for building libgda-sharp
+
 * Wed Nov 30 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
 - Add BuildRequires for optional gtksourceview, unfortunatly the
   evolution-data-server in Fedora is too new for the evolution provider.



From fedora-extras-commits at redhat.com  Mon Jan 16 22:44:15 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:44:15 -0500
Subject: rpms/zoo import.log,1.4,1.5
Message-ID: <200601162244.k0GMimix014588@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/zoo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14542

Modified Files:
	import.log 
Log Message:
auto-import zoo-2.10-4.fc5 on branch devel from zoo-2.10-4.fc5.src.rpm
builds with gcc4.1, warnings all over the place :(


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zoo/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:36:53 -0000	1.4
+++ import.log	16 Jan 2006 22:44:15 -0000	1.5
@@ -1,3 +1,4 @@
 zoo-2_10-0_fdr_2_rh90:HEAD:zoo-2.10-0.fdr.2.rh90.src.rpm:1099892201
 zoo-2_10-0_fdr_2_1:HEAD:zoo-2.10-0.fdr.2.1.src.rpm:1099892207
 zoo-2_10-0_fdr_2_2:HEAD:zoo-2.10-0.fdr.2.2.src.rpm:1099892213
+zoo-2_10-4_fc5:HEAD:zoo-2.10-4.fc5.src.rpm:1137451445



From fedora-extras-commits at redhat.com  Mon Jan 16 22:44:21 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:44:21 -0500
Subject: rpms/zoo/devel zoo.spec,1.6,1.7
Message-ID: <200601162244.k0GMirTo014591@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/zoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14542/devel

Modified Files:
	zoo.spec 
Log Message:
auto-import zoo-2.10-4.fc5 on branch devel from zoo-2.10-4.fc5.src.rpm
builds with gcc4.1, warnings all over the place :(


Index: zoo.spec
===================================================================
RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- zoo.spec	5 Apr 2005 11:09:28 -0000	1.6
+++ zoo.spec	16 Jan 2006 22:44:21 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      zoo
 Version:   2.10
-Release:   3
+Release:   4%{?dist}
 Summary:   File archiving utility with compression
 
 Group:     Applications/Archiving
@@ -43,6 +43,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Mon Jun 16 2006  Mailhot <nicolas.mailhot at laposte.net> - 2.10-4
+- rebuild with gcc 4.1
+
 * Tue Apr 05 2005  Adrian Reber <adrian at lisas.de> - 2.10-3
 - fix gcc4 errors
 



From fedora-extras-commits at redhat.com  Mon Jan 16 22:54:18 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:54:18 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.5,1.6
Message-ID: <200601162254.k0GMsp43014780@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14746

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc5 on branch devel from perl-Convert-UUlib-1.06-1.fc5.src.rpm
1.06


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	8 Nov 2004 04:59:20 -0000	1.5
+++ import.log	16 Jan 2006 22:54:18 -0000	1.6
@@ -2,3 +2,4 @@
 perl-Convert-UUlib-1_03-0_fdr_1_rh90:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.rh90.src.rpm:1099889945
 perl-Convert-UUlib-1_03-0_fdr_1_1:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.src.rpm:1099889951
 perl-Convert-UUlib-1_03-0_fdr_1_1_92:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.92.src.rpm:1099889960
+perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049



From fedora-extras-commits at redhat.com  Mon Jan 16 22:54:24 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:54:24 -0500
Subject: rpms/perl-Convert-UUlib/devel .cvsignore, 1.3,
	1.4 perl-Convert-UUlib.spec, 1.10, 1.11 sources, 1.3, 1.4
Message-ID: <200601162254.k0GMsvrt014785@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14746/devel

Modified Files:
	.cvsignore perl-Convert-UUlib.spec sources 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc5 on branch devel from perl-Convert-UUlib-1.06-1.fc5.src.rpm
1.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jun 2005 21:10:01 -0000	1.3
+++ .cvsignore	16 Jan 2006 22:54:24 -0000	1.4
@@ -1 +1 @@
-Convert-UUlib-1.051.tar.gz
+Convert-UUlib-1.06.tar.gz


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Convert-UUlib.spec	2 Jun 2005 21:40:56 -0000	1.10
+++ perl-Convert-UUlib.spec	16 Jan 2006 22:54:24 -0000	1.11
@@ -1,8 +1,8 @@
 %define rname Convert-UUlib
 
 Name:      perl-%{rname}
-Version:   1.051
-Release:   2%{?dist}
+Version:   1.06
+Release:   1%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
+- 1.06 (can't believe I'm still listed as this package owner)
+
 * Thu Jun  2 2005 Paul Howarth <paul at city-fan.org> 1.051-2%{?dist}
 - add dist tags for ease of syncing with FC-3 & FC-4
 - remove redundant perl buildreq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jun 2005 21:10:01 -0000	1.3
+++ sources	16 Jan 2006 22:54:24 -0000	1.4
@@ -1 +1 @@
-45a456bb8eb625b097f8a3dc15cc6a97  Convert-UUlib-1.051.tar.gz
+92514be4d146e8c4ea1941a7f7472dcb  Convert-UUlib-1.06.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 16 22:55:57 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:55:57 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.6,1.7
Message-ID: <200601162256.k0GMuT4h014880@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14846

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-1.fc4.src.rpm
1.06


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	16 Jan 2006 22:54:18 -0000	1.6
+++ import.log	16 Jan 2006 22:55:56 -0000	1.7
@@ -3,3 +3,4 @@
 perl-Convert-UUlib-1_03-0_fdr_1_1:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.src.rpm:1099889951
 perl-Convert-UUlib-1_03-0_fdr_1_1_92:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.92.src.rpm:1099889960
 perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049
+perl-Convert-UUlib-1_06-1_fc4:FC-4:perl-Convert-UUlib-1.06-1.fc4.src.rpm:1137452147



From fedora-extras-commits at redhat.com  Mon Jan 16 22:56:03 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Mon, 16 Jan 2006 17:56:03 -0500
Subject: rpms/perl-Convert-UUlib/FC-4 .cvsignore, 1.3,
	1.4 perl-Convert-UUlib.spec, 1.9, 1.10 sources, 1.3, 1.4
Message-ID: <200601162256.k0GMuZ6F014885@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14846/FC-4

Modified Files:
	.cvsignore perl-Convert-UUlib.spec sources 
Log Message:
auto-import perl-Convert-UUlib-1.06-1.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-1.fc4.src.rpm
1.06


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jun 2005 21:45:38 -0000	1.3
+++ .cvsignore	16 Jan 2006 22:56:02 -0000	1.4
@@ -1 +1 @@
-Convert-UUlib-1.051.tar.gz
+Convert-UUlib-1.06.tar.gz


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/perl-Convert-UUlib.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Convert-UUlib.spec	2 Jun 2005 21:45:38 -0000	1.9
+++ perl-Convert-UUlib.spec	16 Jan 2006 22:56:02 -0000	1.10
@@ -1,8 +1,8 @@
 %define rname Convert-UUlib
 
 Name:      perl-%{rname}
-Version:   1.051
-Release:   2%{?dist}
+Version:   1.06
+Release:   1%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
+- 1.06 (can't believe I'm still listed as this package owner)
+
 * Thu Jun  2 2005 Paul Howarth <paul at city-fan.org> 1.051-2%{?dist}
 - add dist tags for ease of syncing with FC-3 & FC-4
 - remove redundant perl buildreq


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jun 2005 21:45:38 -0000	1.3
+++ sources	16 Jan 2006 22:56:02 -0000	1.4
@@ -1 +1 @@
-45a456bb8eb625b097f8a3dc15cc6a97  Convert-UUlib-1.051.tar.gz
+92514be4d146e8c4ea1941a7f7472dcb  Convert-UUlib-1.06.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 00:36:05 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 16 Jan 2006 19:36:05 -0500
Subject: rpms/python-setuptools/FC-4 .cvsignore, 1.2,
	1.3 python-setuptools.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601170036.k0H0abTl018892@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18854/FC-4

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Dec 2005 05:12:31 -0000	1.2
+++ .cvsignore	17 Jan 2006 00:36:04 -0000	1.3
@@ -1 +1 @@
-setuptools-0.6a8.zip
+setuptools-0.6a9.zip


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/python-setuptools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-setuptools.spec	29 Dec 2005 05:12:31 -0000	1.1
+++ python-setuptools.spec	17 Jan 2006 00:36:04 -0000	1.2
@@ -3,7 +3,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-setuptools
-Version:        0.6a8
+Version:        0.6a9
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
@@ -33,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
-#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
 echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth
 
 %clean
@@ -47,5 +46,8 @@
 %{python_sitelib}/setuptools-%{version}-py%{pyver}.egg
 
 %changelog
+* Mon Jan 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a9-1
+- Upstream update
+
 * Sat Dec 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a8-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Dec 2005 05:12:31 -0000	1.2
+++ sources	17 Jan 2006 00:36:04 -0000	1.3
@@ -1 +1 @@
-3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip
+10bd22507d6115df6ba053228b648a0c  setuptools-0.6a9.zip



From fedora-extras-commits at redhat.com  Tue Jan 17 00:36:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 16 Jan 2006 19:36:11 -0500
Subject: rpms/python-setuptools/devel .cvsignore, 1.2,
	1.3 python-setuptools.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601170036.k0H0ah6f018897@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-setuptools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18854/devel

Modified Files:
	.cvsignore python-setuptools.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Dec 2005 11:38:56 -0000	1.2
+++ .cvsignore	17 Jan 2006 00:36:11 -0000	1.3
@@ -1 +1 @@
-setuptools-0.6a8.zip
+setuptools-0.6a9.zip


Index: python-setuptools.spec
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/python-setuptools.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-setuptools.spec	27 Dec 2005 12:02:49 -0000	1.2
+++ python-setuptools.spec	17 Jan 2006 00:36:11 -0000	1.3
@@ -3,7 +3,7 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           python-setuptools
-Version:        0.6a8
+Version:        0.6a9
 Release:        1%{?dist}
 Summary:        Download, build, install, upgrade, and uninstall Python packages
 
@@ -33,7 +33,6 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; -print | while read file ; do sed -i '1d' $file ; done
-#find $RPM_BUILD_ROOT%{python_sitelib} -name \*.py -exec grep -q '^#!' {} \; | while read file ; do grep -q '^#!' $file && sed -i '1d' $file ; done
 echo "setuptools-%{version}-py%{pyver}.egg" > $RPM_BUILD_ROOT%{python_sitelib}/setuptools.pth
 
 %clean
@@ -47,5 +46,8 @@
 %{python_sitelib}/setuptools-%{version}-py%{pyver}.egg
 
 %changelog
+* Mon Jan 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a9-1
+- Upstream update
+
 * Sat Dec 24 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.6a8-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-setuptools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Dec 2005 11:38:56 -0000	1.2
+++ sources	17 Jan 2006 00:36:11 -0000	1.3
@@ -1 +1 @@
-3eecdf66c1a2cf8a6556bc00b69d572a  setuptools-0.6a8.zip
+10bd22507d6115df6ba053228b648a0c  setuptools-0.6a9.zip



From fedora-extras-commits at redhat.com  Tue Jan 17 00:40:51 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Mon, 16 Jan 2006 19:40:51 -0500
Subject: rpms/inkscape/devel inkscape-0.42-GC-check.patch, 1.2,
	1.3 inkscape.spec, 1.24, 1.25
Message-ID: <200601170041.k0H0fNbW018952@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/rpms/inkscape/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18930

Modified Files:
	inkscape-0.42-GC-check.patch inkscape.spec 
Log Message:
Updated GC patch, bug 171791

inkscape-0.42-GC-check.patch:

Index: inkscape-0.42-GC-check.patch
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape-0.42-GC-check.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- inkscape-0.42-GC-check.patch	18 Aug 2005 21:56:51 -0000	1.2
+++ inkscape-0.42-GC-check.patch	17 Jan 2006 00:40:50 -0000	1.3
@@ -1,39 +1,21 @@
 diff -Nur inkscape-0.42-orig/configure inkscape-0.42/configure
 --- inkscape-0.42-orig/configure	2005-07-25 07:25:35.000000000 +0200
 +++ inkscape-0.42/configure	2005-08-18 23:55:52.000000000 +0200
-@@ -22931,7 +22931,7 @@
- 		    # desired function name.  They're all in libgc.
- 		    # The "break" will exit from the top level
-                     # AC_CHECK_HEADERS.
--		    gc_libs=""
-+		    gc_libs="-lpthread -ldl"
- 		    echo "$as_me:$LINENO: checking for GC_init in -lgc" >&5
- echo $ECHO_N "checking for GC_init in -lgc... $ECHO_C" >&6
- if test "${ac_cv_lib_gc_GC_init+set}" = set; then
 @@ -23003,7 +23003,7 @@
    gc_ok=no
  fi
  
 -		    gc_libs="-lpthread"
-+		    gc_libs="-lpthread -ldl"
++		    gc_libs=""
  		    echo "$as_me:$LINENO: checking for GC_malloc in -lgc" >&5
  echo $ECHO_N "checking for GC_malloc in -lgc... $ECHO_C" >&6
  if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then
-@@ -23075,7 +23075,7 @@
-   gc_ok=no
- fi
- 
--		    gc_libs="$lt_cv_dlopen_libs"
-+		    gc_libs="-lpthread -ldl"
- 		    echo "$as_me:$LINENO: checking for GC_realloc in -lgc" >&5
- echo $ECHO_N "checking for GC_realloc in -lgc... $ECHO_C" >&6
- if test "${ac_cv_lib_gc_GC_realloc+set}" = set; then
 @@ -23147,7 +23147,7 @@
    gc_ok=no
  fi
  
 -		    gc_libs="-lpthread $lt_cv_dlopen_libs"
-+		    gc_libs="-lpthread -ldl"
++		    gc_libs="$lt_cv_dlopen_libs"
  		    echo "$as_me:$LINENO: checking for GC_free in -lgc" >&5
  echo $ECHO_N "checking for GC_free in -lgc... $ECHO_C" >&6
  if test "${ac_cv_lib_gc_GC_free+set}" = set; then


Index: inkscape.spec
===================================================================
RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- inkscape.spec	18 Dec 2005 03:00:15 -0000	1.24
+++ inkscape.spec	17 Jan 2006 00:40:50 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           inkscape
 Version:        0.43
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Vector-based drawing program using SVG
 
 Group:          Applications/Productivity
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Denis Leroy <denis at poolshark.org> - 0.43-2
+- Updated GC patch, bug 171791
+
 * Sat Dec 17 2005 Denis Leroy <denis at poolshark.org> - 0.43-1
 - Update to 0.43
 - Added 2 patches to fix g++ 4.1 compilation issues



From fedora-extras-commits at redhat.com  Tue Jan 17 01:54:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 16 Jan 2006 20:54:37 -0500
Subject: rpms/liferea/devel .cvsignore, 1.17, 1.18 liferea.spec, 1.26,
	1.27 sources, 1.18, 1.19
Message-ID: <200601170155.k0H1tAXS021032@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21011

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
- Update to 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Dec 2005 21:37:43 -0000	1.17
+++ .cvsignore	17 Jan 2006 01:54:37 -0000	1.18
@@ -1 +1 @@
-liferea-1.0.tar.gz
+liferea-1.0.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- liferea.spec	26 Dec 2005 15:53:05 -0000	1.26
+++ liferea.spec	17 Jan 2006 01:54:37 -0000	1.27
@@ -1,8 +1,8 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.0.1
+Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
 Group:          Applications/Internet
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
+- Update to 1.0.1.
+
 * Mon Dec 26 2005 Brian Pepple <bdpepple at ameritech.net> - 1.0-4
 - Dropp BR for libXdmcp-devel & libXau-devel, replace w/ libX11-devel (#176313).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	23 Dec 2005 21:37:44 -0000	1.18
+++ sources	17 Jan 2006 01:54:37 -0000	1.19
@@ -1 +1 @@
-ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz
+c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 03:19:24 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 16 Jan 2006 22:19:24 -0500
Subject: rpms/lcdf-typetools/devel lcdf-typetools.spec,1.4,1.5
Message-ID: <200601170319.k0H3JvQR025749@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/lcdf-typetools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25732

Modified Files:
	lcdf-typetools.spec 
Log Message:
bump release for rawhide rebuild



Index: lcdf-typetools.spec
===================================================================
RCS file: /cvs/extras/rpms/lcdf-typetools/devel/lcdf-typetools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lcdf-typetools.spec	20 Nov 2005 04:53:02 -0000	1.4
+++ lcdf-typetools.spec	17 Jan 2006 03:19:24 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           lcdf-typetools
 Version:        2.36
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for manipulating Postscript fonts
 
 Group:          Applications/Publishing
@@ -41,6 +41,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Michael A. Peters <mpeters at mac.com> - 2.36-2
+- rebuild in rawhide
+
 * Sat Nov 19 2005 Michael A. Peters <mpeters at mac.com> - 2.36-1
 - upstream update
 



From fedora-extras-commits at redhat.com  Tue Jan 17 03:29:41 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 16 Jan 2006 22:29:41 -0500
Subject: rpms/pan/devel pan.spec,1.5,1.6
Message-ID: <200601170330.k0H3UDdo025821@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25799

Modified Files:
	pan.spec 
Log Message:
devel branch rebuild



Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pan.spec	23 Sep 2005 05:33:40 -0000	1.5
+++ pan.spec	17 Jan 2006 03:29:41 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.14.2.91
-Release: 3.2%{?dist}
+Release: 3.3%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -83,6 +83,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Mon Jan 16 2006 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-3.3
+- Devel branch rebuild
+
 * Thu Sep 22 2005 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-3.2
 - forgot to commit patch to cvs in devel branch.
 



From fedora-extras-commits at redhat.com  Tue Jan 17 04:32:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:32:58 -0500
Subject: rpms/alsamixergui - New directory
Message-ID: <200601170433.k0H4X08X027696@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27688/alsamixergui

Log Message:
Directory /cvs/extras/rpms/alsamixergui added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:33:03 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:33:03 -0500
Subject: rpms/alsamixergui/devel - New directory
Message-ID: <200601170433.k0H4X6Gf027711@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27688/alsamixergui/devel

Log Message:
Directory /cvs/extras/rpms/alsamixergui/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:33:20 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:33:20 -0500
Subject: rpms/alsamixergui Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601170433.k0H4XMZ4027745@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27733

Added Files:
	Makefile import.log 
Log Message:
Setup of module alsamixergui


--- NEW FILE Makefile ---
# Top level Makefile for module alsamixergui
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:33:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:33:27 -0500
Subject: rpms/alsamixergui/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601170433.k0H4XTRP027765@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27733/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module alsamixergui


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:36:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:36:31 -0500
Subject: rpms/alsamixergui import.log,1.1,1.2
Message-ID: <200601170437.k0H4b365027853@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814

Modified Files:
	import.log 
Log Message:
auto-import alsamixergui-0.9.0-0.2.rc1 on branch devel from alsamixergui-0.9.0-0.2.rc1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 04:33:20 -0000	1.1
+++ import.log	17 Jan 2006 04:36:30 -0000	1.2
@@ -0,0 +1 @@
+alsamixergui-0_9_0-0_2_rc1:HEAD:alsamixergui-0.9.0-0.2.rc1.src.rpm:1137472577



From fedora-extras-commits at redhat.com  Tue Jan 17 04:36:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:36:37 -0500
Subject: rpms/alsamixergui/devel alsamixergui-modernfix.patch, NONE,
	1.1 alsamixergui.desktop, NONE, 1.1 alsamixergui.png, NONE,
	1.1 alsamixergui.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601170437.k0H4b90K027857@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/alsamixergui/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27814/devel

Modified Files:
	.cvsignore sources 
Added Files:
	alsamixergui-modernfix.patch alsamixergui.desktop 
	alsamixergui.png alsamixergui.spec 
Log Message:
auto-import alsamixergui-0.9.0-0.2.rc1 on branch devel from alsamixergui-0.9.0-0.2.rc1.src.rpm

alsamixergui-modernfix.patch:

--- NEW FILE alsamixergui-modernfix.patch ---
--- alsamixergui-0.9.0rc1-2/configure.BAD	2006-01-16 12:28:52.000000000 -0600
+++ alsamixergui-0.9.0rc1-2/configure	2006-01-16 12:39:24.000000000 -0600
@@ -1476,17 +1476,17 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lfltk  $LIBS"
+LIBS="-lfltk -lstdc++ $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1482 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char numericsort();
+char fl_numericsort();
 
 int main() {
-numericsort()
+fl_numericsort()
 ; return 0; }
 EOF
 if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -1664,7 +1664,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lasound  $LIBS"
+LIBS="-lasound -lstdc++ $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1670 "configure"
 #include "confdefs.h"
--- alsamixergui-0.9.0rc1-2/src/alsamixer.cxx.BAD	2006-01-16 12:41:54.000000000 -0600
+++ alsamixergui-0.9.0rc1-2/src/alsamixer.cxx	2006-01-16 12:45:44.000000000 -0600
@@ -653,8 +653,8 @@
     if (vleft >= 0 && vright >= 0) {
       if (joined) {
 #ifdef ALSAMIXER_GUI
-	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; 
-	snd_mixer_selem_channel_id_t(int(chn)++))
+	for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST;
+	snd_mixer_selem_channel_id_t(int(chn)+1))
 #else
 	for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++)
 #endif


--- NEW FILE alsamixergui.desktop ---
[Desktop Entry]
Name=ALSA Mixer
Comment=GUI version of alsamixer
Exec=alsamixergui
Icon=alsamixergui.png
Categories=Application;AudioVideo;X-Fedora;
Terminal=false
Type=Application
Encoding=UTF-8


--- NEW FILE alsamixergui.spec ---
Name:		alsamixergui
Summary: 	GUI mixer for ALSA sound devices
Version:	0.9.0
Release:	0.2.rc1%{?dist}
License:	BSD-ish
Group:		Applications/System
Source0:	ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/%{name}-%{version}rc1-2.tar.gz
Source1:	alsamixergui.desktop
Source2:	alsamixergui.png
URL:		ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	fltk-devel, libstdc++-devel
BuildRequires:	alsa-lib-devel, desktop-file-utils
Patch0:		alsamixergui-modernfix.patch

%description
alsamixergui is a FLTK based frontend for alsamixer. It is written
directly on top of the alsamixer source, leaving the original source
intact, only adding a couple of ifdefs, and some calls to the gui
part, so it provides exactly the same functionality, but with a
graphical userinterface.

%prep
%setup -q -n %{name}-%{version}rc1-2
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor fedora                            \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README AUTHORS COPYING ChangeLog
%{_bindir}/alsamixergui
%{_datadir}/applications/fedora-alsamixergui.desktop
%{_datadir}/pixmaps/alsamixergui.png

%changelog
* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-0.2.rc1
- add desktop entry

* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.9.0-0.1.rc1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 04:33:26 -0000	1.1
+++ .cvsignore	17 Jan 2006 04:36:36 -0000	1.2
@@ -0,0 +1 @@
+alsamixergui-0.9.0rc1-2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alsamixergui/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 04:33:26 -0000	1.1
+++ sources	17 Jan 2006 04:36:36 -0000	1.2
@@ -0,0 +1 @@
+24b74dda2cf77c313c6cba9b062c8feb  alsamixergui-0.9.0rc1-2.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 04:45:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:45:02 -0500
Subject: owners owners.list,1.536,1.537
Message-ID: <200601170445.k0H4jYc7028241@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28222

Modified Files:
	owners.list 
Log Message:

alsamixergui



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -r1.536 -r1.537
--- owners.list	16 Jan 2006 19:20:08 -0000	1.536
+++ owners.list	17 Jan 2006 04:45:02 -0000	1.537
@@ -28,6 +28,7 @@
 Fedora Extras|allegro|A game programming library|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:17 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:17 -0500
Subject: rpms/xkeycaps - New directory
Message-ID: <200601170450.k0H4oJsC028303@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28295/xkeycaps

Log Message:
Directory /cvs/extras/rpms/xkeycaps added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:23 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:23 -0500
Subject: rpms/xkeycaps/devel - New directory
Message-ID: <200601170450.k0H4oPmb028318@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28295/xkeycaps/devel

Log Message:
Directory /cvs/extras/rpms/xkeycaps/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:37 -0500
Subject: rpms/xkeycaps Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601170450.k0H4od5J028352@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28340

Added Files:
	Makefile import.log 
Log Message:
Setup of module xkeycaps


--- NEW FILE Makefile ---
# Top level Makefile for module xkeycaps
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:50:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:50:43 -0500
Subject: rpms/xkeycaps/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601170450.k0H4ojeN028372@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28340/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xkeycaps


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 04:51:23 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:51:23 -0500
Subject: rpms/xkeycaps import.log,1.1,1.2
Message-ID: <200601170451.k0H4ptXV028452@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28416

Modified Files:
	import.log 
Log Message:
auto-import xkeycaps-2.46-2 on branch devel from xkeycaps-2.46-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 04:50:37 -0000	1.1
+++ import.log	17 Jan 2006 04:51:22 -0000	1.2
@@ -0,0 +1 @@
+xkeycaps-2_46-2:HEAD:xkeycaps-2.46-2.src.rpm:1137473464



From fedora-extras-commits at redhat.com  Tue Jan 17 04:51:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:51:29 -0500
Subject: rpms/xkeycaps/devel xkeycaps.desktop, NONE, 1.1 xkeycaps.png, NONE, 
	1.1 xkeycaps.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601170452.k0H4q1S4028456@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28416/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xkeycaps.desktop xkeycaps.png xkeycaps.spec 
Log Message:
auto-import xkeycaps-2.46-2 on branch devel from xkeycaps-2.46-2.src.rpm


--- NEW FILE xkeycaps.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xkeycaps
GenericName=xkeycaps
Comment=Graphical front-end to xmodmap
Exec=xkeycaps
Icon=xkeycaps.png
StartupNotify=false
Terminal=false
Type=Application
Categories=X-Fedora;SystemSetup;Application;
Version=2.46


--- NEW FILE xkeycaps.spec ---
# FC-5 version

Name:		xkeycaps
Summary: 	Graphical front end to xmodmap
Version:	2.46
Release:	2%{?dist}
License:	BSD-ish
Group:		Applications/System
Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
Source1:	xkeycaps.desktop
Source2:	xkeycaps.png
URL:		http://www.jwz.org/xkeycaps/
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
BuildRequires:	libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel
BuildRequires:	desktop-file-utils, libXext-devel
Requires:	xorg-x11-server-utils

%description
xkeycaps is a graphical front-end to xmodmap. It opens a window that 
looks like a keyboard; moving the mouse over a key shows what KeySyms 
and Modifier bits that key generates. Clicking on a key simulates 
KeyPress/KeyRelease events on the window of your choice. It is possible 
to change the KeySyms and Modifiers generated by a key through a 
mouse-based interface. This program can also write an input file for 
xmodmap to recreate your changes in future sessions.

%prep
%setup -q 

%build
xmkmf
make

%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install -m0644 xkeycaps.man $RPM_BUILD_ROOT%{_mandir}/man1
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc README sgi-microsoft.txt
%{_bindir}/xkeycaps
%{_datadir}/applications/fedora-xkeycaps.desktop
%{_datadir}/pixmaps/xkeycaps.png
%{_mandir}/man1/*

%changelog
* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
- add missing BR
- fix missing desktop file

* Thu Dec 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 04:50:42 -0000	1.1
+++ .cvsignore	17 Jan 2006 04:51:28 -0000	1.2
@@ -0,0 +1 @@
+xkeycaps-2.46.tar.Z


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 04:50:42 -0000	1.1
+++ sources	17 Jan 2006 04:51:28 -0000	1.2
@@ -0,0 +1 @@
+6792f828db6538f44f7696a8783b44ac  xkeycaps-2.46.tar.Z



From fedora-extras-commits at redhat.com  Tue Jan 17 04:54:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:54:05 -0500
Subject: owners owners.list,1.537,1.538
Message-ID: <200601170454.k0H4scJm028655@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28638

Modified Files:
	owners.list 
Log Message:

xkeycaps



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.537
retrieving revision 1.538
diff -u -r1.537 -r1.538
--- owners.list	17 Jan 2006 04:45:02 -0000	1.537
+++ owners.list	17 Jan 2006 04:54:05 -0000	1.538
@@ -1336,6 +1336,7 @@
 Fedora Extras|xfprint|Print dialog and printer manager for Xfce 4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4|Next generation window manager for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfwm4-themes|Additional themes for xfwm4|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xkeycaps|Graphical front end to xmodmap|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xlhtml|Excel 95/97 and PowerPoint to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|xlockmore|Screen lock and screen saver|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmldiff|Tree to tree correction between XML documents|stickster at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 04:59:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:59:26 -0500
Subject: rpms/xkeycaps/FC-3 xkeycaps.spec,1.1,1.2
Message-ID: <200601170459.k0H4xw6m028700@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668/FC-3

Modified Files:
	xkeycaps.spec 
Log Message:

xkeycaps FC-3/FC-4 changes



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.spec	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.spec	17 Jan 2006 04:59:25 -0000	1.2
@@ -1,4 +1,4 @@
-# FC-5 version
+# FC-3/FC-4 version
 
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
@@ -11,10 +11,8 @@
 Source2:	xkeycaps.png
 URL:		http://www.jwz.org/xkeycaps/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
-BuildRequires:	libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel
-BuildRequires:	desktop-file-utils, libXext-devel
-Requires:	xorg-x11-server-utils
+BuildRequires:	xorg-x11-devel, xorg-x11-deprecated-libs-devel
+BuildRequires:	desktop-file-utils
 
 %description
 xkeycaps is a graphical front-end to xmodmap. It opens a window that 
@@ -29,7 +27,7 @@
 %setup -q 
 
 %build
-xmkmf
+/usr/X11R6/bin/xmkmf
 make
 
 %install



From fedora-extras-commits at redhat.com  Tue Jan 17 04:59:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 16 Jan 2006 23:59:32 -0500
Subject: rpms/xkeycaps/FC-4 xkeycaps.spec,1.1,1.2
Message-ID: <200601170500.k0H5041i028714@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28668/FC-4

Modified Files:
	xkeycaps.spec 
Log Message:

xkeycaps FC-3/FC-4 changes



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.spec	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.spec	17 Jan 2006 04:59:31 -0000	1.2
@@ -1,4 +1,4 @@
-# FC-5 version
+# FC-3/FC-4 version
 
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
@@ -11,10 +11,8 @@
 Source2:	xkeycaps.png
 URL:		http://www.jwz.org/xkeycaps/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
-BuildRequires:	libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel
-BuildRequires:	desktop-file-utils, libXext-devel
-Requires:	xorg-x11-server-utils
+BuildRequires:	xorg-x11-devel, xorg-x11-deprecated-libs-devel
+BuildRequires:	desktop-file-utils
 
 %description
 xkeycaps is a graphical front-end to xmodmap. It opens a window that 
@@ -29,7 +27,7 @@
 %setup -q 
 
 %build
-xmkmf
+/usr/X11R6/bin/xmkmf
 make
 
 %install



From fedora-extras-commits at redhat.com  Tue Jan 17 05:14:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:14:46 -0500
Subject: rpms/xkeycaps/FC-3 xkeycaps.desktop,1.1,1.2 xkeycaps.spec,1.2,1.3
Message-ID: <200601170515.k0H5FIZU030608@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30568/FC-3

Modified Files:
	xkeycaps.desktop xkeycaps.spec 
Log Message:

FC-3/FC-4 fixes



Index: xkeycaps.desktop
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.desktop	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.desktop	17 Jan 2006 05:14:46 -0000	1.2
@@ -3,7 +3,7 @@
 Name=xkeycaps
 GenericName=xkeycaps
 Comment=Graphical front-end to xmodmap
-Exec=xkeycaps
+Exec=/usr/X11R6/bin/xkeycaps
 Icon=xkeycaps.png
 StartupNotify=false
 Terminal=false


Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xkeycaps.spec	17 Jan 2006 04:59:25 -0000	1.2
+++ xkeycaps.spec	17 Jan 2006 05:14:46 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD-ish
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
@@ -48,7 +48,7 @@
 %files
 %defattr(-,root,root)
 %doc README sgi-microsoft.txt
-%{_bindir}/xkeycaps
+/usr/X11R6/bin/xkeycaps
 %{_datadir}/applications/fedora-xkeycaps.desktop
 %{_datadir}/pixmaps/xkeycaps.png
 %{_mandir}/man1/*



From fedora-extras-commits at redhat.com  Tue Jan 17 05:14:52 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:14:52 -0500
Subject: rpms/xkeycaps/FC-4 xkeycaps.desktop,1.1,1.2 xkeycaps.spec,1.2,1.3
Message-ID: <200601170515.k0H5FOSn030612@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30568/FC-4

Modified Files:
	xkeycaps.desktop xkeycaps.spec 
Log Message:

FC-3/FC-4 fixes



Index: xkeycaps.desktop
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.desktop	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.desktop	17 Jan 2006 05:14:52 -0000	1.2
@@ -3,7 +3,7 @@
 Name=xkeycaps
 GenericName=xkeycaps
 Comment=Graphical front-end to xmodmap
-Exec=xkeycaps
+Exec=/usr/X11R6/bin/xkeycaps
 Icon=xkeycaps.png
 StartupNotify=false
 Terminal=false


Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xkeycaps.spec	17 Jan 2006 04:59:31 -0000	1.2
+++ xkeycaps.spec	17 Jan 2006 05:14:52 -0000	1.3
@@ -3,7 +3,7 @@
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD-ish
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
@@ -48,7 +48,7 @@
 %files
 %defattr(-,root,root)
 %doc README sgi-microsoft.txt
-%{_bindir}/xkeycaps
+/usr/X11R6/bin/xkeycaps
 %{_datadir}/applications/fedora-xkeycaps.desktop
 %{_datadir}/pixmaps/xkeycaps.png
 %{_mandir}/man1/*



From fedora-extras-commits at redhat.com  Tue Jan 17 05:17:18 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:17:18 -0500
Subject: rpms/xkeycaps/FC-3 xkeycaps.spec,1.3,1.4
Message-ID: <200601170517.k0H5HoHZ030673@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30626/FC-3

Modified Files:
	xkeycaps.spec 
Log Message:

Fix spec files



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xkeycaps.spec	17 Jan 2006 05:14:46 -0000	1.3
+++ xkeycaps.spec	17 Jan 2006 05:17:18 -0000	1.4
@@ -54,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-3
+- fix FC-3/FC-4
+
 * Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
 - add missing BR
 - fix missing desktop file



From fedora-extras-commits at redhat.com  Tue Jan 17 05:17:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:17:24 -0500
Subject: rpms/xkeycaps/FC-4 xkeycaps.spec,1.3,1.4
Message-ID: <200601170517.k0H5Hu0i030676@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30626/FC-4

Modified Files:
	xkeycaps.spec 
Log Message:

Fix spec files



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xkeycaps.spec	17 Jan 2006 05:14:52 -0000	1.3
+++ xkeycaps.spec	17 Jan 2006 05:17:24 -0000	1.4
@@ -54,6 +54,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-3
+- fix FC-3/FC-4
+
 * Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
 - add missing BR
 - fix missing desktop file



From fedora-extras-commits at redhat.com  Tue Jan 17 05:17:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 17 Jan 2006 00:17:30 -0500
Subject: rpms/xkeycaps/devel xkeycaps.spec,1.1,1.2
Message-ID: <200601170518.k0H5I2e9030679@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xkeycaps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30626/devel

Modified Files:
	xkeycaps.spec 
Log Message:

Fix spec files



Index: xkeycaps.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeycaps/devel/xkeycaps.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xkeycaps.spec	17 Jan 2006 04:51:28 -0000	1.1
+++ xkeycaps.spec	17 Jan 2006 05:17:30 -0000	1.2
@@ -3,7 +3,7 @@
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD-ish
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
@@ -56,6 +56,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-3
+- fix FC-3/FC-4
+
 * Mon Jan 16 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.46-2
 - add missing BR
 - fix missing desktop file



From fedora-extras-commits at redhat.com  Tue Jan 17 05:32:57 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Jan 2006 00:32:57 -0500
Subject: rpms/liferea/FC-4 .cvsignore, 1.17, 1.18 liferea.spec, 1.22,
	1.23 sources, 1.18, 1.19
Message-ID: <200601170533.k0H5XTs5030848@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30827

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
- Update to 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	23 Dec 2005 21:39:20 -0000	1.17
+++ .cvsignore	17 Jan 2006 05:32:57 -0000	1.18
@@ -1 +1 @@
-liferea-1.0.tar.gz
+liferea-1.0.1.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- liferea.spec	23 Dec 2005 21:39:20 -0000	1.22
+++ liferea.spec	17 Jan 2006 05:32:57 -0000	1.23
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
+- Update to 1.0.1.
+
 * Fri Dec 23 2005 Brian Pepple <bdpepple at ameritech.net> - 1.0-1
 - Update to 1.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	23 Dec 2005 21:39:20 -0000	1.18
+++ sources	17 Jan 2006 05:32:57 -0000	1.19
@@ -1 +1 @@
-ba3a520361e5b02a27f93ee5ecda4448  liferea-1.0.tar.gz
+c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 07:12:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 02:12:14 -0500
Subject: owners owners.list,1.538,1.539
Message-ID: <200601170712.k0H7Cr8M002184@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2137

Modified Files:
	owners.list 
Log Message:
Orphan Compton's packages per his ack.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.538
retrieving revision 1.539
diff -u -r1.538 -r1.539
--- owners.list	17 Jan 2006 04:54:05 -0000	1.538
+++ owners.list	17 Jan 2006 07:12:10 -0000	1.539
@@ -32,13 +32,13 @@
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|anjuta|GNOME IDE for C and C++|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|anjuta|GNOME IDE for C and C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|antiword|MS Word to ASCII/Postscript converter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|apachetop|A top-like display of Apache logs|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|apcupsd|APC UPS Power Control Daemon for Linux|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|apel|A Portable Emacs Library|tagoh at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|apg|Automated Password Generator for random password generation|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|apg|Automated Password Generator for random password generation|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
@@ -70,10 +70,10 @@
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|blender|3D modeling, animation, rendering and post-production|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|blender|3D modeling, animation, rendering and post-production|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|bluefish|A GTK2 web development application for experienced users|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|bluefish|A GTK2 web development application for experienced users|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -103,7 +103,7 @@
 Fedora Extras|cfengine|GNU cfengine - a systems administration tool for networks|sheltren at cs.ucsb.edu|extras-qa at fedoraproject.org|
 Fedora Extras|cfitsio|Library for manipulating FITS data files|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|cgoban|X board for playing go|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|cgoban|X board for playing go|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|chmlib|Library for dealing with ITSS/CHM format files|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
@@ -123,7 +123,7 @@
 Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
-Fedora Extras|conglomerate|Extensible XML Editor|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|conglomerate|Extensible XML Editor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|convmv|Convert filename encodings.|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cook|A file construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -205,13 +205,13 @@
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fftw3|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|fftw|Fast Fourier Transform library|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|fftw|Fast Fourier Transform library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|
@@ -249,7 +249,7 @@
 Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|galculator|GTK 2 based scientific calculator|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|galculator|GTK 2 based scientific calculator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -260,7 +260,7 @@
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -286,7 +286,7 @@
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
@@ -310,23 +310,23 @@
 Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-password-generator|Graphical secure password generator|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnugo|Text based go program|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gobby|A free collaborative editor|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|goffice|Goffice support libraries|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|gonvert|Units conversion utility|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gonvert|Units conversion utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpa|Graphical user interface for GnuPG|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -368,7 +368,7 @@
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gurlchecker|A GNOME link validity checker|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|gurlchecker|A GNOME link validity checker|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -475,7 +475,7 @@
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|lcms|Color Management System|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|lcms|Color Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -526,7 +526,7 @@
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
@@ -551,7 +551,7 @@
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++|Typesafe Signal Framework for C++|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++|Typesafe Signal Framework for C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -569,11 +569,11 @@
 Fedora Extras|libxfce4util|Utility library for the Xfce4 desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfcegui4|GTK widgets for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|icon at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|lincvs|Graphical CVS Client|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|lincvs|Graphical CVS Client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -604,7 +604,7 @@
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|mcrypt|Replacement for crypt()|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|meanwhile| Lotus Sametime Community Client library|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
-Fedora Extras|meld|Visual diff and merge tool|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|meld|Visual diff and merge tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mercurial|A fast, lightweight distributed source control management system|katzj at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
@@ -625,7 +625,7 @@
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|
@@ -680,7 +680,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|openal|Open Audio Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1130,9 +1130,9 @@
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|screem|A website development enviroment|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|scribus|DeskTop Publishing app in QT|compton at pcompton.com|extras-qa at fedoraproject.org|
-Fedora Extras|scribus-templates|This package includes additional templates for Scribus|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scribus|DeskTop Publishing app in QT|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1145,14 +1145,14 @@
 Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|sirius|Othello for Gnome|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
-Fedora Extras|snort|An intrusion detection system|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|snort|An intrusion detection system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|
 Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|sodipodi|Vector-based drawing program|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|SoQt|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|soundconverter|A simple sound converter application for GNOME|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -1219,7 +1219,7 @@
 Fedora Extras|tetex-xcolor|Driver-independent color extensions for LaTeX and pdfLaTeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1237,7 +1237,7 @@
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
-Fedora Extras|treecc|Tree Compiler Compiler|compton at pcompton.com|extras-qa at fedoraproject.org|
+Fedora Extras|treecc|Tree Compiler Compiler|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 08:04:33 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 17 Jan 2006 03:04:33 -0500
Subject: owners owners.list,1.539,1.540
Message-ID: <200601170805.k0H855hv004205@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4186

Modified Files:
	owners.list 
Log Message:
Fix broken entries for gift*!


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -r1.539 -r1.540
--- owners.list	17 Jan 2006 07:12:10 -0000	1.539
+++ owners.list	17 Jan 2006 08:04:33 -0000	1.540
@@ -277,8 +277,8 @@
 Fedora Extras|ghex|A binary editor for GNOME|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|giblib|Simple library and a wrapper for imlib2|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gif2png|A GIF to PNG converter|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|gift|Daemon for communicating with filesharing protocols|rdieter at math.unl.edu||extras-qa at fedoraproject.org|
-Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu||extras-qa at fedoraproject.org|
+Fedora Extras|gift|Daemon for communicating with filesharing protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|GiNaC|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 08:19:39 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 17 Jan 2006 03:19:39 -0500
Subject: rpms/libgda/devel libgda.spec,1.8,1.9
Message-ID: <200601170820.k0H8KCL2004276@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4259

Modified Files:
	libgda.spec 
Log Message:
Make -sharp package Require the main package


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgda.spec	16 Jan 2006 22:04:11 -0000	1.8
+++ libgda.spec	17 Jan 2006 08:19:39 -0000	1.9
@@ -35,7 +35,7 @@
 Summary:          Library for writing gnome database programs
 Name:             libgda
 Version:          1.9.100
-Release: 	  2
+Release: 	  3
 Epoch:		  1
 Source:           %{name}-%{version}.tar.bz2
 URL:              http://www.gnome-db.org/
@@ -96,6 +96,7 @@
 %package sharp
 Summary:          Mono bindings for libgda
 Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
 
 %description sharp
 This package contains the dll files needed to run (and compile) Mono
@@ -367,6 +368,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
+- Make -sharp package Require the main package.
+
 * Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-2
 - Remove unneeded requires (.so reqs are automaticly picked up by rpm).
 - Add BuildRequires for building libgda-sharp



From fedora-extras-commits at redhat.com  Tue Jan 17 08:37:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 17 Jan 2006 03:37:18 -0500
Subject: rpms/libgnomedb/devel libgnomedb.spec,1.10,1.11
Message-ID: <200601170837.k0H8boDg004360@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4343

Modified Files:
	libgnomedb.spec 
Log Message:
* Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-4
- Put mono files only in sharp package and not in sharp and main package.
- Make -sharp package Require the main package.



Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libgnomedb.spec	16 Jan 2006 22:42:29 -0000	1.10
+++ libgnomedb.spec	17 Jan 2006 08:37:17 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:         Library for writing gnome database programs
 Name:            libgnomedb
 Version:         1.9.100
-Release:         3
+Release:         4
 Epoch:           1
 Source:          %{name}-%{version}.tar.bz2
 URL:             http://www.gnome-db.org/
@@ -38,8 +38,9 @@
 
 
 %package sharp
-Summary:          Mono bindings for libgnomedb
-Group:            System Environment/Libraries
+Summary:         Mono bindings for libgnomedb
+Group:           System Environment/Libraries
+Requires:        %{name} = %{epoch}:%{version}-%{release}
 
 %description sharp
 This package contains the dll files needed to run (and compile) Mono
@@ -111,7 +112,8 @@
 %{_datadir}/applications/*.desktop
 %{_datadir}/libgnomedb
 %{_libdir}/*.so.*
-%{_libdir}/libgnomedb
+%dir %{_libdir}/libgnomedb
+%{_libdir}/libgnomedb/plugins
 %{_libdir}/libglade/2.0/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
@@ -134,6 +136,10 @@
 
 
 %changelog
+* Tue Jan 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-4
+- Put mono files only in sharp package and not in sharp and main package.
+- Make -sharp package Require the main package.
+
 * Mon Jan 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-3
 - Remove unneeded requires (.so reqs are automaticly picked up by rpm).
 - Add BuildRequires for building libgda-sharp



From fedora-extras-commits at redhat.com  Tue Jan 17 08:54:10 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Tue, 17 Jan 2006 03:54:10 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.1,
	1.2
Message-ID: <200601170854.k0H8sh0Y004453@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4433

Modified Files:
	system-config-control.spec 
Log Message:
New release is out


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-control.spec	14 Nov 2005 11:44:48 -0000	1.1
+++ system-config-control.spec	17 Jan 2006 08:54:10 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base
@@ -47,6 +47,10 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
+- Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
+- Added icons in the tabs of the categories.
+
 * Fri Oct 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
 - cleanups for Fedora
 



From fedora-extras-commits at redhat.com  Tue Jan 17 08:56:40 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Tue, 17 Jan 2006 03:56:40 -0500
Subject: rpms/system-config-control/FC-4 system-config-control.spec,1.1,1.2
Message-ID: <200601170857.k0H8vCa4004486@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4469

Modified Files:
	system-config-control.spec 
Log Message:
New release is out


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/system-config-control.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- system-config-control.spec	14 Nov 2005 11:44:48 -0000	1.1
+++ system-config-control.spec	17 Jan 2006 08:56:40 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base
@@ -47,6 +47,10 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
+- Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
+- Added icons in the tabs of the categories.
+
 * Fri Oct 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
 - cleanups for Fedora
 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:12:26 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Tue, 17 Jan 2006 05:12:26 -0500
Subject: rpms/streamtuner/FC-3 streamtuner.spec,1.4,1.5
Message-ID: <200601171012.k0HACwL0008645@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8623

Modified Files:
	streamtuner.spec 
Log Message:
defaultconfig patch matches FC3, using xmms instead of beep-media-player, xmms added to dependencies, beep-media-player removed from dependencies


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- streamtuner.spec	7 Jan 2006 10:18:09 -0000	1.4
+++ streamtuner.spec	17 Jan 2006 10:12:25 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 9%{?dist}
+Release: 10%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -11,7 +11,7 @@
 Patch3: %{name}-%{version}-pkgconfig.patch
 License: BSD
 Group: Applications/Internet
-Requires: python, pygtk2, htmlview, bmp, xterm
+Requires: python, pygtk2, htmlview, xmms, xterm
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
 BuildRequires: gtk2-devel, curl-devel, openssl-devel, python-devel, scrollkeeper
@@ -116,6 +116,10 @@
 
 
 %changelog
+* Tue Jan 17 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-10
+- defaultconfig patch matches FC3, using xmms instead of beep-media-player
+- xmms added to dependencies, beep-media-player removed from dependencies 
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
 - desktop-file-utils dependency removed from requires(post) and requires(postun)  
 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:14:17 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Tue, 17 Jan 2006 05:14:17 -0500
Subject: rpms/streamtuner/FC-3 streamtuner-0.99.99-defaultconfig.patch, 1.1, 
	1.2
Message-ID: <200601171014.k0HAEnrg008726@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8687

Modified Files:
	streamtuner-0.99.99-defaultconfig.patch 
Log Message:
matches FC3 now, using xmms instead of beep-media-player

streamtuner-0.99.99-defaultconfig.patch:

Index: streamtuner-0.99.99-defaultconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner-0.99.99-defaultconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- streamtuner-0.99.99-defaultconfig.patch	6 Jan 2006 13:37:47 -0000	1.1
+++ streamtuner-0.99.99-defaultconfig.patch	17 Jan 2006 10:14:16 -0000	1.2
@@ -1,78 +1,45 @@
---- src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
-+++ src/plugins/live365/live365.c	2005-12-29 12:49:29.000000000 +0100
-@@ -1410,8 +1410,8 @@
+diff -Nur streamtuner-0.99.99_orig/src/plugins/live365/live365.c streamtuner-0.99.99/src/plugins/live365/live365.c
+--- streamtuner-0.99.99_orig/src/plugins/live365/live365.c	2004-12-19 11:27:03.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/live365/live365.c	2006-01-17 10:40:05.000000000 +0100
+@@ -1410,7 +1410,7 @@
    init_handler();
  
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
--  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
+   st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
  
    return TRUE;
- }
-
---- src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
-+++ src/plugins/local/local.c	2005-12-29 12:50:21.000000000 +0100
-@@ -1057,8 +1057,8 @@
- 
+diff -Nur streamtuner-0.99.99_orig/src/plugins/local/local.c streamtuner-0.99.99/src/plugins/local/local.c
+--- streamtuner-0.99.99_orig/src/plugins/local/local.c	2004-12-13 08:39:29.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/local/local.c	2006-01-17 10:40:39.000000000 +0100
+@@ -1058,7 +1058,7 @@
    init_handler();
  
--  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
+   st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
-
---- src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
-+++ src/plugins/shoutcast/shoutcast.c	2005-12-29 12:48:50.000000000 +0100
-@@ -959,9 +959,9 @@
- 
-   init_handler();
+diff -Nur streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c
+--- streamtuner-0.99.99_orig/src/plugins/shoutcast/shoutcast.c	2004-12-19 16:21:00.000000000 +0100
++++ streamtuner-0.99.99/src/plugins/shoutcast/shoutcast.c	2006-01-17 10:41:49.000000000 +0100
+@@ -961,7 +961,7 @@
    
--  st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
-+  st_action_register("play-m3u", _("Listen to a .m3u file"), "beep-media-player %q");
+   st_action_register("play-m3u", _("Listen to a .m3u file"), "xmms %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");
  
    return TRUE;
  }
-
---- src/plugins/xiph/xiph.c	2004-12-13 10:57:33.000000000 +0100
-+++ src/plugins/xiph/xiph.c	2005-12-29 12:50:54.000000000 +0100
-@@ -957,7 +957,7 @@
-   init_handler();
- 
-   st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
--  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
- 
-   return TRUE;
- }
-
---- src/streamtuner/st-action.c	2004-12-18 10:56:42.000000000 +0100
-+++ src/streamtuner/st-action.c	2005-12-29 12:41:20.000000000 +0100
-@@ -123,7 +123,7 @@
- {
-   actions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
- 
--  st_action_register("view-web", _("Open a web page"), "epiphany %q");
-+  st_action_register("view-web", _("Open a web page"), "htmlview %q");
-   st_action_register("view-ghelp", _("Open a GNOME help document"), "yelp %q");
- }
- 
-
---- src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
-+++ src/streamtuner/st-preselections.c	2005-12-29 12:04:04.000000000 +0100
-@@ -390,9 +390,9 @@
- {
-   st_preselections_init_handler();
+diff -Nur streamtuner-0.99.99_orig/src/streamtuner/st-preselections.c streamtuner-0.99.99/src/streamtuner/st-preselections.c
+--- streamtuner-0.99.99_orig/src/streamtuner/st-preselections.c	2004-12-13 10:57:52.000000000 +0100
++++ streamtuner-0.99.99/src/streamtuner/st-preselections.c	2006-01-17 10:43:27.000000000 +0100
+@@ -392,7 +392,7 @@
    
--  st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
-+  st_action_register("play-stream", _("Listen to a stream"), "beep-media-player %q");
+   st_action_register("play-stream", _("Listen to a stream"), "xmms %q");
    st_action_register("record-stream", _("Record a stream"), "xterm -e streamripper %q");
 -  st_action_register("view-web", _("Open a web page"), "epiphany %q");
 +  st_action_register("view-web", _("Open a web page"), "htmlview %q");



From fedora-extras-commits at redhat.com  Tue Jan 17 10:14:21 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 17 Jan 2006 05:14:21 -0500
Subject: rpms/mail-notification/devel mail-notification.spec,1.13,1.14
Message-ID: <200601171014.k0HAErNg008729@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8703

Modified Files:
	mail-notification.spec 
Log Message:
rebuild


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mail-notification.spec	10 Nov 2005 17:57:29 -0000	1.13
+++ mail-notification.spec	17 Jan 2006 10:14:21 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -117,6 +117,9 @@
 
 
 %changelog
+* Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-8
+- rebuild
+
 * Thu Nov 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-7
 - rebuild against new openssl
 - use LDFLAGS and not CFLAGS for fixing #172010



From fedora-extras-commits at redhat.com  Tue Jan 17 10:20:00 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 05:20:00 -0500
Subject: rpms/t1utils/devel t1utils.spec,1.8,1.9
Message-ID: <200601171020.k0HAKWPI008881@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8862

Modified Files:
	t1utils.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
- add %{?dist} tag
- correct License




Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- t1utils.spec	22 May 2005 23:44:46 -0000	1.8
+++ t1utils.spec	17 Jan 2006 10:20:00 -0000	1.9
@@ -1,11 +1,11 @@
 Name:		t1utils
 Version:	1.32
-Release: 3
+Release:        4%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
 Group:		Applications/Publishing
-License:	Freely modifiable and distributable
+License:	Distributable
 URL:		http://www.lcdf.org/~eddietwo/type/
 Source0:	http://www.lcdf.org/~eddietwo/type/t1utils-1.32.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,10 @@
 
 
 %changelog
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
+- add %%{?dist} tag
+- correct License
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.32-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:23:09 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Tue, 17 Jan 2006 05:23:09 -0500
Subject: rpms/streamtuner/FC-3 streamtuner.spec,1.5,1.6
Message-ID: <200601171023.k0HANfKs008959@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8935

Modified Files:
	streamtuner.spec 
Log Message:
wrong patch option fixed


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-3/streamtuner.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- streamtuner.spec	17 Jan 2006 10:12:25 -0000	1.5
+++ streamtuner.spec	17 Jan 2006 10:23:09 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 10%{?dist}
+Release: 11%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -44,7 +44,7 @@
 %setup -q
 %patch0 -p0 -b .%{name}-%{version}-live365
 %patch1 -p0 -b .%{name}-%{version}-pygtk-2.6
-%patch2 -p0 -b .%{name}-%{version}-defaultconfig.patch
+%patch2 -p1 -b .%{name}-%{version}-defaultconfig.patch
 %patch3 -p1 -b .%{name}-%{version}-pkgconfig.patch
 
 %build
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-11
+- wrong patch option fixed 
+
 * Tue Jan 17 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-10
 - defaultconfig patch matches FC3, using xmms instead of beep-media-player
 - xmms added to dependencies, beep-media-player removed from dependencies 



From fedora-extras-commits at redhat.com  Tue Jan 17 10:29:14 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 05:29:14 -0500
Subject: rpms/t1utils/devel t1utils.spec,1.9,1.10
Message-ID: <200601171029.k0HATpMB009098@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9076

Modified Files:
	t1utils.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-5
- rebuild




Index: t1utils.spec
===================================================================
RCS file: /cvs/extras/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- t1utils.spec	17 Jan 2006 10:20:00 -0000	1.9
+++ t1utils.spec	17 Jan 2006 10:29:09 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		t1utils
 Version:	1.32
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:	Collection of Type 1 and 2 font manipulation utilities
 
@@ -43,6 +43,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-5
+- rebuild
+
 * Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.32-4
 - add %%{?dist} tag
 - correct License



From fedora-extras-commits at redhat.com  Tue Jan 17 10:43:42 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 05:43:42 -0500
Subject: rpms/gtranslator/FC-4 gtranslator.spec,1.7,1.8
Message-ID: <200601171044.k0HAiELM009247@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gtranslator/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9209

Modified Files:
	gtranslator.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
- Add %{?dist} tag
- Rebuild




Index: gtranslator.spec
===================================================================
RCS file: /cvs/extras/rpms/gtranslator/FC-4/gtranslator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtranslator.spec	13 May 2005 00:11:06 -0000	1.7
+++ gtranslator.spec	17 Jan 2006 10:43:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		gtranslator
 Version:	1.1.6
-Release:	1
+Release:	2%{?dist}
 
 Summary:	Gettext po file editor for GNOME
 
@@ -85,7 +85,11 @@
 
 
 %changelog
-* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org>
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
+- Add %{?dist} tag
+- Rebuild
+
+* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 1.1.6-1
 - Updated to 1.1.6
 - Remove build patch as it's no longer needed
 



From fedora-extras-commits at redhat.com  Tue Jan 17 11:27:22 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 06:27:22 -0500
Subject: rpms/gtranslator/devel gtranslator.spec,1.7,1.8
Message-ID: <200601171127.k0HBRsMI011234@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/gtranslator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11216

Modified Files:
	gtranslator.spec 
Log Message:
* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
- Add %{?dist} tag
- Rebuild




Index: gtranslator.spec
===================================================================
RCS file: /cvs/extras/rpms/gtranslator/devel/gtranslator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtranslator.spec	13 May 2005 00:11:06 -0000	1.7
+++ gtranslator.spec	17 Jan 2006 11:27:22 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		gtranslator
 Version:	1.1.6
-Release:	1
+Release:	2%{?dist}
 
 Summary:	Gettext po file editor for GNOME
 
@@ -85,7 +85,11 @@
 
 
 %changelog
-* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org>
+* Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.1.6-2
+- Add %{?dist} tag
+- Rebuild
+
+* Thu May 12 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 1.1.6-1
 - Updated to 1.1.6
 - Remove build patch as it's no longer needed
 



From fedora-extras-commits at redhat.com  Tue Jan 17 12:08:11 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 07:08:11 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.9,1.10
Message-ID: <200601171209.k0HC91wd013119@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13094

Modified Files:
	autotrace.spec 
Log Message:
* Tue Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
- remove BuildRequire on XFree86-devel




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- autotrace.spec	16 Jan 2006 18:20:15 -0000	1.9
+++ autotrace.spec	17 Jan 2006 12:08:11 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -10,7 +10,6 @@
 Source0:        http://dl.sf.net/autotrace/autotrace-0.31.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ImageMagick-devel
-BuildRequires:  XFree86-devel
 BuildRequires:  libpng-devel > 2:1.2
 BuildRequires:  libexif-devel
 BuildRequires:  libtiff-devel
@@ -86,6 +85,9 @@
 
 
 %changelog
+* Tue Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
+- remove BuildRequire on XFree86-devel
+
 * Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
 - add %%{?dist} tag
 - add a BuildRequire on bzip2-devel



From fedora-extras-commits at redhat.com  Tue Jan 17 12:26:49 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 07:26:49 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.10,1.11
Message-ID: <200601171227.k0HCRLZY013289@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13271

Modified Files:
	autotrace.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-10
- add BuildRequires on freetype-devel




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- autotrace.spec	17 Jan 2006 12:08:11 -0000	1.10
+++ autotrace.spec	17 Jan 2006 12:26:49 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        9%{?dist}
+Release:        10%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -16,6 +16,7 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  bzip2-devel
+BuildRequires:  freetype-devel
 #BuildRequires:  pstoedit-devel
 BuildConflicts: pstoedit-devel
 
@@ -85,12 +86,15 @@
 
 
 %changelog
-* Tue Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
-- remove BuildRequire on XFree86-devel
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-10
+- add BuildRequires on freetype-devel
+
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-9
+- remove BuildRequires on XFree86-devel
 
 * Mon Jan 16 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-8
 - add %%{?dist} tag
-- add a BuildRequire on bzip2-devel
+- add a BuildRequires on bzip2-devel
 - add ldconfig to %%post and %%postun
 
 * Thu May 26 2005 Jeremy Katz <katzj at redhat.com> - 0.31.1-7



From fedora-extras-commits at redhat.com  Tue Jan 17 13:16:00 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 17 Jan 2006 08:16:00 -0500
Subject: rpms/python-sqlite2/devel .cvsignore, 1.2, 1.3 python-sqlite2.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601171316.k0HDGW14015258@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15225

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 18:10:09 -0000	1.2
+++ .cvsignore	17 Jan 2006 13:15:59 -0000	1.3
@@ -1 +1 @@
-pysqlite-2.0.5.tar.gz
+pysqlite-2.1.0.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-sqlite2.spec	14 Jan 2006 18:10:09 -0000	1.1
+++ python-sqlite2.spec	17 Jan 2006 13:15:59 -0000	1.2
@@ -1,19 +1,19 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.0.5
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
 Group:          Development/Languages
 License:        zlib/libpng
 URL:            http://pysqlite.org/
-Source0:        http://initd.org/pub/software/pysqlite/releases/2.0/%{version}/pysqlite-%{version}.tar.gz
+Source0:        http://initd.org/pub/software/pysqlite/releases/2.1/%{version}/pysqlite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dos2unix
 BuildRequires:  python-devel
+BuildRequires:  python-setuptools
 BuildRequires:  sqlite-devel
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -33,9 +33,13 @@
 
 %install
 rm -rf %{buildroot}
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python} setup.py install -O1 \
+	--skip-build \
+	--old-and-unmanageable \
+	--root %{buildroot}
+
 %{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
-%{__rm} documentation/install-source.{html,txt}
+%{__rm} documentation/install-source*
 %{__rm} documentation/usage-guide.txt
 dos2unix documentation/{silvercity.css,code/*}
 
@@ -47,7 +51,7 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE documentation/*
-%{_bindir}/test-pysqlite
+%doc doc/pysqlite-introduction-slides/pysqlite-introduction.pdf
 %dir %{python_sitearch}/pysqlite2
 %{python_sitearch}/pysqlite2/__init__.py
 %{python_sitearch}/pysqlite2/__init__.pyc
@@ -78,6 +82,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.1.0-1
+- Update to 2.1.0
+
 * Sat Jan 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 2.0.5-2
 - Fix missing BR: sqlite-devel (Chris Chabot, #176653)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 18:10:09 -0000	1.2
+++ sources	17 Jan 2006 13:15:59 -0000	1.3
@@ -1 +1 @@
-574bbb4f7b3a077506689cbab0d9bf7f  pysqlite-2.0.5.tar.gz
+67530a31508f33d64e86b3e5071822d9  pysqlite-2.1.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 13:40:30 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 08:40:30 -0500
Subject: rpms/t1lib/FC-4 t1lib-5.1.0-destdir.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 sources, 1.2, 1.3 t1lib.spec, 1.6, 1.7
Message-ID: <200601171341.k0HDf2Ea015461@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15430

Modified Files:
	.cvsignore sources t1lib.spec 
Added Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
- remove unneeded %%{_datadir}/t1lib contents
- cleanup

* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
- updated version
- remove Patch0 (in upstream), added Patch6
- Does not BuildRequire xfree/xorg devel
- no longer BuildRequire autoconf (Patch0 removed)



t1lib-5.1.0-destdir.patch:

--- NEW FILE t1lib-5.1.0-destdir.patch ---
diff -ur t1lib-5.1.0/type1afm/Makefile.in t1lib-5.1.0.new/type1afm/Makefile.in
--- t1lib-5.1.0/type1afm/Makefile.in	2004-12-12 18:45:12.000000000 -0800
+++ t1lib-5.1.0.new/type1afm/Makefile.in	2005-09-27 09:42:50.000000000 -0700
@@ -89,7 +89,7 @@
 install: dummy
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install \
-		$(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
+		$(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
 
 
 uninstall: dummy


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:23:56 -0000	1.2
+++ .cvsignore	17 Jan 2006 13:40:30 -0000	1.3
@@ -1 +1 @@
-t1lib-5.0.2.tar.gz
+t1lib-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:23:56 -0000	1.2
+++ sources	17 Jan 2006 13:40:30 -0000	1.3
@@ -1 +1 @@
-cc5d4130b25bb8a1c930488b78930e9b  t1lib-5.0.2.tar.gz
+a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/t1lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- t1lib.spec	22 May 2005 23:39:09 -0000	1.6
+++ t1lib.spec	17 Jan 2006 13:40:30 -0000	1.7
@@ -1,27 +1,21 @@
 Name:           t1lib
-Version:        5.0.2
-Release: 3
+Version:        5.1.0
+Release:        2%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
 License:        LGPL
 URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics
-Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.0.2.tar.gz
-# Based on patches in Mandrakes's t1lib-1.3.1-9mdk.src.rpm:
-Patch0:         t1lib-5.0.0-install.patch
+Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
 # From Debian's t1lib-5.0.0-4:
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
-Patch3:         t1lib-5.0.0-hintfix.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
 Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch6:         t1lib-5.1.0-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  XFree86-devel
-BuildRequires:  autoconf
-BuildRequires:  perl
-
 %description
 T1lib is a rasterizer library for Adobe Type 1 Fonts. It supports
 rotation and transformation, kerning underlining and antialiasing. It
@@ -42,18 +36,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .install
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
-perl -pi -e 's/^dbl$$//' configure.in
-autoconf
 %configure
 make %{?_smp_mflags} without_doc
-ln README.t1lib-5.0.2 README
+ln README.t1lib-%{version} README
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +62,11 @@
 install -p -m 755 debian/t1libconfig $RPM_BUILD_ROOT%{_sbindir}/
 
 touch FontDatabase
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/t1lib
 install -p -m 644 FontDatabase $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/
+touch $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/t1lib.config
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/t1lib
 
 
 %clean
@@ -94,18 +90,28 @@
 %config %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_mandir}/man[^3]/*
+%{_mandir}/man*/*
 %{_sbindir}/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/t1lib_doc.pdf
-%{_includedir}/*
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
+- remove unneeded %%{_datadir}/t1lib contents
+- cleanup
+
+* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
+- updated version
+- remove Patch0 (in upstream), added Patch6
+- Does not BuildRequire xfree/xorg devel
+- no longer BuildRequire autoconf (Patch0 removed)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.0.2-3
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 13:44:50 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 08:44:50 -0500
Subject: rpms/t1lib/FC-4 t1lib-5.0.0-hintfix.patch, 1.1,
	NONE t1lib-5.0.0-install.patch, 1.1, NONE
Message-ID: <200601171344.k0HDiq3w015520@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15511

Removed Files:
	t1lib-5.0.0-hintfix.patch t1lib-5.0.0-install.patch 
Log Message:
remove unneeded patches



--- t1lib-5.0.0-hintfix.patch DELETED ---


--- t1lib-5.0.0-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 13:55:40 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:55:40 -0500
Subject: rpms/itext - New directory
Message-ID: <200601171355.k0HDtgap015615@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607/itext

Log Message:
Directory /cvs/extras/rpms/itext added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 13:55:46 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:55:46 -0500
Subject: rpms/itext/devel - New directory
Message-ID: <200601171355.k0HDtm0B015630@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607/itext/devel

Log Message:
Directory /cvs/extras/rpms/itext/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 13:56:28 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:56:28 -0500
Subject: rpms/itext Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601171356.k0HDuUrJ015666@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15654

Added Files:
	Makefile import.log 
Log Message:
Setup of module itext


--- NEW FILE Makefile ---
# Top level Makefile for module itext
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 13:56:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:56:34 -0500
Subject: rpms/itext/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601171356.k0HDuaUg015686@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15654/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module itext


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 13:58:48 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:58:48 -0500
Subject: rpms/itext import.log,1.1,1.2
Message-ID: <200601171359.k0HDxKUa015780@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15739

Modified Files:
	import.log 
Log Message:
auto-import itext-1.3-1jpp_6 on branch devel from itext-1.3-1jpp_6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/itext/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 13:56:27 -0000	1.1
+++ import.log	17 Jan 2006 13:58:47 -0000	1.2
@@ -0,0 +1 @@
+itext-1_3-1jpp_6:HEAD:itext-1.3-1jpp_6.src.rpm:1137506319



From fedora-extras-commits at redhat.com  Tue Jan 17 13:58:54 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 08:58:54 -0500
Subject: rpms/itext/devel itext-1.3-manifest.mf, NONE,
	1.1 itext-escape-jpeg-java-trap.patch, NONE,
	1.1 itext-no-javadoc-web-links.patch, NONE, 1.1 itext.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601171359.k0HDxQCZ015784@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/itext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15739/devel

Modified Files:
	.cvsignore sources 
Added Files:
	itext-1.3-manifest.mf itext-escape-jpeg-java-trap.patch 
	itext-no-javadoc-web-links.patch itext.spec 
Log Message:
auto-import itext-1.3-1jpp_6 on branch devel from itext-1.3-1jpp_6.src.rpm


--- NEW FILE itext-1.3-manifest.mf ---
Manifest-Version: 1.0
Ant-Version: Apache Ant 1.6.2
Main-Class: com.lowagie.tools.Toolbox


itext-escape-jpeg-java-trap.patch:

--- NEW FILE itext-escape-jpeg-java-trap.patch ---
--- src/com/lowagie/text/pdf/PdfGraphics2D.java~	2006-01-04 04:29:31.000000000 -0800
+++ src/com/lowagie/text/pdf/PdfGraphics2D.java	2006-01-04 04:29:42.000000000 -0800
@@ -170,12 +170,10 @@
      */
     PdfGraphics2D(PdfContentByte cb, float width, float height, FontMapper fontMapper, boolean onlyShapes, boolean convertImagesToJPEG, float quality) {
         super();
-        try {
-            Class.forName("com.sun.image.codec.jpeg.JPEGCodec");
-        }
-        catch (Throwable t) {
-            convertImagesToJPEG = false;
-        }
+
+	// Free Software implementations don't support JPEG encoding yet
+	convertImagesToJPEG = false;
+
         this.convertImagesToJPEG = convertImagesToJPEG;
         this.jpegQuality = quality;
         this.onlyShapes = onlyShapes;
@@ -1239,25 +1237,9 @@
         
         try {
             com.lowagie.text.Image image = null;
-            if(!convertImagesToJPEG){
-                image = com.lowagie.text.Image.getInstance(img, bgColor);
-            }
-            else{
-                BufferedImage scaled = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_RGB);
-                Graphics2D g3 = scaled.createGraphics();
-                g3.drawImage(img, 0, 0, img.getWidth(null), img.getHeight(null), null);
-                g3.dispose();
-                
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(baos);
-                com.sun.image.codec.jpeg.JPEGEncodeParam param = com.sun.image.codec.jpeg.JPEGCodec.getDefaultJPEGEncodeParam(scaled);
-                param.setQuality(jpegQuality, true);
-                encoder.encode(scaled, param);
-                scaled.flush();
-                scaled = null;
-                image = com.lowagie.text.Image.getInstance(baos.toByteArray());
-                
-            }
+
+	    image = com.lowagie.text.Image.getInstance(img, bgColor);
+
             if (mask!=null) {
                 com.lowagie.text.Image msk = com.lowagie.text.Image.getInstance(mask, null, true);
                 msk.makeMask();

itext-no-javadoc-web-links.patch:

--- NEW FILE itext-no-javadoc-web-links.patch ---
--- src/ant/site.xml~	2005-03-25 04:32:39.000000000 -0800
+++ src/ant/site.xml	2006-01-16 17:47:43.000000000 -0800
@@ -104,7 +104,6 @@
 			<packageset dir="${itext.src}" defaultexcludes="yes">
       			<include name="com/lowagie/**" />
 		    </packageset>
-            <link href="http://java.sun.com/j2se/1.3/docs/api/" />
         </javadoc>
     </target>
 


--- NEW FILE itext.spec ---
%define section free

Summary:        A Free Java-PDF library
Name:           itext
Version:        1.3
Release:        1jpp_6%{?dist}
License:        MPL/LGPL
URL:            http://www.lowagie.com/iText/
Group:          Development/Libraries
Source0:        itext-src-1.3.tar.gz
Source1:        itext-www-1.3.tar.gz
Source2:        itext-1.3-manifest.mf
Patch0:         itext-escape-jpeg-java-trap.patch
Patch1:         itext-no-javadoc-web-links.patch
BuildRequires:  jpackage-utils >= 0:1.6
BuildRequires:  ant, ant-trax, jaxp_transform_impl
BuildRequires:  dos2unix
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31

%description
iText is a library that allows you to generate 
PDF files on the fly. The iText classes are very 
useful for people who need to generate read-only, 
platform independent documents containing text, 
lists, tables and images. The library is especially 
useful in combination with Java(TM) technology-based 
Servlets: The look and feel of HTML is browser 
dependent; with iText and PDF you can control 
exactly how your servlet's output will look.


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

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

%package manual
Summary:        Documents for %{name}
Group:          Documentation

%description manual
A programming manual for the %{name} package.

%prep
%setup -c -T -n %{name}
mkdir -p src/META-INF
(cd src
gzip -dc %{SOURCE0} | tar xf -)
cp %{SOURCE2} src/META-INF/MANIFEST.MF
gzip -dc %{SOURCE1} | tar xf -
find . -name "*.jar" -exec rm {} \;
%patch0 -p0
%patch1 -p0

%build
pushd src
export OPT_JAR_LIST="ant/ant-trax jaxp_transform_impl"
ant jar javadoc tutorial lowagie.com
popd

%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p build/bin/iText.jar \
      $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)

aot-compile-rpm

dos2unix build/lowagie/*.{txt,xml}
dos2unix build/lowagie/ant/*.xml
dos2unix build/lowagie/ant/.ant.properties

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

# manual
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/lowagie/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/examples $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr build/tutorial $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p %{_bindir}/rebuild-gcj-db

%postun -p %{_bindir}/rebuild-gcj-db

%files
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/MPL-1.1.txt
%doc %{_docdir}/%{name}-%{version}/lgpl.txt
%{_javadir}/*
%{_libdir}/gcj/*

%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/*

# -----------------------------------------------------------------------------

%changelog
* Mon Jan 17 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_6
- Remove epoch from changelog versions.

* Mon Jan 16 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_5
- Remove empty /usr/share/java/itext.
- Move manual and javadoc packages to Documentation group.
- Add itext-no-javadoc-web-links.patch.

* Mon Jan 16 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_4
- Fixed Group.
- Cleaned up changelog versions.
- Use dos2unix on doc files.
- Don't create unversioned javadoc link.

* Thu Jan 13 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_3
- Remove javadoc %postun, as that should get handled by the fact
  that the file is ghosted.
- Improve javadoc and manual subpackage descriptions.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_2
- Add ant-trax and jaxp_transform_impl dependencies.
- Set OPT_JAR_LIST.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> - 1.3-1jpp_1
- Build native code.
- Add patch to remove proprietary jpeg encoding library usage.
- Fix BuildRequires.
- Tweak BuildRoot.

* Thu Aug 26 2005 Ralph Apel <r.apel at r-apel.de> - 1.3-1jpp
- Upgrade to 1.3
- Now one jar only

* Wed Aug 25 2004 Ralph Apel <r.apel at r-apel.de> - 1.02b-2jpp
- Build with ant-1.6.2
- Relax some versioned dependencies

* Fri Feb 27 2004 Ralph Apel <r.apel at r-apel.de> - 1.02b-1jpp
- First JPackage release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/itext/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 13:56:33 -0000	1.1
+++ .cvsignore	17 Jan 2006 13:58:54 -0000	1.2
@@ -0,0 +1,2 @@
+itext-src-1.3.tar.gz
+itext-www-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/itext/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 13:56:33 -0000	1.1
+++ sources	17 Jan 2006 13:58:54 -0000	1.2
@@ -0,0 +1,2 @@
+6d31b384060ae93c5691fc5b6c017b1e  itext-src-1.3.tar.gz
+710cc9ecfff65c95e2dd84dc3b03fa1d  itext-www-1.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 14:02:31 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:02:31 -0500
Subject: owners owners.list,1.540,1.541
Message-ID: <200601171403.k0HE34AI017564@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17522

Modified Files:
	owners.list 
Log Message:
Add itext



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -r1.540 -r1.541
--- owners.list	17 Jan 2006 08:04:33 -0000	1.540
+++ owners.list	17 Jan 2006 14:02:31 -0000	1.541
@@ -422,6 +422,7 @@
 Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|irssi|Modular text mode IRC client with Perl scripting|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 14:04:18 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:04:18 -0500
Subject: rpms/t1lib/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 t1lib.spec, 
	1.6, 1.7 t1lib-5.0.0-hintfix.patch, 1.1,
	NONE t1lib-5.0.0-install.patch, 1.1, NONE
Message-ID: <200601171404.k0HE4p3h017629@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17571

Modified Files:
	.cvsignore sources t1lib.spec 
Removed Files:
	t1lib-5.0.0-hintfix.patch t1lib-5.0.0-install.patch 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
- remove unneeded %%{_datadir}/t1lib contents
- cleanup

* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
- updated version
- remove Patch0 (in upstream), added Patch6
- Does not BuildRequire xfree/xorg devel
- no longer BuildRequire autoconf (Patch0 removed)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:23:56 -0000	1.2
+++ .cvsignore	17 Jan 2006 14:04:18 -0000	1.3
@@ -1 +1 @@
-t1lib-5.0.2.tar.gz
+t1lib-5.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:23:56 -0000	1.2
+++ sources	17 Jan 2006 14:04:18 -0000	1.3
@@ -1 +1 @@
-cc5d4130b25bb8a1c930488b78930e9b  t1lib-5.0.2.tar.gz
+a05bed4aa63637052e60690ccde70421  t1lib-5.1.0.tar.gz


Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- t1lib.spec	22 May 2005 23:39:09 -0000	1.6
+++ t1lib.spec	17 Jan 2006 14:04:18 -0000	1.7
@@ -1,27 +1,21 @@
 Name:           t1lib
-Version:        5.0.2
-Release: 3
+Version:        5.1.0
+Release:        2%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
 Group:          Applications/Publishing
 License:        LGPL
 URL:            ftp://sunsite.unc.edu/pub/Linux/libs/graphics
-Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-5.0.2.tar.gz
-# Based on patches in Mandrakes's t1lib-1.3.1-9mdk.src.rpm:
-Patch0:         t1lib-5.0.0-install.patch
+Source0:        ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-%{version}.tar.gz
 # From Debian's t1lib-5.0.0-4:
 Patch1:         t1lib-5.0.0-manpages.patch
 Patch2:         t1lib-5.0.0-xglyph-env.patch
-Patch3:         t1lib-5.0.0-hintfix.patch
 # From Debian's t1lib-5.0.0-4 (slightly tweaked):
 Patch5:         t1lib-5.0.0-t1libconfig.patch
+Patch6:         t1lib-5.1.0-destdir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  XFree86-devel
-BuildRequires:  autoconf
-BuildRequires:  perl
-
 %description
 T1lib is a rasterizer library for Adobe Type 1 Fonts. It supports
 rotation and transformation, kerning underlining and antialiasing. It
@@ -42,18 +36,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .install
 %patch1 -p1
 %patch2 -p1
 %patch5 -p1
+%patch6 -p1
 
 
 %build
-perl -pi -e 's/^dbl$$//' configure.in
-autoconf
 %configure
 make %{?_smp_mflags} without_doc
-ln README.t1lib-5.0.2 README
+ln README.t1lib-%{version} README
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,7 +62,11 @@
 install -p -m 755 debian/t1libconfig $RPM_BUILD_ROOT%{_sbindir}/
 
 touch FontDatabase
+install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/t1lib
 install -p -m 644 FontDatabase $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/
+touch $RPM_BUILD_ROOT%{_sysconfdir}/t1lib/t1lib.config
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/t1lib
 
 
 %clean
@@ -94,18 +90,28 @@
 %config %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
-%{_mandir}/man[^3]/*
+%{_mandir}/man*/*
 %{_sbindir}/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc/t1lib_doc.pdf
-%{_includedir}/*
+%{_includedir}/*.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
+- remove unneeded %%{_datadir}/t1lib contents
+- cleanup
+
+* Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> - 5.1.0-1
+- updated version
+- remove Patch0 (in upstream), added Patch6
+- Does not BuildRequire xfree/xorg devel
+- no longer BuildRequire autoconf (Patch0 removed)
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.0.2-3
 - rebuild on all arches
 


--- t1lib-5.0.0-hintfix.patch DELETED ---


--- t1lib-5.0.0-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 14:09:27 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:09:27 -0500
Subject: rpms/t1lib/devel t1lib-5.1.0-destdir.patch,NONE,1.1
Message-ID: <200601171409.k0HE9UKv017693@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17678

Added Files:
	t1lib-5.1.0-destdir.patch 
Log Message:
added forgotten patch


t1lib-5.1.0-destdir.patch:

--- NEW FILE t1lib-5.1.0-destdir.patch ---
diff -ur t1lib-5.1.0/type1afm/Makefile.in t1lib-5.1.0.new/type1afm/Makefile.in
--- t1lib-5.1.0/type1afm/Makefile.in	2004-12-12 18:45:12.000000000 -0800
+++ t1lib-5.1.0.new/type1afm/Makefile.in	2005-09-27 09:42:50.000000000 -0700
@@ -89,7 +89,7 @@
 install: dummy
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(LIBTOOL) --mode=install \
-		$(INSTALL_PROGRAM) type1afm $(bindir)/type1afm
+		$(INSTALL_PROGRAM) type1afm $(DESTDIR)$(bindir)/type1afm
 
 
 uninstall: dummy



From fedora-extras-commits at redhat.com  Tue Jan 17 14:12:23 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:12:23 -0500
Subject: rpms/t1lib/devel t1lib.spec,1.7,1.8
Message-ID: <200601171413.k0HED8xw017811@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17758

Modified Files:
	t1lib.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
- rebuild




Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- t1lib.spec	17 Jan 2006 14:04:18 -0000	1.7
+++ t1lib.spec	17 Jan 2006 14:12:23 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -102,6 +102,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
 - remove unneeded %%{_datadir}/t1lib contents
 - cleanup



From fedora-extras-commits at redhat.com  Tue Jan 17 14:13:40 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:13:40 -0500
Subject: rpms/rssowl - New directory
Message-ID: <200601171413.k0HEDg1Q017849@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17841/rssowl

Log Message:
Directory /cvs/extras/rpms/rssowl added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 14:13:46 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:13:46 -0500
Subject: rpms/rssowl/devel - New directory
Message-ID: <200601171413.k0HEDmxT017864@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17841/rssowl/devel

Log Message:
Directory /cvs/extras/rpms/rssowl/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 14:14:03 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:14:03 -0500
Subject: rpms/rssowl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601171414.k0HEE54l017898@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886

Added Files:
	Makefile import.log 
Log Message:
Setup of module rssowl


--- NEW FILE Makefile ---
# Top level Makefile for module rssowl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 14:14:09 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:14:09 -0500
Subject: rpms/rssowl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601171414.k0HEEBIE017918@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17886/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rssowl


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 14:15:56 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:15:56 -0500
Subject: rpms/rssowl import.log,1.1,1.2
Message-ID: <200601171416.k0HEGS3t018086@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18032

Modified Files:
	import.log 
Log Message:
auto-import rssowl-1.2-7 on branch devel from rssowl-1.2-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rssowl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 14:14:03 -0000	1.1
+++ import.log	17 Jan 2006 14:15:55 -0000	1.2
@@ -0,0 +1 @@
+rssowl-1_2-7:HEAD:rssowl-1.2-7.src.rpm:1137507346



From fedora-extras-commits at redhat.com  Tue Jan 17 14:16:02 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:16:02 -0500
Subject: rpms/rssowl/devel rssowl-JessieX509.patch, NONE,
	1.1 rssowl-browser.patch, NONE, 1.1 rssowl-build0.patch, NONE,
	1.1 rssowl-build1.patch, NONE, 1.1 rssowl-swt31.patch, NONE,
	1.1 rssowl-use-jce.patch, NONE, 1.1 rssowl.desktop, NONE,
	1.1 rssowl.script, NONE, 1.1 rssowl.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601171416.k0HEGY4N018090@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18032/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rssowl-JessieX509.patch rssowl-browser.patch 
	rssowl-build0.patch rssowl-build1.patch rssowl-swt31.patch 
	rssowl-use-jce.patch rssowl.desktop rssowl.script rssowl.spec 
Log Message:
auto-import rssowl-1.2-7 on branch devel from rssowl-1.2-7.src.rpm

rssowl-JessieX509.patch:

--- NEW FILE rssowl-JessieX509.patch ---
--- src/java/net/sourceforge/rssowl/dao/ssl/EasyX509TrustManager.java~	2005-11-06 08:06:57.000000000 -0800
+++ src/java/net/sourceforge/rssowl/dao/ssl/EasyX509TrustManager.java	2006-01-04 09:00:04.000000000 -0800
@@ -51,11 +51,11 @@
    */
   public EasyX509TrustManager(KeyStore keystore) throws NoSuchAlgorithmException, KeyStoreException {
     super();
-    TrustManagerFactory factory = TrustManagerFactory.getInstance("SunX509");
+    TrustManagerFactory factory = TrustManagerFactory.getInstance("JessieX509");
     factory.init(keystore);
     TrustManager[] trustmanagers = factory.getTrustManagers();
     if (trustmanagers.length == 0)
-      throw new NoSuchAlgorithmException("SunX509 trust manager not supported");
+      throw new NoSuchAlgorithmException("JessieX509 trust manager not supported");
 
     this.standardTrustManager = (X509TrustManager) trustmanagers[0];
   }

rssowl-browser.patch:

--- NEW FILE rssowl-browser.patch ---
--- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java~	2005-11-06 08:06:57.000000000 -0800
+++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java	2006-01-13 18:33:12.000000000 -0800
@@ -36,6 +36,9 @@
 import org.eclipse.swt.SWTError;
 import org.eclipse.swt.program.Program;
 
+import org.gnu.gconf.ConfClient;
+import org.gnu.gconf.ConfException;
+
 import java.io.IOException;
 
 /**
@@ -267,11 +270,28 @@
     /** Try Netscape as default browser */
     if (webBrowser == null) {
       try {
-        webBrowser = "netscape";
-        p = Runtime.getRuntime().exec(webBrowser + "  " + href);
-      } catch (IOException e) {
-        p = null;
-        webBrowser = "mozilla";
+	// This is kind of lame, but - oh well - it's slightly better than
+	// the original.
+	ConfClient client = ConfClient.getInstance();
+	webBrowser = client.getString ("/desktop/gnome/url-handlers/http/command");
+	if (webBrowser.startsWith("firefox"))
+	  webBrowser = "firefox";
+	else if (webBrowser.startsWith("mozilla"))
+	  webBrowser = "mozilla";
+	else if (webBrowser.startsWith("epiphany"))
+	  webBrowser = "epiphany";
+	if (webBrowser.startsWith("netscape"))
+	  webBrowser = "netscape";
+	else
+	  webBrowser = "firefox";
+      } catch (ConfException ce) {
+	try {
+	  webBrowser = "firefox";
+	  p = Runtime.getRuntime().exec(webBrowser + "  " + href);
+	} catch (IOException e) {
+	  p = null;
+	  webBrowser = "mozilla";
+	}
       }
     }
 

rssowl-build0.patch:

--- NEW FILE rssowl-build0.patch ---
--- src/build.xml~	2005-11-06 08:06:57.000000000 -0800
+++ src/build.xml	2006-01-04 05:46:08.000000000 -0800
@@ -127,12 +127,17 @@
 		for the special-chars of the translations.
     -->
     <target name="compile_linux" depends="init">
+        <path id="libs.classpath">
+           <fileset dir="${root}/lib" includes="**/*.jar" />
+        </path>
+
         <javac excludes="**/DevShop.java"
                encoding="utf8"
                destdir="${classes}/"
-               srcdir="${src}"
-               classpath="${libs}" />
+               srcdir="${src}">
+           <classpath refid="libs.classpath" />
+	</javac>
     </target>
 
     <!-- 

rssowl-build1.patch:

--- NEW FILE rssowl-build1.patch ---
--- src/build.xml~	2006-01-04 06:11:03.000000000 -0800
+++ src/build.xml	2006-01-04 06:12:24.000000000 -0800
@@ -201,18 +201,7 @@
 		Pack compiled RSSOwl into executable JAR file.
     -->
     <target name="jar_linux" depends="compile_linux">
-        <unjar src="${SWT}" dest="${classes}" />
-        <unjar src="${SWT-NL}" dest="${classes}" />
-        <unjar src="${JDOM}" dest="${classes}" />
-        <unjar src="${JFACE}" dest="${classes}" />
-        <unjar src="${FORMS}" dest="${classes}" />
-        <unjar src="${XERCES}" dest="${classes}" />
-        <unjar src="${ITEXT}" dest="${classes}" />
         <unjar src="${ITEXTASIAN}" dest="${classes}" />
-        <unjar src="${CODEC}" dest="${classes}" />
-        <unjar src="${HTTPCLIENT}" dest="${classes}" />
-        <unjar src="${LOGGING}" dest="${classes}" />
-        <unjar src="${BLOWFISH}" dest="${classes}" />
         <delete file="${classes}/META-INF/LICENSE.txt" />
         <delete file="${classes}/META-INF/info.xml" />
         <jar jarfile="${deploy}/rssowl.jar" basedir="${classes}">

rssowl-swt31.patch:

--- NEW FILE rssowl-swt31.patch ---
--- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java~	2006-01-04 05:58:01.000000000 -0800
+++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java	2005-06-14 14:15:46.000000000 -0700
@@ -26,7 +26,6 @@
 
 import net.sourceforge.rssowl.controller.NewsTable;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Table;
@@ -42,7 +41,7 @@
  * header is clicked and update it.
  * 
  * @author <a href="mailto:masterludo at gmx.net">Ludovic Kim-Xuan Galibert </a>
- * @version 1.2
+ * @version 1.1.3
  */
 public class SortingSelectionAdapter extends SelectionAdapter {
 
@@ -101,59 +100,67 @@
   }
 
   /**
-   * Sort the News using a Sorter that is identified by the given field value.
+   * Handle the sorting corresponding to the header clicked
    * 
-   * @param field The identifier of the Sorter to use.
-   * @return boolean TRUE if the sort was ascending, FALSE if descending.
+   * @param se the SelectionEvent
    */
-  public boolean sort(String field) {
+  public void widgetSelected(SelectionEvent se) {
+    widgetSelected((TableColumn) se.getSource());
+  }
+
+  /**
+   * Handle the sorting corresponding to the header clicked
+   * 
+   * @param tc The selected TableColumn
+   */
+  public void widgetSelected(TableColumn tc) {
     Comparator sorter = null;
     boolean ascending = true;
 
     /** Sort by news title */
-    if ("TABLE_HEADER_NEWSTITLE".equals(field)) {
+    if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) {
       ascending = this.titleAscending;
       this.titleAscending = !this.titleAscending;
       sorter = new TitleSorter();
     }
 
     /** Sort by publish date */
-    else if ("TABLE_HEADER_PUBDATE".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) {
       ascending = this.pudDateAscending;
       this.pudDateAscending = !this.pudDateAscending;
       sorter = new PubDateSorter(newsItems);
     }
 
     /** Sort by author */
-    else if ("TABLE_HEADER_AUTHOR".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) {
       ascending = this.authorAscending;
       this.authorAscending = !this.authorAscending;
       sorter = new AuthorSorter(newsItems);
     }
 
     /** Sort by category */
-    else if ("TABLE_HEADER_CATEGORY".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) {
       ascending = this.categoryAscending;
       this.categoryAscending = !this.categoryAscending;
       sorter = new CategorySorter(newsItems);
     }
 
     /** Sort by publisher */
-    else if ("TABLE_HEADER_PUBLISHER".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) {
       ascending = this.publisherAscending;
       this.publisherAscending = !this.publisherAscending;
       sorter = new PublisherSorter(newsItems);
     }
 
     /** Sort by news feed */
-    else if ("TABLE_HEADER_FEED".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_FEED")) {
       ascending = this.newsfeedAscending;
       this.newsfeedAscending = !this.newsfeedAscending;
       sorter = new NewsFeedSorter(newsItems);
     }
 
     /** Sort by news status */
-    else if ("TABLE_HEADER_STATUS".equals(field)) {
+    else if (tc.getData().equals("TABLE_HEADER_STATUS")) {
       ascending = this.statusAscending;
       this.statusAscending = !this.statusAscending;
       sorter = new StatusSorter(newsItems);
@@ -165,33 +172,11 @@
     else
       Collections.sort(newsItemOrder, sorter);
 
-    /** Reverse if not ascending order */
+    /** Reverse is not ascending order */
     if (!ascending)
       Collections.reverse(newsItemOrder);
 
-    return ascending;
-  }
-
-  /**
-   * Handle the sorting corresponding to the header clicked
-   * 
-   * @param se the SelectionEvent
-   */
-  public void widgetSelected(SelectionEvent se) {
-    widgetSelected((TableColumn) se.getSource());
-  }
-
-  /**
-   * Handle the sorting corresponding to the header clicked
-   * 
-   * @param tc The selected TableColumn
-   */
-  public void widgetSelected(TableColumn tc) {
-
-    /** Sort based on the given TableColumn */
-    boolean ascending = sort((String) tc.getData());
-
-    /** Remember the width values of the columns */
+    /** Remember the width values of the columns before sorting */
     int columnWidth[] = new int[table.getColumnCount()];
     for (int a = 0; a < table.getColumnCount(); a++)
       columnWidth[a] = table.getColumn(a).getWidth();
@@ -201,41 +186,6 @@
     if (table.getSelectionCount() > 0)
       selectedNews = table.getSelection()[0].getText(1);
 
-    /** Show a Sort Indicator inside the selected TableColumn */
-    if (!tc.getData().equals("TABLE_HEADER_STATUS")) {
-      table.setSortColumn(tc);
-
-      /** Reset Sort Direction */
-      if (table.getSortDirection() != SWT.NONE)
-        table.setSortDirection(SWT.NONE);
-
-      /** Apply the new direction */
-      table.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
-
-      /**
-       * The Indicator requires some space, so pack the TableColumn. In order to
-       * avoid flashing, first set the Table visible before packing the Column.
-       */
-      table.setVisible(false);
-      tc.pack();
-      table.setVisible(true);
-
-      /** Restore Focus if necessary */
-      if (!table.isFocusControl())
-        table.setFocus();
-
-      /** Grant the sorted Column its preferred Width */
-      int sortColumnIndex = table.indexOf(tc);
-      if (columnWidth[sortColumnIndex] < tc.getWidth())
-        columnWidth[sortColumnIndex] = tc.getWidth();
-    }
-
-    /** Do not show the Indicator in the first, narrow Column */
-    else if (table.getSortColumn() != null) {
-      table.setSortDirection(SWT.NONE);
-      table.setSortColumn(null);
-    }
-
     /** Remove All tableitems */
     table.removeAll();
 
--- src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java~	2006-01-04 06:01:14.000000000 -0800
+++ src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java	2005-07-15 16:44:50.000000000 -0700
@@ -54,7 +54,6 @@
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 
-import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.Vector;
 
@@ -63,7 +62,7 @@
  * Table. A selection on a newstitle will open it inside the Newstext panel.
  * 
  * @author <a href="mailto:bpasero at rssowl.org">Benjamin Pasero </a>
- * @version 1.2
+ * @version 1.1.3
  */
 public class NewsfeedPanel {
   private int[] columnWidths;
@@ -150,15 +149,15 @@
       MenuItem generateRTF = new MenuItem(labelMenu, SWT.NONE);
       generateRTF.setText(GUI.i18n.getTranslation("MENU_GENERATE_RTF_SELECTION") + "...");
       generateRTF.setEnabled(false);
-    }
 
-    /** Not enabled */
-    MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE);
-    generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "...");
-    generateHTML.setEnabled(false);
+      /** Not enabled */
+      MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE);
+      generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "...");
+      generateHTML.setEnabled(false);
 
-    /** Separator */
-    new MenuItem(labelMenu, SWT.SEPARATOR);
+      /** Separator */
+      new MenuItem(labelMenu, SWT.SEPARATOR);
+    }
 
     /** Not enabled */
     MenuItem markUnreadItem = new MenuItem(labelMenu, SWT.NONE);
@@ -262,15 +261,9 @@
 
     /** Container for the left header */
     Composite infoViewFormHeaderLeft = new Composite(infoViewForm, SWT.NONE);
-    infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(2, 5, 0, 5, 6, false));
+    infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(1, 5, 0));
     infoViewFormHeaderLeft.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE));
 
-    /** Info Icon */
-    Label infoIcon = new Label(infoViewFormHeaderLeft, SWT.NONE);
-    infoIcon.setImage(PaintShop.iconInfo);
-    infoIcon.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE));
-    infoIcon.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, true));
-
     /** Info Label */
     Label infoLabel = new Label(infoViewFormHeaderLeft, SWT.WRAP);
     infoLabel.setFont(FontShop.textFont);
@@ -361,9 +354,17 @@
       /** Create the Table Columns */
       NewsTable.fillTableColumns(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
 
+      /** Fill table with news - Use the existing column widhts */
+      if (columnWidths != null && columnWidths.length == newsItemInfos.size())
+        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths);
+
+      /** Fill table with news - Pack the table columns */
+      else
+        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
+
       /** Auto-Sort table if the settings tell so */
       if (GlobalSettings.autoSortNews) {
-        ArrayList sortOrder = GlobalSettings.sortOrder;
+        java.util.ArrayList sortOrder = GlobalSettings.sortOrder;
         TableData tableData = (TableData) newsTable.getData();
 
         /** Go through sortOrder from beginning to end */
@@ -372,35 +373,12 @@
 
           /** Sort Column if sortOrderItem is available */
           if (tableData.hasColumnSorter(sortOrderItem)) {
-
-            /** Sort based on the given TableColumn */
-            boolean ascending = tableData.getColumnSorter(sortOrderItem).sort(sortOrderItem);
-
-            /** Show a Sort Indicator inside the selected TableColumn */
-            if (!"TABLE_HEADER_STATUS".equals(sortOrderItem)) {
-              newsTable.setSortColumn(tableData.getColumn(sortOrderItem));
-              newsTable.setSortDirection(ascending ? SWT.DOWN : SWT.UP);
-            }
-
-            /** Do not show the Indicator in the first, narrow Column */
-            else if (newsTable.getSortColumn() != null) {
-              newsTable.setSortDirection(SWT.NONE);
-              newsTable.setSortColumn(null);
-            }
-
+            tableData.getColumnSorter(sortOrderItem).widgetSelected(tableData.getColumn(sortOrderItem));
             break;
           }
         }
       }
 
-      /** Fill table with news - Use the existing column widhts */
-      if (columnWidths != null && columnWidths.length == newsItemInfos.size())
-        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths);
-
-      /** Fill table with news - Pack the table columns */
-      else
-        NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch);
-
       /** Restore last selected news if available */
       if (selectedNews != null) {
         for (int a = 0; a < newsTable.getItemCount(); a++)
@@ -411,7 +389,7 @@
       }
     }
 
-    /** No news are there to display */
+    /** No news are there to GUI.display */
     else {
 
       /** Save some data in TabItem */
--- src/java/net/sourceforge/rssowl/controller/NewsTable.java~	2005-11-06 08:06:57.000000000 -0800
+++ src/java/net/sourceforge/rssowl/controller/NewsTable.java	2006-01-04 06:08:15.000000000 -0800
@@ -266,7 +266,7 @@
         /** Status Column is not resizable and has a ToolTip */
         if (isStatus) {
           column.setResizable(false);
-          column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a]));
+          // column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a]));
         }
 
         /** Apply sorting selection adapter */

rssowl-use-jce.patch:

--- NEW FILE rssowl-use-jce.patch ---
--- src/java/net/sourceforge/rssowl/util/CryptoManager.java.sav	2006-01-04 05:29:01.000000000 -0800
+++ src/java/net/sourceforge/rssowl/util/CryptoManager.java	2006-01-04 05:31:00.000000000 -0800
@@ -24,7 +24,9 @@
 
 package net.sourceforge.rssowl.util;
 
-import net.sourceforge.blowfishj.BlowfishEasy;
+import javax.crypto.*;
+import javax.crypto.spec.*;
+
 import net.sourceforge.rssowl.controller.GUI;
 import net.sourceforge.rssowl.util.shop.StringShop;
 
@@ -41,7 +43,7 @@
  * 
  * @author <a href="mailto:bpasero at rssowl.org">Benjamin Pasero </a>
  * @version 1.2
- */
+*/
 public class CryptoManager {
 
   /** Unique key for the proxy domain (NTLM only) */
@@ -56,15 +58,28 @@
   /** An instance of the CryptoManager */
   private static CryptoManager instance;
 
-  private BlowfishEasy blowFish;
+  private Cipher bfe;
+  private Cipher bfd;
+
   private Hashtable crypta;
 
   /**
    * Called from the static factory Method
    */
   private CryptoManager() {
-    blowFish = new BlowfishEasy(new char[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 });
-    loadData();
+    try
+      {
+	  bfe = Cipher.getInstance("Blowfish/ECB/PKCS7");
+	  bfd = Cipher.getInstance("Blowfish/ECB/PKCS7");
+	  SecretKeySpec skeyspec = new SecretKeySpec (new byte[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 },
+						      "Blowfish");
+	  bfe.init(Cipher.ENCRYPT_MODE, skeyspec);
+	  bfd.init(Cipher.DECRYPT_MODE, skeyspec);
+	  loadData();
+      }
+    catch (Exception _)
+      {
+      }
   }
 
   /**
@@ -176,9 +191,12 @@
    */
   private void decryptData() {
     Enumeration keys = crypta.keys();
-    while (keys.hasMoreElements()) {
-      String key = (String) keys.nextElement();
-      crypta.put(key, blowFish.decryptString((String) crypta.get(key)));
+    try {
+	while (keys.hasMoreElements()) {
+	    String key = (String) keys.nextElement();
+	    crypta.put(key, new String (bfd.doFinal((byte[]) crypta.get(key))));
+	}
+    } catch (Exception _) {
     }
   }
 
@@ -187,9 +205,12 @@
    */
   private void encryptData() {
     Enumeration keys = crypta.keys();
-    while (keys.hasMoreElements()) {
-      String key = (String) keys.nextElement();
-      crypta.put(key, blowFish.encryptString((String) crypta.get(key)));
+    try {
+	while (keys.hasMoreElements()) {
+	    String key = (String) keys.nextElement();
+	    crypta.put(key, bfe.doFinal(((String) crypta.get(key)).getBytes()));
+	}
+    } catch (Exception _) {
     }
   }
 


--- NEW FILE rssowl.desktop ---
[Desktop Entry]
Encoding=UTF-8
BinaryPattern=rssowl;
Name=RSSOwl
Comment=RSSOwl - Free RSS / RDF / Atom Newsreader
MimeType=
Exec=rssowl
GenericName=RSS & RDF Newsreader
Icon=rssowl
TerminalOptions=
Path=
Type=Application
Terminal=0
X-KDE-StartupNotify=true
X-DCOP-ServiceType=Multi
Categories=Network;X-SuSE-RSS-News



--- NEW FILE rssowl.script ---
#!/bin/sh
#
# startscript for rssowl
#

# This makes the embedded browser work.
if [ -z "$MOZILLA_FIVE_HOME" ]; then
  XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1)
  export MOZILLA_FIVE_HOME=$(dirname $XPCOM)
fi
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME

exec java -Djava.library.path=/usr/lib/ -cp /usr/share/java/rssowl.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.1.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar:/usr/share/java/glib0.2.jar:/usr/share/java/gconf2.12.jar:/usr/share/java/gtk2.8.jar:/usr/share/java/ net.sourceforge.rssowl.controller.RSSOwlLoader "$@"


--- NEW FILE rssowl.spec ---
%define name    rssowl
%define version 1.2
%define release 7%{?dist}
%define jdk     java

Name:           %name
Summary:        An RSS, RDF and Atom Newsreader
Version:        %version
Release:        %release
License:        CPL
Group:          Applications/Internet
URL:            http://www.rssowl.org
Source0:        rssowl_1_2_src_clean.tar.gz
Source1:        %{name}.script
Source2:        %{name}.desktop
Patch0:         %{name}-use-jce.patch
Patch1:         %{name}-build0.patch
Patch2:         %{name}-swt31.patch
Patch3:         %{name}-build1.patch
Patch4:         %{name}-JessieX509.patch
Patch5:         %{name}-browser.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       jre >= 1.4.2-
BuildRequires:  java-sdk >= 1.4.2
BuildRequires:  ImageMagick
BuildRequires:  ant, itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
BuildRequires:  libgconf-java
BuildRequires:  ant, jpackage-utils >= 1.5
BuildRequires:	dos2unix
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
Requires: 	itext, jdom, jakarta-commons-codec, jakarta-commons-httpclient, eclipse-platform
Requires:  	libgconf-java

%description
RSSOwl is a RSS / RDF / Atom Newsreader written in Java using SWT as
fast graphic library. Read News in a tabfolder, save favorites in
categories, Export to PDF / RTF / HTML / OPML, Import Feeds from OPML,
perform fulltext-search, use the integrated browser. Please contact
bpasero at rssowl.org if you have any questions or problems regarding
this version.

%description -l de
RSSOwl ist ein RSS / RDF / Atom Newsreader in Java mit SWT als
GUI-Bibliothek. Einige der Features sind Export von Nachrichten nach
PDF / RTF / HTML, Import / Export mit OPML, Volltextsuche und der
integrierte Browser. Bei Fragen oder Problemen mit dieser Version
bitte an bpasero at rssowl.org schreiben.

%prep
%setup -q -n %{name}_1_2_src_clean
%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
# This package doesn't contain any MPL licensed code.
rm doc/mpl-v11.txt

%build
build-jar-repository lib swt-gtk-3.1.1 jdom itext jakarta-commons-codec jakarta-commons-httpclient glib0.2 gconf2.12 gtk2.8
ln -s /usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar lib
ln -s /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar lib
cd src
ant deploy_linux

%install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
install -m 644 rssowl.jar $RPM_BUILD_ROOT%{_javadir}/rssowl.jar

# FIXME:  do these really need to be converted?  Couldn't they be shipped as PNGs?
convert img/16x16.gif img/16x16.png
convert img/24x24.gif img/24x24.png
convert img/32x32.gif img/32x32.png
# FIXME:  this is ugly :)
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
install -m 644 img/32x32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/rssowl.png
install -m 644 img/16x16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/rssowl.png
install -m 644 img/24x24.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/rssowl.png
install -m 644 img/32x32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/rssowl.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications

mkdir -p $RPM_BUILD_ROOT/%{_bindir}
cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
sed --in-place "s:/usr/lib:%{_libdir}:" \
  $RPM_BUILD_ROOT%{_bindir}/%{name}
sed --in-place "s:/usr/share:%{_datadir}:" \
  $RPM_BUILD_ROOT%{_bindir}/%{name}
chmod 755 $RPM_BUILD_ROOT/%{_bindir}/%{name}

dos2unix doc/tutorial/en/*.html
dos2unix doc/tutorial/en/styles/*
dos2unix doc/*.{xml,html,txt,template}

aot-compile-rpm

%post -p %{_bindir}/rebuild-gcj-db

%postun -p %{_bindir}/rebuild-gcj-db

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%doc doc/*
%{_javadir}/*
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_datadir}/icons/*
%{_bindir}/%{name}
%{_libdir}/gcj/%{name}

%changelog
* Mon Jan 16 2006 Anthony Green <green at redhat.com> 1.2-7
- Word-wrapped descriptions.
- Set Group to Applications/Internet.
- Cleaned up changelog changelog entries.
- Improved Summary.
- Converted text files to "unix" with dos2unix.
- Fixed documentation and jar file locations.
- Update rssowl accordingly.

* Mon Jan 16 2006 Anthony Green <green at redhat.com> 1.2-6
- Add Requires for libgconf-java (thanks Andrew Overholt!)

* Fri Jan 13 2006 Anthony Green <green at redhat.com> 1.2-5
- Remove debugging patches.
- Use java-gnome API to find preferred browser.

* Thu Jan  5 2006 Anthony Green <green at redhat.com> 1.2-4
- Remove MPL license text (this was for itext.jar, which is packaged
  separately now.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> 1.2-2
- Use JessieX509 instead of SunX509.

* Wed Jan  4 2006 Anthony Green <green at redhat.com> 1.2-1
- Upgrade to RSSOwl 1.2.
- Many new related patches.
- Remove utf8 patch.
- Use clean sources (no precompiled .class files in jars)
- Build as native code.
- Merge overholt's spec file with Kay's.

* Wed Nov 09 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- change buildrequires to java-sdk >= 1.4.2 and change the startscript to rssowl.sh

* Wed Jul 27 2005 Andrew Overholt <overholt at redhat.com> 1.1.3-0.2
- Include rssowl.script and rssowl.desktop as separate files.
- Use Robin Green's work in /usr/bin/eclipse to make internal browser work.
- Add native compilation (but leave unused until we get all dependencies sorted
  out).

* Mon Jul 25 2005 Andrew Overholt <overholt at redhat.com> 1.1.3-0.1
- New upstream version.
- Update build patch and use new deploy task.

* Wed Jul 06 2005 Andrew Overholt <overholt at redhat.com> 1.1.2-0.2
- First go at some cleanups.
- Patch around a libgcj issue with "utf8" vs. "utf-8".

* Sun Jun 12 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- change the menu-category from usenet-news to rss-news
* Wed May 25 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- Little modifications at the startscript, rssowl accepts shell-arguments
* Sun Mar 22 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- Add "AutoReqProv: no" and change jdk-requirements
* Sun Mar 20 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- new jdk-requirements
* Wed Mar 07 2005 Kay Patzwald <kay_patzwald at users.sourceforge.net>
- change the menu-category of rssowl from network to news
* Wed Aug 18 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- swt*.jars are not required in the bin-rpm
* Wed Aug 18 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- libs will copied to the rssowl-dir now
* Tue Aug 10 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- some little changes
* Sat Aug 07 2004 Manfred Tremmel <Manfred.Tremmel at iiv.de>
- some rework
* Tue Aug 03 2004 Kay Patzwald <admiral_kay at users.sourceforge.net>
- first release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 14:14:09 -0000	1.1
+++ .cvsignore	17 Jan 2006 14:16:01 -0000	1.2
@@ -0,0 +1 @@
+rssowl_1_2_src_clean.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rssowl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 14:14:09 -0000	1.1
+++ sources	17 Jan 2006 14:16:01 -0000	1.2
@@ -0,0 +1 @@
+d440e36983de3dba0239b4f1020f0837  rssowl_1_2_src_clean.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 14:21:14 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:21:14 -0500
Subject: rpms/ttf2pt1/FC-4 ttf2pt1.spec,1.5,1.6
Message-ID: <200601171421.k0HELmjF018153@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18134

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
- add %{?dist} tag




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/FC-4/ttf2pt1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ttf2pt1.spec	22 May 2005 22:27:18 -0000	1.5
+++ ttf2pt1.spec	17 Jan 2006 14:21:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release: 4
+Release:        5%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
+- add %%{?dist} tag
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 3.4.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 14:23:17 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Tue, 17 Jan 2006 09:23:17 -0500
Subject: owners owners.list,1.541,1.542
Message-ID: <200601171423.k0HENq6C018230@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18201

Modified Files:
	owners.list 
Log Message:
Add rssowl.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -r1.541 -r1.542
--- owners.list	17 Jan 2006 14:02:31 -0000	1.541
+++ owners.list	17 Jan 2006 14:23:16 -0000	1.542
@@ -1105,6 +1105,7 @@
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|rtorrent|BitTorrent client based on libtorrent|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 14:31:49 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 09:31:49 -0500
Subject: rpms/ttf2pt1/devel ttf2pt1.spec,1.5,1.6
Message-ID: <200601171432.k0HEWLGn018312@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18295

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
- add %{?dist} tag




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/devel/ttf2pt1.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ttf2pt1.spec	22 May 2005 22:27:18 -0000	1.5
+++ ttf2pt1.spec	17 Jan 2006 14:31:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release: 4
+Release:        5%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
+- add %%{?dist} tag
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 3.4.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:01:58 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:01:58 -0500
Subject: rpms/t1lib/devel t1lib.spec,1.8,1.9
Message-ID: <200601171502.k0HF2UgO020142@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20110

Modified Files:
	t1lib.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
- %ghost-ing config files, also making sure they're regenerated




Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/devel/t1lib.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- t1lib.spec	17 Jan 2006 14:12:23 -0000	1.8
+++ t1lib.spec	17 Jan 2006 15:01:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -75,9 +75,7 @@
 
 %post
 /sbin/ldconfig
-if [ "$1" = "1" ]; then
-  /usr/sbin/t1libconfig --force > /dev/null
-fi
+%{_sbindir}/t1libconfig --force > /dev/null
 
 %postun -p /sbin/ldconfig
 
@@ -86,8 +84,8 @@
 %defattr(-,root,root,-)
 %doc Changes LGPL LICENSE README
 %dir %{_sysconfdir}/t1lib
-%config %{_sysconfdir}/t1lib/t1lib.config
-%config %{_sysconfdir}/t1lib/FontDatabase
+%ghost %{_sysconfdir}/t1lib/t1lib.config
+%ghost %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_mandir}/man*/*
@@ -102,6 +100,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
+- %%ghost-ing config files, also making sure they're regenerated
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:06:06 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:06:06 -0500
Subject: rpms/t1lib/FC-4 t1lib.spec,1.7,1.8
Message-ID: <200601171506.k0HF6dho020241@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/t1lib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20219

Modified Files:
	t1lib.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
- %ghost-ing config files, also making sure they're regenerated




Index: t1lib.spec
===================================================================
RCS file: /cvs/extras/rpms/t1lib/FC-4/t1lib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- t1lib.spec	17 Jan 2006 13:40:30 -0000	1.7
+++ t1lib.spec	17 Jan 2006 15:06:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           t1lib
 Version:        5.1.0
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Summary:        PostScript Type 1 font rasterizer
 
@@ -75,9 +75,7 @@
 
 %post
 /sbin/ldconfig
-if [ "$1" = "1" ]; then
-  /usr/sbin/t1libconfig --force > /dev/null
-fi
+%{_sbindir}/t1libconfig --force > /dev/null
 
 %postun -p /sbin/ldconfig
 
@@ -86,8 +84,8 @@
 %defattr(-,root,root,-)
 %doc Changes LGPL LICENSE README
 %dir %{_sysconfdir}/t1lib
-%config %{_sysconfdir}/t1lib/t1lib.config
-%config %{_sysconfdir}/t1lib/FontDatabase
+%ghost %{_sysconfdir}/t1lib/t1lib.config
+%ghost %{_sysconfdir}/t1lib/FontDatabase
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_mandir}/man*/*
@@ -102,6 +100,12 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-4
+- %%ghost-ing config files, also making sure they're regenerated
+
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-3
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 5.1.0-2
 - remove unneeded %%{_datadir}/t1lib contents
 - cleanup



From fedora-extras-commits at redhat.com  Tue Jan 17 15:19:37 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Jan 2006 10:19:37 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.11, 
	1.12
Message-ID: <200601171520.k0HFKATC020496@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20442

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-4
- Rebuild for evolution-data-server dep.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- contact-lookup-applet.spec	17 Aug 2005 00:06:51 -0000	1.11
+++ contact-lookup-applet.spec	17 Jan 2006 15:19:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-4
+- Rebuild for evolution-data-server dep.
+
 * Tue Aug 16 2005 Brian Pepple <bdpepple at ameritech.net> - 0.13-3
 - Rebuild for cairo dep.
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:25:22 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 17 Jan 2006 10:25:22 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.12, 
	1.13
Message-ID: <200601171525.k0HFPsXx020590@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20565

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-5
- Rebuild for evolution-data-server dep.
- Bump.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- contact-lookup-applet.spec	17 Jan 2006 15:19:37 -0000	1.12
+++ contact-lookup-applet.spec	17 Jan 2006 15:25:22 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,8 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
-* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-4
+* Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-5
 - Rebuild for evolution-data-server dep.
+- Bump.
 
 * Tue Aug 16 2005 Brian Pepple <bdpepple at ameritech.net> - 0.13-3
 - Rebuild for cairo dep.



From fedora-extras-commits at redhat.com  Tue Jan 17 15:32:07 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:32:07 -0500
Subject: rpms/ttf2pt1/devel ttf2pt1.spec,1.6,1.7
Message-ID: <200601171532.k0HFWdqD020683@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20666

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
- rebuild




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/devel/ttf2pt1.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ttf2pt1.spec	17 Jan 2006 14:31:49 -0000	1.6
+++ ttf2pt1.spec	17 Jan 2006 15:32:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
 - add %%{?dist} tag
 



From fedora-extras-commits at redhat.com  Tue Jan 17 15:34:45 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 17 Jan 2006 10:34:45 -0500
Subject: rpms/ttf2pt1/FC-4 ttf2pt1.spec,1.6,1.7
Message-ID: <200601171535.k0HFZH8R020769@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/ttf2pt1/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20712

Modified Files:
	ttf2pt1.spec 
Log Message:
* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
- rebuild




Index: ttf2pt1.spec
===================================================================
RCS file: /cvs/extras/rpms/ttf2pt1/FC-4/ttf2pt1.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ttf2pt1.spec	17 Jan 2006 14:21:14 -0000	1.6
+++ ttf2pt1.spec	17 Jan 2006 15:34:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           ttf2pt1
 Version:        3.4.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        TrueType to Adobe Type 1 converter
 
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-6
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 3.4.4-5
 - add %%{?dist} tag
 



From fedora-extras-commits at redhat.com  Tue Jan 17 16:12:13 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 17 Jan 2006 11:12:13 -0500
Subject: fedora-security/audit fc4,1.129,1.130 fc5,1.39,1.40
Message-ID: <200601171612.k0HGCDwE022680@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22653

Modified Files:
	fc4 fc5 
Log Message:
Deal with the latest batch of CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- fc4	16 Jan 2006 18:22:30 -0000	1.129
+++ fc4	17 Jan 2006 16:12:05 -0000	1.130
@@ -3,9 +3,9 @@
 
 ** are items that need attention
 
-CVE-2006-0208 ** php
-CVE-2006-0207 ** php
-CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
+CVE-2006-0208 VULNERALBE (php) bz#178036
+CVE-2006-0207 VULNERABLE (php) bz#178044
+CVE-2006-0200 version (aaph, 5.1.0 5.1.1 only)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- fc5	16 Jan 2006 18:22:30 -0000	1.39
+++ fc5	17 Jan 2006 16:12:05 -0000	1.40
@@ -15,9 +15,9 @@
 
 ** are items that need attention
 
-CVE-2006-0208 ** php
-CVE-2006-0207 ** php
-CVE-2006-0200 ** php (5.1.0, 5.1.1 only)
+CVE-2006-0208 version (php, fixed 5.1.2)
+CVE-2006-0207 version (php, fixed 5.1.2)
+CVE-2006-0200 version (php, fixed 5.1.2)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0144 ** php-pear
 CVE-2006-0097 ignore (php) Windows only



From fedora-extras-commits at redhat.com  Tue Jan 17 16:36:04 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 17 Jan 2006 11:36:04 -0500
Subject: rpms/digikam/devel digikam.spec,1.18,1.19
Message-ID: <200601171636.k0HGabMc022842@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22825

Modified Files:
	digikam.spec 
Log Message:
- Remove redundant BuildRequires (bug #178031)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- digikam.spec	16 Jan 2006 12:34:37 -0000	1.18
+++ digikam.spec	17 Jan 2006 16:36:04 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	14%{?dist}
+Release:	15%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,8 +12,7 @@
 
 BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
 BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	libXt-devel libtiff-devel libidn-devel libacl-devel gettext
-BuildRequires:	libart_lgpl-devel gamin-devel
+BuildRequires:	gettext libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -47,7 +46,8 @@
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
@@ -118,6 +118,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
+- Remove redundant BuildRequires (bug #178031)
+
 * Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
 - Remove --disable-dependency-tracking
 



From fedora-extras-commits at redhat.com  Tue Jan 17 17:01:22 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue, 17 Jan 2006 12:01:22 -0500
Subject: common tobuild,1.2244,NONE
Message-ID: <200601171701.k0HH1OQo024626@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24617

Removed Files:
	tobuild 
Log Message:
Remove unused file


--- tobuild DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 17:11:37 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue, 17 Jan 2006 12:11:37 -0500
Subject: rpms/bmp/devel bmp.spec,1.10,1.11
Message-ID: <200601171712.k0HHCA69024771@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/rpms/bmp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24717

Modified Files:
	bmp.spec 
Log Message:
test commit


Index: bmp.spec
===================================================================
RCS file: /cvs/extras/rpms/bmp/devel/bmp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- bmp.spec	27 Nov 2005 18:18:48 -0000	1.10
+++ bmp.spec	17 Jan 2006 17:11:17 -0000	1.11
@@ -105,7 +105,6 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 /sbin/ldconfig
 update-desktop-database %{_datadir}/applications



From fedora-extras-commits at redhat.com  Tue Jan 17 17:11:17 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 17 Jan 2006 12:11:17 -0500
Subject: fedora-security/audit fc5,1.40,1.41
Message-ID: <200601171711.k0HHBHMe024724@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24687

Modified Files:
	fc5 
Log Message:
PHP has been upgraded in FC5T2.



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- fc5	17 Jan 2006 16:12:05 -0000	1.40
+++ fc5	17 Jan 2006 17:11:08 -0000	1.41
@@ -15,9 +15,9 @@
 
 ** are items that need attention
 
-CVE-2006-0208 version (php, fixed 5.1.2)
-CVE-2006-0207 version (php, fixed 5.1.2)
-CVE-2006-0200 version (php, fixed 5.1.2)
+CVE-2006-0208 VULNERABLE (php)
+CVE-2006-0207 VULNERABLE (php)
+CVE-2006-0200 VULNERABLE (php)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0144 ** php-pear
 CVE-2006-0097 ignore (php) Windows only



From fedora-extras-commits at redhat.com  Tue Jan 17 17:37:43 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Tue, 17 Jan 2006 12:37:43 -0500
Subject: rpms/lzo/devel lzo.spec,1.8,1.9
Message-ID: <200601171738.k0HHcFSL025111@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/lzo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25087

Modified Files:
	lzo.spec 
Log Message:
lzo: rebuild for gcc 4.1


Index: lzo.spec
===================================================================
RCS file: /cvs/extras/rpms/lzo/devel/lzo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lzo.spec	22 May 2005 23:48:05 -0000	1.8
+++ lzo.spec	17 Jan 2006 17:37:43 -0000	1.9
@@ -1,7 +1,7 @@
 Summary:	Data compression library with very fast (de)compression
 Name:		lzo
 Version:	1.08
-Release: 4
+Release:	5%{?dist}
 
 License:	GPL
 Group:		System Environment/Libraries
@@ -59,6 +59,9 @@
 %{_libdir}/liblzo.a
 
 %changelog
+* Tue Jan 17 2006 Dams <anvil[AT]livna.org> - 1.08-5.fc5
+- Bumped release for gcc 4.1 rebuild
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.08-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Tue Jan 17 17:49:46 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 12:49:46 -0500
Subject: rpms/gnotime/devel gnotime-qof-0.6.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 gnotime.spec, 1.12, 1.13 sources, 1.2,
	1.3 gnotime-desktop.patch, 1.1,
	NONE gnotime-gtkhtml3.8-qof.patch, 1.1,
	NONE gnotime-help-error.patch, 1.1, NONE gnotime-help.patch, 1.1,
	NONE gnotime-idle.patch, 1.1, NONE gnotime-popup-menus.patch,
	1.1, NONE gnotime-qof-include.patch, 1.1,
	NONE gnotime-separate-timeouts.patch, 1.1,
	NONE gnotime-wordwrap.patch, 1.1, NONE gtt_restartwin.png, 1.1,
	NONE gtt_startprojwin.png, 1.1, NONE
Message-ID: <200601171750.k0HHoIam025443@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25405

Modified Files:
	.cvsignore gnotime.spec sources 
Added Files:
	gnotime-qof-0.6.patch 
Removed Files:
	gnotime-desktop.patch gnotime-gtkhtml3.8-qof.patch 
	gnotime-help-error.patch gnotime-help.patch gnotime-idle.patch 
	gnotime-popup-menus.patch gnotime-qof-include.patch 
	gnotime-separate-timeouts.patch gnotime-wordwrap.patch 
	gtt_restartwin.png gtt_startprojwin.png 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
- Rebuild against new qof-0.6.1.
- Patch to fix the build for the qof-0.6 series.


gnotime-qof-0.6.patch:

--- NEW FILE gnotime-qof-0.6.patch ---
Index: gnotime-2.2.2/configure.in
===================================================================
--- gnotime-2.2.2.orig/configure.in
+++ gnotime-2.2.2/configure.in
@@ -52,7 +52,6 @@ LIBXML2_REQUIRED=2.0.0
 SCROLLKEEPER_BUILD_REQUIRED=0.3.5
 dnl Doesn't compile w/ qof-0.5.0
 LIBQOF_REQUIRED_MIN=0.6.0
-LIBQOF_REQUIRED_MAX=0.6.0
 
 
 dnl *******************************
@@ -169,7 +168,7 @@ AC_HELP_STRING([--with-system-qof],
 
 [
 if test x$withval = "xyes"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic.
@@ -180,8 +179,8 @@ else
 fi
 ],
 [
-if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX"; then
-	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN qof-1 <= $LIBQOF_REQUIRED_MAX)
+if $PKG_CONFIG --exists "qof-1 >= $LIBQOF_REQUIRED_MIN"; then
+	PKG_CHECK_MODULES(LIBQOF, qof-1 >= $LIBQOF_REQUIRED_MIN)
 	qofbuild=no
 else
 	dnl Have to use static libqof instead of dynamic


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2004 17:34:07 -0000	1.2
+++ .cvsignore	17 Jan 2006 17:49:46 -0000	1.3
@@ -1 +1 @@
-gnotime-2.2.1.tar.gz
+gnotime-2.2.2.tar.gz


Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnotime.spec	18 Aug 2005 17:28:27 -0000	1.12
+++ gnotime.spec	17 Jan 2006 17:49:46 -0000	1.13
@@ -1,36 +1,13 @@
 Name:           gnotime
-Version:        2.2.1
-Release:        11%{?dist}
+Version:        2.2.2
+Release:        1%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://gttr.sourceforge.net/
 Source0:        http://dl.sf.net/gttr/%{name}-%{version}.tar.gz
-# Images to go with the help files.
-Source1:        http://www.tiki-lounge.com/~toshio/fedora/gtt_restartwin.png
-Source2:        http://www.tiki-lounge.com/~toshio/fedora/gtt_startprojwin.png
-# Simple patch to make the .desktop more complete
-Patch0:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-desktop.patch
-# Combined patch allowing builds with gtkhtml3.0 through 3.8 and
-# builds with a libqof installed on the system instead of bundled with Gnotime.
-Patch1:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-gtkhtml3.8-qof.patch
-# Fixes includes of qof headers in source files.
-Patch2:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-qof-include.patch
-# Fixes the idle timer for kernel 2.6.
-Patch3:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-idle.patch
-# Fixes problems with calls to gnome_help
-Patch4:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help.patch
-# Fixes problems with popup menus failing to pass data arguments to callbacks
-Patch5:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-popup-menus.patch
-# Fixes problem with gnome_help being invoked when the toplevel is unknown
-Patch6:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-help-error.patch
-# Add wordwrapping to textviews
-Patch7:         http://www.tiki-lounge.com/~toshio/fedora/gnotime-wordwrap.patch
-# Adapt a patch from the gnotime issue tracker to separate the idle timeout
-# from the no project running timeout.
-Patch8:		http://www.tiki-lounge.com/~toshio/fedora/gnotime-separate-timeouts.patch
-
+Patch0:		gnotime-qof-0.6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtkhtml3-devel
@@ -38,10 +15,11 @@
 BuildRequires:  scrollkeeper
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:  qof-devel >= 0.5.0
-BuildRequires:  qof-devel < 0.6.0
-# Because we modify configure.in, we need to BR the auto* tools.
-BuildRequires:  libtool
+BuildRequires:  qof-devel >= 0.6.0
+# Patch0 modifies configure.in so we need autoconf
+BuildRequires: autoconf
+# To get rid of rpath, we need to use a fedora libtool
+BuildRequires: libtool
 
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
@@ -61,30 +39,18 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p1
-
-cp $RPM_SOURCE_DIR/gtt_restartwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-cp $RPM_SOURCE_DIR/gtt_startprojwin.png $RPM_BUILD_DIR/%{name}-%{version}/doc/C/figures/
-
-# Copy the images to the correct position
+%patch0 -p1
 
 %build
-autoreconf --install --force
-%GNUconfigure
-make
+autoconf
+%configure
+# Fix hardcoded rpath by using Fedora libtool
+make LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Gnotime puts it's locale translations into gnotime-2.0.mo but it's gnome
@@ -110,9 +76,6 @@
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
     %{_sysconfdir}/gconf/schemas/gnotime.schemas &> /dev/null || :
-  # If applicable:
-  # gconftool-2 --makefile-uninstall-rule \
-  #  %{_sysconfdir}/gconf/schemas/OLDSCHEMA.schemas &> /dev/null || :
   killall -HUP gconfd-2 || :
   unset GCONF_CONFIG_SOURCE
 fi
@@ -148,6 +111,17 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
+- Rebuild against new qof-0.6.1.
+- Patch to fix the build for the qof-0.6 series.
+
+* Fri Sep 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-0
+- Update to 2.2.2.
+- Remove all patches as they've been merged upstream.
+- Build with internal qof as gnotime now depends on 0.6.0 which has not yet
+  been released.  Only build for devel/testing until we can use a released
+  version of qof.
+
 * Thu Aug 18 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.1-11
 - Fix the patch level on the new gtkhtml3 patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2004 17:34:07 -0000	1.2
+++ sources	17 Jan 2006 17:49:46 -0000	1.3
@@ -1 +1 @@
-e2aad191b62b41da7f2176a028f1aaf9  gnotime-2.2.1.tar.gz
+8c05509f57a278de03a97fae110de3f5  gnotime-2.2.2.tar.gz


--- gnotime-desktop.patch DELETED ---


--- gnotime-gtkhtml3.8-qof.patch DELETED ---


--- gnotime-help-error.patch DELETED ---


--- gnotime-help.patch DELETED ---


--- gnotime-idle.patch DELETED ---


--- gnotime-popup-menus.patch DELETED ---


--- gnotime-qof-include.patch DELETED ---


--- gnotime-separate-timeouts.patch DELETED ---


--- gnotime-wordwrap.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 17:54:10 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:54:10 -0500
Subject: rpms/cook/devel .cvsignore, 1.3, 1.4 cook.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200601171754.k0HHsgvo025601@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25570

Modified Files:
	.cvsignore cook.spec sources 
Log Message:
new version 2.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:14:48 -0000	1.3
+++ .cvsignore	17 Jan 2006 17:54:10 -0000	1.4
@@ -1 +1 @@
-cook-2.25.tar.gz
+cook-2.26.tar.gz


Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/cook.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cook.spec	25 May 2005 21:37:18 -0000	1.9
+++ cook.spec	17 Jan 2006 17:54:10 -0000	1.10
@@ -1,13 +1,13 @@
 Name:		cook
-Version:	2.25
-Release: 4
+Version:	2.26
+Release:	1%{?dist}
 
 Summary: 	File construction tool
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
-Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.25.tar.gz
+Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
 Patch0: cook-2.25-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	groff, bison, gettext, sharutils, m4
@@ -20,9 +20,11 @@
 creating any file, such as include files.  The cook program provides a
 mechanism to define these.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
+
 
 %build
 %configure
@@ -31,6 +33,7 @@
     gzip -c $f > $f.gz
 done
 
+
 %install
 rm -fr ${RPM_BUILD_ROOT}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -40,12 +43,15 @@
 make DESTDIR=${RPM_BUILD_ROOT} install
 rm -fr ${RPM_BUILD_ROOT}%{_datadir}/cook/en
 
+
 %check
 make sure
 
+
 %clean
 rm -fr ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr (-,root,root,-)
 %{_bindir}/*
@@ -55,7 +61,11 @@
 %doc lib/en/*.ps.gz
 %doc README LICENSE
 
+
 %changelog
+* Tue Jan 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.26-1
+- new version 2.26
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.25-4
 - fix build with gcc4 (mschwendt, #156203)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 13:14:48 -0000	1.3
+++ sources	17 Jan 2006 17:54:10 -0000	1.4
@@ -1 +1 @@
-fd116da31c59c04abe41519fc131b504  cook-2.25.tar.gz
+6cfae86ca89dcfcbd6483aa586a5ac72  cook-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 17:55:41 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:55:41 -0500
Subject: rpms/cook/devel cook.spec,1.10,1.11
Message-ID: <200601171756.k0HHuDiK025646@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25621

Modified Files:
	cook.spec 
Log Message:



Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/devel/cook.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cook.spec	17 Jan 2006 17:54:10 -0000	1.10
+++ cook.spec	17 Jan 2006 17:55:41 -0000	1.11
@@ -8,7 +8,6 @@
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
 Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
-Patch0: cook-2.25-gcc4.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	groff, bison, gettext, sharutils, m4
 Provides:	perl(host_lists.pl)
@@ -23,7 +22,6 @@
 
 %prep
 %setup -q
-#%patch0 -p1 -b .gcc4
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 17 17:58:48 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:58:48 -0500
Subject: rpms/cook/FC-3 .cvsignore, 1.3, 1.4 cook.spec, 1.5, 1.6 sources, 1.3,
	1.4
Message-ID: <200601171759.k0HHxKSG025769@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731/FC-3

Modified Files:
	.cvsignore cook.spec sources 
Log Message:
new version 2.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:14:48 -0000	1.3
+++ .cvsignore	17 Jan 2006 17:58:48 -0000	1.4
@@ -1 +1 @@
-cook-2.25.tar.gz
+cook-2.26.tar.gz


Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-3/cook.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- cook.spec	12 Feb 2005 13:14:48 -0000	1.5
+++ cook.spec	17 Jan 2006 17:58:48 -0000	1.6
@@ -1,15 +1,15 @@
 Name:		cook
-Version:	2.25
-Release:	1
-Epoch:		0
-Summary: 	A file construction tool
+Version:	2.26
+Release:	1%{?dist}
+
+Summary: 	File construction tool
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
-Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.25.tar.gz
+Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  groff, bison, gettext, sharutils, m4
+BuildRequires:	groff, bison, gettext, sharutils, m4
 Provides:	perl(host_lists.pl)
 
 %description
@@ -54,6 +54,9 @@
 %doc README LICENSE
 
 %changelog
+* Tue Jan 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.26-1
+- new version 2.26
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:2.25-1
 - New Version 2.25
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 13:14:48 -0000	1.3
+++ sources	17 Jan 2006 17:58:48 -0000	1.4
@@ -1 +1 @@
-fd116da31c59c04abe41519fc131b504  cook-2.25.tar.gz
+6cfae86ca89dcfcbd6483aa586a5ac72  cook-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 17:58:54 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 17 Jan 2006 12:58:54 -0500
Subject: rpms/cook/FC-4 .cvsignore, 1.3, 1.4 cook.spec, 1.9, 1.10 sources,
	1.3, 1.4
Message-ID: <200601171759.k0HHxQrJ025774@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/cook/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731/FC-4

Modified Files:
	.cvsignore cook.spec sources 
Log Message:
new version 2.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Feb 2005 13:14:48 -0000	1.3
+++ .cvsignore	17 Jan 2006 17:58:54 -0000	1.4
@@ -1 +1 @@
-cook-2.25.tar.gz
+cook-2.26.tar.gz


Index: cook.spec
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-4/cook.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- cook.spec	25 May 2005 21:37:18 -0000	1.9
+++ cook.spec	17 Jan 2006 17:58:54 -0000	1.10
@@ -1,14 +1,13 @@
 Name:		cook
-Version:	2.25
-Release: 4
+Version:	2.26
+Release:	1%{?dist}
 
 Summary: 	File construction tool
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.canb.auug.org.au/~millerp/cook/
-Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.25.tar.gz
-Patch0: cook-2.25-gcc4.patch
+Source:		http://www.canb.auug.org.au/~millerp/cook/cook-2.26.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	groff, bison, gettext, sharutils, m4
 Provides:	perl(host_lists.pl)
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
 
 %build
 %configure
@@ -56,6 +54,9 @@
 %doc README LICENSE
 
 %changelog
+* Tue Jan 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.26-1
+- new version 2.26
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.25-4
 - fix build with gcc4 (mschwendt, #156203)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cook/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Feb 2005 13:14:48 -0000	1.3
+++ sources	17 Jan 2006 17:58:54 -0000	1.4
@@ -1 +1 @@
-fd116da31c59c04abe41519fc131b504  cook-2.25.tar.gz
+6cfae86ca89dcfcbd6483aa586a5ac72  cook-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 18:07:27 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Tue, 17 Jan 2006 13:07:27 -0500
Subject: rpms/mail-notification/devel mail-notification-evolution.patch, 1.1,
	1.2 mail-notification.spec, 1.14, 1.15
Message-ID: <200601171808.k0HI8LOY027609@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27585

Modified Files:
	mail-notification-evolution.patch mail-notification.spec 
Log Message:
fixes for evolution >= 2.5

mail-notification-evolution.patch:

Index: mail-notification-evolution.patch
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification-evolution.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mail-notification-evolution.patch	22 Sep 2005 17:27:33 -0000	1.1
+++ mail-notification-evolution.patch	17 Jan 2006 18:07:25 -0000	1.2
@@ -17,13 +17,13 @@
  elif test -n "$PKG_CONFIG"; then
 -	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
 -  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
-+		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
++		pkg_cv_EVOLUTION_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null`
  	else
  		pkg_failed=yes
  	fi
@@ -33,13 +33,13 @@
  elif test -n "$PKG_CONFIG"; then
 -	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.2 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
 -  ($PKG_CONFIG --exists "evolution-plugin-2.2 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.4 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "evolution-plugin-2.4 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
++	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"evolution-plugin-2.6 \$evolution_plugin_min_version\" >/dev/null 2>&1") >&5
++  ($PKG_CONFIG --exists "evolution-plugin-2.6 $evolution_plugin_min_version" >/dev/null 2>&1) 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
 -		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.2 $evolution_plugin_min_version" 2>/dev/null`
-+		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.4 $evolution_plugin_min_version" 2>/dev/null`
++		pkg_cv_EVOLUTION_PLUGIN_LIBS=`$PKG_CONFIG --libs "evolution-plugin-2.6 $evolution_plugin_min_version" 2>/dev/null`
  	else
  		pkg_failed=yes
  	fi
@@ -48,7 +48,7 @@
  
  if test $pkg_failed = yes; then
 -	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.2 $evolution_plugin_min_version"`
-+	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.4 $evolution_plugin_min_version"`
++	EVOLUTION_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-plugin-2.6 $evolution_plugin_min_version"`
  	# Put the nasty error message in config.log where it belongs
  	echo "$EVOLUTION_PLUGIN_PKG_ERRORS" 1>&5
  
@@ -57,7 +57,7 @@
  	echo "$as_me:$LINENO: checking for the Evolution plugin directory" >&5
  echo $ECHO_N "checking for the Evolution plugin directory... $ECHO_C" >&6
 -	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.2 2>/dev/null`
-+	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.4 2>/dev/null`
++	evolution_plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-2.6 2>/dev/null`
  	if test -n "$evolution_plugindir"; then
  		echo "$as_me:$LINENO: result: $evolution_plugindir" >&5
  echo "${ECHO_T}$evolution_plugindir" >&6


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mail-notification.spec	17 Jan 2006 10:14:21 -0000	1.14
+++ mail-notification.spec	17 Jan 2006 18:07:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -25,7 +25,8 @@
 BuildRequires:  libgcrypt-devel >= 1.2.0
 BuildRequires:  libicu-devel >= 2.6
 BuildRequires:  gob2
-BuildRequires:  evolution-devel evolution-data-server-devel
+BuildRequires:  evolution-devel >= 2.5
+BuildRequires:  evolution-data-server-devel >= 1.5
 
 
 Requires(post):   GConf2
@@ -49,7 +50,7 @@
 
 %build
 export LDFLAGS="-Wl,--export-dynamic"
-%configure --disable-schemas-install  --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.4
+%configure --disable-schemas-install  --enable-evolution --with-evolution-source-dir=/usr/include/evolution-2.6
 make %{?_smp_mflags}
 
 
@@ -110,13 +111,16 @@
 %{_datadir}/applications/fedora-mail-notification.desktop
 %{_datadir}/applications/fedora-mail-notification-properties.desktop
 %{_datadir}/gnome/help/mail-notification/
-%{_libdir}/evolution/2.4/plugins/*
+%{_libdir}/evolution/2.6/plugins/*
 %dir %{_datadir}/omf/mail-notification/
 %{_datadir}/omf/mail-notification/mail-notification-C.omf
 %{_datadir}/pixmaps/mail-notification.png
 
 
 %changelog
+* Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-9
+- fixes for evolution >= 2.5
+
 * Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-8
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Jan 17 18:35:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 13:35:40 -0500
Subject: rpms/gkrellm-themes/devel .cvsignore, 1.2, 1.3 gkrellm-themes.spec, 
	1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200601171836.k0HIaDbG027807@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/gkrellm-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786

Modified Files:
	.cvsignore gkrellm-themes.spec sources 
Log Message:
* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.9-3
- Switch to latest (2003-01-29) muhri.net tarball.
- Remove more backup etc junk from installed files.
- Convert specfile to UTF-8.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:25:55 -0000	1.2
+++ .cvsignore	17 Jan 2006 18:35:40 -0000	1.3
@@ -1 +1 @@
-gkrellm-themes.tar.bz2
+GKrellM-Skins.tar.gz


Index: gkrellm-themes.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gkrellm-themes.spec	6 Apr 2005 22:11:38 -0000	1.6
+++ gkrellm-themes.spec	17 Jan 2006 18:35:40 -0000	1.7
@@ -1,15 +1,14 @@
 Summary:        Some themes for the GNU Krell Monitor
 Name:           gkrellm-themes
 Version:        2.1.9
-Release:        2
+Release:        3
 
 License:        GPL
 Group:          Applications/System
-Source:         gkrellm-themes.tar.bz2
+Source:         http://muhri.net/gkrellm/GKrellM-Skins.tar.gz
 URL:            http://muhri.net/gkrellm/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       gkrellm >= 2.0.0
-BuildRequires:  /usr/bin/find
 BuildArch:      noarch
 
 %description
@@ -24,7 +23,9 @@
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n GKrellM-skins
+# dedupe
+rm -f aliens.tgz cyrus.gkrellm.tar.gz glass.gkrellm.tar.gz IReX.tar.gz
 
 
 %build
@@ -33,10 +34,13 @@
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_datadir}/gkrellm2/themes
-cd %{buildroot}%{_datadir}/gkrellm2/themes
-find $RPM_BUILD_DIR/%{name} -name "*gz" -exec tar -xzvf {} \;
-find . -name ".xvpics" | xargs rm -rf
-find . -type d -name "CVS" | xargs rm -rf
+for file in *gz ; do
+    %{__tar} zxC %{buildroot}%{_datadir}/gkrellm2/themes -f $file \
+        --exclude CVS \
+        --exclude "*~" \
+        --exclude "*.swp" \
+        --exclude .xvpics
+done
 
 
 %clean
@@ -49,10 +53,15 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.1.9-3
+- Switch to latest (2003-01-29) muhri.net tarball.
+- Remove more backup etc junk from installed files.
+- Convert specfile to UTF-8.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.1.9-2
 - rebuilt
 
-* Tue Apr  8 2003 Ville Skytt? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1
+* Tue Apr  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.1.9-0.fdr.1
 - Don't install CVS dirs.
 - Use fixed defattrs.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gkrellm-themes/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:25:55 -0000	1.2
+++ sources	17 Jan 2006 18:35:40 -0000	1.3
@@ -1 +1 @@
-d374f2990e3ecaadbbd288dc40d4e6a1  gkrellm-themes.tar.bz2
+17c88c10cc320db2036720c90887690a  GKrellM-Skins.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 19:50:18 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 14:50:18 -0500
Subject: rpms/python-docutils/FC-4 .cvsignore, 1.3, 1.4 python-docutils.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601171950.k0HJooOw029910@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29880

Modified Files:
	.cvsignore python-docutils.spec sources 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
- Update to 0.4.
- Scripted the listing of files in the python module.
- Add a missingok requirement on python-imaging as docutils can make use of
  it when converting to formats that have images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jun 2005 23:04:22 -0000	1.3
+++ .cvsignore	17 Jan 2006 19:50:17 -0000	1.4
@@ -1 +1 @@
-docutils-0.3.9.tar.gz
+docutils-0.4.tar.gz


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-4/python-docutils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-docutils.spec	7 Jun 2005 23:04:22 -0000	1.4
+++ python-docutils.spec	17 Jan 2006 19:50:17 -0000	1.5
@@ -1,25 +1,23 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?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 srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.3.9
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
-License:        Public domain, BSD, PSF, GPL - see COPYING.txt
+License:        Public Domain, BSD, Python License, GPL - see COPYING.txt
 URL:            http://docutils.sourceforge.net
 Source0:	http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python-devel
+Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
-Requires:	python-abi = %{pyver}
 
 %description
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -35,15 +33,18 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 
+# Remove a shebang from one of the library files
+sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
+
 %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
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 	
-for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
+for file in %{buildroot}/%{_bindir}/*.py; do
 	mv $file `dirname $file`/`basename $file .py`
 done
 
@@ -55,7 +56,7 @@
 # it manually here.
 file=roman.py
 extradest=%{python_sitelib}
-fullextradest=$RPM_BUILD_ROOT/$extradest
+fullextradest=%{buildroot}/$extradest
 install -m 0644 extras/$file $fullextradest
 %{__python} -c "import py_compile; py_compile.compile(\
     '$fullextradest/$file', \
@@ -65,42 +66,34 @@
     '$fullextradest/$file', \
     '$fullextradest/$file' + 'o', \
     '$extradest/$file')"
+    
+echo '%defattr (0644,root,root,0755)' > pyfiles
+find %{buildroot}%{python_sitelib}/docutils -type d | \
+  sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -not -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):%ghost \1:' >> pyfiles
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f pyfiles
 %defattr(-,root,root,-)
-%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
+%doc BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
+%doc THANKS.txt licenses docs tools/editors
 %{_bindir}/*
-%dir %{python_sitelib}/docutils
-%dir %{python_sitelib}/docutils/languages
-%dir %{python_sitelib}/docutils/parsers
-%dir %{python_sitelib}/docutils/parsers/rst
-%dir %{python_sitelib}/docutils/parsers/rst/directives
-%dir %{python_sitelib}/docutils/parsers/rst/languages
-%dir %{python_sitelib}/docutils/readers
-%dir %{python_sitelib}/docutils/readers/python
-%dir %{python_sitelib}/docutils/transforms
-%dir %{python_sitelib}/docutils/writers
 %{python_sitelib}/roman.py
 %{python_sitelib}/roman.pyc
-%{python_sitelib}/docutils/*.py
-%{python_sitelib}/docutils/*.pyc
-%{python_sitelib}/docutils/*/*.py
-%{python_sitelib}/docutils/*/*.pyc
-%{python_sitelib}/docutils/*/*/*.py
-%{python_sitelib}/docutils/*/*/*.pyc
-%{python_sitelib}/docutils/*/*/*/*.py
-%{python_sitelib}/docutils/*/*/*/*.pyc
-
 %ghost %{python_sitelib}/roman.pyo
-%ghost %{python_sitelib}/docutils/*.pyo
-%ghost %{python_sitelib}/docutils/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
+- Update to 0.4.
+- Scripted the listing of files in the python module.
+- Add a missingok requirement on python-imaging as docutils can make use of
+  it when converting to formats that have images.
+  
 * Tue Jun 7 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.9-1
 - Update to version 0.3.9.
 - Use a dist tag as there aren't any differences between supported fc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jun 2005 23:04:22 -0000	1.3
+++ sources	17 Jan 2006 19:50:17 -0000	1.4
@@ -1 +1 @@
-3b6727e4f53e88ae7cea7c296694fc6c  docutils-0.3.9.tar.gz
+0fe7b42bb3c2aa3680fe30f9a5fbf712  docutils-0.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:00:45 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 17 Jan 2006 15:00:45 -0500
Subject: rpms/gfontview/devel gfontview.spec,1.1,1.2
Message-ID: <200601172001.k0HK1QXU031567@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gfontview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29990

Modified Files:
	gfontview.spec 
Log Message:
build against updated compiler/t1lib



Index: gfontview.spec
===================================================================
RCS file: /cvs/extras/rpms/gfontview/devel/gfontview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gfontview.spec	1 Oct 2005 08:44:51 -0000	1.1
+++ gfontview.spec	17 Jan 2006 20:00:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gfontview
 Version:        0.5.0
-Release:        4%{?dist}
+Release:        4.1%{?dist}
 Summary:        A font viewer for Type 1 and TrueType fonts
 
 Group:          User Interface/X
@@ -10,7 +10,7 @@
 Patch0:         gfontview-0.5.0-gcc4.patch
 Patch1:         gfontview-0.5.0-makefile.patch
 
-BuildRequires:  libungif-devel, gtk+-devel, t1lib-devel
+BuildRequires:  giflib-devel, gtk+-devel, t1lib-devel, freetype-devel
 BuildRequires:  desktop-file-utils, gettext
 # it needs to know the spooling system and thus needs /usr/bin/lpr
 BuildRequires:  cups
@@ -33,7 +33,6 @@
 %build
 %configure \
  --enable-gnome=no \
- --with-libungif \
  --with-fontdir=%{_datadir}/fonts
 make %{?_smp_mflags}
 
@@ -64,6 +63,11 @@
 %{_datadir}/gfontview
 
 %changelog
+* Tue Jan 17 2006 Michael A. Peters <mpeters at mac.com> 0.5.0-4.1
+- rebuild in devel branch against updated t1lib
+- add freetype-devel to BuildRequires
+- change from libungif to giflib
+
 * Tue Sep 27 2005 Michael A. Peters <mpeters at mac.com> 0.5.0-4
 - changed the name of patch0 to be more specific
 - replaced patch1 to include better gfontviewrc location



From fedora-extras-commits at redhat.com  Tue Jan 17 20:11:53 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 15:11:53 -0500
Subject: rpms/python-docutils/FC-3 .cvsignore, 1.3, 1.4 python-docutils.spec,
	1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200601172012.k0HKCedg031786@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31759

Modified Files:
	.cvsignore python-docutils.spec sources 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
- Update to 0.4.
- Scripted the listing of files in the python module.
- Add a missingok requirement on python-imaging as docutils can make use of
  it when converting to formats that have images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jun 2005 23:07:17 -0000	1.3
+++ .cvsignore	17 Jan 2006 20:11:48 -0000	1.4
@@ -1 +1 @@
-docutils-0.3.9.tar.gz
+python-docutils.spec


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/python-docutils.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-docutils.spec	7 Jun 2005 23:07:17 -0000	1.2
+++ python-docutils.spec	17 Jan 2006 20:11:48 -0000	1.3
@@ -1,25 +1,23 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?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 srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.3.9
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
-License:        Public domain, BSD, PSF, GPL - see COPYING.txt
+License:        Public Domain, BSD, Python License, GPL - see COPYING.txt
 URL:            http://docutils.sourceforge.net
 Source0:	http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python-devel
+Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
-Requires:	python-abi = %{pyver}
 
 %description
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -35,15 +33,18 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 
+# Remove a shebang from one of the library files
+sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
+
 %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
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 	
-for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
+for file in %{buildroot}/%{_bindir}/*.py; do
 	mv $file `dirname $file`/`basename $file .py`
 done
 
@@ -55,7 +56,7 @@
 # it manually here.
 file=roman.py
 extradest=%{python_sitelib}
-fullextradest=$RPM_BUILD_ROOT/$extradest
+fullextradest=%{buildroot}/$extradest
 install -m 0644 extras/$file $fullextradest
 %{__python} -c "import py_compile; py_compile.compile(\
     '$fullextradest/$file', \
@@ -65,42 +66,34 @@
     '$fullextradest/$file', \
     '$fullextradest/$file' + 'o', \
     '$extradest/$file')"
+    
+echo '%defattr (0644,root,root,0755)' > pyfiles
+find %{buildroot}%{python_sitelib}/docutils -type d | \
+  sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -not -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):%ghost \1:' >> pyfiles
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f pyfiles
 %defattr(-,root,root,-)
-%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
+%doc BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
+%doc THANKS.txt licenses docs tools/editors
 %{_bindir}/*
-%dir %{python_sitelib}/docutils
-%dir %{python_sitelib}/docutils/languages
-%dir %{python_sitelib}/docutils/parsers
-%dir %{python_sitelib}/docutils/parsers/rst
-%dir %{python_sitelib}/docutils/parsers/rst/directives
-%dir %{python_sitelib}/docutils/parsers/rst/languages
-%dir %{python_sitelib}/docutils/readers
-%dir %{python_sitelib}/docutils/readers/python
-%dir %{python_sitelib}/docutils/transforms
-%dir %{python_sitelib}/docutils/writers
 %{python_sitelib}/roman.py
 %{python_sitelib}/roman.pyc
-%{python_sitelib}/docutils/*.py
-%{python_sitelib}/docutils/*.pyc
-%{python_sitelib}/docutils/*/*.py
-%{python_sitelib}/docutils/*/*.pyc
-%{python_sitelib}/docutils/*/*/*.py
-%{python_sitelib}/docutils/*/*/*.pyc
-%{python_sitelib}/docutils/*/*/*/*.py
-%{python_sitelib}/docutils/*/*/*/*.pyc
-
 %ghost %{python_sitelib}/roman.pyo
-%ghost %{python_sitelib}/docutils/*.pyo
-%ghost %{python_sitelib}/docutils/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
+- Update to 0.4.
+- Scripted the listing of files in the python module.
+- Add a missingok requirement on python-imaging as docutils can make use of
+  it when converting to formats that have images.
+  
 * Tue Jun 7 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.9-1
 - Update to version 0.3.9.
 - Use a dist tag as there aren't any differences between supported fc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jun 2005 23:07:17 -0000	1.3
+++ sources	17 Jan 2006 20:11:48 -0000	1.4
@@ -1 +1 @@
-3b6727e4f53e88ae7cea7c296694fc6c  docutils-0.3.9.tar.gz
+4414a94628dfb736252e922e038bd32e  python-docutils.spec



From fedora-extras-commits at redhat.com  Tue Jan 17 20:15:57 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 15:15:57 -0500
Subject: rpms/python-docutils/devel .cvsignore, 1.3, 1.4 python-docutils.spec,
	1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601172016.k0HKGU6Q031900@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31879

Modified Files:
	.cvsignore python-docutils.spec sources 
Log Message:
* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
- Update to 0.4.
- Scripted the listing of files in the python module.
- Add a missingok requirement on python-imaging as docutils can make use of
  it when converting to formats that have images.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 Jun 2005 21:45:42 -0000	1.3
+++ .cvsignore	17 Jan 2006 20:15:57 -0000	1.4
@@ -1 +1 @@
-docutils-0.3.9.tar.gz
+docutils-0.4.tar.gz


Index: python-docutils.spec
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/python-docutils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-docutils.spec	7 Jun 2005 21:45:42 -0000	1.4
+++ python-docutils.spec	17 Jan 2006 20:15:57 -0000	1.5
@@ -1,25 +1,23 @@
-%define pyver %(%{__python} -c "import sys; print sys.version[:3]")
 %{!?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 srcname docutils
 
 Name:           python-%{srcname}
-Version:        0.3.9
+Version:        0.4
 Release:        1%{?dist}
 Summary:        A system for processing plaintext documentation
 
 Group:          Development/Languages
-License:        Public domain, BSD, PSF, GPL - see COPYING.txt
+License:        Public Domain, BSD, Python License, GPL - see COPYING.txt
 URL:            http://docutils.sourceforge.net
 Source0:	http://dl.sourceforge.net/docutils/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 BuildRequires:  python-devel
+Requires(missingok): python-imaging
 Provides: docutils = %{version}-%{release}
 Obsoletes: docutils < %{version}-%{release}
-Requires:	python-abi = %{pyver}
 
 %description
 The Docutils project specifies a plaintext markup language, reStructuredText,
@@ -35,15 +33,18 @@
 %prep
 %setup -q -n %{srcname}-%{version}
 
+# Remove a shebang from one of the library files
+sed -i -e '/#! *\/usr\/bin\/.*python.*/{1D}' docutils/readers/python/pynodes.py
+
 %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
+rm -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 	
-for file in $RPM_BUILD_ROOT/%{_bindir}/*.py; do
+for file in %{buildroot}/%{_bindir}/*.py; do
 	mv $file `dirname $file`/`basename $file .py`
 done
 
@@ -55,7 +56,7 @@
 # it manually here.
 file=roman.py
 extradest=%{python_sitelib}
-fullextradest=$RPM_BUILD_ROOT/$extradest
+fullextradest=%{buildroot}/$extradest
 install -m 0644 extras/$file $fullextradest
 %{__python} -c "import py_compile; py_compile.compile(\
     '$fullextradest/$file', \
@@ -65,42 +66,34 @@
     '$fullextradest/$file', \
     '$fullextradest/$file' + 'o', \
     '$extradest/$file')"
+    
+echo '%defattr (0644,root,root,0755)' > pyfiles
+find %{buildroot}%{python_sitelib}/docutils -type d | \
+  sed 's:%{buildroot}\(.*\):%dir \1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -not -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):\1:' >> pyfiles
+find %{buildroot}%{python_sitelib}/docutils -not -type d -name '*.pyo' | \
+  sed 's:%{buildroot}\(.*\):%ghost \1:' >> pyfiles
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-%files
+%files -f pyfiles
 %defattr(-,root,root,-)
-%doc COPYING.txt FAQ.txt HISTORY.txt README.txt THANKS.txt licenses docs tools
+%doc BUGS.txt COPYING.txt FAQ.txt HISTORY.txt README.txt RELEASE-NOTES.txt 
+%doc THANKS.txt licenses docs tools/editors
 %{_bindir}/*
-%dir %{python_sitelib}/docutils
-%dir %{python_sitelib}/docutils/languages
-%dir %{python_sitelib}/docutils/parsers
-%dir %{python_sitelib}/docutils/parsers/rst
-%dir %{python_sitelib}/docutils/parsers/rst/directives
-%dir %{python_sitelib}/docutils/parsers/rst/languages
-%dir %{python_sitelib}/docutils/readers
-%dir %{python_sitelib}/docutils/readers/python
-%dir %{python_sitelib}/docutils/transforms
-%dir %{python_sitelib}/docutils/writers
 %{python_sitelib}/roman.py
 %{python_sitelib}/roman.pyc
-%{python_sitelib}/docutils/*.py
-%{python_sitelib}/docutils/*.pyc
-%{python_sitelib}/docutils/*/*.py
-%{python_sitelib}/docutils/*/*.pyc
-%{python_sitelib}/docutils/*/*/*.py
-%{python_sitelib}/docutils/*/*/*.pyc
-%{python_sitelib}/docutils/*/*/*/*.py
-%{python_sitelib}/docutils/*/*/*/*.pyc
-
 %ghost %{python_sitelib}/roman.pyo
-%ghost %{python_sitelib}/docutils/*.pyo
-%ghost %{python_sitelib}/docutils/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*.pyo
-%ghost %{python_sitelib}/docutils/*/*/*/*.pyo
 
 %changelog
+* Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> 0.4-1
+- Update to 0.4.
+- Scripted the listing of files in the python module.
+- Add a missingok requirement on python-imaging as docutils can make use of
+  it when converting to formats that have images.
+  
 * Tue Jun 7 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 0.3.9-1
 - Update to version 0.3.9.
 - Use a dist tag as there aren't any differences between supported fc


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Jun 2005 21:45:42 -0000	1.3
+++ sources	17 Jan 2006 20:15:57 -0000	1.4
@@ -1 +1 @@
-3b6727e4f53e88ae7cea7c296694fc6c  docutils-0.3.9.tar.gz
+0fe7b42bb3c2aa3680fe30f9a5fbf712  docutils-0.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:22:41 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 15:22:41 -0500
Subject: owners owners.list,1.542,1.543
Message-ID: <200601172023.k0HKNDtk031972@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31953

Modified Files:
	owners.list 
Log Message:
unorphan i810switch


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.542
retrieving revision 1.543
diff -u -r1.542 -r1.543
--- owners.list	17 Jan 2006 14:23:16 -0000	1.542
+++ owners.list	17 Jan 2006 20:22:40 -0000	1.543
@@ -396,7 +396,7 @@
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|i810switch|Display management utility for i810 chipsets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|i810switch|Display management utility for i810 chipsets|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ibmonitor|Interactive bandwidth monitor|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|icmpdn|ICMP host name utilities|fredrik at dolda2000.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 17 20:25:17 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 15:25:17 -0500
Subject: rpms/i810switch/devel .cvsignore, 1.2, 1.3 i810switch.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601172025.k0HKPnkM032059@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32019

Modified Files:
	.cvsignore i810switch.spec sources 
Log Message:
make: `clog' is up to date.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jan 2005 16:49:20 -0000	1.2
+++ .cvsignore	17 Jan 2006 20:25:16 -0000	1.3
@@ -1 +1 @@
-i810switch-0.6.2.tar.gz
+i810switch-0.6.5.tar.gz


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- i810switch.spec	6 Apr 2005 22:12:02 -0000	1.3
+++ i810switch.spec	17 Jan 2006 20:25:16 -0000	1.4
@@ -1,12 +1,12 @@
 Name: i810switch
-Version: 0.6.2
-Release: 4
+Version: 0.6.5
+Release: 1
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
 License: GPL
-URL: http://vorfgglon.cwru.edu/~ames/i810switch/
-Source0: http://vorlon.cwru.edu/~ames/i810switch/i810switch-0.6.2.tar.gz
+URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
+Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
@@ -37,6 +37,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 17 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-1
+- update to 0.6.5, change URLs due to new upstream maintainer
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jan 2005 16:49:20 -0000	1.2
+++ sources	17 Jan 2006 20:25:16 -0000	1.3
@@ -1 +1 @@
-b31cc8fde7a36d553406339d2626d3e3  i810switch-0.6.2.tar.gz
+5ca07aee624589bdce5761c796e5f9a8  i810switch-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:25:29 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Tue, 17 Jan 2006 15:25:29 -0500
Subject: rpms/python-docutils/FC-3 .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200601172026.k0HKQ1vP032092@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/python-docutils/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015

Modified Files:
	.cvsignore sources 
Log Message:
* Upload the correct docutils tarball this time.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Jan 2006 20:11:48 -0000	1.4
+++ .cvsignore	17 Jan 2006 20:25:28 -0000	1.5
@@ -1 +1 @@
-python-docutils.spec
+docutils-0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-docutils/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Jan 2006 20:11:48 -0000	1.4
+++ sources	17 Jan 2006 20:25:28 -0000	1.5
@@ -1 +1 @@
-4414a94628dfb736252e922e038bd32e  python-docutils.spec
+0fe7b42bb3c2aa3680fe30f9a5fbf712  docutils-0.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 20:33:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 15:33:55 -0500
Subject: rpms/rpmlint/devel rpmlint-0.71-disttag.patch, NONE,
	1.1 rpmlint-0.71-doc-exec.patch, NONE,
	1.1 rpmlint-0.71-la-exec.patch, NONE,
	1.1 rpmlint-0.71-prereq.patch, NONE, 1.1 .cvsignore, 1.9,
	1.10 rpmlint-fedora-config, 1.10, 1.11 rpmlint.spec, 1.18,
	1.19 sources, 1.9, 1.10 DocFilesCheck.py, 1.1,
	NONE rpmlint-0.71-docfilescheck.patch, 1.1,
	NONE rpmlint-0.71-errmsg.patch, 1.1,
	NONE rpmlint-0.71-locale.patch, 1.1,
	NONE rpmlint-0.71-objdump.patch, 1.1,
	NONE rpmlint-0.71-paths.patch, 1.1,
	NONE rpmlint-0.71-scriptinfo.patch, 1.1,
	NONE rpmlint-0.71-symlinks.patch, 1.1,
	NONE rpmlint-disttag.patch, 1.1, NONE rpmlint-execs.patch, 1.1,
	NONE rpmlint-initvars.patch, 1.2, NONE rpmlint-perl-bs.patch,
	1.1, NONE rpmlint-prereq.patch, 1.1,
	NONE rpmlint-svcdefault.patch, 1.1, NONE
Message-ID: <200601172034.k0HKYRBY032248@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32213

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
Removed Files:
	DocFilesCheck.py rpmlint-0.71-docfilescheck.patch 
	rpmlint-0.71-errmsg.patch rpmlint-0.71-locale.patch 
	rpmlint-0.71-objdump.patch rpmlint-0.71-paths.patch 
	rpmlint-0.71-scriptinfo.patch rpmlint-0.71-symlinks.patch 
	rpmlint-disttag.patch rpmlint-execs.patch 
	rpmlint-initvars.patch rpmlint-perl-bs.patch 
	rpmlint-prereq.patch rpmlint-svcdefault.patch 
Log Message:
* 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.


rpmlint-0.71-disttag.patch:

--- NEW FILE rpmlint-0.71-disttag.patch ---
--- TagsCheck.py~	2006-01-15 23:33:42.000000000 +0200
+++ TagsCheck.py	2006-01-15 23:34:30.000000000 +0200
@@ -424,2 +424,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension', 'mdk')
@@ -636,3 +637,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)

rpmlint-0.71-doc-exec.patch:

--- NEW FILE rpmlint-0.71-doc-exec.patch ---
Index: FilesCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
retrieving revision 1.96
diff -u -U1 -r1.96 FilesCheck.py
--- FilesCheck.py	15 Jan 2006 09:59:04 -0000	1.96
+++ FilesCheck.py	15 Jan 2006 21:08:24 -0000
@@ -565,3 +565,3 @@
 
-                            if mode & 0111 == 0:
+                            if mode & 0111 == 0 and not doc_regex.search(f):
                                 printError(pkg, 'non-executable-script', f, oct(perm))

rpmlint-0.71-la-exec.patch:

--- NEW FILE rpmlint-0.71-la-exec.patch ---
Index: FilesCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
retrieving revision 1.96
diff -u -U1 -r1.96 FilesCheck.py
--- FilesCheck.py	15 Jan 2006 09:59:04 -0000	1.96
+++ FilesCheck.py	15 Jan 2006 21:08:59 -0000
@@ -189,2 +189,3 @@
 script_regex=re.compile('^/((usr/)?s?bin|etc/(rc.d/init.d|profile.d|X11/xinit.d|cron.(hourly|daily|monthly|weekly)))/')
+libtool_archive_regex=re.compile('\.la$')
 lib64python_regex=re.compile('^/usr/lib64/python')
@@ -562,3 +563,3 @@
                                     printError(pkg, 'wrong-script-interpreter', f, '"' + res.group(1) + '"')
-                            else:
+                            elif not (lib_path_regex.search(f) and libtool_archive_regex.search(f)):
                                 printError(pkg, 'script-without-shellbang', f)

rpmlint-0.71-prereq.patch:

--- NEW FILE rpmlint-0.71-prereq.patch ---
Index: SpecCheck.py
===================================================================
RCS file: /cooker/soft/rpmlint/SpecCheck.py,v
retrieving revision 1.32
diff -u -r1.32 SpecCheck.py
--- SpecCheck.py	15 Jan 2006 09:59:04 -0000	1.32
+++ SpecCheck.py	15 Jan 2006 21:05:12 -0000
@@ -45,6 +45,7 @@
 biarch_package_regex=re.compile(DEFAULT_BIARCH_PACKAGES)
 hardcoded_lib_path_exceptions_regex=re.compile(Config.getOption('HardcodedLibPathExceptions', DEFAULT_HARDCODED_LIB_PATH_EXCEPTIONS))
 prereq_regex=re.compile('^PreReq:\s*(.+?)\s*$', re.IGNORECASE)
+buildprereq_regex=re.compile('^BuildPreReq:\s*(.+?)\s*$', re.IGNORECASE)
 use_utf8=Config.getOption('UseUTF8', Config.USEUTF8_DEFAULT)
 
 # Only check for /lib, /usr/lib, /usr/X11R6/lib
@@ -190,7 +191,11 @@
 
                 res=prereq_regex.search(line)
                 if res:
-                    printError(pkg, 'prereq-use', res.group(1))
+                    printWarning(pkg, 'prereq-use', res.group(1))
+
+                res=buildprereq_regex.search(line)
+                if res:
+                    printWarning(pkg, 'buildprereq-use', res.group(1))
 
             if not buildroot:
                 printError(pkg, 'no-buildroot-tag')
@@ -284,8 +289,13 @@
 patch to be effective only on a given arch.''',
 
 'prereq-use',
-'''The use of PreReq is deprecated. You should use Requires(pre), Requires(post),
-Requires(preun) or Requires(postun) according to your needs.''',
+'''The use of PreReq is deprecated. In the majority of cases, a plain Requires
+is enough and the right thing to do. Sometimes Requires(pre), Requires(post),
+Requires(preun) and/or Requires(postun) can also be used instead of PreReq.''',
+
+'buildprereq-use',
+'''The use of BuildPreReq is deprecated, build dependencies are always required
+before a package can be built.  Use plain BuildRequires instead.''',
 
 )
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	11 Aug 2005 19:32:46 -0000	1.9
+++ .cvsignore	17 Jan 2006 20:33:54 -0000	1.10
@@ -1 +1,2 @@
 rpmlint-0.71.tar.bz2
+rpmlint-0.71-cvs20060115.patch.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint-fedora-config	20 Nov 2005 21:21:02 -0000	1.10
+++ rpmlint-fedora-config	17 Jan 2006 20:33:54 -0000	1.11
@@ -9,7 +9,9 @@
 setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
+setOption("UseDefaultRunlevels", 0)
 setOption("UseEpoch", 0)
+setOption("UseUTF8", 1)
 setOption("ValidSrcPerms", (0664, 0644, ))
 setOption("ValidGroups", (
     "Amusements/Games",


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmlint.spec	20 Nov 2005 21:21:02 -0000	1.18
+++ rpmlint.spec	17 Jan 2006 20:33:54 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.71
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -8,20 +8,11 @@
 URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
 Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Source2:        DocFilesCheck.py
-Patch0:         %{name}-svcdefault.patch
-Patch1:         %{name}-prereq.patch
-Patch2:         %{name}-disttag.patch
-Patch3:         %{name}-initvars.patch
-Patch4:         %{name}-execs.patch
-Patch5:         %{name}-perl-bs.patch
-Patch6:         %{name}-0.71-paths.patch
-Patch7:         %{name}-0.71-errmsg.patch
-Patch8:         %{name}-0.71-symlinks.patch
-Patch9:         %{name}-0.71-docfilescheck.patch
-Patch10:        %{name}-0.71-objdump.patch
-Patch11:        %{name}-0.71-locale.patch
-Patch12:        %{name}-0.71-scriptinfo.patch
+Patch0:         %{name}-0.71-disttag.patch
+Patch1:         %{name}-0.71-cvs20060115.patch.bz2
+Patch2:         %{name}-0.71-prereq.patch
+Patch3:         %{name}-0.71-la-exec.patch
+Patch4:         %{name}-0.71-doc-exec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -31,6 +22,7 @@
 Requires:       rpm-python
 Requires:       python >= 1.5.2
 Requires:       cpio
+Requires:       binutils
 
 %description
 rpmlint is a tool for checking common errors in RPM packages.  Binary
@@ -39,20 +31,11 @@
 
 %prep
 %setup -q
-install -pm 644 %{SOURCE2} .
-%patch0
 %patch1
+%patch0
 %patch2
 %patch3
 %patch4
-%patch5
-%patch6
-%patch7
-%patch8
-%patch9
-%patch10
-%patch11
-%patch12
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 for f in AUTHORS ChangeLog ; do
@@ -105,6 +88,11 @@
 
 
 %changelog
+* 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
 - Take file based dependencies into account in dangling symlink checks
   (completes the fix for #165839).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	11 Aug 2005 19:32:46 -0000	1.9
+++ sources	17 Jan 2006 20:33:54 -0000	1.10
@@ -1 +1,2 @@
 9e7645ee79bfc75540c885f05dca0751  rpmlint-0.71.tar.bz2
+ed1fa7aaa6cbfcdf866b423adcd40cb2  rpmlint-0.71-cvs20060115.patch.bz2


--- DocFilesCheck.py DELETED ---


--- rpmlint-0.71-docfilescheck.patch DELETED ---


--- rpmlint-0.71-errmsg.patch DELETED ---


--- rpmlint-0.71-locale.patch DELETED ---


--- rpmlint-0.71-objdump.patch DELETED ---


--- rpmlint-0.71-paths.patch DELETED ---


--- rpmlint-0.71-scriptinfo.patch DELETED ---


--- rpmlint-0.71-symlinks.patch DELETED ---


--- rpmlint-disttag.patch DELETED ---


--- rpmlint-execs.patch DELETED ---


--- rpmlint-initvars.patch DELETED ---


--- rpmlint-perl-bs.patch DELETED ---


--- rpmlint-prereq.patch DELETED ---


--- rpmlint-svcdefault.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 17 20:53:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:53:32 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.7,1.8
Message-ID: <200601172054.k0HKs4JI032424@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32389

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc5 on branch devel from perl-Convert-UUlib-1.06-2.fc5.src.rpm
1.06 < 1.051 -> bump epoch


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	16 Jan 2006 22:55:56 -0000	1.7
+++ import.log	17 Jan 2006 20:53:32 -0000	1.8
@@ -4,3 +4,4 @@
 perl-Convert-UUlib-1_03-0_fdr_1_1_92:HEAD:perl-Convert-UUlib-1.03-0.fdr.1.1.92.src.rpm:1099889960
 perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049
 perl-Convert-UUlib-1_06-1_fc4:FC-4:perl-Convert-UUlib-1.06-1.fc4.src.rpm:1137452147
+perl-Convert-UUlib-1_06-2_fc5:HEAD:perl-Convert-UUlib-1.06-2.fc5.src.rpm:1137531201



From fedora-extras-commits at redhat.com  Tue Jan 17 20:53:38 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:53:38 -0500
Subject: rpms/perl-Convert-UUlib/devel perl-Convert-UUlib.spec,1.11,1.12
Message-ID: <200601172054.k0HKsAwA032427@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32389/devel

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc5 on branch devel from perl-Convert-UUlib-1.06-2.fc5.src.rpm
1.06 < 1.051 -> bump epoch


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/devel/perl-Convert-UUlib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Convert-UUlib.spec	16 Jan 2006 22:54:24 -0000	1.11
+++ perl-Convert-UUlib.spec	17 Jan 2006 20:53:38 -0000	1.12
@@ -2,7 +2,8 @@
 
 Name:      perl-%{rname}
 Version:   1.06
-Release:   1%{?dist}
+Epoch:     1
+Release:   2%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-2
+- bump epoch to force updates
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
 - 1.06 (can't believe I'm still listed as this package owner)
 



From fedora-extras-commits at redhat.com  Tue Jan 17 20:56:23 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:56:23 -0500
Subject: rpms/perl-Convert-UUlib import.log,1.8,1.9
Message-ID: <200601172056.k0HKutfp032521@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32489

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-2.fc4.src.rpm
1.06 < 1.051 -> bump epoch


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	17 Jan 2006 20:53:32 -0000	1.8
+++ import.log	17 Jan 2006 20:56:23 -0000	1.9
@@ -5,3 +5,4 @@
 perl-Convert-UUlib-1_06-1_fc5:HEAD:perl-Convert-UUlib-1.06-1.fc5.src.rpm:1137452049
 perl-Convert-UUlib-1_06-1_fc4:FC-4:perl-Convert-UUlib-1.06-1.fc4.src.rpm:1137452147
 perl-Convert-UUlib-1_06-2_fc5:HEAD:perl-Convert-UUlib-1.06-2.fc5.src.rpm:1137531201
+perl-Convert-UUlib-1_06-2_fc4:FC-4:perl-Convert-UUlib-1.06-2.fc4.src.rpm:1137531372



From fedora-extras-commits at redhat.com  Tue Jan 17 20:56:29 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 15:56:29 -0500
Subject: rpms/perl-Convert-UUlib/FC-4 perl-Convert-UUlib.spec,1.10,1.11
Message-ID: <200601172057.k0HKv1xL032529@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Convert-UUlib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32489/FC-4

Modified Files:
	perl-Convert-UUlib.spec 
Log Message:
auto-import perl-Convert-UUlib-1.06-2.fc4 on branch FC-4 from perl-Convert-UUlib-1.06-2.fc4.src.rpm
1.06 < 1.051 -> bump epoch


Index: perl-Convert-UUlib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-UUlib/FC-4/perl-Convert-UUlib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Convert-UUlib.spec	16 Jan 2006 22:56:02 -0000	1.10
+++ perl-Convert-UUlib.spec	17 Jan 2006 20:56:28 -0000	1.11
@@ -2,7 +2,8 @@
 
 Name:      perl-%{rname}
 Version:   1.06
-Release:   1%{?dist}
+Epoch:     1
+Release:   2%{?dist}
 
 Summary:   Perl interface to the uulib library
 
@@ -57,6 +58,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-2
+- bump epoch to force updates
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 1.06-1
 - 1.06 (can't believe I'm still listed as this package owner)
 



From fedora-extras-commits at redhat.com  Tue Jan 17 20:59:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 15:59:58 -0500
Subject: rpms/bash-completion/devel
	bash-completion-20050721-bash31quoting.patch, NONE,
	1.1 bash-completion.spec, 1.12, 1.13
Message-ID: <200601172100.k0HL0USs032638@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32591

Modified Files:
	bash-completion.spec 
Added Files:
	bash-completion-20050721-bash31quoting.patch 
Log Message:
* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 20050721-3
- Patch to hopefully fix quoting problems with bash 3.1 (#177056).


bash-completion-20050721-bash31quoting.patch:

--- NEW FILE bash-completion-20050721-bash31quoting.patch ---
--- bash_completion/bash_completion~	2005-07-21 22:21:22.000000000 +0300
+++ bash_completion/bash_completion	2006-01-08 17:31:57.000000000 +0200
@@ -661,4 +661,4 @@
 			COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host |
-			sed -ne '/^['$'\t '']*Sharename/,/^$/p' |
-			sed -ne '3,$s|^[^A-Za-z]*\([^'$'\t '']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
+			sed -ne '/^[\t ]*Sharename/,/^$/p' |
+			sed -ne '3,$s|^[^A-Za-z]*\([^\t ]*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
 		fi
@@ -2398,5 +2398,5 @@
 	    # expand path (if present) to global known hosts file
-	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    global_kh=$( eval echo $( sed -ne 's/^[Gg][Ll][Oo][Bb][Aa][Ll][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	    # expand path (if present) to user known hosts file
-	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee]['$'\t '']*\(.*\)$/\1/p' ${config[@]} ) )
+	    user_kh=$( eval echo $( sed -ne 's/^[Uu][Ss][Ee][Rr][Kk][Nn][Oo][Ww][Nn][Hh][Oo][Ss][Tt][Ss][Ff][Ii][Ll][Ee][\t ]*\(.*\)$/\1/p' ${config[@]} ) )
 	fi
@@ -2476,3 +2476,3 @@
 	    if [ ${#config[@]} -gt 0 ] && [ -n "$aliases" ]; then
-		hosts=$( compgen -W "$( sed -ne "s/^[Hh][Oo][Ss][Tt]["$'\t '"]*\([^*?]*\)$/\1/p" ${config[@]} )" -- $ocur )
+		hosts=$( compgen -W '$( sed -ne "s/^[Hh][Oo][Ss][Tt][\t ]*\([^*?]*\)$/\1/p" ${config[@]} )' -- $ocur )
 		COMPREPLY=( ${COMPREPLY[@]} $hosts )
@@ -5860,3 +5860,3 @@
 	dict $host $port $1 2>/dev/null | sed -ne \
-	    's/^['$'\t '']['$'\t '']*\([^'$'\t '']*\).*$/\1/p'
+	    's/^[\t ][\t ]*\([^\t ]*\).*$/\1/p'
 }
--- bash_completion/contrib/sitecopy~	2005-01-03 04:44:22.000000000 +0200
+++ bash_completion/contrib/sitecopy	2006-01-08 17:35:19.000000000 +0200
@@ -20,7 +20,7 @@
 		;;
 	    *)
 		if [ -r ~/.sitecopyrc ]; then
-		    COMPREPLY=( $( compgen -W "$(grep '^["$'\t '"]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
+		    COMPREPLY=( $( compgen -W "$(grep '^[\t ]*site'  ~/.sitecopyrc | awk '{print $2}')" -- $cur ) )
 		fi
 		;;
 	esac


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- bash-completion.spec	28 Nov 2005 20:26:32 -0000	1.12
+++ bash-completion.spec	17 Jan 2006 20:59:57 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -12,6 +12,7 @@
 Source3:        %{name}-repomanage
 Source4:        %{name}-plague-client
 Patch0:         %{name}-20050721-cvs-stat.patch
+Patch1:         %{name}-20050721-bash31quoting.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,6 +26,7 @@
 %prep
 %setup -q -n bash_completion
 %patch0
+%patch1 -p1
 install -pm 644 %{SOURCE2} contrib/mock
 install -pm 644 %{SOURCE3} contrib/plague-client
 install -pm 644 %{SOURCE3} contrib/repomanage
@@ -88,6 +90,9 @@
 
 
 %changelog
+* Sun Jan  8 2006 Ville Skytt?? <ville.skytta at iki.fi> - 20050721-3
+- Patch to hopefully fix quoting problems with bash 3.1 (#177056).
+
 * Mon Nov 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 20050721-2
 - Work around potential login problem in profile.d snippet (#174355).
 



From fedora-extras-commits at redhat.com  Tue Jan 17 21:16:09 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 16:16:09 -0500
Subject: rpms/i810switch/FC-4 .cvsignore, 1.2, 1.3 i810switch.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601172116.k0HLGgnj002077@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2056

Modified Files:
	.cvsignore i810switch.spec sources 
Log Message:
make: `clog' is up to date.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	25 Jan 2005 16:49:20 -0000	1.2
+++ .cvsignore	17 Jan 2006 21:16:09 -0000	1.3
@@ -1 +1 @@
-i810switch-0.6.2.tar.gz
+i810switch-0.6.5.tar.gz


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/i810switch.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- i810switch.spec	6 Apr 2005 22:12:02 -0000	1.3
+++ i810switch.spec	17 Jan 2006 21:16:09 -0000	1.4
@@ -1,12 +1,12 @@
 Name: i810switch
-Version: 0.6.2
-Release: 4
+Version: 0.6.5
+Release: 1
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support
 License: GPL
-URL: http://vorfgglon.cwru.edu/~ames/i810switch/
-Source0: http://vorlon.cwru.edu/~ames/i810switch/i810switch-0.6.2.tar.gz
+URL: http://www16.plala.or.jp/mano-a-mano/i810switch.html
+Source0: http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz
 Patch0: i810switch-0.6.2.makefile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pciutils
@@ -37,6 +37,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 17 2006 Matt Domsch <Matt_Domsch at dell.com> - 0.6.5-1
+- update to 0.6.5, change URLs due to new upstream maintainer
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	25 Jan 2005 16:49:20 -0000	1.2
+++ sources	17 Jan 2006 21:16:09 -0000	1.3
@@ -1 +1 @@
-b31cc8fde7a36d553406339d2626d3e3  i810switch-0.6.2.tar.gz
+5ca07aee624589bdce5761c796e5f9a8  i810switch-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 21:18:04 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 16:18:04 -0500
Subject: rpms/i810switch/FC-4 i810switch.spec,1.4,1.5
Message-ID: <200601172118.k0HLIafe002155@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2115

Modified Files:
	i810switch.spec 
Log Message:
add dist tag


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/FC-4/i810switch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i810switch.spec	17 Jan 2006 21:16:09 -0000	1.4
+++ i810switch.spec	17 Jan 2006 21:18:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 1
+Release: 1%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support



From fedora-extras-commits at redhat.com  Tue Jan 17 21:18:13 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 17 Jan 2006 16:18:13 -0500
Subject: rpms/sobby/FC-4 sobby.spec,1.2,1.3
Message-ID: <200601172118.k0HLIjbf002190@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2135

Modified Files:
	sobby.spec 
Log Message:
Rebuild


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sobby.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sobby.spec	15 Dec 2005 20:19:34 -0000	1.2
+++ sobby.spec	17 Jan 2006 21:18:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           sobby
 Version:        0.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Tue Jan 17 2006 Luke Macken <lmacken at redhat.com> - 0.2.0-3
+- Rebuild
+
 * Thu Dec 15 2005 Luke Macken <lmacken at redhat.com> - 0.2.0-2
 - Regress package to 0.2.0 for FC-{3,4}
 



From fedora-extras-commits at redhat.com  Tue Jan 17 21:19:42 2006
From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch))
Date: Tue, 17 Jan 2006 16:19:42 -0500
Subject: rpms/i810switch/devel i810switch.spec,1.4,1.5
Message-ID: <200601172120.k0HLKEKt002275@cvs-int.fedora.redhat.com>

Author: mdomsch

Update of /cvs/extras/rpms/i810switch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2249

Modified Files:
	i810switch.spec 
Log Message:
add dist tag


Index: i810switch.spec
===================================================================
RCS file: /cvs/extras/rpms/i810switch/devel/i810switch.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i810switch.spec	17 Jan 2006 20:25:16 -0000	1.4
+++ i810switch.spec	17 Jan 2006 21:19:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name: i810switch
 Version: 0.6.5
-Release: 1
+Release: 1%{?dist}
 
 Summary: Utility for switching the LCD and external VGA displays on and off
 Group: User Interface/X Hardware Support



From fedora-extras-commits at redhat.com  Tue Jan 17 21:42:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 16:42:28 -0500
Subject: rpms/perl-IO-Tty/devel perl-IO-Tty.spec,1.7,1.8
Message-ID: <200601172143.k0HLh0Q5002396@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IO-Tty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2369

Modified Files:
	perl-IO-Tty.spec 
Log Message:
* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.02-4
- Rebuild, cosmetic cleanups.



Index: perl-IO-Tty.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Tty/devel/perl-IO-Tty.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-IO-Tty.spec	6 Apr 2005 22:12:45 -0000	1.7
+++ perl-IO-Tty.spec	17 Jan 2006 21:42:28 -0000	1.8
@@ -1,15 +1,12 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-IO-Tty
 Version:        1.02
-Release:        3
-
+Release:        4%{?dist}
 Summary:        Perl interface to pseudo tty's
 
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/IO-Tty/
-Source0:        http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-1.02.tar.gz
+Source0:        http://www.cpan.org/authors/id/R/RG/RGIERSIG/IO-Tty-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl
@@ -23,22 +20,20 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-  PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-  INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -49,13 +44,16 @@
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README
-%{perl_vendorarch}/auto/IO
-%{perl_vendorarch}/IO
-%{_mandir}/man3/*.3*
+%{perl_vendorarch}/auto/IO/
+%{perl_vendorarch}/IO/
+%{_mandir}/man3/IO::*ty*.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.02-4
+- Rebuild, cosmetic cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.02-3
 - rebuilt
 
 * Sun Feb  1 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.02-0.fdr.2



From fedora-extras-commits at redhat.com  Tue Jan 17 21:43:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 17 Jan 2006 16:43:32 -0500
Subject: rpms/perl-IPC-Run/devel perl-IPC-Run.spec,1.10,1.11
Message-ID: <200601172144.k0HLi4FK002453@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-IPC-Run/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2433

Modified Files:
	perl-IPC-Run.spec 
Log Message:
* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.79-3
- Rebuild, cosmetic cleanups.



Index: perl-IPC-Run.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Run/devel/perl-IPC-Run.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-IPC-Run.spec	10 Apr 2005 17:09:46 -0000	1.10
+++ perl-IPC-Run.spec	17 Jan 2006 21:43:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           perl-IPC-Run
 Version:        0.79
-Release:        2
+Release:        3%{?dist}
 Summary:        Perl module for interacting with child processes
 
 License:        GPL or Artistic
@@ -25,6 +25,7 @@
 %prep
 %setup -q -n IPC-Run-%{version}
 chmod 644 lib/IPC/*.pm lib/IPC/Run/*.pm Changes eg/*
+%{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' eg/run_daemon
 
 
 %build
@@ -38,9 +39,11 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
+rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/IPC/Run/Win32*.pm
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/IPC::Run::Win32*.3*
 
 
-%check || :
+%check
 # https://rt.cpan.org/NoAuth/Bug.html?id=11129
 [ ! -d /dev/pts ] || IPCRUNDEBUG=2 make test
 
@@ -53,12 +56,13 @@
 %defattr(-,root,root,-)
 %doc Changes TODO eg/
 %{perl_vendorlib}/IPC/
-%exclude %{perl_vendorlib}/IPC/Run/Win32*.pm
 %{_mandir}/man3/IPC::Run*.3*
-%exclude %{_mandir}/man3/IPC::Run::Win32*.3*
 
 
 %changelog
+* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.79-3
+- Rebuild, cosmetic cleanups.
+
 * Sun Apr 10 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.79-2
 - Exclude Win32 specific modules.
 - Include more docs.



From fedora-extras-commits at redhat.com  Tue Jan 17 22:24:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:24:26 -0500
Subject: rpms/torsmo - New directory
Message-ID: <200601172224.k0HMOSap004385@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377/torsmo

Log Message:
Directory /cvs/extras/rpms/torsmo added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 22:24:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:24:32 -0500
Subject: rpms/torsmo/devel - New directory
Message-ID: <200601172224.k0HMOYjP004400@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4377/torsmo/devel

Log Message:
Directory /cvs/extras/rpms/torsmo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 17 22:24:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:24:56 -0500
Subject: rpms/torsmo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601172224.k0HMOwkH004434@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4422

Added Files:
	Makefile import.log 
Log Message:
Setup of module torsmo


--- NEW FILE Makefile ---
# Top level Makefile for module torsmo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 17 22:25:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:25:03 -0500
Subject: rpms/torsmo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601172225.k0HMP4Sm004454@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4422/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module torsmo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 17 22:26:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:26:28 -0500
Subject: rpms/torsmo import.log,1.1,1.2
Message-ID: <200601172227.k0HMR0CE004533@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4496

Modified Files:
	import.log 
Log Message:
auto-import torsmo-0.18-4 on branch devel from torsmo-0.18-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/torsmo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Jan 2006 22:24:56 -0000	1.1
+++ import.log	17 Jan 2006 22:26:27 -0000	1.2
@@ -0,0 +1 @@
+torsmo-0_18-4:HEAD:torsmo-0.18-4.src.rpm:1137536740



From fedora-extras-commits at redhat.com  Tue Jan 17 22:26:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 17 Jan 2006 17:26:34 -0500
Subject: rpms/torsmo/devel torsmo.desktop, NONE, 1.1 torsmo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601172227.k0HMR75P004537@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4496/devel

Modified Files:
	.cvsignore sources 
Added Files:
	torsmo.desktop torsmo.spec 
Log Message:
auto-import torsmo-0.18-4 on branch devel from torsmo-0.18-4.src.rpm


--- NEW FILE torsmo.desktop ---
[Desktop Entry]
Name=torsmo
Comment=TyopoytaORvelo System MOnitor
Exec=torsmo
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Application;System;


--- NEW FILE torsmo.spec ---
Name:           torsmo
Version:        0.18
Release:        4%{?dist}
Summary:        TyopoytaORvelo System MOnitor

Group:          Applications/System
License:        BSD
URL:            http://torsmo.sourceforge.net/
Source0:        http://dl.sf.net/sourceforge/torsmo/torsmo-0.18.tar.gz
Source1:        torsmo.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  xorg-x11-devel
BuildRequires:  fontconfig-devel
BuildRequires:  freetype-devel
BuildRequires:  desktop-file-utils

# modular X
BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel

%description
Torsmo (TyopoytaORvelo System MOnitor) is a system monitor that sits in the
corner of your desktop. Torsmo can show various information about your system
and its peripherals. Torsmo is very light and customizable, and it renders
text on the root window.

For a sample configuration take a look torsmorc.sample.

%prep
%setup -q

%build
%configure --enable-xft --enable-proc-uptime --enable-seti \
--x-includes=%{_includedir} --x-libraries=%{_libdir}
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README readme.html torsmorc.sample
%{_bindir}/torsmo
%{_mandir}/man1/*
%{_datadir}/applications/*desktop

%changelog
* Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-4
- add dist
- fix up description

* Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-3
- add sample rc
- switch to devel BR

* Sun Jan 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
0.18-2
- Fix spec for fe inclusion
- add desktop entry

* Sat Jan 14 2006 Thomas Jansen <mithi[AT]mithi.net>
0.18-1
- Initial Release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torsmo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Jan 2006 22:25:02 -0000	1.1
+++ .cvsignore	17 Jan 2006 22:26:34 -0000	1.2
@@ -0,0 +1 @@
+torsmo-0.18.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torsmo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Jan 2006 22:25:02 -0000	1.1
+++ sources	17 Jan 2006 22:26:34 -0000	1.2
@@ -0,0 +1 @@
+88bd8f627637d785a1d681f4f15f00b6  torsmo-0.18.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 17 22:34:45 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 17 Jan 2006 17:34:45 -0500
Subject: rpms/cernlib/devel cernlib.spec,1.16,1.17
Message-ID: <200601172235.k0HMZHw1004648@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631

Modified Files:
	cernlib.spec 
Log Message:
* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12
- attempt a rebuild against newer openmotif



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cernlib.spec	22 Dec 2005 09:32:55 -0000	1.16
+++ cernlib.spec	17 Jan 2006 22:34:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       11%{?dist}.4
+Release:       12%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -712,6 +712,9 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
+* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12
+- attempt a rebuild against newer openmotif
+
 * Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11.4
 - add a symlink from /usr/lib/cernlib/2005/bin/pawX11 to /usr/bin/pawX11
 - fix gxint



From fedora-extras-commits at redhat.com  Tue Jan 17 22:39:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 17 Jan 2006 17:39:57 -0500
Subject: rpms/meld/devel meld.spec,1.11,1.12
Message-ID: <200601172240.k0HMeUvq004744@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/meld/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4725

Modified Files:
	meld.spec 
Log Message:



Index: meld.spec
===================================================================
RCS file: /cvs/extras/rpms/meld/devel/meld.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- meld.spec	13 Nov 2005 09:39:53 -0000	1.11
+++ meld.spec	17 Jan 2006 22:39:57 -0000	1.12
@@ -1,3 +1,6 @@
+# targeting FC-5
+# spec for FC-4 differs (and could be merged)
+
 Name:             meld
 Version:          1.1.2
 Release:          1%{?dist}



From fedora-extras-commits at redhat.com  Tue Jan 17 23:21:09 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:21:09 -0500
Subject: rpms/gdesklets/devel .cvsignore, 1.2, 1.3 gdesklets.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200601172321.k0HNLfCv006901@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6878

Modified Files:
	.cvsignore gdesklets.spec sources 
Log Message:

updated gdesklets.spec and added updated upstream




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
+++ .cvsignore	17 Jan 2006 23:21:09 -0000	1.3
@@ -1 +1 @@
-gDesklets-0.35.2.tar.bz2
+gDesklets-0.35.3.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdesklets.spec	5 Jan 2006 20:23:25 -0000	1.6
+++ gdesklets.spec	17 Jan 2006 23:21:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gdesklets
-Version:        0.35.2
-Release:        26%{?dist}
+Version:        0.35.3
+Release:        1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 
 URL:            http://www.gdesklets.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -39,7 +38,7 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1 
+
 
 %build
 
@@ -87,9 +86,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
 %{_bindir}/%{name}
-%{_bindir}/%{name}-display-thumbnailer
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_datadir}/pixmaps/%{name}.png
@@ -99,6 +96,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
+- Updated to 0.35.3
+- Removed thumbmail
+- Removed patch, no longer needed
+
 * Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-26.fc5
 - Minor rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 22:14:49 -0000	1.2
+++ sources	17 Jan 2006 23:21:09 -0000	1.3
@@ -1 +1 @@
-8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2
+3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 17 23:24:41 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:24:41 -0500
Subject: rpms/gdesklets/FC-4 .cvsignore, 1.2, 1.3 gdesklets.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601172325.k0HNPDiF006974@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6943

Modified Files:
	.cvsignore gdesklets.spec sources 
Log Message:

updated gdesklets.spec




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
+++ .cvsignore	17 Jan 2006 23:24:40 -0000	1.3
@@ -1 +1 @@
-gDesklets-0.35.2.tar.bz2
+gDesklets-0.35.3.tar.bz2


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
+++ gdesklets.spec	17 Jan 2006 23:24:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gdesklets
-Version:        0.35.2
-Release:        22%{?dist}
+Version:        0.35.3
+Release:        1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 
 URL:            http://gdesklets.gnomedesktop.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -37,7 +36,7 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1 
+
 
 %build
 
@@ -85,9 +84,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
 %{_bindir}/%{name}
-%{_bindir}/%{name}-display-thumbnailer
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_datadir}/pixmaps/%{name}.png
@@ -99,6 +96,11 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
+- Updated to 0.35.3
+- Removed thumbnail schema
+- Removed patch, no longer needed
+
 * Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 22:14:49 -0000	1.2
+++ sources	17 Jan 2006 23:24:40 -0000	1.3
@@ -1 +1 @@
-8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2
+3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 17 23:27:04 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:27:04 -0500
Subject: rpms/gdesklets/FC-3 gdesklets.spec,1.2,1.3
Message-ID: <200601172327.k0HNRaUW007042@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7016

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/gdesklets.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdesklets.spec	14 Dec 2005 09:51:47 -0000	1.2
+++ gdesklets.spec	17 Jan 2006 23:27:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gdesklets
-Version:        0.35.2
-Release:        22%{?dist}
+Version:        0.35.3
+Release:        1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -8,7 +8,6 @@
 
 URL:            http://gdesklets.gnomedesktop.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
-Patch0:		NullObject-1.0-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -37,7 +36,7 @@
 
 %prep
 %setup -q -n gDesklets-%{version}
-%patch0 -p1 
+
 
 %build
 
@@ -85,9 +84,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/%{name}-display-thumbnail.schemas
 %{_bindir}/%{name}
-%{_bindir}/%{name}-display-thumbnailer
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/gnome/48x48/mimetypes/*.png
 %{_datadir}/pixmaps/%{name}.png
@@ -99,6 +96,12 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
+- Updated to 0.35.3
+- Removed thumbnail schema
+- Removed patch, no longer needed
+
+
 * Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up



From fedora-extras-commits at redhat.com  Tue Jan 17 23:36:05 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 17 Jan 2006 18:36:05 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.7,1.8
Message-ID: <200601172336.k0HNacjC007213@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7171

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdesklets.spec	17 Jan 2006 23:21:09 -0000	1.7
+++ gdesklets.spec	17 Jan 2006 23:36:05 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbmail



From fedora-extras-commits at redhat.com  Tue Jan 17 23:46:31 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:46:31 -0500
Subject: rpms/dejavu-fonts import.log,1.28,1.29
Message-ID: <200601172347.k0HNl3Il007343@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-3.fc4 on branch FC-4 from dejavu-fonts-2.2-3.fc4.src.rpm
fix comparator ?


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- import.log	16 Jan 2006 20:43:26 -0000	1.28
+++ import.log	17 Jan 2006 23:46:30 -0000	1.29
@@ -25,3 +25,4 @@
 dejavu-fonts-2_2-2_fc5:HEAD:dejavu-fonts-2.2-2.fc5.src.rpm:1137436706
 dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269
 dejavu-fonts-2_2-3_fc5:HEAD:dejavu-fonts-2.2-3.fc5.src.rpm:1137444196
+dejavu-fonts-2_2-3_fc4:FC-4:dejavu-fonts-2.2-3.fc4.src.rpm:1137541581



From fedora-extras-commits at redhat.com  Tue Jan 17 23:46:36 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:46:36 -0500
Subject: rpms/dejavu-fonts/FC-4 dejavu-fonts.spec,1.8,1.9
Message-ID: <200601172347.k0HNl9Z7007346@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311/FC-4

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-3.fc4 on branch FC-4 from dejavu-fonts-2.2-3.fc4.src.rpm
fix comparator ?


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dejavu-fonts.spec	16 Jan 2006 18:46:04 -0000	1.8
+++ dejavu-fonts.spec	17 Jan 2006 23:46:36 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,7 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Conflicts: fontconfig > = 2.3.0
+Conflicts: fontconfig >= 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -62,6 +62,9 @@
 %ghost %{fontdir}/fonts.cache-1
 
 %changelog
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-3
+- > = -> >=
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
 - Seems FC-4 and FC-3 have the same needs after all
 



From fedora-extras-commits at redhat.com  Tue Jan 17 23:50:46 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:50:46 -0500
Subject: rpms/dejavu-fonts import.log,1.29,1.30
Message-ID: <200601172351.k0HNpJJm007470@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7438

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.2-3.fc3 on branch FC-3 from dejavu-fonts-2.2-3.fc3.src.rpm
fix comparator ?


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- import.log	17 Jan 2006 23:46:30 -0000	1.29
+++ import.log	17 Jan 2006 23:50:46 -0000	1.30
@@ -26,3 +26,4 @@
 dejavu-fonts-2_2-2_fc3:FC-3:dejavu-fonts-2.2-2.fc3.src.rpm:1137437269
 dejavu-fonts-2_2-3_fc5:HEAD:dejavu-fonts-2.2-3.fc5.src.rpm:1137444196
 dejavu-fonts-2_2-3_fc4:FC-4:dejavu-fonts-2.2-3.fc4.src.rpm:1137541581
+dejavu-fonts-2_2-3_fc3:FC-3:dejavu-fonts-2.2-3.fc3.src.rpm:1137541836



From fedora-extras-commits at redhat.com  Tue Jan 17 23:50:52 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 18:50:52 -0500
Subject: rpms/dejavu-fonts/FC-3 dejavu-fonts.spec,1.8,1.9
Message-ID: <200601172351.k0HNpO6N007473@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7438/FC-3

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.2-3.fc3 on branch FC-3 from dejavu-fonts-2.2-3.fc3.src.rpm
fix comparator ?


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-3/dejavu-fonts.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dejavu-fonts.spec	16 Jan 2006 18:48:05 -0000	1.8
+++ dejavu-fonts.spec	17 Jan 2006 23:50:52 -0000	1.9
@@ -3,7 +3,7 @@
 
 Name:      dejavu-fonts
 Version:   2.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 Summary:   DejaVu Fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -11,7 +11,7 @@
 Source:    http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Conflicts: fontconfig > = 2.3.0
+Conflicts: fontconfig >= 2.3.0
 
 %description
 The DejaVu fonts are a font family based on the Bitstream Vera Fonts release
@@ -62,6 +62,9 @@
 %ghost %{fontdir}/fonts.cache-1
 
 %changelog
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-3
+- > = -> >=
+
 * Mon Jan 16 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> 2.2-2
 - Seems FC-4 and FC-3 have the same needs after all
 



From fedora-extras-commits at redhat.com  Wed Jan 18 00:02:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 17 Jan 2006 19:02:53 -0500
Subject: owners owners.list,1.543,1.544
Message-ID: <200601180003.k0I03PXG009276@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226

Modified Files:
	owners.list 
Log Message:
New maintainer of perl-Mail-Sendmail, perl-Net-SSLeay, perl-IO-Socket-SSL,
perl-IPC-SharedCache (ville -> jpo).



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -r1.543 -r1.544
--- owners.list	17 Jan 2006 20:22:40 -0000	1.543
+++ owners.list	18 Jan 2006 00:02:52 -0000	1.544
@@ -838,14 +838,14 @@
 Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-ShareLite|Light-weight Perl interface to shared memory|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -858,7 +858,7 @@
 Fedora Extras|perl-Mail-GnuPG|Process email with GPG|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Mbox-MessageParser|A fast and simple mbox folder reader|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -878,7 +878,7 @@
 Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-SSH|Perl extension for secure shell|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-SSLeay|Perl extension for using OpenSSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Jan 18 00:06:57 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 19:06:57 -0500
Subject: rpms/lzop import.log,1.4,1.5
Message-ID: <200601180008.k0I08pk9009347@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9312

Modified Files:
	import.log 
Log Message:
auto-import lzop-1.01-4.fc5 on branch devel from lzop-1.01-4.fc5.src.rpm
gcc 4.1 fest


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lzop/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:50:43 -0000	1.4
+++ import.log	18 Jan 2006 00:06:57 -0000	1.5
@@ -1,3 +1,4 @@
 lzop-1_01-0_fdr_1_rh90:HEAD:lzop-1.01-0.fdr.1.rh90.src.rpm:1099889431
 lzop-1_01-0_fdr_1_1:HEAD:lzop-1.01-0.fdr.1.1.src.rpm:1099889437
 lzop-1_01-0_fdr_1_2:HEAD:lzop-1.01-0.fdr.1.2.src.rpm:1099889443
+lzop-1_01-4_fc5:HEAD:lzop-1.01-4.fc5.src.rpm:1137542768



From fedora-extras-commits at redhat.com  Wed Jan 18 00:07:32 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Tue, 17 Jan 2006 19:07:32 -0500
Subject: rpms/lzop/devel lzop.spec,1.7,1.8
Message-ID: <200601180008.k0I08pnN009346@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9312/devel

Modified Files:
	lzop.spec 
Log Message:
auto-import lzop-1.01-4.fc5 on branch devel from lzop-1.01-4.fc5.src.rpm
gcc 4.1 fest


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lzop.spec	22 May 2005 23:49:12 -0000	1.7
+++ lzop.spec	18 Jan 2006 00:07:32 -0000	1.8
@@ -1,6 +1,6 @@
 Name: lzop
 Version: 1.01
-Release: 3
+Release: 4%{?dist}
 
 Summary: Real-time file compressor
 
@@ -43,6 +43,9 @@
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.01-4
+- gcc 4.1 build time
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.01-3
 - rebuild on all arches
 
@@ -50,7 +53,7 @@
 - rebuilt
 
 * Tue Apr 20 2004 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0:1.01-0.fdr.1
-* Fedorization
+- Fedorization
 
 * Tue Mar 09 2004 Dag Wieers <dag at wieers.com> - 1.01-1
 - Initial package. (using DAR)



From fedora-extras-commits at redhat.com  Wed Jan 18 02:14:09 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 17 Jan 2006 21:14:09 -0500
Subject: rpms/mod_security/devel .cvsignore, 1.3, 1.4 mod_security.spec, 1.9,
	1.10 sources, 1.4, 1.5
Message-ID: <200601180214.k0I2EfkF013114@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13093

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 08:39:23 -0000	1.3
+++ .cvsignore	18 Jan 2006 02:14:08 -0000	1.4
@@ -1 +1 @@
-modsecurity-apache-1.9.tar.gz
+modsecurity-apache-1.9.2.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_security.spec	15 Dec 2005 22:36:12 -0000	1.9
+++ mod_security.spec	18 Jan 2006 02:14:08 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.1
-Release: 2%{?dist}
+Version: 1.9.2
+Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
@@ -40,6 +40,9 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
+- New upstream release
+
 * Fri Dec 16 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-2
 - Bump for new httpd
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 11:32:58 -0000	1.4
+++ sources	18 Jan 2006 02:14:08 -0000	1.5
@@ -1 +1 @@
-d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz
+c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 03:08:09 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 17 Jan 2006 22:08:09 -0500
Subject: rpms/mod_security/FC-4 .cvsignore, 1.4, 1.5 mod_security.spec, 1.5, 
	1.6 sources, 1.4, 1.5
Message-ID: <200601180308.k0I38fHY015052@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Dec 2005 11:29:03 -0000	1.4
+++ .cvsignore	18 Jan 2006 03:08:08 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.1.tar.gz
+modsecurity-apache-1.9.2.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mod_security.spec	1 Dec 2005 11:29:03 -0000	1.5
+++ mod_security.spec	18 Jan 2006 03:08:08 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.1
+Version: 1.9.2
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -40,6 +40,12 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
+- New upstream release
+
+* Fri Dec 16 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-2
+- Bump for new httpd
+
 * Thu Dec 1 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-1
 - New release 1.9.1 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 11:29:03 -0000	1.4
+++ sources	18 Jan 2006 03:08:08 -0000	1.5
@@ -1 +1 @@
-d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz
+c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 03:12:43 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 17 Jan 2006 22:12:43 -0500
Subject: rpms/mod_security/FC-3 .cvsignore, 1.3, 1.4 mod_security.spec, 1.8, 
	1.9 sources, 1.4, 1.5
Message-ID: <200601180313.k0I3DW2l015171@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15119

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
- New upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:46:13 -0000	1.3
+++ .cvsignore	18 Jan 2006 03:12:42 -0000	1.4
@@ -1 +1 @@
-modsecurity-apache-1.9.tar.gz
+modsecurity-apache-1.9.2.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mod_security.spec	1 Dec 2005 11:31:52 -0000	1.8
+++ mod_security.spec	18 Jan 2006 03:12:42 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.1
+Version: 1.9.2
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -40,6 +40,12 @@
 %config(noreplace) /etc/httpd/conf.d/mod_security.conf
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
+- New upstream release
+
+* Fri Dec 16 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-2
+- Bump for new httpd
+
 * Thu Dec 1 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.1-1
 - New release 1.9.1 
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Dec 2005 11:31:52 -0000	1.4
+++ sources	18 Jan 2006 03:12:42 -0000	1.5
@@ -1 +1 @@
-d648ba26b1dba708a06344072bea984c  modsecurity-apache-1.9.1.tar.gz
+c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 05:05:31 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 00:05:31 -0500
Subject: rpms/fyre/FC-3 fyre.spec,1.9,1.10
Message-ID: <200601180507.k0I57853020818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20770/FC-3

Modified Files:
	fyre.spec 
Log Message:
Move chkconfig and service to %%preun (#178129)


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-3/fyre.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fyre.spec	1 Dec 2005 10:54:36 -0000	1.9
+++ fyre.spec	18 Jan 2006 05:05:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -14,7 +14,8 @@
 
 BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
 Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): desktop-file-utils shared-mime-info
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -54,14 +55,16 @@
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+%preun
 if [ $1 = 0 ]; then
  /sbin/chkconfig --del fyre-cluster
  /sbin/service fyre-cluster stop >> /dev/null
 fi
 
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -75,6 +78,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-11
+- Move chkconfig and service to %%preun (#178129)
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams <ivazquez ivazquez net> 1.0.0-10
 - Fix NLS in initscript
 



From fedora-extras-commits at redhat.com  Wed Jan 18 05:05:53 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 00:05:53 -0500
Subject: rpms/fyre/FC-4 fyre.spec,1.10,1.11
Message-ID: <200601180507.k0I578sp020817@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20770/FC-4

Modified Files:
	fyre.spec 
Log Message:
Move chkconfig and service to %%preun (#178129)


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/FC-4/fyre.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fyre.spec	1 Dec 2005 10:54:42 -0000	1.10
+++ fyre.spec	18 Jan 2006 05:05:53 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -14,7 +14,8 @@
 
 BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
 Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): desktop-file-utils shared-mime-info
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -54,14 +55,16 @@
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+%preun
 if [ $1 = 0 ]; then
  /sbin/chkconfig --del fyre-cluster
  /sbin/service fyre-cluster stop >> /dev/null
 fi
 
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -75,6 +78,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-11
+- Move chkconfig and service to %%preun (#178129)
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams <ivazquez ivazquez net> 1.0.0-10
 - Fix NLS in initscript
 



From fedora-extras-commits at redhat.com  Wed Jan 18 05:06:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 00:06:33 -0500
Subject: rpms/fyre/devel fyre.spec,1.11,1.12
Message-ID: <200601180507.k0I57BT1020823@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/fyre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20770/devel

Modified Files:
	fyre.spec 
Log Message:
Move chkconfig and service to %%preun (#178129)


Index: fyre.spec
===================================================================
RCS file: /cvs/extras/rpms/fyre/devel/fyre.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fyre.spec	1 Dec 2005 10:36:31 -0000	1.11
+++ fyre.spec	18 Jan 2006 05:06:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           fyre
 Version:        1.0.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 
 Summary:        A tool for creating artwork from chaotic functions
 Group:          Amusements/Graphics
@@ -14,7 +14,8 @@
 
 BuildRequires:  libglade2-devel desktop-file-utils gnet2-devel OpenEXR-devel
 Requires(post): desktop-file-utils shared-mime-info initscripts chkconfig
-Requires(postun): desktop-file-utils shared-mime-info initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): desktop-file-utils shared-mime-info
 
 %description
 Fyre is a tool for producing computational artwork based on histograms of
@@ -54,14 +55,16 @@
 /sbin/chkconfig --add fyre-cluster
 /sbin/service fyre-cluster condrestart >> /dev/null
 
-%postun
-update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database &> /dev/null || :
+%preun
 if [ $1 = 0 ]; then
  /sbin/chkconfig --del fyre-cluster
  /sbin/service fyre-cluster stop >> /dev/null
 fi
 
+%postun
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
@@ -75,6 +78,9 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/fyre
 
 %changelog
+* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-12
+- Move chkconfig and service to %%preun (#178129)
+
 * Thu Dec  1 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.0-11
 - Fix NLS in initscript
 



From fedora-extras-commits at redhat.com  Wed Jan 18 07:13:29 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 02:13:29 -0500
Subject: rpms/php-json/devel php-json.spec,1.2,1.3
Message-ID: <200601180714.k0I7E10X024884@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24866

Modified Files:
	php-json.spec 
Log Message:
Rebuild for new PHP


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-json.spec	31 Dec 2005 11:28:39 -0000	1.2
+++ php-json.spec	18 Jan 2006 07:13:28 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           php-json
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -63,5 +63,8 @@
 %{php_extdir}/json.so
 
 %changelog
+* Wed Jan 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.0-2
+- Rebuild for new PHP
+
 * Fri Dec 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.0-1
 - Initial RPM release



From fedora-extras-commits at redhat.com  Wed Jan 18 08:16:58 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 18 Jan 2006 03:16:58 -0500
Subject: rpms/fbida/devel fbida.spec,1.9,1.10
Message-ID: <200601180817.k0I8HVZE026930@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26913

Modified Files:
	fbida.spec 
Log Message:
* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-7
- moved file Ida to %{_datadir}/X11/app-defaults



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fbida.spec	24 Nov 2005 08:19:46 -0000	1.9
+++ fbida.spec	18 Jan 2006 08:16:58 -0000	1.10
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -58,6 +58,7 @@
 %{__mv} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
+%{__mv} %{buildroot}%{_sysconfdir}/X11 %{buildroot}%{_datadir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -74,7 +75,7 @@
 %defattr(-, root, root, -)
 %doc %{_mandir}/man1/ida*
 %{_bindir}/ida
-%config %{_prefix}/lib/X11/app-defaults/Ida
+%config %{_datadir}/X11/app-defaults/Ida
 
 %files fbgs
 %defattr(-, root, root, -)
@@ -82,6 +83,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-7
+- moved file Ida to %%{_datadir}/X11/app-defaults
+
 * Thu Nov 24 2005 Adrian Reber <adrian at lisas.de> - 2.03-6
 - updated for modular xorg-x11
 



From fedora-extras-commits at redhat.com  Wed Jan 18 09:32:35 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 18 Jan 2006 04:32:35 -0500
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.3,1.4
Message-ID: <200601180933.k0I9X80s029538@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29521

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdesklets.spec	17 Jan 2006 23:24:40 -0000	1.3
+++ gdesklets.spec	18 Jan 2006 09:32:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbnail schema



From fedora-extras-commits at redhat.com  Wed Jan 18 10:27:44 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:27:44 -0500
Subject: rpms/SIBsim4 - New directory
Message-ID: <200601181027.k0IARkBW031667@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31659/SIBsim4

Log Message:
Directory /cvs/extras/rpms/SIBsim4 added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 10:27:49 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:27:49 -0500
Subject: rpms/SIBsim4/devel - New directory
Message-ID: <200601181027.k0IARqvv031682@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31659/SIBsim4/devel

Log Message:
Directory /cvs/extras/rpms/SIBsim4/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:08 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:08 -0500
Subject: rpms/SIBsim4 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601181028.k0IASAKA031716@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31704

Added Files:
	Makefile import.log 
Log Message:
Setup of module SIBsim4


--- NEW FILE Makefile ---
# Top level Makefile for module SIBsim4
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:14 -0500
Subject: rpms/SIBsim4/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601181028.k0IASGAp031736@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31704/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module SIBsim4


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:45 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:45 -0500
Subject: rpms/SIBsim4 import.log,1.1,1.2
Message-ID: <200601181029.k0IATHfn031805@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31770

Modified Files:
	import.log 
Log Message:
auto-import SIBsim4-0.9-1 on branch devel from SIBsim4-0.9-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jan 2006 10:28:08 -0000	1.1
+++ import.log	18 Jan 2006 10:28:45 -0000	1.2
@@ -0,0 +1 @@
+SIBsim4-0_9-1:HEAD:SIBsim4-0.9-1.src.rpm:1137580118



From fedora-extras-commits at redhat.com  Wed Jan 18 10:28:51 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:28:51 -0500
Subject: rpms/SIBsim4/devel SIBsim4.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601181029.k0IATN6R031809@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/SIBsim4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31770/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SIBsim4.spec 
Log Message:
auto-import SIBsim4-0.9-1 on branch devel from SIBsim4-0.9-1.src.rpm


--- NEW FILE SIBsim4.spec ---
Name:           SIBsim4
Version:        0.9
Release:        1%{?dist}
Summary:        Align expressed RNA sequences on a DNA template
Group:          Applications/Engineering
License:        GPL
URL:            http://sibsim4.sourceforge.net
Source0:        http://dl.sf.net/sibsim4/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


%description
SIBsim4 is a modified version of the sim4 program, which is a
similarity-based tool for aligning an expressed DNA sequence (EST,
mRNA) with a genomic sequence.


%prep
%setup -q


%build
make %{?_smp_mflags} OPT="$RPM_OPT_FLAGS" LIBS=-lm


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
install -m 755 SIBsim4 $RPM_BUILD_ROOT/%{_bindir}/
install -m 644 SIBsim4.1 $RPM_BUILD_ROOT/%{_mandir}/man1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT
%{_bindir}/*
%{_mandir}/man1/*


%changelog
* Wed Jan 18 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9-1
- Add LIBS=-lm.

* Fri Jan 13 2006 Christian Iseli <Christian.Iseli at licr.org> 0.9-0
- Version 0.9.

* Wed Aug 27 2004 Christian Iseli <Christian.Iseli at licr.org>
- Version 0.8.

* Wed Jun 23 2004 Christian Iseli <Christian.Iseli at licr.org>
- Version 0.7.

* Thu May 27 2004 Christian Iseli <Christian.Iseli at licr.org>
- Version 0.6.

* Fri Apr 30 2004 Christian Iseli <Christian.Iseli at licr.org>
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2006 10:28:14 -0000	1.1
+++ .cvsignore	18 Jan 2006 10:28:51 -0000	1.2
@@ -0,0 +1 @@
+SIBsim4-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SIBsim4/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2006 10:28:14 -0000	1.1
+++ sources	18 Jan 2006 10:28:51 -0000	1.2
@@ -0,0 +1 @@
+6d086c4cfd2e5b270d6ea6a5dec099b3  SIBsim4-0.9.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 10:34:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 18 Jan 2006 05:34:03 -0500
Subject: owners owners.list,1.544,1.545
Message-ID: <200601181034.k0IAYaHx031895@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31878

Modified Files:
	owners.list 
Log Message:
Add SIBsim4 package.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -r1.544 -r1.545
--- owners.list	18 Jan 2006 00:02:52 -0000	1.544
+++ owners.list	18 Jan 2006 10:34:03 -0000	1.545
@@ -1145,6 +1145,7 @@
 Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org|
 Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|silky|Silky is an easy-to-use graphical SILC client|toniw at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|SIMVoleon|Volume rendering library for Coin|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 10:52:58 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 18 Jan 2006 05:52:58 -0500
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.6,
	1.7 perl-Params-Util.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601181053.k0IArUib032039@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32016

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 14:36:54 -0000	1.6
+++ .cvsignore	18 Jan 2006 10:52:58 -0000	1.7
@@ -1 +1 @@
-Params-Util-0.09.tar.gz
+Params-Util-0.10.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Util.spec	11 Jan 2006 14:36:54 -0000	1.5
+++ perl-Params-Util.spec	18 Jan 2006 10:52:58 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.09
+Version: 	0.10
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 14:36:54 -0000	1.6
+++ sources	18 Jan 2006 10:52:58 -0000	1.7
@@ -1 +1 @@
-5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz
+1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 10:53:45 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 18 Jan 2006 05:53:45 -0500
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.6,
	1.7 perl-Params-Util.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601181054.k0IAsIgw032066@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32045

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 14:36:48 -0000	1.6
+++ .cvsignore	18 Jan 2006 10:53:44 -0000	1.7
@@ -1 +1 @@
-Params-Util-0.09.tar.gz
+Params-Util-0.10.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/perl-Params-Util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Util.spec	11 Jan 2006 14:36:48 -0000	1.5
+++ perl-Params-Util.spec	18 Jan 2006 10:53:44 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.09
+Version: 	0.10
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 14:36:48 -0000	1.6
+++ sources	18 Jan 2006 10:53:44 -0000	1.7
@@ -1 +1 @@
-5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz
+1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 10:55:24 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 18 Jan 2006 05:55:24 -0500
Subject: rpms/perl-Params-Util/FC-3 .cvsignore, 1.6,
	1.7 perl-Params-Util.spec, 1.5, 1.6 sources, 1.6, 1.7
Message-ID: <200601181055.k0IAtvgT032095@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Util/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32072

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 14:36:42 -0000	1.6
+++ .cvsignore	18 Jan 2006 10:55:24 -0000	1.7
@@ -1 +1 @@
-Params-Util-0.09.tar.gz
+Params-Util-0.10.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/perl-Params-Util.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Util.spec	11 Jan 2006 14:36:42 -0000	1.5
+++ perl-Params-Util.spec	18 Jan 2006 10:55:24 -0000	1.6
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.09
+Version: 	0.10
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Wed Jan 11 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 14:36:42 -0000	1.6
+++ sources	18 Jan 2006 10:55:24 -0000	1.7
@@ -1 +1 @@
-5e96d49ff78a4fd1d96d754051ff820b  Params-Util-0.09.tar.gz
+1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 12:30:36 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Wed, 18 Jan 2006 07:30:36 -0500
Subject: rpms/streamtuner/FC-4 streamtuner.spec,1.6,1.7
Message-ID: <200601181231.k0ICV8s2003403@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3386

Modified Files:
	streamtuner.spec 
Log Message:
only a sync of the version number with the increased one from FC3


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/FC-4/streamtuner.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- streamtuner.spec	7 Jan 2006 10:13:24 -0000	1.6
+++ streamtuner.spec	18 Jan 2006 12:30:35 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 9%{?dist}
+Release: 11%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-11
+- only a sync of the version number with the increased one from FC3
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
 - desktop-file-utils dependency removed from requires(post) and requires(postun)  
 



From fedora-extras-commits at redhat.com  Wed Jan 18 12:33:51 2006
From: fedora-extras-commits at redhat.com (Matthias Haase (endur))
Date: Wed, 18 Jan 2006 07:33:51 -0500
Subject: rpms/streamtuner/devel streamtuner.spec,1.4,1.5
Message-ID: <200601181234.k0ICYNbp003478@cvs-int.fedora.redhat.com>

Author: endur

Update of /cvs/extras/rpms/streamtuner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3461

Modified Files:
	streamtuner.spec 
Log Message:
only a sync of the version number with the increased one from FC3


Index: streamtuner.spec
===================================================================
RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- streamtuner.spec	7 Jan 2006 10:23:02 -0000	1.4
+++ streamtuner.spec	18 Jan 2006 12:33:51 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A stream directory browser
 Name: streamtuner
 Version: 0.99.99
-Release: 9%{?dist}
+Release: 11%{?dist}
 URL: http://streamtuner.sourceforge.net
 Source0: http://download.savannah.nongnu.org/releases/streamtuner/streamtuner-0.99.99.tar.gz
 Source1: %{name}.png
@@ -116,6 +116,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-11
+- only a sync of the version number with the increased one from FC3
+
 * Sat Jan  7 2006 Matthias Haase <matthias_haase at bennewitz.com> - 0.99.99-9
 - desktop-file-utils dependency removed from requires(post) and requires(postun)  
 



From fedora-extras-commits at redhat.com  Wed Jan 18 13:27:50 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 18 Jan 2006 08:27:50 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.7, 1.8 mlmmj.spec, 1.17, 1.18 sources,
	1.7, 1.8
Message-ID: <200601181328.k0IDSMw1005475@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5454

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
- New upstream release. 1.2.9 has a serious bug in find_email_adr(), all
  should upgrade.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Dec 2005 00:06:39 -0000	1.7
+++ .cvsignore	18 Jan 2006 13:27:50 -0000	1.8
@@ -1 +1 @@
-mlmmj-1.2.9.tar.bz2
+mlmmj-1.2.10.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mlmmj.spec	15 Dec 2005 07:43:52 -0000	1.17
+++ mlmmj.spec	18 Jan 2006 13:27:50 -0000	1.18
@@ -2,8 +2,8 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.9
-Release: 2.1%{?dist}
+Version: 1.2.10
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2
@@ -48,6 +48,10 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
+- New upstream release. 1.2.9 has a serious bug in find_email_adr(), all
+  should upgrade.
+
 * Thu Dec 15 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.9-2.1
 - New upstream stable release
 - Fix Release tag


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Dec 2005 00:06:39 -0000	1.7
+++ sources	18 Jan 2006 13:27:50 -0000	1.8
@@ -1 +1 @@
-6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2
+09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 13:33:23 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 18 Jan 2006 08:33:23 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.6, 1.7 mlmmj.spec, 1.13, 1.14 sources,
	1.6, 1.7
Message-ID: <200601181333.k0IDXt8q005551@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5528

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
- New upstream release. All users should upgrade.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Dec 2005 23:41:35 -0000	1.6
+++ .cvsignore	18 Jan 2006 13:33:22 -0000	1.7
@@ -1 +1 @@
-mlmmj-1.2.9.tar.bz2
+mlmmj-1.2.10.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mlmmj.spec	14 Dec 2005 23:41:35 -0000	1.13
+++ mlmmj.spec	18 Jan 2006 13:33:22 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.9
+Version: 1.2.10
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
+- New upstream release. All users should upgrade.
+
 * Thu Dec 15 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.9-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Dec 2005 23:41:35 -0000	1.6
+++ sources	18 Jan 2006 13:33:22 -0000	1.7
@@ -1 +1 @@
-6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2
+09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 13:35:52 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Wed, 18 Jan 2006 08:35:52 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.6, 1.7 mlmmj.spec, 1.13, 1.14 sources,
	1.6, 1.7
Message-ID: <200601181336.k0IDaPFR005658@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5633

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
- New upstream release. All users should upgrade.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Dec 2005 07:51:53 -0000	1.6
+++ .cvsignore	18 Jan 2006 13:35:52 -0000	1.7
@@ -1 +1 @@
-mlmmj-1.2.9.tar.bz2
+mlmmj-1.2.10.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mlmmj.spec	15 Dec 2005 07:51:53 -0000	1.13
+++ mlmmj.spec	18 Jan 2006 13:35:52 -0000	1.14
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.9
+Version: 1.2.10
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
+- New upstream release. All users should upgrade.
+
 * Thu Dec 15 2005 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.9-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Dec 2005 07:51:53 -0000	1.6
+++ sources	18 Jan 2006 13:35:52 -0000	1.7
@@ -1 +1 @@
-6011ba93fa907289b4ed3d4c3552a90e  mlmmj-1.2.9.tar.bz2
+09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2



From fedora-extras-commits at redhat.com  Wed Jan 18 13:38:16 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 08:38:16 -0500
Subject: rpms/synce-trayicon/devel synce-trayicon.spec,1.2,1.3
Message-ID: <200601181338.k0IDcmh8005719@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/synce-trayicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5702

Modified Files:
	synce-trayicon.spec 
Log Message:
- bump release



Index: synce-trayicon.spec
===================================================================
RCS file: /cvs/extras/rpms/synce-trayicon/devel/synce-trayicon.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- synce-trayicon.spec	13 Dec 2005 23:21:19 -0000	1.2
+++ synce-trayicon.spec	18 Jan 2006 13:38:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           synce-trayicon
 Version:        0.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tray icon for use with gnome and synce
 
 Group:          Applications/Communications
@@ -53,6 +53,10 @@
 %{_datadir}/applications/*
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-5
+- bump release
+
 * Wed Dec 14 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.0-4
 - add dist



From fedora-extras-commits at redhat.com  Wed Jan 18 13:43:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 08:43:50 -0500
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 sylpheed-claws.spec, 1.32, 1.33
Message-ID: <200601181344.k0IDiMgF005829@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5801

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	9 Jan 2006 07:52:38 -0000	1.13
+++ .cvsignore	18 Jan 2006 13:43:50 -0000	1.14
@@ -1 +1 @@
-sylpheed-claws-2.0.0-rc3.tar.bz2
+sylpheed-claws-2.0.0-rc4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	9 Jan 2006 07:52:38 -0000	1.14
+++ sources	18 Jan 2006 13:43:50 -0000	1.15
@@ -1 +1 @@
-105875aa5c853f47c38996bd8820a49e  sylpheed-claws-2.0.0-rc3.tar.bz2
+a3efc6cedbd36cfd3f5f636f76cad61c  sylpheed-claws-2.0.0-rc4.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sylpheed-claws.spec	9 Jan 2006 07:52:38 -0000	1.32
+++ sylpheed-claws.spec	18 Jan 2006 13:43:50 -0000	1.33
@@ -2,12 +2,12 @@
 
 Name:           sylpheed-claws
 Version:        2.0.0
-Release:        0.rc3%{?dist}
+Release:        0.rc4%{?dist}
 Summary:        The bleeding edge branch of Sylpheed
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
-Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc3.tar.bz2
+Source0:        http://claws.sylpheed.org/snapshots/sylpheed-claws-2.0.0-rc4.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -47,7 +47,7 @@
 for development with %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}-rc3
+%setup -q -n %{name}-%{version}-rc4
 
 %build
 #%if %openssl_pc
@@ -82,7 +82,7 @@
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
-%{__install} %{_builddir}/%{name}-%{version}-rc3/sylpheed-claws.png \
+%{__install} %{_builddir}/%{name}-%{version}-rc4/sylpheed-claws.png \
 ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
 %clean
@@ -113,6 +113,10 @@
 %{_libdir}/sylpheed-claws/plugins/*deps
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.0.0-0.rc4
+- version upgrade
+
 * Mon Jan 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-0.rc3
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Jan 18 13:44:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 08:44:43 -0500
Subject: rpms/libopensync-plugin-evolution2/devel
	libopensync-plugin-evolution2.spec, 1.2, 1.3
Message-ID: <200601181345.k0IDjG1k005930@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libopensync-plugin-evolution2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5835

Modified Files:
	libopensync-plugin-evolution2.spec 
Log Message:
- bump release



Index: libopensync-plugin-evolution2.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-evolution2/devel/libopensync-plugin-evolution2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libopensync-plugin-evolution2.spec	13 Dec 2005 14:57:50 -0000	1.2
+++ libopensync-plugin-evolution2.spec	18 Jan 2006 13:44:43 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-evolution2
 Version:        0.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Evolution 2 plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -58,6 +58,9 @@
 %{_includedir}/opensync-1.0/opensync/evo2_sync.h
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-4
+- bump release
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
 - add dist
 



From fedora-extras-commits at redhat.com  Wed Jan 18 13:51:47 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 18 Jan 2006 08:51:47 -0500
Subject: fedora-security/audit fc4,1.130,1.131 fc5,1.41,1.42
Message-ID: <200601181351.k0IDplIn006008@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5988

Modified Files:
	fc4 fc5 
Log Message:
Note the new thunderbird issue doesn't affect us.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- fc4	17 Jan 2006 16:12:05 -0000	1.130
+++ fc4	18 Jan 2006 13:51:40 -0000	1.131
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERALBE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
 CVE-2006-0200 version (aaph, 5.1.0 5.1.1 only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- fc5	17 Jan 2006 17:11:08 -0000	1.41
+++ fc5	18 Jan 2006 13:51:40 -0000	1.42
@@ -15,6 +15,7 @@
 
 ** are items that need attention
 
+CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERABLE (php)
 CVE-2006-0207 VULNERABLE (php)
 CVE-2006-0200 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Wed Jan 18 13:56:45 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:56:45 -0500
Subject: rpms/jakarta-commons-cli - New directory
Message-ID: <200601181356.k0IDulkb006071@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/jakarta-commons-cli

Log Message:
Directory /cvs/extras/rpms/jakarta-commons-cli added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 13:56:51 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:56:51 -0500
Subject: rpms/jakarta-commons-cli/devel - New directory
Message-ID: <200601181356.k0IDurk7006086@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6063/jakarta-commons-cli/devel

Log Message:
Directory /cvs/extras/rpms/jakarta-commons-cli/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:09 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:09 -0500
Subject: rpms/jakarta-commons-cli Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601181357.k0IDvBV8006124@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6112

Added Files:
	Makefile import.log 
Log Message:
Setup of module jakarta-commons-cli


--- NEW FILE Makefile ---
# Top level Makefile for module jakarta-commons-cli
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:15 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:15 -0500
Subject: rpms/jakarta-commons-cli/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601181357.k0IDvHkx006144@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6112/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module jakarta-commons-cli


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:52 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:52 -0500
Subject: rpms/jakarta-commons-cli import.log,1.1,1.2
Message-ID: <200601181358.k0IDwOJJ006220@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6183

Modified Files:
	import.log 
Log Message:
auto-import jakarta-commons-cli-1.0-6jpp_5 on branch devel from jakarta-commons-cli-1.0-6jpp_5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jan 2006 13:57:08 -0000	1.1
+++ import.log	18 Jan 2006 13:57:52 -0000	1.2
@@ -0,0 +1 @@
+jakarta-commons-cli-1_0-6jpp_5:HEAD:jakarta-commons-cli-1.0-6jpp_5.src.rpm:1137592664



From fedora-extras-commits at redhat.com  Wed Jan 18 13:57:58 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 08:57:58 -0500
Subject: rpms/jakarta-commons-cli/devel jakarta-commons-cli-crosslink.patch, 
	NONE, 1.1 jakarta-commons-cli.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601181358.k0IDwUB6006224@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/jakarta-commons-cli/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6183/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jakarta-commons-cli-crosslink.patch jakarta-commons-cli.spec 
Log Message:
auto-import jakarta-commons-cli-1.0-6jpp_5 on branch devel from jakarta-commons-cli-1.0-6jpp_5.src.rpm

jakarta-commons-cli-crosslink.patch:

--- NEW FILE jakarta-commons-cli-crosslink.patch ---
--- build.xml~	2002-11-06 07:10:24.000000000 +0200
+++ build.xml	2003-10-12 22:24:53.000000000 +0300
@@ -9,7 +9,9 @@
   <property name="distdir" value="dist"></property>
   <property name="javadocdir" value="target/docs/apidocs"></property>
   <property name="final.name" value="commons-cli-1.0-beta-2-dev"></property>
-  
+  <property name="j2se.javadoc"
+    value="http://java.sun.com/j2se/1.4/docs/api/"/>
+
   <target name="init" description="o Initializes some properties">
 
     <condition property="noget">
@@ -121,6 +123,7 @@
         </fileset>
         <pathelement location="target/${final.name}.jar"></pathelement>
       </classpath>
+      <link href="${j2se.javadoc}"/>
     </javadoc>
  
   </target>
@@ -155,4 +158,4 @@
   </target>
 
 </project>
-    
\ No newline at end of file
+    


--- NEW FILE jakarta-commons-cli.spec ---
%define base_name       cli
%define short_name      commons-%{base_name}
%define name            jakarta-%{short_name}
%define section         devel

Name:           %{name}
Version:        1.0
Release:        6jpp_5%{?dist}
Epoch:          0
Summary:        Command Line Interface Library for Java
License:        Apache Software License
Group:          Development/Libraries
URL:            http://jakarta.apache.org/commons/cli/
Source:         http://archive.apache.org/dist/jakarta/commons/cli/source/cli-1.0-src.tar.gz
Patch0:         %{name}-crosslink.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildRequires:  ant >= 0:1.6, ant-junit >= 0:1.6, junit, jakarta-commons-lang, jakarta-commons-logging
BuildRequires:  jpackage-utils >= 0:1.5
# libgcj aot-compiled native libraries
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
Requires:       jakarta-commons-lang, jakarta-commons-logging

%description
The CLI library provides a simple and easy to use API for working with
the command line arguments and options.

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

%description    javadoc
Javadoc for %{name}.

%prep
%setup -q -n %{short_name}-%{version}
%patch0 -p0


%build
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=%(build-classpath commons-logging commons-lang )
export CLASSPATH="$CLASSPATH:target/%{short_name}.jar:target/test-classes"
 # for tests
mkdir lib
ant \
  -Dbuild.sysclasspath=only \
  -Dfinal.name=%{short_name} \
  -Dj2se.javadoc=%{_javadocdir}/java \
  jar test dist


%install
rm -rf $RPM_BUILD_ROOT

# jars
mkdir -p $RPM_BUILD_ROOT%{_javadir}
cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(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)

aot-compile-rpm

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr dist/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p %{_bindir}/rebuild-gcj-db

%postun -p %{_bindir}/rebuild-gcj-db

%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt README.txt
%{_javadir}/*
%{_libdir}/gcj/%{name}

%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/%{name}-%{version}


%changelog
* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 0:1.0-6jpp_5
- Fix Summary.
- Clean up %files.

* Tue Jan 17 2006 Anthony Green <green at redhat.com> - 0:1.0-6jpp_4
- Build for Fedora.
- Remove unversioned javadoc dir.
- Adjust Groups.

* Wed Dec 21 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0-6jpp_3fc
- rebuilt again

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 0:1.0-6jpp_2fc
- rebuilt

* Thu Jun 16 2005 Gary Benson <gbenson at redhat.com> - 0:1.0-6jpp_1fc
- Build into Fedora.

* Mon Dec 20 2004 Fernando Nasser <fnasser at redhat.com> - 0:1.0-6jpp_1rh
- First Red Hat release

* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.0-6jpp
- Rebuild with ant-1.6.2

* Fri Aug 06 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-5jpp
- Void change

* Tue Jun 01 2004 Randy Watler <rwatler at finali.com> - 0:1.0-4jpp
- Upgrade to Ant 1.6.X

* Sun Oct 12 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0-3jpp
- Non-versioned javadoc dir symlink.
- Crosslink with local J2SE javadocs.

* Fri Apr  4 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.0-2jpp
- Rebuild for JPackage 1.5.

* Tue Dec 10 2002 Ville Skytt?? <ville.skytta at iki.fi> - 1.0-1jpp
- 1.0, first JPackage release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2006 13:57:15 -0000	1.1
+++ .cvsignore	18 Jan 2006 13:57:58 -0000	1.2
@@ -0,0 +1 @@
+cli-1.0-src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jakarta-commons-cli/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2006 13:57:15 -0000	1.1
+++ sources	18 Jan 2006 13:57:58 -0000	1.2
@@ -0,0 +1 @@
+ba34d585046b1f17dacbb13b377f4255  cli-1.0-src.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 14:00:42 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 18 Jan 2006 09:00:42 -0500
Subject: owners owners.list,1.545,1.546
Message-ID: <200601181401.k0IE1IeT007949@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6271

Modified Files:
	owners.list 
Log Message:
Add jakarta-commons-cli



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.545
retrieving revision 1.546
diff -u -r1.545 -r1.546
--- owners.list	18 Jan 2006 10:34:03 -0000	1.545
+++ owners.list	18 Jan 2006 14:00:42 -0000	1.546
@@ -424,6 +424,7 @@
 Fedora Extras|istanbul|Desktop Session Recorder|jspaleta at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|itext|A Free Java-PDF library|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jabberd|OpenSource server implementation of the Jabber protocols|adrian at lisas.de|extras-qa at fedoraproject.org|
+Fedora Extras|jakarta-commons-cli|Command Line Interface Library for Java|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jam|Program construction tool, similar to make|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|jed|A fast, compact editor based on the S-Lang screen library.|notting at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 16:42:30 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 18 Jan 2006 11:42:30 -0500
Subject: owners owners.list,1.546,1.547
Message-ID: <200601181643.k0IGh2Ud012744@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12716

Modified Files:
	owners.list 
Log Message:
Updated my email address to be consistent with Fedora Account System (again, undone by 1.460 accident)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -r1.546 -r1.547
--- owners.list	18 Jan 2006 14:00:42 -0000	1.546
+++ owners.list	18 Jan 2006 16:42:29 -0000	1.547
@@ -250,16 +250,16 @@
 Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|galculator|GTK 2 based scientific calculator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|galeon|GNOME2 Web browser based on Mozilla|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gconfmm26|A C++ wrapper for GConf2|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdeskcal|Eye-candy calendar for your desktop.|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gdesklets|Advanced architecture for desktop applets|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
@@ -292,7 +292,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|global|A source code tag system|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|glpk|GNU Linear Programming Kit|qspencer at ieee.org|extras-qa at fedoraproject.org|
@@ -318,7 +318,7 @@
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -357,8 +357,8 @@
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -411,7 +411,7 @@
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org|
-Fedora Extras|inkscape|A vector-based drawing program using SVG|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
@@ -506,15 +506,15 @@
 Fedora Extras|libgcrypt1|A general-purpose cryptography library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libgda|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libgdamm|C++ wrappers for libgda|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm20|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libglademm24|A C++ wrapper for libglade|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm20|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libglademm24|A C++ wrapper for libglade|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomecanvasmm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgnomedb|Library for writing gnome database programs|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
-Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
+Fedora Extras|libgnomeuimm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libibverbs|A library for direct userspace use of InfiniBand|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libid3tag|ID3 tag manipulation library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -552,7 +552,7 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denisleroy at yahoo.com|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++|Typesafe Signal Framework for C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 16:44:37 2006
From: fedora-extras-commits at redhat.com (Denis Leroy (denis))
Date: Wed, 18 Jan 2006 11:44:37 -0500
Subject: owners owners.list,1.547,1.548
Message-ID: <200601181645.k0IGj9C7012784@cvs-int.fedora.redhat.com>

Author: denis

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12765

Modified Files:
	owners.list 
Log Message:
Taking ownership of orphaned libsigc++


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -r1.547 -r1.548
--- owners.list	18 Jan 2006 16:42:29 -0000	1.547
+++ owners.list	18 Jan 2006 16:44:36 -0000	1.548
@@ -553,7 +553,7 @@
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|libsigc++|Typesafe Signal Framework for C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|libsigc++|Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libstatgrab|Make system statistics|oliver at linux-kernel.at|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Jan 18 20:43:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 18 Jan 2006 15:43:27 -0500
Subject: rpms/perl-MailTools/devel .cvsignore, 1.6, 1.7 perl-MailTools.spec, 
	1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200601182043.k0IKhxci020902@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20881

Modified Files:
	.cvsignore perl-MailTools.spec sources 
Log Message:
* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.72-1
- 1.72.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 08:56:48 -0000	1.6
+++ .cvsignore	18 Jan 2006 20:43:26 -0000	1.7
@@ -1 +1 @@
-MailTools-1.71.tar.gz
+MailTools-1.72.tar.gz


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-MailTools.spec	6 Jan 2006 08:56:48 -0000	1.13
+++ perl-MailTools.spec	18 Jan 2006 20:43:26 -0000	1.14
@@ -1,6 +1,6 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
-Version:        1.71
+Version:        1.72
 Release:        1%{?dist}
 
 License:        GPL or Artistic
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.72-1
+- 1.72.
+
 * Fri Jan  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.71-1
 - 1.71.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 08:56:48 -0000	1.6
+++ sources	18 Jan 2006 20:43:26 -0000	1.7
@@ -1 +1 @@
-f42de7cd61246870b9c08369fd4a5e60  MailTools-1.71.tar.gz
+9e9d40fe0f3acbcdefdfe678f478436e  MailTools-1.72.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 20:46:37 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:46:37 -0500
Subject: rpms/wp_tray - New directory
Message-ID: <200601182046.k0IKkdfl021000@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20992/wp_tray

Log Message:
Directory /cvs/extras/rpms/wp_tray added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 20:46:43 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:46:43 -0500
Subject: rpms/wp_tray/devel - New directory
Message-ID: <200601182046.k0IKkjDt021015@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20992/wp_tray/devel

Log Message:
Directory /cvs/extras/rpms/wp_tray/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 18 20:47:02 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:47:02 -0500
Subject: rpms/wp_tray Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601182047.k0IKl4VJ021049@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21037

Added Files:
	Makefile import.log 
Log Message:
Setup of module wp_tray


--- NEW FILE Makefile ---
# Top level Makefile for module wp_tray
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 18 20:47:08 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:47:08 -0500
Subject: rpms/wp_tray/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601182047.k0IKlALY021069@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21037/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wp_tray


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 18 20:48:07 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:48:07 -0500
Subject: rpms/wp_tray import.log,1.1,1.2
Message-ID: <200601182048.k0IKmdLC021145@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21108

Modified Files:
	import.log 
Log Message:
auto-import wp_tray-0.5.1-1 on branch devel from wp_tray-0.5.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Jan 2006 20:47:02 -0000	1.1
+++ import.log	18 Jan 2006 20:48:07 -0000	1.2
@@ -0,0 +1 @@
+wp_tray-0_5_1-1_fc5:HEAD:wp_tray-0.5.1-1.src.rpm:1137617280



From fedora-extras-commits at redhat.com  Wed Jan 18 20:48:13 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 18 Jan 2006 15:48:13 -0500
Subject: rpms/wp_tray/devel wp_tray-0.5.1-paths.patch, NONE, 1.1 wp_tray.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601182048.k0IKmjpv021149@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21108/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wp_tray-0.5.1-paths.patch wp_tray.spec 
Log Message:
auto-import wp_tray-0.5.1-1 on branch devel from wp_tray-0.5.1-1.src.rpm

wp_tray-0.5.1-paths.patch:

--- NEW FILE wp_tray-0.5.1-paths.patch ---
--- wp_tray-0.5.1/src/Makefile.in.paths	2006-01-17 12:22:42.000000000 -0500
+++ wp_tray-0.5.1/src/Makefile.in	2006-01-17 12:24:24.000000000 -0500
@@ -322,7 +322,7 @@
 	-rm -f config.h stamp-h1
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+	test -z "$(DESTDIR)$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
 	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -396,7 +396,7 @@
 uninstall-info-am:
 install-gladeDATA: $(glade_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
+	test -z "$(DESTDIR)$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
 	@list='$(glade_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
--- wp_tray-0.5.1/Makefile.in.paths	2006-01-17 12:32:12.000000000 -0500
+++ wp_tray-0.5.1/Makefile.in	2006-01-17 12:32:58.000000000 -0500
@@ -306,7 +306,7 @@
 uninstall-info-am:
 install-iconDATA: $(icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
+	test -z "$(DESTDIR)$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
 	@list='$(icon_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -323,7 +323,7 @@
 	done
 install-schemasDATA: $(schemas_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
+	test -z "$(DESTDIR)$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
 	@list='$(schemas_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
@@ -340,7 +340,7 @@
 	done
 install-serverDATA: $(server_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
+	test -z "$(DESTDIR)$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
 	@list='$(server_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \


--- NEW FILE wp_tray.spec ---
Name:           wp_tray
Version:        0.5.1
Release:        1%{?dist}
Summary:        A wallpaper-changing applet for GNOME

Group:          Amusements/Graphics
License:        GPL
URL:            http://planetearthworm.com/projects/wp_tray/
Source0:        http://planetearthworm.com/projects/wp_tray/files/%{name}-%{version}.tar.gz
Patch:          wp_tray-0.5.1-paths.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext libglademm24-devel libgnomecanvasmm26-devel
BuildRequires:  gconfmm26-devel libgnomemm26-devel libgnomeuimm26-devel
BuildRequires:  gnome-panel-devel boost-devel

%description
Wallpaper Tray is a GNOME applet used for changing your wallpaper.

%prep
%setup -q
%patch -p 1 -b .paths

%build
%configure --with-boostfilesystem=/usr/lib/libboost_filesystem.so \
  --with-boostregex=/usr/lib/libboost_regex.so
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null  || :
killall -HUP gconfd-2 &>/dev/null || :

%postun
if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas >/dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi

%preun
if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/wp_tray.schemas > /dev/null || :
  killall -HUP gconfd-2 &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_datadir}/%{name}
%{_datadir}/pixmaps/*
%{_libdir}/bonobo/servers/*.server
%{_libexecdir}/*
%{_sysconfdir}/gconf/schemas/*.schemas

%changelog
* Tue Jan 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.1-1
- Upstream update
- Merge Chris Chabot's spec file changes

* Mon Jan  2 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.4.6-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Jan 2006 20:47:08 -0000	1.1
+++ .cvsignore	18 Jan 2006 20:48:13 -0000	1.2
@@ -0,0 +1 @@
+wp_tray-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Jan 2006 20:47:08 -0000	1.1
+++ sources	18 Jan 2006 20:48:13 -0000	1.2
@@ -0,0 +1 @@
+b94b32245558cadd384538ff7d8df403  wp_tray-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 18 21:51:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 16:51:51 -0500
Subject: rpms/torsmo/FC-3 torsmo.spec,1.1,1.2
Message-ID: <200601182152.k0ILqNSw023239@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23207/FC-3

Modified Files:
	torsmo.spec 
Log Message:
- substitute devel spec with <= fc4 spec



Index: torsmo.spec
===================================================================
RCS file: /cvs/extras/rpms/torsmo/FC-3/torsmo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torsmo.spec	17 Jan 2006 22:26:34 -0000	1.1
+++ torsmo.spec	18 Jan 2006 21:51:51 -0000	1.2
@@ -10,14 +10,11 @@
 Source1:        torsmo.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  desktop-file-utils
 
-# modular X
-BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel
-
 %description
 Torsmo (TyopoytaORvelo System MOnitor) is a system monitor that sits in the
 corner of your desktop. Torsmo can show various information about your system
@@ -30,8 +27,7 @@
 %setup -q
 
 %build
-%configure --enable-xft --enable-proc-uptime --enable-seti \
---x-includes=%{_includedir} --x-libraries=%{_libdir}
+%configure --enable-xft --enable-proc-uptime --enable-seti
 make %{?_smp_mflags}
 
 %install
@@ -62,7 +58,6 @@
 * Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-3
 - add sample rc
-- switch to devel BR
 
 * Sun Jan 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-2



From fedora-extras-commits at redhat.com  Wed Jan 18 21:51:57 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 18 Jan 2006 16:51:57 -0500
Subject: rpms/torsmo/FC-4 torsmo.spec,1.1,1.2
Message-ID: <200601182152.k0ILqTDB023242@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/torsmo/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23207/FC-4

Modified Files:
	torsmo.spec 
Log Message:
- substitute devel spec with <= fc4 spec



Index: torsmo.spec
===================================================================
RCS file: /cvs/extras/rpms/torsmo/FC-4/torsmo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torsmo.spec	17 Jan 2006 22:26:34 -0000	1.1
+++ torsmo.spec	18 Jan 2006 21:51:56 -0000	1.2
@@ -10,14 +10,11 @@
 Source1:        torsmo.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel
 BuildRequires:  desktop-file-utils
 
-# modular X
-BuildRequires: libX11-devel libXext-devel libXft-devel libXrender-devel
-
 %description
 Torsmo (TyopoytaORvelo System MOnitor) is a system monitor that sits in the
 corner of your desktop. Torsmo can show various information about your system
@@ -30,8 +27,7 @@
 %setup -q
 
 %build
-%configure --enable-xft --enable-proc-uptime --enable-seti \
---x-includes=%{_includedir} --x-libraries=%{_libdir}
+%configure --enable-xft --enable-proc-uptime --enable-seti
 make %{?_smp_mflags}
 
 %install
@@ -62,7 +58,6 @@
 * Tue Jan 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-3
 - add sample rc
-- switch to devel BR
 
 * Sun Jan 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.18-2



From fedora-extras-commits at redhat.com  Wed Jan 18 22:10:58 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 18 Jan 2006 17:10:58 -0500
Subject: rpms/mock/devel mock-0.4-unpackaged-files-fix.patch, NONE,
	1.1 mock.spec, 1.8, 1.9
Message-ID: <200601182211.k0IMBjRC025106@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25062

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-unpackaged-files-fix.patch 
Log Message:
* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
- Add unpackaged files fix from RH#163576 (Adrian Reber)



mock-0.4-unpackaged-files-fix.patch:

--- NEW FILE mock-0.4-unpackaged-files-fix.patch ---
--- mock-0.4/mock.py.rpmbuild-fix	2006-01-18 17:05:43.000000000 -0500
+++ mock-0.4/mock.py	2006-01-18 17:06:14.000000000 -0500
@@ -311,7 +311,7 @@
         srpmfn = os.path.basename(srpm_in)
         # run with --nodeps b/c of the check above we know we have our build
         # deps satisfied.
-        cmd = "%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
+        cmd = "cd /;%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
              self.config['runuser'], self.target_arch, srpm_in, 
              self.config['chrootuser'])
         


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mock.spec	16 Aug 2005 16:40:28 -0000	1.8
+++ mock.spec	18 Jan 2006 22:10:57 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: mock-0.4-unpackaged-files-fix.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -17,6 +18,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .unpackaged-files-fix
+
 %build
 make
 
@@ -65,6 +68,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
+- Add unpackaged files fix from RH#163576 (Adrian Reber)
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
 - Fix ?fedora check when not defined (would fail to parse).
 



From fedora-extras-commits at redhat.com  Wed Jan 18 22:16:27 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 18 Jan 2006 17:16:27 -0500
Subject: rpms/mock/FC-4 mock-0.4-unpackaged-files-fix.patch, NONE,
	1.1 mock.spec, 1.8, 1.9
Message-ID: <200601182217.k0IMH0sh025250@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25227

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-unpackaged-files-fix.patch 
Log Message:
* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
- Add unpackaged files fix from RH#163576 (Adrian Reber)



mock-0.4-unpackaged-files-fix.patch:

--- NEW FILE mock-0.4-unpackaged-files-fix.patch ---
--- mock-0.4/mock.py.rpmbuild-fix	2006-01-18 17:05:43.000000000 -0500
+++ mock-0.4/mock.py	2006-01-18 17:06:14.000000000 -0500
@@ -311,7 +311,7 @@
         srpmfn = os.path.basename(srpm_in)
         # run with --nodeps b/c of the check above we know we have our build
         # deps satisfied.
-        cmd = "%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
+        cmd = "cd /;%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
              self.config['runuser'], self.target_arch, srpm_in, 
              self.config['chrootuser'])
         


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mock.spec	16 Aug 2005 16:40:22 -0000	1.8
+++ mock.spec	18 Jan 2006 22:16:27 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: mock-0.4-unpackaged-files-fix.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -17,6 +18,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .unpackaged-files-fix
+
 %build
 make
 
@@ -65,6 +68,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
+- Add unpackaged files fix from RH#163576 (Adrian Reber)
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
 - Fix ?fedora check when not defined (would fail to parse).
 



From fedora-extras-commits at redhat.com  Wed Jan 18 22:18:03 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 18 Jan 2006 17:18:03 -0500
Subject: rpms/hddtemp/devel hddtemp.db,1.8,1.9 hddtemp.spec,1.14,1.15
Message-ID: <200601182218.k0IMIZaV025275@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/hddtemp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25256

Modified Files:
	hddtemp.db hddtemp.spec 
Log Message:
* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.7.beta14
- Update drive database to 2006-01-18.
- Init script is not a config file.
- Mark consle.perms snippet as noreplace.



Index: hddtemp.db
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.db,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hddtemp.db	21 Sep 2005 18:09:14 -0000	1.8
+++ hddtemp.db	18 Jan 2006 22:18:03 -0000	1.9
@@ -45,28 +45,44 @@
 # "ExcelStor Technology CT215"    ??? ? "ExcelStor CT215"
 "ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
 "ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
+"ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)"
 "ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)"
+"ExcelStor Technology J880" 194 C "ExcelStor Technology J880 (80 GB)"
+
 
 
 ########################################
 ############# Fujitsu drives
 ########################################
 "FUJITSU MHM2100AT"		0    C  "Fujitsu MHM2100AT"
+
+"FUJITSU MHN2150AT"		194  C  "Fujitsu MHN2150AT"
 "FUJITSU MHN2200AT"		194  C  "Fujitsu MHN2200AT"
 "FUJITSU MHN2300AT"		194  C  "Fujitsu MHN2300AT"
+
 "FUJITSU MHR2020AT"		194  C  "Fujitsu MHR2020AT"
 "FUJITSU MHR2030AT"		194  C  "Fujitsu MHR2030AT"
+
 "FUJITSU MHS2030AT"		194  C  "Fujitsu MHS2030AT"
 "FUJITSU MHS2040AT"		194  C  "Fujitsu MHS2040AT"
 "FUJITSU MHS2060AT"             194  C  "Fujitsu MHS2060AT (Apple PowerBook G4)"
+
+"FUJITSU MHT2030AC"             194  C  "Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)"
+
 "FUJITSU MHT2030AT"             194  C  "Fujitsu MHT2030AT"
 "FUJITSU MHT2040AH"		194  C  "Fujitsu MHT2040AH"
 "FUJITSU MHT2040AT"		194  C  "Fujitsu MHT2040AT"
 "FUJITSU MHT2060AH"		194  C  "Fujitsu MHT2060AH"
 "FUJITSU MHT2060AT"		194  C  "Fujitsu MHT2060AT"
 "FUJITSU MHT2080AH"		194  C  "Fujitsu MHT2080AH"
-"FUJITSU MHN2150AT"		194  C  "Fujitsu MHN2150AT"
+
+"FUJITSU MHU2100AT"		194  C  "Fujitsu MHU2100AT 100GB, 8MB (4200RPM)"
+
+"FUJITSU MHV2100AT"		194  C  "FUJITSU MHV2100AT" 
+"FUJITSU MHV2080AH"             194  C  "FUJITSU MHV2080AH"
+
 "FUJITSU MPF3204AH"		194  C  "Fujitsu MPF3204AH"
+
 "FUJITSU MPG3204AT.*"		194  C  "Fujitsu MPG3204AT"
 "FUJITSU MPG3307AT"		194  C  "Fujitsu MPG3307AT"
 "FUJITSU MPG3409AT.*"		194  C  "Fujitsu MPG3409AT E"
@@ -74,6 +90,8 @@
 "FUJITSU MPG3204AH"		194  C  "Fujitsu MPG3204AH"
 "FUJITSU MPG3102AT E"           194  C  "FUJITSU MPG3102AT E"
 
+
+
 ########################################
 ############# Hitachi drives
 ########################################
@@ -87,7 +105,7 @@
 "HITACHI_DK23DA-[234]0"		194  C  "Hitachi DK23DA series"
 "HITACHI_DK23EA-[346]0"		194  C  "Hitachi DK23EA series"
 "HITACHI_DK23EB-40"             194  C  "Hitachi DK23EB series"
-"HITACHI_DK23FA-[46]0"          194  C  "Hitachi DK23FA series"
+"HITACHI_DK23FA-[468]0"		194  C  "Hitachi DK23FA series"
 "HITACHI_DK23FB-[46]0"		194  C  "Hitachi DK23FB series"
 
 "HDS722516VLAT[28]0"            194  C  "Hitachi Deskstar 7K250 160GB 2/8MB cache"
@@ -100,11 +118,12 @@
 
 "HDS722525VLSA80"		194  C  "Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
 
-"HDT722525DLAT80"               194  C  "Hitachi Deskstar T7K250 250GB, 7200RPM, 8MB, PATA"
+"HDT7225(16|25)DLAT80"          194  C  "Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA"
 "HDT722516DLA380 V43O"		194  C  "Hitachi T7K250 SATA"
 "HDS722580VLSA80"		194  C  "Hitachi Deskstar 7K250 80GB SATA"
 "HDS728040PLAT20"		194  C  "Hitachi Deskstar 7K80 40GB"
 
+"HTE721010G9AT00"		194  C  "Hitachi Travelstar 100GB (7200RPM)"
 "HTE726060M9AT00"               194  C  "Hitachi Travelstar 60GB (7200RPM)"
 "HTS424030M9AT00"               194  C  "Hitachi Travelstar 30GB (4200RPM)"
 "HTS424040M9AT00"               194  C  "Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
@@ -115,8 +134,10 @@
 "HTS548040M9AT00"		194  C  "Hitachi Travelstar 40GB (5400RPM)"
 "HTS548060M9AT00"		194  C  "Hitachi Travelstar 60GB (5400RPM)"
 "HTS548080M9AT00"		194  C  "Hitachi Travelstar 80GB (5400RPM)"
+"HTS721080G9AT00"               194  C  "Hitachi Travelstar 7K100 80GB (7200RPM)"
 "HTS726060M9AT00"		194  C  "Hitachi Travelstar 60GB"
 
+
 ########################################
 ############# IBM drives
 ########################################
@@ -172,6 +193,7 @@
 "Maxtor 6E0[234]0L0"					194  C  "Maxtor DiamondMax Plus 8"
 "MAXTOR 6L0[2468]0[LJ][1234]"				194  C  "Maxtor DiamondMax Plus D740X family"
 "Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB buffer 7200rpm"
+"Maxtor 6L300R0"					194  C  "Maxtor 6L300R0"
 "Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C  "Maxtor DiamondMax Plus 9" 
 "Maxtor 7L300R0"					194  C  "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
 "Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
@@ -203,6 +225,7 @@
 #"SAMSUNG SP2014N"					194  C	"Samsung SpinPoint 200GB, 7200RPM, 8MB cache"
 "SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C"	194  C  "Samsung SpinPoint P80 series - SATA"
 "SAMSUNG SP0411N"					194  C  "Samsung SpinPoint PL40 serie"
+"SAMSUNG SP0822N"					194  C  "Samsung SP0822N"
 "SAMSUNG SP(0812|1213|1614)C"				194  C  "Samsung Spinpoint 160G SATA"
 "SAMSUNG SV0432A"					0    C  "Samsung SV0432A"
 "SAMSUNG SV3002H"					0    C  "Samsung SpinPoint V30 serie"
@@ -213,7 +236,6 @@
 "SAMSUNG SV4012H"					194  C  "Samsung 40GB, 5400RPM, 2MB cache"
 "SAMSUNG SP(2014|2514)N"				194  C	"Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
 
-
 ########################################
 ############# Seagate drives
 ########################################
@@ -255,45 +277,63 @@
 "ST380021A"				194  C  "Seagate Barracuda IV ST380021A"
 "ST380022A"				194  C  "Seagate Barracuda U7 80022, Ultra ATA/100"
 "ST380023A"                             194  C  "Seagate Barracuda V ST380023A"
+"ST380817AS"                            194  C  "Seagate Barracuda 7200.7 80GB - SATA"
 "ST39111A"				194  C  "Seagate ST39111A (from Sun Ultra)"
 "ST3120020A"				194  C  "Seagate ST3120020A"
 "ST3120022A"				194  C  "Seagate Baraccuda 7200.7 120GB"
 "ST3120023A"                            194  C  "Seagate Barracuda V ST3120023A"
 "ST3120024A"				194  C  "Seagate Barracuda V ST3120024A"
+"ST3120025ACE"				194  C  "Seagate Barracuda V ST3120025ACE"
 "ST3120026A"				194  C  "Seagate Barracuda V ST3120026A"
 "ST3160021A"				194  C  "Seagate Barracuda 7200.7 - ST3160021A"
-"ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 and Serial ATA)"
-"ST3200822A"                            194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3160023(A|AS)"			194  C  "Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)"
+"ST3160827AS"				194  C  "Seagate Barracuda 7200.7 160GB (Serial ATA)" 
+"ST3200021A"				194  C  "Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200822(A|AS)"                       194  C  "Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)"
 "ST3200826A"                            194  C  "Seagate Barracuda 7200.8 200Gb"
+"ST3250623A"                            194  C  "Seagate Barracuda 7200.16 250GB"
 "ST3250823A"				194  C  "Seagate Barracuda 7200.8 250GB"
 "ST3250823A"                            194  C  "Seagate Barracuda 7200.7 Plus 250GB"
+"ST3250823NS"                           194  C  "Seagate NL35 SATA (RAID-Edition) 7200 250GB"
 "ST3300831A"				194  C  "Seagate 300GB ST3300831A"
 "ST3400832A"                            194  C  "Seagate Barracuda 7200.8 Plus 400GB"
+"ST910021A"				194  C  "Seagate Momentus 7200.1 100GB" 
 "ST9100823A"				194  C	"Seagate Momentus 5400.2 100GB"
+"ST9120821A"				194  C  "Seagate Momentus 5400.2 120GB"
 "ST94019A"				194  C  "Seagate ST94019A"
+"ST94813A"                              194  C  "Seagate Momentus 5400.2 40GB"
 "ST94[08]11A"				194  C  "Seagate ST94011A"
 "ST960821A"                             194  C  "Seagate ST960821A"
 "ST960822A"                             194  C  "Seagate Momentus 5400.2 60GB"
+"ST96812AS"				194  C  "Seagate Momentus 5400.2 60GB SATA"
+"ST9808211A"				194  C  "Seagate Momentus 5400.2 80GB"
 
 ########################################
 ############# TOSHIBA Laptops
 ########################################
 "MK4313MAT"				220  C  "Toshiba MK4313MAT"
+"TOSHIBA MK1032GAX"                     194  C  "Toshiba MK1032GAX"
 "TOSHIBA MK1517GAP"			0    C  "Toshiba MK1517GAP"
 "TOSHIBA MK2018GAS"			226  F  "Toshiba MK2018GAS"
 "TOSHIBA MK2023GAS"			194  C  "Toshiba MK2023GAS"
+
 "TOSHIBA MK3017GAP"			0    C  "Toshiba MK3017GAP"
 "TOSHIBA MK3021GAS"			194  C  "Toshiba MK3021GAS"
 "TOSHIBA MK3025GAS"                     194  C  "Toshiba MK3025GAS" 
+
 #"TOSHIBA MK4019GAX"			222  C  "Toshiba MK4019GAX"
 "TOSHIBA MK4021GAS"			194  C  "Toshiba MK4021GAS"
 "TOSHIBA MK4025GAS"			194  C  "Toshiba MK4025GAS 40 Go"
 "TOSHIBA MK4026GAS"			194  C  "Toshiba MK4026GAS 40 Go"
+"TOSHIBA MK4032GAX"                     194  C  "Toshiba MK4032GAX" 
+
 "TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
 "TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
 "TOSHIBA MK6025GAS"			194  C  "Toshiba MK6025GAS"
+"TOSHIBA MK6026GAX"			194  C  "Toshiba MK6026GAX" 
 "TOSHIBA MK8025GAS"			194  C  "Toshiba MK8025GAS"
 "TOSHIBA MK8026GAX"			194  C  "Toshiba MK8026GAX" 
+
 "MK4025GAS"                             194  C  "Toshiba MK4025GAS"
 
 
@@ -302,57 +342,67 @@
 ########################################
 # WDC AC310100B and WDC AC2850F are reported not working
 # no more informations were given
-"WDC AC22000L"						  0 C "Western Digital Caviar AC22000"
-"WDC AC420400D"                 			231 C "Western Digital Caviar AC420400D"
-"WDC AC418000D"						231 C "Western Digital AC418000D"
-"WDC WD135BA"						231 C "Western Digital WD135BA"
-
-"WDC WD100EB-00BHF0"            			  0 C "Western Digital 100EB-00BHF0"
-"WDC WD200BB-00AUA1"            			  0 C "Western Digital Caviar WD200BB"
-#"WDC WD200BB-60DGA0"					  0 C "Western Digital Caviar WD200BB"
-"WDC WD300BB-00CAA0"					  0 C "Western Digital WD300BB"
-"WDC WD360GD-00FNA0"					194 C "Western Digital SATA Raptor 36.7GB"
-"WDC WD400BB-00J[KH]A0"					194 C "Western Digital Caviar WD400BB"
-"WDC WD400BB-23JHC0"					194 C "Western Digital 23JHC0"
-#"WDC WD400BB-00GFA0"					  0 C ""
-"WDC WD400BB-55HEA0"					194 C "Western Digital Caviar WD400BB"
-"WDC WD400BB-(18CA|00DE)A0"     			  0 C "Western Digital Caviar WD400BB"
-"WDC WD400BB-75FJA1"					194 C "Western Digital Caviar WD400BB"
-"WDC WD400EB-00CPF0"					  0 C "Western Digital 400EB-00CPF0"
-"WDC WD400JB-00(JJ|FM|FS)A0"				194 C "Western Digital Caviar 40GB Special Edition 8MB"
-"WDC WD400JB-00ETA0"					194 C "Western Digital 400JB-00ETA0"
-"WDC WD400JB-00JJC0"					194 C "Western Digital 400JB-00JJC0 40GB"
-"WDC WD600BB-32BSA0"					  0 C "Western Digital 600BB-32BSA0"
-"WDC WD600JB-00ETA0"					194 C "Western Digital 600JB-00ETA0"
-"WDC WD600LB-00DNA0"            			194 C "Western Digital 60GB"
-"WDC WD740GD-00FL21.0"					194 C "Western Digital SATA Raptor"
-"WDC WD740GD-(00FLC0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
-"WDC WD800BB-00CAA1"					  0 C "Western Digital WD800BB-00CAA1"
-"WDC WD800BB-(00|22)DKA0"				194 C "Western Digital WD800BB 80 Go"
-"WDC WD800BB-32CCB0"					194 C "Western Digital 800BB-32CCB0"
-"WDC WD800BB-55HEA0"					194 C "Western Digital 800BB-55HEA0"
-"WDC WD800BB-00JHA0"					194 C "Western Digital 800BB-00JHA0" 
-"WDC WD800BB-00JKA0"					194 C "Western Digital 800BB-00JKA0" 
-"WDC WD800BB-55JKA0"					194 C "Western Digital 800BB-55JKA0" 
-"WDC WD800BB-75FRA0"					194 C "Western Digital Caviar WD800BB"				
-"WDC WD800JB-00CRA1"            			  0 C "Western Digital Caviar WD800JB"
-"WDC WD800JB-00(ET|FM|FS)A0"				194 C "Western Digital Caviar 80GB Special Edition 8MB"
-"WDC WD800JB-00JJ[AC]0"					194 C "Western Digital WD800JB"
-"WDC WD800JD-00HKA0"					194 C "Western Digital SATA 80GB, 8MB Cache"
-"WDC WD800LB-(00|55)DNA0"				194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
-"WDC WD1200BB-00(FTA|GUA)0"				194 C "Western Digital Caviar EIDE 2MB Cache"
-"WDC WD1200JB-00(EV|FU|GV)A0"   			194 C "Western Digital Caviar 120GB Special Edition 8MB" 
-"WDC WD1200JB-22GVA0"                                   194 C "Western Digital Caviar 120GB"
-"WDC WD1200JD-00GBB0"           			194 C "Western Digital WD1200JD"
-"WDC WD1200LB-55EDA0"					194 C "Western Digital WD1220LB"
-"WDC WD1600BB-00DWA0"					194 C "Western Digital Caviar WD1600BB"
-"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   		194 C "Western Digital Caviar 160GB Special Edition 8MB"
-"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
-"WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"			194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC WD2500JB-00GVC0"					194 C "Western Digital 250GB"
-"WDC WD2500JD-00GBB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
-"WDC WD2500PB-98FBA0"					194 C "Western Digital Caviar 250GB Special Edition 8MB"
-"WDC WD3200JB-00KFA0"					194 C "Western Digital Caviar 320GB 8MB"
+"WDC AC22000L"							  0 C "Western Digital Caviar AC22000"
+"WDC AC420400D"                 				231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"							231 C "Western Digital AC418000D"
+"WDC WD135BA"							231 C "Western Digital WD135BA"
+
+"WDC WD100EB-00BHF0"            				  0 C "Western Digital 100EB-00BHF0"
+"WDC WD200BB-00AUA1"            				  0 C "Western Digital Caviar WD200BB"
+#"WDC WD200BB-60DGA0"						  0 C "Western Digital Caviar WD200BB"
+"WDC WD300BB-00CAA0"						  0 C "Western Digital WD300BB"
+"WDC WD360GD-00FNA0"						194 C "Western Digital SATA Raptor 36.7GB"
+"WDC WD400BB-00J[KH]A0"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-23JHC0"						194 C "Western Digital 23JHC0"
+#"WDC WD400BB-00GFA0"						  0 C ""
+"WDC WD400BB-55HEA0"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-(18CA|00DE)A0"     				  0 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-75FJA1"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400EB-00CPF0"						  0 C "Western Digital 400EB-00CPF0"
+"WDC WD400JB-00(JJ|FM|FS)A0"					194 C "Western Digital Caviar 40GB Special Edition 8MB"
+"WDC WD400JB-00ETA0"						194 C "Western Digital 400JB-00ETA0"
+"WDC WD400JB-00JJC0"						194 C "Western Digital 400JB-00JJC0 40GB"
+"WDC WD400LB-00DNA0"						194 C "Western Digital 400LB-00DNA0"
+"WDC WD400UE-22HCT0"						194 C "Western Digital 40GB Notebook HDD"
+"WDC WD400VE-75HDT1"						194 C "Western Digital Scorpio 40GB"
+"WDC WD600BB-32BSA0"						  0 C "Western Digital 600BB-32BSA0"
+"WDC WD600JB-00ETA0"						194 C "Western Digital 600JB-00ETA0"
+"WDC WD600LB-00DNA0"            				194 C "Western Digital 60GB"
+"WDC WD600VE-75HDT0"						194 C "Western Digital 600VE-75HDT0"
+"WDC WD600VE-00HDT0"						194 C "Western Digital 600VE-00HDT0"
+"WDC WD740GD-00FL21.0"						194 C "Western Digital SATA Raptor"
+"WDC WD740GD-(00FL[AC]0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
+"WDC WD800BB-00CAA1"						  0 C "Western Digital WD800BB-00CAA1"
+"WDC WD800BB-(00|22)DKA0"					194 C "Western Digital WD800BB 80 Go"
+"WDC WD800BB-32CCB0"						194 C "Western Digital 800BB-32CCB0"
+"WDC WD800BB-55HEA0"						194 C "Western Digital 800BB-55HEA0"
+"WDC WD800BB-00JHA0"						194 C "Western Digital 800BB-00JHA0" 
+"WDC WD800BB-00JKA0"						194 C "Western Digital 800BB-00JKA0" 
+"WDC WD800BB-55JKA0"						194 C "Western Digital 800BB-55JKA0" 
+"WDC WD800BB-75FRA0"						194 C "Western Digital Caviar WD800BB"				
+"WDC WD800JB-00CRA1"            				  0 C "Western Digital Caviar WD800JB"
+"WDC WD800JB-00(ET|FM|FS)A0"					194 C "Western Digital Caviar 80GB Special Edition 8MB"
+"WDC WD800JB-00JJ[AC]0"						194 C "Western Digital WD800JB"
+"WDC WD800JD-00HKA0"						194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD800LB-(00|55)DNA0"					194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
+"WDC WD1200BB-00(FTA|GUA)0"					194 C "Western Digital Caviar EIDE 2MB Cache"
+"WDC WD1200JB-00(EV|FU|GV)A0"   				194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-22GVA0"                                   	194 C "Western Digital Caviar 120GB"
+"WDC WD1200JD-00GBB0"           				194 C "Western Digital WD1200JD"
+"WDC WD1200LB-55EDA0"						194 C "Western Digital WD1220LB"
+"WDC WD1200SB-01KB[AC]0"					194 C "Western Digital Caviar RE (Raid Edition) 120 GB"
+"WDC WD1600BB-00DWA0"						194 C "Western Digital Caviar WD1600BB"
+"WDC WD1600JB-(00EV|00FU|00GV|75GV)A0"   			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD2000BB-00FTA0"						194 C "Western Digital WD2000BB"
+"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
+"WDC WD2000JB-00GVC0"						194 C "Western Digital WD2000JB"
+"WDC WD2500JB-(00FU|32FU|00GV|55GV)A0"				194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500JB-00GVC0"						194 C "Western Digital 250GB"
+"WDC WD2500JD-(00G|32H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
+"WDC WD2500PB-98FBA0"						194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD3000JB-00KFA0"						194 C "Western Digital WD3000JB"
+"WDC WD3200JB-00KFA0"						194 C "Western Digital Caviar 320GB 8MB"
+"WDC WD4000KD-00NAB0"						194 C "Western Digital Caviar SE16 400GB 16MB"
 
 # not sure for next
 # "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"


Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/devel/hddtemp.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- hddtemp.spec	21 Sep 2005 18:09:14 -0000	1.14
+++ hddtemp.spec	18 Jan 2006 22:18:03 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           hddtemp
 Version:        0.3
-Release:        0.6.%{beta}%{?dist}
+Release:        0.7.%{beta}%{?dist}
 Summary:        Hard disk temperature tool
 
 Group:          Applications/System
@@ -86,9 +86,9 @@
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO contribs
 %config(noreplace) %{_sysconfdir}/sysconfig/hddtemp
-%config(noreplace) %{_initrddir}/hddtemp
 %config(noreplace) %{_sysconfdir}/pam.d/hddtemp
-%config %{_sysconfdir}/security/console.apps/hddtemp
+%config(noreplace) %{_sysconfdir}/security/console.apps/hddtemp
+%{_initrddir}/hddtemp
 %{_bindir}/hddtemp
 %{_sbindir}/hddtemp
 %config %{_datadir}/misc/hddtemp.db
@@ -96,6 +96,11 @@
 
 
 %changelog
+* Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.7.beta14
+- Update drive database to 2006-01-18.
+- Init script is not a config file.
+- Mark consle.perms snippet as noreplace.
+
 * Tue Sep 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.3-0.6.beta14
 - 0.3-beta14, drive database 2005-09-20.
 



From fedora-extras-commits at redhat.com  Wed Jan 18 22:23:08 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Wed, 18 Jan 2006 17:23:08 -0500
Subject: rpms/mock/FC-3 mock-0.4-unpackaged-files-fix.patch, NONE,
	1.1 mock.spec, 1.8, 1.9
Message-ID: <200601182223.k0IMNeoQ025388@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25368

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-unpackaged-files-fix.patch 
Log Message:
* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
- Add unpackaged files fix from RH#163576 (Adrian Reber)



mock-0.4-unpackaged-files-fix.patch:

--- NEW FILE mock-0.4-unpackaged-files-fix.patch ---
--- mock-0.4/mock.py.rpmbuild-fix	2006-01-18 17:05:43.000000000 -0500
+++ mock-0.4/mock.py	2006-01-18 17:06:14.000000000 -0500
@@ -311,7 +311,7 @@
         srpmfn = os.path.basename(srpm_in)
         # run with --nodeps b/c of the check above we know we have our build
         # deps satisfied.
-        cmd = "%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
+        cmd = "cd /;%s -c 'rpmbuild --rebuild  --target %s --nodeps %s' %s" % (
              self.config['runuser'], self.target_arch, srpm_in, 
              self.config['chrootuser'])
         


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mock.spec	16 Aug 2005 16:40:22 -0000	1.8
+++ mock.spec	18 Jan 2006 22:23:07 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: mock-0.4-unpackaged-files-fix.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -17,6 +18,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .unpackaged-files-fix
+
 %build
 make
 
@@ -65,6 +68,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
+- Add unpackaged files fix from RH#163576 (Adrian Reber)
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 0.4-2
 - Fix ?fedora check when not defined (would fail to parse).
 



From fedora-extras-commits at redhat.com  Thu Jan 19 07:50:05 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 19 Jan 2006 02:50:05 -0500
Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.2,
	1.3 perl-Params-Validate.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601190750.k0J7obdX010054@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10027

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 04:26:08 -0000	1.2
+++ .cvsignore	19 Jan 2006 07:50:04 -0000	1.3
@@ -1 +1 @@
-Params-Validate-0.78.tar.gz
+Params-Validate-0.79.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Validate.spec	14 Aug 2005 04:31:33 -0000	1.2
+++ perl-Params-Validate.spec	19 Jan 2006 07:50:04 -0000	1.3
@@ -1,18 +1,19 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.78
-Release: 	2%{?dist}
+Version: 	0.79
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # Required by the tests
 BuildRequires: 	perl(Test::Taint)
+BuildRequires:	perl(Readonly)
+BuildRequires:	perl(Readonly::XS)
 
 %description
 The Params::Validate module allows you to validate method or function
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.79-1
+- Upstream update.
+- BR perl(Readonly), perl(Readonly::XS).
+
 * Sun Aug 14 2005 Ralf Corsepius <ralf at links2linux.de> - 0.78-2
 - Spec file cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 04:26:08 -0000	1.2
+++ sources	19 Jan 2006 07:50:04 -0000	1.3
@@ -1 +1 @@
-8b6951214915c33addc4cc16e047546f  Params-Validate-0.78.tar.gz
+3e0a710c3cb2c40000999071442c368e  Params-Validate-0.79.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 08:04:33 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 19 Jan 2006 03:04:33 -0500
Subject: rpms/perl-Params-Validate/FC-4 .cvsignore, 1.2,
	1.3 perl-Params-Validate.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601190805.k0J85jdU011852@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11831

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 04:26:08 -0000	1.2
+++ .cvsignore	19 Jan 2006 08:04:30 -0000	1.3
@@ -1 +1 @@
-Params-Validate-0.78.tar.gz
+Params-Validate-0.79.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/perl-Params-Validate.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Params-Validate.spec	14 Aug 2005 04:31:33 -0000	1.2
+++ perl-Params-Validate.spec	19 Jan 2006 08:04:31 -0000	1.3
@@ -1,18 +1,19 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.78
-Release: 	2%{?dist}
+Version: 	0.79
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
 Source0: 	http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/Params-Validate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 # Required by the tests
 BuildRequires: 	perl(Test::Taint)
+BuildRequires:	perl(Readonly)
+BuildRequires:	perl(Readonly::XS)
 
 %description
 The Params::Validate module allows you to validate method or function
@@ -53,6 +54,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 14 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.79-1
+- Upstream update.
+- BR perl(Readonly), perl(Readonly::XS).
+
 * Sun Aug 14 2005 Ralf Corsepius <ralf at links2linux.de> - 0.78-2
 - Spec file cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 04:26:08 -0000	1.2
+++ sources	19 Jan 2006 08:04:31 -0000	1.3
@@ -1 +1 @@
-8b6951214915c33addc4cc16e047546f  Params-Validate-0.78.tar.gz
+3e0a710c3cb2c40000999071442c368e  Params-Validate-0.79.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 08:19:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:19:24 -0500
Subject: rpms/scribus/FC-3 .cvsignore, 1.5, 1.6 scribus.spec, 1.9,
	1.10 sources, 1.6, 1.7
Message-ID: <200601190819.k0J8JuXV012085@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027/FC-3

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jan 2005 19:29:45 -0000	1.5
+++ .cvsignore	19 Jan 2006 08:19:23 -0000	1.6
@@ -1 +1 @@
-scribus-1.2.1.tar.bz2
+scribus-1.2.4.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-3/scribus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scribus.spec	7 Jul 2005 22:36:07 -0000	1.9
+++ scribus.spec	19 Jan 2006 08:19:23 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           scribus
-Version:        1.2.2.1
-Release:        2%{?dist}
+Version:        1.2.4.1
+Release:        1%{?dist}
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2
+Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 #Patch0:        scribus-x86_64.patch
@@ -135,6 +135,10 @@
 
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1
+- version upgrade
+
 * Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2
 - use dist tag for sanity between branches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jul 2005 22:36:49 -0000	1.6
+++ sources	19 Jan 2006 08:19:23 -0000	1.7
@@ -1,2 +1 @@
-002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2
-8c2eac0a358b04c39252586d9d85ab24  scribus-1.2.2.1.tar.bz2
+d72ffe72b1d9ba1230557692af803927  scribus-1.2.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 08:19:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:19:30 -0500
Subject: rpms/scribus/FC-4 .cvsignore, 1.6, 1.7 scribus.spec, 1.14,
	1.15 sources, 1.6, 1.7
Message-ID: <200601190820.k0J8K2ZT012090@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027/FC-4

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jul 2005 22:41:31 -0000	1.6
+++ .cvsignore	19 Jan 2006 08:19:29 -0000	1.7
@@ -1,2 +1 @@
-scribus-1.2.1.tar.bz2
-scribus-1.2.2.1.tar.bz2
+scribus-1.2.4.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scribus.spec	7 Jul 2005 22:36:07 -0000	1.14
+++ scribus.spec	19 Jan 2006 08:19:29 -0000	1.15
@@ -1,13 +1,13 @@
 Name:           scribus
-Version:        1.2.2.1
-Release:	2%{?dist}
+Version:        1.2.4.1
+Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2.2.1/scribus-1.2.2.1.tar.bz2
+Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 #Patch0:         scribus-x86_64.patch
@@ -136,6 +136,10 @@
 
 
 %changelog
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1
+- version upgrade
+
 * Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2
 - use dist tag for sanity between branches
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jul 2005 22:41:31 -0000	1.6
+++ sources	19 Jan 2006 08:19:29 -0000	1.7
@@ -1,2 +1 @@
-002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2
-8c2eac0a358b04c39252586d9d85ab24  scribus-1.2.2.1.tar.bz2
+d72ffe72b1d9ba1230557692af803927  scribus-1.2.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 08:19:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:19:36 -0500
Subject: rpms/scribus/devel .cvsignore, 1.5, 1.6 scribus.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200601190820.k0J8K8fR012095@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027/devel

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	9 Jan 2005 19:29:45 -0000	1.5
+++ .cvsignore	19 Jan 2006 08:19:35 -0000	1.6
@@ -1 +1 @@
-scribus-1.2.1.tar.bz2
+scribus-1.2.4.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- scribus.spec	22 Dec 2005 08:35:34 -0000	1.12
+++ scribus.spec	19 Jan 2006 08:19:35 -0000	1.13
@@ -1,15 +1,16 @@
 Name:           scribus
-Version:        1.2.1
-Release:        6
+Version:        1.2.4.1
+Release:	1%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
-Source0:        http://www.scribus.org.uk/downloads/1.2.1/scribus-1.2.1.tar.bz2
+Source0:        http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2
 Source1:        scribus.xml
-Patch0:         scribus-x86_64.patch
+Source2:	scribus.desktop
+#Patch0:         scribus-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cups-devel
@@ -22,24 +23,42 @@
 BuildRequires:  libtool
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python-devel >= 2.2
+BuildRequires:  python-devel >= 2.3
 BuildRequires:  qt-devel >= 1:3.3
 BuildRequires:  zlib-devel
+BuildRequires:  freetype-devel
 Requires:       ghostscript >= 7.07
-Requires:       python >= 2.2
+Requires:       python >= 2.3
 Requires:       tkinter
 Requires(post): shared-mime-info
 Requires(post): desktop-file-utils
 Requires(postun): shared-mime-info
 Requires(postun): desktop-file-utils
 
-Obsoletes:      scribus-i18n-en
-
+Obsoletes:     scribus-i18n-en
+Obsoletes:     scribus-svg
+Obsoletes:     scribus-scripting
+Obsoletes:     scribus-short-words
+Obsoletes:     scribus-vnla
+Obsoletes:     scribus-i18en
+Obsoletes:     scribus-i18de
+Obsoletes:     scribus-i18fr
+Obsoletes:     scribus-templates
+
+Provides:      scribus-i18n-en
+Provides:      scribus-svg
+Provides:      scribus-scripting
+Provides:      scribus-short-words
+Provides:      scribus-vnla
+Provides:      scribus-i18en
+Provides:      scribus-i18de
+Provides:      scribus-i18fr
+Provides:      scribus-templates
 
 %description
-Scribus is a Layout program for GNU/Linux??, similar to Adobe?? PageMaker???,
-QuarkXPress??? or Adobe?? InDesign???, except that it is published under the
-GNU GPL.
+Scribus is an desktop open source page layout program with
+the aim of producing commercial grade output in PDF and
+Postscript, primarily, though not exclusively for Linux.
 
 While the goals of the program are for ease of use and simple easy to
 understand tools, Scribus offers support for professional publishing
@@ -48,7 +67,7 @@
 
 
 %package        devel
-Summary:        Header files for Scribus.
+Summary:        Header files for Scribus
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
@@ -58,7 +77,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .x86_64
+#%patch -p1 -b .x86_64
 
 
 %build
@@ -117,8 +136,26 @@
 
 
 %changelog
-* Thu Dec 22 2005 Luke Macken <lmacken at redhat.com> - 1.2.1-6
-- Rebuild against new openssl (Bug #174781)
+* Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1
+- version upgrade
+
+* Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2
+- use dist tag for sanity between branches
+
+* Tue Jul 5 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2.1-1
+- 1.2.2.1 released to fix crash on open with certain 1.2.1 docs
+
+* Sun Jul 3 2005 P Linnell <mrdocs AT scribus.info> - 1.2.2-0.fc4
+- 1.2.2 final
+
+* Tue Jun 28 2005 P Linnell <mrdocs AT scribus.info>- 1.2.2cvs-0
+- test build for 1.2.2cvs
+- Add freetype2 explicit build requirement
+- Add obsoletes. See PACKAGING in the source tarball
+- Change the description per PACKAGING
+- Bump required python. 2.2 is no longer supported.
+
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.2.1-5
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	9 Jan 2005 19:29:45 -0000	1.5
+++ sources	19 Jan 2006 08:19:35 -0000	1.6
@@ -1 +1 @@
-002cb629e817722f4123df7a41fc824b  scribus-1.2.1.tar.bz2
+d72ffe72b1d9ba1230557692af803927  scribus-1.2.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 08:43:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:43:25 -0500
Subject: rpms/openal/FC-3 .cvsignore, 1.3, 1.4 openal.spec, 1.6, 1.7 sources,
	1.3, 1.4 openal-conf.patch, 1.1, NONE openal-etc_openalrc.patch,
	1.1, NONE openal-incl.patch, 1.1, NONE
Message-ID: <200601190843.k0J8hwS9012247@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/FC-3

Modified Files:
	.cvsignore openal.spec sources 
Removed Files:
	openal-conf.patch openal-etc_openalrc.patch openal-incl.patch 
Log Message:
- use noncvs sources
- major cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:57:47 -0000	1.3
+++ .cvsignore	19 Jan 2006 08:43:25 -0000	1.4
@@ -1 +1 @@
-openal-20040726.tar.bz2
+openal-0.0.8.tar.gz


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openal.spec	2 Feb 2005 14:16:49 -0000	1.6
+++ openal.spec	19 Jan 2006 08:43:25 -0000	1.7
@@ -1,20 +1,13 @@
 Name:           openal
-Version:        0.0
-Release:        0.2.20040726
+Version:        0.0.8
+Release:        2%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.openal.org/
-# use the following to get / verify source:
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login
-#password: guest
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository export -D  20040726 openal
-Source0:        openal-20040726.tar.bz2
+Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
-Patch0:         openal-conf.patch
-Patch1:         openal-etc_openalrc.patch
-Patch2:         openal-incl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -26,8 +19,7 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  SDL-devel
 BuildRequires:  texinfo
-Requires(post): info
-Requires(preun): info
+Obsoletes:      %{name}-test < 0.0.8
 
 %description
 OpenAL is an audio library designed in the spirit of OpenGL--machine
@@ -36,25 +28,13 @@
 
 
 %package        devel
-Summary:        Static libraries and header files for openal library
-Requires:       %{name} = %{version}-%{release}
+Summary:        Development files for openal library
 Group:          Development/Libraries
-
-%description    devel
-This package contains static libraries and header files for the openal library.
-
-OpenAL is an audio library designed in the spirit of OpenGL - machine
-independent, cross platform, and data format neutral, with a clean,
-simple C-based API.
-
-
-%package        test
-Summary:        Tests for openal library
 Requires:       %{name} = %{version}-%{release}
-Group:          Development/Libraries
+Requires:       pkgconfig
 
-%description    test
-This package contains tests for the openal library.
+%description    devel
+This package contains development files for the openal library.
 
 OpenAL is an audio library designed in the spirit of OpenGL - machine
 independent, cross platform, and data format neutral, with a clean,
@@ -62,15 +42,9 @@
 
 
 %prep
-%setup -q -n openal
-%patch0 -p1
-%patch1
-%patch2 -p1
-
+%setup -q
 
 %build
-cd linux
-sh ./autogen.sh
 %configure --enable-arts                   \
            --enable-alsa                   \
            --enable-esd                    \
@@ -78,74 +52,58 @@
            --enable-sdl                    \
            --disable-smpeg                 \
            --enable-capture
-
 make %{?_smp_mflags}
-make -C doc
-make -C test
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make -C linux DESTDIR=${RPM_BUILD_ROOT}%{_prefix}/ \
-              DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
-              install
-#
-# tests
-install -m0755 -d ${RPM_BUILD_ROOT}%{_libdir}/openal
-cp -r linux/test/* ${RPM_BUILD_ROOT}%{_libdir}/openal
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/openal/*.o \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/Makefile* \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/CVS
-#
-# info 
-install -m0755 -d ${RPM_BUILD_ROOT}%{_infodir}
-install -m0644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}
-#
-
-#
-# configuration
-install -m0755 -d ${RPM_BUILD_ROOT}/etc
-install -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=${RPM_BUILD_ROOT}
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
+install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
 
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 
+%clean
+rm -rf ${RPM_BUILD_ROOT}
 
-%preun
-if [ "$1" -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-fi
-
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING CREDITS README 
-%config %{_sysconfdir}/openalrc
-%attr(0644,root,root)%{_libdir}/libopenal.so.*
-%attr(0644,root,root)%{_infodir}/*.info*
+%doc AUTHORS ChangeLog COPYING NOTES README TODO
+%config(noreplace) %{_sysconfdir}/openalrc
+%{_libdir}/libopenal.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc README
-%{_includedir}/AL
-%attr(0644,root,root)%{_libdir}/libopenal.a
-%attr(0644,root,root)%{_libdir}/libopenal.so
+%doc common/specification/*
+%{_bindir}/openal-config
+%{_includedir}/AL/
+%{_libdir}/libopenal.so
+%{_libdir}/pkgconfig/openal.pc
+
+
+%changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.8-2
+- switch to non cvs sources
+- major cleanups
+
+* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
+- 0.0.8, patches applied upstream.
+- Mark /etc/openalrc as noreplace.
+- Don't ship static library.
+- Drop test subpackage.
 
-%files test
-%defattr(-,root,root,-)
-%{_libdir}/openal
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.0-0.4.20040726
+- rebuild on all arches
 
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.0-0.3.20040726
+- rebuilt
 
-%changelog -n openal
 * Thu Apr 08 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.0-0.2.fdr.0.20040726
 - Clean up spec/Bump release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:57:47 -0000	1.3
+++ sources	19 Jan 2006 08:43:25 -0000	1.4
@@ -1 +1 @@
-850583d59b54d7298ee843700d3add6f  openal-20040726.tar.bz2
+0379bd39fc84454491ef38434a2e6e8d  openal-0.0.8.tar.gz


--- openal-conf.patch DELETED ---


--- openal-etc_openalrc.patch DELETED ---


--- openal-incl.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 08:43:37 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:43:37 -0500
Subject: rpms/openal/devel .cvsignore, 1.4, 1.5 openal.spec, 1.10,
	1.11 sources, 1.4, 1.5
Message-ID: <200601190844.k0J8i9aw012257@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/devel

Modified Files:
	.cvsignore openal.spec sources 
Log Message:
- use noncvs sources
- major cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Oct 2005 21:30:12 -0000	1.4
+++ .cvsignore	19 Jan 2006 08:43:37 -0000	1.5
@@ -1 +1 @@
-openal-0.0.8.tar.bz2
+openal-0.0.8.tar.gz


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openal.spec	10 Oct 2005 21:30:12 -0000	1.10
+++ openal.spec	19 Jan 2006 08:43:37 -0000	1.11
@@ -1,16 +1,12 @@
 Name:           openal
 Version:        0.0.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.openal.org/
-# use the following to get / verify source:
-# cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login
-# password: guest
-# cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository ex -r Linux_Spec1-0 openal/{COPYING,README,include,linux}
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +19,6 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  SDL-devel
 BuildRequires:  texinfo
-Requires(post): /sbin/ldconfig
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 Obsoletes:      %{name}-test < 0.0.8
 
 %description
@@ -49,13 +42,9 @@
 
 
 %prep
-%setup -q -n openal
-cd linux
-sh ./autogen.sh
-
+%setup -q
 
 %build
-cd linux
 %configure --enable-arts                   \
            --enable-alsa                   \
            --enable-esd                    \
@@ -68,12 +57,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make -C linux DESTDIR=${RPM_BUILD_ROOT}%{_prefix}/ \
-              DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
-              install
-rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.a
+make install DESTDIR=${RPM_BUILD_ROOT}
 
-install -Dpm 644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}/openal.info
+rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
 install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
 
@@ -81,28 +67,19 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-fi
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%doc COPYING README linux/ChangeLog linux/TODO
+%doc AUTHORS ChangeLog COPYING NOTES README TODO
 %config(noreplace) %{_sysconfdir}/openalrc
 %{_libdir}/libopenal.so.*
-%{_infodir}/*.info*
 
 %files devel
 %defattr(-,root,root,-)
+%doc common/specification/*
 %{_bindir}/openal-config
 %{_includedir}/AL/
 %{_libdir}/libopenal.so
@@ -110,6 +87,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.8-2
+- switch to non cvs sources
+- major cleanups
+
 * Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
 - 0.0.8, patches applied upstream.
 - Mark /etc/openalrc as noreplace.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Oct 2005 21:30:12 -0000	1.4
+++ sources	19 Jan 2006 08:43:37 -0000	1.5
@@ -1 +1 @@
-d7bb526b7c13f9addecb05365934cbd7  openal-0.0.8.tar.bz2
+0379bd39fc84454491ef38434a2e6e8d  openal-0.0.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 08:43:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 03:43:31 -0500
Subject: rpms/openal/FC-4 .cvsignore, 1.3, 1.4 openal.spec, 1.9, 1.10 sources,
	1.3, 1.4 openal-conf.patch, 1.1, NONE openal-etc_openalrc.patch,
	1.1, NONE openal-incl.patch, 1.1, NONE
Message-ID: <200601190844.k0J8i4h1012252@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/FC-4

Modified Files:
	.cvsignore openal.spec sources 
Removed Files:
	openal-conf.patch openal-etc_openalrc.patch openal-incl.patch 
Log Message:
- use noncvs sources
- major cleanups



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:57:47 -0000	1.3
+++ .cvsignore	19 Jan 2006 08:43:31 -0000	1.4
@@ -1 +1 @@
-openal-20040726.tar.bz2
+openal-0.0.8.tar.gz


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openal.spec	23 May 2005 00:18:22 -0000	1.9
+++ openal.spec	19 Jan 2006 08:43:31 -0000	1.10
@@ -1,21 +1,13 @@
 Name:           openal
-Version:        0.0
-Release:        0.4.20040726
-
+Version:        0.0.8
+Release:        2%{?dist}
 Summary:        Open Audio Library
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.openal.org/
-# use the following to get / verify source:
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository login
-#password: guest
-#cvs -d:pserver:guest at opensource.creative.com:/usr/local/cvs-repository export -D  20040726 openal
-Source0:        openal-20040726.tar.bz2
+Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
-Patch0:         openal-conf.patch
-Patch1:         openal-etc_openalrc.patch
-Patch2:         openal-incl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -27,8 +19,7 @@
 BuildRequires:  libvorbis-devel
 BuildRequires:  SDL-devel
 BuildRequires:  texinfo
-Requires(post): info
-Requires(preun): info
+Obsoletes:      %{name}-test < 0.0.8
 
 %description
 OpenAL is an audio library designed in the spirit of OpenGL--machine
@@ -37,25 +28,13 @@
 
 
 %package        devel
-Summary:        Static libraries and header files for openal library
-Requires:       %{name} = %{version}-%{release}
+Summary:        Development files for openal library
 Group:          Development/Libraries
-
-%description    devel
-This package contains static libraries and header files for the openal library.
-
-OpenAL is an audio library designed in the spirit of OpenGL - machine
-independent, cross platform, and data format neutral, with a clean,
-simple C-based API.
-
-
-%package        test
-Summary:        Tests for openal library
 Requires:       %{name} = %{version}-%{release}
-Group:          Development/Libraries
+Requires:       pkgconfig
 
-%description    test
-This package contains tests for the openal library.
+%description    devel
+This package contains development files for the openal library.
 
 OpenAL is an audio library designed in the spirit of OpenGL - machine
 independent, cross platform, and data format neutral, with a clean,
@@ -63,15 +42,9 @@
 
 
 %prep
-%setup -q -n openal
-%patch0 -p1
-%patch1
-%patch2 -p1
-
+%setup -q
 
 %build
-cd linux
-sh ./autogen.sh
 %configure --enable-arts                   \
            --enable-alsa                   \
            --enable-esd                    \
@@ -79,78 +52,56 @@
            --enable-sdl                    \
            --disable-smpeg                 \
            --enable-capture
-
 make %{?_smp_mflags}
-make -C doc
-make -C test
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make -C linux DESTDIR=${RPM_BUILD_ROOT}%{_prefix}/ \
-              DESTLIB=${RPM_BUILD_ROOT}%{_libdir} \
-              install
-#
-# tests
-install -m0755 -d ${RPM_BUILD_ROOT}%{_libdir}/openal
-cp -r linux/test/* ${RPM_BUILD_ROOT}%{_libdir}/openal
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/openal/*.o \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/Makefile* \
-       ${RPM_BUILD_ROOT}%{_libdir}/openal/CVS
-#
-# info
-install -m0755 -d ${RPM_BUILD_ROOT}%{_infodir}
-install -m0644 linux/doc/openal.info ${RPM_BUILD_ROOT}%{_infodir}
-#
-
-#
-# configuration
-install -m0755 -d ${RPM_BUILD_ROOT}/etc
-install -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
-
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=${RPM_BUILD_ROOT}
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/libopenal.{l,}a
 
-%post
-/sbin/ldconfig
-/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
+install -Dpm 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/openalrc
 
 
-%preun
-if [ $1 -eq 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
-fi
+%clean
+rm -rf ${RPM_BUILD_ROOT}
 
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING CREDITS README
-%config %{_sysconfdir}/openalrc
-%attr(0644,root,root)%{_libdir}/libopenal.so.*
-%attr(0644,root,root)%{_infodir}/*.info*
+%doc AUTHORS ChangeLog COPYING NOTES README TODO
+%config(noreplace) %{_sysconfdir}/openalrc
+%{_libdir}/libopenal.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc README
-%{_includedir}/AL
-%attr(0644,root,root)%{_libdir}/libopenal.a
-%attr(0644,root,root)%{_libdir}/libopenal.so
-
-%files test
-%defattr(-,root,root,-)
-%{_libdir}/openal
+%doc common/specification/*
+%{_bindir}/openal-config
+%{_includedir}/AL/
+%{_libdir}/libopenal.so
+%{_libdir}/pkgconfig/openal.pc
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.0.8-2
+- switch to non cvs sources
+- major cleanups
+
+* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.0.8-1
+- 0.0.8, patches applied upstream.
+- Mark /etc/openalrc as noreplace.
+- Don't ship static library.
+- Drop test subpackage.
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.0-0.4.20040726
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.0-0.3.20040726
 - rebuilt
 
 * Thu Apr 08 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0.0-0.2.fdr.0.20040726


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:57:47 -0000	1.3
+++ sources	19 Jan 2006 08:43:31 -0000	1.4
@@ -1 +1 @@
-850583d59b54d7298ee843700d3add6f  openal-20040726.tar.bz2
+0379bd39fc84454491ef38434a2e6e8d  openal-0.0.8.tar.gz


--- openal-conf.patch DELETED ---


--- openal-etc_openalrc.patch DELETED ---


--- openal-incl.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 09:01:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:01:20 -0500
Subject: rpms/lcms/devel .cvsignore, 1.5, NONE Makefile, 1.2,
	NONE lcms-1.14-fc4-swigtype.patch, 1.1, NONE lcms.spec, 1.9,
	NONE sources, 1.5, NONE
Message-ID: <200601190901.k0J91MQB014038@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/lcms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12338/devel

Removed Files:
	.cvsignore Makefile lcms-1.14-fc4-swigtype.patch lcms.spec 
	sources 
Log Message:
- version upgrade for fc{3,4}
- remove devel branch (in rawhide now)



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- lcms-1.14-fc4-swigtype.patch DELETED ---


--- lcms.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 09:01:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:01:03 -0500
Subject: rpms/lcms/FC-3 .cvsignore, 1.5, 1.6 lcms.spec, 1.6, 1.7 sources, 1.5,
	1.6
Message-ID: <200601190901.k0J91Z4C014051@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/lcms/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12338/FC-3

Modified Files:
	.cvsignore lcms.spec sources 
Log Message:
- version upgrade for fc{3,4}
- remove devel branch (in rawhide now)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2004 18:40:50 -0000	1.5
+++ .cvsignore	19 Jan 2006 09:01:03 -0000	1.6
@@ -1 +1 @@
-lcms-1.14.tar.gz
+lcms-1.15.tar.gz


Index: lcms.spec
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-3/lcms.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lcms.spec	19 Dec 2004 18:40:50 -0000	1.6
+++ lcms.spec	19 Jan 2006 09:01:03 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           lcms
-Version:        1.14
-Release:        1
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Color Management System.
 
 Group:          Applications/Productivity
 License:        LGPL
 URL:            http://www.littlecms.com/
-Source0:        http://www.littlecms.com/lcms-1.14.tar.gz
+Source0:        http://www.littlecms.com/lcms-1.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.15-1
+- verion upgrade
+
 * Thu May 20 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:1.14-1
 - Update to 1.14.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2004 18:40:50 -0000	1.5
+++ sources	19 Jan 2006 09:01:03 -0000	1.6
@@ -1 +1 @@
-a1ea406408099300ee994e4b9daee19a  lcms-1.14.tar.gz
+76c921973fdea4f880944a024197f924  lcms-1.15.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 09:01:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:01:05 -0500
Subject: rpms/lcms/FC-4 .cvsignore, 1.5, 1.6 lcms.spec, 1.8, 1.9 sources, 1.5,
	1.6 lcms-1.14-fc4-swigtype.patch, 1.1, NONE
Message-ID: <200601190901.k0J91c7s014054@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/lcms/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12338/FC-4

Modified Files:
	.cvsignore lcms.spec sources 
Removed Files:
	lcms-1.14-fc4-swigtype.patch 
Log Message:
- version upgrade for fc{3,4}
- remove devel branch (in rawhide now)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2004 18:40:50 -0000	1.5
+++ .cvsignore	19 Jan 2006 09:01:04 -0000	1.6
@@ -1 +1 @@
-lcms-1.14.tar.gz
+lcms-1.15.tar.gz


Index: lcms.spec
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-4/lcms.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lcms.spec	22 May 2005 17:22:38 -0000	1.8
+++ lcms.spec	19 Jan 2006 09:01:04 -0000	1.9
@@ -1,15 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           lcms
-Version:        1.14
-Release:        3
+Version:        1.15
+Release:        1%{?dist}
 Summary:        Color Management System
 
 Group:          Applications/Productivity
 License:        LGPL
 URL:            http://www.littlecms.com/
-Source0:        http://www.littlecms.com/lcms-1.14.tar.gz
-Patch0:         lcms-1.14-fc4-swigtype.patch
+Source0:        http://www.littlecms.com/lcms-1.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libjpeg-devel
@@ -49,8 +48,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .fc4-swigtype
-
 
 %build
 %configure --with-python
@@ -98,6 +95,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.15-1
+- version upgrade
+- remove swigtype patch (applied upstream)
+
 * Sun May 22 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.14-3
 - Fix FC4 build (#114146).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lcms/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2004 18:40:50 -0000	1.5
+++ sources	19 Jan 2006 09:01:04 -0000	1.6
@@ -1 +1 @@
-a1ea406408099300ee994e4b9daee19a  lcms-1.14.tar.gz
+76c921973fdea4f880944a024197f924  lcms-1.15.tar.gz


--- lcms-1.14-fc4-swigtype.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 09:15:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 04:15:27 -0500
Subject: owners owners.list,1.548,1.549
Message-ID: <200601190916.k0J9GFUu014520@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14450

Modified Files:
	owners.list 
Log Message:
- take ownership of scribus, scribus-templates, lcms, openal
- add torsmo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -r1.548 -r1.549
--- owners.list	18 Jan 2006 16:44:36 -0000	1.548
+++ owners.list	19 Jan 2006 09:15:26 -0000	1.549
@@ -477,7 +477,7 @@
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|lcms|Color Management System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -682,7 +682,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1134,8 +1134,8 @@
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|scribus|DeskTop Publishing app in QT|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|scribus-templates|This package includes additional templates for Scribus|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|scribus|DeskTop Publishing app in QT|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|scribus-templates|This package includes additional templates for Scribus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_gfx|Graphic primitives, rotozoomer, framerate control and image filters|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_image|A sample image loading library for SDL.|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -1238,6 +1238,7 @@
 Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 09:19:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 19 Jan 2006 04:19:38 -0500
Subject: rpms/grads/FC-4 grads.spec,1.5,1.6
Message-ID: <200601190920.k0J9KPnC014718@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14701

Modified Files:
	grads.spec 
Log Message:
* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
- add BR on readline-devel close #178285



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grads.spec	23 Dec 2005 09:10:40 -0000	1.5
+++ grads.spec	19 Jan 2006 09:19:38 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.2
+Release:        6%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -34,11 +34,10 @@
 BuildRequires:  hdf-devel 
 %endif
 BuildRequires:  udunits-devel netcdf-devel 
-#BuildRequires:  opendap-devel
+BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-#Requires:       
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -109,7 +108,10 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5.2
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+- add BR on readline-devel close #178285
+
+* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-4



From fedora-extras-commits at redhat.com  Thu Jan 19 11:15:36 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:15:36 -0500
Subject: rpms/python-4Suite-XML - New directory
Message-ID: <200601191115.k0JBFcB9018835@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18827/python-4Suite-XML

Log Message:
Directory /cvs/extras/rpms/python-4Suite-XML added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 11:15:42 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:15:42 -0500
Subject: rpms/python-4Suite-XML/devel - New directory
Message-ID: <200601191115.k0JBFiVZ018850@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18827/python-4Suite-XML/devel

Log Message:
Directory /cvs/extras/rpms/python-4Suite-XML/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:00 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:00 -0500
Subject: rpms/python-4Suite-XML Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601191116.k0JBG2fZ018884@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18872

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-4Suite-XML


--- NEW FILE Makefile ---
# Top level Makefile for module python-4Suite-XML
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:06 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:06 -0500
Subject: rpms/python-4Suite-XML/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601191116.k0JBG84P018906@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18872/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-4Suite-XML


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:44 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:44 -0500
Subject: rpms/python-4Suite-XML import.log,1.1,1.2
Message-ID: <200601191117.k0JBHG7M018977@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18943

Modified Files:
	import.log 
Log Message:
auto-import python-4Suite-XML-1.0-0.3.b3 on branch devel from python-4Suite-XML-1.0-0.3.b3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 11:16:00 -0000	1.1
+++ import.log	19 Jan 2006 11:16:43 -0000	1.2
@@ -0,0 +1 @@
+python-4Suite-XML-1_0-0_3_b3:HEAD:python-4Suite-XML-1.0-0.3.b3.src.rpm:1137669422



From fedora-extras-commits at redhat.com  Thu Jan 19 11:16:50 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:16:50 -0500
Subject: rpms/python-4Suite-XML/devel python-4Suite-XML.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601191117.k0JBHMi9018981@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/python-4Suite-XML/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18943/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-4Suite-XML.spec 
Log Message:
auto-import python-4Suite-XML-1.0-0.3.b3 on branch devel from python-4Suite-XML-1.0-0.3.b3.src.rpm


--- NEW FILE python-4Suite-XML.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define ver 1.0b3

Name: python-4Suite-XML
Version: 1.0
Release: 0.3.b3
Summary: A collection of XML-related technologies for Python

Group: Development/Libraries
License: Apacheish
URL: http://www.4suite.org/
Source0: http://dl.sourceforge.net/foursuite/4Suite-XML-%{ver}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: python-devel
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
4Suite-XML is a suite of Python modules for XML and RDF processing.
Its major components include the following:

 * Ft.Xml.Domlette: A very fast, lightweight XPath-oriented DOM.
 * Ft.Xml.XPath: An XPath 1.0 implementation for Domlette documents.
 * Ft.Xml.Xslt: A robust XSLT 1.0 processor.
 * Ft.Lib: Various support libraries that can be used independently.

%prep
%setup -q -n 4Suite-%{ver}

%build
export CFLAGS="$RPM_OPT_FLAGS"
python setup.py config --system --pythonlibdir=%{python_sitearch} \
	--bindir=%{_bindir} --datadir=%{_datadir}/4Suite \
	--sysconfdir=%{_sysconfdir}/4Suite \
	--localstatedir=%{_localstatedir}/lib/4Suite \
	--libdir=%{_libdir}/4Suite --docdir=%{_datadir}/doc/4Suite \
	--localedir=%{_datadir}/locale --mandir=%{_mandir}
python setup.py build

%install
rm -rf $RPM_BUILD_ROOT

python setup.py bdist_install -O1 --root=$RPM_BUILD_ROOT

chmod a-x $RPM_BUILD_ROOT%{_datadir}/4Suite/Data/Stylesheets/*.xslt

# Move documentation to the right place
mv $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/html html
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/4Suite/xml

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc COPYRIGHT README html
%{_bindir}/4*
%exclude %{_libdir}/4Suite
%{python_sitearch}/Ft
%{_datadir}/4Suite

%changelog
* Fri Jan  6 2006 Miloslav Trmac <mitr at redhat.com> - 1.0-0.3.b3
- Fix Summary:
- Use an URL in Source0:

* Thu Jan  5 2006 Miloslav Trmac <mitr at redhat.com> - 1.0-0.2.b3
- Require python-abi
- Ship .pyo files
- Use macros instead of hardcoded paths

* Tue Dec 13 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-0.1.b3
- Update to 4Suite-XML-1.0b3

* Mon Nov  7 2005 Miloslav Trmac <mitr at redhat.com> - 1.0-0.1.b2
- Initial package, based on Fedora Core 4Suite-1.0-9.b1.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 11:16:06 -0000	1.1
+++ .cvsignore	19 Jan 2006 11:16:49 -0000	1.2
@@ -0,0 +1 @@
+4Suite-XML-1.0b3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-4Suite-XML/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 11:16:06 -0000	1.1
+++ sources	19 Jan 2006 11:16:49 -0000	1.2
@@ -0,0 +1 @@
+9decb8b1032415ae155fe9a917fe8126  4Suite-XML-1.0b3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 11:21:18 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Thu, 19 Jan 2006 06:21:18 -0500
Subject: owners owners.list,1.549,1.550
Message-ID: <200601191121.k0JBLoZZ019052@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19035

Modified Files:
	owners.list 
Log Message:
Add python-4Suite-XML



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -r1.549 -r1.550
--- owners.list	19 Jan 2006 09:15:26 -0000	1.549
+++ owners.list	19 Jan 2006 11:21:18 -0000	1.550
@@ -1017,6 +1017,7 @@
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|colin at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 11:27:23 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Jan 2006 06:27:23 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200601191127.k0JBRu6W019147@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19121

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
New upstream version 1.3.82



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkwave.spec	13 Dec 2005 14:05:50 -0000	1.3
+++ gtkwave.spec	19 Jan 2006 11:27:23 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.81
+Version:		1.3.82
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
+- update to 1.3.82
+
 * Tue Dec 13 2005 Paul Howarth <paul at city-fan.org> 1.3.81-1
 - update to 1.3.81
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 14:05:50 -0000	1.4
+++ sources	19 Jan 2006 11:27:23 -0000	1.5
@@ -1 +1 @@
-3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz
+0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 14:05:50 -0000	1.4
+++ .cvsignore	19 Jan 2006 11:27:23 -0000	1.5
@@ -1 +1 @@
-gtkwave-1.3.81.tgz
+gtkwave-1.3.82.tgz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:30:04 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Jan 2006 06:30:04 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200601191130.k0JBUati019225@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19195

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkwave.spec	13 Dec 2005 14:09:46 -0000	1.3
+++ gtkwave.spec	19 Jan 2006 11:30:03 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.81
+Version:		1.3.82
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
+- update to 1.3.82
+
 * Tue Dec 13 2005 Paul Howarth <paul at city-fan.org> 1.3.81-1
 - update to 1.3.81
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 14:09:46 -0000	1.4
+++ sources	19 Jan 2006 11:30:03 -0000	1.5
@@ -1 +1 @@
-3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz
+0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 14:09:46 -0000	1.4
+++ .cvsignore	19 Jan 2006 11:30:03 -0000	1.5
@@ -1 +1 @@
-gtkwave-1.3.81.tgz
+gtkwave-1.3.82.tgz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:30:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Jan 2006 06:30:49 -0500
Subject: rpms/perl-Glib/FC-4 .cvsignore, 1.6, 1.7 perl-Glib.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200601191131.k0JBVMOi019301@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19222/FC-4

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
- Update to 1.103.
- Provides list: filtered out perl(MY) (#177956).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Jan 2006 16:31:57 -0000	1.6
+++ .cvsignore	19 Jan 2006 11:30:49 -0000	1.7
@@ -1 +1 @@
-Glib-1.102.tar.gz
+Glib-1.103.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/perl-Glib.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Glib.spec	2 Jan 2006 16:31:57 -0000	1.10
+++ perl-Glib.spec	19 Jan 2006 11:30:49 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Glib
-Version:        1.102
+Version:        1.103
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
@@ -12,7 +12,7 @@
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  glib2-devel
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module provides perl access to Glib and GLib's GObject libraries.
@@ -26,6 +26,15 @@
 %prep
 %setup -q -n Glib-%{version}
 
+# Provides: exclude perl(MY)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(MY)$'
+__EOF__
+%define __perl_provides %{_builddir}/Glib-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
@@ -57,6 +66,10 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.103-1
+- Update to 1.103.
+- Provides list: filtered out perl(MY) (#177956).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
 - Update to 1.102.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Jan 2006 16:31:58 -0000	1.6
+++ sources	19 Jan 2006 11:30:49 -0000	1.7
@@ -1 +1 @@
-d49aa86f0c77f04c0a196414ba0a27fa  Glib-1.102.tar.gz
+fe8d123a872776a0c5cae50d513bf938  Glib-1.103.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:30:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Jan 2006 06:30:55 -0500
Subject: rpms/perl-Glib/devel .cvsignore, 1.8, 1.9 perl-Glib.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200601191131.k0JBVSMQ019306@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19222/devel

Modified Files:
	.cvsignore perl-Glib.spec sources 
Log Message:
- Update to 1.103.
- Provides list: filtered out perl(MY) (#177956).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Nov 2005 15:15:22 -0000	1.8
+++ .cvsignore	19 Jan 2006 11:30:55 -0000	1.9
@@ -1 +1 @@
-Glib-1.102.tar.gz
+Glib-1.103.tar.gz


Index: perl-Glib.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Glib.spec	30 Nov 2005 15:15:22 -0000	1.12
+++ perl-Glib.spec	19 Jan 2006 11:30:55 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Glib
-Version:        1.102
+Version:        1.103
 Release:        1%{?dist}
 Summary:        Perl interface to GLib
 
@@ -12,7 +12,7 @@
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  glib2-devel
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module provides perl access to Glib and GLib's GObject libraries.
@@ -26,6 +26,15 @@
 %prep
 %setup -q -n Glib-%{version}
 
+# Provides: exclude perl(MY)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(MY)$'
+__EOF__
+%define __perl_provides %{_builddir}/Glib-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
@@ -57,6 +66,10 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.103-1
+- Update to 1.103.
+- Provides list: filtered out perl(MY) (#177956).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
 - Update to 1.102.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Nov 2005 15:15:22 -0000	1.8
+++ sources	19 Jan 2006 11:30:55 -0000	1.9
@@ -1 +1 @@
-d49aa86f0c77f04c0a196414ba0a27fa  Glib-1.102.tar.gz
+fe8d123a872776a0c5cae50d513bf938  Glib-1.103.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 11:32:28 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 19 Jan 2006 06:32:28 -0500
Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.3, 1.4 sources, 1.4,
	1.5 .cvsignore, 1.4, 1.5
Message-ID: <200601191133.k0JBX1s1019408@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19353

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtkwave.spec	13 Dec 2005 14:12:18 -0000	1.3
+++ gtkwave.spec	19 Jan 2006 11:32:28 -0000	1.4
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.81
+Version:		1.3.82
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
+- update to 1.3.82
+
 * Tue Dec 13 2005 Paul Howarth <paul at city-fan.org> 1.3.81-1
 - update to 1.3.81
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Dec 2005 14:12:18 -0000	1.4
+++ sources	19 Jan 2006 11:32:28 -0000	1.5
@@ -1 +1 @@
-3dfd17856187c816b533aec1e78e80cb  gtkwave-1.3.81.tgz
+0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Dec 2005 14:12:18 -0000	1.4
+++ .cvsignore	19 Jan 2006 11:32:28 -0000	1.5
@@ -1 +1 @@
-gtkwave-1.3.81.tgz
+gtkwave-1.3.82.tgz



From fedora-extras-commits at redhat.com  Thu Jan 19 12:26:45 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Thu, 19 Jan 2006 07:26:45 -0500
Subject: rpms/fbida/devel fbida.spec,1.10,1.11
Message-ID: <200601191227.k0JCRHLS021489@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21472

Modified Files:
	fbida.spec 
Log Message:
* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-8
- rebuilt



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fbida.spec	18 Jan 2006 08:16:58 -0000	1.10
+++ fbida.spec	19 Jan 2006 12:26:45 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -58,7 +58,8 @@
 %{__mv} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
-%{__mv} %{buildroot}%{_sysconfdir}/X11 %{buildroot}%{_datadir}
+%{__mv} %{buildroot}%{_libdir}/X11 %{buildroot}%{_datadir}
+%{__rm} -rf %{buildroot}%{_libdir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +84,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-8
+- rebuilt
+
 * Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-7
 - moved file Ida to %%{_datadir}/X11/app-defaults
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:37:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:37:28 -0500
Subject: rpms/treecc/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 treecc.spec,
	1.6, 1.7
Message-ID: <200601191238.k0JCc18R021610@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/treecc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553/FC-3

Modified Files:
	.cvsignore sources treecc.spec 
Log Message:
- version upgrade
- use one spec for all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2004 06:20:12 -0000	1.5
+++ .cvsignore	19 Jan 2006 12:37:28 -0000	1.6
@@ -1 +1 @@
-treecc-0.3.4.tar.gz
+treecc-0.3.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2004 06:20:12 -0000	1.5
+++ sources	19 Jan 2006 12:37:28 -0000	1.6
@@ -1 +1 @@
-c6cbc91a03ae5c46afdb32c7f87fa560  treecc-0.3.4.tar.gz
+ca26c97d00cff28fa312155b2228ff97  treecc-0.3.8.tar.gz


Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-3/treecc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- treecc.spec	20 Feb 2005 20:11:12 -0000	1.6
+++ treecc.spec	19 Jan 2006 12:37:28 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           treecc
-Version:        0.3.4
-Release:        2
-Summary:        Tree Compiler Compiler.
+Version:        0.3.8
+Release:        1%{?dist}
+
+Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://dotgnu.org/
-Source0:        ftp://ftp.gnu.org/gnu/dotgnu/pnet/treecc-0.3.4.tar.gz
+URL:            http://www.southern-storm.com.au/treecc.html
+Source0:        http://www.southern-storm.com.au/download/treecc-0.3.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison >= 1.28
@@ -37,7 +38,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtreecc.a
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -47,7 +48,7 @@
 
 
 %preun
-if [ "$1" -eq 0 ]; then
+if [ $1 -eq 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir 2>/dev/null || :
 fi
 
@@ -61,6 +62,17 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.3.8-1
+- same spec for all arches hence add dist
+- upgrade to new version
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.3.4-4
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sun Feb 20 2005 David Woodhouse <dwmw2 at infradead.org> 0.3.4-2
 - Don't package %%{_infodir}/dir
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:37:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:37:34 -0500
Subject: rpms/treecc/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 treecc.spec,
	1.9, 1.10
Message-ID: <200601191238.k0JCc67l021615@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/treecc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553/FC-4

Modified Files:
	.cvsignore sources treecc.spec 
Log Message:
- version upgrade
- use one spec for all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2004 06:20:12 -0000	1.5
+++ .cvsignore	19 Jan 2006 12:37:34 -0000	1.6
@@ -1 +1 @@
-treecc-0.3.4.tar.gz
+treecc-0.3.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2004 06:20:12 -0000	1.5
+++ sources	19 Jan 2006 12:37:34 -0000	1.6
@@ -1 +1 @@
-c6cbc91a03ae5c46afdb32c7f87fa560  treecc-0.3.4.tar.gz
+ca26c97d00cff28fa312155b2228ff97  treecc-0.3.8.tar.gz


Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/FC-4/treecc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- treecc.spec	23 May 2005 00:08:46 -0000	1.9
+++ treecc.spec	19 Jan 2006 12:37:34 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           treecc
-Version:        0.3.4
-Release: 4
+Version:        0.3.8
+Release:        1%{?dist}
 
 Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://dotgnu.org/
-Source0:        ftp://ftp.gnu.org/gnu/dotgnu/pnet/treecc-0.3.4.tar.gz
+URL:            http://www.southern-storm.com.au/treecc.html
+Source0:        http://www.southern-storm.com.au/download/treecc-0.3.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison >= 1.28
@@ -38,7 +38,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtreecc.a
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -62,6 +62,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.3.8-1
+- same spec for all arches hence add dist
+- upgrade to new version
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.3.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:37:40 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:37:40 -0500
Subject: rpms/treecc/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 treecc.spec,
	1.9, 1.10
Message-ID: <200601191238.k0JCcC0K021620@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/treecc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21553/devel

Modified Files:
	.cvsignore sources treecc.spec 
Log Message:
- version upgrade
- use one spec for all branches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Nov 2004 06:20:12 -0000	1.5
+++ .cvsignore	19 Jan 2006 12:37:40 -0000	1.6
@@ -1 +1 @@
-treecc-0.3.4.tar.gz
+treecc-0.3.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Nov 2004 06:20:12 -0000	1.5
+++ sources	19 Jan 2006 12:37:40 -0000	1.6
@@ -1 +1 @@
-c6cbc91a03ae5c46afdb32c7f87fa560  treecc-0.3.4.tar.gz
+ca26c97d00cff28fa312155b2228ff97  treecc-0.3.8.tar.gz


Index: treecc.spec
===================================================================
RCS file: /cvs/extras/rpms/treecc/devel/treecc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- treecc.spec	23 May 2005 00:08:46 -0000	1.9
+++ treecc.spec	19 Jan 2006 12:37:40 -0000	1.10
@@ -1,13 +1,13 @@
 Name:           treecc
-Version:        0.3.4
-Release: 4
+Version:        0.3.8
+Release:        1%{?dist}
 
 Summary:        Tree Compiler Compiler
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://dotgnu.org/
-Source0:        ftp://ftp.gnu.org/gnu/dotgnu/pnet/treecc-0.3.4.tar.gz
+URL:            http://www.southern-storm.com.au/treecc.html
+Source0:        http://www.southern-storm.com.au/download/treecc-0.3.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bison >= 1.28
@@ -38,7 +38,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtreecc.a
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -62,6 +62,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.3.8-1
+- same spec for all arches hence add dist
+- upgrade to new version
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.3.4-4
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Thu Jan 19 12:51:48 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 07:51:48 -0500
Subject: owners owners.list,1.550,1.551
Message-ID: <200601191252.k0JCqK1S021682@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21663

Modified Files:
	owners.list 
Log Message:
- take treecc



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.550
retrieving revision 1.551
diff -u -r1.550 -r1.551
--- owners.list	19 Jan 2006 11:21:18 -0000	1.550
+++ owners.list	19 Jan 2006 12:51:48 -0000	1.551
@@ -1243,7 +1243,7 @@
 Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
-Fedora Extras|treecc|Tree Compiler Compiler|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 15:51:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 19 Jan 2006 10:51:23 -0500
Subject: rpms/kasablanca/devel kasablanca-0.4.0.2-dt.patch, NONE,
	1.1 kasablanca.spec, 1.10, 1.11
Message-ID: <200601191551.k0JFptPR027463@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27443

Modified Files:
	kasablanca.spec 
Added Files:
	kasablanca-0.4.0.2-dt.patch 
Log Message:
* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
- drop x-modular hack(s) (kdelibs-devel fixed)
- .desktop: GenericName=FTP client
- update %description


kasablanca-0.4.0.2-dt.patch:

--- NEW FILE kasablanca-0.4.0.2-dt.patch ---
--- kasablanca-0.4.0.2/src/kasablanca.desktop.dt	2004-03-22 12:58:39.000000000 -0600
+++ kasablanca-0.4.0.2/src/kasablanca.desktop	2006-01-19 09:48:07.000000000 -0600
@@ -1,26 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=kasablanca
-Name[xx]=xxkasablancaxx
+GenericName=FTP Client
 Exec=kasablanca
 Icon=kasablanca
 Type=Application
-Comment=A simple KDE Application
-Comment[ca]=Una simple aplicaci?? KDE
-Comment[da]=Et simpelt KDE program
-Comment[de]=Eine einfache KDE-Anwendung
-Comment[el]=?????? ???????? ???????????????? ?????? KDE
-Comment[es]=Una aplicaci??n de KDE sencilla
-Comment[et]=Lihtne KDE rakendus
-Comment[fr]=Une application simple pour KDE.
-Comment[hu]=Egyszer?? KDE-alkalmaz??s
-Comment[it]=Una semplice applicazione KDE
-Comment[nl]=Een eenvoudige KDE-toepassing
-Comment[pt]=Uma aplica????o KDE simples
-Comment[pt_BR]=Um simples Aplicativo do KDE
-Comment[ru]=?????????????? ???????????????????? KDE
-Comment[sl]=Preprost program za KDE
-Comment[sr]=?????????????????????? KDE ??????????????
-Comment[sv]=Ett enkelt KDE-program
-Comment[xx]=xxA simple KDE Applicationxx
-Comment[zh_CN]=???????????????KDE????????????


Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kasablanca.spec	19 Dec 2005 21:25:47 -0000	1.10
+++ kasablanca.spec	19 Jan 2006 15:51:23 -0000	1.11
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -14,15 +14,16 @@
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
-# Workaround for kdelibs-devel missing deps:
-# http://bugzilla.redhat.com/bugzilla/176159
-%if "%{?fedora}" > "4"
-BuildRequires: xorg-x11-proto-devel libXt-devel
-%endif
 
 %description
-Kasablanca is an ftp client for KDE, among its features are currently 
-encryption (auth tls) support, fxp, site bookmarks, and queued transfers.
+Kasablanca is an ftp client for KDE, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
 
 
 %prep
@@ -104,12 +105,17 @@
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
+- drop x-modular hack(s) (kdelibs-devel fixed)
+- .desktop: GenericName=FTP client
+- update %%description
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-6
 - fix for modular X
 - workaround kdelibs-devel missing deps (#176159)



From fedora-extras-commits at redhat.com  Thu Jan 19 15:57:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 19 Jan 2006 10:57:47 -0500
Subject: rpms/kasablanca/devel kasablanca.spec,1.11,1.12
Message-ID: <200601191558.k0JFwKoB027498@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27481

Modified Files:
	kasablanca.spec 
Log Message:
actually *use* -dt.patch



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kasablanca.spec	19 Jan 2006 15:51:23 -0000	1.11
+++ kasablanca.spec	19 Jan 2006 15:57:47 -0000	1.12
@@ -10,6 +10,8 @@
 Group: 	 Applications/Internet 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kasablanca-0.4.0.2-dt.patch
+
 BuildRequires: gettext 
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
@@ -29,6 +31,8 @@
 %prep
 %setup -q 
 
+%patch1 -p1 -b .dt
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh



From fedora-extras-commits at redhat.com  Thu Jan 19 15:59:21 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 19 Jan 2006 10:59:21 -0500
Subject: rpms/kasablanca/FC-4 kasablanca-0.4.0.2-dt.patch, NONE,
	1.1 kasablanca.spec, 1.10, 1.11
Message-ID: <200601191559.k0JFxr5X027568@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27543

Modified Files:
	kasablanca.spec 
Added Files:
	kasablanca-0.4.0.2-dt.patch 
Log Message:
* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
- drop x-modular hack(s) (kdelibs-devel fixed)
- .desktop: GenericName=FTP client
- update %description


kasablanca-0.4.0.2-dt.patch:

--- NEW FILE kasablanca-0.4.0.2-dt.patch ---
--- kasablanca-0.4.0.2/src/kasablanca.desktop.dt	2004-03-22 12:58:39.000000000 -0600
+++ kasablanca-0.4.0.2/src/kasablanca.desktop	2006-01-19 09:48:07.000000000 -0600
@@ -1,26 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=kasablanca
-Name[xx]=xxkasablancaxx
+GenericName=FTP Client
 Exec=kasablanca
 Icon=kasablanca
 Type=Application
-Comment=A simple KDE Application
-Comment[ca]=Una simple aplicaci?? KDE
-Comment[da]=Et simpelt KDE program
-Comment[de]=Eine einfache KDE-Anwendung
-Comment[el]=?????? ???????? ???????????????? ?????? KDE
-Comment[es]=Una aplicaci??n de KDE sencilla
-Comment[et]=Lihtne KDE rakendus
-Comment[fr]=Une application simple pour KDE.
-Comment[hu]=Egyszer?? KDE-alkalmaz??s
-Comment[it]=Una semplice applicazione KDE
-Comment[nl]=Een eenvoudige KDE-toepassing
-Comment[pt]=Uma aplica????o KDE simples
-Comment[pt_BR]=Um simples Aplicativo do KDE
-Comment[ru]=?????????????? ???????????????????? KDE
-Comment[sl]=Preprost program za KDE
-Comment[sr]=?????????????????????? KDE ??????????????
-Comment[sv]=Ett enkelt KDE-program
-Comment[xx]=xxA simple KDE Applicationxx
-Comment[zh_CN]=???????????????KDE????????????


Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kasablanca.spec	19 Dec 2005 21:25:42 -0000	1.10
+++ kasablanca.spec	19 Jan 2006 15:59:20 -0000	1.11
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -10,24 +10,29 @@
 Group: 	 Applications/Internet 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kasablanca-0.4.0.2-dt.patch
+
 BuildRequires: gettext 
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
-# Workaround for kdelibs-devel missing deps:
-# http://bugzilla.redhat.com/bugzilla/176159
-%if "%{?fedora}" > "4"
-BuildRequires: xorg-x11-proto-devel libXt-devel
-%endif
 
 %description
-Kasablanca is an ftp client for KDE, among its features are currently 
-encryption (auth tls) support, fxp, site bookmarks, and queued transfers.
+Kasablanca is an ftp client for KDE, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
 
 
 %prep
 %setup -q 
 
+%patch1 -p1 -b .dt
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -104,12 +109,17 @@
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
+- drop x-modular hack(s) (kdelibs-devel fixed)
+- .desktop: GenericName=FTP client
+- update %%description
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-6
 - fix for modular X
 - workaround kdelibs-devel missing deps (#176159)



From fedora-extras-commits at redhat.com  Thu Jan 19 16:24:33 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 11:24:33 -0500
Subject: rpms/blender/devel .cvsignore, 1.6, 1.7 blender.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200601191625.k0JGP6IH029422@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29401

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Jun 2005 00:22:58 -0000	1.6
+++ .cvsignore	19 Jan 2006 16:24:33 -0000	1.7
@@ -1 +1 @@
-blender-2.37.tar.gz
+blender-2.40.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blender.spec	8 Jul 2005 10:41:39 -0000	1.13
+++ blender.spec	19 Jan 2006 16:24:33 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           blender
-Version:        2.37
-Release:        3
+Version:        2.40
+Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.blender.org
-Source0:        http://download.blender.org/source/blender-2.37.tar.gz
+Source0:        http://download.blender.org/source/blender-%{version}.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
 Source3:        blender.png
@@ -45,8 +45,8 @@
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1 -b .x86_64
+%setup -q 
+# %patch0 -p1 -b .x86_64
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+- New upstream release.
+
 * Mon Jun 6 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-3
 - Bump release for development.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Jun 2005 00:22:58 -0000	1.6
+++ sources	19 Jan 2006 16:24:33 -0000	1.7
@@ -1 +1 @@
-a233a77abcc5561fbe2c5fe307654b41  blender-2.37.tar.gz
+3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 16:43:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 19 Jan 2006 11:43:07 -0500
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.9, 1.10 perl-Gtk2.spec, 1.13,
	1.14 sources, 1.9, 1.10
Message-ID: <200601191643.k0JGhdh7029578@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29545

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
- Update to 1.103.
- Converted the Gtk2::Helper man page to utf8 (#177802).
- Provides list: filtered out perl(main) (#177802).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Nov 2005 15:34:03 -0000	1.9
+++ .cvsignore	19 Jan 2006 16:43:07 -0000	1.10
@@ -1 +1 @@
-Gtk2-1.102.tar.gz
+Gtk2-1.103.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- perl-Gtk2.spec	30 Nov 2005 15:34:03 -0000	1.13
+++ perl-Gtk2.spec	19 Jan 2006 16:43:07 -0000	1.14
@@ -1,5 +1,11 @@
+#
+# Rebuild option:
+#
+#   --with testsuite         - run the test suite (requires X)
+#
+
 Name:           perl-Gtk2
-Version:        1.102
+Version:        1.103
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -10,10 +16,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 2:5.8.0
-BuildRequires:  gtk2-devel, perl-Glib >= 1.102
+BuildRequires:  gtk2-devel, perl-Glib >= 1.103
 BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
-Requires:       perl-Glib >= 1.102
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl-Glib >= 1.103
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module allows you to write Gtk+ graphical user interfaces in a
@@ -25,6 +31,17 @@
 %prep
 %setup -q -n Gtk2-%{version}
 
+iconv -f iso-8859-1 -t utf-8 -o pm/Helper.pm{.utf8,}
+mv pm/Helper.pm{.utf8,}
+
+# Provides: exclude perl(main)
+cat <<__EOF__ > %{name}-perl.prov
+#!/bin/sh
+/usr/lib/rpm/perl.prov \$* | grep -v '^perl(main)$'
+__EOF__
+%define __perl_provides %{_builddir}/Gtk2-%{version}/%{name}-perl.prov
+chmod +x %{__perl_provides}
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -41,8 +58,7 @@
 
 
 %check
-# Testing requires X
-%{?_with_tests:make test}
+%{?_with_testsuite:make test}
 
 
 %clean
@@ -59,6 +75,11 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.103-1
+- Update to 1.103.
+- Converted the Gtk2::Helper man page to utf8 (#177802).
+- Provides list: filtered out perl(main) (#177802).
+
 * Wed Nov 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.102-1
 - Update to 1.102.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Nov 2005 15:34:03 -0000	1.9
+++ sources	19 Jan 2006 16:43:07 -0000	1.10
@@ -1 +1 @@
-8bd7173c8a2b6b8baf2fa3c3d48d4bb5  Gtk2-1.102.tar.gz
+7c7a6970cd58756a19c787976306e635  Gtk2-1.103.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 18:05:29 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Thu, 19 Jan 2006 13:05:29 -0500
Subject: CVSROOT avail,1.23,1.24
Message-ID: <200601191805.k0JI5TSG000957@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv935

Modified Files:
	avail 
Log Message:
Adding new maintainers of Fedora Trans to the proper ACLS to work on and add their own docs.


Index: avail
===================================================================
RCS file: /cvs/fedora/CVSROOT/avail,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- avail	4 Jan 2006 20:37:13 -0000	1.23
+++ avail	19 Jan 2006 18:05:10 -0000	1.24
@@ -27,11 +27,12 @@
 avail | sopwith,dwalsh,kwade | web/html/About/Projects
 avail | alikins,trobert | web/html/Download
 avail | llch | web/html/About/Projects/i18n
-avail | sarahs | web/html/About/Projects/translations
+avail | sarahs,aalam,ccheng | web/html/About/Projects/translations
 avail | kwade,pfrields | web/html/docs
-avail | sarahs | web/html/docs/translation-faq
-avail | sarahs | web/html/docs/translation-guide
-avail | sarahs | web/html/docs/translation-windows
+avail | sarahs,aalam,ccheng | web/html/docs/translation-faq
+avail | sarahs,aalam,ccheng | web/html/docs/translation-guide
+avail | sarahs,aalam,ccheng | web/html/docs/translation-windows
+avail | sarahs,aalam,ccheng | web/html/docs/translation-quick-start-guide
 avail | dmalcolm | web/html/About/Projects/stateless
 avail | dmalcolm | web/html/docs/stateless
 avail | riel | web/html/docs/virtualisation



From fedora-extras-commits at redhat.com  Thu Jan 19 18:21:11 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Jan 2006 13:21:11 -0500
Subject: rpms/celestia/devel celestia.spec,1.11,1.12
Message-ID: <200601191821.k0JILheU001283@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1263

Modified Files:
	celestia.spec 
Log Message:
Remove redundant BR: xorg-x11-proto-devel.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- celestia.spec	14 Jan 2006 22:16:05 -0000	1.11
+++ celestia.spec	19 Jan 2006 18:21:11 -0000	1.12
@@ -18,7 +18,6 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libGL-devel
-BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  libXt-devel
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -99,7 +98,7 @@
 
 %changelog
 * Thu Jan 05 2006 Steven Pritchard <steve at kspei.com> 1.4.0-2
-- Add BR: xorg-x11-proto-devel, libXt-devel
+- Add BR: libXt-devel
 
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0



From fedora-extras-commits at redhat.com  Thu Jan 19 18:28:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 19 Jan 2006 13:28:13 -0500
Subject: rpms/perl-HTML-Mason/devel perl-HTML-Mason.spec,1.3,1.4
Message-ID: <200601191828.k0JISjZt001397@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-HTML-Mason/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1380

Modified Files:
	perl-HTML-Mason.spec 
Log Message:
Epoch bump to resolve rpm thinking 1.3101 > 1.32.



Index: perl-HTML-Mason.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Mason/devel/perl-HTML-Mason.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTML-Mason.spec	11 Jan 2006 01:00:28 -0000	1.3
+++ perl-HTML-Mason.spec	19 Jan 2006 18:28:12 -0000	1.4
@@ -1,6 +1,7 @@
 Name:           perl-HTML-Mason
 Version:        1.32
-Release:        1%{?dist}
+Release:        2%{?dist}
+Epoch:          1
 Summary:        Powerful Perl-based web site development and delivery engine
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -80,6 +81,9 @@
 %dir %{_localstatedir}/www/mason
 
 %changelog
+* Thu Jan 19 2006 Steven Pritchard <steve at kspei.com> 1:1.32-2
+- Epoch bump to resolve rpm thinking 1.3101 > 1.32
+
 * Tue Jan 10 2006 Steven Pritchard <steve at kspei.com> 1.32-1
 - Update to 1.32
 



From fedora-extras-commits at redhat.com  Thu Jan 19 18:37:01 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 13:37:01 -0500
Subject: rpms/gdesklets/FC-3 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200601191837.k0JIbXRp001482@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1462

Modified Files:
	.cvsignore sources 
Log Message:

source updated




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	7 Dec 2005 22:14:49 -0000	1.2
+++ .cvsignore	19 Jan 2006 18:37:00 -0000	1.3
@@ -1 +1 @@
-gDesklets-0.35.2.tar.bz2
+gDesklets-0.35.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	7 Dec 2005 22:14:49 -0000	1.2
+++ sources	19 Jan 2006 18:37:00 -0000	1.3
@@ -1 +1 @@
-8d77add2c07cb374a79a30d1d2055f54  gDesklets-0.35.2.tar.bz2
+3f9ce7f2ca4522bc96cb9bc4a4b91774  gDesklets-0.35.3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 19:18:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Jan 2006 14:18:54 -0500
Subject: rpms/perl-Text-Iconv/devel perl-Text-Iconv.spec,1.5,1.6
Message-ID: <200601191919.k0JJJRQP003417@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Text-Iconv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3400

Modified Files:
	perl-Text-Iconv.spec 
Log Message:
* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-3
- Specfile cleanup.



Index: perl-Text-Iconv.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Iconv/devel/perl-Text-Iconv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Text-Iconv.spec	6 Apr 2005 22:13:08 -0000	1.5
+++ perl-Text-Iconv.spec	19 Jan 2006 19:18:54 -0000	1.6
@@ -1,15 +1,12 @@
-%{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
-
 Name:           perl-Text-Iconv
 Version:        1.4
-Release:        2
-
+Release:        3%{?dist}
 Summary:        Perl interface to iconv() codeset conversion function
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Text-Iconv/
-Source0:       http://www.cpan.org/authors/id/M/MP/MPIOTR/Text-Iconv-1.4.tar.gz
+Source0:        http://www.cpan.org/authors/id/M/MP/MPIOTR/Text-Iconv-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl >= 1:5.6.1
@@ -30,21 +27,20 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,13 +51,16 @@
 %files
 %defattr(-,root,root,-)
 %doc Changes README
-%{perl_vendorarch}/auto/Text
-%{perl_vendorarch}/Text
+%{perl_vendorarch}/auto/Text/
+%{perl_vendorarch}/Text/
 %{_mandir}/man3/Text::Iconv.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.4-3
+- Specfile cleanup.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.4-2
 - rebuilt
 
 * Sun Jul 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:1.4-0.fdr.1



From fedora-extras-commits at redhat.com  Thu Jan 19 19:23:19 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Jan 2006 14:23:19 -0500
Subject: rpms/perl-String-Ediff/devel perl-String-Ediff.spec,1.11,1.12
Message-ID: <200601191923.k0JJNprB003531@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-String-Ediff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514

Modified Files:
	perl-String-Ediff.spec 
Log Message:
* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.08-2
- Rebuild, cosmetics.



Index: perl-String-Ediff.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-Ediff/devel/perl-String-Ediff.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-String-Ediff.spec	9 Aug 2005 15:37:37 -0000	1.11
+++ perl-String-Ediff.spec	19 Jan 2006 19:23:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           perl-String-Ediff
 Version:        0.08
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Produce common sub-string indices for two strings
 
 Group:          Development/Libraries
@@ -23,8 +23,8 @@
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 
 %install
@@ -49,10 +49,13 @@
 %doc ChangeLog README
 %{perl_vendorarch}/auto/String/
 %{perl_vendorarch}/String/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/String::Ediff.3*
 
 
 %changelog
+* Thu Jan 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.08-2
+- Rebuild, cosmetics.
+
 * Mon Aug  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.08-1
 - 0.08.
 



From fedora-extras-commits at redhat.com  Thu Jan 19 19:38:09 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 14:38:09 -0500
Subject: rpms/gdesklets/FC-3 gdesklets.spec,1.3,1.4
Message-ID: <200601191938.k0JJcg69003645@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3628

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-3/gdesklets.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gdesklets.spec	17 Jan 2006 23:27:04 -0000	1.3
+++ gdesklets.spec	19 Jan 2006 19:38:09 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,12 +96,14 @@
 
 
 %changelog
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
 - Removed thumbnail schema
 - Removed patch, no longer needed
 
-
 * Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up



From fedora-extras-commits at redhat.com  Thu Jan 19 19:39:38 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 14:39:38 -0500
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.4,1.5
Message-ID: <200601191940.k0JJeA9Q003708@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3689

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdesklets.spec	18 Jan 2006 09:32:35 -0000	1.4
+++ gdesklets.spec	19 Jan 2006 19:39:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1.1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
 - Rebuilt
 



From fedora-extras-commits at redhat.com  Thu Jan 19 19:40:49 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Thu, 19 Jan 2006 14:40:49 -0500
Subject: rpms/gdesklets/devel gdesklets.spec,1.8,1.9
Message-ID: <200601191941.k0JJfMqr003769@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3752

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdesklets.spec	17 Jan 2006 23:36:05 -0000	1.8
+++ gdesklets.spec	19 Jan 2006 19:40:49 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        1.1%{?dist}
+Release:        2%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
+- Rebuilt
+
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1.1
 - Rebuilt
 



From fedora-extras-commits at redhat.com  Thu Jan 19 19:45:51 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 14:45:51 -0500
Subject: rpms/blender/FC-4 .cvsignore, 1.6, 1.7 blender.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200601191946.k0JJkOSv003877@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3840

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    Update to new upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jun 2005 03:47:41 -0000	1.6
+++ .cvsignore	19 Jan 2006 19:45:51 -0000	1.7
@@ -1 +1 @@
-blender-2.37.tar.gz
+blender-2.40.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- blender.spec	8 Jul 2005 10:41:39 -0000	1.13
+++ blender.spec	19 Jan 2006 19:45:51 -0000	1.14
@@ -1,19 +1,18 @@
 Name:           blender
-Version:        2.37
-Release:        2
+Version:        2.40
+Release:        1.%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.blender.org
-Source0:        http://download.blender.org/source/blender-2.37.tar.gz
+Source0:        http://download.blender.org/source/blender-%{version}.tar.gz
 Source1:        http://bane.servebeer.com/programming/blender/import-3ds-0.7.py
 Source2:        http://bane.servebeer.com/programming/blender/export-3ds-0.71.py
 Source3:        blender.png
 Source4:        blender.desktop
 Source5:        blender.xml
-Patch0:         blender-2.37-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -45,8 +44,7 @@
 
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1 -b .x86_64
+%setup -q 
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -93,6 +91,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+- Update to new upstream release.
+
 * Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-2
 - Patch to fix compilation errors on x86_64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jun 2005 03:47:41 -0000	1.6
+++ sources	19 Jan 2006 19:45:51 -0000	1.7
@@ -1 +1 @@
-a233a77abcc5561fbe2c5fe307654b41  blender-2.37.tar.gz
+3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 19:50:50 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:50:50 -0500
Subject: rpms/byzanz - New directory
Message-ID: <200601191950.k0JJoqIA004066@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4058/byzanz

Log Message:
Directory /cvs/extras/rpms/byzanz added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 19:50:56 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:50:56 -0500
Subject: rpms/byzanz/devel - New directory
Message-ID: <200601191950.k0JJowM1004081@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4058/byzanz/devel

Log Message:
Directory /cvs/extras/rpms/byzanz/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 19:51:15 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:51:15 -0500
Subject: rpms/byzanz Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601191951.k0JJpHei004116@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104

Added Files:
	Makefile import.log 
Log Message:
Setup of module byzanz


--- NEW FILE Makefile ---
# Top level Makefile for module byzanz
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 19:51:21 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:51:21 -0500
Subject: rpms/byzanz/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601191951.k0JJpNu3004138@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4104/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module byzanz


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 19:51:58 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:51:58 -0500
Subject: rpms/byzanz import.log,1.1,1.2
Message-ID: <200601191952.k0JJqULH004208@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4174

Modified Files:
	import.log 
Log Message:
auto-import byzanz-0.0.3-2 on branch devel from byzanz-0.0.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/byzanz/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 19:51:14 -0000	1.1
+++ import.log	19 Jan 2006 19:51:58 -0000	1.2
@@ -0,0 +1 @@
+byzanz-0_0_3-2:HEAD:byzanz-0.0.3-2.src.rpm:1137700311



From fedora-extras-commits at redhat.com  Thu Jan 19 19:52:04 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:52:04 -0500
Subject: rpms/byzanz/devel byzanz.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601191952.k0JJqaps004212@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4174/devel

Modified Files:
	.cvsignore sources 
Added Files:
	byzanz.spec 
Log Message:
auto-import byzanz-0.0.3-2 on branch devel from byzanz-0.0.3-2.src.rpm


--- NEW FILE byzanz.spec ---
Summary: A desktop recorder
Name: byzanz
Version: 0.0.3
Release: 2
License: GPL
Group: Applications/Multimedia
URL: http://www.freedesktop.org/~company/byzanz/
Source0: http://www.freedesktop.org/~company/byzanz/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: libXdamage-devel >= 1.0
BuildRequires: glib2-devel >= 2.6.0
BuildRequires: gnome-panel-devel >= 2.10.0
BuildRequires: gnome-vfs2-devel >= 2.12.0
BuildRequires: libgnomeui-devel >= 2.12.0

%description
Byzanz is a desktop recorder. Just like Istanbul. But it doesn't
record to Ogg Theora, but to GIF.

%prep
%setup -q

%build
%configure
make %{?_smp_mflags}

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

%clean
rm -rf %{buildroot}

%files -f byzanz.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS

%{_bindir}/byzanz-record
%{_libdir}/bonobo/servers/ByzanzApplet.server
%{_libexecdir}/byzanz-applet

%changelog
* Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 19:51:20 -0000	1.1
+++ .cvsignore	19 Jan 2006 19:52:04 -0000	1.2
@@ -0,0 +1 @@
+byzanz-0.0.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 19:51:20 -0000	1.1
+++ sources	19 Jan 2006 19:52:04 -0000	1.2
@@ -0,0 +1 @@
+3c57cd11aba49fe05f77709cd9a7d609  byzanz-0.0.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 19:55:27 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 14:55:27 -0500
Subject: owners owners.list,1.551,1.552
Message-ID: <200601191955.k0JJtxJb004272@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4254

Modified Files:
	owners.list 
Log Message:
Added byzanz.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.551
retrieving revision 1.552
diff -u -r1.551 -r1.552
--- owners.list	19 Jan 2006 12:51:48 -0000	1.551
+++ owners.list	19 Jan 2006 19:55:27 -0000	1.552
@@ -85,6 +85,7 @@
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|byzanz|A desktop recorder|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 20:00:27 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Thu, 19 Jan 2006 15:00:27 -0500
Subject: rpms/byzanz/devel byzanz.spec,1.1,1.2
Message-ID: <200601192001.k0JK10dw004334@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4312

Modified Files:
	byzanz.spec 
Log Message:
Bump release.


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- byzanz.spec	19 Jan 2006 19:52:04 -0000	1.1
+++ byzanz.spec	19 Jan 2006 20:00:27 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
 Version: 0.0.3
-Release: 2
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -43,6 +43,9 @@
 %{_libexecdir}/byzanz-applet
 
 %changelog
+* Thu Jan 19 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-3
+- Bump release.
+
 * Fri Jan 13 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-1
 - Initial build.
 



From fedora-extras-commits at redhat.com  Thu Jan 19 20:03:11 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 15:03:11 -0500
Subject: rpms/blender/FC-4 blender.spec,1.14,1.15
Message-ID: <200601192003.k0JK3o4G006091@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6074

Modified Files:
	blender.spec 
Log Message:

  Description:
    Add libtiff-devel as BuildRequires.



Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blender.spec	19 Jan 2006 19:45:51 -0000	1.14
+++ blender.spec	19 Jan 2006 20:03:10 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           blender
 Version:        2.40
-Release:        1.%{?dist}
+Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -30,6 +30,8 @@
 BuildRequires:  scons
 BuildRequires:  SDL-devel
 BuildRequires:  zlib-devel
+BuildRequires:  libtiff-devel
+
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -92,6 +94,7 @@
 
 %changelog
 * Thu Jan 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+- Add libtiff-devel as BuildRequire2.
 - Update to new upstream release.
 
 * Sun Jun 5 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-2



From fedora-extras-commits at redhat.com  Thu Jan 19 20:32:03 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:32:03 -0500
Subject: rpms/lzop import.log,1.5,1.6
Message-ID: <200601192032.k0JKWZs1006433@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6389

Modified Files:
	import.log 
Log Message:
auto-import lzop-1.02-0.1.fc5 on branch devel from lzop-1.02-0.1.fc5.src.rpm
prepare for lzo2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lzop/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	18 Jan 2006 00:06:57 -0000	1.5
+++ import.log	19 Jan 2006 20:32:02 -0000	1.6
@@ -2,3 +2,4 @@
 lzop-1_01-0_fdr_1_1:HEAD:lzop-1.01-0.fdr.1.1.src.rpm:1099889437
 lzop-1_01-0_fdr_1_2:HEAD:lzop-1.01-0.fdr.1.2.src.rpm:1099889443
 lzop-1_01-4_fc5:HEAD:lzop-1.01-4.fc5.src.rpm:1137542768
+lzop-1_02-0_1_fc5:HEAD:lzop-1.02-0.1.fc5.src.rpm:1137702711



From fedora-extras-commits at redhat.com  Thu Jan 19 20:32:09 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:32:09 -0500
Subject: rpms/lzop/devel .cvsignore, 1.2, 1.3 lzop.spec, 1.8, 1.9 sources,
	1.2, 1.3 lzop-1.01-gcc29.patch, 1.1, NONE
Message-ID: <200601192032.k0JKWges006438@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6389/devel

Modified Files:
	.cvsignore lzop.spec sources 
Removed Files:
	lzop-1.01-gcc29.patch 
Log Message:
auto-import lzop-1.02-0.1.fc5 on branch devel from lzop-1.02-0.1.fc5.src.rpm
prepare for lzo2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:50:31 -0000	1.2
+++ .cvsignore	19 Jan 2006 20:32:09 -0000	1.3
@@ -1 +1 @@
-lzop-1.01.tar.gz
+lzop-1.02rc1.tar.gz


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/lzop.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lzop.spec	18 Jan 2006 00:07:32 -0000	1.8
+++ lzop.spec	19 Jan 2006 20:32:09 -0000	1.9
@@ -1,14 +1,15 @@
+%define archivever 1.02rc1
+
 Name: lzop
-Version: 1.01
-Release: 4%{?dist}
+Version: 1.02
+Release: 0.1%{?dist}
 
 Summary: Real-time file compressor
 
 Group: Applications/Archiving
 License: GPL
-URL: http://www.lzop.org/
-Source: http://www.lzop.org/download/lzop-%{version}.tar.gz
-Patch0: lzop-1.01-gcc29.patch
+URL: http://www.%{name}.org/
+Source: http://www.%{name}.org/download/%{name}-%{archivever}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: lzo-devel
@@ -22,8 +23,7 @@
 drop-in compatiblity to gzip.
 
 %prep
-%setup
-%patch0
+%setup -n %{name}-%{archivever}
 
 %build
 %configure
@@ -38,11 +38,15 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%doc AUTHORS NEWS README THANKS
+%doc AUTHORS COPYING NEWS README THANKS ChangeLog
 %doc %{_mandir}/man?/*
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Jan 19 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.02-0.1
+- update to 1.02rc1
+- build with lzop 2
+
 * Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.01-4
 - gcc 4.1 build time
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lzop/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:31 -0000	1.2
+++ sources	19 Jan 2006 20:32:09 -0000	1.3
@@ -1 +1 @@
-de1f90bc21a0e56a27f39322f56a275d  lzop-1.01.tar.gz
+4b999030716b1353c3dac049b269df7a  lzop-1.02rc1.tar.gz


--- lzop-1.01-gcc29.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 20:33:55 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:33:55 -0500
Subject: rpms/lzop import.log,1.6,1.7
Message-ID: <200601192034.k0JKYS5q006552@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6506

Modified Files:
	import.log 
Log Message:
auto-import lzop-1.02-0.1.fc4 on branch FC-4 from lzop-1.02-0.1.fc4.src.rpm
prepare for lzo2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lzop/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	19 Jan 2006 20:32:02 -0000	1.6
+++ import.log	19 Jan 2006 20:33:55 -0000	1.7
@@ -3,3 +3,4 @@
 lzop-1_01-0_fdr_1_2:HEAD:lzop-1.01-0.fdr.1.2.src.rpm:1099889443
 lzop-1_01-4_fc5:HEAD:lzop-1.01-4.fc5.src.rpm:1137542768
 lzop-1_02-0_1_fc5:HEAD:lzop-1.02-0.1.fc5.src.rpm:1137702711
+lzop-1_02-0_1_fc4:FC-4:lzop-1.02-0.1.fc4.src.rpm:1137702826



From fedora-extras-commits at redhat.com  Thu Jan 19 20:34:01 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Thu, 19 Jan 2006 15:34:01 -0500
Subject: rpms/lzop/FC-4 .cvsignore, 1.2, 1.3 lzop.spec, 1.7, 1.8 sources, 1.2,
	1.3 lzop-1.01-gcc29.patch, 1.1, NONE
Message-ID: <200601192034.k0JKYXTW006557@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/lzop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6506/FC-4

Modified Files:
	.cvsignore lzop.spec sources 
Removed Files:
	lzop-1.01-gcc29.patch 
Log Message:
auto-import lzop-1.02-0.1.fc4 on branch FC-4 from lzop-1.02-0.1.fc4.src.rpm
prepare for lzo2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lzop/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:50:31 -0000	1.2
+++ .cvsignore	19 Jan 2006 20:34:01 -0000	1.3
@@ -1 +1 @@
-lzop-1.01.tar.gz
+lzop-1.02rc1.tar.gz


Index: lzop.spec
===================================================================
RCS file: /cvs/extras/rpms/lzop/FC-4/lzop.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lzop.spec	22 May 2005 23:49:12 -0000	1.7
+++ lzop.spec	19 Jan 2006 20:34:01 -0000	1.8
@@ -1,14 +1,15 @@
+%define archivever 1.02rc1
+
 Name: lzop
-Version: 1.01
-Release: 3
+Version: 1.02
+Release: 0.1%{?dist}
 
 Summary: Real-time file compressor
 
 Group: Applications/Archiving
 License: GPL
-URL: http://www.lzop.org/
-Source: http://www.lzop.org/download/lzop-%{version}.tar.gz
-Patch0: lzop-1.01-gcc29.patch
+URL: http://www.%{name}.org/
+Source: http://www.%{name}.org/download/%{name}-%{archivever}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: lzo-devel
@@ -22,8 +23,7 @@
 drop-in compatiblity to gzip.
 
 %prep
-%setup
-%patch0
+%setup -n %{name}-%{archivever}
 
 %build
 %configure
@@ -38,11 +38,18 @@
 
 %files
 %defattr(0644, root, root, 0755)
-%doc AUTHORS NEWS README THANKS
+%doc AUTHORS COPYING NEWS README THANKS ChangeLog
 %doc %{_mandir}/man?/*
 %attr(0755,root,root) %{_bindir}/*
 
 %changelog
+* Thu Jan 19 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.02-0.1
+- update to 1.02rc1
+- build with lzop 2
+
+* Wed Jan 18 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> -  1.01-4
+- gcc 4.1 build time
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.01-3
 - rebuild on all arches
 
@@ -50,7 +57,7 @@
 - rebuilt
 
 * Tue Apr 20 2004 Nicolas Mailhot <Nicolas.Mailhot at laPoste.net> - 0:1.01-0.fdr.1
-* Fedorization
+- Fedorization
 
 * Tue Mar 09 2004 Dag Wieers <dag at wieers.com> - 1.01-1
 - Initial package. (using DAR)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lzop/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:31 -0000	1.2
+++ sources	19 Jan 2006 20:34:01 -0000	1.3
@@ -1 +1 @@
-de1f90bc21a0e56a27f39322f56a275d  lzop-1.01.tar.gz
+4b999030716b1353c3dac049b269df7a  lzop-1.02rc1.tar.gz


--- lzop-1.01-gcc29.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 21:33:37 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 19 Jan 2006 16:33:37 -0500
Subject: mock mock.py,1.32,1.33
Message-ID: <200601192133.k0JLXbPZ008686@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668

Modified Files:
	mock.py 
Log Message:
s/mach/mock/ in comments.


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mock.py	27 Dec 2005 18:30:26 -0000	1.32
+++ mock.py	19 Jan 2006 21:33:30 -0000	1.33
@@ -219,7 +219,7 @@
 
     def yum(self, cmd):
         """use yum to install packages/package groups into the chroot"""
-        # mach-helper yum --installroot=rootdir cmd
+        # mock-helper yum --installroot=rootdir cmd
         basecmd = '%s --installroot %s' % (self.config['yum'], self.rootdir)
         
         self._mount() # check it again        
@@ -619,7 +619,7 @@
         #self.do_chroot ("mkdir -p /boot", fatal = True)
         #self.do_chroot ("echo '#ifndef __BOOT_KERNEL_H_' > /boot/kernel.h", fatal = True)
         #self.do_chroot ("echo '#define __BOOT_KERNEL_H_' >> /boot/kernel.h", fatal = True)
-        #self.do_chroot ("echo '#error This is a kernel.h generated by mach, including this indicates a build error !' >> /boot/kernel.h", fatal = True)
+        #self.do_chroot ("echo '#error This is a kernel.h generated by mock, including this indicates a build error !' >> /boot/kernel.h", fatal = True)
         #self.do_chroot ("echo '#endif /* __BOOT_KERNEL_H_ */' >> /boot/kernel.h", fatal = True)
         
 def command_parse():



From fedora-extras-commits at redhat.com  Thu Jan 19 21:54:03 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 16:54:03 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.10, 1.11 rxvt-unicode.spec,
	1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200601192154.k0JLsZ0b008808@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8752/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jan 2006 23:43:59 -0000	1.10
+++ .cvsignore	19 Jan 2006 21:54:03 -0000	1.11
@@ -1 +1 @@
-rxvt-unicode-7.0.tar.bz2
+rxvt-unicode-7.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rxvt-unicode.spec	13 Jan 2006 23:43:59 -0000	1.12
+++ rxvt-unicode.spec	19 Jan 2006 21:54:03 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -58,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/README.xvt doc/etc doc/menu COPYING
+%doc README.FAQ INSTALL doc/README.xvt doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.1-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Jan 2006 23:43:59 -0000	1.10
+++ sources	19 Jan 2006 21:54:03 -0000	1.11
@@ -1 +1 @@
-4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2
+2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 21:54:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 16:54:09 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.10, 1.11 rxvt-unicode.spec,
	1.12, 1.13 sources, 1.10, 1.11
Message-ID: <200601192154.k0JLsgoV008813@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8752/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jan 2006 23:44:05 -0000	1.10
+++ .cvsignore	19 Jan 2006 21:54:09 -0000	1.11
@@ -1 +1 @@
-rxvt-unicode-7.0.tar.bz2
+rxvt-unicode-7.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rxvt-unicode.spec	13 Jan 2006 23:44:05 -0000	1.12
+++ rxvt-unicode.spec	19 Jan 2006 21:54:09 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -58,7 +58,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/README.xvt doc/etc doc/menu COPYING
+%doc README.FAQ INSTALL doc/README.xvt doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.1-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Jan 2006 23:44:05 -0000	1.10
+++ sources	19 Jan 2006 21:54:09 -0000	1.11
@@ -1 +1 @@
-4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2
+2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 21:54:15 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 16:54:15 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.10, 1.11 rxvt-unicode.spec,
	1.15, 1.16 sources, 1.10, 1.11
Message-ID: <200601192154.k0JLslTu008818@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8752/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Jan 2006 23:44:11 -0000	1.10
+++ .cvsignore	19 Jan 2006 21:54:15 -0000	1.11
@@ -1 +1 @@
-rxvt-unicode-7.0.tar.bz2
+rxvt-unicode-7.1.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rxvt-unicode.spec	13 Jan 2006 23:44:11 -0000	1.15
+++ rxvt-unicode.spec	19 Jan 2006 21:54:15 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/README.xvt doc/etc doc/menu COPYING
+%doc README.FAQ INSTALL doc/README.menu doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*
@@ -71,6 +71,11 @@
 %{_libdir}/urxvt
 
 %changelog
+%changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.1-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.0-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Jan 2006 23:44:11 -0000	1.10
+++ sources	19 Jan 2006 21:54:15 -0000	1.11
@@ -1 +1 @@
-4c7905b57199d1fe217a91e750721af9  rxvt-unicode-7.0.tar.bz2
+2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 19 22:10:13 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Thu, 19 Jan 2006 17:10:13 -0500
Subject: rpms/blender/devel blender.spec,1.14,1.15
Message-ID: <200601192210.k0JMAkx2010701@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10681

Modified Files:
	blender.spec 
Log Message:

  Description:
    Adapted to modular X.
    Add libtiff-devel as Build-Requires.




Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- blender.spec	19 Jan 2006 16:24:33 -0000	1.14
+++ blender.spec	19 Jan 2006 22:10:08 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           blender
 Version:        2.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -31,6 +31,12 @@
 BuildRequires:  scons
 BuildRequires:  SDL-devel
 BuildRequires:  zlib-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  xorg-x11-proto-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  mesa-libGLU-devel
+buildRequires:  freetype-devel
+
 Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
 Requires(postun): desktop-file-utils
@@ -93,8 +99,10 @@
 
 
 %changelog
-* Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
+* Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-2
 - New upstream release.
+- adapting to mudular X.
+- add libtiff-devel as BuildRequires.
 
 * Mon Jun 6 2005 Toshio Kuratomi <toshio-tiki-lounge.com> 2.37-3
 - Bump release for development.



From fedora-extras-commits at redhat.com  Thu Jan 19 22:24:05 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:24:05 -0500
Subject: rpms/alltray/devel alltray.spec,1.2,1.3
Message-ID: <200601192224.k0JMObMC010883@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10865

Modified Files:
	alltray.spec 
Log Message:
Added -fPIC to RPM_OPT_FLAGS


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alltray.spec	30 Dec 2005 23:47:30 -0000	1.2
+++ alltray.spec	19 Jan 2006 22:24:04 -0000	1.3
@@ -20,6 +20,7 @@
 %setup -q
 
 %build
+RPM_OPT_FLAGS="-fPIC $RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
 
@@ -49,5 +50,6 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu Dec 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
+* Thu Jan 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
+- Added -fPIC to RPM_OPT_FLAGS
 - Initial RPM release



From fedora-extras-commits at redhat.com  Thu Jan 19 22:37:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 17:37:34 -0500
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wine-docs.spec, 1.2, 1.3
Message-ID: <200601192238.k0JMc7gk011066@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11011/FC-3

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
+++ .cvsignore	19 Jan 2006 22:37:34 -0000	1.3
@@ -1 +1 @@
-wine-docs-0.9.5.tar.bz2
+wine-docs-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 08:17:27 -0000	1.2
+++ sources	19 Jan 2006 22:37:34 -0000	1.3
@@ -1 +1 @@
-0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2
+23c9067d57639c637eaf065feb6c9917  wine-docs-0.9.6.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
+++ wine-docs.spec	19 Jan 2006 22:37:34 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-3
 - add dist



From fedora-extras-commits at redhat.com  Thu Jan 19 22:37:40 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 17:37:40 -0500
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wine-docs.spec, 1.2, 1.3
Message-ID: <200601192238.k0JMcDMV011071@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11011/FC-4

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
+++ .cvsignore	19 Jan 2006 22:37:40 -0000	1.3
@@ -1 +1 @@
-wine-docs-0.9.5.tar.bz2
+wine-docs-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 08:17:27 -0000	1.2
+++ sources	19 Jan 2006 22:37:40 -0000	1.3
@@ -1 +1 @@
-0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2
+23c9067d57639c637eaf065feb6c9917  wine-docs-0.9.6.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
+++ wine-docs.spec	19 Jan 2006 22:37:40 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-3
 - add dist



From fedora-extras-commits at redhat.com  Thu Jan 19 22:37:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 17:37:46 -0500
Subject: rpms/wine-docs/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 wine-docs.spec, 1.2, 1.3
Message-ID: <200601192238.k0JMcIvj011076@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11011/devel

Modified Files:
	.cvsignore sources wine-docs.spec 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jan 2006 08:17:27 -0000	1.2
+++ .cvsignore	19 Jan 2006 22:37:46 -0000	1.3
@@ -1 +1 @@
-wine-docs-0.9.5.tar.bz2
+wine-docs-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jan 2006 08:17:27 -0000	1.2
+++ sources	19 Jan 2006 22:37:46 -0000	1.3
@@ -1 +1 @@
-0b90842e9484a6c7df37883ad947fd8e  wine-docs-0.9.5.tar.bz2
+23c9067d57639c637eaf065feb6c9917  wine-docs-0.9.6.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wine-docs.spec	14 Jan 2006 08:25:18 -0000	1.2
+++ wine-docs.spec	19 Jan 2006 22:37:46 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.9.6
+Release:        1%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
 License:        LGPL
 URL:            http://www.winehq.org
-Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.5.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.6.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -37,6 +37,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+
 * Sat Jan 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-3
 - add dist



From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:20 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:20 -0500
Subject: rpms/nagios - New directory
Message-ID: <200601192244.k0JMiM5L011165@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11157/nagios

Log Message:
Directory /cvs/extras/rpms/nagios added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:26 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:26 -0500
Subject: rpms/nagios/devel - New directory
Message-ID: <200601192244.k0JMiSxu011180@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11157/nagios/devel

Log Message:
Directory /cvs/extras/rpms/nagios/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:44 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:44 -0500
Subject: rpms/nagios Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601192244.k0JMik0X011214@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11202

Added Files:
	Makefile import.log 
Log Message:
Setup of module nagios


--- NEW FILE Makefile ---
# Top level Makefile for module nagios
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 22:44:50 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:44:50 -0500
Subject: rpms/nagios/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601192244.k0JMiqqV011234@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11202/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nagios


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 22:47:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:47:14 -0500
Subject: rpms/nagios import.log,1.1,1.2
Message-ID: <200601192247.k0JMlkEl011321@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11286

Modified Files:
	import.log 
Log Message:
auto-import nagios-1.3-14 on branch devel from nagios-1.3-14.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 22:44:44 -0000	1.1
+++ import.log	19 Jan 2006 22:47:14 -0000	1.2
@@ -0,0 +1 @@
+nagios-1_3-14:HEAD:nagios-1.3-14.src.rpm:1137710827



From fedora-extras-commits at redhat.com  Thu Jan 19 22:47:20 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 17:47:20 -0500
Subject: rpms/nagios/devel nagios.logrotate, NONE, 1.1 nagios.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601192247.k0JMlqFu011327@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11286/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nagios.logrotate nagios.spec 
Log Message:
auto-import nagios-1.3-14 on branch devel from nagios-1.3-14.src.rpm


--- NEW FILE nagios.logrotate ---
# Important!  Nagios rotates its own logs.  Only enable this logrotate if you
# know what you are doing!

# For more information please see "log_rotate_method" in: 
# /etc/nagios/nagios.cfg

# ----- logrotate config -------------
#/var/log/nagios/*.log {
#       missingok
#       weekly
#       notifempty
#       nocompress
#       create 644 nagios nagios
#}



--- NEW FILE nagios.spec ---
Name: nagios
Version: 1.3
Release: 14
Summary: Host/service/network monitoring program

Group: Applications/System
License: GPL
URL: http://www.nagios.org/
Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
Source1: nagios.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gd-devel > 1.8
Requires: httpd
Requires(pre): %{_sbindir}/useradd
Requires(preun): /sbin/service /sbin/chkconfig
Requires(post): /sbin/chkconfig /sbin/service %{_sbindir}/usermod
Requires(postun): /sbin/service

%description
Nagios is a program that will monitor hosts and services on your
network.  It has the ability to send email or page alerts when a
problem arises and when a problem is resolved.  Nagios is written
in C and is designed to run under Linux (and some other *NIX
variants) as a background process, intermittently running checks
on various services that you specify.

The actual service checks are performed by separate "plugin" programs
which return the status of the checks to Nagios. The plugins are
available at http://sourceforge.net/projects/nagiosplug.

This package provides the core program, web interface, and documentation
files for Nagios. Development files are built as a separate package.

%package devel
Group: Applications/System
Summary: Provides include files that Nagios-related applications may compile against
Requires: %{name} = %{version}-%{release}

%description devel
Nagios is a program that will monitor hosts and services on your
network. It has the ability to email or page you when a problem arises
and when a problem is resolved. Nagios is written in C and is
designed to run under Linux (and some other *NIX variants) as a
background process, intermittently running checks on various services
that you specify.

This package provides include files that Nagios-related applications
may compile against.

%prep
%setup -q

%build
./configure \
	--prefix=%{_datadir}/%{name} \
	--exec-prefix=%{_localstatedir}/lib/%{name} \
	--with-init-dir=%{_initrddir} \
	--with-cgiurl=/%{name}/cgi-bin/ \
	--with-htmlurl=/%{name} \
	--with-lockfile=%{_localstatedir}/run/%{name}.pid \
	--with-nagios-user=nagios \
	--with-nagios-grp=nagios \
	--bindir=%{_sbindir} \
	--libexecdir=%{_libdir}/%{name}/plugins \
	--sysconfdir=%{_sysconfdir}/%{name} \
	--localstatedir=%{_localstatedir}/log/%{name} \
	--with-gd-lib=%{_libdir} \
	--with-gd-inc=%{_includedir} \
	--enable-embedded-perl \
	--with-perlcache \
	--with-template-objects \
	--with-template-extinfo	
make %{?_smp_mflags} all

%{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora
%{__sed} -e "s/# chkconfig: 345/# chkconfig: - /" \
	 -e "s|NagiosCmd=/var/log/nagios/rw/nagios.cmd|NagiosCmd=%{_localstatedir}/spool/%{name}/nagios.cmd|" < daemon-init > daemon-init.fedora
%{__sed} -e "s|resource.cfg|private/resource.cfg|" \
	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
%{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora

%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} INSTALL_OPTS="" COMMAND_OPTS="" install-config
%{__install} -d -m 0775 %{buildroot}/%{_localstatedir}/spool/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_prefix}/include/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_sysconfdir}/%{name}/private
%{__install} -D -m 0755 base/nagios %{buildroot}/%{_sbindir}/nagios
%{__install} -d -m 0755 cgi/ %{buildroot}/%{_libdir}/%{name}/cgi-bin/
%{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
%{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
%{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
%{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
%{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
%{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
%{__install} -D -m 0755 p1.pl.fedora %{buildroot}/%{_sbindir}/p1.pl
%{__mkdir} -p %{buildroot}/%{_initrddir}
%{__mkdir} -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
%{__cp} -a html/* %{buildroot}/%{_datadir}/%{name}/html/
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/*in
%{__rm} -f %{buildroot}/%{_datadir}/%{name}/html/Makefile
%{__mv} %{buildroot}/%{_sysconfdir}/%{name}/resource.cfg-sample %{buildroot}/%{_sysconfdir}/%{name}/private/resource.cfg-sample

%clean
rm -rf %{buildroot} > /dev/null 2>&1

%pre
%{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || :

%preun
/sbin/service nagios stop > /dev/null 2>&1 || :
/sbin/chkconfig --del %{name} || :

%post
/sbin/chkconfig --add %{name} || :
/sbin/service httpd condrestart > /dev/null 2>&1 || :
%{_sbindir}/usermod -G %{name} apache || :

%postun
/sbin/service httpd condrestart > /dev/null 2>&1 || :

%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/%{name}
%dir %{_libdir}/%{name}/plugins/eventhandlers
%dir %{_libdir}/%{name}/cgi-bin
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/html
%doc %{_datadir}/%{name}/html/docs
%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
%{_datadir}/%{name}/html/[^d]*
%{_sbindir}/*
%{_libdir}/%{name}/cgi-bin/*cgi
%{_initrddir}/nagios
%config(noreplace) %{_sysconfdir}/httpd/conf.d/nagios.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*cfg-sample

%attr(0750,root,root) %dir %{_sysconfdir}/%{name}/private
%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/%{name}/private/resource.cfg-sample
%attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
%attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives

%files devel
%defattr(-,root,root)
%{_includedir}/%{name}

%changelog
* Sun Jan 15 2005 Mike McGrath <imlinux at gmail.com> 1.3-14
- Fedora friendly spec file

* Sat May 31 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.1-1)
- Merge with CVS for 1.1 release

* Fri May 30 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.0-4)
- cmdgrp was not always getting created
- patches for cmd.cgi and history.cgi

* Sat May 24 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.0-3)
- patches for doco and PostgreSQL timestamp
- make sure all files are packaged (otherwise, will not build on RH9)

* Sat May 17 2003 Karl DeBisschop <kdebisschop at users.sourceforge.net> (1.0-2)
- patch for file descriptor leak

* Fri Oct 04 2002 Karl DeBisschop <kdebisschop at users.sourceforge.net>
- merge many improvements from Ramiro Morales <rm-rpms at gmx.net>
  (macros for PERF_EXTERNAL and EMBPERL, cleanup pre/post scripts,
   nnmmsg logger macro, include eventhandlers, convertcfg, mini_epn)
- use LSB-standard /etc/init.d/nagios startup location

* Tue Aug 13 2002 Karl DeBisschop <kdebisschop at users.sourceforge.net>
- INSTALL was renamed INSTALLING
- p1.pl script included in package
- web server restarted because Red Hat 7.3 init does not do 'reload'

* Fri Jun 14 2002 Ethan Galstad <nagios at nagios.org) (1.0b4)
- Modified requirements to work when installed using KickStart (Jeff Frost)
- Changed method used for checking for user/group existence (Jeff Frost)

* Tue May 15 2002 Ethan Galstad <nagios at nagios.org) (1.0b1)
- Updated to work with new sample template-based config files (Darren Gamble)

* Sun Feb 17 2002 Ole Gjerde <gjerde at ignus.com> (1.0a4)
- Fixed spec file to work with Nagios

* Wed Jan 17 2001 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.7a5-1)
- switch from /usr/libexec to /usr/lib because linux FHS has no libexec
- use global macro to set location of init script
- fold htaccess.sample into contrib directory of tarball

* Fri Nov 03 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6-1)
- Rebuild with final sources

* Wed Sep 06 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b5-1)
- Create separate cgi, html, and devel packages
- Include commands.cfg

* Sun Aug 27 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b5-1)
- beta 5

* Sun Jul 23 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b3-2)
- fixes for daemon-init, multi-OS RPM building

* Wed Jul 12 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b3-1)
- beta 3

* Sun Jun 25 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b2-3)
- true beta2 sources

* Sat Jun 24 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b2-2)
- cleanup spec, still using pre-beta2 sources

* Sat Jun 24 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b2-1)
- mandrake merge using pre-beta2 sources (many thanks to Stefan van der Eijk <s.vandereijk at chello.nl>)

* Wed Jun 14 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b1-1)
- add stylesheet diffs

* Mon Jun 12 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.6b1-1)
- adapt for 0.0.6b1

* Mon Jun 05 2000 Karl DeBisschop <kdebisschop at users.sourceforge.net> (0.0.5-4)
- add traceroute.cgi and htaccess.sample
- move placement of docs (in files) to avoid group warnings
- change www user and group to nobody and add warning

* Mon Jun 05 2000 Karsten Weiss <knweiss at gmx.de> (0.0.5-3)
- official group name
- improved user detection

* Tue Oct 19 1999 Mike McHenry <mmchen at minn.net) (0.0.4-2)
- Fixed init.d scripts to better fit new Redhat init.d script formats

* Fri Sep 03 1999 Mike McHenry <mmchen at minn.net> (0.0.4-1)
- Upgraded package from 0.0.4b4 to 0.0.4

* Mon Aug 16 1999 Mike McHenry <mmchen at minn.net>
- First RPM build (0.0.4b4)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 22:44:50 -0000	1.1
+++ .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
@@ -0,0 +1 @@
+nagios-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 22:44:50 -0000	1.1
+++ sources	19 Jan 2006 22:47:20 -0000	1.2
@@ -0,0 +1 @@
+2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 22:59:35 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 17:59:35 -0500
Subject: rpms/azureus - New directory
Message-ID: <200601192259.k0JMxb7g011466@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11458/azureus

Log Message:
Directory /cvs/extras/rpms/azureus added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 22:59:41 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 17:59:41 -0500
Subject: rpms/azureus/devel - New directory
Message-ID: <200601192259.k0JMxhoS011482@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11458/azureus/devel

Log Message:
Directory /cvs/extras/rpms/azureus/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 23:00:04 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:00:04 -0500
Subject: rpms/azureus Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601192300.k0JN07mc011525@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11513

Added Files:
	Makefile import.log 
Log Message:
Setup of module azureus


--- NEW FILE Makefile ---
# Top level Makefile for module azureus
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:00:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:00:10 -0500
Subject: rpms/azureus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601192300.k0JN0CwF011545@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11513/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module azureus


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:07:40 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:07:40 -0500
Subject: rpms/azureus import.log,1.1,1.2
Message-ID: <200601192308.k0JN8YHu013485@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410

Modified Files:
	import.log 
Log Message:
auto-import azureus-2.3.0.6-13 on branch devel from azureus-2.3.0.6-13.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/azureus/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 23:00:04 -0000	1.1
+++ import.log	19 Jan 2006 23:07:40 -0000	1.2
@@ -0,0 +1 @@
+azureus-2_3_0_6-13:HEAD:azureus-2.3.0.6-13.src.rpm:1137712030



From fedora-extras-commits at redhat.com  Thu Jan 19 23:08:03 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 19 Jan 2006 18:08:03 -0500
Subject: rpms/azureus/devel Azureus.desktop, NONE, 1.1 azureus-ChangeLog.txt,
	NONE, 1.1 azureus-ConfigurationManager-improvement.patch, NONE,
	1.1 azureus-GKR.patch, NONE, 1.1 azureus-License.txt, NONE,
	1.1 azureus-base64.patch, NONE, 1.1 azureus-cache-size.patch,
	NONE, 1.1 azureus-java.beans.XMLEncoder.patch, NONE,
	1.1 azureus-jessie.patch, NONE,
	1.1 azureus-no-bouncycastle.patch, NONE,
	1.1 azureus-remove-manifest-classpath.patch, NONE,
	1.1 azureus-remove-win32-PlatformManagerUpdateChecker.patch,
	NONE, 1.1 azureus-remove-win32-osx-platforms.patch, NONE,
	1.1 azureus-sun.misc.Cleaner.patch, NONE,
	1.1 azureus-sun.misc.Signal.patch, NONE,
	1.1 azureus.applications, NONE, 1.1 azureus.script, NONE,
	1.1 azureus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601192308.k0JN8dW5013489@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13410/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Azureus.desktop azureus-ChangeLog.txt 
	azureus-ConfigurationManager-improvement.patch 
	azureus-GKR.patch azureus-License.txt azureus-base64.patch 
	azureus-cache-size.patch azureus-java.beans.XMLEncoder.patch 
	azureus-jessie.patch azureus-no-bouncycastle.patch 
	azureus-remove-manifest-classpath.patch 
	azureus-remove-win32-PlatformManagerUpdateChecker.patch 
	azureus-remove-win32-osx-platforms.patch 
	azureus-sun.misc.Cleaner.patch azureus-sun.misc.Signal.patch 
	azureus.applications azureus.script azureus.spec 
Log Message:
auto-import azureus-2.3.0.6-13 on branch devel from azureus-2.3.0.6-13.src.rpm


--- NEW FILE Azureus.desktop ---
[Desktop Entry]
Name=Azureus
Comment=A BitTorrent Client
Exec=azureus
Icon=azureus
Terminal=false
Type=Application
MimeType=application/x-bittorrent
Categories=Application;Network;



--- NEW FILE azureus-ChangeLog.txt ---
AZUREUS CHANGELOG
---------

2005.11.22 | Azureus 2.3.0.6

FEATURE: Core | Built in tracker support for multiple listen ports [Parg]
FEATURE: Core | Tracker support for multi-hash scrapes [Parg]
FEATURE: Core | "Date added" field added for hosted torrents [Parg]
FEATURE: Core | Alternate max upload rate limit when only seeding option [Nolar]
FEATURE: Core | Ability to move a download's data files and torrent added [Parg]
FEATURE: Core | Added ability to turn off DHT originated IP Filter violation logs [Parg]
FEATURE: Core | When a peer is banned remove any data downloaded from it in partially complete pieces [Parg]
FEATURE: Core | Added "block banning" feature when multiple bad peers found with "close" IPs [Parg]
FEATURE: Core | Support for platform-specific plugin update components [Parg]
FEATURE: Core | Support for .torrent file download using just infohash hex string (via DHT magnet lookup mechanism) [Nolar]
FEATURE: Core | Added some control over initial share ratio for "add for seeding" downloads [Parg]
FEATURE: Core | Added feature to allow disabling of multi-hash tracker scrapes [Parg]
FEATURE: Core | Tracker connections respect bind-ip settings (http only) [Parg]
FEATURE: Core | Banned ips persisted across restart [Parg]
FEATURE: Core | Ability to add an alternative max-torrent-limit when seeding [Parg]
FEATURE: Core | DHT NAT punching for firewalled peers [Parg]
FEATURE: Core | Ability to rename and redirect files within a torrent [Parg]
FEATURE: Core | Compact storage for "do not download" files [Parg]
FEATURE: Core | Magnet URI protocol registration under windows [Parg]
FEATURE: Plug | UPnP plugin will warn if it discovers a router that has known protocol problems [Parg]
FEATURE: Plug | Magnet URI accessor method added to Torrent [Parg]
FEATURE: Plug | Added "launchable plugins" that can be used to start Azureus [Parg]
FEATURE: Plug | Added single-instance management function [Parg]
FEATURE: Plug | Made some platform-specific functions available to plugins [Parg]
FEATURE: Plug | Ability to add Swing based interfaces as plugin views [Parg]
FEATURE: UI   | Console UI support for viewing specific plugin logs [Parg]
FEATURE: UI   | Beginner configuration user mode provides a simplified interface [Gouss]
FEATURE: UI   | Support for --closedown parameter to org.gudy.azureus2.ui.swt.Main to closedown an existing AZ instance [Parg]
FEATURE: UI   | Added Average Peer Completion percentage column to MyTorrents view and Details view [Nolar]
FEATURE: UI   | Added NAT status icon to status area [Parg]
FEATURE: UI   | Indicate potential DHT port problems in SWT status area [Parg]
FEATURE: UI   | Added swarm average to activity view plus a legend [Parg]
FEATURE: UI   | Console support for listing shares improved, deleting of shares added [Parg]

CHANGE: Core  | Countermeasures against swarm DOS/poisoning [Nolar]
CHANGE: Core  | Health status for swarms where all known peers are connected now reported as OK [Parg]
CHANGE: Core  | Friendly hash-checking option now only applied during recheck operations and delay based on piece size [Parg]
CHANGE: Core  | Don't automatically remove directory contents shares if they (appear to) have been deleted [Parg]
CHANGE: Core  | Improved algorithm for detecting DHT port reachability [Parg]
CHANGE: Core  | DHT - removed cache-distance metrics and added value versions to handle value evolution correctly [Parg]
CHANGE: Core  | Reduced thread count by aggregating async listener dispatchers [Parg]
CHANGE: Core  | Major refactoring of Download and Disk managers [Parg]
CHANGE: Core  | Download totals don't include hash fails and discards and aren't included in share-ratio calculation [Parg]
CHANGE: Core  | "Max simultaneous outbound connection attempts" option no longer accepts zero as a disable value [Nolar]
CHANGE: Core  | Under OSX, new bundle launches using the Java Preferences application configured JVM, enabling JRE 5.0 support [Nolar]
CHANGE: Core  | Under Windows, now runs via a launcher built by exe4j - taskmanager process is now "Azureus.exe" [Nolar,Parg]
CHANGE: Plug  | Major refactoring of plugin interface to separate out UI-level and core-level stuff [Parg]
CHANGE: UI    | Update to the latest release SWT library (3.1.1) [Nolar]

BUGFIX: Core  | Fix interested flag being set sometimes when seeding [Nolar]
BUGFIX: Core  | Wrong file name returned for stopped simple torrents [Parg]
BUGFIX: Core  | Seeder/leecher counts missing for published torrents [Parg]
BUGFIX: Core  | Stats going negative for hosted torrent average up/down [Parg]
BUGFIX: Core  | Fix piece request ignore bug [Nolar]
BUGFIX: Core  | Fixed DHT initialisation hang if port already in use [Parg]
BUGFIX: Core  | Don't allow prohibited peer sources to be enabled (ui artifact only) [Parg]
BUGFIX: Core  | Fixed too many socket selectors created when in safe selector mode [Nolar]
BUGFIX: Core  | Fixed re-announce interval when receiving "failure reason" error response from tracker [Nolar]
BUGFIX: Core  | Fixed and improved restarts under OSX (and linux) [Nolar,Gouss]
BUGFIX: Core  | Fixed and improved one-to-one LAN transfer speeds [Nolar]
BUGFIX: Plug  | UPnP fix for picking up changed network interfaces [Parg]
BUGFIX: UI    | Fixed 100% CPU problem with download bars [Parg]
BUGFIX: UI    | Fixed UI foregrounding itself on every unverified localhost:6880 socket connection attempt [Nolar]
BUGFIX: UI    | Create-torrent wizard fix for multi-torrent checkbox enabling error [Parg]




2005.06.27 | Azureus 2.3.0.4

FEATURE: Core | DHT torrent lookup now based on sha1(hash) and torrent xfer encrypted using hash-derived key [Parg]
FEATURE: Core | More aggressive banning of peers sending bad data - algorithm change and block-banning feature [Gudy,Parg]
FEATURE: Core | Support for multiple DHT networks on same port [Parg]
FEATURE: Core | Introduced "passive torrents" - these are tracked but not downloaded [Parg]
FEATURE: Core | Category setting functions added to "My Tracker" [Parg]
FEATURE: Core | Added ability to make plugin config ui components invisible [Parg]
FEATURE: UI   | Average peer speed for swarm column added [Nolar]
FEATURE: Plug | Plugin interface extension to allow per-plugin torrent-attributes [Parg]
FEATURE: Plug | Plugin ResourceDownload feature for accessing content-type [Parg]

CHANGE: Core  | Improved optimistic unchoke anti-leech algorithms [Nolar]
CHANGE: Core  | CVS versions run multiple DHTs to permit validations of changes [Parg]
CHANGE: Core  | DHT anti-spoof for cache forwards [Parg]
CHANGE: Core  | DHT mechanisms for flood prevention [Parg]
CHANGE: Core  | Added local tracker url to torrents when hosting external torrents [Parg]
CHANGE: Core  | Hosted torrents now become "passively tracked" when their corresponding download is removed [Parg]
CHANGE: Core  | More pro-active injection of DHT scrapes for torrents with failing trackers [Parg]
CHANGE: Plug  | More JPC plugin enhancements to help reduce cache server load [Nolar]

BUGFIX: Core  | DHT protocol version logic fixes [Parg]
BUGFIX: Core  | Fix for 100% cpu when more than 60 connections are registered with a selector under buggy network stacks [Nolar]
BUGFIX: Core  | Invalid listen port configuration would prevent Azureus from starting [Nolar]
BUGFIX: Core  | Added hooks to catch Windows shutdown events to allow graceful Azureus exit [Nolar]
BUGFIX: Core  | Fix for start-stopped non-simple torrents showing data-missing error on restart [Parg]
BUGFIX: Core  | Fix for drag-n-drop SWT exceptions blocking Azureus startup [Nolar]
BUGFIX: Core  | Fixed up "interested" message for downloads with "do not download" files [Parg,Nolar]
BUGFIX: UI    | Categories not being correctly displayed when torrents transit between downloading and seeding [Parg]



2005.05.25 | Azureus 2.3.0.2

FEATURE: UI   | Console UI now has update check, alerting and DHT stats [Parg]
FEATURE: UI   | SWT make torrent wizard remembers value for "add other hashes" [Parg]
FEATURE: UI   | Console UI logging config [Fatal]
FEATURE: Plug | Added progress indicator and torrent stats to tracker web templates [Parg, Gouss]
FEATURE: Plug | Availability column added to webui + some alignment changes [Parg]
FEATURE: Plug | XML/http interface access to individual torrent file stats added [Parg]

CHANGE: Core  | CPU usage reductions when connected to many idle peers [Nolar]
CHANGE: Core  | Disable console view logging by default [Nolar]
CHANGE: Core  | Memory usage reductions and optimizations [Gudy, Parg, Nolar]
CHANGE: Core  | Improved long-term connection-attempt management [Nolar]
CHANGE: Core  | DHT bootstrap in absence of version-check server improved [Parg]
CHANGE: Core  | DHT IP filter reports reduced [Parg]
CHANGE: Core  | Disk manager read/write threads now started on demand [Parg]
CHANGE: UI    | Default for "add other hashes" in make torrent wizard and sharing config changed to false [Parg]
CHANGE: UI    | Retention of log history removed as taking up to 1MB mem [Parg]
CHANGE: UI    | Added missing spaces back into SWT dock item's tooltip [Parg]
CHANGE: UI    | Restore version number on status bar and add protocol rate to the stats view [Nolar]
CHANGE: Plug  | JPC plugin refactoring to help reduce cache server load [Nolar]

BUGFIX: Core  | Fix compatibility with JRE 1.4 series under Win32 due to NIO bug [Nolar]
BUGFIX: Core  | Ignore peers with these data ports config option didn't work the DHT and PEX obtained peers [Nolar]
BUGFIX: Core  | DHT IP derivation from contacts fixed [Parg]



2005.05.02 | Azureus 2.3.0.0

FEATURE: Core | Client support for the 'trackerid' announce extension [Nolar]
FEATURE: Core | Client support for the 'min interval' announce extension [Nolar]
FEATURE: Core | Added options to disable scrape entirely or just for non-running torrents [Parg]
FEATURE: Core | RSS Feed parse APIs added to plugin interface [Parg]
FEATURE: Core | Non-blocking sockets based TCP tracker implementation [Parg]
FEATURE: Core | Client identification plugin interface [Parg]
FEATURE: Core | Separate protocol payload and overhead stats [Nolar]
FEATURE: Core | Data deletion can now defer to Recycle Bin and Trash under Windows and Mac OS X, respectively [Parg, CrazyAlchemist]
FEATURE: Core | Distributed Database [Parg]
FEATURE: Core | Decentralised tracking [Parg]
FEATURE: Core | Magnet URI for location of decentralised torrents [Parg]
FEATURE: Core | Ability to update built-in plugins independently of the core [Parg]
FEATURE: Core | Diagnostic collection for system properties and config settings [Parg]
FEATURE: Core | added option to move newly completed seeds to the end of the seeding list, rather than the front [Parg]
FEATURE: Core | Support for I2P plugin [Parg]
FEATURE: Core | Network selection support (public, i2p, tor) [Parg]
FEATURE: Core | Inter-client peer exchange [Nolar]
FEATURE: UI   | Option to disable small fonts under OSX [Nolar]
FEATURE: UI   | Console support for aliases [Fatal]
FEATURE: UI   | Torrent export option added to SWT UI [Parg]
FEATURE: UI   | Keyboard shortcut parsing system [CrazyAlchemist]
FEATURE: UI   | System tray menus for setting global upload and download bandwidth limits [CrazyAlchemist]
FEATURE: UI   | Synthesized speech alerts for Mac OS X; Go to Azureus / Preferences to enable it [CrazyAlchemist]
FEATURE: UI   | New file icon for Mac OS X [CrazyAlchemist]
FEATURE: Plug | Added local host configuration setting for statusmailer [Parg]
FEATURE: Plug | Reworked CSS for tracker web pages to create old and new styles [Gouss]
FEATURE: Plug | StartStop Rules: First Priority ignore Rules: 0 Peers and SeedsPeers Ratio [Gouss]
FEATURE: Plug | RSS Feed added to tracker web pages [Parg]
FEATURE: Plug | Tracker stats added to tracker web pages [Parg]
FEATURE: Plug | Generic Messaging API: inter-client message passing [Nolar]
FEATURE: Plug | Joltid Peer Cache plugin is now bundled with Azureus [Nolar, Parg, Gudy]
FEATURE: Plug | I2P plugin [Parg]

CHANGE: Core | Smarter re-announce interval handling, especially for lopsided swarms [Nolar]
CHANGE: Core | Added many new peerid identifications [Nolar, Gouss]
CHANGE: Core | First piece priority option now also prioritizes last piece of file [Nolar]
CHANGE: Core | NAT check functions even when downloads have already been started [Nolar]
CHANGE: Core | Update check can now check via configured proxy [Nolar]
CHANGE: Core | Rewritten download code: decreased cpu usage and faster speeds in LAN network environments [Nolar]
CHANGE: Core | Network IP_TOS option now sets required registry setting under Win2K/XP [Parg, Nolar]
CHANGE: Core | Favor establishing inbound peer connections, to increase the health of swarms with firewalled clients [Nolar]
CHANGE: Core | Improved seeding unchoking algorithm: distributes data more evenly [Nolar]
CHANGE: Core | Anti-leech code to prevent optimistic unchoke leechers [Nolar]
CHANGE: Core | Reduced threads required for multiple torrents [Parg]
CHANGE: Core | Relaxed cross-torrent file locking to permit multiple read access [Parg]
CHANGE: Core | changed HTTP user-agent to include OS and java version [Parg]
CHANGE: Core | max cache size limited to 32M less than VM size [Parg]
CHANGE: UI   | Reintroduced download completion alerts in Mac OS X (use System Preferences / Sound to set the alert sound of choice) [CrazyAlchemist]
CHANGE: UI   | For Mac OS X, contextual menu items no longer carry images for better compliance with Apple Human Interface Guidelines [CrazyAlchemist]
CHANGE: UI   | RFE #1092614: Informational popup messages now auto-close after 5 seconds - unless the message window is closed manually, or if the mouse is over it / details view is open (the timing will be 'reset' then) [CrazyAlchemist]
CHANGE: UI   | Miscellaneous cosmetics updates for Mac OS X [CrazyAlchemist]
CHANGE: UI   | Bug #1112278: https:// URLs now autopaste in Open URL window [CrazyAlchemist]
CHANGE: UI   | Main menu bar should now be more streamlined in its arrangement [CrazyAlchemist]
CHANGE: UI   | Console view will now display information logged (for the duration of the application session) when the Console view is closed [CrazyAlchemist]
CHANGE: UI   | ETA and remaining now take into account DHD files [Parg]
CHANGE: Plug | More choices in First Priority ShareRatio [Gouss]

BUGFIX: Core | IPFilters loaded from static config file weren't working [Parg]
BUGFIX: Core | Fix re-announce interval bug when zero peers in swarm [Nolar]
BUGFIX: Core | Send uninterested message when complete while using do-not-download feature [Nolar]
BUGFIX: Core | Optimistic Connect, when seeding, no longer drops just random connections [Nolar]
BUGFIX: Core | Better recovery from corrupt resume data [Parg]
BUGFIX: Core | Better handling of invalid torrent save locations [Parg]
BUGFIX: Core | fix for SSL (https) problems introduced by changes in JDK 5.0 [Parg]
BUGFIX: Core | fix for hash-fails when running with cache + incremental file creation enabled [Parg]
BUGFIX: Core | Fix scrape processing stall bug when scrape url was invalid [Nolar]
BUGFIX: UI   | Corrected save dialog behaviour on Make Torrent Wizard regarding file selection [CrazyAlchemist]
BUGFIX: UI   | Bug #953619 concerning Mac OS X: Double-clicking .torrent files now activate Azureus with the expected Finder dialogs (Dragging files to the Dock icon will continue to malfunction for the indefinite future) [CrazyAlchemist]
BUGFIX: UI   | Bug #1120995: Improper validation could allow unreasonably low global upload cap [CrazyAlchemist]
BUGFIX: UI   | Main window no longer tries to steal focus on opening (Mac OS X) [CrazyAlchemist]
BUGFIX: UI   | Pop up messages no longer try to steal focus (Mac OS X) [CrazyAlchemist]
BUGFIX: UI   | Resolved fuzzy dock icon display under Mac OS X if Column Setup is opened [CrazyAlchemist]
BUGFIX: UI   | Upload caps for individual transfers now display more sensible values if global upload cap is set to unlimited [CrazyAlchemist]
BUGFIX: UI   | In My Torrents, a category view will no longer prevent its corresponding table view's horizontal scrolling [CrazyAlchemist]
BUGFIX: UI   | Download bars should no longer disappear when the main window is minimized (Mac OS X) [CrazyAlchemist]
BUGFIX: UI   | Certain table column contents no longer 'disappear' when a row is selected (Mac OS X) [CrazyAlchemist]
BUGFIX: Plug | StartStop Rules: Autostart Seed Count Only and Prefer Large Swarms removed First Priority [Gouss]




2004.12.18 | Azureus 2.2.0.2

FEATURE: Core | Manual peer upload blocking (when seeding) and kick-banning [Nolar]
FEATURE: Core | Control added to not cache small files (default no cache for < 1MB) [Parg]
FEATURE: Core | Ability to cancel torrent creation processes added [Parg, Gudy]
FEATURE: Core | Ability to cancel sharing process added [Parg]
FEATURE: Core | Ability to pass multiple torrents to Azureus.exe [Parg]
FEATURE: Core | Added configuration items for tracker processing limits [Parg]
FEATURE: Core | Option to open torrent for seeding in create-torrent Wizard [Parg,Gudy]
FEATURE: Core | Auto-rescan of shared resources + addition/deletion of shares accordingly [Parg]
FEATURE: Core | Persistence of download and tracker stats for shares [Parg]
FEATURE: Core | Advanced network settings: MTU, SO_RCVBUF, SO_SNDBUF, IPTOS [Nolar]
FEATURE: Core | Optimistic Connect: drop inactive connections in order to find better ones [Nolar]
FEATURE: Core | Added ability to apply updates and shutdown Azureus instead of restarting [Parg]
FEATURE: Core | Can now specify that password protected tracker web is only available via HTTPS, HTTP access -> access denied [Parg]
FEATURE: Core | Can now specify comment to be added to share torrents [Parg]
FEATURE: Core | resume data no longer saved to torrent files, stored in %user-dir%/active instead [Parg]
FEATURE: Core | Plugin support for installing and uninstaling plugins [Parg]
FEATURE: Core | Category support for shares [Parg]
FEATURE: Core | Apply updates and defer applicaton to later restart/close [Parg/Gudy]
FEATURE: UI   | Added 'share' support to console UI [Nolar]
FEATURE: UI   | Option to show confirmation dialog on torrent Removal [Nolar]
FEATURE: UI   | Added Seed2PeerRatio item to MyTorrents view [Nolar]
FEATURE: UI   | Added detailed connection State to peers view [Nolar]
FEATURE: UI   | Added Connected Time item to peers view [Nolar]
FEATURE: UI   | Option to add torrent downloads silently (without activating main Azureus window) [Nolar]
FEATURE: UI   | Added download speed limit column to MyTorrents [Parg]
FEATURE: UI   | Telnet UI added [Fatal]
FEATURE: UI   | Auto-open stats option added [Parg]
FEATURE: UI   | Plugin install/uninstall wizards [Gudy]
FEATURE: UI   | Double click on status bar progress area to give details of update/install/uninstall progress [Parg]
FEATURE: UI   | SWT/Console share support for setting category [Parg]
FEATURE: UI   | Pick out links (anything prefixed with "http") in torrent comments in general view [Parg]
FEATURE: Plug | Status mailer support for SMTP port, user + password [Parg]
FEATURE: Plug | Status mailer support for plain text notifications [Parg]

CHANGE: Core | Support azureus.install.path parameter, used by new linux launcher script [Nolar]
CHANGE: Core | Moved config items for tracker client overrides + UDP to tracker client config [Parg]
CHANGE: Core | Also do dynamic tracker re-announce interval overrides when seeding; uses peer count only [Nolar]
CHANGE: Core | NAT check url changed to aelitis server [Nolar]
CHANGE: Core | Reduce tracker re-announce frequency when incoming connections are accepted (unfirewalled) [Nolar]
CHANGE: Core | Remove old auto-migration code [Nolar]
CHANGE: Core | Update restart logic now preserves JVM max mem setting for Sun JVMs [Parg]
CHANGE: Core | Cleanup and optimize choke-unchoke logic [Nolar]
CHANGE: Core | Added an option to enable the prioritization of most completed Files, default is off [Gudy]
CHANGE: Core | Default http tracker to disabled [Parg]
CHANGE: UI   | Create torrent wizard now initially defaults torrent save path from "save to" default [Parg]
CHANGE: UI   | Obey "start stopped" config item for dropped torrents [Parg]
CHANGE: UI   | Torrents no longer need to be stopped before removal is allowed [Nolar]
CHANGE: UI   | Graphical view item refresh optimizations [Nolar]
CHANGE: UI   | Change context menu selection for queue/stop/force-start/recheck to be "at least one can be..." rather than "all can be..." [Parg]
CHANGE: UI   | More pre-defined speed ranges for queue slot limits [Parg]
CHANGE: UI   | Improve wording of "delete torrent?" prompt [Parg]
CHANGE: Plug | UPnP information messages now off by default [Parg]

BUGFIX: Core | Fix for kernel panics under MacOSX [ej32206, Nolar]
BUGFIX: Core | Handle passing of torrents to already running but not fully initialised process better [Parg]
BUGFIX: Core | Default save dir was defaulting to ON, changed to OFF [Parg]
BUGFIX: Core | Tidied up UPnP error handing if action missing [Parg]
BUGFIX: Core | Scrape mult-tracker torrents correctly when download not running [Parg]
BUGFIX: Core | Upload/download/share ratio frig for newly added seeds made consistent [Parg]
BUGFIX: Core | Fix for stalls from system clock being set backwards in time [Nolar]
BUGFIX: Core | Fixed up bad behaviour on out-of-disk-space falures [Parg]
BUGFIX: Core | Fixed torrents getting stuck in READY state [Parg]
BUGFIX: Core | Fix potential connection establishment backlog [Nolar]
BUGFIX: Core | Fix potential DOS by timing out stalled connections [Nolar]
BUGFIX: Core | Fix bug in re-announce interval override calculation when connection limit has been reached [Nolar]
BUGFIX: Core | Fix for hangs when scraping due to slow DNS resolves [Parg]
BUGFIX: Core | Fix for UPnP failing if trailing spaces in 'action name' [Parg]
BUGFIX: Core | Fixed bug in choke/unchoke logic when number of connected peers < max upload slots [Nolar]
BUGFIX: Core | Updater problems with non-ascii chars in user dir (again!) [Parg]
BUGFIX: Core | Created torrents had name.utf-8 tag in wrong place [Parg]
BUGFIX: Core | UDP scrape responses being handled incorrectly [Parg]
BUGFIX: Core | Fixed the "high priority" piece-picking for files [Gudy]
BUGFIX: UI   | Old language files in user dir causing !missing! item texts [Nolar]
BUGFIX: UI   | Fix for window state not being remembered between sessions [Nolar]
BUGFIX: UI   | Fix for messages window being closed while animated [Gudy]
BUGFIX: UI   | Fix for BUG 1059432 : Download bars spawning multiple times when set to auto open [Gudy]
BUGFIX: UI   | Fix for BUG 1061538 : /0 error if no pieces [Parg]
BUGFIX: UI   | Fix create-torrent wizard to remember paths properly [Parg]
BUGFIX: UI   | Fixed up opening of torrent files not ending in ".tor" or ".torrent" [Parg]
BUGFIX: UI   | Fix Health icons sometimes not refreshing [Nolar]
BUGFIX: UI   | Fix bug with Azureus crashing when quitting on OSX if the Stats view has been opened [Gudy]
BUGFIX: UI   | Fix the fuzzy Azureus icon bug under OSX [Gudy]
BUGFIX: UI   | IPFilter config view slow to display when thousands of ranges are set [Gudy]
BUGGIX: UI   | Fixed bug with sharing window re-animating even when opened [Gudy]
BUGFIX: UI   | Fixed bug 1081886 : stats graphics can now be 2000 pixels wide, instead of only 1600 before [Gudy]
BUGFIX: Plug | UPnP plugin support for multi-homed machines improved [Parg]




2004.10.31 | Azureus 2.2.0.0

FEATURE: Core | Disk cache [Parg]
FEATURE: Core | Ability to set IP type-of-service (TOS) field for outbound data [Nolar]
FEATURE: Core | Show current upload and download limits in status area [Parg]
FEATURE: Core | Locale selection - options to add in all defined encodings + show lax list [Parg]
FEATURE: Core | Change the incoming data port without restarting [Parg]
FEATURE: Core | Display "warning message" responses in announce replies [Parg]
FEATURE: Core | Added option for tracker to perform a connectability check to peers [Parg]
FEATURE: Core | Have message aggregation, for bandwidth savings/efficiency [Nolar] 
FEATURE: Core | Torrent HTTP urls now accepted as program command line parameter [Nolar]
FEATURE: Core | Option added to disable system tray [Parg]
FEATURE: Core | Concurrent hashing for >1 CPU [Parg]
FEATURE: Core | Added ability to not outward connect to a defined set of port numbers [Parg]
FEATURE: Core | SOCKS V4, V4a and V5 (no auth/user+password methods) support for outgoing data connections [Parg]
FEATURE: Core | Torrents created by Azureus now include .utf-8 fields [Parg]
FEATURE: Core | Dynamic piece request queue scaling [Gudy]
FEATURE: Core | Added torrent name to authentication dialog [Parg]
FEATURE: Core | Per-torrent upload speed limits [Nolar,Gudy]
FEATURE: Core | Ability to change the sound played on torrent completion added [Parg]
FEATURE: Core | Added session uptime to stats [Nolar]
FEATURE: UI   | 'Download' menu added with start/stop all + pause/resume options [Parg]
FEATURE: UI   | Table col sort order default option added, thanks to Charnobo! [Parg]
FEATURE: UI   | URL Downloader window now support to set-up referrer and saves last used referrers [Parg, Gudy]
FEATURE: UI   | New Statistic page about the disk cache (yeah more CPU consuming graphs) [Gudy]
FEATURE: UI   | Down/Up speed indicators in main view are now double-clickable to open the Stats View [Gudy]
FEATURE: UI   | Added Path and # Remaining Pieces to Files view, Tracker Name to MyTorrents view [Nolar]
FEATURE: Plug | webui support for torrent encoding choice [Parg]
FEATURE: Plug | Tracker torrent stats available via xml/http interface [Parg]

CHANGE: Core | Show time to re-announce/scrape in general view using hh::mm::ss [Parg]
CHANGE: Core | Timeout tracker server operations [Parg]
CHANGE: Core | Torrent opener will now report errors opening torrents better [Parg]
CHANGE: Core | Complete core networking/messaging rewrite [Nolar]
CHANGE: Core | Stop scrape on UDP V2 torrents when download running [Parg]
CHANGE: Core | Refactor of DiskManager [Parg]
CHANGE: Core | Protocol tweaking for significantly reduced discard rates [Nolar]
CHANGE: Core | Tracker now treats port value of 0 as 'explicitly firewalled' [Parg]
CHANGE: Core | Tracker client will revert to "initialised" state after explicit failure from tracker [Parg]
CHANGE: Core | Locale selection changed to show more possible encodings [Parg]
CHANGE: Core | XML stats - downloads ordered by downloading/index then seeding/index [Parg]
CHANGE: Core | Reworked connection establishment to conform to new WinXP SP2 limits [Nolar]
CHANGE: Core | When restarting torrents are checked in smallest->largest size [Parg]
CHANGE: Core | Reworked the piece picking so that slow peers don't "block" pieces to be completed [Gudy]
CHANGE: Core | JAR signing for webui (etc) now based on "tools.jar" from Sun JDK due to changes with their 1.5 JRE [Parg]
CHANGE: Core | "Pause" command now greyed out if there is nothing to pause [Parg]
CHANGE: Core | Create-torrent wizard now remembers comment data on back button + defaults for open/save dirs [Parg]
CHANGE: Core | Reduced memory used of ipfilter list to help support large list sizes [Parg]
CHANGE: Core | Added "*.*" to list of selectable file types in open-torrent dialogs [Parg]
CHANGE: UI   | Added a legend to the Pieces View [Gudy]
CHANGE: UI   | Pieces View now display if the blocks are in the cache or not [Gudy]
CHANGE: UI   | New Tools menu, Configuration --> Options, Plugins root menu, Language selection moved to config [Nolar,Gudy]
CHANGE: Plug | UPnP plugin now only uses plugin interfaces [Parg]
CHANGE: Plug | Differentiate UDP and TCP mappings in UPnP desc as some routers need this [Parg]
CHANGE: Plug | UpdateLanguagePlugin removed, as no longer maintained [Nolar]

BUGFIX: Core | Throw an error message if existing data file length is too large [Nolar]
BUGFIX: Core | Fix new bug with tracker announce every 10s when no peers were connected [Nolar]
BUGFIX: Core | Fix for renaming files across volumes [Parg]
BUGFIX: Core | Torrent auto-import now works with console UI [Nolar]
BUGFIX: Core | Bug when setting upload to unlimited (forced download to unlimited too) [Parg]
BUGFIX: Core | Set downloaded amount correctly when opening a torrent with existing download data [Parg]
BUGFIX: Core | Detect changed file sizes (smaller) when resuming torrents [Parg]
BUGFIX: Core | Random shuffling of multi-tracker torrent URLs fixed [Parg]
BUGFIX: Core | Fix occasional 60sec delay on initial tracker announce [Nolar]
BUGFIX: Core | Fix for reading piece data from a too-long file [Nolar/Parg]
BUGFIX: Core | Stop scraping all announce URLs in a torrent when removing torrent [Parg]
BUGFIX: Core | File handle closing [Parg/Nolar]
BUGFIX: UI   | Labels with '&' displaying incorrectly [Parg]
BUGFIX: UI   | Torrent Downloader Window : retry button now placed correctly [Gudy]
BUGFIX: UI   | Fix for clicking the plugins directory and open the folder from the Configuration>Plugins view [Gudy]
BUGFIX: UI   | Fix for animated message windows not being at the right place on dual monitors. [Gudy,Bluelive]
BUGFIX: Plug | Netgear WGT624 was crashing when processing UPnP requests [Parg]
BUGFIX: Plug | Webui 'view' mode wasn't working [Parg]
BUGFIX: Plug | Webui - excessively long status text messing up table [Parg]
BUGFIX: Plug | azplugins - web tracker pages wasn't picking up "show details" option [Parg]
BUGFIX: Plug | webui - fixed bug with re-ordering of columns [Parg]




2004.07.08 | Azureus 2.1.0.4

FEATURE: Core | Show built-in plugins in config view [Parg]
FEATURE: Core | Fallback encoding for torrents (a-zA-Z0-9 type encoding with hex chars for others) [Parg]
FEATURE: Core | Numbers now localized to selected language [TuxPaper]
FEATURE: Core | More "polite" hash checking...doesn't stress the cpu/system as much [Nolar]
FEATURE: Core | Tracker seed retention limit added to limit tracker memory on torrents with high seed counts [Parg]
FEATURE: Core | Show Bad ips/banned ips in ipfilter window + allow clear/reset [Parg]
FEATURE: Core | Option to start torrents in a stopped state [Parg]
FEATURE: Core | Torrent removal rules. Initially to handle unauthorised torrents + AZ update torrents [Parg]
FEATURE: Dev  | More features for torrent creation [Parg]
FEATURE: UI   | New peer columns to help track leechers [TuxPaper]
FEATURE: Plug | Experimental data upload facility for tracker web pages [Parg]
FEATURE: Plug | WebUI support for "host" operation [Parg]
FEATURE: Plug | Run the web interface standalone (outside of a browser) [Parg]
FEATURE: Plug | Option to keep hold of UPnP port mappings when closing Azureus [Parg]

CHANGE: Core | More sensible merging of plugin.properties on plugin update [Parg]
CHANGE: Core | Retuned tracker connect failure retry interval [Nolar]
CHANGE: Core | Torrents downloaded by URL now named after torrent if not already .torrent [Parg]
CHANGE: Core | Performance of ipfilter checking improved [Parg]
CHANGE: Plug | Green colour used on tracker web pages now more legible [Nolar]

BUGFIX: Core | 99.X% / continuous hash fails fix [Parg]
BUGFIX: Core | Basic plugin config model parameters not working in non-swt (e.g. console) mode [Parg]
BUGFIX: Core | Fix for 'completed' announce event not being sent on occasion [Nolar]
BUGFIX: Core | Fix for occassional missing of resume data write -> recheck on start up [Parg]
BUGFIX: Core | Bad peers not being detected on hashfail if they contributed all blocks [Parg]
BUGFIX: Core | Better handling of "auto import" + default torrent save dir being the same [Parg]
BUGFIX: Core | Strip resume data on open of new torrent [Parg]
BUGFIX: UI   | Fix bug where failed-hashcheck pieces never reappeared in Pieces view [Nolar]
BUGFIX: Plug | Web UI authentication for torrent download not working with default port URLs [Parg]



2004.06.21 | Azureus 2.1.0.2

FEATURE: Core | Health items now show if a torrent is being shared/published [Parg]
FEATURE: Core | Creation of self-signed certificates for SSL (etc) via UI [Parg]
FEATURE: Core | Set download speed per torrent [Parg]
FEATURE: Core | Universal Plugin and Play (UPnP) support [Parg]
FEATURE: Dev  | ToolTip access functions for table cells [TuxPaper]
FEATURE: Plug | Tracker plugin supports simple category view [Parg]
FEATURE: Plug | Webui support for password protected trackers [Parg]
FEATURE: Plug | Webui attempts to get access to system clipboard to fix copy/paste issues [Parg]
FEATURE: Plug | Plugin interface extensions for basic plugin config [Parg]
FEATURE: Plug | External authorisation framework [Parg]
FEATURE: Plug | WebUI + XML/HTTP i/f now have separately configurable username/password via Plugin config (*not* plugin.properties) [Parg]
FEATURE: Plug | WebUI can now use signed jars, if configured, so that clipboard access doesn't require local config [Parg]
FEATURE: UI   | Better scrape result reporting, including new "Next Tracker Access" column [TuxPaper]
FEATURE: UI   | Tooltip for Health Icon [TuxPaper]
FEATURE: UI   | New language: Japanese [Gouss]

CHANGE: Core | Core update checker now uses aelitis.com server to grab latest version instead of SF's one [Gudy]
CHANGE: Core | Default socket write buffer now a more conservative 1460 bytes for smoother uploading [Nolar]
CHANGE: Core | Central control of global outgoing peer connection rates...i.e. a better SlowConnect [Nolar]
CHANGE: Core | Unused potential peer connections are cached for later use [Nolar]
CHANGE: Core | Tracker now doesn't return peer list on "stopped" event [Parg]
CHANGE: Plug | Tracker web plugin configuration moved to plugin config from core config  [Parg]
CHANGE: Plug | Tracker web contexts now have the option to not apply IP Filters - this affects the web plugin and xml/http interface [Parg]
CHANGE: UI   | About Window is closeable by hitting the 'ESC' key [Gudy]

BUGFIX: Core | Fix for Library Paths using single quotes [Parg]
BUGFIX: Core | Fixed shared plugin dir location on OSX [Parg]
BUGFIX: Core | File Open dialogs now correctly remember their last path [Nolar]
BUGFIX: Core | Plugin loader picking up .zip files instead of corresponding .jar files [Parg]
BUGFIX: Core | Don't delete the imported .torrent file if the import dir happens to also be the Save torrent dir [Nolar]
BUGFIX: Core | Torrents leave READY state quicker after other torrents are re-queued [TuxPaper]
BUGFIX: Core | Fix for Fast Resume not working when a 0-byte file exists in the torrent [Nolar]
BUGIFX: Core | Fix for Fast Resume not working when Incremental File Creation is enabled [Nolar]
BUGFIX: Core | Show error message if previously-allocated data cannot be found, instead of re-creating it [Nolar]
BUGFIX: Core | Force a file handle recycle every 50M read so the OS cache clears (Win2k, possibly other OSes) [TuxPaper]
BUGFIX: Core | Tracker stats wrong [Parg]
BUGFIX: Core | Not deleting backup torrents (.bak) when MyTorrent->remove + delete [Parg]
BUGFIX: UI   | # Column now on by default again [TuxPaper]
BUGFIX: UI   | Fix for Bug #966867: Context Menu not appearing after setting up columns on Linux [TuxPaper]
BUGFIX: UI   | IP column now sorts by hex groups [TuxPaper]
BUGFIX: UI   | Fix for .torrent icons with new Azureus.exe [Parg]
BUGFIX: UI   | Fix for text color on some Table cells not moving when row moved [TuxPaper]
BUGFIX: UI   | Moving torrent from Uncategorized category to new category now removes the row from the display [TuxPaper]
BUGFIX: UI   | Fix for empty table rows appearing in Peers Details tab and Pieces tab [TuxPaper]
BUGFIX: UI   | Windows : Tray Icon should come back after explorer crash (needs latest SWT build) [SWT team, Gudy]
BUGFIX: UI   | 192 bytes memory leak fixed on OSX [SWT Team, Gudy]



30.05.04 | Azureus 2.1.0.0

FEATURE: Core | Ability to limit global download speed [Parg]
FEATURE: Core | Added ability to automatically exclude files when making torrents (e.g. .DS_Store & Thumbs.db) [Parg]
FEATURE: Core | Caching of peer info to disk for quick restarts if tracker is unavailable [Parg]
FEATURE: Core | Detection of plugin updates [Parg]
FEATURE: Core | HTTP scrapes to same tracker combined into one request if tracker supports it [TuxPaper]
FEATURE: Core | Support for scraping trackers like http://tracker.boxtorrents.com:6969/ that scrape with /scrape but don't have "announce" in announce URL [Parg]
FEATURE: Core | Tracker connections proxy support (peer connections not supported yet) [Nolar]
FEATURE: Core | UDP authentication protocol added [Parg]
FEATURE: Core | UDP tracker version 2 support added [Parg]
FEATURE: Core | Generic update mechanisms for core, updater and swt [Parg/Gudy]
FEATURE: Core | Support for loading user-specific plugins from user dir and shared ones from app dir [Parg]
FEATURE: Dev  | Column management for any of Azureus' table views. [TuxPaper]
FEATURE: Dev  | Easy to use "basic plugin view": see PluginInterface::getUIManager::getBasicPluginViewModel [Parg, Gudy]
FEATURE: UI   | Ability to upload torrents with xml/http interface [Parg]
FEATURE: UI   | All columns sortable and configurable [TuxPaper]
FEATURE: UI   | Added "Remaining", "DLing For" (time) and "Seeding For" (time) columns to "My Torrents" [TuxPaper]
FEATURE: UI   | Added option to auto-update language file from web (Config -> Interface -> Language) [TuxPaper]
FEATURE: UI   | Added option to show transfer rates in bits/sec [Parg]
FEATURE: UI   | In the Details view, the peer's pieces that we already have are shown in a faded color [TuxPaper]
FEATURE: UI   | Linux system tray support [Gudy]
FEATURE: UI   | MyTracker row right-click support for copying torrent URL to clipboard [Parg]
FEATURE: UI   | Right-click menu sorting of columns (Sorting for OSX) [TuxPaper]
FEATURE: UI   | Send text in My Torrents to clipboard [TuxPaper]
FEATURE: UI   | When torrent data is missing, you can change directory via the context menu [TuxPaper]
FEATURE: UI   | OSX : About and Preferences items are listed under 'Azureus' menu [Gudy]
FEATURE: UI   | Added an option not to use units bigger than MB [Gudy]
FEATURE: UI   | Option to show peer host names instead of IP address [Parg]
FEATURE: UI   | Embedded tracker IP blocks shown in Blocked IPs List [Parg]
FEATURE: WebUI| Web Plugin now can set upload rate [Parg]
FEATURE: WebUI| Web Plugin support for uploading torrents [Parg]
FEATURE: WebUI| Webui + xml/http "access" property support for IP range [Parg]
FEATURE: WebUI| Webui + xml/http plugins have had basic plugin view added [Parg]

CHANGE:      | IRC and Tracker Web Pages moved to separate plugin [Parg]
CHANGE: Core | Auto-imported .torrent files are moved (not copied) to default .torrent save dir if enabled [Nolar]
CHANGE: Core | Auto-imported .torrent files are renamed *.imported if default .torrent save dir is not enabled [Nolar]
CHANGE: Core | Can set per-torrent and global peer connection limits [Nolar]
CHANGE: Core | Config/pref/torrent file saving uses intermediate .saving file for more reliability [Nolar]
CHANGE: Core | Currently-connected peer connections are dropped when IPFilter is enabled [Nolar]
CHANGE: Core | File descriptor handles increased from default of 256 to 8192 under OSX [Nolar]
CHANGE: Core | Ignore Share Ratio can now be non-integer [TuxPaper]
CHANGE: Core | New SHA-1 hasher: up to 25% faster [Gudy / Nolar]
CHANGE: Core | Scrape interval now based on # of seeds (15min minimum) [TuxPaper]
CHANGE: Core | Socket writes now done in full MSS-sized chunks [Nolar]
CHANGE: Core | Upload limit can now be set less than 5KB/sec. However, doing so limits download speed too [Parg]
CHANGE: Core | User config/pref/plugins dir culled from Windows' Registry (needs aereg.dll) [Parg]
CHANGE: Core | OSX user- pref/plugin dir moved from ~/Library/Azureus/ to ~/Library/Application Support/Azureus/ to meet osx standards [Nolar]
CHANGE: Core | Unix user- pref/plugin dir moved from ~/Azureus/ to ~/.Azureus/ to meet unix standards [Nolar]
CHANGE: UI   | All progress/piece bars re-done (again) [TuxPaper]
CHANGE: UI   | Azureus should work with SWT 2.12 until we break backwards compat. again [TuxPaper]
CHANGE: UI   | Shrink "My Torrents" Context menu [TuxPaper]
CHANGE: UI   | Systray4j removed: system tray support now from SWT built-in code (Requires SWT-M8+) [Gudy]
CHANGE: UI   | Torrent name shown with IPs in the blocked-IPFilter list [Nolar]
CHANGE: UI   | The Donation Window is now Closeable using the 'Esc' Key [Gudy]
CHANGE: UI   | In the Donation Window the OK button should be on top of other Controls [Gudy]
CHANGE: UI   | Added a "what's new" item in help menu, pointing to changelog for current version [Gudy / Gouss]

BUGFIX: Core | Files incorrectly shared if contents not a torrent when opening [Parg]
BUGFIX: Core | First Priority rules based on time now work across sessions [TuxPaper]
BUGFIX: Core | Fix for saving of .torrent file in wrong dir: Bug #916137 [Nolar]
BUGFIX: Core | Fix for some discarded data due to occasional duplicate request [Nolar]
BUGFIX: Core | Fix for system clock changes stalling downloads: Bug #918193 [Nolar]
BUGFIX: Core | Fix for system clock running faster when using Azureus [Nolar]
BUGFIX: Core | Fix for underlying socket handles not closing under linux ("Too many open files") [Nolar]
BUGFIX: Core | Individual file priorities remembered after Stop-Start [Nolar]
BUGFIX: Core | Multiple shares of same resources causing problems (e.g. share contents+share contents recursive of same dir) [Parg]
BUGFIX: Core | Simpler and more reliable file allocation...won't b0rk existing data [Nolar]
BUGFIX: Core | Re-check on completion no longer sends Have messages [Nolar]
BUGFIX: UI   | Fix for the General View in a torrent details, not being layout correctly [Gudy]
BUGFIX: UI   | Fix for the toolbar on linux / OS X [Gudy]
BUGFIX: UI   | Fix for the Torrent Maker not getting the correct Tracker when choosing from the Combo on OS X [Gudy]
BUGFIX: UI   | Fix for the Freeze on exit under OSX [Gudy]





16.03.04 | Azureus 2.0.8.4

CHANGE: WebUI plugin included in mainline (see http://azureus.sf.net/CVS/web.interface.howto.htm) [Parg]
CHANGE: Much more reliable SF mirror auto-update handling [Nolar]

BUGFIX: Fix for loading .torrent files via web-browser/shell/doubleclick/etc [Nolar]



15.03.04 | Azureus 2.0.8.2

FEATURE: Show last time IPFilter list was updated in status area [Parg]
FEATURE: Support for "compact" tracker announce protocol [Parg]
FEATURE: Support for "key" tracker announce protocol [Parg]
FEATURE: Download Speed column in "My Torrents" turns red if below speed set in Queue config. [TuxPaper]
FEATURE: Webplugin swing ui has status area with total ul/dl [Parg]
FEATURE: XML over HTTP remote plugin interface (initially to support GTS) - mail parg at users.sf.net for details [Parg]

CHANGE: All config/pref files utilize .bak backup files [Parg]
CHANGE: Option to limit outstanding disk writes and piece hash checks [Parg]
CHANGE: Can delete shares in QUEUED state [Parg]

BUGFIX: Fix of startup issues under Win95/98/Me [TuxPaper]
BUGFIX: Locale-specific dir creation [Parg]
BUGFIX: Hebrew language works now [TuxPaper]
BUGFIX: Fixed long load times under Linux of Configuration view and General tab [TuxPaper]
BUGFIX: Popup windows now center in main monitor on multi-monitor setups [TuxPaper]
BUGFIX: Fix for Pieces and Files views off-by-one row drawing glitch under linux [TuxPaper]
BUGFIX: Sort on Health and Availability now enabled [TuxPaper]
BUGFIX: Various memory leaks (DiskManager instances not being freed) [Parg]



08.03.04 | Azureus 2.0.8.0

FEATURE: QUEUED status. Torrents that are queued are stopped, but available for automatic starting [TuxPaper]
FEATURE: Partial support for Read-Only data (for seeding) [TuxPaper]
FEATURE: Added "Forced-Start" to force a torrent to start, ignoring download limits or seeding rules [TuxPaper]
FEATURE: Auto-positioning of finished torrent based on how badly the torrent needs seeding [TuxPaper]
FEATURE: Added Availability, Seeding Rank, SavePath, Max # Uploads, and Total Speed columns to My Torrents view [TuxPaper]
FEATURE: Categories to group your torrents in (right click on My Torrents and select Set Category to get started) [TuxPaper]
FEATURE: More auto-seeding options [TuxPaper]
FEATURE: Ability to limit maximum number of file handles open/in-use at any given time [Parg]
FEATURE: Tracker - various performance enhancements such as announce/scrape caching. Tested to 500,000 peers on single torrent [Parg]
FEATURE: Tracker activity logging to %azhome%/tracker.log [Parg]
FEATURE: Tracker bytes in/out + scrapes recorded [Parg]
FEATURE: Tracker - ability to limit number of peers returned [Parg]
FEATURE: Share ratio now shown on tracker web pages [Parg]
FEATURE: Tracker/client support for "no_peer_id" spec for bandwidth savings [Parg/Nolar]
FEATURE: More plugin stuff - alert raising, ipfilter reloading, various other stuff [Parg]
FEATURE: Applet UI enhanced into usable state (start/stop/add/remove downloads) + auto refresh [Parg]
FEATURE: Added torrent hashes for G2 + ED2K (ala http://www.torrentaid.com/) [ Parg]
FEATURE: Added colours to file view to show: grey -> requested; red -> data recently written [Parg]

CHANGE: Split torrents in My Torrents view into 2 lists: Downloading and Seeding (Completed) [TuxPaper]
CHANGE: STOPPED status now means the torrent never auto-starts [TuxPaper]
CHANGE: Moved icon from Rank column to Name column [TuxPaper]
CHANGE: Removed Lock Priority.  No longer an issue since priority only gets autochanged once [TuxPaper]
CHANGE: Remove "Lock Start/Stop" menu option.  Stop now means no auto-starting/stopping [TuxPaper]
CHANGE: Re-design of Configuration view [TuxPaper]
CHANGE: Language files (MessagesBundle_xx_XX.properties) are read in the following order: Azureus user directory, Azureus application directory, JAR file [TuxPaper]
CHANGE: Remember sorted column and order for all views [TuxPaper]
CHANGE: Core performance optimizations and major cpu usage reductions [Nolar]
CHANGE: User prompt when (1) tracker listens fails (2) incoming server port bind fails [Parg]
CHANGE: Config files/dirs and plugins now stored in OS user dir (Win: C:\Documents and Settings\username\Application Data\Azureus\, OSX: /Users/username/Library/Azureus/, Linux: /home/username/Azureus/) [Nolar]
CHANGE: Tracker log now includes date as well as time [Parg]

BUGFIX: Once a torrent is complete, and you remove the data, it wil no longer start downloading again when seeding rules are on [TuxPaper]
BUGFIX: 1st column of MyTorrents no longer has a gap if there's no icon. (Windows Only Bug) [TuxPaper]
BUGFIX: Fix for download stalls at 99% / 100% cpu usage bug introduced in 2070 [Parg/Gudy] 
BUGFIX: Fix for minimize/close causing the program to disappear from view under OSX [Nolar]
BUGFIX: Fix for icon bar buttons not being flat (Bug #890166) [Gudy]
BUGFIX: More reliable .config and .torrent file save/load management [Nolar]
BUGFIX: Better handling of failures when performing "move on complete" [Parg]
BUGFIX: Handle torrent file names with trailing spaces and CR/NL (from Mac) [Parg]


02.02.04 | Azureus 2.0.7.0

FEATURE: Under Linux + GTK, added an option to setup a vertical offset to re-align graphics [Gudy]
FEATURE: SSL tracker client now gives option to import certificate rather than manually doing so via "keytool" [Parg]
FEATURE: Start All Downloads option on tray icon [Nolar]
FEATURE: Support for trackers that do not return peerIDs on announce [Parg]
FEATURE: Sharing - allows files/dirs/dir contents (recursive) to automatically have torrents created for them and torrents hosted
		 The shared resources will automatically have their torrents recalculated if they change (over Azureus restart) [Parg]
FEATURE: Tracker allows number of peers returned to be limited [Parg]
FEATURE: Experimental UDP tracker protocol (see Config->Tracker->Extensions). Azureus client/tracker supports this, as does the XBT tracker (http://sourceforge.net/projects/xbtt/) [Parg]
FEATURE: Tracker support for GZIP encoding [Parg]
FEATURE: Tracker support for multiple pages [IAmChrist]
FEATURE: Tracker pages skinable by placing pages in %azhome%/web [Parg]
FEATURE: Major extensions to plugin interfaces [Parg]
FEATURE: Simple Swing based remote admin interface (over SSL+password auth) - email parg at users.sourceforge.net for details [Parg]
FEATURE: Click on hash in general view to copy hash to clipboard [Parg]

CHANGE: Azureus now identifies itself via User-Agent in tracker http communications [Nolar]
CHANGE: Less flickering, on all platforms (tested on both windows and linux+GTK) [Gudy]
CHANGE: Azureus now responds as Server: Azureus <version> in tracker http comms [Parg]
CHANGE: Unwritten blocks in Pieces view shown in red [Gijs Overvliet]
CHANGE: Prioritizing first piece of file(s) now optional in config [Nolar]
CHANGE: Confirmation on data deletion now optional in config [Nolar]
CHANGE: More intelligent announce url '&numwant=' handling [Nolar]
CHANGE: On tracker announce errors, retry interval now uses exponential backoff [Nolar]
CHANGE: Removed multi-port listening, as shared single port is far superior [Nolar]
CHANGE: More reliable .config and .torrent file writing [Nolar]
CHANGE: Tracker scraper now honors a 'flags: min_request_interval' response [TuxPaper]
CHANGE: Plugins can be initialised from plugin.properties freestanding (not just in .jar file) [Parg]

BUGFIX: Problem with tracker not responding with "Connection: close" causing SSL session maintainance with HttpsURLConnection to stuff up and fail clients with "recv fail" [Parg]
BUGFIX: Fast resuming with Chinese directories: Bug #869749 [Parg]
BUGFIX: System tray icon re-shown after explorer.exe crash (again) [Rele]
BUGFIX: Fix for potential memory leaks [Nolar]
BUGFIX: Fix for stalled piece writing [Gijs Overvliet]
BUGFIX: Fix for .torrent file data not being fully written on shutdown [Parg]
BUGFIX: Fix for OutOfMemoryError in DiskManager: Bug #865553 [TuxPaper]
BUGFIX: Fix for 'Open a URL' downloading of .torrent file which contains white spaces: Bug #878990 [Parg]
BUGFIX: Fix for Fast Resume with Chinese torrents: Bug #878015 [Parg]
BUGFIX: Fix for excess thread creation when tracker does not support single-infohash scrapes [Nolar]
BUGFIX: Fix for hash checking 0-byte files: Bug #853126 [Nolar]
BUGFIX: Fix for opening files via Files tab when using MoveOnComplete: Bugs #860822, #878795 [Nolar] 
BUGFIX: Fix for 100% cpu usage after network disconnect/reconnect: Bugs #873957, #879498 [Nolar]
BUGFIX: Fix for downloaded blocks not being written to disk, due to write-thread stall under high load [Nolar]
BUGFIX: Fix for various non-unicode torrent encoding issues regarding resume data [Parg]



19.12.03 | Azureus 2.0.6.0

FEATURE: Intelligent Tracker Checking: optimizes tracker re-ask interval for quicker download speed ramp up [Nolar]
FEATURE: Azureus can now run all downloads off one shared incoming port: only need to open/forward one port in your firewall/NAT [Parg]
FEATURE: Drag-n-Drop moving of downloads in MyTorrents; moving of downloads in MyTorrents with Ctrl + Arrow-Up/Down [Rele]
FEATURE: Password protected access to tracker web and torrents [Parg]
FEATURE: GUI Update interval is configurable [Gudy]
FEATURE: Images update interval is configurable [Gudy]
FEATURE: Auto sort on tables possible, interval configurable [Gudy]
FEATURE: MyTorrents view can now be customized (choice of columns and order) [Gudy]
FEATURE: Added new columns to MyTorrents : 'Share Ratio', 'Downloaded', 'Uploaded', 'Health' [Gudy]
FEATURE: Details view can now be customized (choice of columns and order) [Gudy]
FEATURE: SSL now supported for tracker web and tracker updates [Parg]
FEATURE: Added Drag and Drop of URLs [Rele]
FEATURE: Multi-Trackers torrents can now be created/edited [Gudy]
FEATURE: Menu option to force a re-check of downloaded data [Nolar]
FEATURE: End-Game Mode: Completes the last few pieces of a download faster [Gudy]
FEATURE: Attempts to download the very beginning of a file first - to support previewing [Nolar]
FEATURE: IPFiltering stats shown in status bar [Gudy]
FEATURE: Toolbar! [Gudy]
FEATURE: Logging of console output to disk [Parg]
FEATURE: Option to confirm on exit [Rele]
FEATURE: Bad Peer Detection [Gudy]
FEATURE: Inclusion of XSL stylesheed tag in stats XML file [Parg]
FEATURE: Editing and selection of tracker announce URLs from general view [Gudy]
FEATURE: Plugin interface for tracker web serving [Parg]
FEATURE: HTML template (http://html-tmpl-java.sourceforge.net/) support for tracker web serving from %az_home%/web folder [Parg]
FEATURE: Opening a second torrent with same hash as existing download causes second torrent's announce urls to be merged into the first [Parg]
FEATURE: Option to not accept multiple connections from the same IP [Gudy]
FEATURE: Option to use the IP Filter list as an 'ALLOW' list [Gudy]
FEATURE: Super-Seed Mode [Gudy]
FEATURE: Pressing a character selects the next download with a name beginning with this character in MyTorrents view [Rele]
FEATURE: Option to move-on-complete only when data is inside the default save dir [Nolar]
FEATURE: Auto-import new .torrents from a chosen folder regularly [Rele]
FEATURE: Create torrent allows manual piece size selection [Parg]
FEATURE: New 'Activity' view (download and upload speed graphics) [Gudy]
FEATURE: Gzip encoding support for tracker announces [Parg]
FEATURE: Tray icon: added Stop All Torrents [Rele]
FEATURE: If .torrents are dropped in COPY state (with modifier key Ctrl under Windows), they will begin in STOPPED state [Rele]
FEATURE: Ctrl + [Home/End/CursorUp/CursorDown] moves selected torrents to top/end/up/down, "Del" removes selected torrents [Rele]
FEATURE: Ctrl + [S/R] stops/resumes(starts) selected torrents, Ctrl+Shift+S stops all torrents, Ctrl+A selects all torrents [Rele]
FEATURE: Option to backup .torrent files [Rele]
FEATURE: Option to play a sound on download finish [Rele]
FEATURE: Download Basket: TrayWindow always visible for Drag-n-Drop of .torrents [Rele]
FEATURE: Clickable Tracker URL in Details/General copies the announce URL into clipboard [Rele]
FEATURE: Tab hot keys: F6 selects next Tab, Shift+F6 selects previous Tab, ESC or CTRL+F4 closes current Tab [Rele]
FEATURE: Extended Plugin interface [Parg,Gudy]

CHANGE: 'Bind to local IP address' now binds outbound sockets as well [Nolar]
CHANGE: Status now shows when it is re-checking pieces on download completion [Nolar]
CHANGE: URL dialogs are initialized with the first valid link beginning with http:// from clipboard [Rele]
CHANGE: Under linux, only use ~/.azureus dir if it already exists, otherwise use normal program dir for files [Nolar] 
CHANGE: Auto-update: now writes a log to an 'update.log' file [Nolar]
CHANGE: Option to disconnect seeds when seeding is now checked by default [Gudy]
CHANGE: FilesView now shows files even in other states than Downloading (configurable) [Rele]
CHANGE: Updated/additional menu buttons [Gudy]
CHANGE: Some speed optimizations with piece-picking [Nolar]
CHANGE: Generated PeerID only uses chars that don't need to be escaped, saving bandwidth for tracker communications [Nolar]
CHANGE: Can now identify BitComet, TurboBT, LibTorrent clients [Nolar]
CHANGE: Support for both SI byte units (KiB,MiB,GiB) and more well known, but incorrect KB/MB/GB units via config Interface param [Parg]
CHANGE: locale choice can force prompt via new config param on "File" tab [Parg]

BUGFIX: 'Re-check pieces when done' now always ignores fast-resume data: Bug #825881 [Nolar]
BUGFIX: Fix some decoding bugs in Chinese torrent files due to missing locale encodings in dialog box [Akilgard]
BUGFIX: System tray icon re-shown after explorer.exe crash [Rele]
BUGFIX: Completed downloads shown in different color when Stopped [Nolar]
BUGFIX: Fix possible data loss when moving complete files if not enough free space avail: Bug #855284 [Nolar]
BUGFIX: Fix for the incremental vs allocate choice in Config [Gudy]
BUGFIX: DNS lookups are no longer cached for ever [Parg]
BUGFIX: OSX: Hang when closing: Bug #824459 [Nhilep]


20.11.03 | Azureus 2.0.4.2

FEATURE: Added tooltip general support [Gudy]
FEATURE: Default torrent encoding selection added to Config->File [Parg]
FEATURE: Public tracker support - config item allows external use of tracker [Parg]

CHANGE: Full scrape of embedded tracker now supported as SN requires this for hosting [Parg]
CHANGE: Better peer client identification [Nolar]
CHANGE: Added AZ version + torrent size to stats [Parg]
CHANGE: Added 'comment' field to torrent create [Parg]
CHANGE: Moving of .torrent to completed dir now optional [Nolar]
CHANGE: Additional upload speed options [Nolar]
CHANGE: Cleanup of Configuration tabs [Nolar]
CHANGE: Rewrite of locale selection code for torrents. Only one encoding allowed per torrent [Parg]
CHANGE: File->Open... now opens to the default download/torrent dirs set in config [Parg]
CHANGE: ETA/TimeRemaining now uses just two significant measures, and "kB" changed to "KB"  [Nolar] 

BUGFIX: Torrent hosting - resetting of tracker url to original after hosting cancelled [Parg]
BUGFIX: Allow for torrent files with '.tor' extention [Nolar]
BUGFIX: Renamed file not reused after torrent Stop-Start: Bug #842750 [Nolar]
BUGFIX: No longer deletes files if the 'completed' dir points to the download dir: Bug #842896 [Nolar]
BUGFIX: Fast resume data no longer duplicated [Nolar]
BUGFIX: File 'downloads.config' kept better up-to-date [Nolar]
BUGFIX: % Completed is now correct again in MyTorrents view on stopped downloads [Gudy]
BUGFIX: Non-UTF8 encoded 'comment' fields in torrents not showing properly [Parg]
BUGFIX: Some dead-lock issues (especially on startup) [Gudy]
BUGFIX: Better recovery on connection closing [Nolar]
BUGFIX: Uncleaned buffers in peer handling code [Nolar]
BUGFIX: Outgoing message correctness verification [Nolar]
BUGFIX: Text scroll is now ok in irc view [Gudy]
BUGFIX: Size is now displayed even when the torrent is stopped [Gudy]
BUGFIX: Sorting by 'Discarded', 'Overall Down Speed', 'Stat Up' in Details view [Nolar]
BUGFIX: Torrent 'discarded' and 'hash fails' now remembered between sessions [Nolar]
BUGFIX: Corrected sorting by DownSpeed, UpSpeed, ETA in MyTorrents view [Nolar]
BUXFIX: Irc input text area gets focus correctly now [Gudy]
BUXFIX: On Windows bundle, systray4.dll as been updated to support chinese characters [evilcai]



13.11.03 | Azureus 2.0.4.0

FEATURE: Disable (per torrent) the auto priority setting when seeding [Gudy]
FEATURE: Disable (per torrent) the rules to start / stop a seeding torrent [Gudy]
FEATURE: Move files to a directory upon completion [Nolar]
FEATURE: Slowly establish new connections to peers (for those with internet disconnection issues) [Nolar]
FEATURE: Bind to local IP address [Nolar]
FEATURE: Export/import torrent file to/from XML file [Parg]
FEATURE: Export of runtime statistics to XML file [Parg]
FEATURE: Hosting of torrents using built-in tracker [Parg]
FEATURE: Trackers used in the 'make torrent' wizard are now remembered.
FEATURE: Embedded tracker [Parg]
FEATURE: Enhanced peer client identification [Nolar]
FEATURE: Publishing of torrents to tracker (as opposed to hosting them) [Parg]
FEATURE: Choosable color for the progress bars [Gudy]
FEATURE: Plugin support [Gudy]
FEATURE: Open a torrent file without using the default save location [Gudy]
FEATURE: Added a FAQ and a Donate link in Help menu [Gudy]
FEATURE: New languages : Brazilian-Portuguese, Czech, Lithuanian [Gouss - Translators]

CHANGE: Some GUI Changes, so that SWT WinXP theme is better supported [Gudy]
CHANGE: Saving of torrent files to central dir now optional [Nolar]
CHANGE: Checking after crash now remembers Fast Resume data [Nolar]
CHANGE: Internal refactorization of core classes [Parg]
CHANGE: More logging of reasons for connection closed [Gudy]

BUGFIX: Fixed snub/unsnub multiple peers on the peers list [Gudy]
BUGFIX: Save file dialog now opens as a 'save' dialog, and not 'open' (for OSX) [Gudy]
BUGFIX: DNS name resolution caching no longer infinite [Nolar]
BUGFIX: Better recovery checking of partially-allocated files [Nolar]
BUGFIX: Re-check file(s) integrity after completion [Nolar]
BUGFIX: Max torrent file size was limited to 1MB - limit removed [Parg]
BUGFIX: Fix for several exceptions thrown during socket reads/writes [Nolar]
BUGFIX: Fix for exception thrown when peer sends an invalid bitfield [Nolar]
BUGFIX: AZ was reporting cumulative upload/download stats to tracker - should be per session [Parg]
BUGFIX: Fix for handling single data files larger than 2GB [Nolar]
BUGFIX: Corrected socket writing [Gudy]
BUGFIX: Weren't sending "complete" event to tracker on download->seeding transition [Parg]
azureus-ConfigurationManager-improvement.patch:

--- NEW FILE azureus-ConfigurationManager-improvement.patch ---
--- org/gudy/azureus2/core3/config/impl/ConfigurationManager.java~	2005-10-03 09:36:58.000000000 -0700
+++ org/gudy/azureus2/core3/config/impl/ConfigurationManager.java	2005-12-18 07:30:07.000000000 -0800
@@ -201,14 +201,14 @@
   }
   
   private String getStringParameter(String parameter, byte[] defaultValue) {
-    try {
-      return new String(getByteParameter(parameter, defaultValue));
-    } catch (Exception e) {
-      byte[] bytesReturn = getByteParameter(parameter, null);
-      if (bytesReturn == null)
-        return null;
-      return new String(bytesReturn);
-    }
+    byte[] bp = getByteParameter(parameter, defaultValue);
+    if (bp == null)
+      {
+	bp = getByteParameter(parameter, null);
+	if (bp == null)
+	  return null;
+      }
+    return new String(bp);
   }
   
   public String getStringParameter(String parameter, String defaultValue) {

azureus-GKR.patch:

--- NEW FILE azureus-GKR.patch ---
--- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~	2005-12-19 07:55:50.000000000 -0800
+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java	2006-01-14 16:52:09.000000000 -0800
@@ -336,7 +336,7 @@
 		try{
 			this_mon.enter();
 		
-			KeyStore keystore = KeyStore.getInstance("JKS");
+			KeyStore keystore = KeyStore.getInstance("GKR");
 			
 			if ( !new File(name).exists()){
 		
@@ -391,7 +391,7 @@
 		
 		throws Exception
 	{
-		KeyStore key_store = KeyStore.getInstance("JKS");
+		KeyStore key_store = KeyStore.getInstance("GKR");
 		
 		if ( !new File(keystore_name).exists()){
 			
@@ -676,7 +676,7 @@
 		try{
 			this_mon.enter();
 		
-			KeyStore keystore = KeyStore.getInstance("JKS");
+			KeyStore keystore = KeyStore.getInstance("GKR");
 			
 			if ( !new File(truststore_name).exists()){
 		


--- NEW FILE azureus-License.txt ---
The GNU General Public License (GPL)
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.

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) 

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.

azureus-base64.patch:

--- NEW FILE azureus-base64.patch ---
--- com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java~	2005-11-22 12:07:30.000000000 -0800
+++ com/aelitis/net/udp/impl/PRUDPPacketHandlerImpl.java	2006-01-17 21:56:00.000000000 -0800
@@ -43,7 +43,7 @@
 import com.aelitis.net.udp.PRUDPPacketRequest;
 import com.aelitis.net.udp.PRUDPRequestHandler;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 public class 
 PRUDPPacketHandlerImpl
--- org/gudy/azureus2/ui/console/util/StringEncrypter.java~	2005-10-14 04:43:14.000000000 -0700
+++ org/gudy/azureus2/ui/console/util/StringEncrypter.java	2006-01-17 21:56:24.000000000 -0800
@@ -12,7 +12,7 @@
 import javax.crypto.spec.DESKeySpec;
 import javax.crypto.spec.DESedeKeySpec;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 /**
  * utility class to encrypt strings. this class was taken from the examples at:
--- org/gudy/azureus2/ui/swt/auth/AuthenticatorWindow.java~	2005-10-14 00:17:38.000000000 -0700
+++ org/gudy/azureus2/ui/swt/auth/AuthenticatorWindow.java	2006-01-17 21:56:47.000000000 -0800
@@ -42,7 +42,7 @@
 import org.gudy.azureus2.core3.config.*;
 import org.gudy.azureus2.core3.security.*;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 public class 
 AuthenticatorWindow 
--- org/gudy/azureus2/core3/tracker/server/impl/tcp/TRTrackerServerProcessorTCP.java~	2005-10-15 17:36:18.000000000 -0700
+++ org/gudy/azureus2/core3/tracker/server/impl/tcp/TRTrackerServerProcessorTCP.java	2006-01-17 21:57:15.000000000 -0800
@@ -31,7 +31,7 @@
 import org.gudy.azureus2.core3.tracker.server.impl.*;
 import org.gudy.azureus2.core3.util.*;
 
-import org.bouncycastle.util.encoders.Base64;
+import gnu.crypto.util.Base64;
 
 public abstract class 
 TRTrackerServerProcessorTCP

azureus-cache-size.patch:

--- NEW FILE azureus-cache-size.patch ---
--- org/gudy/azureus2/core3/config/COConfigurationManager.java~	2005-10-05 11:27:44.000000000 -0700
+++ org/gudy/azureus2/core3/config/COConfigurationManager.java	2006-01-18 19:49:48.000000000 -0800
@@ -39,7 +39,7 @@
 	public static final int CONFIG_CACHE_SIZE_MAX_MB;
 	
 	static{
-		long max_mem_bytes 	= Runtime.getRuntime().maxMemory();
+	    long max_mem_bytes 	= Math.min (Runtime.getRuntime().maxMemory(), 64*1024*1024);
 	    long mb_1			= 1*1024*1024;
 	    long mb_32			= 32*mb_1;
 	    CONFIG_CACHE_SIZE_MAX_MB = (int)(( max_mem_bytes - mb_32 )/mb_1);

azureus-java.beans.XMLEncoder.patch:

--- NEW FILE azureus-java.beans.XMLEncoder.patch ---
--- org/gudy/azureus2/ui/console/multiuser/UserManager.java~	2005-09-06 08:44:54.000000000 -0700
+++ org/gudy/azureus2/ui/console/multiuser/UserManager.java	2005-12-17 12:06:13.000000000 -0800
@@ -23,7 +23,7 @@
 package org.gudy.azureus2.ui.console.multiuser;
 
 import java.beans.XMLDecoder;
-import java.beans.XMLEncoder;
+// import java.beans.XMLEncoder;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -159,9 +159,9 @@
 		List users = new ArrayList( usersMap.values() );
 		config.setUsers(users);
 		
-		XMLEncoder encoder = new XMLEncoder( new BufferedOutputStream( out ) );
-		encoder.writeObject(config);
-		encoder.close();
+		// XMLEncoder encoder = new XMLEncoder( new BufferedOutputStream( out ) );
+		// encoder.writeObject(config);
+		// encoder.close();
 	}
 
 	public static UserManager getInstance(PluginInterface pi) 

azureus-jessie.patch:

--- NEW FILE azureus-jessie.patch ---
--- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~	2005-11-03 07:32:04.000000000 -0800
+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java	2005-12-17 19:33:27.000000000 -0800
@@ -86,7 +86,7 @@
 		
 		try{
 			Security.addProvider((java.security.Provider)
-				Class.forName("com.sun.net.ssl.internal.ssl.Provider").newInstance());
+				Class.forName("org.metastatic.jessie.provider.Jessie").newInstance());
 			
 		}catch( Throwable e ){
 			

azureus-no-bouncycastle.patch:

--- NEW FILE azureus-no-bouncycastle.patch ---
--- org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java~	2006-01-17 21:58:55.000000000 -0800
+++ org/gudy/azureus2/core3/security/impl/SESecurityManagerImpl.java	2006-01-17 22:20:05.000000000 -0800
@@ -94,7 +94,7 @@
 		}
 		
 		try{
-			SESecurityManagerBC.initialise();
+		    //			SESecurityManagerBC.initialise();
 			
 		}catch( Throwable e ){
 			
@@ -505,7 +505,8 @@
 	
 		throws Exception
 	{
-		return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
+	    //		return( SESecurityManagerBC.createSelfSignedCertificate( this, alias, cert_dn, strength ));
+	    return null;
 	}
 	
 	public boolean

azureus-remove-manifest-classpath.patch:

--- NEW FILE azureus-remove-manifest-classpath.patch ---
--- build.xml~	2005-10-25 07:21:24.000000000 -0700
+++ build.xml	2006-01-19 06:39:07.000000000 -0800
@@ -39,7 +39,6 @@
       <jar destfile="${root.dir}/${dist.dir}/Azureus2.jar" basedir="${root.dir}" excludes="${dist.jar.excludes}" >
          <manifest>
             <attribute name="Main-Class" value="org.gudy.azureus2.ui.common.Main" />
-            <attribute name="Class-Path" value="Azureus2.jar apple-extensions.jar commons-cli.jar log4j.jar swt.jar swt-win32.jar swt-osx.jar" />
          </manifest>
       </jar>
       

azureus-remove-win32-PlatformManagerUpdateChecker.patch:

--- NEW FILE azureus-remove-win32-PlatformManagerUpdateChecker.patch ---
--- org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java~	2005-10-18 17:40:06.000000000 -0700
+++ org/gudy/azureus2/pluginsimpl/local/PluginInitializer.java	2005-12-17 19:19:51.000000000 -0800
@@ -131,11 +131,6 @@
    					"azbpcorepatcher", 
    					"CorePatcher",
 					"true" },
-	   		{	 PluginManagerDefaults.PID_PLATFORM_CHECKER, 
-   					"org.gudy.azureus2.platform.win32.PlatformManagerUpdateChecker", 
-   					"azplatform2", 
-   					"azplatform2",
-					"true" },
 	   		{	 PluginManagerDefaults.PID_JPC, 
 					"com.aelitis.azureus.plugins.jpc.JPCPlugin", 
 					"azjpc", 

azureus-remove-win32-osx-platforms.patch:

--- NEW FILE azureus-remove-win32-osx-platforms.patch ---
--- org/gudy/azureus2/platform/PlatformManagerFactory.java~	2005-09-12 14:00:06.000000000 -0700
+++ org/gudy/azureus2/platform/PlatformManagerFactory.java	2005-12-17 12:35:09.000000000 -0800
@@ -44,28 +44,6 @@
 			class_mon.enter();
 		
 			if ( platform_manager == null ){
-										  
-				try{
-					if ( getPlatformType() == PlatformManager.PT_WINDOWS ){
-						
-						platform_manager = org.gudy.azureus2.platform.win32.PlatformManagerImpl.getSingleton();
-						
-					}else if( getPlatformType() == PlatformManager.PT_MACOSX ){
-						
-	                    platform_manager = org.gudy.azureus2.platform.macosx.PlatformManagerImpl.getSingleton();
-	                    
-					}
-				}catch( PlatformManagerException e ){
-					
-						// exception will already have been logged
-					
-				}catch( Throwable e ){
-					
-					Debug.printStackTrace(e);
-				}
-			}
-			
-			if ( platform_manager == null ){
 				
 				platform_manager = org.gudy.azureus2.platform.dummy.PlatformManagerImpl.getSingleton();
 			}

azureus-sun.misc.Cleaner.patch:

--- NEW FILE azureus-sun.misc.Cleaner.patch ---
--- com/aelitis/azureus/core/diskmanager/MemoryMappedFile.java~	2004-09-23 08:52:12.000000000 -0700
+++ com/aelitis/azureus/core/diskmanager/MemoryMappedFile.java	2005-12-17 12:03:21.000000000 -0800
@@ -220,8 +220,8 @@
   				try {
   					Method getCleanerMethod = buffer.getClass().getMethod( "cleaner", new Class[0] );
   					getCleanerMethod.setAccessible( true );
-  					sun.misc.Cleaner cleaner = (sun.misc.Cleaner)getCleanerMethod.invoke( buffer, new Object[0] );
-  					cleaner.clean();
+					// sun.misc.Cleaner cleaner = (sun.misc.Cleaner)getCleanerMethod.invoke( buffer, new Object[0] );
+  					// cleaner.clean();
   				}
           catch (Exception e) { Debug.printStackTrace( e ); }
   				return null;

azureus-sun.misc.Signal.patch:

--- NEW FILE azureus-sun.misc.Signal.patch ---
--- ./org/gudy/azureus2/core3/util/ShutdownHook.java~	2005-06-14 19:06:26.000000000 -0700
+++ ./org/gudy/azureus2/core3/util/ShutdownHook.java	2005-12-17 12:01:13.000000000 -0800
@@ -22,8 +22,8 @@
 
 package org.gudy.azureus2.core3.util;
 
-import sun.misc.Signal;
-import sun.misc.SignalHandler;
+// import sun.misc.Signal;
+// import sun.misc.SignalHandler;
 
 
 
@@ -40,44 +40,6 @@
    * @param handler
    */
   public static void install( final Handler handler) {
-    try{
-      final SignalHandler[] old_handlers = new SignalHandler[2];
-    
-      //ctrl-c signal
-      old_handlers[0] = Signal.handle( new Signal( "INT" ), new SignalHandler() {
-        public void handle( Signal sig ) {
-          try{
-            handler.shutdown( sig.getName() );  //main ShutdownHook.Handler
-            
-            if( old_handlers[0] != null && old_handlers[0] != SIG_DFL && old_handlers[0] != SIG_IGN ) {  //chain back to previous handler if one exists
-              old_handlers[0].handle( sig );
-            }
-          }
-          catch( Throwable t ) {
-            Debug.out( t );
-          }
-        }
-      });
-      
-      //os termination signal
-      old_handlers[1] = Signal.handle( new Signal( "TERM" ), new SignalHandler() {
-        public void handle( Signal sig ) {
-          try{
-            handler.shutdown( sig.getName() );  //main ShutdownHook.Handler
-            
-            if( old_handlers[1] != null && old_handlers[1] != SIG_DFL && old_handlers[1] != SIG_IGN ) {  //chain back to previous handler if one exists
-              old_handlers[1].handle( sig );
-            }
-          }
-          catch( Throwable t ) {
-            Debug.out( t );
-          }
-        }
-      });
-    }
-    catch( Throwable t ) {
-      Debug.out( t );
-    }
     
   }
   


--- NEW FILE azureus.applications ---
azureus
	command=azureus
	name=Azureus
	can_open_multiple_files=true
	expects_uris=true
	requires_terminal=false
	supported_uri_schemes=http,ftp,file
	mime_types=application/x-bittorrent


--- NEW FILE azureus.script ---
#!/bin/sh

CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main $*


--- NEW FILE azureus.spec ---
Name:           azureus
Version:        2.3.0.6
Release:        13%{?dist}
Summary:        A BitTorrent Client

Group:          Applications/Internet
License:        GPL
URL:            http://azureus.sourceforge.net

# This is just the upstream Azureus_2.3.0.6_source.zip file with 
# the crypto code removed (org/bouncycastle).
Source0:        Azureus_2.3.0.6_source_nocrypto.zip

Source1:        azureus.script
Source2:        Azureus.desktop
Source3:        azureus.applications
Source4:        azureus-License.txt
Source5:        azureus-ChangeLog.txt

Patch0:         azureus-sun.misc.Cleaner.patch
Patch1:         azureus-sun.misc.Signal.patch
Patch2:         azureus-java.beans.XMLEncoder.patch
Patch3:         azureus-remove-win32-osx-platforms.patch
Patch4:         azureus-remove-win32-PlatformManagerUpdateChecker.patch
Patch5:         azureus-jessie.patch
Patch6:         azureus-GKR.patch
Patch7:         azureus-ConfigurationManager-improvement.patch
Patch8:         azureus-base64.patch
Patch9:         azureus-no-bouncycastle.patch
Patch10:        azureus-cache-size.patch
Patch11:        azureus-remove-manifest-classpath.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
Requires:       libgcj >= 4.1.0-0.15
BuildRequires:    java-gcj-compat-devel >= 1.0.31
Requires(post):   java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
BuildRequires:    desktop-file-utils
Requires(post):   desktop-file-utils
Requires(postun): desktop-file-utils

%description 
Azureus implements the BitTorrent protocol using java language and
comes bundled with many invaluable features for both beginners and
advanced users.

%prep
%setup -q -c %{name}-%{version}
%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
%patch6 -p0
%patch7 -p0
%patch8 -p0
%patch9 -p0
%patch10 -p0
%patch11 -p0
cp %{SOURCE4} License.txt
cp %{SOURCE5} ChangeLog.txt

%build
mkdir -p build/libs
build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 junit log4j gnu-crypto
find ./ -name osx | xargs rm -r
find ./ -name macosx | xargs rm -r
find ./ -name [Ww]in32\* | xargs rm -r
# Remove the BouncyCastle security manager.
rm org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
# Remove test code
rm org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
ant jar

%install
rm -rf $RPM_BUILD_ROOT

install -dm 755 $RPM_BUILD_ROOT%{_javadir}
install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_javadir}/Azureus2.jar
install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
install -m 644 org/gudy/azureus2/ui/icons/a32.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/azureus.png
install -m 644 org/gudy/azureus2/ui/icons/a16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/azureus.png
install -m 644 org/gudy/azureus2/ui/icons/a32.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/azureus.png
install -m 644 org/gudy/azureus2/ui/icons/a64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/azureus.png

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora 			\
	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
	--add-category X-Fedora				\
	%{SOURCE2}

mkdir -p $RPM_BUILD_ROOT%{_datadir}/application-registry
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/application-registry

# Convert line endings...
%{__sed} -i 's/\r//' License.txt
%{__sed} -i 's/\r//' ChangeLog.txt
chmod 644 *.txt

aot-compile-rpm

%clean
rm -rf $RPM_BUILD_ROOT

%post
%{_bindir}/rebuild-gcj-db
update-desktop-database %{_datadir}/applications
# update icon themes
touch %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi

%postun
%{_bindir}/rebuild-gcj-db
update-desktop-database %{_datadir}/applications
# update icon themes
touch %{_datadir}/icons/hicolor
if [ -x /usr/bin/gtk-update-icon-cache ]; then
  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
fi

%files
%defattr(-,root,root)
%doc License.txt ChangeLog.txt
%{_datadir}/applications/*
%{_datadir}/application-registry/*
%{_datadir}/pixmaps/azureus.png
%{_datadir}/icons/hicolor/16x16/apps/azureus.png
%{_datadir}/icons/hicolor/32x32/apps/azureus.png
%{_datadir}/icons/hicolor/64x64/apps/azureus.png
%{_bindir}/azureus
%{_javadir}/*.jar
%{_libdir}/gcj/*

%changelog
* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-13
- Drop the junit dependencies.
- Delete unused test code.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-12
- Convert line endings with sed, not dos2unix.
- Add BuildRequires for desktop-file-utils.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-11
- Add Requires(post/postun): desktop-file-utils.
- Install .desktop file with desktop-file-install.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-10
- Fix post and postun desktop integration.
- Add MimeType to .desktop file.
- Add comment about SOURCE0.
- Install files with install, not cp.
- Fix permissions on doc files.
- Add BuildRequires xml-commons-apis.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-9
- Require libgcj with the latest fixes for running Azureus.
- Be explicit about .png files in %files.

* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-8
- Remove bouncycastle from build-classpath in startup script.
- Remove exclusive arch.
- Remove classpath from manifest.
- Add License.txt and ChangeLog.txt.

* Tue Jan 17 2006 Anthony Green <green at redhat.com> - 2.3.0.6-7
- Add azureus-cache-size.patch

* Tue Jan 17 2006 Anthony Green <green at redhat.com> - 2.3.0.6-6
- Experimental build with no bouncycastle dependency.

* Mon Jan 16 2006 Chris Chabot <chabot at xs4all.nl> - 2.3.0.6-5
- Changed file section so package doesn't end up owning
  standard directories.

* Sun Jan 15 2006 Anthony Green <green at redhat.com> - 2.3.0.6-4
- Remove bouncycastle crypto from zipball.
- Add bouncycastle build- and runtime dependencies.
- Desktop integration work.

* Sun Dec 18 2005 Anthony Green <green at redhat.com> - 2.3.0.6-3
- Add azureus-ConfigurationManager-improvement.patch

* Sat Dec 17 2005 Anthony Green <green at redhat.com> - 2.3.0.6-2
- Add azureus-remove-win32-PlatformManagerUpdateChecker.patch

* Sat Dec 17 2005 Anthony Green <green at redhat.com> - 2.3.0.6-1
- Created.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 23:00:10 -0000	1.1
+++ .cvsignore	19 Jan 2006 23:08:02 -0000	1.2
@@ -0,0 +1 @@
+Azureus_2.3.0.6_source_nocrypto.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 23:00:10 -0000	1.1
+++ sources	19 Jan 2006 23:08:02 -0000	1.2
@@ -0,0 +1 @@
+e53e5b114750c552dc0773106160275b  Azureus_2.3.0.6_source_nocrypto.zip



From fedora-extras-commits at redhat.com  Thu Jan 19 23:12:42 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 18:12:42 -0500
Subject: rpms/alltray/devel alltray.spec,1.3,1.4
Message-ID: <200601192313.k0JNDE3p013599@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13582

Modified Files:
	alltray.spec 
Log Message:
Quick fix thanks to Ville


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alltray.spec	19 Jan 2006 22:24:04 -0000	1.3
+++ alltray.spec	19 Jan 2006 23:12:41 -0000	1.4
@@ -20,7 +20,7 @@
 %setup -q
 
 %build
-RPM_OPT_FLAGS="-fPIC $RPM_OPT_FLAGS"
+export CFLAGS="-fPIC $RPM_OPT_FLAGS"
 %configure
 make %{?_smp_mflags}
 
@@ -51,5 +51,5 @@
 
 %changelog
 * Thu Jan 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
-- Added -fPIC to RPM_OPT_FLAGS
+- Added -fPIC to CFLAGS
 - Initial RPM release



From fedora-extras-commits at redhat.com  Thu Jan 19 23:20:39 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 18:20:39 -0500
Subject: owners owners.list,1.552,1.553
Message-ID: <200601192320.k0JNKxHZ013733@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13715

Modified Files:
	owners.list 
Log Message:
nagios and wp_tray


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -r1.552 -r1.553
--- owners.list	19 Jan 2006 19:55:27 -0000	1.552
+++ owners.list	19 Jan 2006 23:20:38 -0000	1.553
@@ -638,6 +638,7 @@
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
+Fedora Extras|nagios|Host/service/network monitoring program|imlinux at gmail.com|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|nail|Enhanced implementation of the mailx command|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|naim|An ncurses-based console AIM, ICQ, IRC, and Lily client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|namazu|A full-text search engine|tagoh at redhat.com|extras-qa at fedoraproject.org|
@@ -1290,6 +1291,7 @@
 Fedora Extras|wmCalClock|A Calendar clock with antialiased text|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|workrave|Recovery and prevention of RSI assistant|tmraz at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|wxGTK|GTK+ port of the wxWidgets GUI library|mattdm at mattdm.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 19 23:22:42 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 19 Jan 2006 18:22:42 -0500
Subject: rpms/nagios/devel nagios.spec,1.1,1.2
Message-ID: <200601192323.k0JNNEB9013807@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13780

Modified Files:
	nagios.spec 
Log Message:
Disttag


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios.spec	19 Jan 2006 22:47:20 -0000	1.1
+++ nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 1.3
-Release: 14
+Release: 14%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System



From fedora-extras-commits at redhat.com  Thu Jan 19 23:33:22 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:33:22 -0500
Subject: rpms/wine/FC-3 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 wine.spec, 1.6,
	1.7 wine-CVE-2005-4560.patch, 1.1, NONE
Message-ID: <200601192333.k0JNXsHx013923@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13864/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	wine-CVE-2005-4560.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jan 2006 11:00:54 -0000	1.3
+++ .cvsignore	19 Jan 2006 23:33:21 -0000	1.4
@@ -1,2 +1 @@
-wine-0.9.5.tar.bz2
-wine-fonts-20050524.tar.gz
+wine-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Jan 2006 11:00:54 -0000	1.4
+++ sources	19 Jan 2006 23:33:21 -0000	1.5
@@ -1,2 +1 @@
-b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
-fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
+1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wine.spec	8 Jan 2006 09:06:36 -0000	1.6
+++ wine.spec	19 Jan 2006 23:33:21 -0000	1.7
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.6.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -19,8 +19,6 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
-# CVS-2005-4560 wmf exploit
-Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -146,7 +144,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
-%patch100 -p1
 autoconf
 
 %build
@@ -515,7 +512,6 @@
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
-#%{_libdir}/wine/winetty.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
 %{_libdir}/wine/wininet.dll.so
@@ -533,6 +529,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/security.dll.so
 %dir %{_datadir}/fonts/wine
 %{_datadir}/fonts/wine/wine_coure.fon
 %{_datadir}/fonts/wine/wine_couree.fon
@@ -679,6 +676,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+- drop wmf exploit patch (part of current version)
+
 * Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix for CVE-2005-4560


--- wine-CVE-2005-4560.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:33:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:33:28 -0500
Subject: rpms/wine/FC-4 .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 wine.spec, 1.8,
	1.9 wine-CVE-2005-4560.patch, 1.1, NONE
Message-ID: <200601192334.k0JNY0aI013931@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13864/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	wine-CVE-2005-4560.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jan 2006 11:01:00 -0000	1.4
+++ .cvsignore	19 Jan 2006 23:33:27 -0000	1.5
@@ -1,2 +1 @@
-wine-0.9.5.tar.bz2
-wine-fonts-20050524.tar.gz
+wine-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jan 2006 11:01:00 -0000	1.5
+++ sources	19 Jan 2006 23:33:27 -0000	1.6
@@ -1,2 +1 @@
-b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
-fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
+1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine.spec	8 Jan 2006 09:06:46 -0000	1.8
+++ wine.spec	19 Jan 2006 23:33:27 -0000	1.9
@@ -1,12 +1,12 @@
 Name:		wine
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.6.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -19,9 +19,6 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
-# CVS-2005-4560 wmf exploit from wine cvs
-# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
-Patch100:       wine-CVE-2005-4560.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -147,7 +144,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
-%patch100 -p1
 autoconf
 
 %build
@@ -516,7 +512,6 @@
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
-#%{_libdir}/wine/winetty.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
 %{_libdir}/wine/wininet.dll.so
@@ -534,6 +529,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/security.dll.so
 %dir %{_datadir}/fonts/wine
 %{_datadir}/fonts/wine/wine_coure.fon
 %{_datadir}/fonts/wine/wine_couree.fon
@@ -680,6 +676,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+- drop wmf exploit patch (part of current version)
+
 * Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix for CVE-2005-4560


--- wine-CVE-2005-4560.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:33:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:33:34 -0500
Subject: rpms/wine/devel .cvsignore, 1.4, 1.5 sources, 1.5, 1.6 wine.spec,
	1.10, 1.11 wine-CVE-2005-4560.patch, 1.1, NONE
Message-ID: <200601192334.k0JNY6KG013967@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13864/devel

Modified Files:
	.cvsignore sources wine.spec 
Removed Files:
	wine-CVE-2005-4560.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Jan 2006 11:01:06 -0000	1.4
+++ .cvsignore	19 Jan 2006 23:33:33 -0000	1.5
@@ -1,2 +1 @@
-wine-0.9.5.tar.bz2
-wine-fonts-20050524.tar.gz
+wine-0.9.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jan 2006 11:01:06 -0000	1.5
+++ sources	19 Jan 2006 23:33:33 -0000	1.6
@@ -1,2 +1 @@
-b0c8e65efd541eb690ae05fdf05fcd4d  wine-0.9.5.tar.bz2
-fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz
+1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wine.spec	8 Jan 2006 09:07:13 -0000	1.10
+++ wine.spec	19 Jan 2006 23:33:33 -0000	1.11
@@ -1,14 +1,14 @@
 %define __global_cflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fno-stack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables
 
 Name:		wine
-Version:	0.9.5
-Release:	2%{?dist}
+Version:	0.9.6
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
-Source0:        http://dl.sf.net/wine/wine-0.9.5.tar.bz2
+Source0:        http://dl.sf.net/wine/wine-0.9.6.tar.bz2
 Source1:	wine.init
 Source2:	wine-fonts-20050524.tar.gz
 Source3:        wine-README-Fedora
@@ -21,9 +21,6 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch2:		wine-20050524-generated.patch
-# CVS-2005-4560 wmf exploit from wine cvs
-# http://cvs.winehq.org/cvsweb/wine/dlls/gdi/metafile.c.diff?r1=text&tr1=1.11&r2=text&tr2=1.12
-Patch100:       wine-CVE-2005-4560.patch
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -159,7 +156,6 @@
 %prep
 %setup -q
 %patch2 -p1 -b .generated
-%patch100 -p1
 autoconf
 
 %build
@@ -529,7 +525,6 @@
 %{_libdir}/wine/winedos.dll.so
 %{_libdir}/wine/winemp3.acm.so
 %{_libdir}/wine/wineoss.drv.so
-#%{_libdir}/wine/winetty.drv.so
 %{_libdir}/wine/winex11.drv.so
 %{_libdir}/wine/wing.dll.so
 %{_libdir}/wine/wininet.dll.so
@@ -547,6 +542,7 @@
 %{_libdir}/wine/ws2_32.dll.so
 %{_libdir}/wine/wsock32.dll.so
 %{_libdir}/wine/wtsapi32.dll.so
+%{_libdir}/wine/security.dll.so
 %dir %{_datadir}/fonts/wine
 %{_datadir}/fonts/wine/wine_coure.fon
 %{_datadir}/fonts/wine/wine_couree.fon
@@ -693,6 +689,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-1
+- version upgrade
+- drop wmf exploit patch (part of current version)
+
 * Sun Jan 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.5-2
 - fix for CVE-2005-4560


--- wine-CVE-2005-4560.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:34:16 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:34:16 -0500
Subject: rpms/ldns/FC-4 sources,1.2,1.3
Message-ID: <200601192334.k0JNYmfB013987@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13882

Modified Files:
	sources 
Log Message:
new sources file for ldns



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 04:08:25 -0000	1.2
+++ sources	19 Jan 2006 23:34:16 -0000	1.3
@@ -1 +1 @@
-bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz
+39210ff3bb2673d57e024f7908d31be5  ldns-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:35:59 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:35:59 -0500
Subject: rpms/ldns/FC-3 sources,1.2,1.3
Message-ID: <200601192336.k0JNaVix014021@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13999

Modified Files:
	sources 
Log Message:
new sources file for ldns



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Dec 2005 04:08:25 -0000	1.2
+++ sources	19 Jan 2006 23:35:58 -0000	1.3
@@ -1 +1 @@
-bf8ff0868cacd2d4487ed1e28ea6c239  ldns-1.0.0.tar.gz
+39210ff3bb2673d57e024f7908d31be5  ldns-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:37:49 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:37:49 -0500
Subject: rpms/wine/FC-3 .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200601192338.k0JNcLZA014099@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
- fix sources (forgot wine-fonts)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Jan 2006 23:33:21 -0000	1.4
+++ .cvsignore	19 Jan 2006 23:37:48 -0000	1.5
@@ -1 +1,2 @@
 wine-0.9.6.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 23:33:21 -0000	1.5
+++ sources	19 Jan 2006 23:37:48 -0000	1.6
@@ -1 +1,2 @@
 1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:37:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:37:55 -0500
Subject: rpms/wine/FC-4 .cvsignore,1.5,1.6 sources,1.6,1.7
Message-ID: <200601192338.k0JNcRx3014103@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
- fix sources (forgot wine-fonts)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 23:33:27 -0000	1.5
+++ .cvsignore	19 Jan 2006 23:37:54 -0000	1.6
@@ -1 +1,2 @@
 wine-0.9.6.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2006 23:33:27 -0000	1.6
+++ sources	19 Jan 2006 23:37:54 -0000	1.7
@@ -1 +1,2 @@
 1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:38:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu, 19 Jan 2006 18:38:01 -0500
Subject: rpms/wine/devel .cvsignore,1.5,1.6 sources,1.6,1.7
Message-ID: <200601192338.k0JNcXUp014107@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037/devel

Modified Files:
	.cvsignore sources 
Log Message:
- fix sources (forgot wine-fonts)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 23:33:33 -0000	1.5
+++ .cvsignore	19 Jan 2006 23:38:00 -0000	1.6
@@ -1 +1,2 @@
 wine-0.9.6.tar.bz2
+wine-fonts-20050524.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Jan 2006 23:33:33 -0000	1.6
+++ sources	19 Jan 2006 23:38:00 -0000	1.7
@@ -1 +1,2 @@
 1e3bfac123009300646a0b8a7fcfd81d  wine-0.9.6.tar.bz2
+fb216b10993cb17501efff7afa812da1  wine-fonts-20050524.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 19 23:44:45 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:44:45 -0500
Subject: rpms/fetchlog - New directory
Message-ID: <200601192344.k0JNilbg014224@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14216/fetchlog

Log Message:
Directory /cvs/extras/rpms/fetchlog added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 23:44:51 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:44:51 -0500
Subject: rpms/fetchlog/devel - New directory
Message-ID: <200601192344.k0JNirwu014239@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14216/fetchlog/devel

Log Message:
Directory /cvs/extras/rpms/fetchlog/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 19 23:45:09 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:45:09 -0500
Subject: rpms/fetchlog Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601192345.k0JNjCMO014275@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14263

Added Files:
	Makefile import.log 
Log Message:
Setup of module fetchlog


--- NEW FILE Makefile ---
# Top level Makefile for module fetchlog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:45:16 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:45:16 -0500
Subject: rpms/fetchlog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601192345.k0JNjIQG014295@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14263/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fetchlog


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 19 23:45:58 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:45:58 -0500
Subject: rpms/fetchlog import.log,1.1,1.2
Message-ID: <200601192346.k0JNkU5G014365@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14329

Modified Files:
	import.log 
Log Message:
auto-import fetchlog-1.0-2 on branch devel from fetchlog-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Jan 2006 23:45:09 -0000	1.1
+++ import.log	19 Jan 2006 23:45:58 -0000	1.2
@@ -0,0 +1 @@
+fetchlog-1_0-2:HEAD:fetchlog-1.0-2.src.rpm:1137714389



From fedora-extras-commits at redhat.com  Thu Jan 19 23:46:04 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 18:46:04 -0500
Subject: rpms/fetchlog/devel fetchlog.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601192346.k0JNkanl014372@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/fetchlog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14329/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fetchlog.spec 
Log Message:
auto-import fetchlog-1.0-2 on branch devel from fetchlog-1.0-2.src.rpm


--- NEW FILE fetchlog.spec ---
Summary: The fetchlog utility displays the last new messages of a logfile
Name: fetchlog
Version: 1.0
Release: 2%{?dist}
License: GPL
Url: http://sourceforge.net/projects/%{name}/
Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The fetchlog utility displays the last new messages of a logfile. It is
similar like tail (1) but offers some extra functionality for output
formatting. To show only the new messages appeared since the last call
fetchlog uses a bookmark to remember which messages have been fetched.

%prep
%setup -q 

%build
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -d %{buildroot}/%{_bindir}
install -d %{buildroot}/%{_mandir}/man1
install -m755 %{name} %{buildroot}/%{_bindir}
install -m644 %{name}.1 %{buildroot}/%{_mandir}/man1

%clean
rm -rf %{buildroot}

%files 
%defattr(-,root,root)
%{_bindir}/%{name}
%doc CHANGES LICENSE README README.Nagios README.SNMP
%{_mandir}/*/*

%changelog
* Mon Jan 17 2006 Paul Wouters <paul at xelerance.com> 1.0-2
- Fixed install target for man page and cleaning before install

* Mon Jan 16 2006 Paul Wouters <paul at xelerance.com> 1.0-1
- Initial version for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Jan 2006 23:45:15 -0000	1.1
+++ .cvsignore	19 Jan 2006 23:46:04 -0000	1.2
@@ -0,0 +1 @@
+fetchlog-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Jan 2006 23:45:15 -0000	1.1
+++ sources	19 Jan 2006 23:46:04 -0000	1.2
@@ -0,0 +1 @@
+e2ef0a076d1901c489c953fe48e1b2a9  fetchlog-1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 00:20:34 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Thu, 19 Jan 2006 19:20:34 -0500
Subject: owners owners.list,1.553,1.554
Message-ID: <200601200021.k0K0L6D0016707@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16689

Modified Files:
	owners.list 
Log Message:
Added ownership of fetchlog



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- owners.list	19 Jan 2006 23:20:38 -0000	1.553
+++ owners.list	20 Jan 2006 00:20:34 -0000	1.554
@@ -1381,3 +1381,4 @@
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 05:00:17 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 20 Jan 2006 00:00:17 -0500
Subject: rpms/azureus/devel azureus.spec,1.1,1.2
Message-ID: <200601200500.k0K50oZL024275@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24258

Modified Files:
	azureus.spec 
Log Message:
Remove junit from build-jar-repository.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus.spec	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus.spec	20 Jan 2006 05:00:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -66,7 +66,7 @@
 
 %build
 mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 junit log4j gnu-crypto
+build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -143,6 +143,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-14
+- Remove junit from build-jar-repository.
+
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-13
 - Drop the junit dependencies.
 - Delete unused test code.



From fedora-extras-commits at redhat.com  Fri Jan 20 05:22:32 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 20 Jan 2006 00:22:32 -0500
Subject: rpms/azureus/devel azureus.spec,1.2,1.3
Message-ID: <200601200523.k0K5N4uR026134@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26117

Modified Files:
	azureus.spec 
Log Message:
Remove PrintTransferTypes, which is unused and not 64-bit clean.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus.spec	20 Jan 2006 05:00:17 -0000	1.2
+++ azureus.spec	20 Jan 2006 05:22:31 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -74,6 +74,7 @@
 rm org/gudy/azureus2/core3/security/impl/SESecurityManagerBC.java
 # Remove test code
 rm org/gudy/azureus2/ui/console/multiuser/TestUserManager.java
+rm org/gudy/azureus2/ui/swt/test/PrintTransferTypes.java
 ant jar
 
 %install
@@ -143,6 +144,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-15
+- Remove PrintTransferTypes, which is unused and not 64-bit clean.
+
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-14
 - Remove junit from build-jar-repository.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 08:23:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Jan 2006 03:23:20 -0500
Subject: rpms/openal/FC-4 openal.spec,1.10,1.11
Message-ID: <200601200823.k0K8Nq96032680@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32662

Modified Files:
	openal.spec 
Log Message:
- drop smpflags



Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openal.spec	19 Jan 2006 08:43:31 -0000	1.10
+++ openal.spec	20 Jan 2006 08:23:19 -0000	1.11
@@ -52,7 +52,8 @@
            --enable-sdl                    \
            --disable-smpeg                 \
            --enable-capture
-make %{?_smp_mflags}
+# drop smpflags do not work
+make
 
 
 %install



From fedora-extras-commits at redhat.com  Fri Jan 20 08:30:33 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Jan 2006 03:30:33 -0500
Subject: rpms/rxvt-unicode/devel rxvt-unicode.spec,1.16,1.17
Message-ID: <200601200831.k0K8V57p000308@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32757

Modified Files:
	rxvt-unicode.spec 
Log Message:
- fix doc



Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rxvt-unicode.spec	19 Jan 2006 21:54:15 -0000	1.16
+++ rxvt-unicode.spec	20 Jan 2006 08:30:30 -0000	1.17
@@ -63,7 +63,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README.FAQ INSTALL doc/README.menu doc/etc doc/changes.txt COPYING
+%doc README.FAQ INSTALL doc/README.xvt doc/etc doc/changes.txt COPYING
 %{_bindir}/*
 %{_datadir}/terminfo/r/*
 %{_mandir}/man*/*



From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:13 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:13 -0500
Subject: rpms/libupnp - New directory
Message-ID: <200601200838.k0K8cFcj000441@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433/libupnp

Log Message:
Directory /cvs/extras/rpms/libupnp added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:19 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:19 -0500
Subject: rpms/libupnp/devel - New directory
Message-ID: <200601200838.k0K8cLq5000456@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv433/libupnp/devel

Log Message:
Directory /cvs/extras/rpms/libupnp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:40 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:40 -0500
Subject: rpms/libupnp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601200838.k0K8cgrJ000491@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv479

Added Files:
	Makefile import.log 
Log Message:
Setup of module libupnp


--- NEW FILE Makefile ---
# Top level Makefile for module libupnp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 20 08:38:46 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:38:46 -0500
Subject: rpms/libupnp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601200838.k0K8cmUS000511@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv479/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libupnp


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 20 08:40:06 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:40:06 -0500
Subject: rpms/libupnp import.log,1.1,1.2
Message-ID: <200601200840.k0K8ecJE000606@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv561

Modified Files:
	import.log 
Log Message:
auto-import libupnp-1.2.1a-4 on branch devel from libupnp-1.2.1a-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libupnp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Jan 2006 08:38:40 -0000	1.1
+++ import.log	20 Jan 2006 08:40:05 -0000	1.2
@@ -0,0 +1 @@
+libupnp-1_2_1a-4:HEAD:libupnp-1.2.1a-4.src.rpm:1137746395



From fedora-extras-commits at redhat.com  Fri Jan 20 08:40:11 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Fri, 20 Jan 2006 03:40:11 -0500
Subject: rpms/libupnp/devel libupnp.spec, NONE, 1.1 libupnp_dsm_320.patch,
	NONE, 
	1.1 libupnp_ixml_FC4.patch, NONE, 1.1 libupnp_performance.patch,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601200840.k0K8eixk000610@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/libupnp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv561/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libupnp.spec libupnp_dsm_320.patch libupnp_ixml_FC4.patch 
	libupnp_performance.patch 
Log Message:
auto-import libupnp-1.2.1a-4 on branch devel from libupnp-1.2.1a-4.src.rpm


--- NEW FILE libupnp.spec ---
Version: 1.2.1a
Summary: Universal Plug and Play (UPnP) SDK
Name: libupnp
Release: 4%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://upnp.sourceforge.net/
Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz
Patch0: libupnp_dsm_320.patch 
Patch1: libupnp_ixml_FC4.patch 
Patch2: libupnp_performance.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
The Universal Plug and Play (UPnP) SDK for Linux provides 
support for building UPnP-compliant control points, devices, 
and bridges on Linux.

%package devel
Group: Development/Libraries
Summary: Include files needed for development with libupnp
Requires: libupnp = %{version}-%{release}

%description devel
The libupnp-devel package contains the files necessary for development with
the UPnP SDK libraries.

%prep
%setup -q

%patch0 -p0
%patch1 -p0
%patch2 -p1
chmod 644 {LICENSE,README}

# Fix permissions for files in debuginfo package
find . -name '*.[ch]' | xargs chmod 644

# Fix libupnp.so symlink
sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile

# Remove -Os optflag and add RPM optflags in makefiles
# Install libraries in correct directories
find . -name '[Mm]akefile' | xargs sed -i \
	-e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \
	-e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \
	-e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \
	-e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \
	-e 's#/usr/lib$#%{_libdir}#g'

%build
make -C upnp STRIP="echo Not stripping" %{?_smp_mflags}

%install
rm -rf %{buildroot}

## Install libupnp.so and headers
make -C upnp PREFIX=%{buildroot} install

## Install libixml.so and headers
make -C ixml PREFIX=%{buildroot} install
install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp

## Install libthreadutil.so and headers
make -C threadutil PREFIX=%{buildroot} install

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc LICENSE README
%{_libdir}/libixml.so*
%{_libdir}/libthreadutil.so*
%{_libdir}/libupnp.so*

%files devel
%defattr(0644,root,root,0755)
%{_includedir}/upnp/

%clean
rm -rf %{buildroot}

%changelog
* Mon Jan  9 2006 Eric Tanguy 1.2.1a-4
- Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1

* Sun Jan  8 2006 Paul Howarth 1.2.1a-3
- Disable stripping of object code for sane debuginfo generation
- Edit makefiles to hnnor RPM optflags
- Install libraries in %%{_libdir} rather than hardcoded /usr/lib
- Fix libupnp.so symlink
- Own directory %%{_includedir}/upnp
- Fix permissions in -devel package

* Fri Jan 06 2006 Eric Tanguy 1.2.1a-2
- Use 'install -p' to preserve timestamps
- Devel now require full version-release of main package

* Thu Dec 22 2005 Eric Tanguy 1.2.1a-1
- Modify spec file from 
http://rpm.pbone.net/index.php3/stat/4/idpl/2378737/com/libupnp-1.2.1a_DSM320-3.i386.rpm.html

libupnp_dsm_320.patch:

--- NEW FILE libupnp_dsm_320.patch ---
diff -Naur ../libupnp-1.2.1a/upnp/inc/config.h upnp/inc/config.h
--- ../libupnp-1.2.1a/upnp/inc/config.h	2003-02-13 17:19:02.000000000 +0100
+++ upnp/inc/config.h	2005-11-05 20:42:25.000000000 +0100
@@ -56,6 +56,17 @@
 #define THREAD_IDLE_TIME 5000
 //@}
 
+/** @name X_USER_AGENT
+ *  The {\tt X_USER_AGENT} constant specifies the value of the X-User-Agent:
+ *  HTTP header. The value "redsonic" is needed for the DSM-320. See
+ *  https://sourceforge.net/forum/message.php?msg_id=3166856 for more
+ * information
+ */
+
+//@{
+#define X_USER_AGENT "redsonic"
+//@}
+
 /** @name JOBS_PER_THREAD
  *  The {\tt JOBS_PER_THREAD} constant determines when a new thread will be
  *  allocated to the thread pool inside the  SDK. The thread pool will
diff -Naur ../libupnp-1.2.1a/upnp/src/gena/gena_device.c upnp/src/gena/gena_device.c
--- ../libupnp-1.2.1a/upnp/src/gena/gena_device.c	2003-02-13 17:19:11.000000000 +0100
+++ upnp/src/gena/gena_device.c	2005-11-05 20:18:42.000000000 +0100
@@ -1164,10 +1164,16 @@
 
     membuffer_init( &response );
     response.size_inc = 30;
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+ * added X-User-Agent header
+ */
     if( http_MakeMessage( &response, major, minor,
-                          "R" "D" "S" "ssc" "sc" "c",
+                          "R" "D" "S" "Xc" "ssc" "sc" "c",
                           HTTP_OK,
-                          "SID: ", sub->sid, timeout_str ) != 0 ) {
+                          X_USER_AGENT,
+                          "SID: ", sub->sid, timeout_str ) != 0 ) 
+/* - PATCH END --- */        
+    {
         membuffer_destroy( &response );
         error_respond( info, HTTP_INTERNAL_SERVER_ERROR, request );
         return UPNP_E_OUTOF_MEMORY;
diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c upnp/src/genlib/net/http/httpreadwrite.c
--- ../libupnp-1.2.1a/upnp/src/genlib/net/http/httpreadwrite.c	2003-02-13 17:19:13.000000000 +0100
+++ upnp/src/genlib/net/http/httpreadwrite.c	2005-11-05 20:04:51.000000000 +0100
@@ -1632,6 +1632,9 @@
 *				appends content-length, content-type and HTML body for given code
 *		'T':	arg = char * content_type; format e.g: "text/html";	
 *				 content-type header
+* --- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+*       'X':    arg = const char useragent; "redsonic" HTTP X-User-Agent: useragent
+* --- PATCH END ---
 *
 *	Return : int;
 *		0 - On Success
@@ -1800,6 +1803,24 @@
             }
         }
 
+/* --- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
+        if( c == 'X' )          // C string
+        {
+            s = ( char * )va_arg( argp, char * );
+
+            assert( s );
+
+            if( membuffer_append_str( buf, "X-User-Agent: ") != 0 ) {
+                goto error_handler;
+            }
+            if( membuffer_append( buf, s, strlen( s ) ) != 0 ) {
+                goto error_handler;
+            }
+        }
+        
+/* --- PATCH END --- */
+    
+
         else if( c == 'R' ) {
             // response start line
             //   e.g.: 'HTTP/1.1 200 OK'
diff -Naur ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c upnp/src/genlib/net/http/webserver.c
--- ../libupnp-1.2.1a/upnp/src/genlib/net/http/webserver.c	2003-02-13 17:19:14.000000000 +0100
+++ upnp/src/genlib/net/http/webserver.c	2005-11-05 20:53:56.000000000 +0100
@@ -1368,16 +1368,22 @@
     }
 
     if( RespInstr->IsRangeActive && RespInstr->IsChunkActive ) {
+
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+ * added X-User-Agent header
+ */
+        
         //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         //Transfer-Encoding: chunked
         // K means add chunky header ang G means range header.
-        if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSCc", HTTP_PARTIAL_CONTENT, // status code
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RTGKDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code
                               // RespInstr->ReadSendSize,// content length
                               finfo.content_type,
                               //     content_type.buf,            // content type
                               RespInstr,    // Range
                               "LAST-MODIFIED: ",
-                              &finfo.last_modified ) != 0 ) {
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
     } else if( RespInstr->IsRangeActive && !RespInstr->IsChunkActive ) {
@@ -1385,13 +1391,14 @@
         //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         //Transfer-Encoding: chunked
         // K means add chunky header ang G means range header.
-        if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSCc", HTTP_PARTIAL_CONTENT, // status code
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RNTGDstcSXcCc", HTTP_PARTIAL_CONTENT, // status code
                               RespInstr->ReadSendSize,  // content length
                               finfo.content_type,
                               //content_type.buf,            // content type
                               RespInstr,    //Range Info
                               "LAST-MODIFIED: ",
-                              &finfo.last_modified ) != 0 ) {
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
@@ -1400,12 +1407,13 @@
         //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
         //Transfer-Encoding: chunked
         // K means add chunky header ang G means range header.
-        if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSCc", HTTP_OK,   // status code
+        if( http_MakeMessage( headers, resp_major, resp_minor, "RKTDstcSXcCc", HTTP_OK,   // status code
                               //RespInstr->ReadSendSize,// content length
                               finfo.content_type,
                               // content_type.buf,            // content type
                               "LAST-MODIFIED: ",
-                              &finfo.last_modified ) != 0 ) {
+                              &finfo.last_modified,
+                              X_USER_AGENT) != 0 ) {
             goto error_handler;
         }
 
@@ -1414,28 +1422,31 @@
             //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
             //Transfer-Encoding: chunked
             // K means add chunky header ang G means range header.
-            if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSCc", HTTP_OK,   // status code
+            if( http_MakeMessage( headers, resp_major, resp_minor, "RNTDstcSXcCc", HTTP_OK,   // status code
                                   RespInstr->ReadSendSize,  // content length
                                   finfo.content_type,
                                   //content_type.buf,          // content type
                                   "LAST-MODIFIED: ",
-                                  &finfo.last_modified ) != 0 ) {
+                                  &finfo.last_modified,
+                                  X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         } else {
             //Content-Range: bytes 222-3333/4000  HTTP_PARTIAL_CONTENT
             //Transfer-Encoding: chunked
             // K means add chunky header ang G means range header.
-            if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSCc", HTTP_OK,    // status code
+            if( http_MakeMessage( headers, resp_major, resp_minor, "RTDstcSXcCc", HTTP_OK,    // status code
                                   //RespInstr->ReadSendSize,// content length
                                   finfo.content_type,
                                   //content_type.buf,          // content type
                                   "LAST-MODIFIED: ",
-                                  &finfo.last_modified ) != 0 ) {
+                                  &finfo.last_modified,
+                                  X_USER_AGENT) != 0 ) {
                 goto error_handler;
             }
         }
     }
+/* -- PATCH END -- */
 
     if( req->method == HTTPMETHOD_HEAD ) {
         *rtype = RESP_HEADERS;
@@ -1717,8 +1728,14 @@
                     http_RecvPostMessage( parser, info, filename.buf,
                                           &RespInstr );
                 //Send response.
-                http_MakeMessage( &headers, 1, 1, "RTDSCc", ret,
-                                  "text/html" );
+
+/* - PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+ * added X-User-Agent header
+ */
+                http_MakeMessage( &headers, 1, 1, "RTDSXcCc", ret,
+                                  "text/html", X_USER_AGENT );
+/* - PATCH END --- */
+
                 http_SendMessage( info, &timeout, "b", headers.buf,
                                   headers.length );
                 break;
diff -Naur ../libupnp-1.2.1a/upnp/src/soap/soap_device.c upnp/src/soap/soap_device.c
--- ../libupnp-1.2.1a/upnp/src/soap/soap_device.c	2003-02-13 17:19:20.000000000 +0100
+++ upnp/src/soap/soap_device.c	2005-11-05 20:44:41.000000000 +0100
@@ -221,17 +221,20 @@
 
     // make headers
     membuffer_init( &headers );
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */    
     if( http_MakeMessage( &headers, major, minor,
-                          "RNsDsSc" "sssss",
+                          "RNsDsSXc" "sssss",
                           500,
                           content_length,
                           ContentTypeHeader,
                           "EXT:\r\n",
+                          X_USER_AGENT,
                           start_body, err_code_str, mid_body, err_msg,
                           end_body ) != 0 ) {
         membuffer_destroy( &headers );
         return;                 // out of mem
     }
+/*-- PATCH END - */
     // send err msg
     http_SendMessage( info, &timeout_secs, "b",
                       headers.buf, headers.length );
@@ -285,16 +288,21 @@
 
     // make headers
     membuffer_init( &response );
+    
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
     if( http_MakeMessage( &response, major, minor,
-                          "RNsDsSc" "sss",
+                          "RNsDsSXcc" "sss",
                           HTTP_OK,
                           content_length,
                           ContentTypeHeader,
                           "EXT:\r\n",
+                          X_USER_AGENT,
                           start_body, var_value, end_body ) != 0 ) {
         membuffer_destroy( &response );
         return;                 // out of mem
     }
+/* -- PATCH END - */
+    
     // send msg
     http_SendMessage( info, &timeout_secs, "b",
                       response.buf, response.length );
@@ -704,11 +712,14 @@
         strlen( end_body );
 
     // make headers
-    if( http_MakeMessage( &headers, major, minor, "RNsDsSc", HTTP_OK,   // status code
-                          content_length, ContentTypeHeader, "EXT:\r\n" // EXT header
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */    
+    if( http_MakeMessage( &headers, major, minor, "RNsDsSXcc", HTTP_OK,   // status code
+                          content_length, ContentTypeHeader, "EXT:\r\n", X_USER_AGENT // EXT header
          ) != 0 ) {
         goto error_handler;
     }
+/* -- PATCH END - */
+
     // send whole msg
     ret_code = http_SendMessage( info, &timeout_secs, "bbbb",
                                  headers.buf, headers.length,
diff -Naur ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c upnp/src/ssdp/ssdp_device.c
--- ../libupnp-1.2.1a/upnp/src/ssdp/ssdp_device.c	2003-02-13 17:19:21.000000000 +0100
+++ upnp/src/ssdp/ssdp_device.c	2005-11-05 21:04:52.000000000 +0100
@@ -290,12 +290,16 @@
     *packet = NULL;
 
     if( msg_type == MSGTYPE_REPLY ) {
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
         ret_code = http_MakeMessage( &buf, 1, 1,
-                                     "R" "sdc" "D" "s" "ssc" "S" "ssc"
+                                     "R" "sdc" "D" "s" "ssc" "S" "Xc" "ssc"
                                      "ssc" "c", HTTP_OK,
                                      "CACHE-CONTROL: max-age=", duration,
                                      "EXT:\r\n", "LOCATION: ", location,
+                                     X_USER_AGENT,
                                      "ST: ", nt, "USN: ", usn );
+/* -- PATCH END - */
+        
         if( ret_code != 0 ) {
             return;
         }
@@ -310,14 +314,16 @@
 
         // NOTE: The CACHE-CONTROL and LOCATION headers are not present in
         //  a shutdown msg, but are present here for MS WinMe interop.
-
+        
+/* -- PATCH START - Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net> */
         ret_code = http_MakeMessage( &buf, 1, 1,
                                      "Q" "sssdc" "sdc" "ssc" "ssc" "ssc"
-                                     "S" "ssc" "c", HTTPMETHOD_NOTIFY, "*",
+                                     "S" "Xc" "ssc" "c", HTTPMETHOD_NOTIFY, "*",
                                      1, "HOST: ", SSDP_IP, ":", SSDP_PORT,
                                      "CACHE-CONTROL: max-age=", duration,
                                      "LOCATION: ", location, "NT: ", nt,
-                                     "NTS: ", nts, "USN: ", usn );
+                                     "NTS: ", nts, X_USER_AGENT, "USN: ", usn );
+/* -- PATCH END - */        
         if( ret_code != 0 ) {
             return;
         }

libupnp_ixml_FC4.patch:

--- NEW FILE libupnp_ixml_FC4.patch ---
--- ../libupnp-1.2.1a/ixml/src/element.c	2003-02-13 17:18:51.000000000 +0100
+++ ixml/src/element.c	2005-11-05 20:47:25.000000000 +0100
@@ -454,9 +454,12 @@
             element->n.firstAttr = nextSib;
         }
 
-        ( IXML_Attr * ) attrNode->parentNode = NULL;
-        ( IXML_Attr * ) attrNode->prevSibling = NULL;
-        ( IXML_Attr * ) attrNode->nextSibling = NULL;
+        // removed the casts, else it did not compile on FC4
+        // Sergey 'Jin' Bostandzhyan <jin_eld at users.sourceforge.net>
+        attrNode->parentNode = NULL;
+        attrNode->prevSibling = NULL;
+        attrNode->nextSibling = NULL;
+        
         *rtAttr = ( IXML_Attr * ) attrNode;
         return IXML_SUCCESS;
 

libupnp_performance.patch:

--- NEW FILE libupnp_performance.patch ---
--- libupnp-1.2.1a/upnp/inc/config.h	2003-02-13 17:19:02.000000000 +0100
+++ libupnp-1.2.1a/upnp/inc/config.h	2005-03-08 21:26:25.000000000 +0100
@@ -65,7 +65,7 @@
  */
 
 //@{
-#define JOBS_PER_THREAD 10
+#define JOBS_PER_THREAD 1
 //@}
 
 /** @name MIN_THREADS
@@ -78,7 +78,7 @@
  */
 
 //@{
-#define MIN_THREADS 2 
+#define MIN_THREADS 4 
 //@}
 
 /** @name MAX_THREADS


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jan 2006 08:38:46 -0000	1.1
+++ .cvsignore	20 Jan 2006 08:40:11 -0000	1.2
@@ -0,0 +1 @@
+libupnp-1.2.1a.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libupnp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jan 2006 08:38:46 -0000	1.1
+++ sources	20 Jan 2006 08:40:11 -0000	1.2
@@ -0,0 +1 @@
+e72b3550bf064eedf080f16f09688891  libupnp-1.2.1a.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 09:10:03 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Fri, 20 Jan 2006 04:10:03 -0500
Subject: rpms/fbida/devel fbida.spec,1.11,1.12
Message-ID: <200601200910.k0K9AbkY002844@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2814

Modified Files:
	fbida.spec 
Log Message:
* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-9
- this should finally work; also on x86_64



Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fbida.spec	19 Jan 2006 12:26:45 -0000	1.11
+++ fbida.spec	20 Jan 2006 09:10:02 -0000	1.12
@@ -1,7 +1,7 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
@@ -42,7 +42,7 @@
 %setup -q
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__sed} -i -e "s,/X11R6,,g" GNUmakefile
-%{__sed} -i -e "s,/usr/X11R6/lib/X11,/usr/lib/X11,g" mk/Autoconf.mk
+%{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
 
 %build
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -58,8 +58,6 @@
 %{__mv} ida.man.new ida.man
 %{__mv} fbgs.man.new fbgs.man
 lib=%{_lib} prefix=%{_prefix} %{__make} DESTDIR=%{buildroot} install
-%{__mv} %{buildroot}%{_libdir}/X11 %{buildroot}%{_datadir}
-%{__rm} -rf %{buildroot}%{_libdir}
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -84,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-9
+- this should finally work; also on x86_64
+
 * Wed Jan 18 2006 Adrian Reber <adrian at lisas.de> - 2.03-8
 - rebuilt
 



From fedora-extras-commits at redhat.com  Fri Jan 20 09:10:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 20 Jan 2006 04:10:46 -0500
Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.3,1.4
Message-ID: <200601200911.k0K9BJfW003042@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2843

Modified Files:
	wine-docs.spec 
Log Message:
- try to fix fc4 build



Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wine-docs.spec	19 Jan 2006 22:37:40 -0000	1.3
+++ wine-docs.spec	20 Jan 2006 09:10:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           wine-docs
 Version:        0.9.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Documentation for wine
 
 Group:          Documentation
@@ -11,6 +11,7 @@
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
 BuildRequires:  openjade
+BuildRequires:  elinks
 
 %description
 This package is Wine's documentation repository. It consists of 
@@ -37,6 +38,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Fri Jan 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.6-2
+- try to fix fc4 build
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.6-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Jan 20 10:00:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:00:32 -0500
Subject: rpms/prozilla/devel prozilla-1.3.7.4-buf.patch, NONE,
	1.1 prozilla.spec, 1.11, 1.12
Message-ID: <200601201001.k0KA146f004942@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3272

Modified Files:
	prozilla.spec 
Added Files:
	prozilla-1.3.7.4-buf.patch 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791


prozilla-1.3.7.4-buf.patch:

--- NEW FILE prozilla-1.3.7.4-buf.patch ---
--- prozilla-1.3.7.4/src/ftpsearch.c.buf	2006-01-05 11:43:08.000000000 +0100
+++ prozilla-1.3.7.4/src/ftpsearch.c	2006-01-05 11:59:49.000000000 +0100
@@ -81,9 +81,10 @@
     return (strstr(buf, "</A"));
 }
 
-char *get_string_ahref(char *buf, char *out)
+static char *get_string_ahref(char *buf, char *out, size_t out_size)
 {
     char *p1, *p2, *p3;
+    size_t to_copy;
 
     p1 = find_ahref(buf);
     assert(p1 != NULL);
@@ -93,11 +94,14 @@
 
     p3 = find_closed_a(p2);
     assert(p3 != NULL);
-
-    strncpy(out, p2 + 1, p3 - p2 - 1);
-    out[p3 - p2 - 1] = 0;
+    
+    to_copy = p3 - p2 - 1;
+    if (to_copy >= out_size)
+        to_copy = out_size - 1;
+    strncpy(out, p2 + 1, to_copy);
+    out[to_copy] = 0;
+    
     return p3;
-
 }
 
 
@@ -242,9 +246,8 @@
 
     p1 = kmalloc((j - i - 5) + 100);
     strncpy(p1, i + 5, j - i - 5);
-
-    debug_prz("\nstring len= %ld", strlen(p1));
     p1[j - i - 5 + 1] = 0;
+    debug_prz("\nstring len= %ld", strlen(p1));
 
     p2 = p1;
 
@@ -275,9 +278,9 @@
     for (k = 0; k < *num_servers; k++)
     {
 	memset(&(ftp_mirrors[k]), 0, sizeof(ftp_mirror));
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].server_name = kstrdup(buf);
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 
 	/*Strip any leading slash in the path name if preent */
 	if (*buf == '/')
@@ -285,7 +288,7 @@
 	else
 	    ftp_mirrors[k].path = kstrdup(buf);
 
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].file_name = kstrdup(buf);
     }
 


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prozilla.spec	9 Sep 2005 11:26:07 -0000	1.11
+++ prozilla.spec	20 Jan 2006 10:00:32 -0000	1.12
@@ -1,11 +1,12 @@
 Summary:	Advanced Linux download manager
 Name:		prozilla
 Version:	1.3.7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
+Patch0:		prozilla-1.3.7.4-buf.patch
 URL:		http://prozilla.genesys.ro/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .buf
 %configure
 
 %build
@@ -49,6 +51,9 @@
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Fix CAN-2005-2961 / bugzilla 169791
+
 * Fri Sep 09 2005 Ralf Corsepius <rc040203 at freenet.de>
 - %%{_bindir}/proz.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 10:08:02 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:08:02 -0500
Subject: rpms/prozilla/FC-4 prozilla-1.3.7.4-buf.patch, NONE,
	1.1 prozilla.spec, 1.11, 1.12
Message-ID: <200601201008.k0KA8ZsU005101@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5081

Modified Files:
	prozilla.spec 
Added Files:
	prozilla-1.3.7.4-buf.patch 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791


prozilla-1.3.7.4-buf.patch:

--- NEW FILE prozilla-1.3.7.4-buf.patch ---
--- prozilla-1.3.7.4/src/ftpsearch.c.buf	2006-01-05 11:43:08.000000000 +0100
+++ prozilla-1.3.7.4/src/ftpsearch.c	2006-01-05 11:59:49.000000000 +0100
@@ -81,9 +81,10 @@
     return (strstr(buf, "</A"));
 }
 
-char *get_string_ahref(char *buf, char *out)
+static char *get_string_ahref(char *buf, char *out, size_t out_size)
 {
     char *p1, *p2, *p3;
+    size_t to_copy;
 
     p1 = find_ahref(buf);
     assert(p1 != NULL);
@@ -93,11 +94,14 @@
 
     p3 = find_closed_a(p2);
     assert(p3 != NULL);
-
-    strncpy(out, p2 + 1, p3 - p2 - 1);
-    out[p3 - p2 - 1] = 0;
+    
+    to_copy = p3 - p2 - 1;
+    if (to_copy >= out_size)
+        to_copy = out_size - 1;
+    strncpy(out, p2 + 1, to_copy);
+    out[to_copy] = 0;
+    
     return p3;
-
 }
 
 
@@ -242,9 +246,8 @@
 
     p1 = kmalloc((j - i - 5) + 100);
     strncpy(p1, i + 5, j - i - 5);
-
-    debug_prz("\nstring len= %ld", strlen(p1));
     p1[j - i - 5 + 1] = 0;
+    debug_prz("\nstring len= %ld", strlen(p1));
 
     p2 = p1;
 
@@ -275,9 +278,9 @@
     for (k = 0; k < *num_servers; k++)
     {
 	memset(&(ftp_mirrors[k]), 0, sizeof(ftp_mirror));
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].server_name = kstrdup(buf);
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 
 	/*Strip any leading slash in the path name if preent */
 	if (*buf == '/')
@@ -285,7 +288,7 @@
 	else
 	    ftp_mirrors[k].path = kstrdup(buf);
 
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].file_name = kstrdup(buf);
     }
 


Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-4/prozilla.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- prozilla.spec	9 Sep 2005 11:26:08 -0000	1.11
+++ prozilla.spec	20 Jan 2006 10:08:02 -0000	1.12
@@ -1,11 +1,12 @@
 Summary:	Advanced Linux download manager
 Name:		prozilla
 Version:	1.3.7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
+Patch0:		prozilla-1.3.7.4-buf.patch
 URL:		http://prozilla.genesys.ro/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .buf
 %configure
 
 %build
@@ -49,6 +51,9 @@
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Fix CAN-2005-2961 / bugzilla 169791
+
 * Fri Sep 09 2005 Ralf Corsepius <rc040203 at freenet.de>
 - %%{_bindir}/proz.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 10:15:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:15:01 -0500
Subject: rpms/prozilla/FC-3 prozilla.spec,1.9,1.10
Message-ID: <200601201015.k0KAFlKZ005173@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5154

Modified Files:
	prozilla.spec 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791



Index: prozilla.spec
===================================================================
RCS file: /cvs/extras/rpms/prozilla/FC-3/prozilla.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- prozilla.spec	9 Sep 2005 11:26:13 -0000	1.9
+++ prozilla.spec	20 Jan 2006 10:15:01 -0000	1.10
@@ -1,11 +1,12 @@
 Summary:	Advanced Linux download manager
 Name:		prozilla
 Version:	1.3.7.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://prozilla.genesys.ro/downloads/prozilla/tarballs/%{name}-%{version}.tar.gz
+Patch0:		prozilla-1.3.7.4-buf.patch
 URL:		http://prozilla.genesys.ro/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -z .buf
 %configure
 
 %build
@@ -49,6 +51,9 @@
 %{_mandir}/man1/proz*
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+- Fix CAN-2005-2961 / bugzilla 169791
+
 * Fri Sep 09 2005 Ralf Corsepius <rc040203 at freenet.de>
 - %%{_bindir}/proz.
 



From fedora-extras-commits at redhat.com  Fri Jan 20 10:16:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 05:16:53 -0500
Subject: rpms/prozilla/FC-3 prozilla-1.3.7.4-buf.patch,NONE,1.1
Message-ID: <200601201016.k0KAGtFf005204@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/prozilla/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5192

Added Files:
	prozilla-1.3.7.4-buf.patch 
Log Message:
* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
- Fix CAN-2005-2961 / bugzilla 169791


prozilla-1.3.7.4-buf.patch:

--- NEW FILE prozilla-1.3.7.4-buf.patch ---
--- prozilla-1.3.7.4/src/ftpsearch.c.buf	2006-01-05 11:43:08.000000000 +0100
+++ prozilla-1.3.7.4/src/ftpsearch.c	2006-01-05 11:59:49.000000000 +0100
@@ -81,9 +81,10 @@
     return (strstr(buf, "</A"));
 }
 
-char *get_string_ahref(char *buf, char *out)
+static char *get_string_ahref(char *buf, char *out, size_t out_size)
 {
     char *p1, *p2, *p3;
+    size_t to_copy;
 
     p1 = find_ahref(buf);
     assert(p1 != NULL);
@@ -93,11 +94,14 @@
 
     p3 = find_closed_a(p2);
     assert(p3 != NULL);
-
-    strncpy(out, p2 + 1, p3 - p2 - 1);
-    out[p3 - p2 - 1] = 0;
+    
+    to_copy = p3 - p2 - 1;
+    if (to_copy >= out_size)
+        to_copy = out_size - 1;
+    strncpy(out, p2 + 1, to_copy);
+    out[to_copy] = 0;
+    
     return p3;
-
 }
 
 
@@ -242,9 +246,8 @@
 
     p1 = kmalloc((j - i - 5) + 100);
     strncpy(p1, i + 5, j - i - 5);
-
-    debug_prz("\nstring len= %ld", strlen(p1));
     p1[j - i - 5 + 1] = 0;
+    debug_prz("\nstring len= %ld", strlen(p1));
 
     p2 = p1;
 
@@ -275,9 +278,9 @@
     for (k = 0; k < *num_servers; k++)
     {
 	memset(&(ftp_mirrors[k]), 0, sizeof(ftp_mirror));
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].server_name = kstrdup(buf);
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 
 	/*Strip any leading slash in the path name if preent */
 	if (*buf == '/')
@@ -285,7 +288,7 @@
 	else
 	    ftp_mirrors[k].path = kstrdup(buf);
 
-	p2 = get_string_ahref(p2, buf);
+	p2 = get_string_ahref(p2, buf, sizeof(buf)/sizeof(char));
 	ftp_mirrors[k].file_name = kstrdup(buf);
     }
 



From fedora-extras-commits at redhat.com  Fri Jan 20 15:37:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 10:37:52 -0500
Subject: rpms/lyx/devel helpers.conf, NONE, 1.1 helpers.sh, NONE,
	1.1 lyx-1.3.7-helpers.patch, NONE, 1.1 lyx-1.3.7-noxfonts.patch,
	NONE, 1.1 lyx-qt.desktop, NONE, 1.1 lyx-xforms.desktop, NONE,
	1.1 lyx.conf, NONE, 1.1 lyx.sh, NONE, 1.1 .cvsignore, 1.3,
	1.4 lyx.desktop, 1.2, 1.3 lyx.spec, 1.14, 1.15 sources, 1.4,
	1.5 find_helpers.sh, 1.1, NONE lyx-1.3.5-helpers.patch, 1.3, NONE
Message-ID: <200601201538.k0KFcPVK015024@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14983

Modified Files:
	.cvsignore lyx.desktop lyx.spec sources 
Added Files:
	helpers.conf helpers.sh lyx-1.3.7-helpers.patch 
	lyx-1.3.7-noxfonts.patch lyx-qt.desktop lyx-xforms.desktop 
	lyx.conf lyx.sh 
Removed Files:
	find_helpers.sh lyx-1.3.5-helpers.patch 
Log Message:
* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
- 1.3.7
- -qt/-xforms: frontend pkgs (#178116)



--- NEW FILE helpers.conf ---

ps_viewers="evince gsview32 gsview ggv kghostview gv ghostview"


***** Error reading new file: [Errno 2] No such file or directory: 'helpers.sh'
lyx-1.3.7-helpers.patch:

--- NEW FILE lyx-1.3.7-helpers.patch ---
--- lyx-1.3.7/lib/configure.m4.helpers	2006-01-11 10:32:15.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 11:55:31.000000000 -0600
@@ -269,7 +269,7 @@
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,evince gsview32 gsview ggv kghostview gv ghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
   *) PS_VIEWER="$GHOSTVIEW";;
@@ -277,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)
 
 # Search something to preview dvi
 SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
--- lyx-1.3.7/lib/configure.helpers	2006-01-16 08:51:48.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:00:54.000000000 -0600
@@ -478,9 +478,9 @@
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview kghostview)"
+echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)"
 GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview kghostview
+for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -519,9 +519,9 @@
 
 # Search for a program to preview pdf
 echo $ac_n "checking for a PDF previewer""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)"
+echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)"
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -591,9 +591,9 @@
 
 # Search something to preview html
 echo $ac_n "checking for an HTML previewer""... $ac_c"
-echo "$ac_t""("mozilla file://\$\$p\$\$i" netscape)"
+echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)"
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" 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

lyx-1.3.7-noxfonts.patch:

--- NEW FILE lyx-1.3.7-noxfonts.patch ---
--- lyx-1.3.7/lib/configure.noxfonts	2006-01-17 12:00:54.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:14:49.000000000 -0600
@@ -1610,6 +1610,8 @@
 EOF
 fi
 
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then 
 ######## X FONTS
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
@@ -1643,6 +1645,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib
--- lyx-1.3.7/lib/configure.m4.noxfonts	2006-01-17 11:55:31.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 12:14:31.000000000 -0600
@@ -676,7 +676,9 @@
 EOF
 fi
 
-######## X FONTS
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then
+######## X FONTS 
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
 
@@ -709,6 +711,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib


--- NEW FILE lyx-qt.desktop ---
[Desktop Entry]
Name=LyX-qt
GenericName=WYSIWYM document processor
Comment=Lyx using Qt frontend
Exec=lyx-qt
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx-xforms.desktop ---
[Desktop Entry]
Name=LyX-xforms
GenericName=WYSIWYM document processor
Comment=Lyx using XForms frontend
Exec=lyx-xforms
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx.conf ---
LYX_FRONTEND=lyx-qt


--- NEW FILE lyx.sh ---
#!/bin/bash

if [ -f /etc/lyx/lyx.conf ]; then
 source /etc/lyx/lyx.conf
fi

if [ -f ${HOME}/.lyx/lyx.conf ]; then
 source ${HOME}/.lyx/lyx.conf
fi

if [ -z "${LYX_FRONTEND}" ]; then
  LYX_FRONTEND=qt
fi

# Try LYX_FRONTEND
which lyx-${LYX_FRONTEND} >& /dev/null && \
  exec lyx-${LYX_FRONTEND} ${1+"$@"}

# Fall back to trying lyx-qt, lyx-xforms
for frontend in qt xforms ; do
  which lyx-$frontend >& /dev/null && exec lyx-$frontend ${1+"$@"} ||:
done

# ERROR should not reach this point
exit 1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Aug 2005 17:51:33 -0000	1.3
+++ .cvsignore	20 Jan 2006 15:37:52 -0000	1.4
@@ -1 +1 @@
-lyx-1.3.6.tar.gz
+lyx-1.3.7.tar.bz2


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lyx.desktop	4 Dec 2004 12:21:23 -0000	1.2
+++ lyx.desktop	20 Jan 2006 15:37:52 -0000	1.3
@@ -3,7 +3,7 @@
 GenericName=WYSIWYM document processor
 Comment=WYSIWYM document processor
 Exec=lyx
-Icon=lyx.png
+Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lyx.spec	2 Sep 2005 12:16:21 -0000	1.14
+++ lyx.spec	20 Jan 2006 15:37:52 -0000	1.15
@@ -1,32 +1,41 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.3.6
-Release: 4%{?dist}%{?kde}
+Version: 1.3.7 
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz
+Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.3.5-helpers.patch
+Patch1: lyx-1.3.7-helpers.patch
+Patch2: lyx-1.3.7-noxfonts.patch
+
+# app-wrapper for various frontends
+Source10: lyx.sh
+
+Source20: lyx.desktop
+Source21: lyx-qt.desktop
+Source22: lyx-xforms.desktop
 
-Source1: lyx.desktop
 # "borrow" kde's crystal icon for lyx
-Source2: lyx-crystal.png
+Source30: lyx-crystal.png
 
 # TODO: use this find_helpers.sh script at runtime, instead of depending on
 # lyx's configure and %%triggers
-Source10: find_helpers.sh
+#Source100: helpers.sh
+
+# Front-ends
+BuildRequires: qt-devel
+BuildRequires: xforms-devel libjpeg-devel
 
 BuildRequires: desktop-file-utils
 BuildRequires: aiksaurus-devel
 BuildRequires: aspell-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-#BuildRequires: /usr/X11R6/bin/makepsres
-BuildRequires: xorg-x11
 
 # For texhash
 Requires(post): tetex-fonts
@@ -37,13 +46,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
-
-BuildRequires: qt-devel >= 1:3.3
-%if "%{?kde}" != "%{nil}"
-# kde-redhat crud, not needed in Fedora Extras
-%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )}
-Requires: qt >= 1:%{qt_ver}
-%endif
+Requires: %{name}-frontend = %{version}
 
 
 %description
@@ -64,29 +67,65 @@
 and let the computer take care of the rest.
 
 
+%package qt 
+Summary: Lyx graphical frontend using Qt
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description qt
+%{summary}.
+
+%package xforms
+Summary: Lyx graphical frontend using XForms
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description xforms
+%{summary}.
+
+
 %prep
 
 %setup -q
 
 %patch1 -p1 -b .helpers
+%patch2 -p1 -b .noxfonts
+
+# ./autogen.sh
 
 
 %build
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 
 unset LINGUAS ||:
 
+# QT
+test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
-
 %configure \
   --with-frontend=qt \
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-pspell \
-  --disable-dependency-tracking
+  --without-warnings --disable-debug --disable-dependency-tracking
+
+make %{?_smp_mflags} && \
+ cp -a src/lyx lyx-qt
 
-make %{?_smp_mflags}
+# Intermediate cleanup 
+# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
+make -C src/frontends clean
+
+# XFORMS
+%configure \
+  --with-frontend=xforms \
+  --enable-optimization="$RPM_OPT_FLAGS" \
+  --with-aiksaurus \
+  --with-pspell \
+  --without-warnings --disable-debug --disable-dependency-tracking
+
+make %{?_smp_mflags} && \
+cp -a src/lyx lyx-xforms
 
 
 %install
@@ -94,38 +133,42 @@
 
 unset LINGUAS ||:
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Handle front-ends
+install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
+install -p -m0755 -D lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
+
 
-#
 # Set up the lyx-specific class files where TeX can see them
-#
 texmf=%{_datadir}/texmf
-mkdir -p ${RPM_BUILD_ROOT}${texmf}/tex/latex
-mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
-   ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx
-
-# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
+mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex
+mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
+   $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
+
+# KDE already has a nice builtin crystalsvg icon, 
+# but this is for gnome's benefit (gtk2 < 2.6)
+install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category "X-Fedora" \
-   %{SOURCE1}
+   %{SOURCE21} %{SOURCE22}
 
 %find_lang %{name} || touch %{name}.lang
 
-touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
+#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
 
 
 %post
-# Make TeX understand where LyX-specific packages are
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
-# Now configure LyX
 cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
 
 %postun
-# Fix the TeX file hash
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
 
 # Catch installed/uninstalled helpers
@@ -145,22 +188,39 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%{_datadir}/applications/*.desktop
+%{_bindir}/lyx
+%{_bindir}/noweb2lyx
+%{_bindir}/reLyX
+#{_datadir}/applications/*-lyx.desktop
 %{_datadir}/pixmaps/*
-%{_bindir}/*
 %{_mandir}/man?/*
-%{_datadir}/%{name}
-%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst
-%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults
-%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.*
-%{_datadir}/texmf/tex/latex/%{name}
+%{_datadir}/lyx/
+%{_datadir}/texmf/tex/latex/lyx/
+%verify(not md5 size mtime) %{_datadir}/lyx/*.lst
+%verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults
+%verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx
+
+%files qt
+%defattr(-,root,root,-)
+%{_bindir}/lyx-qt
+%{_datadir}/applications/*-lyx-qt.desktop
+
+%files xforms
+%defattr(-,root,root,-)
+%{_bindir}/lyx-xforms
+%{_datadir}/applications/*-lyx-xforms.desktop
+
+
+%changelog
+* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
+- 1.3.7
+- -qt/-xforms: frontend pkgs (#178116)
 
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
+- %%post/%%postun: update-desktop-database
 
-%changelog 
 * Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
 - leave out kde-redhat bits in Fedora Extras build
 - define/use safer (esp for x86_64) QTDIR bits


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2005 17:51:33 -0000	1.4
+++ sources	20 Jan 2006 15:37:52 -0000	1.5
@@ -1 +1 @@
-20fd8515cc025129d97232dd2583f35f  lyx-1.3.6.tar.gz
+cef9a2fca128c32ffa04c214d02cde04  lyx-1.3.7.tar.bz2


--- find_helpers.sh DELETED ---


--- lyx-1.3.5-helpers.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 20 16:05:51 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 11:05:51 -0500
Subject: rpms/xforms/devel xforms.spec,1.14,1.15
Message-ID: <200601201606.k0KG6Osu016935@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/xforms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16917

Modified Files:
	xforms.spec 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-6
- -devel: Req: libjpeg-devel(flimage), libXpm-devel



Index: xforms.spec
===================================================================
RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xforms.spec	2 Jan 2006 21:40:01 -0000	1.14
+++ xforms.spec	20 Jan 2006 16:05:50 -0000	1.15
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.90
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: LGPL
 Group:   System Environment/Libraries
@@ -18,7 +18,7 @@
 BuildRequires: libGL-devel
 %if "%{?fedora}" > "4"
 BuildRequires: libXpm-devel
-%define x_deps libX11-devel
+%define x_deps libX11-devel libXpm-devel
 %endif
 
 # import/export: png, sgi (optional?)
@@ -41,6 +41,7 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: %{?x_deps}%{!?x_deps:XFree86-devel}
+Requires: libjpeg-devel
 %description devel
 %{summary}.
 
@@ -94,6 +95,9 @@
 
 
 %changelog 
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-6
+- -devel: Req: libjpeg-devel(flimage), libXpm-devel
+
 * Mon Jan 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.90-5
 - prelink.patch: fix undefined symbols in (shared) lib(s)
 



From fedora-extras-commits at redhat.com  Fri Jan 20 16:08:06 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 20 Jan 2006 11:08:06 -0500
Subject: owners owners.list,1.554,1.555
Message-ID: <200601201608.k0KG8dxT017044@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16993

Modified Files:
	owners.list 
Log Message:
Add azureus.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -r1.554 -r1.555
--- owners.list	20 Jan 2006 00:20:34 -0000	1.554
+++ owners.list	20 Jan 2006 16:08:05 -0000	1.555
@@ -55,6 +55,7 @@
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|baobab|Graphical tool to analyse directory trees|dakingun at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 16:08:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 11:08:32 -0500
Subject: rpms/lyx/devel lyx.spec,1.15,1.16
Message-ID: <200601201609.k0KG95w6017055@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17032

Modified Files:
	lyx.spec 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
- BR: libXpm-devel



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lyx.spec	20 Jan 2006 15:37:52 -0000	1.15
+++ lyx.spec	20 Jan 2006 16:08:32 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.7 
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -27,9 +27,14 @@
 # lyx's configure and %%triggers
 #Source100: helpers.sh
 
-# Front-ends
+# qt frontend
 BuildRequires: qt-devel
-BuildRequires: xforms-devel libjpeg-devel
+# xforms frontend
+BuildRequires: xforms-devel
+BuildRequires: libjpeg-devel
+%if "{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%endif
 
 BuildRequires: desktop-file-utils
 BuildRequires: aiksaurus-devel
@@ -214,6 +219,9 @@
 
 
 %changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
+- BR: libXpm-devel
+
 * Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
 - 1.3.7
 - -qt/-xforms: frontend pkgs (#178116)



From fedora-extras-commits at redhat.com  Fri Jan 20 16:39:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 20 Jan 2006 11:39:54 -0500
Subject: rpms/kdesvn/devel .cvsignore, 1.4, 1.5 kdesvn.spec, 1.9,
	1.10 sources, 1.4, 1.5 kdesvn-0.7.1-gcc41.patch, 1.1, NONE
Message-ID: <200601201640.k0KGeRUW017253@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17228

Modified Files:
	.cvsignore kdesvn.spec sources 
Removed Files:
	kdesvn-0.7.1-gcc41.patch 
Log Message:
- Update to 0.7.2
- Remove gcc41 patch fixed upstream
- Remove apr-1-config and apu-1-config args - fixed upstream
- Drop srcver - bad idea



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Dec 2005 16:37:28 -0000	1.4
+++ .cvsignore	20 Jan 2006 16:39:54 -0000	1.5
@@ -1 +1 @@
-kdesvn-0.7.1.tar.gz
+kdesvn-0.7.2.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdesvn.spec	19 Dec 2005 16:16:00 -0000	1.9
+++ kdesvn.spec	20 Jan 2006 16:39:54 -0000	1.10
@@ -1,16 +1,13 @@
-%define srcver  0.7.1
-
 Name:           kdesvn
-Version:        0.7.1
-Release:        3%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://www.alwins-world.de/programs/kdesvn/
-Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{srcver}.tar.gz
+Source0:        http://www.alwins-world.de/programs/download/kdesvn/kdesvn-%{version}.tar.gz
 Patch0:         kdesvn-0.7.1-x.patch
-Patch1:         kdesvn-0.7.1-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel
@@ -31,16 +28,14 @@
 
 
 %prep
-%setup -q -n %{name}-%{srcver}
+%setup -q
 %patch -p1 -b .x11
-%patch1 -p1 -b .gcc41
 
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
-%configure --disable-rpath --with-svn-lib=%{_libdir} \
-           --with-apr-config=apr-1-config --with-apu-config=apu-1-config
+%configure --disable-rpath --with-svn-lib=%{_libdir}
 make %{?_smp_mflags}
 
 
@@ -102,6 +97,12 @@
 
 
 %changelog
+* Fri Jan 20 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
+- Update to 0.7.2
+- Remove gcc41 patch fixed upstream
+- Remove apr-1-config and apu-1-config args - fixed upstream
+- Drop srcver - bad idea
+
 * Fri Dec 16 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-3
 - Add missing files not detected by mock
 - Add patch to fix gcc41 compile error


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Dec 2005 16:37:28 -0000	1.4
+++ sources	20 Jan 2006 16:39:54 -0000	1.5
@@ -1 +1 @@
-46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz
+7ebc3e786bab67f23826df99a1828b08  kdesvn-0.7.2.tar.gz


--- kdesvn-0.7.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 20 16:42:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 20 Jan 2006 11:42:54 -0500
Subject: rpms/kdesvn/FC-4 .cvsignore, 1.3, 1.4 kdesvn.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200601201643.k0KGhQC4017326@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17303

Modified Files:
	.cvsignore kdesvn.spec sources 
Log Message:
New upstream version 0.7.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Dec 2005 16:22:28 -0000	1.3
+++ .cvsignore	20 Jan 2006 16:42:54 -0000	1.4
@@ -1 +1 @@
-kdesvn-0.7.1.tar.gz
+kdesvn-0.7.2.tar.gz


Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdesvn.spec	16 Dec 2005 18:42:17 -0000	1.4
+++ kdesvn.spec	20 Jan 2006 16:42:54 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kdesvn
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.7.2
+Release:        1%{?dist}
 Summary:        A subversion client for KDE with KIO integration
 
 Group:          Development/Tools
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Fri Jan 20 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
+- New upstream version 0.7.2
+
 * Fri Dec 16 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-2
 - Add missing files not detected by mock
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Dec 2005 16:22:28 -0000	1.3
+++ sources	20 Jan 2006 16:42:54 -0000	1.4
@@ -1 +1 @@
-46c8acbd008c066e9101bc80b4549487  kdesvn-0.7.1.tar.gz
+7ebc3e786bab67f23826df99a1828b08  kdesvn-0.7.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 16:43:57 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 20 Jan 2006 11:43:57 -0500
Subject: rpms/kdesvn/FC-4 kdesvn.spec,1.5,1.6
Message-ID: <200601201644.k0KGiTXB017370@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/kdesvn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17353

Modified Files:
	kdesvn.spec 
Log Message:
Gah - 2006!



Index: kdesvn.spec
===================================================================
RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kdesvn.spec	20 Jan 2006 16:42:54 -0000	1.5
+++ kdesvn.spec	20 Jan 2006 16:43:57 -0000	1.6
@@ -95,7 +95,7 @@
 
 
 %changelog
-* Fri Jan 20 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
+* Fri Jan 20 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.7.2-1
 - New upstream version 0.7.2
 
 * Fri Dec 16 2005 - Orion Poplawski <orion at cora.nwra.com> - 0.7.1-2



From fedora-extras-commits at redhat.com  Fri Jan 20 17:51:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 12:51:39 -0500
Subject: rpms/lyx/FC-4 helpers.conf, NONE, 1.1 helpers.sh, NONE,
	1.1 lyx-qt.desktop, NONE, 1.1 lyx-xforms.desktop, NONE,
	1.1 lyx.conf, NONE, 1.1 lyx.sh, NONE, 1.1 .cvsignore, 1.2,
	1.3 lyx.desktop, 1.2, 1.3 lyx.spec, 1.13, 1.14 sources, 1.4,
	1.5 find_helpers.sh, 1.1, NONE lyx-1.3.5-helpers.patch, 1.3, NONE
Message-ID: <200601201752.k0KHqCeZ019339@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19308

Modified Files:
	.cvsignore lyx.desktop lyx.spec sources 
Added Files:
	helpers.conf helpers.sh lyx-qt.desktop lyx-xforms.desktop 
	lyx.conf lyx.sh 
Removed Files:
	find_helpers.sh lyx-1.3.5-helpers.patch 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
- cleanup/fix snarfing of intermediate frontend builds.

* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
- BR: libXpm-devel

* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
- 1.3.7
- -qt/-xforms: frontend pkgs (#178116)

* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
- %%post/%%postun: update-desktop-database




--- NEW FILE helpers.conf ---

ps_viewers="evince gsview32 gsview ggv kghostview gv ghostview"


***** Error reading new file: [Errno 2] No such file or directory: 'helpers.sh'

--- NEW FILE lyx-qt.desktop ---
[Desktop Entry]
Name=LyX-qt
GenericName=WYSIWYM document processor
Comment=Lyx using Qt frontend
Exec=lyx-qt
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx-xforms.desktop ---
[Desktop Entry]
Name=LyX-xforms
GenericName=WYSIWYM document processor
Comment=Lyx using XForms frontend
Exec=lyx-xforms
Icon=lyx
MimeType=application/x-lyx;text/x-lyx;
Type=Application
Encoding=UTF-8
Categories=Qt;Application;Office;



--- NEW FILE lyx.conf ---
LYX_FRONTEND=lyx-qt


--- NEW FILE lyx.sh ---
#!/bin/bash

if [ -f /etc/lyx/lyx.conf ]; then
 source /etc/lyx/lyx.conf
fi

if [ -f ${HOME}/.lyx/lyx.conf ]; then
 source ${HOME}/.lyx/lyx.conf
fi

if [ -z "${LYX_FRONTEND}" ]; then
  LYX_FRONTEND=qt
fi

# Try LYX_FRONTEND
which lyx-${LYX_FRONTEND} >& /dev/null && \
  exec lyx-${LYX_FRONTEND} ${1+"$@"}

# Fall back to trying lyx-qt, lyx-xforms
for frontend in qt xforms ; do
  which lyx-$frontend >& /dev/null && exec lyx-$frontend ${1+"$@"} ||:
done

# ERROR should not reach this point
exit 1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:51:01 -0000	1.2
+++ .cvsignore	20 Jan 2006 17:51:39 -0000	1.3
@@ -1 +1 @@
-lyx-1.3.4.tar.bz2
+lyx-1.3.7.tar.bz2


Index: lyx.desktop
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- lyx.desktop	4 Dec 2004 12:21:23 -0000	1.2
+++ lyx.desktop	20 Jan 2006 17:51:39 -0000	1.3
@@ -3,7 +3,7 @@
 GenericName=WYSIWYM document processor
 Comment=WYSIWYM document processor
 Exec=lyx
-Icon=lyx.png
+Icon=lyx
 MimeType=application/x-lyx;text/x-lyx;
 Type=Application
 Encoding=UTF-8


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lyx.spec	2 Sep 2005 12:16:20 -0000	1.13
+++ lyx.spec	20 Jan 2006 17:51:39 -0000	1.14
@@ -1,32 +1,46 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.3.6
-Release: 4%{?dist}%{?kde}
+Version: 1.3.7 
+Release: 3%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-1.3.6.tar.gz
+Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.3.5-helpers.patch
+Patch1: lyx-1.3.7-helpers.patch
+Patch2: lyx-1.3.7-noxfonts.patch
+
+# app-wrapper for various frontends
+Source10: lyx.sh
+
+Source20: lyx.desktop
+Source21: lyx-qt.desktop
+Source22: lyx-xforms.desktop
 
-Source1: lyx.desktop
 # "borrow" kde's crystal icon for lyx
-Source2: lyx-crystal.png
+Source30: lyx-crystal.png
 
 # TODO: use this find_helpers.sh script at runtime, instead of depending on
 # lyx's configure and %%triggers
-Source10: find_helpers.sh
+#Source100: helpers.sh
+
+# qt frontend
+BuildRequires: qt-devel
+# xforms frontend
+BuildRequires: xforms-devel
+BuildRequires: libjpeg-devel
+%if "{?fedora}" > "4"
+BuildRequires: libXpm-devel
+%endif
 
 BuildRequires: desktop-file-utils
 BuildRequires: aiksaurus-devel
 BuildRequires: aspell-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
-#BuildRequires: /usr/X11R6/bin/makepsres
-BuildRequires: xorg-x11
 
 # For texhash
 Requires(post): tetex-fonts
@@ -37,13 +51,7 @@
 Requires: mathml-fonts
 Requires: ghostscript
 Requires: htmlview
-
-BuildRequires: qt-devel >= 1:3.3
-%if "%{?kde}" != "%{nil}"
-# kde-redhat crud, not needed in Fedora Extras
-%define qt_ver %{expand:%%(rpm -q --qf '%%{VERSION}' qt-devel )}
-Requires: qt >= 1:%{qt_ver}
-%endif
+Requires: %{name}-frontend = %{version}
 
 
 %description
@@ -64,29 +72,65 @@
 and let the computer take care of the rest.
 
 
+%package qt 
+Summary: Lyx graphical frontend using Qt
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description qt
+%{summary}.
+
+%package xforms
+Summary: Lyx graphical frontend using XForms
+Group:   Applications/Publishing
+Requires: %{name} = %{version}
+Provides: %{name}-frontend = %{version}-%{release}
+%description xforms
+%{summary}.
+
+
 %prep
 
 %setup -q
 
 %patch1 -p1 -b .helpers
+%patch2 -p1 -b .noxfonts
+
+# ./autogen.sh
 
 
 %build
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 
 unset LINGUAS ||:
 
+# QT
+test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
 %{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
-
 %configure \
   --with-frontend=qt \
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
   --with-pspell \
-  --disable-dependency-tracking
+  --without-warnings --disable-debug --disable-dependency-tracking
+
+make %{?_smp_mflags}
+cp -a src/lyx lyx-qt
+
+# Intermediate cleanup 
+# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
+make -C src/frontends clean
+
+# XFORMS
+%configure \
+  --with-frontend=xforms \
+  --enable-optimization="$RPM_OPT_FLAGS" \
+  --with-aiksaurus \
+  --with-pspell \
+  --without-warnings --disable-debug --disable-dependency-tracking
 
 make %{?_smp_mflags}
+cp -a src/lyx lyx-xforms
 
 
 %install
@@ -94,38 +138,42 @@
 
 unset LINGUAS ||:
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+## Handle front-ends
+install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
+install -p -m0755 -D lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
+
 
-#
 # Set up the lyx-specific class files where TeX can see them
-#
 texmf=%{_datadir}/texmf
-mkdir -p ${RPM_BUILD_ROOT}${texmf}/tex/latex
-mv ${RPM_BUILD_ROOT}%{_datadir}/lyx/tex \
-   ${RPM_BUILD_ROOT}${texmf}/tex/latex/lyx
-
-# KDE already has a nice builtin crystalsvg icon, but this is for gnome's benefit
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
+mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex
+mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
+   $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
+
+# KDE already has a nice builtin crystalsvg icon, 
+# but this is for gnome's benefit (gtk2 < 2.6)
+install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category "X-Fedora" \
-   %{SOURCE1}
+   %{SOURCE21} %{SOURCE22}
 
 %find_lang %{name} || touch %{name}.lang
 
-touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
+#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
 
 
 %post
-# Make TeX understand where LyX-specific packages are
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
-# Now configure LyX
 cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
 
 %postun
-# Fix the TeX file hash
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 texhash >& /dev/null ||:
 
 # Catch installed/uninstalled helpers
@@ -145,22 +193,45 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
-%{_datadir}/applications/*.desktop
+%{_bindir}/lyx
+%{_bindir}/noweb2lyx
+%{_bindir}/reLyX
+#{_datadir}/applications/*-lyx.desktop
 %{_datadir}/pixmaps/*
-%{_bindir}/*
 %{_mandir}/man?/*
-%{_datadir}/%{name}
-%verify(not md5 size mtime) %{_datadir}/%{name}/*.lst
-%verify(not md5 size mtime) %{_datadir}/%{name}/lyxrc.defaults
-%verify(not md5 size mtime) %{_datadir}/%{name}/doc/LaTeXConfig.lyx
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/PSres.upr
-%verify(not md5 size mtime) %{_datadir}/%{name}/xfonts/fonts.*
-%{_datadir}/texmf/tex/latex/%{name}
+%{_datadir}/lyx/
+%{_datadir}/texmf/tex/latex/lyx/
+%verify(not md5 size mtime) %{_datadir}/lyx/*.lst
+%verify(not md5 size mtime) %{_datadir}/lyx/lyxrc.defaults
+%verify(not md5 size mtime) %{_datadir}/lyx/doc/LaTeXConfig.lyx
+
+%files qt
+%defattr(-,root,root,-)
+%{_bindir}/lyx-qt
+%{_datadir}/applications/*-lyx-qt.desktop
+
+%files xforms
+%defattr(-,root,root,-)
+%{_bindir}/lyx-xforms
+%{_datadir}/applications/*-lyx-xforms.desktop
+
+
+%changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
+- cleanup/fix snarfing of intermediate frontend builds.
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
+- BR: libXpm-devel
+
+* Tue Jan 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-1
+- 1.3.7
+- -qt/-xforms: frontend pkgs (#178116)
 
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-5
+- %%post/%%postun: update-desktop-database
 
-%changelog 
 * Fri Sep 02 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.6-4
 - leave out kde-redhat bits in Fedora Extras build
 - define/use safer (esp for x86_64) QTDIR bits


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2005 18:39:46 -0000	1.4
+++ sources	20 Jan 2006 17:51:39 -0000	1.5
@@ -1 +1 @@
-20fd8515cc025129d97232dd2583f35f  lyx-1.3.6.tar.gz
+cef9a2fca128c32ffa04c214d02cde04  lyx-1.3.7.tar.bz2


--- find_helpers.sh DELETED ---


--- lyx-1.3.5-helpers.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 20 17:53:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 12:53:07 -0500
Subject: rpms/lyx/FC-4 lyx-1.3.7-helpers.patch, NONE,
	1.1 lyx-1.3.7-noxfonts.patch, NONE, 1.1 lyx.spec, 1.14, 1.15
Message-ID: <200601201753.k0KHrduG019407@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19384

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch 
Log Message:
include 1.3.7 patches


lyx-1.3.7-helpers.patch:

--- NEW FILE lyx-1.3.7-helpers.patch ---
--- lyx-1.3.7/lib/configure.m4.helpers	2006-01-11 10:32:15.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 11:55:31.000000000 -0600
@@ -269,7 +269,7 @@
 test $image_command = "convert" && image_command="convert \$\$i \$\$o"
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,gsview32 gv ghostview kghostview)
+SEARCH_PROG([for a Postscript previewer],GHOSTVIEW,evince gsview32 gsview ggv kghostview gv ghostview)
 case $GHOSTVIEW in
   ghostview) PS_VIEWER="$GHOSTVIEW -swap" ;;
   *) PS_VIEWER="$GHOSTVIEW";;
@@ -277,13 +277,13 @@
 EPS_VIEWER=$GHOSTVIEW
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)
 
 # Search something to preview dvi
 SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
 
 # Search something to preview html
-SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for an HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
--- lyx-1.3.7/lib/configure.helpers	2006-01-16 08:51:48.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:00:54.000000000 -0600
@@ -478,9 +478,9 @@
 
 # Search something to preview postscript
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
-echo "$ac_t""(gsview32 gv ghostview kghostview)"
+echo "$ac_t""(evince gsview32 gsview ggv kghostview gv ghostview)"
 GHOSTVIEW=
-for ac_prog in gsview32 gv ghostview kghostview
+for ac_prog in evince gsview32 gsview ggv kghostview gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -519,9 +519,9 @@
 
 # Search for a program to preview pdf
 echo $ac_n "checking for a PDF previewer""... $ac_c"
-echo "$ac_t""(acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)"
+echo "$ac_t""(evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview)"
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in evince acrobat acrord32 acroread gsview32 gsview ggv kpdf kghostview xpdf gv ghostview
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -591,9 +591,9 @@
 
 # Search something to preview html
 echo $ac_n "checking for an HTML previewer""... $ac_c"
-echo "$ac_t""("mozilla file://\$\$p\$\$i" netscape)"
+echo "$ac_t""("htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape)"
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" 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

lyx-1.3.7-noxfonts.patch:

--- NEW FILE lyx-1.3.7-noxfonts.patch ---
--- lyx-1.3.7/lib/configure.noxfonts	2006-01-17 12:00:54.000000000 -0600
+++ lyx-1.3.7/lib/configure	2006-01-17 12:14:49.000000000 -0600
@@ -1610,6 +1610,8 @@
 EOF
 fi
 
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then 
 ######## X FONTS
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
@@ -1643,6 +1645,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib
--- lyx-1.3.7/lib/configure.m4.noxfonts	2006-01-17 11:55:31.000000000 -0600
+++ lyx-1.3.7/lib/configure.m4	2006-01-17 12:14:31.000000000 -0600
@@ -676,7 +676,9 @@
 EOF
 fi
 
-######## X FONTS
+## DISABLED (by default), rely on already-present mathml-fonts
+if [ "x${use_xfonts}" == "xtrue"]; then
+######## X FONTS 
 # create a fonts.dir file to make X fonts available to LyX
 echo "checking for TeX fonts"
 
@@ -709,6 +711,7 @@
   (cd xfonts ; rm -f PSres.upr ; makepsres) 2>/dev/null || true
 fi
 rm -f xfonts/tmpfonts
+fi
 
 
 # Remove superfluous files if we are not writing in the main lib


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- lyx.spec	20 Jan 2006 17:51:39 -0000	1.14
+++ lyx.spec	20 Jan 2006 17:53:07 -0000	1.15
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.7 
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -219,7 +219,7 @@
 
 
 %changelog
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-3
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
 - cleanup/fix snarfing of intermediate frontend builds.
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2



From fedora-extras-commits at redhat.com  Fri Jan 20 18:29:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 13:29:55 -0500
Subject: rpms/tidy/devel tidy.spec,1.13,1.14
Message-ID: <200601201830.k0KIUSJ5021293@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/tidy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21269

Modified Files:
	tidy.spec 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-9.20051025
- libtidy returns to be multilib friendly



Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tidy.spec	28 Oct 2005 12:05:40 -0000	1.13
+++ tidy.spec	20 Jan 2006 18:29:55 -0000	1.14
@@ -1,8 +1,10 @@
 
+%define libname libtidy
+
 Name:    tidy
 Summary: Utility to clean up and pretty print HTML/XHTML/XML
 Version: 0.99.0
-Release: 8.20051025%{?dist}
+Release: 9.20051025%{?dist}
 
 Group:   Applications/Text
 License: W3C Software License
@@ -11,7 +13,7 @@
 
 Source0: http://tidy.sourceforge.net/src/tidy_src_051025.tgz
 # When next snapshot is released, to become:
-#Source0: http://tidy.sourceforge.net/src/old/tidy_src_050803.tgz
+#Source0: http://tidy.sourceforge.net/src/old/tidy_src_051025.tgz
 
 Source1: http://tidy.sourceforge.net/docs/tidy_docs_051020.tgz
 
@@ -19,9 +21,6 @@
 BuildRequires: doxygen
 BuildRequires: libxslt
 
-Obsoletes: libtidy < %{version}-%{release}
-Provides:  libtidy = %{version}-%{release}
-
 %description
 When editing HTML it's easy to make mistakes. Wouldn't it be nice if
 there was a simple way to fix these mistakes automatically and tidy up
@@ -32,13 +31,19 @@
 identify where you need to pay further attention on making your pages
 more accessible to people with disabilities.
 
-%package devel
-Summary: Development files for %{name} 
+%package -n %{libname} 
+Summary: Shared libraries for tidy
+Group:	 System Environment/Libraries
+%description -n %{libname} 
+%{summary}.
+
+%package -n %{libname}-devel
+Summary: Development files for libtidy 
 Group:   Development/Libraries
-Obsoletes: libtidy-devel < %{version}-%{release}
-Provides:  libtidy-devel = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
-%description devel
+Obsoletes: tidy-devel < %{version}-%{release}
+Provides:  tidy-devel = %{version}-%{release}
+Requires: %{libname} = %{version}-%{release}
+%description -n %{libname}-devel
 %{summary}.
 
 
@@ -72,9 +77,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT 
 
-make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
-install -D -p -m644 htmldoc/tidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
+install -p -m644 -D htmldoc/tidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
 
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -84,9 +89,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
 
 %files
@@ -94,9 +99,12 @@
 %doc htmldoc/*.html htmldoc/*.css htmldoc/*.gif
 %{_bindir}/*
 %{_mandir}/man1/*
+
+%files -n %{libname} 
+%defattr(-,root,root,-)
 %{_libdir}/lib*.so.*
 
-%files devel
+%files -n %{libname}-devel
 %defattr(-,root,root,-)
 %doc htmldoc/api/*
 %{_includedir}/*
@@ -104,6 +112,9 @@
 
 
 %changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-9.20051025
+- libtidy returns to be multilib friendly
+
 * Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-8.20051025
 - Update to 051025 and docs to 051020
 



From fedora-extras-commits at redhat.com  Fri Jan 20 18:43:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 20 Jan 2006 13:43:46 -0500
Subject: rpms/lyx/FC-4 lyx.spec,1.15,1.16
Message-ID: <200601201844.k0KIiIeE021386@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21365

Modified Files:
	lyx.spec 
Log Message:
typo, {?fedora} -> %{?fedora}



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- lyx.spec	20 Jan 2006 17:53:07 -0000	1.15
+++ lyx.spec	20 Jan 2006 18:43:46 -0000	1.16
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.3.7 
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -32,7 +32,7 @@
 # xforms frontend
 BuildRequires: xforms-devel
 BuildRequires: libjpeg-devel
-%if "{?fedora}" > "4"
+%if "%{?fedora}" > "4"
 BuildRequires: libXpm-devel
 %endif
 
@@ -219,7 +219,7 @@
 
 
 %changelog
-* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-5
 - cleanup/fix snarfing of intermediate frontend builds.
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2



From fedora-extras-commits at redhat.com  Fri Jan 20 18:57:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 20 Jan 2006 13:57:33 -0500
Subject: rpms/perl-Module-Signature/FC-4 .cvsignore, 1.4,
	1.5 perl-Module-Signature.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601201858.k0KIw5Mr021522@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482/FC-4

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
- 0.52.
- Run non-live tests during build and make live ones optional, enabled
  when building with "--with livetests".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2006 16:41:35 -0000	1.4
+++ .cvsignore	20 Jan 2006 18:57:32 -0000	1.5
@@ -1 +1 @@
-Module-Signature-0.51.tar.gz
+Module-Signature-0.52.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/perl-Module-Signature.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Module-Signature.spec	2 Jan 2006 16:41:35 -0000	1.4
+++ perl-Module-Signature.spec	20 Jan 2006 18:57:32 -0000	1.5
@@ -1,8 +1,12 @@
 # Must use expand to ensure mktemp is run only once
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
+# Yep, this is a noarch package, but this is to avoid debug*.list which
+# interfere with some of the signature tests.
+%define debug_package %{nil}
+
 Name:           perl-Module-Signature
-Version:        0.51
+Version:        0.52
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -31,6 +35,7 @@
 
 %build
 mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg
+PERL_AUTOINSTALL=--skipdeps \
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
 
@@ -45,9 +50,7 @@
 
 %check
 export GNUPGHOME=%{mytempdir}/_gnupg
-for f in debug*.list ; do test -e $f && mv $f %{mytempdir} ; done
-# make test # would require network access
-for f in %{mytempdir}/debug*.list ; do test -e $f && mv $f . ; done
+make test %{!?_with_livetests:TEST_FILES=t/1-basic.t}
 
 
 %clean
@@ -56,13 +59,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS Changes README TODO *.pub
+%doc AUTHORS Changes README *.pub
 %{_bindir}/cpansign
 %{perl_vendorlib}/Module/
 %{_mandir}/man[13]/*.[13]*
 
 
 %changelog
+* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
+- 0.52.
+- Run non-live tests during build and make live ones optional, enabled
+  when building with "--with livetests".
+
 * Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
 - 0.51.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 16:41:35 -0000	1.4
+++ sources	20 Jan 2006 18:57:32 -0000	1.5
@@ -1 +1 @@
-c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz
+4f5ce59239561f1f0c29efb1b485744b  Module-Signature-0.52.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 18:57:38 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 20 Jan 2006 13:57:38 -0500
Subject: rpms/perl-Module-Signature/devel .cvsignore, 1.5,
	1.6 perl-Module-Signature.spec, 1.5, 1.6 sources, 1.5, 1.6
Message-ID: <200601201858.k0KIwBdP021527@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Module-Signature/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482/devel

Modified Files:
	.cvsignore perl-Module-Signature.spec sources 
Log Message:
* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
- 0.52.
- Run non-live tests during build and make live ones optional, enabled
  when building with "--with livetests".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 16:41:41 -0000	1.5
+++ .cvsignore	20 Jan 2006 18:57:38 -0000	1.6
@@ -1 +1 @@
-Module-Signature-0.51.tar.gz
+Module-Signature-0.52.tar.gz


Index: perl-Module-Signature.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/perl-Module-Signature.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Module-Signature.spec	2 Jan 2006 16:41:41 -0000	1.5
+++ perl-Module-Signature.spec	20 Jan 2006 18:57:38 -0000	1.6
@@ -1,8 +1,12 @@
 # Must use expand to ensure mktemp is run only once
 %{expand: %%define mytempdir %(mktemp -d %{_tmppath}/tmp.XXXXXX)}
 
+# Yep, this is a noarch package, but this is to avoid debug*.list which
+# interfere with some of the signature tests.
+%define debug_package %{nil}
+
 Name:           perl-Module-Signature
-Version:        0.51
+Version:        0.52
 Release:        1%{?dist}
 Summary:        CPAN signature management utilities and modules
 
@@ -31,6 +35,7 @@
 
 %build
 mkdir -m 700 %{mytempdir}/_gnupg ; export GNUPGHOME=%{mytempdir}/_gnupg
+PERL_AUTOINSTALL=--skipdeps \
 %{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
 
@@ -45,9 +50,7 @@
 
 %check
 export GNUPGHOME=%{mytempdir}/_gnupg
-for f in debug*.list ; do test -e $f && mv $f %{mytempdir} ; done
-# make test # would require network access
-for f in %{mytempdir}/debug*.list ; do test -e $f && mv $f . ; done
+make test %{!?_with_livetests:TEST_FILES=t/1-basic.t}
 
 
 %clean
@@ -56,13 +59,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS Changes README TODO *.pub
+%doc AUTHORS Changes README *.pub
 %{_bindir}/cpansign
 %{perl_vendorlib}/Module/
 %{_mandir}/man[13]/*.[13]*
 
 
 %changelog
+* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.52-1
+- 0.52.
+- Run non-live tests during build and make live ones optional, enabled
+  when building with "--with livetests".
+
 * Mon Jan  2 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.51-1
 - 0.51.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Signature/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 16:41:41 -0000	1.5
+++ sources	20 Jan 2006 18:57:38 -0000	1.6
@@ -1 +1 @@
-c7d5381ac01308564ffee8c1b040f648  Module-Signature-0.51.tar.gz
+4f5ce59239561f1f0c29efb1b485744b  Module-Signature-0.52.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 20 19:21:01 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 20 Jan 2006 14:21:01 -0500
Subject: owners owners.list,1.555,1.556
Message-ID: <200601201921.k0KJLXM5023422@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23403

Modified Files:
	owners.list 
Log Message:
Sync with Wiki (and hopefully reality).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.555
retrieving revision 1.556
diff -u -r1.555 -r1.556
--- owners.list	20 Jan 2006 16:08:05 -0000	1.555
+++ owners.list	20 Jan 2006 19:21:01 -0000	1.556
@@ -156,7 +156,7 @@
 Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org|
 Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|dhcp-forwarder|A DHCP relay agent|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|diag-ether|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|diction|Identifies diction and style errors|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org|
@@ -315,7 +315,7 @@
 Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-sudoku|GNOME based Sudoku, a logic puzzle game|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-telnet|A fancy GNOME telnet client|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -355,7 +355,7 @@
 Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
-Fedora Extras|gtkglarea2|An OpenGL GTK widget|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
@@ -389,7 +389,7 @@
 Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|hpic|Healpix manipulation binaries and library|matt at truch.net|extras-qa at fedoraproject.org|
-Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|kuko at maarmas.com|extras-qa at fedoraproject.org|
+Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|extras-qa at fedoraproject.org|
 Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -602,7 +602,7 @@
 Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org
 Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org|
-Fedora Extras|manedit|GUI editor for creating man pages.|nos at utelsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mantis|A web-based bugtracking system|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mathml-fonts|Mathematical symbol fonts|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|maxima|Symbolic Computation Program|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -619,7 +619,7 @@
 Fedora Extras|milter-greylist|Milter for greylisting, the next step in the spam control war|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|mimetex|Easily embed LaTeX math in web pages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|mimetic|A full featured MIME library written in C++|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
-Fedora Extras|mknbi|Utility for creating network bootable images|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org|
 Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
@@ -655,7 +655,7 @@
 Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|net6|A TCP protocol abstraction for library C++|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|
-Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|netdiag|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|netgo|Networking profile manager|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack|A rogue-like single player dungeon exploration game|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.org|extras-qa at fedoraproject.org|
@@ -1006,7 +1006,7 @@
 Fedora Extras|pptp|Point-to-Point Tunneling Protocol (PPTP) Client|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|proftpd|Flexible, stable and highly-configurable FTP server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|proj|Cartographic projection software (PROJ.4)|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|prozilla|An advanced Linux download manager|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|prozilla|An advanced Linux download manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pscan|Limited problem scanner for C source files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|psi|Jabber client using Qt 3|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 19:41:49 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Fri, 20 Jan 2006 14:41:49 -0500
Subject: owners owners.list,1.556,1.557
Message-ID: <200601201942.k0KJgMKu023509@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23485

Modified Files:
	owners.list 
Log Message:
tla has been orphaned for a while; Ville reminded me to fix the email address



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- owners.list	20 Jan 2006 19:21:01 -0000	1.556
+++ owners.list	20 Jan 2006 19:41:49 -0000	1.557
@@ -1238,7 +1238,7 @@
 Fedora Extras|tkcvs|TkCVS and TkDiff|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|tklib|Useful extensions for Tk|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tktable|Table/matrix widget extension to Tcl/Tk|jfontain at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|tla|The Low-Budget arch Revision Control System|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|tla|The Low-Budget arch Revision Control System|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tomoe|Japanese handwritten input system|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Jan 20 20:27:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 20 Jan 2006 15:27:29 -0500
Subject: rpms/allegro/devel allegro.spec,1.18,1.19
Message-ID: <200601202028.k0KKS23Z025344@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25325

Modified Files:
	allegro.spec 
Log Message:
update / fix BuildRequires for modular X


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- allegro.spec	16 Dec 2005 09:29:20 -0000	1.18
+++ allegro.spec	20 Jan 2006 20:27:28 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        2
+Release:        3
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -16,7 +16,9 @@
 Patch2:         allegro-4.0.3-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
-BuildRequires:  libX11-devel, libXext-devel, libXau, libXdmcp
+BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
+BuildRequires:  libXpm-devel, libXcursor-devel, libXxf86vm-devel
+BuildRequires:  libXxf86dga-devel
 
 %description
 Allegro is a cross-platform library intended for use in computer games
@@ -45,8 +47,8 @@
 Summary(it):    Una libreria per la programmazione di videogiochi
 Summary(cz):    Knihovna pro programov??n?? her
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}, libX11-devel
-Requires:       libXext-devel, libXau, libXdmcp
+Requires:       %{name} = %{version}-%{release}, xorg-x11-proto-devel
+Requires:       libX11-devel, libXcursor-devel
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -204,6 +206,9 @@
 
 
 %changelog
+* Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-3
+- update / fix BuildRequires for modular X
+
 * Fri Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 4.2.0-2
 - update dependencies for the new modular X
 - disable _smp_mflags to workaround build failure caused



From fedora-extras-commits at redhat.com  Fri Jan 20 21:36:14 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Fri, 20 Jan 2006 16:36:14 -0500
Subject: rpms/xchat-gnome/devel .cvsignore, 1.6, 1.7 sources, 1.6,
	1.7 xchat-gnome.spec, 1.11, 1.12 xchat-gnome-certificates.patch,
	1.1, NONE
Message-ID: <200601202136.k0KLalHo027324@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27301

Modified Files:
	.cvsignore sources xchat-gnome.spec 
Removed Files:
	xchat-gnome-certificates.patch 
Log Message:
* Fri Jan 20 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-1
- Update to 0.9.
- Add BR for libnotify-devel.
- Drop certificates patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Dec 2005 21:16:11 -0000	1.6
+++ .cvsignore	20 Jan 2006 21:36:14 -0000	1.7
@@ -1 +1 @@
-xchat-gnome-0.8.tar.bz2
+xchat-gnome-0.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Dec 2005 21:16:11 -0000	1.6
+++ sources	20 Jan 2006 21:36:14 -0000	1.7
@@ -1 +1 @@
-048f0bb530bc2afce43aff6eb9538554  xchat-gnome-0.8.tar.bz2
+607d36afbadd35a163464b3f39c93526  xchat-gnome-0.9.tar.bz2


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xchat-gnome.spec	30 Dec 2005 17:53:20 -0000	1.11
+++ xchat-gnome.spec	20 Jan 2006 21:36:14 -0000	1.12
@@ -1,12 +1,9 @@
-%if "%fedora" >= "5"
-    %define with_dbus 1
-%else
-    %define with_dbus 0
-%endif
+%define with_dbus 1
+%define with_libnotify 1
 
 Name:           xchat-gnome
-Version:        0.8
-Release:        2%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -14,7 +11,6 @@
 URL:            http://%{name}.navi.cx/
 Source0:        http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-certificates.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -31,6 +27,11 @@
 BuildRequires:	dbus-devel
 %endif
 
+# Leave as conditional until API is more stable.
+%if %{with_libnotify}
+BuildRequires:	libnotify-devel
+%endif
+
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 
@@ -52,7 +53,6 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
-%patch1 -p0 -b .certificates
 
 
 %build
@@ -134,6 +134,11 @@
 
 
 %changelog
+* Fri Jan 20 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-1
+- Update to 0.9.
+- Add BR for libnotify-devel.
+- Drop certificates patch.
+
 * Fri Dec 30 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-2
 - add patch for self-signed certificate acceptance. (#174591)
 


--- xchat-gnome-certificates.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 21 01:09:27 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 20 Jan 2006 20:09:27 -0500
Subject: rpms/celestia/devel celestia.spec,1.12,1.13
Message-ID: <200601210110.k0L1A0Ae002324@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304

Modified Files:
	celestia.spec 
Log Message:
More build fixes.


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- celestia.spec	19 Jan 2006 18:21:11 -0000	1.12
+++ celestia.spec	21 Jan 2006 01:09:26 -0000	1.13
@@ -17,8 +17,9 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
+BuildRequires:  libXmu-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -41,6 +42,7 @@
 
 
 %build
+export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -98,7 +100,8 @@
 
 %changelog
 * Thu Jan 05 2006 Steven Pritchard <steve at kspei.com> 1.4.0-2
-- Add BR: libXt-devel
+- Add BR: libGLU-devel, libXt-devel, libXmu-devel
+- Add -lpangox-1.0 to GTK_LIBS
 
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0



From fedora-extras-commits at redhat.com  Sat Jan 21 01:38:18 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri, 20 Jan 2006 20:38:18 -0500
Subject: fedora-security/audit fc4,1.131,1.132
Message-ID: <200601210138.k0L1cI5u002424@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2406

Modified Files:
	fc4 
Log Message:
Note the FC4 httpd update. (FEDORA-2006-052)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- fc4	18 Jan 2006 13:51:40 -0000	1.131
+++ fc4	21 Jan 2006 01:38:10 -0000	1.132
@@ -95,9 +95,9 @@
 CVE-2005-3389 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3358 version (kernel, fixed 2.6.11)
-CVE-2005-3357 VULNERABLE (httpd, fixed 2.0.56)
+CVE-2005-3357 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
-CVE-2005-3352 VULNERABLE (httpd, fixed 2.0.56)
+CVE-2005-3352 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]
 CVE-2005-3350 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-3322 version (squid, not upstream) SUSE only
@@ -168,7 +168,7 @@
 CVE-2005-2975 backport (gdk-pixbuf) [since FEDORA-2005-1085]
 CVE-2005-2974 version (libungif, fixed 4.1.3) [since FEDORA-2005-1046]
 CVE-2005-2973 version (kernel, 2.6.14 at least) [since FEODRA-2005-1067]
-CVE-2005-2970 VULNERABLE (httpd) bz#171759
+CVE-2005-2970 backport (httpd) bz#171759 [since FEDORA-2006-052]
 CVE-2005-2969 backport (openssl097a, fixed 0.9.7h) [since FEDORA-2005-986]
 CVE-2005-2969 backport (openssl, fixed 0.9.7h) [since FEDORA-2005-986]
 CVE-2005-2968 version (thunderbird) [since FEDORA-2005-963]



From fedora-extras-commits at redhat.com  Sat Jan 21 05:15:10 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 21 Jan 2006 00:15:10 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.12,1.13
Message-ID: <200601210515.k0L5FhAn009868@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9851

Modified Files:
	xchat-gnome.spec 
Log Message:
* Sat Jan 21 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-2
- Add xchat_gnome_url_handler.schemas to scriptlet.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xchat-gnome.spec	20 Jan 2006 21:36:14 -0000	1.12
+++ xchat-gnome.spec	21 Jan 2006 05:15:10 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:           xchat-gnome
 Version:        0.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -81,18 +81,20 @@
 
 %pre
 if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
-    	gconftool-2 --makefile-uninstall-rule \
-      	    %{_sysconfdir}/gconf/schemas/$i >/dev/null || :
-    done
-    killall -HUP gconfd-2 || :
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+    	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i >/dev/null || :
+	done
+	killall -HUP gconfd-2 || :
 fi
 
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
+SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+for i in $SCHEMAS; do
 	gconftool-2 --makefile-install-rule \
 		 %{_sysconfdir}/gconf/schemas/$i > /dev/null || :
 done
@@ -102,12 +104,13 @@
 
 %preun
 if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    for i in apps_xchat.schemas notification.schemas urlscraper.schemas; do
-    	gconftool-2 --makefile-uninstall-rule \
-      		%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
-    done
-    killall -HUP gconfd-2 || :
+	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+	SCHEMAS="apps_xchat.schemas notification.schemas urlscraper.schemas xchat_gnome_url_handler.schemas"
+	for i in $SCHEMAS; do
+		gconftool-2 --makefile-uninstall-rule \
+			%{_sysconfdir}/gconf/schemas/$i > /dev/null || :
+	done
+	killall -HUP gconfd-2 || :
 fi
 
 
@@ -134,6 +137,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-2
+- Add xchat_gnome_url_handler.schemas to scriptlet.
+
 * Fri Jan 20 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-1
 - Update to 0.9.
 - Add BR for libnotify-devel.



From fedora-extras-commits at redhat.com  Sat Jan 21 05:18:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 21 Jan 2006 00:18:23 -0500
Subject: rpms/tclhttpd/FC-3 tclhttpd.spec,1.2,1.3
Message-ID: <200601210518.k0L5Itjo009963@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9916/FC-3

Modified Files:
	tclhttpd.spec 
Log Message:
Don't attempt to create the tclhttpd user if it already exists.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd.spec	16 Jan 2006 01:48:31 -0000	1.2
+++ tclhttpd.spec	21 Jan 2006 05:18:23 -0000	1.3
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -88,7 +88,10 @@
 %pre
 # The "tclhttpd" user is used so that we don't have to run the
 # server as "root" or "nobody".
-/usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -r -d %{contentdir} tclhttpd
+user_uid=`id -u tclhttpd 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+fi
 
 %post
 /sbin/chkconfig --add tclhttpd



From fedora-extras-commits at redhat.com  Sat Jan 21 05:18:29 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 21 Jan 2006 00:18:29 -0500
Subject: rpms/tclhttpd/FC-4 tclhttpd.spec,1.2,1.3
Message-ID: <200601210519.k0L5J12c009966@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9916/FC-4

Modified Files:
	tclhttpd.spec 
Log Message:
Don't attempt to create the tclhttpd user if it already exists.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd.spec	16 Jan 2006 01:48:37 -0000	1.2
+++ tclhttpd.spec	21 Jan 2006 05:18:28 -0000	1.3
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -88,7 +88,10 @@
 %pre
 # The "tclhttpd" user is used so that we don't have to run the
 # server as "root" or "nobody".
-/usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -r -d %{contentdir} tclhttpd
+user_uid=`id -u tclhttpd 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+fi
 
 %post
 /sbin/chkconfig --add tclhttpd



From fedora-extras-commits at redhat.com  Sat Jan 21 05:18:34 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 21 Jan 2006 00:18:34 -0500
Subject: rpms/tclhttpd/devel tclhttpd.spec,1.2,1.3
Message-ID: <200601210519.k0L5J72k009969@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9916/devel

Modified Files:
	tclhttpd.spec 
Log Message:
Don't attempt to create the tclhttpd user if it already exists.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd.spec	16 Jan 2006 01:35:32 -0000	1.2
+++ tclhttpd.spec	21 Jan 2006 05:18:34 -0000	1.3
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -88,7 +88,10 @@
 %pre
 # The "tclhttpd" user is used so that we don't have to run the
 # server as "root" or "nobody".
-/usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -r -d %{contentdir} tclhttpd
+user_uid=`id -u tclhttpd 2>/dev/null`
+if [ x"$user_uid" = x ] ; then
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+fi
 
 %post
 /sbin/chkconfig --add tclhttpd



From fedora-extras-commits at redhat.com  Sat Jan 21 08:08:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Jan 2006 03:08:43 -0500
Subject: rpms/allegro/devel allegro.spec,1.19,1.20
Message-ID: <200601210809.k0L89Gmd015532@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15518

Modified Files:
	allegro.spec 
Log Message:
Add bz ticket nr to changelog


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- allegro.spec	20 Jan 2006 20:27:28 -0000	1.19
+++ allegro.spec	21 Jan 2006 08:08:41 -0000	1.20
@@ -207,7 +207,7 @@
 
 %changelog
 * Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-3
-- update / fix BuildRequires for modular X
+- update / fix BuildRequires for modular X (bz 178245)
 
 * Fri Dec 16 2005 Jindrich Novy <jnovy at redhat.com> 4.2.0-2
 - update dependencies for the new modular X



From fedora-extras-commits at redhat.com  Sat Jan 21 08:13:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 21 Jan 2006 03:13:21 -0500
Subject: rpms/gnumeric/devel gnumeric.spec,1.13,1.14
Message-ID: <200601210813.k0L8DsIQ015597@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15580

Modified Files:
	gnumeric.spec 
Log Message:
* Sat Jan 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-3
- Cleanup Requires
- Add (missing) call of gtk-update-icon-cache to %post and %postun



Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnumeric.spec	14 Dec 2005 07:59:08 -0000	1.13
+++ gnumeric.spec	21 Jan 2006 08:13:21 -0000	1.14
@@ -1,19 +1,13 @@
 Summary:        A spreadsheet program for GNOME.
 Name:     	gnumeric
 Version: 	1.6.1
-Release: 	2
+Release: 	3
 Epoch:		1
 License:	GPL
 Group:		Applications/Productivity
 Source: 	ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.2/gnumeric-%{version}.tar.bz2
 URL:		http://www.gnome.org/gnumeric/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Requires:       libgnomeui >= 2.8.2
-Requires:       libgnomeprintui22 >= 2.8.2
-Requires:       gtk2 >= 2.6.0
-Requires:  	libgnomedb >= 1.0.4
-PreReq:         desktop-file-utils >= 0.9
 BuildRequires:  desktop-file-utils >= 0.9
 BuildRequires:  libgnomeui-devel >= 2.4.0
 BuildRequires:  libgnomeprintui22-devel >= 2.8.2
@@ -102,10 +96,18 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 /usr/bin/gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnumeric*.schemas > /dev/null 2>&1
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %postun
 /sbin/ldconfig
 if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
@@ -132,6 +134,10 @@
 %{_datadir}/gnumeric/%{version}/idl/*.idl
 
 %changelog
+* Sat Jan 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-3
+- Cleanup Requires
+- Add (missing) call of gtk-update-icon-cache to %%post and %%postun
+
 * Thu Dec  8 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.1-2
 - Switch to core version of libgsf now Core has 1.13 instead of using special
   Extras libgsf113 version.



From fedora-extras-commits at redhat.com  Sat Jan 21 08:43:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 21 Jan 2006 03:43:43 -0500
Subject: rpms/scribus/FC-4 scribus.spec,1.15,1.16
Message-ID: <200601210844.k0L8iF69015811@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15791

Modified Files:
	scribus.spec 
Log Message:
- rebuild



Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/FC-4/scribus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scribus.spec	19 Jan 2006 08:19:29 -0000	1.15
+++ scribus.spec	21 Jan 2006 08:43:42 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.2.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -136,8 +136,12 @@
 
 
 %changelog
+* Sat Jan 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.4.1-2
+- rebuild (#178494)
+
 * Wed Jan 18 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.2.4.1
+1.2.4.1-1
 - version upgrade
 
 * Thu Jul 7 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.2.1-2



From fedora-extras-commits at redhat.com  Sat Jan 21 12:32:26 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sat, 21 Jan 2006 07:32:26 -0500
Subject: owners owners.list,1.557,1.558
Message-ID: <200601211232.k0LCWwUb024677@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24660

Modified Files:
	owners.list 
Log Message:
Peter Lemenkov takes over fuse and fuse-sshfs; He already maintains fuse-encfs in FE and seems to be a lot more interested in it than I am.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.557
retrieving revision 1.558
diff -u -r1.557 -r1.558
--- owners.list	20 Jan 2006 19:41:49 -0000	1.557
+++ owners.list	21 Jan 2006 12:32:25 -0000	1.558
@@ -238,9 +238,9 @@
 Fedora Extras|freeze|freeze/melt/fcat compression utilities|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|
 Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org|
+Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|fuse|File System in Userspace|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fwbuilder|Firewall Builder|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|fwrestart|A way to more safely re-load firewall rules remotely|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|fyre|A tool for creating artwork from chaotic functions|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 21 15:13:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 21 Jan 2006 10:13:25 -0500
Subject: rpms/lirc/devel .cvsignore, 1.9, 1.10 lirc.spec, 1.13, 1.14 sources,
	1.9, 1.10
Message-ID: <200601211514.k0LFE3XW030373@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30350

Modified Files:
	.cvsignore lirc.spec sources 
Log Message:
* Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
- 0.8.0.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	14 Jan 2006 19:34:32 -0000	1.9
+++ .cvsignore	21 Jan 2006 15:13:25 -0000	1.10
@@ -1 +1 @@
-lirc-0.8.0pre4.tar.bz2
+lirc-0.8.0.tar.bz2


Index: lirc.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/lirc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lirc.spec	14 Jan 2006 19:34:32 -0000	1.13
+++ lirc.spec	21 Jan 2006 15:13:25 -0000	1.14
@@ -10,14 +10,13 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre4%{?dist}
+Release:        2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-#Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre4.tar.bz2
+Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +50,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}pre4
+%setup -q
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +138,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
+- 0.8.0.
+
 * Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
 - 0.8.0pre4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	14 Jan 2006 19:34:32 -0000	1.9
+++ sources	21 Jan 2006 15:13:25 -0000	1.10
@@ -1 +1 @@
-8e69494b32a14d7513499bd7d4a350d2  lirc-0.8.0pre4.tar.bz2
+0bf28bf82c7766a462f90927b6bf3af1  lirc-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 16:58:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 11:58:48 -0500
Subject: rpms/showimg/FC-4 showimg.spec,1.5,1.6
Message-ID: <200601211659.k0LGxKig002021@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1950/FC-4

Modified Files:
	showimg.spec 
Log Message:
- work around improper QT detection


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- showimg.spec	16 Jan 2006 08:27:04 -0000	1.5
+++ showimg.spec	21 Jan 2006 16:58:48 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -53,6 +53,7 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath \
            --disable-debug \
            --enable-libkipi \



From fedora-extras-commits at redhat.com  Sat Jan 21 16:58:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 11:58:54 -0500
Subject: rpms/showimg/devel showimg.spec,1.5,1.6
Message-ID: <200601211659.k0LGxQlT002031@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1950/devel

Modified Files:
	showimg.spec 
Log Message:
- work around improper QT detection


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- showimg.spec	16 Jan 2006 08:27:10 -0000	1.5
+++ showimg.spec	21 Jan 2006 16:58:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -53,6 +53,7 @@
 
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure --disable-rpath \
            --disable-debug \
            --enable-libkipi \



From fedora-extras-commits at redhat.com  Sat Jan 21 17:04:14 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 21 Jan 2006 12:04:14 -0500
Subject: rpms/azureus/devel azureus.script,1.1,1.2 azureus.spec,1.3,1.4
Message-ID: <200601211704.k0LH4kp9003951@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3919

Modified Files:
	azureus.script azureus.spec 
Log Message:
Fix startup script.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus.script	19 Jan 2006 23:08:02 -0000	1.1
+++ azureus.script	21 Jan 2006 17:04:07 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main $*
+CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus.spec	20 Jan 2006 05:22:31 -0000	1.3
+++ azureus.spec	21 Jan 2006 17:04:07 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -144,6 +144,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-16
+- Use "$@" instead of $* in azureus.script (thanks ivazquez).
+
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-15
 - Remove PrintTransferTypes, which is unused and not 64-bit clean.
 



From fedora-extras-commits at redhat.com  Sat Jan 21 17:16:38 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:16:38 -0500
Subject: rpms/showimg/FC-4 showimg.spec,1.6,1.7
Message-ID: <200601211717.k0LHHBfZ004138@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4099/FC-4

Modified Files:
	showimg.spec 
Log Message:
forgot to add changelog entry...


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- showimg.spec	21 Jan 2006 16:58:48 -0000	1.6
+++ showimg.spec	21 Jan 2006 17:16:38 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
+- fix improper QT detection
+
 * Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
 - version 0.9.5
 



From fedora-extras-commits at redhat.com  Sat Jan 21 17:16:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:16:44 -0500
Subject: rpms/showimg/devel showimg.spec,1.6,1.7
Message-ID: <200601211717.k0LHHGhM004143@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4099/devel

Modified Files:
	showimg.spec 
Log Message:
forgot to add changelog entry...


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- showimg.spec	21 Jan 2006 16:58:54 -0000	1.6
+++ showimg.spec	21 Jan 2006 17:16:44 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -121,6 +121,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
+- fix improper QT detection
+
 * Sat Jan 14 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-1
 - version 0.9.5
 



From fedora-extras-commits at redhat.com  Sat Jan 21 17:26:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:26:47 -0500
Subject: rpms/grisbi/FC-4 .cvsignore, 1.5, 1.6 grisbi.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200601211727.k0LHRJbs004243@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/grisbi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4205/FC-4

Modified Files:
	.cvsignore grisbi.spec sources 
Log Message:
- version 0.5.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jun 2005 19:58:59 -0000	1.5
+++ .cvsignore	21 Jan 2006 17:26:46 -0000	1.6
@@ -1 +1 @@
-grisbi-0.5.7.tar.bz2
+grisbi-0.5.8.tar.bz2


Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-4/grisbi.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grisbi.spec	11 Jun 2005 19:58:59 -0000	1.8
+++ grisbi.spec	21 Jan 2006 17:26:46 -0000	1.9
@@ -1,6 +1,6 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
-Version:	0.5.7
+Version:	0.5.8
 Release:	1%{?dist}
 Summary:	Personal finances manager
 
@@ -112,6 +112,12 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.5.8-1
+- version 0.5.8
+
+* Fri Dec 23 2005 Bill Nottingham <notting at redhat.com> 0.5.7-2
+- rebuild against new libofx
+
 * Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 0.5.7-1
 - version 0.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grisbi/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jun 2005 19:58:59 -0000	1.5
+++ sources	21 Jan 2006 17:26:46 -0000	1.6
@@ -1 +1 @@
-571e5b08ee9477c2adec459fb4d99625  grisbi-0.5.7.tar.bz2
+6637c02bfad46ac061b9d0e91e404721  grisbi-0.5.8.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 17:26:52 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 21 Jan 2006 12:26:52 -0500
Subject: rpms/grisbi/devel .cvsignore, 1.5, 1.6 grisbi.spec, 1.9,
	1.10 sources, 1.5, 1.6
Message-ID: <200601211727.k0LHRPZL004248@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/grisbi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4205/devel

Modified Files:
	.cvsignore grisbi.spec sources 
Log Message:
- version 0.5.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jun 2005 19:58:59 -0000	1.5
+++ .cvsignore	21 Jan 2006 17:26:52 -0000	1.6
@@ -1 +1 @@
-grisbi-0.5.7.tar.bz2
+grisbi-0.5.8.tar.bz2


Index: grisbi.spec
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/grisbi.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grisbi.spec	24 Dec 2005 03:44:37 -0000	1.9
+++ grisbi.spec	21 Jan 2006 17:26:52 -0000	1.10
@@ -1,7 +1,7 @@
 %define GRISBI_HELP_DIR %{_datadir}/doc/%{name}/help
 Name:		grisbi
-Version:	0.5.7
-Release:	2%{?dist}
+Version:	0.5.8
+Release:	1%{?dist}
 Summary:	Personal finances manager
 
 Group:		Applications/Productivity
@@ -112,6 +112,9 @@
 %ghost %{_datadir}/doc/%{name}/help/fr/grisbi-manuel.html
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.5.8-1
+- version 0.5.8
+
 * Fri Dec 23 2005 Bill Nottingham <notting at redhat.com> 0.5.7-2
 - rebuild against new libofx
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/grisbi/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jun 2005 19:58:59 -0000	1.5
+++ sources	21 Jan 2006 17:26:52 -0000	1.6
@@ -1 +1 @@
-571e5b08ee9477c2adec459fb4d99625  grisbi-0.5.7.tar.bz2
+6637c02bfad46ac061b9d0e91e404721  grisbi-0.5.8.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 17:33:50 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 21 Jan 2006 12:33:50 -0500
Subject: extras-buildsys/utils extras-sign-move.py,1.4,1.5
Message-ID: <200601211733.k0LHXoYg004322@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4304

Modified Files:
	extras-sign-move.py 
Log Message:
Make error codes more distinguishable.


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- extras-sign-move.py	2 Nov 2005 14:37:45 -0000	1.4
+++ extras-sign-move.py	21 Jan 2006 17:33:43 -0000	1.5
@@ -156,7 +156,7 @@
 def main(dist):
     if not archdict.has_key(dist):
         print "No Distribution named %s found" % dist
-        sys.exit(1)
+        sys.exit(5)
     distdir = 'fedora-%s-extras' % dist    
     needsign = os.path.join(stagesdir, distdir)
     files = find_files(needsign)
@@ -178,7 +178,7 @@
     rpms = files['rpm'] + files['srpm'] + files['debuginfo']
     if len(rpms) == 0:
       print 'nothing to sign'
-      sys.exit(1)
+      sys.exit(4)
 
     print "Signing Packages:"
     if not DEBUG:



From fedora-extras-commits at redhat.com  Sat Jan 21 18:18:59 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 21 Jan 2006 13:18:59 -0500
Subject: extras-buildsys/utils extras-repoview.py, NONE, 1.1 extras-push, 1.1,
	1.2 extras-repobuild.py, 1.9, 1.10 extras-sign-move.py, 1.5, 1.6
Message-ID: <200601211818.k0LIIxrD006250@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6227

Modified Files:
	extras-push extras-repobuild.py extras-sign-move.py 
Added Files:
	extras-repoview.py 
Log Message:
Sync with production.


--- NEW FILE extras-repoview.py ---
#!/usr/bin/python -t
# 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 Library 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 St, Fifth Floor, Boston, MA  02110-1301  USA

import os
import sys
import shutil
import string

# get the path to where to look for the packages to be signed
# make repoview

treedir = '/rpmbuild/extras/tree/extras'
archdict = {'3':['x86_64', 'i386'], 
            'development':['ppc','x86_64','i386'],
            '4':['ppc','x86_64', 'i386']}


DEBUG = False

def debugprint(msg):
    if DEBUG:
        print msg
        

def run_and_check(cmd):
    debugprint(cmd)
    if not DEBUG:
        result = os.system(cmd)
        if result != 0:
            print >> sys.stderr, 'Error running command: %s ' % cmd
            sys.exit(result)


def do_repoview(repodir):
    print 'Generating repoview'
    cmd = '/usr/bin/repoview %s' % repodir
    run_and_check(cmd)            

    # if there's a debug subdir, make that a repo, too.
    dbg_repodir = os.path.join(repodir, 'debug')

    if os.path.exists(dbg_repodir):
        cmd = '/usr/bin/repoview %s' % dbg_repodir
        run_and_check(cmd)                    


def main(dist):
    if not archdict.has_key(dist):
        print "No Distribution named %s found" % dist
        sys.exit(1)
    
    destdir = os.path.join(treedir, dist)

    print "Making Repoview pages"

    do_repoview(os.path.join(destdir, 'SRPMS'))

    # arch repo creation
    for arch in archdict[dist]:
        repodir = os.path.join(destdir, arch)
        do_repoview(repodir)

if __name__ == '__main__':
    me = os.getcwd()
    if len(sys.argv) < 2:
        print "Usage:\nextras-repoview.py release\n\n"
        sys.exit(1)
    main(sys.argv[1])
    os.chdir(me)
    


Index: extras-push
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extras-push	17 Aug 2005 05:17:45 -0000	1.1
+++ extras-push	21 Jan 2006 18:18:51 -0000	1.2
@@ -5,5 +5,6 @@
    exit 1
 fi
 
-~/bin/extras-sign-move.py $1 && ~/bin/extras-repobuild.py $1
+~/bin/extras-sign-move.py $1 && ~/bin/extras-repobuild.py $1 && ~/bin/extras-repoview.py $1
+
 


Index: extras-repobuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- extras-repobuild.py	25 Nov 2005 17:45:22 -0000	1.9
+++ extras-repobuild.py	21 Jan 2006 18:18:51 -0000	1.10
@@ -11,7 +11,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
 import sys
@@ -70,10 +70,6 @@
         cmd = '/usr/bin/createrepo -c %s -q -x *debuginfo* %s' % (cachedir, repodir)
     
     run_and_check(cmd)            
-    
-    print 'Generating repoview'
-    cmd = '/usr/bin/repoview %s' % repodir
-    run_and_check(cmd)            
 
     # if there's a debug subdir, make that a repo, too.
     dbg_repodir = os.path.join(repodir, 'debug')
@@ -88,9 +84,6 @@
     
         cmd = '/usr/bin/createrepo -c %s -q %s' % (cachedir, dbg_repodir)
         run_and_check(cmd)            
-            
-        cmd = '/usr/bin/repoview %s' % dbg_repodir
-        run_and_check(cmd)                    
 
 
 def main(dist):
@@ -102,8 +95,7 @@
 
     print "Making Repository Metadata"
 
-    repodir = os.path.join(destdir, 'SRPMS')
-    do_repo_stuff(repodir)
+    do_repo_stuff(os.path.join(destdir, 'SRPMS'))
 
     # arch repo creation
     for arch in archdict[dist]:


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- extras-sign-move.py	21 Jan 2006 17:33:43 -0000	1.5
+++ extras-sign-move.py	21 Jan 2006 18:18:51 -0000	1.6
@@ -11,7 +11,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import os
 import sys
@@ -19,7 +19,6 @@
 import smtplib
 import shutil
 import string
-import tempfile
 from email.MIMEText import MIMEText
 
 
@@ -126,10 +125,7 @@
     s.connect()
     s.sendmail(mail_from, [mail_to], msg.as_string())
     s.close()
-    
-
-
-
+        
 def sign_pkgs(filelist):
     """gpg sign all the rpms"""
     numfiles = len(filelist)
@@ -166,8 +162,6 @@
       print ' %s' % os.path.basename(item)
 
     destdir = os.path.join(treedir, dist)
-    tmpdir = tempfile.mkdtemp(prefix=dist, dir='/var/tmp')
-    
     if not os.path.exists(destdir):
         for arch in archdict[dist]:
             if not DEBUG:
@@ -260,7 +254,7 @@
         if not DEBUG:
             os.unlink(file)
         
-    
+    # FIXME clean up empty dirs, too.
     
 if __name__ == '__main__':
     me = os.getcwd()



From fedora-extras-commits at redhat.com  Sat Jan 21 20:15:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:15:31 -0500
Subject: rpms/xfce4-taskmanager - New directory
Message-ID: <200601212015.k0LKFXDs010216@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10208/xfce4-taskmanager

Log Message:
Directory /cvs/extras/rpms/xfce4-taskmanager added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:15:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:15:36 -0500
Subject: rpms/xfce4-taskmanager/devel - New directory
Message-ID: <200601212015.k0LKFcT8010231@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10208/xfce4-taskmanager/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-taskmanager/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:15:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:15:58 -0500
Subject: rpms/xfce4-taskmanager Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212016.k0LKG0Cl010265@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-taskmanager


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-taskmanager
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:16:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:16:04 -0500
Subject: rpms/xfce4-taskmanager/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601212016.k0LKG6R4010285@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-taskmanager


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:17:06 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:17:06 -0500
Subject: rpms/xfce4-taskmanager import.log,1.1,1.2
Message-ID: <200601212017.k0LKHcBD010363@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10328

Modified Files:
	import.log 
Log Message:
auto-import xfce4-taskmanager-0.3.1-2.fc4 on branch devel from xfce4-taskmanager-0.3.1-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:15:58 -0000	1.1
+++ import.log	21 Jan 2006 20:17:06 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskmanager-0_3_1-2_fc4:HEAD:xfce4-taskmanager-0.3.1-2.fc4.src.rpm:1137874618



From fedora-extras-commits at redhat.com  Sat Jan 21 20:17:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:17:12 -0500
Subject: rpms/xfce4-taskmanager/devel xfce4-taskmanager.desktop, NONE,
	1.1 xfce4-taskmanager.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601212017.k0LKHil5010367@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10328/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-taskmanager.desktop xfce4-taskmanager.spec 
Log Message:
auto-import xfce4-taskmanager-0.3.1-2.fc4 on branch devel from xfce4-taskmanager-0.3.1-2.fc4.src.rpm


--- NEW FILE xfce4-taskmanager.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Xfce 4 Taskmanager
GenericName=Taskmanager
Comment=View current processes
Comment[be]=?????????????????????? ?????????????? ??????????????
Comment[bg]=?????????????????? ???? ???????????????? ??????????????
Comment[bs]=Pregled trenutnih procesa
Comment[ca]=Visualitza els processos actuals i l'estat
Comment[cs]=Zobrazit aktu??ln?? procesy
Comment[cy]=Gweld prosesau cyfredol
Comment[da]=Vis aktive processer
Comment[de]=Momentan laufende Prozesse anzeigen
Comment[el]=?????????????? ?????????????????? ????????????????????
Comment[en_CA]=View current processes
Comment[en_GB]=View current processes
Comment[es]=Ver los procesos actuales
Comment[eu]=Ikusi uneko prozesuak
Comment[fi]=Katsele aktiivisia prosesseja
Comment[fr]=Affiche les processus en cours
Comment[gl]=Ver procesos actuais
Comment[hr]=Pregled trenutnih procesa
Comment[hu]=A jelenlegi folyamatok megtekint??se
Comment[id]=Lihat proses yang
Comment[it]=Mostra i processi correnti
Comment[li]=Tuin huijig proses
Comment[lt]=Parodo paleistus procesus
Comment[lv]=Skat??t pa??reiz??jos procesus
Comment[mk]=???????????????? ???? ???????????????????? ?????????????????? ??????????????
Comment[ms]=Lihat proses semasa
Comment[nb]=Vis aktive prosesser
Comment[nl]=Toon de huidige processen
Comment[no]=Vis aktive prosesser
Comment[pl]=Wy??wietla istniej??ce procesy
Comment[pt]=Ver processos actuais
Comment[pt_BR]=Exibe os processos atuais
Comment[ro]=Arat?? procesele curente
Comment[ru]=?????????????????? ?????? ?????????????????? ?????????????? ??????????????????
Comment[sk]=Zobrazuje aktu??lne procesy
Comment[sl]=Glej trenutne procese
Comment[sq]=Shfaq pro??eset aktual??
Comment[sr]=???????????????? ???????????????? ?????????????????? ??????????????
Comment[sr at Latn]=Pogledaj trenutno pokrenute procese
Comment[sv]=Visa aktuella processer
Comment[tr]=??al????an s??re??leri
Exec=xfce4-taskmanager
Icon=xfce4_xicon
Terminal=false
Type=Application
StartupNotify=true
X-Desktop-File-Install-Version=0.10
OnlyShowIn=XFCE;


--- NEW FILE xfce4-taskmanager.spec ---
Name:		xfce4-taskmanager
Version:	0.3.1
Release:	2%{?dist}
Summary:	Taskmanager for the Xfce desktop environment

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
Source1:	xfce4-taskmanager.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils

%description
A simple taskmanager for the Xfce desktop environment.

%prep
%setup -q
# fix permissions of a file in the debug package
%__chmod 0644 src/functions.c

%build
%configure
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
	--add-category Application                            	\
	--add-category System                                	\
        %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README TODO
%{_bindir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop

%changelog
* Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2
- Initial Fedora Extras version.
- Add xfce4-taskmanager.desktop.
- Remove useless NEWS from %DOC.
- Clean up specfile.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc4.cw
- Updated to version 0.3.1.
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:16:03 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:17:12 -0000	1.2
@@ -0,0 +1 @@
+xfce4-taskmanager-0.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:16:03 -0000	1.1
+++ sources	21 Jan 2006 20:17:12 -0000	1.2
@@ -0,0 +1 @@
+f8b0370c6aa6046720b039fad932084d  xfce4-taskmanager-0.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 21 20:19:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:19:31 -0500
Subject: rpms/xfce4-mount-plugin - New directory
Message-ID: <200601212019.k0LKJXJg010460@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/xfce4-mount-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-mount-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:19:37 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:19:37 -0500
Subject: rpms/xfce4-mount-plugin/devel - New directory
Message-ID: <200601212019.k0LKJdHc010475@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452/xfce4-mount-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-mount-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:19:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:19:55 -0500
Subject: rpms/xfce4-mount-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212019.k0LKJv6u010509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-mount-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-mount-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:20:01 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:20:01 -0500
Subject: rpms/xfce4-mount-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601212020.k0LKK3PR010529@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-mount-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:20:47 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:20:47 -0500
Subject: rpms/xfce4-mount-plugin import.log,1.1,1.2
Message-ID: <200601212021.k0LKLJSK010597@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10563

Modified Files:
	import.log 
Log Message:
auto-import xfce4-mount-plugin-0.3.2-3.fc4 on branch devel from xfce4-mount-plugin-0.3.2-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:19:55 -0000	1.1
+++ import.log	21 Jan 2006 20:20:47 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mount-plugin-0_3_2-3_fc4:HEAD:xfce4-mount-plugin-0.3.2-3.fc4.src.rpm:1137874839



From fedora-extras-commits at redhat.com  Sat Jan 21 20:20:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:20:53 -0500
Subject: rpms/xfce4-mount-plugin/devel xfce4-mount-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601212021.k0LKLPTF010601@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10563/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-mount-plugin.spec 
Log Message:
auto-import xfce4-mount-plugin-0.3.2-3.fc4 on branch devel from xfce4-mount-plugin-0.3.2-3.fc4.src.rpm


--- NEW FILE xfce4-mount-plugin.spec ---
Name:		xfce4-mount-plugin
Version:	0.3.2
Release:	3%{?dist}
Summary:	Mount/unmount utility for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
Mount and unmount filesystems from the Xfce panel.

%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 -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-1.fc4.cw
- Updated to version 0.3.2.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3-1.fc4.cw
- Updated to version 0.3.
- Rebuild for Core 4.

* Thu Apr 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:20:01 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:20:52 -0000	1.2
@@ -0,0 +1 @@
+xfce4-mount-plugin-0.3.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:20:01 -0000	1.1
+++ sources	21 Jan 2006 20:20:52 -0000	1.2
@@ -0,0 +1 @@
+ba0a96c9e3c3bb309e13851c77fd014c  xfce4-mount-plugin-0.3.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:28 -0500
Subject: rpms/xfce4-websearch-plugin - New directory
Message-ID: <200601212041.k0LKfUQl010782@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10774/xfce4-websearch-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-websearch-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:33 -0500
Subject: rpms/xfce4-websearch-plugin/devel - New directory
Message-ID: <200601212041.k0LKfZ12010797@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10774/xfce4-websearch-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-websearch-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:52 -0500
Subject: rpms/xfce4-websearch-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212041.k0LKfsaf010833@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10821

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-websearch-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-websearch-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:41:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:41:58 -0500
Subject: rpms/xfce4-websearch-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601212042.k0LKg0wQ010853@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10821/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-websearch-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:42:49 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:42:49 -0500
Subject: rpms/xfce4-websearch-plugin import.log,1.1,1.2
Message-ID: <200601212043.k0LKhMlK010921@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887

Modified Files:
	import.log 
Log Message:
auto-import xfce4-websearch-plugin-0.1.0-4.fc4 on branch devel from xfce4-websearch-plugin-0.1.0-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:41:52 -0000	1.1
+++ import.log	21 Jan 2006 20:42:49 -0000	1.2
@@ -0,0 +1 @@
+xfce4-websearch-plugin-0_1_0-4_fc4:HEAD:xfce4-websearch-plugin-0.1.0-4.fc4.src.rpm:1137876161



From fedora-extras-commits at redhat.com  Sat Jan 21 20:42:55 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:42:55 -0500
Subject: rpms/xfce4-websearch-plugin/devel xfce4-websearch-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601212043.k0LKhRld010925@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10887/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-websearch-plugin.spec 
Log Message:
auto-import xfce4-websearch-plugin-0.1.0-4.fc4 on branch devel from xfce4-websearch-plugin-0.1.0-4.fc4.src.rpm


--- NEW FILE xfce4-websearch-plugin.spec ---
Name: 		xfce4-websearch-plugin
Version: 	0.1.0
Release: 	4%{?dist}
Summary: 	Websearch plugin from the XFCE panel

Group: 		User Interface/Desktops
License:	GPL
URL: 		http://www.xfce.org/
Source0: 	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildREquires:  gettext

%description
Access searchengines from the XFCE panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-1%{?dist}%{?repo}
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:41:58 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:42:55 -0000	1.2
@@ -0,0 +1 @@
+xfce4-websearch-plugin-0.1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:41:58 -0000	1.1
+++ sources	21 Jan 2006 20:42:55 -0000	1.2
@@ -0,0 +1 @@
+352ddd859ecd6649db34682a25012638  xfce4-websearch-plugin-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:12 -0500
Subject: rpms/xfce4-sensors-plugin - New directory
Message-ID: <200601212047.k0LKlEY2011010@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11002/xfce4-sensors-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-sensors-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:18 -0500
Subject: rpms/xfce4-sensors-plugin/devel - New directory
Message-ID: <200601212047.k0LKlKan011025@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11002/xfce4-sensors-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-sensors-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:36 -0500
Subject: rpms/xfce4-sensors-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601212047.k0LKlcRs011059@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11047

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-sensors-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-sensors-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:47:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:47:42 -0500
Subject: rpms/xfce4-sensors-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601212047.k0LKli9S011079@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11047/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-sensors-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 21 20:48:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:48:28 -0500
Subject: rpms/xfce4-sensors-plugin import.log,1.1,1.2
Message-ID: <200601212049.k0LKn1ML011147@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113

Modified Files:
	import.log 
Log Message:
auto-import xfce4-sensors-plugin-0.7.0-2.fc4 on branch devel from xfce4-sensors-plugin-0.7.0-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Jan 2006 20:47:36 -0000	1.1
+++ import.log	21 Jan 2006 20:48:28 -0000	1.2
@@ -0,0 +1 @@
+xfce4-sensors-plugin-0_7_0-2_fc4:HEAD:xfce4-sensors-plugin-0.7.0-2.fc4.src.rpm:1137876501



From fedora-extras-commits at redhat.com  Sat Jan 21 20:48:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 15:48:34 -0500
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601212049.k0LKn6Kl011151@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-sensors-plugin.spec 
Log Message:
auto-import xfce4-sensors-plugin-0.7.0-2.fc4 on branch devel from xfce4-sensors-plugin-0.7.0-2.fc4.src.rpm


--- NEW FILE xfce4-sensors-plugin.spec ---
Name: 		xfce4-sensors-plugin
Version: 	0.7.0
Release: 	2%{?dist}
Summary: 	Sensors plugin for the Xfce panel

Group: 		User Interface/Desktops
License:	GPL
URL: 		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext, lm_sensors-devel >= 2.8
Requires:	lm_sensors >= 2.8

%description
This plugin displays various hardware sensor values in the Xfce panel.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-1
- Initial Fedora Extras version.
- Update to 0.7.0.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.6.2-1.fc4.cw
- Update to 0.6.2.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Jan 2006 20:47:42 -0000	1.1
+++ .cvsignore	21 Jan 2006 20:48:34 -0000	1.2
@@ -0,0 +1 @@
+xfce4-sensors-plugin-0.7.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Jan 2006 20:47:42 -0000	1.1
+++ sources	21 Jan 2006 20:48:34 -0000	1.2
@@ -0,0 +1 @@
+10399ab7351c60e9e46e4d4375250157  xfce4-sensors-plugin-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 21 21:14:21 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 16:14:21 -0500
Subject: rpms/xfce4-xmms-plugin/FC-3 .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE branch, 1.1, NONE sources, 1.2, NONE xfce4-xmms-plugin.spec,
	1.1, NONE
Message-ID: <200601212114.k0LLEN6p013126@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13117

Removed Files:
	.cvsignore Makefile branch sources xfce4-xmms-plugin.spec 
Log Message:
remove core 3 branch, pango version to low


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- sources DELETED ---


--- xfce4-xmms-plugin.spec DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 21 21:32:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 16:32:15 -0500
Subject: owners owners.list,1.558,1.559
Message-ID: <200601212132.k0LLWmwo013203@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13186

Modified Files:
	owners.list 
Log Message:
add xfce4-mount-plugin, xfce4-sensors-plugin, xfce4-taskmanager & xfce4-websearch-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- owners.list	21 Jan 2006 12:32:25 -0000	1.558
+++ owners.list	21 Jan 2006 21:32:15 -0000	1.559
@@ -1323,17 +1323,21 @@
 Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-mount-plugin|Mount/unmount utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-taskbar-plugin|Tasklist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-taskmanager|Taskmanager for the Xfce desktop environment|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-toys|Small Xfce4 applications|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-trigger-launcher|Trigger launcher for Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-wavelan-plugin|WaveLAN plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-weather-plugin|Weather plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-websearch-plugin|Websearch plugin from the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 21 21:36:42 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Sat, 21 Jan 2006 16:36:42 -0500
Subject: rpms/abiword/devel abiword.spec,1.28,1.29
Message-ID: <200601212137.k0LLbEkA013226@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13209

Modified Files:
	abiword.spec 
Log Message:
Disable the PDF plugin, as poppler doesn't ship the xpdf headers anymore




Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- abiword.spec	14 Jan 2006 14:17:51 -0000	1.28
+++ abiword.spec	21 Jan 2006 21:36:41 -0000	1.29
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -65,7 +65,7 @@
 cd ../abiword-plugins
 libtoolize --copy --force
 ./nextgen.sh
-%configure --disable-gda --with-abiword=../abi
+%configure --disable-gda --disable-pdf --with-abiword=../abi
 # Remove libtool predep_objects and postdep_objects wonkiness so that
 # building without -nostdlib doesn't include them twice.  Because we
 # already link with g++, weird stuff happens if you don't let the
@@ -136,6 +136,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Sat Jan 21 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-4.fc5
+- Disable the PDF plugin for now, as poppler doesn't ship the xpdf
+  headers anymore
+
 * Sat Jan 14 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-3.fc5
 - Remove redundant requires - bug 177305
 



From fedora-extras-commits at redhat.com  Sat Jan 21 22:24:09 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sat, 21 Jan 2006 17:24:09 -0500
Subject: rpms/xfce4-mount-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-mount-plugin.spec, 1.1, 1.2
Message-ID: <200601212224.k0LMOf6t015153@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15132

Modified Files:
	.cvsignore sources xfce4-mount-plugin.spec 
Log Message:
update to 0.3.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Jan 2006 20:20:52 -0000	1.2
+++ .cvsignore	21 Jan 2006 22:24:09 -0000	1.3
@@ -1 +1 @@
-xfce4-mount-plugin-0.3.2.tar.bz2
+xfce4-mount-plugin-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Jan 2006 20:20:52 -0000	1.2
+++ sources	21 Jan 2006 22:24:09 -0000	1.3
@@ -1 +1 @@
-ba0a96c9e3c3bb309e13851c77fd014c  xfce4-mount-plugin-0.3.2.tar.bz2
+94e0f1e0b5501d5a5ba7d137ca7e5be9  xfce4-mount-plugin-0.3.3.tar.bz2


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-mount-plugin.spec	21 Jan 2006 20:20:52 -0000	1.1
+++ xfce4-mount-plugin.spec	21 Jan 2006 22:24:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
-Version:	0.3.2
-Release:	3%{?dist}
+Version:	0.3.3
+Release:	1%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -36,6 +36,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
+- Updat to 0.3.3.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 02:10:04 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sat, 21 Jan 2006 21:10:04 -0500
Subject: extras-buildsys/common Makefile,1.10,1.11
Message-ID: <200601220210.k0M2A4mT023501@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23480/common

Modified Files:
	Makefile 
Log Message:
No more lighttpd manager


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile	29 Nov 2005 06:41:46 -0000	1.10
+++ Makefile	22 Jan 2006 02:08:56 -0000	1.11
@@ -20,7 +20,6 @@
 	SSLCommon.py \
 	SSLConnection.py \
 	XMLRPCServerProxy.py \
-	lighttpdManager.py \
 	daemonize.py \
 	__init__.py
 



From fedora-extras-commits at redhat.com  Sun Jan 22 02:45:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:45:07 -0500
Subject: rpms/kdocker/devel kdocker-1.3-paths.patch, NONE, 1.1 kdocker.spec, 
	1.2, 1.3 kdocker-qmake.patch, 1.1, NONE
Message-ID: <200601220245.k0M2jebm023594@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23574

Modified Files:
	kdocker.spec 
Added Files:
	kdocker-1.3-paths.patch 
Removed Files:
	kdocker-qmake.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)


kdocker-1.3-paths.patch:

--- NEW FILE kdocker-1.3-paths.patch ---
--- kdocker/kdocker.desktop.qmake	2004-11-22 10:11:49.000000000 -0600
+++ kdocker/kdocker.desktop	2006-01-21 20:39:14.000000000 -0600
@@ -4,7 +4,7 @@
 Comment=Docks any application into system tray
 Exec=kdocker
 TryExec=kdocker
-Icon=/usr/local/share/kdocker/icons/kdocker.png
+Icon=/usr/share/kdocker/icons/kdocker.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
--- kdocker/kdocker.pro.qmake	2005-04-04 22:14:58.000000000 -0500
+++ kdocker/kdocker.pro	2006-01-21 20:38:57.000000000 -0600
@@ -1,10 +1,10 @@
 TEMPLATE = app
 DEPENDPATH += i18n src
 INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
-LIBPATH += /usr/X11/lib /usr/X11R6/lib
+#LIBPATH += /usr/X11/lib /usr/X11R6/lib
 LIBS = -lX11 -lXpm -lXmu
 TARGET = kdocker
-INSTALL_PATH = /usr/local/share/kdocker
+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
 DOCS_PATH = $$INSTALL_PATH/docs
 
 # Defines
@@ -24,10 +24,10 @@
 docs.path = $$DOCS_PATH
 docs.files = README
 
-desktop.path = /usr/share/applications
+desktop.path = $$DESTDIR/usr/share/applications
 desktop.files = kdocker.desktop
 
-target.path = /usr/local/bin
+target.path = $$DESTDIR/usr/bin
 
 INSTALLS += target icons docs translations desktop
 


Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdocker.spec	1 Nov 2005 14:51:41 -0000	1.2
+++ kdocker.spec	22 Jan 2006 02:45:07 -0000	1.3
@@ -2,15 +2,15 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
 URL:	 http://kdocker.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-1.3.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdocker-qmake.patch 
+Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
@@ -40,7 +40,7 @@
 %prep
 %setup -q -n kdocker 
 
-%patch0 -p1 -b .qmake
+%patch1 -p1 -b .paths
 
 
 %build
@@ -63,7 +63,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
+  --add-category Qt \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -97,6 +97,9 @@
 
 
 %changelog 
+* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
+- .desktop: fix path to app-icon (#178531)
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-3
 - remove dup'd docs
 - %%lang'ify i18n bits


--- kdocker-qmake.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 02:49:57 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:49:57 -0500
Subject: rpms/kdocker/FC-3 kdocker-1.3-paths.patch,NONE,1.1
Message-ID: <200601220249.k0M2nxJW023708@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695/FC-3

Added Files:
	kdocker-1.3-paths.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)


kdocker-1.3-paths.patch:

--- NEW FILE kdocker-1.3-paths.patch ---
--- kdocker/kdocker.desktop.qmake	2004-11-22 10:11:49.000000000 -0600
+++ kdocker/kdocker.desktop	2006-01-21 20:39:14.000000000 -0600
@@ -4,7 +4,7 @@
 Comment=Docks any application into system tray
 Exec=kdocker
 TryExec=kdocker
-Icon=/usr/local/share/kdocker/icons/kdocker.png
+Icon=/usr/share/kdocker/icons/kdocker.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
--- kdocker/kdocker.pro.qmake	2005-04-04 22:14:58.000000000 -0500
+++ kdocker/kdocker.pro	2006-01-21 20:38:57.000000000 -0600
@@ -1,10 +1,10 @@
 TEMPLATE = app
 DEPENDPATH += i18n src
 INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
-LIBPATH += /usr/X11/lib /usr/X11R6/lib
+#LIBPATH += /usr/X11/lib /usr/X11R6/lib
 LIBS = -lX11 -lXpm -lXmu
 TARGET = kdocker
-INSTALL_PATH = /usr/local/share/kdocker
+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
 DOCS_PATH = $$INSTALL_PATH/docs
 
 # Defines
@@ -24,10 +24,10 @@
 docs.path = $$DOCS_PATH
 docs.files = README
 
-desktop.path = /usr/share/applications
+desktop.path = $$DESTDIR/usr/share/applications
 desktop.files = kdocker.desktop
 
-target.path = /usr/local/bin
+target.path = $$DESTDIR/usr/bin
 
 INSTALLS += target icons docs translations desktop
 



From fedora-extras-commits at redhat.com  Sun Jan 22 02:50:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:50:03 -0500
Subject: rpms/kdocker/FC-4 kdocker-1.3-paths.patch,NONE,1.1
Message-ID: <200601220250.k0M2o50x023726@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695/FC-4

Added Files:
	kdocker-1.3-paths.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)


kdocker-1.3-paths.patch:

--- NEW FILE kdocker-1.3-paths.patch ---
--- kdocker/kdocker.desktop.qmake	2004-11-22 10:11:49.000000000 -0600
+++ kdocker/kdocker.desktop	2006-01-21 20:39:14.000000000 -0600
@@ -4,7 +4,7 @@
 Comment=Docks any application into system tray
 Exec=kdocker
 TryExec=kdocker
-Icon=/usr/local/share/kdocker/icons/kdocker.png
+Icon=/usr/share/kdocker/icons/kdocker.png
 Terminal=false
 Type=Application
 Categories=Application;Utility;
--- kdocker/kdocker.pro.qmake	2005-04-04 22:14:58.000000000 -0500
+++ kdocker/kdocker.pro	2006-01-21 20:38:57.000000000 -0600
@@ -1,10 +1,10 @@
 TEMPLATE = app
 DEPENDPATH += i18n src
 INCLUDEPATH += . src  /usr/include/X11 /usr/include/X11R6
-LIBPATH += /usr/X11/lib /usr/X11R6/lib
+#LIBPATH += /usr/X11/lib /usr/X11R6/lib
 LIBS = -lX11 -lXpm -lXmu
 TARGET = kdocker
-INSTALL_PATH = /usr/local/share/kdocker
+INSTALL_PATH = $$DESTDIR/usr/share/kdocker
 DOCS_PATH = $$INSTALL_PATH/docs
 
 # Defines
@@ -24,10 +24,10 @@
 docs.path = $$DOCS_PATH
 docs.files = README
 
-desktop.path = /usr/share/applications
+desktop.path = $$DESTDIR/usr/share/applications
 desktop.files = kdocker.desktop
 
-target.path = /usr/local/bin
+target.path = $$DESTDIR/usr/bin
 
 INSTALLS += target icons docs translations desktop
 



From fedora-extras-commits at redhat.com  Sun Jan 22 02:49:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:49:27 -0500
Subject: rpms/kdocker/FC-3 kdocker.spec, 1.2, 1.3 kdocker-qmake.patch, 1.1,
	NONE
Message-ID: <200601220250.k0M2oTYf023793@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23650/FC-3

Modified Files:
	kdocker.spec 
Removed Files:
	kdocker-qmake.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-3/kdocker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdocker.spec	1 Nov 2005 14:51:41 -0000	1.2
+++ kdocker.spec	22 Jan 2006 02:49:26 -0000	1.3
@@ -2,15 +2,15 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
 URL:	 http://kdocker.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-1.3.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdocker-qmake.patch 
+Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
@@ -40,7 +40,7 @@
 %prep
 %setup -q -n kdocker 
 
-%patch0 -p1 -b .qmake
+%patch1 -p1 -b .paths
 
 
 %build
@@ -63,7 +63,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
+  --add-category Qt \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -97,6 +97,9 @@
 
 
 %changelog 
+* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
+- .desktop: fix path to app-icon (#178531)
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-3
 - remove dup'd docs
 - %%lang'ify i18n bits


--- kdocker-qmake.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 02:49:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat, 21 Jan 2006 21:49:32 -0500
Subject: rpms/kdocker/FC-4 kdocker.spec, 1.2, 1.3 kdocker-qmake.patch, 1.1,
	NONE
Message-ID: <200601220250.k0M2oZD5023796@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23650/FC-4

Modified Files:
	kdocker.spec 
Removed Files:
	kdocker-qmake.patch 
Log Message:
* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
- .desktop: fix path to app-icon (#178531)



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-4/kdocker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdocker.spec	1 Nov 2005 14:51:41 -0000	1.2
+++ kdocker.spec	22 Jan 2006 02:49:32 -0000	1.3
@@ -2,15 +2,15 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
 URL:	 http://kdocker.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-1.3.tar.gz
+Source0: http://dl.sourceforge.net/sourceforge/kdocker/kdocker-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0: kdocker-qmake.patch 
+Patch1: kdocker-1.3-paths.patch 
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
@@ -40,7 +40,7 @@
 %prep
 %setup -q -n kdocker 
 
-%patch0 -p1 -b .qmake
+%patch1 -p1 -b .paths
 
 
 %build
@@ -63,7 +63,7 @@
 desktop-file-install --vendor fedora \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Fedora \
-  --add-category Application \
+  --add-category Qt \
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
@@ -97,6 +97,9 @@
 
 
 %changelog 
+* Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
+- .desktop: fix path to app-icon (#178531)
+
 * Tue Nov 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-3
 - remove dup'd docs
 - %%lang'ify i18n bits


--- kdocker-qmake.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 05:51:24 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 22 Jan 2006 00:51:24 -0500
Subject: rpms/azureus/devel Azureus.desktop,1.1,1.2 azureus.spec,1.4,1.5
Message-ID: <200601220551.k0M5pudD029206@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29182

Modified Files:
	Azureus.desktop azureus.spec 
Log Message:
.desktop improvements



Index: Azureus.desktop
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/Azureus.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Azureus.desktop	19 Jan 2006 23:08:02 -0000	1.1
+++ Azureus.desktop	22 Jan 2006 05:51:23 -0000	1.2
@@ -1,10 +1,11 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=Azureus
-Comment=A BitTorrent Client
+GenericName=BitTorrent Client
 Exec=azureus
 Icon=azureus
 Terminal=false
 Type=Application
 MimeType=application/x-bittorrent
-Categories=Application;Network;
+Categories=Application;Network;FileTransfer;P2P;GTK;Java
 


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- azureus.spec	21 Jan 2006 17:04:07 -0000	1.4
+++ azureus.spec	22 Jan 2006 05:51:23 -0000	1.5
@@ -146,6 +146,7 @@
 %changelog
 * Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-16
 - Use "$@" instead of $* in azureus.script (thanks ivazquez).
+- Improve .desktop file.
 
 * Wed Jan 18 2006 Anthony Green <green at redhat.com> - 2.3.0.6-15
 - Remove PrintTransferTypes, which is unused and not 64-bit clean.



From fedora-extras-commits at redhat.com  Sun Jan 22 05:53:36 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sun, 22 Jan 2006 00:53:36 -0500
Subject: rpms/azureus/devel azureus.spec,1.5,1.6
Message-ID: <200601220554.k0M5s81Z029270@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29247

Modified Files:
	azureus.spec 
Log Message:
Increment release number



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- azureus.spec	22 Jan 2006 05:51:23 -0000	1.5
+++ azureus.spec	22 Jan 2006 05:53:36 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -144,7 +144,7 @@
 %{_libdir}/gcj/*
 
 %changelog
-* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-16
+* Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-17
 - Use "$@" instead of $* in azureus.script (thanks ivazquez).
 - Improve .desktop file.
 



From fedora-extras-commits at redhat.com  Sun Jan 22 05:59:19 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 00:59:19 -0500
Subject: extras-buildsys/common SSLConnection.py,1.5,1.6
Message-ID: <200601220559.k0M5xJ60029344@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29310/common

Modified Files:
	SSLConnection.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SSLConnection.py	25 Nov 2005 04:45:07 -0000	1.5
+++ SSLConnection.py	22 Jan 2006 05:59:12 -0000	1.6
@@ -29,6 +29,12 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
+
+        # Buffer stuff
+        self.__dict__["buffer_size"] = 16384
+        self.__dict__["pos"] = 0
+        self.__dict__["buffer"] = ""
+
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -76,57 +82,76 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-    def sendall(self, data, flags=0):
-        while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in write:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].sendall(data, flags)
-                    except SSL.SysCallError, e:
-                        if e[0] == 32:      # Broken Pipe
-                            self.close()
-                        else:
-                            raise socket.error(e)
-                    except SSL.WantWriteError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
-    def recv(self, bufsize, flags=0):
+
+    def write(self, data, flags=0):
+        origlen = len(data)
+        sent = 0
         while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in read:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].recv(bufsize, flags)
-                    except SSL.ZeroReturnError:
-                        return None
-                    except SSL.WantReadError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
+            try:
+                sent = self.__dict__["conn"].send(data)
+            except (SSL.WantReadError, SSL.WantWriteError):
+                continue
+            if sent == len(data):
+                break
+            data = data[sent:]
+
+        return origlen
+
+    def recv(self, amt):
+        return self.read(amt)
+
+    send = write
+
+    sendall = write
+
+    def tell(self):
+        return self.__dict__["pos"]
+
+    def seek(self, pos, mode=0):
+        raise NotImplementedError, "seek"
+
+    def read(self, amt, flags=0):
+        # Initially, the buffer size is the default buffer size.
+        # Unfortunately, pending() does not return meaningful data until
+        # recv() is called, so we only adjust the buffer size after the
+        # first read
+        buffer_size = self.__dict__["buffer_size"]
+        # Read only the specified amount of data
+        while amt is None or len(self.__dict__["buffer"]) < amt:
+            # if amt is None (read till the end), fills in self.__dict__["buffer"]
+            if amt is not None:
+                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
+
+            try:
+                data = self.__dict__["conn"].recv(buffer_size)
+            except SSL.ZeroReturnError:
+                # Nothing more to be read
+                break
+            except (SSL.WantReadError, SSL.WantWriteError):
+                # Try again
+                continue
+
+            self.__dict__["buffer"] = self.__dict__["buffer"] + data
+
+            # More bytes to read?
+            pending = self.__dict__["conn"].pending()
+            if pending == 0:
+                # we're done here
+                break
+
+        if amt:
+            ret = self.__dict__["buffer"][:amt]
+            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
+        else:
+            ret = self.__dict__["buffer"]
+            self.__dict__["buffer"] = ""
+
+        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
+        return ret
 
 class PlgFileObject(socket._fileobject):
+    def read(self, bufsize, flags=0):
+        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Sun Jan 22 05:59:14 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 00:59:14 -0500
Subject: extras-buildsys ChangeLog,1.157,1.158
Message-ID: <200601220559.k0M5xiex029347@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29310

Modified Files:
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- ChangeLog	1 Dec 2005 18:44:48 -0000	1.157
+++ ChangeLog	22 Jan 2006 05:59:06 -0000	1.158
@@ -1,3 +1,10 @@
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Be smarter about SSL stuff by using pending() where possible in a
+            vain effort not to hang as much.  Cribbed from rhn code by
+            misa at redhat
+
 2005-12-01  Dan Williams  <dcbw at redhat.com>
 
     Patch from Rudolf Kastl <che666 at gmail.com> #rh174573#:



From fedora-extras-commits at redhat.com  Sun Jan 22 06:00:42 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:00:42 -0500
Subject: extras-buildsys/server Builder.py,1.25,1.26
Message-ID: <200601220600.k0M60g7O029395@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29361/server

Modified Files:
	Builder.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/Builder.py
        - Move most of the building_jobs() logic into another thread to
            combat hanging issues




Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Builder.py	29 Nov 2005 06:41:51 -0000	1.25
+++ Builder.py	22 Jan 2006 06:00:35 -0000	1.26
@@ -34,6 +34,34 @@
 SUSPEND_TIMEOUT = 'timeout'
 SUSPEND_HARD_ERROR = 'hard-error'
 
+# HACK: This class is a hack to work around SSL hanging issues,
+# which cause the whole server to grind to a halt
+class BuildingJobsCheck(threading.Thread):
+    def __init__(self, server, address):
+        self._server = server
+        self._address = address
+
+        self.done = False
+        self.failed = False
+
+        threading.Thread.__init__(self)
+        self.setName("BuildingJobsCheck: %s" % address)
+
+    def run(self):
+        jobs = {}
+        free_slots = 0
+        try:
+            (jobs, free_slots) = self._server.building_jobs()
+        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
+            self.failed = True
+        except xmlrpclib.Fault, e:
+            print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self._address, e)
+            self.failed = True
+        self.jobs = jobs
+        self.free_slots = free_slots
+        self.done = True
+
+
 class Builder(threading.Thread):
     """ Tracks all jobs on a builder instance """
 
@@ -65,16 +93,16 @@
             certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
             certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
 
-        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
+        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
         self._server_lock = threading.Lock()
 
+        threading.Thread.__init__(self)
+        self.setName("Builder: %s" % address)
+
         (self._alive, target_list) = self._ping_builder()
         if self._alive:
             self._init_builder(target_list)
 
-        threading.Thread.__init__(self)
-        self.setName("Builder: %s" % address)
-
     def _init_builder(self, target_list):
         self._target_list = target_list
 
@@ -99,18 +127,28 @@
         return num_slots
 
     def _building_jobs(self):
-        jobs = {}
-        try:
-            (jobs, free_slots) = self._server.building_jobs()
-            self._unavail_count = 0
-            self._alive = True
-            self._free_slots = free_slots
-        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
-            self._unavail_count = self._unavail_count + 1
-        except xmlrpclib.Fault, e:
-            print "Builder Error (%s) in _building_jobs(): builder replied '%s'" % (self.address, e)
-            self._unavail_count = self._unavail_count + 1
-        return jobs
+        bjc = BuildingJobsCheck(self._server, self.address)
+
+        curtime = time.time()
+        bjc.start()
+
+        # Give the check 10s, otherwise screw it
+        while time.time() - curtime < 10:
+            if bjc.done:
+                break
+            time.sleep(0.5)
+
+        if bjc.done:
+            if not bjc.failed:
+                self._unavail_count = 0
+                self._alive = True
+                self._free_slots = bjc.free_slots
+                return bjc.jobs
+            else:
+                # Error of some kind
+                self._unavail_count = self._unavail_count + 1
+
+        return {}
 
     def _ping_builder(self):
         target_list = []
@@ -309,7 +347,7 @@
                     else:
                         # Wait and ping again
                         self._ping_timeout = time.time()
-
+
                     # Reset current ping interval to default
                     self._cur_ping_interval = self._BUILDER_PING_INTERVAL
                     self._ping_now = False



From fedora-extras-commits at redhat.com  Sun Jan 22 06:00:37 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:00:37 -0500
Subject: extras-buildsys ChangeLog,1.158,1.159
Message-ID: <200601220601.k0M617Cu031068@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29361

Modified Files:
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/Builder.py
        - Move most of the building_jobs() logic into another thread to
            combat hanging issues




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- ChangeLog	22 Jan 2006 05:59:06 -0000	1.158
+++ ChangeLog	22 Jan 2006 06:00:29 -0000	1.159
@@ -1,5 +1,11 @@
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
+    * server/Builder.py
+        - Move most of the building_jobs() logic into another thread to
+            combat hanging issues
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
     * common/SSLConnection.py
         - Be smarter about SSL stuff by using pending() where possible in a
             vain effort not to hang as much.  Cribbed from rhn code by



From fedora-extras-commits at redhat.com  Sun Jan 22 06:02:05 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:02:05 -0500
Subject: extras-buildsys/common SSLConnection.py,1.3.4.2,1.3.4.3
Message-ID: <200601220602.k0M625TT031139@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081/common

Modified Files:
      Tag: STABLE_0_4
	SSLConnection.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- SSLConnection.py	24 Nov 2005 22:32:02 -0000	1.3.4.2
+++ SSLConnection.py	22 Jan 2006 06:01:56 -0000	1.3.4.3
@@ -29,6 +29,12 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
+
+        # Buffer stuff
+        self.__dict__["buffer_size"] = 16384
+        self.__dict__["pos"] = 0
+        self.__dict__["buffer"] = ""
+
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -76,57 +82,76 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-    def sendall(self, data, flags=0):
-        while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in write:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].sendall(data, flags)
-                    except SSL.SysCallError, e:
-                        if e[0] == 32:      # Broken Pipe
-                            self.close()
-                        else:
-                            raise socket.error(e)
-                    except SSL.WantWriteError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
-    def recv(self, bufsize, flags=0):
+
+    def write(self, data, flags=0):
+        origlen = len(data)
+        sent = 0
         while True:
-            # Use select() to simulate a socket timeout without setting the socket
-            # to non-blocking mode
-            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
-            if self.__dict__["conn"] in read:
-                starttime = time.time()
-                while True:
-                    try:
-                        return self.__dict__["conn"].recv(bufsize, flags)
-                    except SSL.ZeroReturnError:
-                        return None
-                    except SSL.WantReadError:
-                        time.sleep(0.1)
-
-                    curtime = time.time()
-                    if curtime - starttime > self.__dict__["timeout"]:
-                        raise socket.timeout
-            else:
-                raise socket.timeout
-            if self.__dict__["conn"] in error:
-                raise socket.error
-        return None
+            try:
+                sent = self.__dict__["conn"].send(data)
+            except (SSL.WantReadError, SSL.WantWriteError):
+                continue
+            if sent == len(data):
+                break
+            data = data[sent:]
+
+        return origlen
+
+    def recv(self, amt):
+        return self.read(amt)
+
+    send = write
+
+    sendall = write
+
+    def tell(self):
+        return self.__dict__["pos"]
+
+    def seek(self, pos, mode=0):
+        raise NotImplementedError, "seek"
+
+    def read(self, amt, flags=0):
+        # Initially, the buffer size is the default buffer size.
+        # Unfortunately, pending() does not return meaningful data until
+        # recv() is called, so we only adjust the buffer size after the
+        # first read
+        buffer_size = self.__dict__["buffer_size"]
+        # Read only the specified amount of data
+        while amt is None or len(self.__dict__["buffer"]) < amt:
+            # if amt is None (read till the end), fills in self.__dict__["buffer"]
+            if amt is not None:
+                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
+
+            try:
+                data = self.__dict__["conn"].recv(buffer_size)
+            except SSL.ZeroReturnError:
+                # Nothing more to be read
+                break
+            except (SSL.WantReadError, SSL.WantWriteError):
+                # Try again
+                continue
+
+            self.__dict__["buffer"] = self.__dict__["buffer"] + data
+
+            # More bytes to read?
+            pending = self.__dict__["conn"].pending()
+            if pending == 0:
+                # we're done here
+                break
+
+        if amt:
+            ret = self.__dict__["buffer"][:amt]
+            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
+        else:
+            ret = self.__dict__["buffer"]
+            self.__dict__["buffer"] = ""
+
+        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
+        return ret
 
 class PlgFileObject(socket._fileobject):
+    def read(self, bufsize, flags=0):
+        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Sun Jan 22 06:01:58 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:01:58 -0500
Subject: extras-buildsys ChangeLog,1.126.2.26,1.126.2.27
Message-ID: <200601220602.k0M62Vs0031143@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31081

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Be smarter about SSL stuff by using pending() where possible in a
            vain effort not to hang as much.  Cribbed from rhn code by
            misa at redhat




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.26
retrieving revision 1.126.2.27
diff -u -r1.126.2.26 -r1.126.2.27
--- ChangeLog	1 Dec 2005 18:43:36 -0000	1.126.2.26
+++ ChangeLog	22 Jan 2006 06:01:43 -0000	1.126.2.27
@@ -1,3 +1,10 @@
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Be smarter about SSL stuff by using pending() where possible in a
+            vain effort not to hang as much.  Cribbed from rhn code by
+            misa at redhat
+
 2005-12-01  Dan Williams  <dcbw at redhat.com>
 
     Patch from Rudolf Kastl <che666 at gmail.com> #rh174573#:



From fedora-extras-commits at redhat.com  Sun Jan 22 06:05:26 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:05:26 -0500
Subject: extras-buildsys ChangeLog,1.126.2.27,1.126.2.28
Message-ID: <200601220605.k0M65QSs031183@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31159

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/Builder.py
        - Move most of the building_jobs() logic into another thread to
            combat hanging issues







From fedora-extras-commits at redhat.com  Sun Jan 22 06:08:30 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:08:30 -0500
Subject: extras-buildsys/server ArchJob.py,1.16.2.5,1.16.2.6
Message-ID: <200601220608.k0M68UeS031239@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200/server

Modified Files:
      Tag: STABLE_0_4
	ArchJob.py 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/ArchJob.py
        - Don't traceback when killing jobs on builders




Index: ArchJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -u -r1.16.2.5 -r1.16.2.6
--- ArchJob.py	18 Nov 2005 15:08:20 -0000	1.16.2.5
+++ ArchJob.py	22 Jan 2006 06:08:01 -0000	1.16.2.6
@@ -275,7 +275,10 @@
         user_requested = self._die_user_requested
         self._die_lock.release()
         if should_die:
-            self._server.die(self.jobid)
+            try:
+                self._server.die(self.jobid)
+            except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error):
+                pass
             self._set_status('done')
             if user_requested:
                 print "%s (%s/%s): %s - killed." % (self.par_job.uid, self.par_job.package,



From fedora-extras-commits at redhat.com  Sun Jan 22 06:08:03 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:08:03 -0500
Subject: extras-buildsys ChangeLog,1.126.2.28,1.126.2.29
Message-ID: <200601220608.k0M68XdH031240@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31200

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-22  Dan Williams  <dcbw at redhat.com>

    * server/ArchJob.py
        - Don't traceback when killing jobs on builders




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.28
retrieving revision 1.126.2.29
diff -u -r1.126.2.28 -r1.126.2.29
--- ChangeLog	22 Jan 2006 06:05:08 -0000	1.126.2.28
+++ ChangeLog	22 Jan 2006 06:07:37 -0000	1.126.2.29
@@ -1,5 +1,10 @@
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
+    * server/ArchJob.py
+        - Don't traceback when killing jobs on builders
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
     * server/Builder.py
         - Move most of the building_jobs() logic into another thread to
             combat hanging issues



From fedora-extras-commits at redhat.com  Sun Jan 22 06:18:22 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:18:22 -0500
Subject: rpms/plague/devel plague.spec,1.20,1.21 sources,1.19,1.20
Message-ID: <200601220618.k0M6IsWE031315@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31296

Modified Files:
	plague.spec sources 
Log Message:
* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
- Don't traceback when killing jobs on builders
- Work around SSL hanging issues




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plague.spec	29 Nov 2005 06:46:52 -0000	1.20
+++ plague.spec	22 Jan 2006 06:18:22 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
+- Don't traceback when killing jobs on builders
+- Work around SSL hanging issues
+
 * Tue Nov 29 2005 Dan Williams <dcbw at redhat.com> 0.4.3-2
 - Move README and ChangeLog to -common package
 - Traceback/debug functionality added in server, depends on


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	29 Nov 2005 06:46:52 -0000	1.19
+++ sources	22 Jan 2006 06:18:22 -0000	1.20
@@ -1 +1 @@
-ccf61419e286348a18126d783f7fe7e9  plague-0.4.3.tar.bz2
+dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 06:20:24 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:20:24 -0500
Subject: rpms/plague/FC-4 plague.spec,1.18,1.19 sources,1.17,1.18
Message-ID: <200601220620.k0M6Kvde031395@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31376

Modified Files:
	plague.spec sources 
Log Message:
* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
- Don't traceback when killing jobs on builders
- Work around SSL hanging issues




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plague.spec	29 Nov 2005 06:49:11 -0000	1.18
+++ plague.spec	22 Jan 2006 06:20:24 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
+- Don't traceback when killing jobs on builders
+- Work around SSL hanging issues
+
 * Tue Nov 29 2005 Dan Williams <dcbw at redhat.com> 0.4.3-2
 - Move README and ChangeLog to -common package
 - Traceback/debug functionality added in server, depends on


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 Nov 2005 06:49:11 -0000	1.17
+++ sources	22 Jan 2006 06:20:24 -0000	1.18
@@ -1 +1 @@
-ccf61419e286348a18126d783f7fe7e9  plague-0.4.3.tar.bz2
+dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 06:21:25 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Sun, 22 Jan 2006 01:21:25 -0500
Subject: rpms/plague/FC-3 plague.spec,1.18,1.19 sources,1.17,1.18
Message-ID: <200601220621.k0M6LwVX031458@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31439

Modified Files:
	plague.spec sources 
Log Message:
* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
- Don't traceback when killing jobs on builders
- Work around SSL hanging issues




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- plague.spec	29 Nov 2005 06:50:08 -0000	1.18
+++ plague.spec	22 Jan 2006 06:21:25 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,10 @@
 
 
 %changelog
+* Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
+- Don't traceback when killing jobs on builders
+- Work around SSL hanging issues
+
 * Tue Nov 29 2005 Dan Williams <dcbw at redhat.com> 0.4.3-2
 - Move README and ChangeLog to -common package
 - Traceback/debug functionality added in server, depends on


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	29 Nov 2005 06:50:08 -0000	1.17
+++ sources	22 Jan 2006 06:21:25 -0000	1.18
@@ -1 +1 @@
-ccf61419e286348a18126d783f7fe7e9  plague-0.4.3.tar.bz2
+dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 08:16:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 22 Jan 2006 03:16:54 -0500
Subject: rpms/perl-MailTools/devel .cvsignore, 1.7, 1.8 perl-MailTools.spec, 
	1.14, 1.15 sources, 1.7, 1.8
Message-ID: <200601220817.k0M8HQSd002930@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-MailTools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2909

Modified Files:
	.cvsignore perl-MailTools.spec sources 
Log Message:
* Sun Jan 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.73-1
- 1.73.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 20:43:26 -0000	1.7
+++ .cvsignore	22 Jan 2006 08:16:53 -0000	1.8
@@ -1 +1 @@
-MailTools-1.72.tar.gz
+MailTools-1.73.tar.gz


Index: perl-MailTools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- perl-MailTools.spec	18 Jan 2006 20:43:26 -0000	1.14
+++ perl-MailTools.spec	22 Jan 2006 08:16:53 -0000	1.15
@@ -1,6 +1,6 @@
 Summary:        Various mail-related perl modules
 Name:           perl-MailTools
-Version:        1.72
+Version:        1.73
 Release:        1%{?dist}
 
 License:        GPL or Artistic
@@ -57,6 +57,9 @@
 
 
 %changelog
+* Sun Jan 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.73-1
+- 1.73.
+
 * Wed Jan 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.72-1
 - 1.72.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 20:43:26 -0000	1.7
+++ sources	22 Jan 2006 08:16:53 -0000	1.8
@@ -1 +1 @@
-9e9d40fe0f3acbcdefdfe678f478436e  MailTools-1.72.tar.gz
+5fae3213871ae435014c613e88d081a7  MailTools-1.73.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 22 09:07:23 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:07:23 -0500
Subject: rpms/amarok/FC-4 .cvsignore, 1.17, 1.18 amarok.spec, 1.36,
	1.37 sources, 1.17, 1.18
Message-ID: <200601220907.k0M97uAD005649@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5609/FC-4

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	9 Dec 2005 10:24:48 -0000	1.17
+++ .cvsignore	22 Jan 2006 09:07:05 -0000	1.18
@@ -1 +1 @@
-amarok-1.3.7.tar.bz2
+amarok-1.3.8.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- amarok.spec	15 Dec 2005 19:08:57 -0000	1.36
+++ amarok.spec	22 Jan 2006 09:07:06 -0000	1.37
@@ -6,14 +6,14 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.7
+Version:    1.3.8
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
-Patch0:     amarok-1.3.4-helix-libs.patch
+Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+#Patch0:     amarok-1.3.4-helix-libs.patch
 Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,13 +22,17 @@
 BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  libGL
-BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
+%if "%fedora" >= "5"
+BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
+%else
+BuildRequires:  gstreamer-plugins-devel >= 0.8.4
+%endif
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -85,7 +89,7 @@
 %prep
 %setup -q
 # Discover the helix libs
-%patch0 -p1 -b .helix-libs
+#%patch0 -p1 -b .helix-libs
 # Use libtunepimp 0.4.0 (api changed)
 %patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
@@ -216,6 +220,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-1
+- version 1.3.8
+
 * Wed Dec 07 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.7-1
 - version 1.3.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Dec 2005 10:24:48 -0000	1.17
+++ sources	22 Jan 2006 09:07:23 -0000	1.18
@@ -1 +1 @@
-e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2
+fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 09:07:45 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:07:45 -0500
Subject: rpms/amarok/devel .cvsignore, 1.17, 1.18 amarok.spec, 1.34,
	1.35 sources, 1.17, 1.18
Message-ID: <200601220908.k0M98Lrt005656@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5609/devel

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
- version 1.3.8


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	9 Dec 2005 10:24:54 -0000	1.17
+++ .cvsignore	22 Jan 2006 09:07:44 -0000	1.18
@@ -1 +1 @@
-amarok-1.3.7.tar.bz2
+amarok-1.3.8.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- amarok.spec	15 Dec 2005 19:09:26 -0000	1.34
+++ amarok.spec	22 Jan 2006 09:07:44 -0000	1.35
@@ -6,14 +6,14 @@
 
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.7
+Version:    1.3.8
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.7.tar.bz2
-Patch0:     amarok-1.3.4-helix-libs.patch
+Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+#Patch0:     amarok-1.3.4-helix-libs.patch
 Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,13 +22,17 @@
 BuildRequires:  taglib-devel >= 1.3, esound-devel
 BuildRequires:  desktop-file-utils, gettext
 BuildRequires:  libGL
-BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
 BuildRequires:  libtool-ltdl-devel
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
+%if "%fedora" >= "5"
+BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
+%else
+BuildRequires:  gstreamer-plugins-devel >= 0.8.4
+%endif
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
@@ -85,7 +89,7 @@
 %prep
 %setup -q
 # Discover the helix libs
-%patch0 -p1 -b .helix-libs
+#%patch0 -p1 -b .helix-libs
 # Use libtunepimp 0.4.0 (api changed)
 %patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
@@ -216,6 +220,9 @@
 
 
 %changelog
+* Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-1
+- version 1.3.8
+
 * Wed Dec 07 2005 Aurelien Bompard <gauret[AT]free.fr> 1.3.7-1
 - version 1.3.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	9 Dec 2005 10:24:54 -0000	1.17
+++ sources	22 Jan 2006 09:07:44 -0000	1.18
@@ -1 +1 @@
-e2297042070643c105f8bb0e524c73ad  amarok-1.3.7.tar.bz2
+fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 09:37:50 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:37:50 -0500
Subject: rpms/showimg/FC-4 showimg.spec,1.7,1.8
Message-ID: <200601220938.k0M9cM5V009558@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9526/FC-4

Modified Files:
	showimg.spec 
Log Message:
fix x86_64 build


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/FC-4/showimg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- showimg.spec	21 Jan 2006 17:16:38 -0000	1.7
+++ showimg.spec	22 Jan 2006 09:37:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -59,6 +59,7 @@
            --enable-libkipi \
            --enable-mysql \
            --enable-pgsql \
+           --with-pqxxlibdir=%{_libdir} \
            --with-kexif \
            --with-showimgdb
 #           --enable-final \
@@ -121,6 +122,9 @@
 
 
 %changelog
+* Sun Jan 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-4
+- fix pqxx detection on x86_64
+
 * Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
 - fix improper QT detection
 



From fedora-extras-commits at redhat.com  Sun Jan 22 09:37:55 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun, 22 Jan 2006 04:37:55 -0500
Subject: rpms/showimg/devel showimg.spec,1.7,1.8
Message-ID: <200601220938.k0M9cSak009561@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/showimg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9526/devel

Modified Files:
	showimg.spec 
Log Message:
fix x86_64 build


Index: showimg.spec
===================================================================
RCS file: /cvs/extras/rpms/showimg/devel/showimg.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- showimg.spec	21 Jan 2006 17:16:44 -0000	1.7
+++ showimg.spec	22 Jan 2006 09:37:55 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           showimg
 Version:        0.9.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Feature-rich image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -59,6 +59,7 @@
            --enable-libkipi \
            --enable-mysql \
            --enable-pgsql \
+           --with-pqxxlibdir=%{_libdir} \
            --with-kexif \
            --with-showimgdb
 #           --enable-final \
@@ -121,6 +122,9 @@
 
 
 %changelog
+* Sun Jan 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-4
+- fix pqxx detection on x86_64
+
 * Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.9.5-3
 - fix improper QT detection
 



From fedora-extras-commits at redhat.com  Sun Jan 22 10:51:52 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 22 Jan 2006 05:51:52 -0500
Subject: extras-buildsys/utils extras-push-all,NONE,1.1
Message-ID: <200601221051.k0MApqHE011493@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11476

Added Files:
	extras-push-all 
Log Message:
Improved push-em-all script.


--- NEW FILE extras-push-all ---
#!/bin/bash
#
# 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 Library 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 St, Fifth Floor, Boston, MA  02110-1301  USA

dists="3 4 development"
changed=

sign_move()
{
    dist=$1
    extras-sign-move.py $dist
    rc=$?
    if [ $rc -eq 4 ] ; then # no packages to sign?
        rc=0
    elif [ $rc -eq 0 ] ; then
        changed="$changed $dist"
    fi
    return $rc
}

for dist in $dists ; do
    sign_move $dist || exit $?
done

for dist in $changed ; do
    extras-repobuild.py $dist && extras-repoview.py $dist || exit $?
done

extras-sync



From fedora-extras-commits at redhat.com  Sun Jan 22 15:46:46 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 22 Jan 2006 10:46:46 -0500
Subject: rpms/wp_tray/FC-4 wp_tray.spec,1.1,1.2
Message-ID: <200601221547.k0MFlIqH020859@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20827/FC-4

Modified Files:
	wp_tray.spec 
Log Message:
Fix 64-bit build


Index: wp_tray.spec
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/FC-4/wp_tray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wp_tray.spec	18 Jan 2006 20:48:13 -0000	1.1
+++ wp_tray.spec	22 Jan 2006 15:46:45 -0000	1.2
@@ -22,8 +22,8 @@
 %patch -p 1 -b .paths
 
 %build
-%configure --with-boostfilesystem=/usr/lib/libboost_filesystem.so \
-  --with-boostregex=/usr/lib/libboost_regex.so
+%configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \
+  --with-boostregex=%{_libdir}/libboost_regex.so
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sun Jan 22 15:46:52 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 22 Jan 2006 10:46:52 -0500
Subject: rpms/wp_tray/devel wp_tray.spec,1.1,1.2
Message-ID: <200601221547.k0MFlOAh020862@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/wp_tray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20827/devel

Modified Files:
	wp_tray.spec 
Log Message:
Fix 64-bit build


Index: wp_tray.spec
===================================================================
RCS file: /cvs/extras/rpms/wp_tray/devel/wp_tray.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wp_tray.spec	18 Jan 2006 20:48:13 -0000	1.1
+++ wp_tray.spec	22 Jan 2006 15:46:52 -0000	1.2
@@ -22,8 +22,8 @@
 %patch -p 1 -b .paths
 
 %build
-%configure --with-boostfilesystem=/usr/lib/libboost_filesystem.so \
-  --with-boostregex=/usr/lib/libboost_regex.so
+%configure --with-boostfilesystem=%{_libdir}/libboost_filesystem.so \
+  --with-boostregex=%{_libdir}/libboost_regex.so
 make %{?_smp_mflags}
 
 %install



From fedora-extras-commits at redhat.com  Sun Jan 22 16:35:24 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:35:24 -0500
Subject: rpms/moomps/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200601221635.k0MGZu9t022824@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22805

Modified Files:
	.cvsignore sources 
Log Message:
upstream 5.4 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 19:51:03 -0000	1.5
+++ .cvsignore	22 Jan 2006 16:35:23 -0000	1.6
@@ -1 +1 @@
-moomps-5.3.tar.bz2
+moomps-5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2005 19:51:03 -0000	1.5
+++ sources	22 Jan 2006 16:35:23 -0000	1.6
@@ -1 +1 @@
-3f00acd118e11403ef1d6e630cb759e0  moomps-5.3.tar.bz2
+37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 16:37:50 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:37:50 -0500
Subject: rpms/moodss/devel .cvsignore,1.6,1.7 sources,1.7,1.8
Message-ID: <200601221638.k0MGcMCu022855@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22832

Modified Files:
	.cvsignore sources 
Log Message:
upstream 21.0 release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Aug 2005 19:41:28 -0000	1.6
+++ .cvsignore	22 Jan 2006 16:37:50 -0000	1.7
@@ -1 +1 @@
-moodss-20.4.tar.bz2
+moodss-21.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Aug 2005 19:41:28 -0000	1.7
+++ sources	22 Jan 2006 16:37:50 -0000	1.8
@@ -1 +1 @@
-562834a27ffe522a5cf88eb10b26fb89  moodss-20.4.tar.bz2
+1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 16:40:59 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:40:59 -0500
Subject: rpms/moodss/devel moodss.spec,1.18,1.19
Message-ID: <200601221641.k0MGfWs7022886@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22869

Modified Files:
	moodss.spec 
Log Message:
21.0 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- moodss.spec	23 Aug 2005 19:41:28 -0000	1.18
+++ moodss.spec	22 Jan 2006 16:40:59 -0000	1.19
@@ -1,26 +1,26 @@
 Name: moodss
-Version: 20.4
+Version: 21.0
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
-Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl
+Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl, R >= 2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
-multi-purpose monitoring tool with table, graphical, textual data
-viewers, thresholds, formulas and full drag and drop user interface as
-well as a UNIX daemon (separate moomps package available). Compatible
-with a variety of SQL databases for data history over time storage and
-display. Includes modules for Linux system, MySQL database, SNMP
-networking, Apache and Nagios. Modules can be written in Tcl, Perl
-(tclperl package required), Python (tclpython package required) or C.
-Moodss is localized (Japanese with input, partial French) and
-supports Unicode.
+multi-purpose monitoring and capacity planning tool with table,
+graphical, textual data viewers, thresholds, formulas and full drag
+and drop user interface as well as a UNIX daemon (separate moomps
+package available). Compatible with a variety of SQL databases for
+data history over time storage and display. Includes modules for Linux
+system, MySQL database, SNMP networking, Apache and Nagios. Modules
+can be written in Tcl, Perl (tclperl package required), Python
+(tclpython package required) or C.  Moodss is localized (Japanese with
+input, partial French) and supports Unicode.
 
 %prep
 %setup -q
@@ -58,6 +58,11 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 21.0-1
+- 21.0 upstream release
+- added R dependency
+- updated description
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 20.4-1
 - 20.4 upstream release
 



From fedora-extras-commits at redhat.com  Sun Jan 22 16:44:50 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 11:44:50 -0500
Subject: rpms/moomps/devel moomps.spec,1.7,1.8
Message-ID: <200601221645.k0MGjMb9022949@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22930

Modified Files:
	moomps.spec 
Log Message:
5.4 upstream release.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moomps.spec	23 Aug 2005 19:51:03 -0000	1.7
+++ moomps.spec	22 Jan 2006 16:44:49 -0000	1.8
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.3
+Version: 5.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 20.4, tclx >= 8.3
+Requires: moodss >= 21.0, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -78,6 +78,9 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.4-1
+- 5.4 upstream release
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.3-1
 - 5.3 upstream release
 



From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:10 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:22:10 -0500
Subject: rpms/gstreamer08-python - New directory
Message-ID: <200601221722.k0MHMCQw024931@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24920/gstreamer08-python

Log Message:
Directory /cvs/extras/rpms/gstreamer08-python added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:16 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:22:16 -0500
Subject: rpms/gstreamer08-python/devel - New directory
Message-ID: <200601221722.k0MHMIOp024952@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24920/gstreamer08-python/devel

Log Message:
Directory /cvs/extras/rpms/gstreamer08-python/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:43 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:22:43 -0500
Subject: rpms/testdisk - New directory
Message-ID: <200601221722.k0MHMjrH025003@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/testdisk

Log Message:
Directory /cvs/extras/rpms/testdisk added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:49 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:22:49 -0500
Subject: rpms/testdisk/devel - New directory
Message-ID: <200601221722.k0MHMpgo025023@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/testdisk/devel

Log Message:
Directory /cvs/extras/rpms/testdisk/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 17:22:55 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:22:55 -0500
Subject: rpms/gstreamer08-python Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601221722.k0MHMvC4025052@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029

Added Files:
	Makefile import.log 
Log Message:
Setup of module gstreamer08-python


--- NEW FILE Makefile ---
# Top level Makefile for module gstreamer08-python
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:00 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:23:00 -0500
Subject: rpms/gstreamer08-python/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601221723.k0MHN2Cp025077@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25029/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gstreamer08-python


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:07 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:23:07 -0500
Subject: rpms/testdisk Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601221723.k0MHN9S9025104@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25090

Added Files:
	Makefile import.log 
Log Message:
Setup of module testdisk


--- NEW FILE Makefile ---
# Top level Makefile for module testdisk
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:13 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:23:13 -0500
Subject: rpms/testdisk/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601221723.k0MHNFpF025123@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25090/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module testdisk


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 17:23:55 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:23:55 -0500
Subject: rpms/testdisk import.log,1.1,1.2
Message-ID: <200601221724.k0MHOTNQ025210@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25169

Modified Files:
	import.log 
Log Message:
auto-import testdisk-6.2-2 on branch devel from testdisk-6.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/testdisk/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 17:23:07 -0000	1.1
+++ import.log	22 Jan 2006 17:23:55 -0000	1.2
@@ -0,0 +1 @@
+testdisk-6_2-2:HEAD:testdisk-6.2-2.src.rpm:1137950622



From fedora-extras-commits at redhat.com  Sun Jan 22 17:24:03 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:24:03 -0500
Subject: rpms/testdisk/devel testdisk.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601221724.k0MHOZGl025217@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25169/devel

Modified Files:
	.cvsignore sources 
Added Files:
	testdisk.spec 
Log Message:
auto-import testdisk-6.2-2 on branch devel from testdisk-6.2-2.src.rpm


--- NEW FILE testdisk.spec ---
Summary:	Tool to check and undelete partition
Summary(pl):	Narz?dzie sprawdzaj?ce i odzyskuj?ce partycje
Summary(fr):	Outil pour v?rifier et restorer des partitions
Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
Name:		testdisk
Version:	6.2
Release:	2
License:	GPL
Group:		Applications/System
Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
URL:		http://www.cgsecurity.org/testdisk.html
BuildRequires:	ncurses-devel >= 5.2
BuildRequires:  e2fsprogs-devel
BuildRequires:	libjpeg-devel
BuildRoot:	%{_tmppath}/testdisk-%{version}-%{release}-root-%(%{__id_u} -n)


%description
Tool to check and undelete partition. Works with FAT12, FAT16, FAT32,
NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid, Linux Swap,
LVM, LVM2, NSS, ReiserFS, UFS, XFS

%description -l pl
Narz?dzie sprawdzaj?ce i odzyskujace partycje. Pracuje z partycjami:
FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS

%description -l fr
Outil pour v?rifier et restorer des partitions. Fonctionne avec
FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS

%description -l ru_RU.KOI8-R
????????? ??? ???????? ? ?????????????? ???????? ?????.
???????????? ????????? ???? ????????:
FAT12, FAT16, FAT32, NTFS, EXT2, EXT3, BeFS, CramFS, HFS, JFS, Linux Raid,
Linux Swap, LVM, LVM2, NSS, ReiserFS, UFS, XFS

%prep
%setup

%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR="$RPM_BUILD_ROOT" install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(644,root,root,755)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS doc
%attr(755,root,root) %{_sbindir}/testdisk
%attr(755,root,root) %{_sbindir}/photorec
%{_mandir}/man1/testdisk.1*
%{_mandir}/man1/photorec.1*
%changelog
* Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
- 5.0

* Wed Oct 1 2003 Christophe Grenier <grenier at cgsecurity.org> 4.5
- 4.5

* Wed Apr 23 2003 Christophe Grenier <grenier at cgsecurity.org> 4.4-2

* Sat Mar 29 2003 Pascal Terjan <CMoi at tuxfamily.org> 4.4-1mdk
- 4.4

* Fri Dec 27 2002 Olivier Thauvin <thauvin at aerov.jussieu.fr> 4.2-2mdk
- rebuild for rpm and glibc

* Sun Oct 06 2002 Olivier Thauvin <thauvin at aerov.jussieu.fr> 4.2-1mdk
- 4.2

* Mon Sep 02 2002 Olivier Thauvin <thauvin at aerov.jussieu.fr> 4.1-1mdk 
- By Pascal Terjan <pascal.terjan at free.fr>
	- first mdk release, adapted from PLD.
	- gz to bz2 compression.
- fix %%tmppath
- %%make instead %%{__make}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 17:23:13 -0000	1.1
+++ .cvsignore	22 Jan 2006 17:24:03 -0000	1.2
@@ -0,0 +1 @@
+testdisk-6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 17:23:13 -0000	1.1
+++ sources	22 Jan 2006 17:24:03 -0000	1.2
@@ -0,0 +1 @@
+9c103d130f56d3dd901246574a1df76b  testdisk-6.2.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:24:42 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:24:42 -0500
Subject: rpms/gstreamer08-python import.log,1.1,1.2
Message-ID: <200601221725.k0MHPExT025285@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25249

Modified Files:
	import.log 
Log Message:
auto-import gstreamer08-python-0.8.3-1 on branch devel from gstreamer08-python-0.8.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gstreamer08-python/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 17:22:54 -0000	1.1
+++ import.log	22 Jan 2006 17:24:42 -0000	1.2
@@ -0,0 +1 @@
+gstreamer08-python-0_8_3-1:HEAD:gstreamer08-python-0.8.3-1.src.rpm:1137950556



From fedora-extras-commits at redhat.com  Sun Jan 22 17:24:48 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:24:48 -0500
Subject: rpms/gstreamer08-python/devel gstreamer08-python.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601221725.k0MHPKe1025292@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer08-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25249/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gstreamer08-python.spec 
Log Message:
auto-import gstreamer08-python-0.8.3-1 on branch devel from gstreamer08-python-0.8.3-1.src.rpm


--- NEW FILE gstreamer08-python.spec ---
%define         gstreamer       gstreamer08

%define         gst_minver      0.8.7
%define         gstp_minver     0.8.5
%define         pygtk_minver    2.4.0

Name:           %{gstreamer}-python
Version:        0.8.3
Release:        1%{?dist}
Summary:        Python bindings for GStreamer

Group:          Development/Languages
License:        LGPL
URL:            http://gstreamer.freedesktop.org/
Source:         http://gstreamer.freedesktop.org/src/gst-python/gst-python-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

Requires:       python >= 2
Requires:       pygtk2 >= %{pygtk_minver}
Requires:       %{gstreamer} >= %{gst_minver}
Requires:       %{gstreamer}-plugins >= %{gstp_minver}

BuildRequires:  python >= 2
BuildRequires:  python-devel >= 2
BuildRequires:  pygtk2-devel >= %{pygtk_minver}

# xwindowlistener needs X11 Xlib
BuildRequires:  libX11-devel

BuildRequires:  %{gstreamer}-devel >= %{gst_minver}
BuildRequires:  %{gstreamer}-plugins-devel >= %{gstp_minver}

# sigh, libtool
BuildRequires:  gcc-c++

# no sense in splitting off a devel package just yet
Provides:       %{gstreamer}-python-devel = %{version}-%{release}

%description
This module contains a wrapper that allows GStreamer applications
to be written in Python.

%prep
%setup -q -n gst-python-%{version}

%build
# the "docs" were built when disting the tarball, so we don't need to
# rebuild them
%configure --disable-docs
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

%makeinstall
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc examples/gst/*.py examples/gstplay/*.py
%{_libdir}/python?.?/site-packages/gst
%dir %{_datadir}/gst-python
%{_datadir}/gst-python/examples
%dir %{_datadir}/gst-python/2.0/
%dir %{_datadir}/gst-python/2.0/defs/
%{_datadir}/gst-python/2.0/defs/*.defs
%{_libdir}/pkgconfig/gst-python-0.8.pc

%changelog
* Sun Jan 22 2006 Thomas Vander Stichele <thomas at apestaart dot org>
- Renamed package to gstreamer08-python for rawhide before FC5
- Removed Requires: of -devel packages
- BuildRequire libX11-devel now that X.org is modular

* Sat Jan 14 2006 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.3-1
- fix requires and buildrequires which were using an underscore
- update to 0.8.3 version
- remove the lib64 hack, should be fixed upstream now

* Thu May 19 2005 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.1-6
- disable docs build - they're already in the tarball

* Tue May 10 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.8.1-5
- Move __init__.py* files from lib to _libdir on multilibarchs
  Found in thias spec file, fixes x86_64

* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.1-3
- include missing directories

* Thu Mar 31 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.1-2
- add deps pygtk2-devel and gstreamer-devel for pkgconfig file

* Fri Dec 24 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.1-1: moved to Fedora Extras CVS

* Fri Dec 24 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.1-0.fdr.2: various cleanups

* Tue Dec 07 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.1-0.fdr.1: new upstream release

* Mon Nov 15 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.8.0-0.fdr.1: new upstream release

* Fri Nov 05 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.94-0.fdr.1: new upstream release

* Tue Oct 12 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.93-0.fdr.1: new upstream release

* Mon Jun 21 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.92-0.fdr.1: new upstream release

* Wed Mar 31 2004 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.7.91-0.fdr.1: new upstream release

* Tue Sep 02 2003 Thomas Vander Stichele <thomas at apestaart dot org>
- 0.1.0-0.fdr.1: first fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gstreamer08-python/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 17:23:00 -0000	1.1
+++ .cvsignore	22 Jan 2006 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+gst-python-0.8.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gstreamer08-python/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 17:23:00 -0000	1.1
+++ sources	22 Jan 2006 17:24:48 -0000	1.2
@@ -0,0 +1 @@
+f33f6b95d3911e7ad355199abea8d0ff  gst-python-0.8.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:28:09 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Sun, 22 Jan 2006 12:28:09 -0500
Subject: owners owners.list,1.559,1.560
Message-ID: <200601221728.k0MHSfJA025344@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25327

Modified Files:
	owners.list 
Log Message:
Add TestDisk entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.559
retrieving revision 1.560
diff -u -r1.559 -r1.560
--- owners.list	21 Jan 2006 21:32:15 -0000	1.559
+++ owners.list	22 Jan 2006 17:28:09 -0000	1.560
@@ -1209,6 +1209,7 @@
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|testdisk|Tool to check and undelete partition|grenier at cgsecurity.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-arabtex|The ArabTeX package for TeX/LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-armtex|Support for typesetting Armenian with TeX and LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-beamer|A LaTeX class for producing presentations and slides|jpo at di.uminho.pt|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 22 17:37:13 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 12:37:13 -0500
Subject: rpms/moodss/FC-4 .cvsignore, 1.7, 1.8 moodss.spec, 1.18,
	1.19 sources, 1.7, 1.8
Message-ID: <200601221737.k0MHbj20025384@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25360

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.0 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Aug 2005 19:56:32 -0000	1.7
+++ .cvsignore	22 Jan 2006 17:37:12 -0000	1.8
@@ -1 +1 @@
-moodss-20.4.tar.bz2
+moodss-21.0.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- moodss.spec	23 Aug 2005 19:56:32 -0000	1.18
+++ moodss.spec	22 Jan 2006 17:37:12 -0000	1.19
@@ -1,26 +1,26 @@
 Name: moodss
-Version: 20.4
+Version: 21.0
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
-Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl
+Requires: tk >= 8.4.8, blt >= 2.4-0.fdr.0.z, tktable >= 2.7, sqlite2-tcl, R >= 2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
-multi-purpose monitoring tool with table, graphical, textual data
-viewers, thresholds, formulas and full drag and drop user interface as
-well as a UNIX daemon (separate moomps package available). Compatible
-with a variety of SQL databases for data history over time storage and
-display. Includes modules for Linux system, MySQL database, SNMP
-networking, Apache and Nagios. Modules can be written in Tcl, Perl
-(tclperl package required), Python (tclpython package required) or C.
-Moodss is localized (Japanese with input, partial French) and
-supports Unicode.
+multi-purpose monitoring and capacity planning tool with table,
+graphical, textual data viewers, thresholds, formulas and full drag
+and drop user interface as well as a UNIX daemon (separate moomps
+package available). Compatible with a variety of SQL databases for
+data history over time storage and display. Includes modules for Linux
+system, MySQL database, SNMP networking, Apache and Nagios. Modules
+can be written in Tcl, Perl (tclperl package required), Python
+(tclpython package required) or C.  Moodss is localized (Japanese with
+input, partial French) and supports Unicode.
 
 %prep
 %setup -q
@@ -58,6 +58,11 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 21.0-1
+- 21.0 upstream release
+- added R dependency
+- updated description
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 20.4-1
 - 20.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Aug 2005 19:56:32 -0000	1.7
+++ sources	22 Jan 2006 17:37:12 -0000	1.8
@@ -1 +1 @@
-562834a27ffe522a5cf88eb10b26fb89  moodss-20.4.tar.bz2
+1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:39:37 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 12:39:37 -0500
Subject: rpms/moomps/FC-4 .cvsignore, 1.5, 1.6 moomps.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200601221740.k0MHe9xv025447@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25422

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.4 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 19:54:42 -0000	1.5
+++ .cvsignore	22 Jan 2006 17:39:36 -0000	1.6
@@ -1 +1 @@
-moomps-5.3.tar.bz2
+moomps-5.4.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- moomps.spec	23 Aug 2005 19:54:42 -0000	1.7
+++ moomps.spec	22 Jan 2006 17:39:36 -0000	1.8
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.3
+Version: 5.4
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 20.4, tclx >= 8.3
+Requires: moodss >= 21.0, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -78,6 +78,9 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.4-1
+- 5.4 upstream release
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 5.3-1
 - 5.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2005 19:54:42 -0000	1.5
+++ sources	22 Jan 2006 17:39:36 -0000	1.6
@@ -1 +1 @@
-3f00acd118e11403ef1d6e630cb759e0  moomps-5.3.tar.bz2
+37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 17:48:34 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun, 22 Jan 2006 12:48:34 -0500
Subject: owners owners.list,1.560,1.561
Message-ID: <200601221749.k0MHn6we025534@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25510

Modified Files:
	owners.list 
Log Message:
add myself as owner of gstreamer08-python


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.560
retrieving revision 1.561
diff -u -r1.560 -r1.561
--- owners.list	22 Jan 2006 17:28:09 -0000	1.560
+++ owners.list	22 Jan 2006 17:48:34 -0000	1.561
@@ -351,6 +351,7 @@
 Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 22 17:49:33 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 12:49:33 -0500
Subject: rpms/moomps/FC-3 .cvsignore, 1.5, 1.6 moomps.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200601221750.k0MHo5Cg025565@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25533

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.4 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2005 20:08:40 -0000	1.5
+++ .cvsignore	22 Jan 2006 17:49:33 -0000	1.6
@@ -1 +1 @@
-moomps-5.3.tar.bz2
+moomps-5.4.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-3/moomps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- moomps.spec	23 Aug 2005 20:08:40 -0000	1.8
+++ moomps.spec	22 Jan 2006 17:49:33 -0000	1.9
@@ -1,11 +1,11 @@
 Name: moomps
-Version: 5.3
+Version: 5.4
 Release: 1%{?dist}
 Epoch: 0
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.3.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -14,7 +14,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 0:20.4, tclx >= 0:8.3
+Requires: moodss >= 0:21.0 tclx >= 0:8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -79,6 +79,9 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:5.4-1
+- 5.4 upstream release
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:5.3-1
 - 5.3 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2005 20:08:40 -0000	1.5
+++ sources	22 Jan 2006 17:49:33 -0000	1.6
@@ -1 +1 @@
-3f00acd118e11403ef1d6e630cb759e0  moomps-5.3.tar.bz2
+37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 18:01:50 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Sun, 22 Jan 2006 13:01:50 -0500
Subject: rpms/moodss/FC-3 .cvsignore, 1.7, 1.8 moodss.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200601221802.k0MI2P3v027369@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27318

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.0 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Aug 2005 20:01:04 -0000	1.7
+++ .cvsignore	22 Jan 2006 18:01:49 -0000	1.8
@@ -1 +1 @@
-moodss-20.4.tar.bz2
+moodss-21.0.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/moodss.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- moodss.spec	23 Aug 2005 20:01:05 -0000	1.12
+++ moodss.spec	22 Jan 2006 18:01:49 -0000	1.13
@@ -1,27 +1,27 @@
 Name: moodss
-Version: 20.4
+Version: 21.0
 Release: 1%{?dist}
 Epoch: 0
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-20.4.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 0:8.4.7
-Requires: tk >= 0:8.4.7, blt >= 0:2.4-0.fdr.0.z, tktable >= 0:2.7, sqlite2-tcl
+Requires: tk >= 0:8.4.7, blt >= 0:2.4-0.fdr.0.z, tktable >= 0:2.7, sqlite2-tcl, R >= 0:2.1.1
 
 %description
 moodss (Modular Object Oriented Dynamic SpreadSheet) is a modular
-multi-purpose monitoring tool with table, graphical, textual data
-viewers, thresholds, formulas and full drag and drop user interface as
-well as a UNIX daemon (separate moomps package available). Compatible
-with a variety of SQL databases for data history over time storage and
-display. Includes modules for Linux system, MySQL database, SNMP
-networking, Apache and Nagios. Modules can be written in Tcl, Perl
-(tclperl package required), Python (tclpython package required) or C.
-Moodss is localized (Japanese with input, partial French) and
-supports Unicode.
+multi-purpose monitoring and capacity planning tool with table,
+graphical, textual data viewers, thresholds, formulas and full drag
+and drop user interface as well as a UNIX daemon (separate moomps
+package available). Compatible with a variety of SQL databases for
+data history over time storage and display. Includes modules for Linux
+system, MySQL database, SNMP networking, Apache and Nagios. Modules
+can be written in Tcl, Perl (tclperl package required), Python
+(tclpython package required) or C.  Moodss is localized (Japanese with
+input, partial French) and supports Unicode.
 
 %prep
 %setup -q
@@ -59,6 +59,11 @@
 
 %changelog
 
+* Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:21.0-1
+- 21.0 upstream release
+- added R dependency
+- updated description
+
 * Fri Aug 19 2005 Jean-Luc Fontaine <jfontain at free.fr> 0:20.4-1
 - 20.4 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Aug 2005 20:01:05 -0000	1.7
+++ sources	22 Jan 2006 18:01:49 -0000	1.8
@@ -1 +1 @@
-562834a27ffe522a5cf88eb10b26fb89  moodss-20.4.tar.bz2
+1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 19:54:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 14:54:33 -0500
Subject: rpms/xfce4-taskmanager/FC-3 xfce4-taskmanager.spec,1.1,1.2
Message-ID: <200601221955.k0MJt5SU029551@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29534

Modified Files:
	xfce4-taskmanager.spec 
Log Message:
Add startup-notification-devel BR for core 3


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/FC-3/xfce4-taskmanager.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-taskmanager.spec	21 Jan 2006 20:17:12 -0000	1.1
+++ xfce4-taskmanager.spec	22 Jan 2006 19:54:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-taskmanager
 Version:	0.3.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Taskmanager for the Xfce desktop environment
 
 Group:		User Interface/Desktops
@@ -10,7 +10,8 @@
 Source1:	xfce4-taskmanager.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libxfcegui4-devel >= 4.2, gettext, desktop-file-utils
+BuildRequires:	libxfcegui4-devel >= 4.2, startup-notification-devel
+BuildRequires:	gettext, desktop-file-utils
 
 %description
 A simple taskmanager for the Xfce desktop environment.
@@ -46,6 +47,9 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Sun Jan 22 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
+- Add startup-notification-devel requires.
+
 * Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2
 - Initial Fedora Extras version.
 - Add xfce4-taskmanager.desktop.



From fedora-extras-commits at redhat.com  Sun Jan 22 19:58:01 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 14:58:01 -0500
Subject: rpms/xfce4-taskmanager/FC-3 xfce4-taskmanager.spec,1.2,1.3
Message-ID: <200601221958.k0MJwXbm029611@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskmanager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29594

Modified Files:
	xfce4-taskmanager.spec 
Log Message:
fix year in changelog, it's 2006


Index: xfce4-taskmanager.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskmanager/FC-3/xfce4-taskmanager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-taskmanager.spec	22 Jan 2006 19:54:32 -0000	1.2
+++ xfce4-taskmanager.spec	22 Jan 2006 19:58:01 -0000	1.3
@@ -47,7 +47,7 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
-* Sun Jan 22 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-3
 - Add startup-notification-devel requires.
 
 * Thu Dec 15 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-2



From fedora-extras-commits at redhat.com  Sun Jan 22 20:08:44 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 22 Jan 2006 15:08:44 -0500
Subject: rpms/util-vserver/devel util-vserver.spec, 1.15, 1.16 sources, 1.7, 
	1.8 util-vserver-0.30.209-yum24.patch, 1.1,
	NONE util-vserver-0.30.209-dietfix.patch, 1.1, NONE
Message-ID: <200601222009.k0MK9G0r031445@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31426

Modified Files:
	util-vserver.spec sources 
Removed Files:
	util-vserver-0.30.209-yum24.patch 
	util-vserver-0.30.209-dietfix.patch 
Log Message:
- version 0.30.210
- removed patches which were from upstream
- do not require 'xalan' anymore by default
- removed 'Requires: apt'; apt-rpm is not maintained upstream anymore
- removed 'chattr' leftovers
- create the '/etc/vservers/.defaults/cachebase' symlink
- added /var/cache/vservers and the needed support
- set barrier attribute on /vservers/.pkg and /vservers/.hash
- added 'centos-release' to the list of packages in the copy-the-keys
  trigger script
- create '/vservers/.hash' and add initial configuration for it



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- util-vserver.spec	3 Nov 2005 18:04:20 -0000	1.15
+++ util-vserver.spec	22 Jan 2006 20:08:43 -0000	1.16
@@ -2,17 +2,14 @@
 
 ## This package understands the following switches:
 ## --without dietlibc        ...   disable usage of dietlibc
-## --without xalan           ...   do not require/use the xalan xslt processor
 ## --with    xalan           ...   require/use the xalan xslt processor
 
 ## Fedora Extras specific customization below...
-%{!?_with_xalan:%global _without_xalan	--without xalan}
 ##
 
 %global confdir		%_sysconfdir/vservers
 %global confdefaultdir	%confdir/.defaults
 %global pkglibdir	%_libdir/%name
-%global __chattr	/usr/bin/chattr
 %global chkconfig	/sbin/chkconfig
 
 %global _localstatedir	%_var
@@ -22,16 +19,13 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.209
-Release:	%release_func 4
+Version:	0.30.210
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2
 Source1:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.209-dietfix.patch
-# http://savannah.nongnu.org/cgi-bin/viewcvs/util-vserver/util-vserver/scripts/vyum-worker.diff?r1=1.5&r2=1.6
-Patch1:		util-vserver-0.30.209-yum24.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -43,14 +37,14 @@
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
 BuildRequires:	doxygen tetex-latex
-## HACK; 'make check' fails there and I do not know how to debug it
+## HACK; 'make check' fails there due to a kernel bug
 ## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
 ExcludeArch:	ppc
-Requires(post):		%__chattr
+Requires(post):		%name-core
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
 %{!?_without_dietlibc:BuildRequires:	dietlibc >= 0:0.25}
-%{!?_without_xalan:BuildRequires:	xalan-j}
+%{?_with_xalan:BuildRequires:	xalan-j}
 
 %package lib
 Summary:		Dynamic libraries for util-vserver
@@ -68,10 +62,7 @@
 Requires:		%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
-
-%ifarch %ix86
-Requires:		apt
-%endif
+Requires(post):		%name-core
 
 %package sysv
 Summary:		SysV-initscripts for vserver
@@ -176,8 +167,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dietfix
-%patch1 -p2 -b .yum24
 
 
 %build
@@ -211,10 +200,15 @@
 test -d /vservers      || mkdir -m0000 /vservers
 test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg
 
-f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers                        "$f"
-f="%confdefaultdir/run.rev";  test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f"
+f="%confdefaultdir/vdirbase";  test -L "$f" -o -e "$f" || ln -s /vservers                        "$f"
+f="%confdefaultdir/run.rev";   test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f"
+f="%confdefaultdir/cachebase"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/cache/vservers   "$f"
+
+%_sbindir/setattr --barrier /vservers /vservers/.pkg || :
+
 
-%_sbindir/setattr --barrier /vservers || :
+%preun
+test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 
 
 %post   lib -p /sbin/ldconfig
@@ -238,7 +232,7 @@
 test "$1" = 0  || %_initrddir/vprocunhide condrestart >/dev/null || :
 
 
-%triggerin build -- fedora-release
+%triggerin build -- fedora-release, centos-release
 function copy()
 {
     base=$1
@@ -251,13 +245,20 @@
 	cp -a "$i" "$target"
     done
 }
-
 copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-*
 copy fedora /etc/pki/rpm-gpg/RPM-GPG-*
-
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%post build
+test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
+
+f="%confdefaultdir/apps/vunify/hash"; test -e "$f"/method -o -e "$f"/00 || \
+	ln -s /vservers/.hash "$f"/00
+
+%_sbindir/setattr --barrier /vservers/.hash || :
+
+
 %preun build
 test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-*
 
@@ -306,9 +307,11 @@
 %dir %confdefaultdir/apps
 %dir %confdefaultdir/files
 %dir %pkglibdir/defaults
+%ghost %confdefaultdir/cachebase
 %ghost %confdefaultdir/vdirbase
 %ghost %confdefaultdir/run.rev
 
+%dir %_localstatedir/cache/vservers
 %dir %_localstatedir/run/vservers
 %dir %_localstatedir/run/vservers.rev
 %dir %_localstatedir/run/vshelper
@@ -347,6 +350,21 @@
 
 
 %changelog
+* Sun Jan 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-1
+- version 0.30.210
+- removed patches which were from upstream
+
+* Sun Jan 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-0
+- do not require 'xalan' anymore by default
+- removed 'Requires: apt'; apt-rpm is not maintained upstream anymore
+- removed 'chattr' leftovers
+- create the '/etc/vservers/.defaults/cachebase' symlink
+- added /var/cache/vservers and the needed support
+- set barrier attribute on /vservers/.pkg and /vservers/.hash
+- added 'centos-release' to the list of packages in the copy-the-keys
+  trigger script
+- create '/vservers/.hash' and add initial configuration for it
+
 * Thu Nov  3 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.209-4
 - exclude PPC from build; see
   https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Oct 2005 10:44:10 -0000	1.7
+++ sources	22 Jan 2006 20:08:43 -0000	1.8
@@ -1,2 +1,2 @@
-674b122824292c20d3c53245b91f6088  util-vserver-0.30.209.tar.bz2
-f1386336cb8ec360ad7f440ab69ea21d  util-vserver-0.30.209.tar.bz2.asc
+1e8fff7cb6246d21ed029f082123019b  util-vserver-0.30.210.tar.bz2
+46625942d7064edeaa167ae5525694b7  util-vserver-0.30.210.tar.bz2.asc


--- util-vserver-0.30.209-yum24.patch DELETED ---


--- util-vserver-0.30.209-dietfix.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 20:24:01 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 15:24:01 -0500
Subject: rpms/xfce4-sensors-plugin/FC-4 xfce4-sensors-plugin.spec,1.1,1.2
Message-ID: <200601222024.k0MKOYkE031536@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31519

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
ExcludeArch ppc for there is no lm_sensors for power pc


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-4/xfce4-sensors-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-sensors-plugin.spec	21 Jan 2006 20:48:34 -0000	1.1
+++ xfce4-sensors-plugin.spec	22 Jan 2006 20:24:01 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
 Requires:	lm_sensors >= 2.8
+ExcludeArch:	ppc
 
 %description
 This plugin displays various hardware sensor values in the Xfce panel.
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
+- ExcludeArch ppc.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 20:45:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 15:45:44 -0500
Subject: rpms/xfce4-sensors-plugin/FC-3 xfce4-sensors-plugin.spec,1.1,1.2
Message-ID: <200601222046.k0MKkGnF031718@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31701

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
ExcludeArch ppc for there is no lm_sensors for power pc


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-3/xfce4-sensors-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-sensors-plugin.spec	21 Jan 2006 20:48:34 -0000	1.1
+++ xfce4-sensors-plugin.spec	22 Jan 2006 20:45:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
 Requires:	lm_sensors >= 2.8
+ExcludeArch:	ppc
 
 %description
 This plugin displays various hardware sensor values in the Xfce panel.
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
+- ExcludeArch ppc.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 20:47:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 15:47:56 -0500
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec,1.1,1.2
Message-ID: <200601222048.k0MKmTN6031784@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31767

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
ExcludeArch ppc for there is no lm_sensors for power pc


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-sensors-plugin.spec	21 Jan 2006 20:48:34 -0000	1.1
+++ xfce4-sensors-plugin.spec	22 Jan 2006 20:47:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -12,6 +12,7 @@
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
 Requires:	lm_sensors >= 2.8
+ExcludeArch:	ppc
 
 %description
 This plugin displays various hardware sensor values in the Xfce panel.
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
+- ExcludeArch ppc.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Sun Jan 22 20:55:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 22 Jan 2006 15:55:07 -0500
Subject: rpms/dosbox/devel dosbox.spec,1.13,1.14
Message-ID: <200601222055.k0MKtdmQ031814@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31797

Modified Files:
	dosbox.spec 
Log Message:
- rebuild/dist



Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dosbox.spec	30 May 2005 19:44:28 -0000	1.13
+++ dosbox.spec	22 Jan 2006 20:55:07 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.63
-Release:        6
+Release:        7%{?dist}
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -71,6 +71,11 @@
 
 
 %changelog
+* Sun Jan 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.64-7
+- add dist
+- rebuild
+
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.64-6
 - add a x86_64 bugfix from upstream 



From fedora-extras-commits at redhat.com  Sun Jan 22 21:51:24 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 22 Jan 2006 16:51:24 -0500
Subject: rpms/doctorj/devel .cvsignore, 1.2, NONE Makefile, 1.2,
	NONE doctorj-improperseq.patch, 1.1,
	NONE doctorj-precision.patch, 1.1, NONE doctorj-yagol.patch, 1.1,
	NONE doctorj.spec, 1.11, NONE sources, 1.2, NONE
Message-ID: <200601222151.k0MLpQ08001345@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1336/devel

Removed Files:
	.cvsignore Makefile doctorj-improperseq.patch 
	doctorj-precision.patch doctorj-yagol.patch doctorj.spec 
	sources 
Log Message:
Orphaned long enough and does not build with g++ 4.1 -> dropped.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- doctorj-improperseq.patch DELETED ---


--- doctorj-precision.patch DELETED ---


--- doctorj-yagol.patch DELETED ---


--- doctorj.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 22 21:53:38 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 22 Jan 2006 16:53:38 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.5,1.6
Message-ID: <200601222154.k0MLsBkU001379@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1361

Modified Files:
	ldns.spec 
Log Message:
version update



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ldns.spec	9 Jan 2006 02:34:27 -0000	1.5
+++ ldns.spec	22 Jan 2006 21:53:38 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -77,7 +77,7 @@
 %postun -p /sbin/ldconfig
 
 %changelog
-* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-2
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
 - Upgraded to 1.0.1. Removed temporary clean hack from spec file.
 
 * Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8



From fedora-extras-commits at redhat.com  Sun Jan 22 21:55:02 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 22 Jan 2006 16:55:02 -0500
Subject: rpms/ldns/FC-4 ldns.spec,1.6,1.7
Message-ID: <200601222155.k0MLtYaN001440@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1420

Modified Files:
	ldns.spec 
Log Message:
bump version



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-4/ldns.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ldns.spec	22 Jan 2006 21:53:38 -0000	1.6
+++ ldns.spec	22 Jan 2006 21:55:02 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 22 21:57:52 2006
From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters))
Date: Sun, 22 Jan 2006 16:57:52 -0500
Subject: rpms/ldns/FC-3 ldns.spec,1.3,1.4
Message-ID: <200601222158.k0MLwOGI001516@cvs-int.fedora.redhat.com>

Author: pwouters

Update of /cvs/extras/rpms/ldns/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499

Modified Files:
	ldns.spec 
Log Message:
* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
- Upgraded to 1.0.1. Removed temporary clean hack from spec file.



Index: ldns.spec
===================================================================
RCS file: /cvs/extras/rpms/ldns/FC-3/ldns.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ldns.spec	13 Dec 2005 16:25:46 -0000	1.3
+++ ldns.spec	22 Jan 2006 21:57:52 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Lowlevel DNS(SEC) library with API
 Name: ldns
-Version: 1.0.0
-Release: 7%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 License: BSD
 Url: http://open.nlnetlabs.nl/%{name}/
 Source: http://open.nlnetlabs.nl/downloads/%{name}-%{version}.tar.gz
@@ -25,21 +25,20 @@
 
 %prep
 %setup -q 
-rm config.sub config.guess
-libtoolize
-autoreconf
-# only for 2.3.3, since upstream left .o files in release
-make clean
+
+#libtoolize
+#autoreconf
 
 %configure
 
 
 %build
-%{__make} %{?_smp_mflags} allautoconf
-%{__make} %{?_smp_mflags}
-%{__make} %{?_smp_mflags} drill
-%{__make} %{?_smp_mflags} examples
-%{__make} %{?_smp_mflags} doc
+make %{?_smp_mflags} clean
+make %{?_smp_mflags} allautoconf
+make %{?_smp_mflags}
+make %{?_smp_mflags} drill
+make %{?_smp_mflags} examples
+make %{?_smp_mflags} doc
 
 %install
 rm -rf %{buildroot}
@@ -78,8 +77,17 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Dec  5 2006 Paul Wouters <paul at xelerance.com> 1.0.1-1
+- Upgraded to 1.0.1. Removed temporary clean hack from spec file.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-8
+- Cannot use make clean because there are no Makefiles. Use hardcoded rm.
+
+* Sun Dec 18 2005 Paul Wouters <paul at xelerance.com> 1.0.0-7
+- Patched 'make clean' target to get rid of object files shipped with 1.0.0
+
 * Sun Dec 13 2005 Paul Wouters <paul at xelerance.com> 1.0.0-6
-- added a make clean for 1.0.0 since .o files were left behind upstream,
+- added a make clean for 2.3.3 since .o files were left behind upstream,
   causing failure on ppc platform
 
 * Sun Dec 11 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.0-5



From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:14 -0500
Subject: rpms/xfce4-fsguard-plugin - New directory
Message-ID: <200601222335.k0MNZGAp005306@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5298/xfce4-fsguard-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-fsguard-plugin added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:20 -0500
Subject: rpms/xfce4-fsguard-plugin/devel - New directory
Message-ID: <200601222335.k0MNZMDY005321@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5298/xfce4-fsguard-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-fsguard-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:39 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:39 -0500
Subject: rpms/xfce4-fsguard-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601222335.k0MNZfZS005355@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5343

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-fsguard-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-fsguard-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:35:44 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:35:44 -0500
Subject: rpms/xfce4-fsguard-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601222335.k0MNZkjE005376@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5343/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-fsguard-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:36:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:36:36 -0500
Subject: rpms/xfce4-fsguard-plugin import.log,1.1,1.2
Message-ID: <200601222337.k0MNb9nC005444@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5410

Modified Files:
	import.log 
Log Message:
auto-import xfce4-fsguard-plugin-0.2.1-2.fc4 on branch devel from xfce4-fsguard-plugin-0.2.1-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 23:35:38 -0000	1.1
+++ import.log	22 Jan 2006 23:36:36 -0000	1.2
@@ -0,0 +1 @@
+xfce4-fsguard-plugin-0_2_1-2_fc4:HEAD:xfce4-fsguard-plugin-0.2.1-2.fc4.src.rpm:1137972988



From fedora-extras-commits at redhat.com  Sun Jan 22 23:36:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:36:42 -0500
Subject: rpms/xfce4-fsguard-plugin/devel xfce4-fsguard-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601222337.k0MNbEe6005448@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5410/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-fsguard-plugin.spec 
Log Message:
auto-import xfce4-fsguard-plugin-0.2.1-2.fc4 on branch devel from xfce4-fsguard-plugin-0.2.1-2.fc4.src.rpm


--- NEW FILE xfce4-fsguard-plugin.spec ---
Name:		xfce4-fsguard-plugin
Version:	0.2.1
Release:	2%{?dist}
Summary:	Filesystem-Guard plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
A little Xfce plugin, which checks the free space on the chosen mountpoint 
frequently. It displays 4 different icons and a message box, depending on the
free space. The amount of free disk space is visible in a tooltip. If you 
left-click on its icon, it opens the mountpoint directory in the file manager.

%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 -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-fsguard

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-fsguard.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-1
- Initial Fedora Extras version.
- Update to 0.2.1.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.0-2.fc4.cw
- Add libxml2 BuildReqs.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.0-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.0-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 23:35:44 -0000	1.1
+++ .cvsignore	22 Jan 2006 23:36:42 -0000	1.2
@@ -0,0 +1 @@
+xfce4-fsguard-plugin-0.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 23:35:44 -0000	1.1
+++ sources	22 Jan 2006 23:36:42 -0000	1.2
@@ -0,0 +1 @@
+6fa6c2b734ee8d4c0a5901f6d704b6c9  xfce4-fsguard-plugin-0.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 22 23:38:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:38:52 -0500
Subject: rpms/xfce4-netload-plugin - New directory
Message-ID: <200601222338.k0MNcs74005538@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530/xfce4-netload-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-netload-plugin added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:38:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:38:58 -0500
Subject: rpms/xfce4-netload-plugin/devel - New directory
Message-ID: <200601222339.k0MNd0ID005553@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5530/xfce4-netload-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-netload-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 22 23:39:19 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:39:19 -0500
Subject: rpms/xfce4-netload-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601222339.k0MNdL7B005587@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-netload-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-netload-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:39:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:39:24 -0500
Subject: rpms/xfce4-netload-plugin/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601222339.k0MNdQgr005607@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5575/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-netload-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 22 23:40:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:40:10 -0500
Subject: rpms/xfce4-netload-plugin import.log,1.1,1.2
Message-ID: <200601222340.k0MNehbt005677@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643

Modified Files:
	import.log 
Log Message:
auto-import xfce4-netload-plugin-0.3.3-3.fc4 on branch devel from xfce4-netload-plugin-0.3.3-3.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Jan 2006 23:39:18 -0000	1.1
+++ import.log	22 Jan 2006 23:40:10 -0000	1.2
@@ -0,0 +1 @@
+xfce4-netload-plugin-0_3_3-3_fc4:HEAD:xfce4-netload-plugin-0.3.3-3.fc4.src.rpm:1137973203



From fedora-extras-commits at redhat.com  Sun Jan 22 23:40:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:40:16 -0500
Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601222340.k0MNemwM005681@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5643/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-netload-plugin.spec 
Log Message:
auto-import xfce4-netload-plugin-0.3.3-3.fc4 on branch devel from xfce4-netload-plugin-0.3.3-3.fc4.src.rpm


--- NEW FILE xfce4-netload-plugin.spec ---
Name:		xfce4-netload-plugin
Version:	0.3.3
Release:	3%{?dist}
Summary:	Network-load monitor for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
A network-load monitor plugin for the Xfce panel.

%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 -type f -name "*.la" -exec rm -f {} ';'
%find_lang xfce4-netload

%clean
rm -rf $RPM_BUILD_ROOT

%files -f xfce4-netload.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1.fc4.cw
- Updated to version 0.3.3.
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-1.fc4.cw
- Updated to version 0.3.2.
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-1.fc3.cw
- Updated to version 0.3.1.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.3-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Jan 2006 23:39:24 -0000	1.1
+++ .cvsignore	22 Jan 2006 23:40:16 -0000	1.2
@@ -0,0 +1 @@
+xfce4-netload-plugin-0.3.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Jan 2006 23:39:24 -0000	1.1
+++ sources	22 Jan 2006 23:40:16 -0000	1.2
@@ -0,0 +1 @@
+7a0483c77240200f1a918a1a3c5e0b33  xfce4-netload-plugin-0.3.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 22 23:58:06 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 22 Jan 2006 18:58:06 -0500
Subject: owners owners.list,1.561,1.562
Message-ID: <200601222358.k0MNwdTS005765@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5748

Modified Files:
	owners.list 
Log Message:
add xfce4-fsguard-plugin & xfce4-netload-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.561
retrieving revision 1.562
diff -u -r1.561 -r1.562
--- owners.list	22 Jan 2006 17:48:34 -0000	1.561
+++ owners.list	22 Jan 2006 23:58:06 -0000	1.562
@@ -1319,6 +1319,7 @@
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1326,6 +1327,7 @@
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mount-plugin|Mount/unmount utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-netload-plugin|Network-load monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 23 05:58:45 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:58:45 -0500
Subject: rpms/libibverbs import.log,1.2,1.3
Message-ID: <200601230559.k0N5xHvP017488@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17454

Modified Files:
	import.log 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch devel from libibverbs-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	26 Oct 2005 04:28:24 -0000	1.2
+++ import.log	23 Jan 2006 05:58:44 -0000	1.3
@@ -1 +1,2 @@
 libibverbs-1_0-0_2_rc4:HEAD:libibverbs-1.0-0.2.rc4.src.rpm:1130300901
+libibverbs-1_0-0_3_rc5:HEAD:libibverbs-1.0-0.3.rc5.src.rpm:1137995921



From fedora-extras-commits at redhat.com  Mon Jan 23 05:58:51 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:58:51 -0500
Subject: rpms/libibverbs/devel .cvsignore, 1.2, 1.3 libibverbs.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230559.k0N5xNxr017493@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17454/devel

Modified Files:
	.cvsignore libibverbs.spec sources 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch devel from libibverbs-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Oct 2005 04:28:24 -0000	1.2
+++ .cvsignore	23 Jan 2006 05:58:51 -0000	1.3
@@ -1 +1 @@
-libibverbs-1.0-rc4.tar.gz
+libibverbs-1.0-rc5.tar.gz


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libibverbs.spec	26 Oct 2005 04:28:24 -0000	1.1
+++ libibverbs.spec	23 Jan 2006 05:58:51 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libibverbs
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sysfsutils-devel
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Oct 2005 04:28:24 -0000	1.2
+++ sources	23 Jan 2006 05:58:51 -0000	1.3
@@ -1 +1 @@
-c0c757f35f19da472e313b1b6ca8827c  libibverbs-1.0-rc4.tar.gz
+a5ce940009d55d2a9f30575873e28964  libibverbs-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 05:59:53 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:59:53 -0500
Subject: rpms/libmthca import.log,1.2,1.3
Message-ID: <200601230600.k0N60Phg017598@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17556

Modified Files:
	import.log 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch devel from libmthca-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmthca/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	4 Nov 2005 00:41:32 -0000	1.2
+++ import.log	23 Jan 2006 05:59:53 -0000	1.3
@@ -1 +1,2 @@
 libmthca-1_0-0_2_rc4:HEAD:libmthca-1.0-0.2.rc4.src.rpm:1131064890
+libmthca-1_0-0_3_rc5:HEAD:libmthca-1.0-0.3.rc5.src.rpm:1137995990



From fedora-extras-commits at redhat.com  Mon Jan 23 05:59:59 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 00:59:59 -0500
Subject: rpms/libmthca/devel .cvsignore, 1.2, 1.3 libmthca.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230600.k0N60Vlb017603@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17556/devel

Modified Files:
	.cvsignore libmthca.spec sources 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch devel from libmthca-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Nov 2005 00:41:38 -0000	1.2
+++ .cvsignore	23 Jan 2006 05:59:58 -0000	1.3
@@ -1 +1 @@
-libmthca-1.0-rc4.tar.gz
+libmthca-1.0-rc5.tar.gz


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmthca.spec	4 Nov 2005 00:41:38 -0000	1.1
+++ libmthca.spec	23 Jan 2006 05:59:58 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libmthca
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Nov 2005 00:41:38 -0000	1.2
+++ sources	23 Jan 2006 05:59:58 -0000	1.3
@@ -1 +1 @@
-c20df941bea20a059316eac38a20b1a2  libmthca-1.0-rc4.tar.gz
+8fca7cdccbdb5296a126bdd190c6096b  libmthca-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 06:06:18 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:06:18 -0500
Subject: rpms/libmthca import.log,1.3,1.4
Message-ID: <200601230606.k0N66oc7019413@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19379

Modified Files:
	import.log 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch FC-4 from libmthca-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmthca/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Jan 2006 05:59:53 -0000	1.3
+++ import.log	23 Jan 2006 06:06:17 -0000	1.4
@@ -1,2 +1,3 @@
 libmthca-1_0-0_2_rc4:HEAD:libmthca-1.0-0.2.rc4.src.rpm:1131064890
 libmthca-1_0-0_3_rc5:HEAD:libmthca-1.0-0.3.rc5.src.rpm:1137995990
+libmthca-1_0-0_3_rc5:FC-4:libmthca-1.0-0.3.rc5.src.rpm:1137996363



From fedora-extras-commits at redhat.com  Mon Jan 23 06:06:39 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:06:39 -0500
Subject: rpms/libmthca/FC-4 .cvsignore, 1.2, 1.3 libmthca.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230607.k0N67HBd019419@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libmthca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19379/FC-4

Modified Files:
	.cvsignore libmthca.spec sources 
Log Message:
auto-import libmthca-1.0-0.3.rc5 on branch FC-4 from libmthca-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Nov 2005 00:41:38 -0000	1.2
+++ .cvsignore	23 Jan 2006 06:06:38 -0000	1.3
@@ -1 +1 @@
-libmthca-1.0-rc4.tar.gz
+libmthca-1.0-rc5.tar.gz


Index: libmthca.spec
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/libmthca.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmthca.spec	4 Nov 2005 00:41:38 -0000	1.1
+++ libmthca.spec	23 Jan 2006 06:06:38 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libmthca
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: Mellanox InfiniBand HCA Userspace Driver
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libmthca-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libmthca-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libibverbs-devel
@@ -55,6 +55,9 @@
 %{_libdir}/infiniband/mthca.a
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmthca/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Nov 2005 00:41:38 -0000	1.2
+++ sources	23 Jan 2006 06:06:38 -0000	1.3
@@ -1 +1 @@
-c20df941bea20a059316eac38a20b1a2  libmthca-1.0-rc4.tar.gz
+8fca7cdccbdb5296a126bdd190c6096b  libmthca-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 06:08:44 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:08:44 -0500
Subject: rpms/libibverbs import.log,1.3,1.4
Message-ID: <200601230609.k0N69dPc019524@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19486

Modified Files:
	import.log 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch FC-4 from libibverbs-1.0-0.3.rc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	23 Jan 2006 05:58:44 -0000	1.3
+++ import.log	23 Jan 2006 06:08:44 -0000	1.4
@@ -1,2 +1,3 @@
 libibverbs-1_0-0_2_rc4:HEAD:libibverbs-1.0-0.2.rc4.src.rpm:1130300901
 libibverbs-1_0-0_3_rc5:HEAD:libibverbs-1.0-0.3.rc5.src.rpm:1137995921
+libibverbs-1_0-0_3_rc5:FC-4:libibverbs-1.0-0.3.rc5.src.rpm:1137996521



From fedora-extras-commits at redhat.com  Mon Jan 23 06:09:10 2006
From: fedora-extras-commits at redhat.com (Roland Dreier (dreier))
Date: Mon, 23 Jan 2006 01:09:10 -0500
Subject: rpms/libibverbs/FC-4 .cvsignore, 1.2, 1.3 libibverbs.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200601230609.k0N69gKL019529@cvs-int.fedora.redhat.com>

Author: dreier

Update of /cvs/extras/rpms/libibverbs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19486/FC-4

Modified Files:
	.cvsignore libibverbs.spec sources 
Log Message:
auto-import libibverbs-1.0-0.3.rc5 on branch FC-4 from libibverbs-1.0-0.3.rc5.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Oct 2005 04:28:24 -0000	1.2
+++ .cvsignore	23 Jan 2006 06:09:10 -0000	1.3
@@ -1 +1 @@
-libibverbs-1.0-rc4.tar.gz
+libibverbs-1.0-rc5.tar.gz


Index: libibverbs.spec
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libibverbs.spec	26 Oct 2005 04:28:24 -0000	1.1
+++ libibverbs.spec	23 Jan 2006 06:09:10 -0000	1.2
@@ -1,16 +1,16 @@
 # $Id$
 
-%define ver      1.0-rc4
+%define ver      1.0-rc5
 
 Name: libibverbs
 Version: 1.0
-Release: 0.2.rc4%{?dist}
+Release: 0.3.rc5%{?dist}
 Summary: A library for direct userspace use of InfiniBand
 
 Group: System Environment/Libraries
 License: GPL/BSD
 Url: http://openib.org/
-Source: http://openib.org/downloads/libibverbs-1.0-rc4.tar.gz
+Source: http://openib.org/downloads/libibverbs-1.0-rc5.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: sysfsutils-devel
@@ -77,6 +77,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Oct 25 2005 Roland Dreier <roland at cisco.com> - 1.0-0.3.rc5
+- New upstream release
+
 * Wed Oct  5 2005 Roland Dreier <roland at cisco.com> - 1.0-0.2.rc4
 - Update to upstream 1.0-rc4 release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Oct 2005 04:28:24 -0000	1.2
+++ sources	23 Jan 2006 06:09:10 -0000	1.3
@@ -1 +1 @@
-c0c757f35f19da472e313b1b6ca8827c  libibverbs-1.0-rc4.tar.gz
+a5ce940009d55d2a9f30575873e28964  libibverbs-1.0-rc5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 07:45:35 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Jan 2006 02:45:35 -0500
Subject: rpms/testdisk/devel testdisk.spec,1.1,1.2
Message-ID: <200601230746.k0N7k7nX021831@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21814

Modified Files:
	testdisk.spec 
Log Message:
Update spec file



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testdisk.spec	22 Jan 2006 17:24:03 -0000	1.1
+++ testdisk.spec	23 Jan 2006 07:45:35 -0000	1.2
@@ -4,7 +4,7 @@
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
 Version:	6.2
-Release:	2
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -57,6 +57,10 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Mon Jan 23 2006 Christophe Group <grenier at cgsecurity.org>
+- 6.2-3
+- same spec for all arches hence add dist
+
 * Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
 - 5.0
 



From fedora-extras-commits at redhat.com  Mon Jan 23 07:47:13 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Jan 2006 02:47:13 -0500
Subject: rpms/testdisk/FC-3 testdisk.spec,1.1,1.2
Message-ID: <200601230747.k0N7ljbZ021903@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21871/FC-3

Modified Files:
	testdisk.spec 
Log Message:
Same spec file for all dist



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-3/testdisk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testdisk.spec	22 Jan 2006 17:24:03 -0000	1.1
+++ testdisk.spec	23 Jan 2006 07:47:13 -0000	1.2
@@ -4,7 +4,7 @@
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
 Version:	6.2
-Release:	2
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -57,6 +57,10 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Mon Jan 23 2006 Christophe Group <grenier at cgsecurity.org>
+- 6.2-3
+- same spec for all arches hence add dist
+
 * Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
 - 5.0
 



From fedora-extras-commits at redhat.com  Mon Jan 23 07:47:19 2006
From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier))
Date: Mon, 23 Jan 2006 02:47:19 -0500
Subject: rpms/testdisk/FC-4 testdisk.spec,1.1,1.2
Message-ID: <200601230747.k0N7lppk021906@cvs-int.fedora.redhat.com>

Author: grenier

Update of /cvs/extras/rpms/testdisk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21871/FC-4

Modified Files:
	testdisk.spec 
Log Message:
Same spec file for all dist



Index: testdisk.spec
===================================================================
RCS file: /cvs/extras/rpms/testdisk/FC-4/testdisk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- testdisk.spec	22 Jan 2006 17:24:03 -0000	1.1
+++ testdisk.spec	23 Jan 2006 07:47:18 -0000	1.2
@@ -4,7 +4,7 @@
 Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ?????
 Name:		testdisk
 Version:	6.2
-Release:	2
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.cgsecurity.org/testdisk-%{version}.tar.bz2
@@ -57,6 +57,10 @@
 %{_mandir}/man1/testdisk.1*
 %{_mandir}/man1/photorec.1*
 %changelog
+* Mon Jan 23 2006 Christophe Group <grenier at cgsecurity.org>
+- 6.2-3
+- same spec for all arches hence add dist
+
 * Sun Jan 4 2004 Christophe Grenier <grenier at cgsecurity.org> 5.0
 - 5.0
 



From fedora-extras-commits at redhat.com  Mon Jan 23 07:57:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 02:57:34 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.11, 1.12 rxvt-unicode.spec,
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200601230758.k0N7w6nL022102@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jan 2006 21:54:03 -0000	1.11
+++ .cvsignore	23 Jan 2006 07:57:34 -0000	1.12
@@ -1 +1 @@
-rxvt-unicode-7.1.tar.bz2
+rxvt-unicode-7.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rxvt-unicode.spec	19 Jan 2006 21:54:03 -0000	1.13
+++ rxvt-unicode.spec	23 Jan 2006 07:57:34 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.1
+Version:        7.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.2-1
+- version upgrade (should resolve #178561)
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jan 2006 21:54:03 -0000	1.11
+++ sources	23 Jan 2006 07:57:34 -0000	1.12
@@ -1 +1 @@
-2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2
+8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 07:57:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 02:57:39 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.11, 1.12 rxvt-unicode.spec,
	1.13, 1.14 sources, 1.11, 1.12
Message-ID: <200601230758.k0N7wCCk022107@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jan 2006 21:54:09 -0000	1.11
+++ .cvsignore	23 Jan 2006 07:57:39 -0000	1.12
@@ -1 +1 @@
-rxvt-unicode-7.1.tar.bz2
+rxvt-unicode-7.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- rxvt-unicode.spec	19 Jan 2006 21:54:09 -0000	1.13
+++ rxvt-unicode.spec	23 Jan 2006 07:57:39 -0000	1.14
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.1
+Version:        7.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.2-1
+- version upgrade (should resolve #178561)
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jan 2006 21:54:09 -0000	1.11
+++ sources	23 Jan 2006 07:57:39 -0000	1.12
@@ -1 +1 @@
-2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2
+8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 07:57:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 02:57:45 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.11, 1.12 rxvt-unicode.spec,
	1.17, 1.18 sources, 1.11, 1.12
Message-ID: <200601230758.k0N7wHOk022112@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	19 Jan 2006 21:54:15 -0000	1.11
+++ .cvsignore	23 Jan 2006 07:57:45 -0000	1.12
@@ -1 +1 @@
-rxvt-unicode-7.1.tar.bz2
+rxvt-unicode-7.2.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rxvt-unicode.spec	20 Jan 2006 08:30:30 -0000	1.17
+++ rxvt-unicode.spec	23 Jan 2006 07:57:45 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.1
+Version:        7.2
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,7 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
-%changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.2-1
+- version upgrade (should resolve #178561)
+
 * Thu Jan 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.1-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Jan 2006 21:54:15 -0000	1.11
+++ sources	23 Jan 2006 07:57:45 -0000	1.12
@@ -1 +1 @@
-2cb8248d9b0f6d277c5be548b3e33d20  rxvt-unicode-7.1.tar.bz2
+8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 08:00:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 03:00:56 -0500
Subject: rpms/fluxconf/FC-4 .cvsignore, 1.3, 1.4 fluxconf.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200601230801.k0N81SaY023898@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxconf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130/FC-4

Modified Files:
	.cvsignore fluxconf.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 May 2005 22:12:53 -0000	1.3
+++ .cvsignore	23 Jan 2006 08:00:55 -0000	1.4
@@ -1 +1 @@
-fluxconf-0.9.8.tar.gz
+fluxconf-0.9.9.tar.gz


Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-4/fluxconf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fluxconf.spec	16 Oct 2005 21:19:38 -0000	1.8
+++ fluxconf.spec	23 Jan 2006 08:00:55 -0000	1.9
@@ -1,13 +1,13 @@
 Name:		fluxconf
-Version:	0.9.8
-Release:	2%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 
 Summary:	Configuration utility for fluxbox
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://devaux.fabien.free.fr/flux
-Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
+Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.9.tar.gz
 Patch0:         fluxconf-Makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,6 +51,10 @@
 %lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.9-1
+- version upgrade
+
 * Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.8-2
 - use %lang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 May 2005 22:12:53 -0000	1.3
+++ sources	23 Jan 2006 08:00:55 -0000	1.4
@@ -1 +1 @@
-b4e17b45fcec48d04c1c16e75836b6b7  fluxconf-0.9.8.tar.gz
+ac37b12410daa06128f8eb29163a741d  fluxconf-0.9.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 08:00:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 03:00:50 -0500
Subject: rpms/fluxconf/FC-3 .cvsignore, 1.3, 1.4 fluxconf.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601230801.k0N81MVj023893@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxconf/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130/FC-3

Modified Files:
	.cvsignore fluxconf.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 May 2005 22:04:08 -0000	1.3
+++ .cvsignore	23 Jan 2006 08:00:50 -0000	1.4
@@ -1 +1 @@
-fluxconf-0.9.8.tar.gz
+fluxconf-0.9.9.tar.gz


Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-3/fluxconf.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fluxconf.spec	31 May 2005 22:04:08 -0000	1.4
+++ fluxconf.spec	23 Jan 2006 08:00:50 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		fluxconf
-Version:	0.9.8
+Version:	0.9.9
 Release:	1%{?dist}
 Epoch:		0
 Summary:	Configuration utility for fluxbox
@@ -7,19 +7,14 @@
 Group:          User Interface/Desktops 
 License:	GPL
 Url:		http://devaux.fabien.free.fr/flux
-
-
-Source:		http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
+Source:		http://devaux.fabien.free.fr/flux/fluxconf-0.9.9.tar.gz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
 Requires:	fluxbox
 
-
-
 %description
-
 Fluxbox graphical configuration utilities:
 fluxconf: a general configuration tool
 fluxkeys: keyboard shortcut configuration tool  
@@ -59,10 +54,14 @@
 %defattr(0644,root,root,0755)
 %doc ChangeLog README COPYING AUTHORS NEWS docs/*.png docs/*.html
 %defattr(0444,root,root)
-%{_prefix}/share/locale/fi/LC_MESSAGES/%{name}.mo
-%{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
+%lang(fi) %{_prefix}/share/locale/fi/LC_MESSAGES/%{name}.mo
+%lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.9-1
+- version upgrade
+
 * Tue May 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - upgrade to 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 May 2005 22:04:08 -0000	1.3
+++ sources	23 Jan 2006 08:00:50 -0000	1.4
@@ -1 +1 @@
-b4e17b45fcec48d04c1c16e75836b6b7  fluxconf-0.9.8.tar.gz
+ac37b12410daa06128f8eb29163a741d  fluxconf-0.9.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 08:01:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 23 Jan 2006 03:01:05 -0500
Subject: rpms/fluxconf/devel .cvsignore, 1.2, 1.3 fluxconf.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200601230801.k0N81eV8023905@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxconf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22130/devel

Modified Files:
	.cvsignore fluxconf.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:19:32 -0000	1.2
+++ .cvsignore	23 Jan 2006 08:01:02 -0000	1.3
@@ -1 +1 @@
-fluxconf-0.9.7.tar.gz
+fluxconf-0.9.9.tar.gz


Index: fluxconf.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/fluxconf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fluxconf.spec	16 Oct 2005 21:19:38 -0000	1.8
+++ fluxconf.spec	23 Jan 2006 08:01:02 -0000	1.9
@@ -1,13 +1,13 @@
 Name:		fluxconf
-Version:	0.9.8
-Release:	2%{?dist}
+Version:	0.9.9
+Release:	1%{?dist}
 
 Summary:	Configuration utility for fluxbox
 
 Group:		User Interface/Desktops
 License:	GPL
 URL:		http://devaux.fabien.free.fr/flux
-Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.8.tar.gz
+Source0:	http://devaux.fabien.free.fr/flux/fluxconf-0.9.9.tar.gz
 Patch0:         fluxconf-Makefile.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,6 +51,10 @@
 %lang(fr) %{_prefix}/share/locale/fr/LC_MESSAGES/%{name}.mo
 
 %changelog
+* Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.9-1
+- version upgrade
+
 * Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.8-2
 - use %lang


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fluxconf/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Jun 2005 10:57:56 -0000	1.3
+++ sources	23 Jan 2006 08:01:04 -0000	1.4
@@ -1 +1 @@
-b4e17b45fcec48d04c1c16e75836b6b7  fluxconf-0.9.8.tar.gz
+ac37b12410daa06128f8eb29163a741d  fluxconf-0.9.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 08:37:12 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Jan 2006 03:37:12 -0500
Subject: fedora-security/audit fc4,1.132,1.133 fc5,1.42,1.43
Message-ID: <200601230837.k0N8bCul024094@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24074

Modified Files:
	fc4 fc5 
Log Message:
(Many times I say aaagh instead of php)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- fc4	21 Jan 2006 01:38:10 -0000	1.132
+++ fc4	23 Jan 2006 08:37:04 -0000	1.133
@@ -3,10 +3,12 @@
 
 ** are items that need attention
 
+CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERALBE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
-CVE-2006-0200 version (aaph, 5.1.0 5.1.1 only)
+CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
 CVE-2006-0197 ** xorg-x11
 CVE-2006-0097 ignore (php) Windows only
 CVE-2006-0096 ignore (kernel) minor and requires root


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- fc5	18 Jan 2006 13:51:40 -0000	1.42
+++ fc5	23 Jan 2006 08:37:04 -0000	1.43
@@ -15,6 +15,8 @@
 
 ** are items that need attention
 
+CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0208 VULNERABLE (php)
 CVE-2006-0207 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Mon Jan 23 09:09:22 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 23 Jan 2006 04:09:22 -0500
Subject: fedora-security/audit fc4,1.133,1.134 fc5,1.43,1.44
Message-ID: <200601230909.k0N99Mua026169@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26151

Modified Files:
	fc4 fc5 
Log Message:
Deal with issues over the last few days



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- fc4	23 Jan 2006 08:37:04 -0000	1.133
+++ fc4	23 Jan 2006 09:08:59 -0000	1.134
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060115
-Up to date FC4 as of 20060115
+Up to date CVE as of CVE email 20060122
+Up to date FC4 as of 20060122
 
 ** are items that need attention
 
@@ -17,6 +17,7 @@
 CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15)
 CVE-2006-0035 VULNERABLE (kernel)
+CVE-2006-0019 backport (kdelibs) [since FEDORA-2006-050]
 CVE-2005-4639 VULNERABLE (kernel)
 CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 backport (kernel, fixed 2.6.15) [since FEDORA-2006-013]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- fc5	23 Jan 2006 08:37:04 -0000	1.43
+++ fc5	23 Jan 2006 09:08:59 -0000	1.44
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060115
+Up to date CVE as of CVE email 20060122
 Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -30,6 +30,7 @@
 CVE-2006-0037 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2006-0036 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
 CVE-2006-0035 VULNERABLE (kernel, only 2.6.14 and 2.6.15) bz#177916
+CVE-2006-0019 VULNERABLE (kdelibs)
 CVE-2005-4639 version (kernel, fixed 2.6.15)
 CVE-2005-4636 version (openoffice.org, fixed 2.0.1)
 CVE-2005-4635 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Mon Jan 23 09:42:03 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 23 Jan 2006 04:42:03 -0500
Subject: rpms/enigma/devel enigma.spec,1.10,1.11
Message-ID: <200601230942.k0N9gaeh026659@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26635

Modified Files:
	enigma.spec 
Log Message:
* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.92-2
- Added patch to build with gcc 4.1



Index: enigma.spec
===================================================================
RCS file: /cvs/extras/rpms/enigma/devel/enigma.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- enigma.spec	25 Jun 2005 11:37:57 -0000	1.10
+++ enigma.spec	23 Jan 2006 09:42:03 -0000	1.11
@@ -1,12 +1,13 @@
 Name:           enigma
 Version:        0.92
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Clone of the ATARI game Oxyd
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.nongnu.org/enigma/
 Source0:        http://savannah.nongnu.org/download/enigma/enigma-0.92.tar.gz
+Patch0:         enigma-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel >= 1.2  SDL_image-devel >= 1.2 SDL_mixer-devel >= 1.2.4
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-optimize
@@ -63,6 +65,9 @@
 %{_datadir}/applications/*enigma.desktop
 
 %changelog
+* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.92-2
+- Added patch to build with gcc 4.1
+
 * Sat May 07 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.92-1
 - Update to 0.92
 - Use disttag



From fedora-extras-commits at redhat.com  Mon Jan 23 09:48:19 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 23 Jan 2006 04:48:19 -0500
Subject: rpms/enigma/devel enigma-gcc41.patch,NONE,1.1
Message-ID: <200601230948.k0N9mLHP026735@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/enigma/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26723

Added Files:
	enigma-gcc41.patch 
Log Message:
* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.92-2
- Added patch to build with gcc 4.1


enigma-gcc41.patch:

--- NEW FILE enigma-gcc41.patch ---
diff -ur enigma-0.92/src/file_internal.hh enigma-0.92.new/src/file_internal.hh
--- enigma-0.92/src/file_internal.hh	2004-10-22 19:26:25.000000000 +0200
+++ enigma-0.92.new/src/file_internal.hh	2006-01-23 08:34:49.000000000 +0100
@@ -19,7 +19,7 @@
 
     class GameFS {
     public:
-        GameFS::GameFS();
+        GameFS();
 
         void clear() { entries.clear(); }

diff -ur enigma-0.92/src/stones_simple.cc enigma-0.92.new/src/stones_simple.cc
--- enigma-0.92/src/stones_simple.cc	2005-03-02 21:33:36.000000000 +0100
+++ enigma-0.92.new/src/stones_simple.cc	2006-01-23 08:39:51.000000000 +0100
@@ -1672,7 +1672,7 @@
             KillStone(p);
             SetItem(p, it_explosion1);
         }
-        void BombStone::message(const string &msg, const Value &) {
+        void message(const string &msg, const Value &) {
             if (msg =="expl" || msg =="bombstone")
                 change_state(BREAK);
         }



From fedora-extras-commits at redhat.com  Mon Jan 23 13:17:33 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 08:17:33 -0500
Subject: rpms/digikam/devel digikam.spec,1.19,1.20
Message-ID: <200601231318.k0NDI688001971@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1951

Modified Files:
	digikam.spec 
Log Message:
- Add some stuff to BuildRequires (finally fix bug #178031)



Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- digikam.spec	17 Jan 2006 16:36:04 -0000	1.19
+++ digikam.spec	23 Jan 2006 13:17:32 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.0
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -10,9 +10,10 @@
 Patch0:		digikam-0.8.0-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
-BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext libtool-ltdl-devel
+BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
+BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
+BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
+BuildRequires:	desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -118,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
+- Add some stuff to BuildRequires (finally fix bug #178031)
+
 * Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
 - Remove redundant BuildRequires (bug #178031)
 



From fedora-extras-commits at redhat.com  Mon Jan 23 14:03:14 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 23 Jan 2006 09:03:14 -0500
Subject: rpms/gaim-meanwhile/devel .cvsignore, 1.7, 1.8 gaim-meanwhile.spec, 
	1.11, 1.12 sources, 1.7, 1.8 g-mw-empty-message-crash.patch, 1.2,
	NONE g-mw-empty-title-crash.patch, 1.2, NONE
Message-ID: <200601231403.k0NE3phL003996@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3971

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Removed Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jan 2006 18:07:49 -0000	1.7
+++ .cvsignore	23 Jan 2006 14:03:14 -0000	1.8
@@ -1 +1 @@
-gaim-meanwhile-1.2.7.tar.gz
+gaim-meanwhile-1.2.8.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gaim-meanwhile.spec	13 Jan 2006 20:58:25 -0000	1.11
+++ gaim-meanwhile.spec	23 Jan 2006 14:03:14 -0000	1.12
@@ -6,23 +6,19 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
-Patch0:         g-mw-empty-title-crash.patch
-Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -43,7 +39,12 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
-* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+* Mon Jan 23 2006 - jwboyer at jdub.homelinux.org 1.2.8-1
+- Update to latest release
+- Remove patches (in upstream)
+- Fix typo in last changelog
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-3
 - Fix patches to have the correct strip level.  Gah.
 
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	3 Jan 2006 18:07:49 -0000	1.7
+++ sources	23 Jan 2006 14:03:14 -0000	1.8
@@ -1 +1 @@
-890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz
+da891cb5304776ace34ce63c7f666172  gaim-meanwhile-1.2.8.tar.gz


--- g-mw-empty-message-crash.patch DELETED ---


--- g-mw-empty-title-crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 15:32:09 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 10:32:09 -0500
Subject: rpms/gtk-qt-engine/devel gtk-qt-engine-0.6-dt.patch, NONE,
	1.1 gtk-qt-engine.spec, 1.15, 1.16
Message-ID: <200601231532.k0NFWg6C006997@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6977

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-0.6-dt.patch 
Log Message:
* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
- don't dup "GTK Styles and fonts" in KDE menu(s)
- drop Req: kdebase


gtk-qt-engine-0.6-dt.patch:

--- NEW FILE gtk-qt-engine-0.6-dt.patch ---
--- gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop.dt	2004-08-22 03:40:29.000000000 -0500
+++ gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop	2006-01-23 09:28:15.000000000 -0600
@@ -12,3 +12,5 @@
 X-KDE-Library=kcmgtk
 X-KDE-ModuleType=Library
 Type=Application
+
+NotShowIn=KDE


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gtk-qt-engine.spec	27 Oct 2005 15:19:56 -0000	1.15
+++ gtk-qt-engine.spec	23 Jan 2006 15:32:09 -0000	1.16
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -34,7 +34,8 @@
 ## build fails w/gcc-2.9x:
 ## http://bugs.freedesktop.org/show_bug.cgi?id=4676
 Patch1: gtk-qt-engine-gcc29.patch
-
+## don't dup GTK-QT in kde menu(s)
+Patch2: gtk-qt-engine-0.6-dt.patch
 
 BuildRequires: automake17
 
@@ -45,9 +46,6 @@
 BuildRequires: kdelibs-devel >= 6:3.3
 BuildRequires: libpng-devel
 
-# For KDE Control center
-Requires: kdebase
-
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
@@ -61,6 +59,7 @@
 
 %{!?cvs:%patch0 -p0 -b .x86_64}
 %{?gcc296:%patch1 -p1 -b .gcc29}
+%patch2 -p1 -b .dt
 %patch3919 -p1 -b .3919
 %patch3983 -p1 -b .3983
 
@@ -75,8 +74,8 @@
 
 %configure \
   --disable-rpath \
-  %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
@@ -101,15 +100,19 @@
 %files -f gtkqtengine.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
-%{_datadir}/themes/Qt
-%{_datadir}/gtk-qt-engine
+%{_datadir}/themes/Qt/
+%{_datadir}/gtk-qt-engine/
 %{_datadir}/applications/*.desktop
-%{_datadir}/applnk/Settings/*/*.desktop
+%{_datadir}/applnk/Settings/LookNFeel/*.desktop
 %{_libdir}/gtk-2.0/*/engines/*
 %{_libdir}/kde3/kcm_*.*
 
 
 %changelog 
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+- don't dup "GTK Styles and fonts" in KDE menu(s)
+- drop Req: kdebase
+
 * Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
 - revert to 0.6.
 - Req: kdebase



From fedora-extras-commits at redhat.com  Mon Jan 23 15:33:56 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 10:33:56 -0500
Subject: rpms/gtk-qt-engine/FC-4 gtk-qt-engine.spec,1.8,1.9
Message-ID: <200601231534.k0NFYTeQ007069@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7018

Modified Files:
	gtk-qt-engine.spec 
Log Message:
* Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
- revert to 0.6.
- Req: kdebase
- cleanout unused crud
- fix gtk/cairo crasher (fdo bug #3214)
- segfault in libqtengine.so drawing notebook (fdo bug #3919)



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/gtk-qt-engine.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gtk-qt-engine.spec	27 Oct 2005 15:21:52 -0000	1.8
+++ gtk-qt-engine.spec	23 Jan 2006 15:33:56 -0000	1.9
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -34,7 +34,8 @@
 ## build fails w/gcc-2.9x:
 ## http://bugs.freedesktop.org/show_bug.cgi?id=4676
 Patch1: gtk-qt-engine-gcc29.patch
-
+## don't dup GTK-QT in kde menu(s)
+Patch2: gtk-qt-engine-0.6-dt.patch
 
 BuildRequires: automake17
 
@@ -45,9 +46,6 @@
 BuildRequires: kdelibs-devel >= 6:3.3
 BuildRequires: libpng-devel
 
-# For KDE Control center
-Requires: kdebase
-
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
@@ -61,6 +59,7 @@
 
 %{!?cvs:%patch0 -p0 -b .x86_64}
 %{?gcc296:%patch1 -p1 -b .gcc29}
+%patch2 -p1 -b .dt
 %patch3919 -p1 -b .3919
 %patch3983 -p1 -b .3983
 
@@ -75,8 +74,8 @@
 
 %configure \
   --disable-rpath \
-  %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
@@ -101,15 +100,19 @@
 %files -f gtkqtengine.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
-%{_datadir}/themes/Qt
-%{_datadir}/gtk-qt-engine
+%{_datadir}/themes/Qt/
+%{_datadir}/gtk-qt-engine/
 %{_datadir}/applications/*.desktop
-%{_datadir}/applnk/Settings/*/*.desktop
+%{_datadir}/applnk/Settings/LookNFeel/*.desktop
 %{_libdir}/gtk-2.0/*/engines/*
 %{_libdir}/kde3/kcm_*.*
 
 
 %changelog 
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+- don't dup "GTK Styles and fonts" in KDE menu(s)
+- drop Req: kdebase
+
 * Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
 - revert to 0.6.
 - Req: kdebase



From fedora-extras-commits at redhat.com  Mon Jan 23 15:48:40 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 23 Jan 2006 10:48:40 -0500
Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.13,1.14
Message-ID: <200601231549.k0NFnCCC007175@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7156

Modified Files:
	xchat-gnome.spec 
Log Message:
* Mon Jan 23 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-3
- Bump.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xchat-gnome.spec	21 Jan 2006 05:15:10 -0000	1.13
+++ xchat-gnome.spec	23 Jan 2006 15:48:40 -0000	1.14
@@ -3,7 +3,7 @@
 
 Name:           xchat-gnome
 Version:        0.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -137,6 +137,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-3
+- Bump.
+
 * Sat Jan 21 2006 Brian Pepple <bdpepple at ameritech.net> - 0.9-2
 - Add xchat_gnome_url_handler.schemas to scriptlet.
 



From fedora-extras-commits at redhat.com  Mon Jan 23 16:00:54 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 11:00:54 -0500
Subject: rpms/gtk-qt-engine/FC-4 gtk-qt-engine-0.6-dt.patch, NONE,
	1.1 gtk-qt-engine.spec, 1.9, 1.10
Message-ID: <200601231601.k0NG1ViC008954@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240/FC-4

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-0.6-dt.patch 
Log Message:
Release++, add missed patch in FC-4 branch


gtk-qt-engine-0.6-dt.patch:

--- NEW FILE gtk-qt-engine-0.6-dt.patch ---
--- gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop.dt	2004-08-22 03:40:29.000000000 -0500
+++ gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop	2006-01-23 09:28:15.000000000 -0600
@@ -12,3 +12,5 @@
 X-KDE-Library=kcmgtk
 X-KDE-ModuleType=Library
 Type=Application
+
+NotShowIn=KDE


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-4/gtk-qt-engine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gtk-qt-engine.spec	23 Jan 2006 15:33:56 -0000	1.9
+++ gtk-qt-engine.spec	23 Jan 2006 16:00:54 -0000	1.10
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -109,7 +109,7 @@
 
 
 %changelog 
-* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-7
 - don't dup "GTK Styles and fonts" in KDE menu(s)
 - drop Req: kdebase
 



From fedora-extras-commits at redhat.com  Mon Jan 23 16:01:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 23 Jan 2006 11:01:00 -0500
Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.16,1.17
Message-ID: <200601231601.k0NG1W5u008957@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7240/devel

Modified Files:
	gtk-qt-engine.spec 
Log Message:
Release++, add missed patch in FC-4 branch



Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gtk-qt-engine.spec	23 Jan 2006 15:32:09 -0000	1.16
+++ gtk-qt-engine.spec	23 Jan 2006 16:01:00 -0000	1.17
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -109,7 +109,7 @@
 
 
 %changelog 
-* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-7
 - don't dup "GTK Styles and fonts" in KDE menu(s)
 - drop Req: kdebase
 



From fedora-extras-commits at redhat.com  Mon Jan 23 17:12:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:12:47 -0500
Subject: rpms/perl-Pod-Simple/FC-3 .cvsignore, 1.3, 1.4 perl-Pod-Simple.spec,
	1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601231713.k0NHDJGw011176@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Simple/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/FC-3

Modified Files:
	.cvsignore perl-Pod-Simple.spec sources 
Log Message:
Update to 3.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:36:13 -0000	1.3
+++ .cvsignore	23 Jan 2006 17:12:47 -0000	1.4
@@ -1 +1 @@
-Pod-Simple-3.03.tar.gz
+Pod-Simple-3.04.tar.gz


Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-3/perl-Pod-Simple.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Pod-Simple.spec	22 Nov 2005 11:36:13 -0000	1.5
+++ perl-Pod-Simple.spec	23 Jan 2006 17:12:47 -0000	1.6
@@ -1,18 +1,18 @@
 Name:           perl-Pod-Simple
-Version:        3.03
+Version:        3.04
 Release:        1%{?dist}
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Simple/
-Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AR/ARANDAL/Pod-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  perl(Pod::Escapes)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Pod::Simple is a Perl library for parsing text in the Pod ("plain old
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.04-1
+- Update to 3.04.
+
 * Tue Nov 22 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.03-1
 - Update to 3.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 11:36:13 -0000	1.3
+++ sources	23 Jan 2006 17:12:47 -0000	1.4
@@ -1 +1 @@
-8b29d147d00245bffa39b2e97d9fe7b0  Pod-Simple-3.03.tar.gz
+bf566103b75c7955d0880da3ce268744  Pod-Simple-3.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:12:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:12:53 -0500
Subject: rpms/perl-Pod-Simple/FC-4 .cvsignore, 1.3, 1.4 perl-Pod-Simple.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601231713.k0NHDPXi011183@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/FC-4

Modified Files:
	.cvsignore perl-Pod-Simple.spec sources 
Log Message:
Update to 3.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:36:18 -0000	1.3
+++ .cvsignore	23 Jan 2006 17:12:53 -0000	1.4
@@ -1 +1 @@
-Pod-Simple-3.03.tar.gz
+Pod-Simple-3.04.tar.gz


Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-4/perl-Pod-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Pod-Simple.spec	22 Nov 2005 11:36:18 -0000	1.7
+++ perl-Pod-Simple.spec	23 Jan 2006 17:12:53 -0000	1.8
@@ -1,18 +1,18 @@
 Name:           perl-Pod-Simple
-Version:        3.03
+Version:        3.04
 Release:        1%{?dist}
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Simple/
-Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AR/ARANDAL/Pod-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  perl(Pod::Escapes)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Pod::Simple is a Perl library for parsing text in the Pod ("plain old
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.04-1
+- Update to 3.04.
+
 * Tue Nov 22 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.03-1
 - Update to 3.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 11:36:18 -0000	1.3
+++ sources	23 Jan 2006 17:12:53 -0000	1.4
@@ -1 +1 @@
-8b29d147d00245bffa39b2e97d9fe7b0  Pod-Simple-3.03.tar.gz
+bf566103b75c7955d0880da3ce268744  Pod-Simple-3.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:12:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:12:59 -0500
Subject: rpms/perl-Pod-Simple/devel .cvsignore, 1.3, 1.4 perl-Pod-Simple.spec,
	1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200601231713.k0NHDVjb011190@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Pod-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/devel

Modified Files:
	.cvsignore perl-Pod-Simple.spec sources 
Log Message:
Update to 3.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Nov 2005 11:36:23 -0000	1.3
+++ .cvsignore	23 Jan 2006 17:12:59 -0000	1.4
@@ -1 +1 @@
-Pod-Simple-3.03.tar.gz
+Pod-Simple-3.04.tar.gz


Index: perl-Pod-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/perl-Pod-Simple.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Pod-Simple.spec	22 Nov 2005 11:36:23 -0000	1.7
+++ perl-Pod-Simple.spec	23 Jan 2006 17:12:59 -0000	1.8
@@ -1,18 +1,18 @@
 Name:           perl-Pod-Simple
-Version:        3.03
+Version:        3.04
 Release:        1%{?dist}
 Summary:        Framework for parsing POD documentation
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Pod-Simple/
-Source0:        http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/A/AR/ARANDAL/Pod-Simple-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 2:5.8.0
 BuildRequires:  perl(Pod::Escapes)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Pod::Simple is a Perl library for parsing text in the Pod ("plain old
@@ -55,6 +55,9 @@
 
 
 %changelog
+* Thu Jan 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.04-1
+- Update to 3.04.
+
 * Tue Nov 22 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.03-1
 - Update to 3.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Pod-Simple/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Nov 2005 11:36:23 -0000	1.3
+++ sources	23 Jan 2006 17:12:59 -0000	1.4
@@ -1 +1 @@
-8b29d147d00245bffa39b2e97d9fe7b0  Pod-Simple-3.03.tar.gz
+bf566103b75c7955d0880da3ce268744  Pod-Simple-3.04.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:25:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:25:55 -0500
Subject: rpms/perl-HTTP-Server-Simple/FC-4 .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601231726.k0NHQVxY011441@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11402/FC-4

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Nov 2005 18:23:42 -0000	1.4
+++ .cvsignore	23 Jan 2006 17:25:54 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-0.16.tar.gz
+HTTP-Server-Simple-0.17.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple.spec	10 Nov 2005 18:23:42 -0000	1.4
+++ perl-HTTP-Server-Simple.spec	23 Jan 2006 17:25:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.16
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 HTTP::Server::Simple is a very simple standalone HTTP daemon with no non-core
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.17-1
+- Update to 0.17.
+
 * Tue Nov  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.16-1
 - Update to 0.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2005 18:23:42 -0000	1.4
+++ sources	23 Jan 2006 17:25:54 -0000	1.5
@@ -1 +1 @@
-1dda81e7d0dbe40dd85635204a9fa060  HTTP-Server-Simple-0.16.tar.gz
+8fed9670c5d3b3802d6a9fa5eadccd8b  HTTP-Server-Simple-0.17.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:26:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 23 Jan 2006 12:26:01 -0500
Subject: rpms/perl-HTTP-Server-Simple/devel .cvsignore, 1.4,
	1.5 perl-HTTP-Server-Simple.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601231726.k0NHQbhN011446@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Server-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11402/devel

Modified Files:
	.cvsignore perl-HTTP-Server-Simple.spec sources 
Log Message:
Update to 0.17.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Nov 2005 18:23:47 -0000	1.4
+++ .cvsignore	23 Jan 2006 17:26:01 -0000	1.5
@@ -1 +1 @@
-HTTP-Server-Simple-0.16.tar.gz
+HTTP-Server-Simple-0.17.tar.gz


Index: perl-HTTP-Server-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/perl-HTTP-Server-Simple.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTTP-Server-Simple.spec	10 Nov 2005 18:23:47 -0000	1.4
+++ perl-HTTP-Server-Simple.spec	23 Jan 2006 17:26:01 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Server-Simple
-Version:        0.16
+Version:        0.17
 Release:        1%{?dist}
 Summary:        Very simple standalone HTTP daemon
 
@@ -11,7 +11,7 @@
 
 BuildArch:      noarch
 BuildRequires:  perl(Test::Pod), perl(Test::Pod::Coverage)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 HTTP::Server::Simple is a very simple standalone HTTP daemon with no non-core
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.17-1
+- Update to 0.17.
+
 * Tue Nov  8 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.16-1
 - Update to 0.16.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Server-Simple/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Nov 2005 18:23:47 -0000	1.4
+++ sources	23 Jan 2006 17:26:01 -0000	1.5
@@ -1 +1 @@
-1dda81e7d0dbe40dd85635204a9fa060  HTTP-Server-Simple-0.16.tar.gz
+8fed9670c5d3b3802d6a9fa5eadccd8b  HTTP-Server-Simple-0.17.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 23 17:40:35 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 23 Jan 2006 12:40:35 -0500
Subject: rpms/giblib/devel giblib.spec,1.7,1.8
Message-ID: <200601231741.k0NHf8PE011608@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/giblib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11571/giblib/devel

Modified Files:
	giblib.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178653).



Index: giblib.spec
===================================================================
RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- giblib.spec	6 Apr 2005 22:11:38 -0000	1.7
+++ giblib.spec	23 Jan 2006 17:40:35 -0000	1.8
@@ -1,8 +1,7 @@
 Summary: Simple library and a wrapper for imlib2
 Name: giblib
 Version: 1.2.4
-Release: 3
-
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Libraries
 URL: http://linuxbrit.co.uk/giblib/
@@ -47,11 +46,9 @@
 %{__rm} -rf %{buildroot}
 
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 
 %files
@@ -70,6 +67,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 1.2.4-4
+- Rebuilt for FC5.
+- Switch back /sbin/ldconfig calls to use -p.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Jan 23 17:40:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 23 Jan 2006 12:40:41 -0500
Subject: rpms/camE/devel camE.spec,1.7,1.8
Message-ID: <200601231741.k0NHfDsa011615@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/camE/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11571/camE/devel

Modified Files:
	camE.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178653).



Index: camE.spec
===================================================================
RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- camE.spec	14 Apr 2005 19:19:39 -0000	1.7
+++ camE.spec	23 Jan 2006 17:40:41 -0000	1.8
@@ -1,15 +1,14 @@
 Summary: Rewrite of the xawtv webcam app, which adds imlib2 support
 Name: camE
 Version: 1.9
-Release: 3
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
 URL: http://linuxbrit.co.uk/camE/
+Source: http://linuxbrit.co.uk/downloads/camE-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: giblib >= 1.2.3
-BuildRequires: XFree86-devel, giblib-devel >= 1.2.3, imlib2-devel, curl-devel
-BuildRequires: zlib-devel
+BuildRequires: giblib-devel >= 1.2.3, imlib2-devel, curl-devel, zlib-devel
 
 %description
 camE is a rewrite of the xawtv webcam app, which adds imlib2 support and
@@ -36,10 +35,14 @@
 %files
 %defattr(-, root, root, 0755)
 %doc AUTHORS COPYING *.style example.camErc*
-%{_bindir}/%{name}
+%{_bindir}/camE
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 1.9-4
+- Remove explicit X build requirement since giblib-devel requires imlib2-devel
+  which in turn requires all necessary X development packages.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> 1.9-3
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Jan 23 17:42:02 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 23 Jan 2006 12:42:02 -0500
Subject: fedora-security/audit fc4,1.134,1.135 fc5,1.44,1.45
Message-ID: <200601231742.k0NHg2P0011671@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11614

Modified Files:
	fc4 fc5 
Log Message:
Note a new openssh issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- fc4	23 Jan 2006 09:08:59 -0000	1.134
+++ fc4	23 Jan 2006 17:41:54 -0000	1.135
@@ -6,6 +6,7 @@
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
+CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
 CVE-2006-0208 VULNERALBE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
 CVE-2006-0200 version (php, 5.1.0 5.1.1 only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- fc5	23 Jan 2006 09:08:59 -0000	1.44
+++ fc5	23 Jan 2006 17:41:54 -0000	1.45
@@ -18,6 +18,7 @@
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
+CVE-2006-0225 VULNERABLE (openssh)
 CVE-2006-0208 VULNERABLE (php)
 CVE-2006-0207 VULNERABLE (php)
 CVE-2006-0200 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Mon Jan 23 18:23:28 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 23 Jan 2006 13:23:28 -0500
Subject: rpms/csmash/devel csmash-0.6.6-extraqualif.patch, NONE,
	1.1 csmash.spec, 1.9, 1.10
Message-ID: <200601231824.k0NIO0CP013569@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/csmash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13549

Modified Files:
	csmash.spec 
Added Files:
	csmash-0.6.6-extraqualif.patch 
Log Message:
Add modular X support, patch for gcc 4.1 and rebuild for FC5 (#178666).


csmash-0.6.6-extraqualif.patch:

--- NEW FILE csmash-0.6.6-extraqualif.patch ---
diff -Naupr csmash-0.6.6.orig/BallView.h csmash-0.6.6/BallView.h
--- csmash-0.6.6.orig/BallView.h	2003-07-13 17:26:24.000000000 +0200
+++ csmash-0.6.6/BallView.h	2006-01-23 18:43:13.000000000 +0100
@@ -32,7 +32,7 @@ public:
 
   static GLuint m_number[10];
 private:
-  void BallView::DrawTargetCircle();
+  void DrawTargetCircle();
   GLUquadricObj *m_quad;
 
   void DrawBall();


Index: csmash.spec
===================================================================
RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- csmash.spec	24 May 2005 17:06:14 -0000	1.9
+++ csmash.spec	23 Jan 2006 18:23:27 -0000	1.10
@@ -1,16 +1,23 @@
 Summary: 3D tabletennis game
 Name: csmash
 Version: 0.6.6
-Release: 9
+Release: 10%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://cannonsmash.sourceforge.net/
 Source: http://dl.sf.net/cannonsmash/csmash-%{version}.tar.gz
-Patch: csmash-0.6.6-64bit-gcc4-fixes.patch
+Patch0: csmash-0.6.6-64bit-gcc4-fixes.patch
+Patch1: csmash-0.6.6-extraqualif.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: Mesa-devel, libjpeg-devel, zlib-devel, gtk2-devel >= 2.0.0
+BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel, gcc-c++
 BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel
-BuildRequires: gcc-c++, desktop-file-utils
+BuildRequires: desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel, Mesa-devel
+%else
+BuildRequires: libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
+%endif
 
 %description
 CannonSmash is a 3D tabletennis game. The goal of this project is to
@@ -21,7 +28,8 @@
 
 %prep
 %setup
-%patch -p1 -b .64bit-gcc4
+%patch0 -p1 -b .64bit-gcc4
+%patch1 -p1 -b .extraqualif
 
 
 %build
@@ -67,6 +75,11 @@
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.6.6-10
+- Add conditional to build with/without modular X depending on FC version.
+- Include gcc 4.1 patch to fix "extra qualification" errors.
+- For some reason, adding libXt, libXext and libXmu to the build make it fail.
+
 * Tue May 24 2005 Matthias Saou <http://freshrpms.net/> 0.6.6-9
 - Update the gcc4 patch with diff from bug #156205.
 



From fedora-extras-commits at redhat.com  Mon Jan 23 19:55:09 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 23 Jan 2006 14:55:09 -0500
Subject: fedora-security/audit fc4,1.135,1.136 fc5,1.45,1.46
Message-ID: <200601231955.k0NJt9gT015573@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15550

Modified Files:
	fc4 fc5 
Log Message:
Note a new fetchmail issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- fc4	23 Jan 2006 17:41:54 -0000	1.135
+++ fc4	23 Jan 2006 19:55:02 -0000	1.136
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0321 ignore (fetchmail) 6.3.X only affected (fixed in 6.3.2)
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- fc5	23 Jan 2006 17:41:54 -0000	1.45
+++ fc5	23 Jan 2006 19:55:02 -0000	1.46
@@ -16,6 +16,7 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
+CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 VULNERABLE (openssh)



From fedora-extras-commits at redhat.com  Mon Jan 23 21:23:05 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon, 23 Jan 2006 16:23:05 -0500
Subject: rpms/cvsup/devel cvsup.spec,1.8,1.9
Message-ID: <200601232123.k0NLNcwn019343@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/cvsup/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19325

Modified Files:
	cvsup.spec 
Log Message:
* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.16.1-9h
- rebuilt for modular X



Index: cvsup.spec
===================================================================
RCS file: /cvs/extras/rpms/cvsup/devel/cvsup.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- cvsup.spec	29 Mar 2005 20:41:04 -0000	1.8
+++ cvsup.spec	23 Jan 2006 21:23:05 -0000	1.9
@@ -7,7 +7,7 @@
 Summary: CVS-Optimized General-Purpose Network File Distribution System client
 Name: cvsup
 Version: 16.1
-Release: 8.h
+Release: 9.h
 URL: http://www.polstra.com/projects/freeware/CVSup/
 License: BSD
 Group: Applications/Internet
@@ -29,8 +29,9 @@
 Patch6: ezm3-1.2-ppc-jmpbufsize.patch
 Patch7: cvsup-gcc4.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: mktemp, sed, XFree86-devel, zlib-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: mktemp, sed, zlib-devel
+BuildRequires: libXt-devel libXmu-devel
 ExclusiveArch: i386 ppc
 
 %ifarch i386
@@ -121,7 +122,7 @@
 (cd %{m3name}-%{m3ver}; make BISON=yacc -f Makefile.%{M3TARGET})
 # ------------------------- End hackery ------------------------------ #
 # Now build cvsup -- whew!
-make PREFIX=%{_prefix} %{?_smp_mflags}
+make PREFIX=%{_prefix}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -204,6 +205,9 @@
 %doc Acknowledgments Announce Blurb ChangeLog Install License doc examples
 
 %changelog
+* Mon Jan 23 2006 Adrian Reber <adrian at lisas.de> - 0.16.1-9h
+- rebuilt for modular X
+
 * Tue Mar 28 2005 Adrian Reber <adrian at lisas.de> - 0.16.1-8h
 - added gcc4 patch
 



From fedora-extras-commits at redhat.com  Mon Jan 23 21:33:50 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 23 Jan 2006 16:33:50 -0500
Subject: rpms/gaim-meanwhile/FC-4 .cvsignore, 1.7, 1.8 gaim-meanwhile.spec, 
	1.11, 1.12 sources, 1.8, 1.9 g-mw-empty-message-crash.patch, 1.2,
	NONE g-mw-empty-title-crash.patch, 1.2, NONE
Message-ID: <200601232134.k0NLYN1i019533@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19511

Modified Files:
	.cvsignore gaim-meanwhile.spec sources 
Removed Files:
	g-mw-empty-message-crash.patch g-mw-empty-title-crash.patch 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	3 Jan 2006 18:07:29 -0000	1.7
+++ .cvsignore	23 Jan 2006 21:33:49 -0000	1.8
@@ -1 +1 @@
-gaim-meanwhile-1.2.7.tar.gz
+gaim-meanwhile-1.2.8.tar.gz


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/gaim-meanwhile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gaim-meanwhile.spec	13 Jan 2006 20:57:30 -0000	1.11
+++ gaim-meanwhile.spec	23 Jan 2006 21:33:49 -0000	1.12
@@ -6,23 +6,19 @@
 Summary:	Lotus Sametime Community Client plugin for Gaim
 License:	GPL
 Group:		Applications/Internet
-Version:	1.2.7
-Release:	3%{?dist}
+Version:	1.2.8
+Release:	1%{?dist}
 Source:		http://dl.sf.net/meanwhile/gaim-meanwhile-%{version}.tar.gz
 URL:		http://meanwhile.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gaim >= 1.2.1, meanwhile-devel >= 1.0.0
 Requires: gaim >= 1.2.1, meanwhile >= 1.0.0, meanwhile < 2.0.0
-Patch0:         g-mw-empty-title-crash.patch
-Patch1:         g-mw-empty-message-crash.patch
 
 %description
 Gaim plugin to use the meanwhile Lotus Sametime library
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -43,7 +39,12 @@
 %{_datadir}/pixmaps/gaim/
 
 %changelog
-* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2
+* Mon Jan 23 2006 - jwboyer at jdub.homelinux.org 1.2.8-1
+- Update to latest release
+- Remove patches (in upstream)
+- Fix typo in last changelog
+
+* Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-3
 - Fix patches to have the correct strip level.  Gah.
 
 * Fri Jan 13 2006 - jwboyer at jdub.homelinux.org 1.2.7-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Jan 2006 18:07:29 -0000	1.8
+++ sources	23 Jan 2006 21:33:50 -0000	1.9
@@ -1 +1 @@
-890708b76edae2c47ce18183ac94678f  gaim-meanwhile-1.2.7.tar.gz
+da891cb5304776ace34ce63c7f666172  gaim-meanwhile-1.2.8.tar.gz


--- g-mw-empty-message-crash.patch DELETED ---


--- g-mw-empty-title-crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 21:41:38 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 23 Jan 2006 16:41:38 -0500
Subject: rpms/pybliographer/FC-3 .cvsignore, 1.5, 1.6 pybliographer.spec, 1.7,
	1.8 sources, 1.5, 1.6 pybliographer.patch, 1.2, NONE
Message-ID: <200601232142.k0NLgBiI019662@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607/FC-3

Modified Files:
	.cvsignore pybliographer.spec sources 
Removed Files:
	pybliographer.patch 
Log Message:
Update to 1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2005 21:56:03 -0000	1.5
+++ .cvsignore	23 Jan 2006 21:41:38 -0000	1.6
@@ -1 +1 @@
-pybliographer-1.2.7.tar.gz
+pybliographer-1.2.8.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/pybliographer.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pybliographer.spec	20 Dec 2005 14:11:07 -0000	1.7
+++ pybliographer.spec	23 Jan 2006 21:41:38 -0000	1.8
@@ -1,11 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
-Patch0: pybliographer.patch
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.8.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -43,7 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure
@@ -154,6 +152,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Zoltan Kota <z.kota at gmx.net> - 1.2.8-1
+- update to 1.2.8
+- drop patch, fixed upstream
+
 * Tue Dec 20 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-2
 - add patch for fixing different bugs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2005 21:56:03 -0000	1.5
+++ sources	23 Jan 2006 21:41:38 -0000	1.6
@@ -1 +1 @@
-c40c23565974f675e75d211bf0621e36  pybliographer-1.2.7.tar.gz
+3a4eaa405ce26347cbc42f6fb7854303  pybliographer-1.2.8.tar.gz


--- pybliographer.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 21:41:44 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 23 Jan 2006 16:41:44 -0500
Subject: rpms/pybliographer/FC-4 .cvsignore, 1.5, 1.6 pybliographer.spec,
	1.10, 1.11 sources, 1.5, 1.6 gnome-python.patch, 1.1,
	NONE pybliographer.patch, 1.2, NONE
Message-ID: <200601232142.k0NLgGku019667@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607/FC-4

Modified Files:
	.cvsignore pybliographer.spec sources 
Removed Files:
	gnome-python.patch pybliographer.patch 
Log Message:
Update to 1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2005 21:56:03 -0000	1.5
+++ .cvsignore	23 Jan 2006 21:41:44 -0000	1.6
@@ -1 +1 @@
-pybliographer-1.2.7.tar.gz
+pybliographer-1.2.8.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/pybliographer.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pybliographer.spec	20 Dec 2005 14:11:13 -0000	1.10
+++ pybliographer.spec	23 Jan 2006 21:41:44 -0000	1.11
@@ -1,12 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
-Patch0: pybliographer.patch
-Patch1: gnome-python.patch
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.8.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,8 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -156,6 +152,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Zoltan Kota <z.kota at gmx.net> - 1.2.8-1
+- update to 1.2.8
+- drop patches, fixed upstream
+
 * Tue Dec 20 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-2
 - add patches for fixing different bugs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2005 21:56:03 -0000	1.5
+++ sources	23 Jan 2006 21:41:44 -0000	1.6
@@ -1 +1 @@
-c40c23565974f675e75d211bf0621e36  pybliographer-1.2.7.tar.gz
+3a4eaa405ce26347cbc42f6fb7854303  pybliographer-1.2.8.tar.gz


--- gnome-python.patch DELETED ---


--- pybliographer.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 21:41:50 2006
From: fedora-extras-commits at redhat.com (Zoltan Kota (zkota))
Date: Mon, 23 Jan 2006 16:41:50 -0500
Subject: rpms/pybliographer/devel .cvsignore, 1.5, 1.6 pybliographer.spec,
	1.11, 1.12 sources, 1.5, 1.6 gnome-python.patch, 1.1,
	NONE pybliographer.patch, 1.2, NONE
Message-ID: <200601232142.k0NLgMUm019672@cvs-int.fedora.redhat.com>

Author: zkota

Update of /cvs/extras/rpms/pybliographer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19607/devel

Modified Files:
	.cvsignore pybliographer.spec sources 
Removed Files:
	gnome-python.patch pybliographer.patch 
Log Message:
Update to 1.2.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2005 21:56:04 -0000	1.5
+++ .cvsignore	23 Jan 2006 21:41:50 -0000	1.6
@@ -1 +1 @@
-pybliographer-1.2.7.tar.gz
+pybliographer-1.2.8.tar.gz


Index: pybliographer.spec
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/pybliographer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pybliographer.spec	20 Dec 2005 14:11:18 -0000	1.11
+++ pybliographer.spec	23 Jan 2006 21:41:50 -0000	1.12
@@ -1,12 +1,10 @@
 Summary: Framework for working with bibliographic databases
 Name: pybliographer
-Version: 1.2.7
-Release: 2%{?dist}
+Version: 1.2.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Publishing
-Source: http://dl.sf.net/pybliographer/pybliographer-1.2.7.tar.gz
-Patch0: pybliographer.patch
-Patch1: gnome-python.patch
+Source: http://dl.sf.net/pybliographer/pybliographer-1.2.8.tar.gz
 Url: http://www.pybliographer.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,8 +42,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 %configure
@@ -156,6 +152,10 @@
 
 
 %changelog
+* Mon Jan 23 2006 Zoltan Kota <z.kota at gmx.net> - 1.2.8-1
+- update to 1.2.8
+- drop patches, fixed upstream
+
 * Tue Dec 20 2005 Zoltan Kota <z.kota at gmx.net> - 1.2.7-2
 - add patches for fixing different bugs
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pybliographer/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2005 21:56:04 -0000	1.5
+++ sources	23 Jan 2006 21:41:50 -0000	1.6
@@ -1 +1 @@
-c40c23565974f675e75d211bf0621e36  pybliographer-1.2.7.tar.gz
+3a4eaa405ce26347cbc42f6fb7854303  pybliographer-1.2.8.tar.gz


--- gnome-python.patch DELETED ---


--- pybliographer.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 22:34:50 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 17:34:50 -0500
Subject: rpms/digikam/devel .cvsignore, 1.3, 1.4 digikam.spec, 1.20,
	1.21 sources, 1.3, 1.4 digikam-0.8.0-gcc41.patch, 1.1, NONE
Message-ID: <200601232235.k0NMZNfs021842@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21819

Modified Files:
	.cvsignore digikam.spec sources 
Removed Files:
	digikam-0.8.0-gcc41.patch 
Log Message:
- Add --enable-final
- Remove GCC 4.1 patch, applied upstream
- Update to version 0.8.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 15:20:30 -0000	1.3
+++ .cvsignore	23 Jan 2006 22:34:50 -0000	1.4
@@ -1,2 +1,3 @@
 digikam-0.7.4.tar.bz2
 digikam-0.8.0.tar.bz2
+digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/digikam.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- digikam.spec	23 Jan 2006 13:17:32 -0000	1.20
+++ digikam.spec	23 Jan 2006 22:34:50 -0000	1.21
@@ -1,13 +1,12 @@
 Name:		digikam
-Version:	0.8.0
-Release:	16%{?dist}
+Version:	0.8.1
+Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.digikam.org/
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Patch0:		digikam-0.8.0-gcc41.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
@@ -39,7 +38,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
@@ -48,7 +46,8 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -109,6 +108,7 @@
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*
+%{_datadir}/mimelnk/image/*.desktop
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -119,6 +119,11 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
+- Add --enable-final
+- Remove GCC 4.1 patch, applied upstream
+- Update to version 0.8.1
+
 * Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
 - Add some stuff to BuildRequires (finally fix bug #178031)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 15:20:30 -0000	1.3
+++ sources	23 Jan 2006 22:34:50 -0000	1.4
@@ -1 +1,2 @@
 9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
+2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2


--- digikam-0.8.0-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 23 22:42:20 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 23 Jan 2006 17:42:20 -0500
Subject: rpms/mlmmj/devel .cvsignore, 1.8, 1.9 mlmmj.spec, 1.18, 1.19 sources,
	1.8, 1.9
Message-ID: <200601232242.k0NMgqHo021923@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21902

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
- New upstream release (more bugfixes in address handling)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	18 Jan 2006 13:27:50 -0000	1.8
+++ .cvsignore	23 Jan 2006 22:42:20 -0000	1.9
@@ -1 +1 @@
-mlmmj-1.2.10.tar.bz2
+mlmmj-1.2.11.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/mlmmj.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mlmmj.spec	18 Jan 2006 13:27:50 -0000	1.18
+++ mlmmj.spec	23 Jan 2006 22:42:20 -0000	1.19
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
+- New upstream release (more bugfixes in address handling)
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
 - New upstream release. 1.2.9 has a serious bug in find_email_adr(), all
   should upgrade.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	18 Jan 2006 13:27:50 -0000	1.8
+++ sources	23 Jan 2006 22:42:20 -0000	1.9
@@ -1 +1 @@
-09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2
+dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 22:44:40 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 23 Jan 2006 17:44:40 -0500
Subject: rpms/mlmmj/FC-4 .cvsignore, 1.7, 1.8 mlmmj.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <200601232245.k0NMjCtB021982@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21959

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
- New upstream release (fixes to address handling/parsing).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 13:33:22 -0000	1.7
+++ .cvsignore	23 Jan 2006 22:44:39 -0000	1.8
@@ -1 +1 @@
-mlmmj-1.2.10.tar.bz2
+mlmmj-1.2.11.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/mlmmj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlmmj.spec	18 Jan 2006 13:33:22 -0000	1.14
+++ mlmmj.spec	23 Jan 2006 22:44:39 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
+- New upstream release (fixes to address handling/parsing).
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
 - New upstream release. All users should upgrade.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 13:33:22 -0000	1.7
+++ sources	23 Jan 2006 22:44:39 -0000	1.8
@@ -1 +1 @@
-09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2
+dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 23:16:18 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 18:16:18 -0500
Subject: rpms/digikam/FC-3 .cvsignore, 1.5, 1.6 digikam.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601232316.k0NNGosq023985@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23951

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Add --disable-dependency-tracking & --enable-final
- Remove GCC 4.1 patch, applied upstream
- Update to version 0.8.1
- Add some stuff to BuildRequires (finally fix bug #178031)
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Dec 2005 12:00:56 -0000	1.5
+++ .cvsignore	23 Jan 2006 23:16:18 -0000	1.6
@@ -1,2 +1,3 @@
 digikam-0.7.4.tar.bz2
 digikam-0.8.0.tar.bz2
+digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- digikam.spec	21 Dec 2005 12:00:56 -0000	1.6
+++ digikam.spec	23 Jan 2006 23:16:18 -0000	1.7
@@ -1,5 +1,5 @@
 Name:		digikam
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
@@ -9,9 +9,10 @@
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
-BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
+BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
+BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
+BuildRequires:	desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -39,12 +40,14 @@
 %setup -q
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -105,6 +108,7 @@
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*
+%{_datadir}/mimelnk/image/*.desktop
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -115,6 +119,57 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
+- Add --enable-final
+- Remove GCC 4.1 patch, applied upstream
+- Update to version 0.8.1
+
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
+- Add some stuff to BuildRequires (finally fix bug #178031)
+
+* Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
+- Remove redundant BuildRequires (bug #178031)
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
+- Remove --disable-dependency-tracking
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
+- Remove --enable-final (caused compilation errors)
+
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-dependency-tracking & --enable-final
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-11
+- Add libart_lgpl-devel and gamin-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-10
+- Add libacl-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-9
+- Add libidn-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-8
+- Fix compile on GCC 4.1
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-7
+- Remove autoreconf
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-6
+- Remove patch
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-5
+- Last chance to make it right (modular X.Org)
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-4
+- Try to build for modular X.Org
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-3
+- Add new paths for modular X.Org
+
+* Fri Dec 09 2005 Marcin Garski <mgarski at post.pl> 0.8.0-2
+- Work around for modular X.Org paths
+
 * Thu Dec 01 2005 Marcin Garski <mgarski at post.pl> 0.8.0-1
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Dec 2005 12:00:56 -0000	1.5
+++ sources	23 Jan 2006 23:16:18 -0000	1.6
@@ -1 +1,2 @@
 9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
+2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 23 23:17:38 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 23 Jan 2006 18:17:38 -0500
Subject: rpms/digikam/FC-4 .cvsignore, 1.3, 1.4 digikam.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200601232318.k0NNIAID024061@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24031

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Add --disable-dependency-tracking & --enable-final
- Remove GCC 4.1 patch, applied upstream
- Update to version 0.8.1
- Add some stuff to BuildRequires (finally fix bug #178031)
- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Dec 2005 16:05:48 -0000	1.3
+++ .cvsignore	23 Jan 2006 23:17:38 -0000	1.4
@@ -1,2 +1,3 @@
 digikam-0.7.4.tar.bz2
 digikam-0.8.0.tar.bz2
+digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/digikam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- digikam.spec	1 Dec 2005 16:05:48 -0000	1.4
+++ digikam.spec	23 Jan 2006 23:17:38 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		digikam
-Version:	0.8.0
+Version:	0.8.1
 Release:	1%{?dist}
 Summary:	A digital camera accessing & photo management application
 
@@ -9,9 +9,10 @@
 Source0:	http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	gphoto2-devel >= 2.0.0 imlib2-devel libkexif-devel >= 0.2
-BuildRequires:	libkipi-devel >= 0.1 sqlite-devel >= 3.0.0 desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
+BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
+BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
+BuildRequires:	desktop-file-utils libtool-ltdl-devel
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -39,12 +40,14 @@
 %setup -q
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
 	--disable-rpath \
-	--disable-debug
+	--disable-debug \
+	--disable-dependency-tracking \
+	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -105,6 +108,7 @@
 %{_datadir}/apps/digikam/
 %{_datadir}/apps/showfoto/
 %{_datadir}/icons/hicolor/*
+%{_datadir}/mimelnk/image/*.desktop
 %{_datadir}/services/digikam*
 %{_datadir}/servicetypes/digikamimageplugin.desktop
 
@@ -115,6 +119,57 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
+- Add --enable-final
+- Remove GCC 4.1 patch, applied upstream
+- Update to version 0.8.1
+
+* Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.0-16
+- Add some stuff to BuildRequires (finally fix bug #178031)
+
+* Tue Jan 17 2006 Marcin Garski <mgarski at post.pl> 0.8.0-15
+- Remove redundant BuildRequires (bug #178031)
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-14
+- Remove --disable-dependency-tracking
+
+* Mon Jan 16 2006 Marcin Garski <mgarski at post.pl> 0.8.0-13
+- Remove --enable-final (caused compilation errors)
+
+* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.8.0-12
+- Change "/etc/profile.d/qt.sh" to "%{_sysconfdir}/profile.d/qt.sh"
+- Add --disable-dependency-tracking & --enable-final
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-11
+- Add libart_lgpl-devel and gamin-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-10
+- Add libacl-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-9
+- Add libidn-devel to BR
+
+* Wed Dec 14 2005 Marcin Garski <mgarski at post.pl> 0.8.0-8
+- Fix compile on GCC 4.1
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-7
+- Remove autoreconf
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-6
+- Remove patch
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-5
+- Last chance to make it right (modular X.Org)
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-4
+- Try to build for modular X.Org
+
+* Tue Dec 13 2005 Marcin Garski <mgarski at post.pl> 0.8.0-3
+- Add new paths for modular X.Org
+
+* Fri Dec 09 2005 Marcin Garski <mgarski at post.pl> 0.8.0-2
+- Work around for modular X.Org paths
+
 * Thu Dec 01 2005 Marcin Garski <mgarski at post.pl> 0.8.0-1
 - Add description about digikamimageplugins and kipi-plugins
 - Remove 64 bit patch, applied upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Dec 2005 16:05:49 -0000	1.3
+++ sources	23 Jan 2006 23:17:38 -0000	1.4
@@ -1 +1,2 @@
 9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
+2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:11:41 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:11:41 -0500
Subject: extras-buildsys ChangeLog,1.126.2.29,1.126.2.30
Message-ID: <200601240111.k0O1BfYN028522@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28492

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
Update changelog for past changes


Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.29
retrieving revision 1.126.2.30
diff -u -r1.126.2.29 -r1.126.2.30
--- ChangeLog	22 Jan 2006 06:07:37 -0000	1.126.2.29
+++ ChangeLog	24 Jan 2006 01:11:09 -0000	1.126.2.30
@@ -1,5 +1,18 @@
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
+    * server/Builder.py
+        - Move most of the building_jobs() logic into another thread to
+            combat hanging issues
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Be smarter about SSL stuff by using pending() where possible in a
+            vain effort not to hang as much.  Cribbed from rhn code by
+            misa at redhat
+
+2006-01-22  Dan Williams  <dcbw at redhat.com>
+
     * server/ArchJob.py
         - Don't traceback when killing jobs on builders
 



From fedora-extras-commits at redhat.com  Tue Jan 24 01:12:55 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:12:55 -0500
Subject: extras-buildsys/common SSLConnection.py,1.3.4.3,1.3.4.4
Message-ID: <200601240112.k0O1Ct80028577@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28536/common

Modified Files:
      Tag: STABLE_0_4
	SSLConnection.py 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -r1.3.4.3 -r1.3.4.4
--- SSLConnection.py	22 Jan 2006 06:01:56 -0000	1.3.4.3
+++ SSLConnection.py	24 Jan 2006 01:12:41 -0000	1.3.4.4
@@ -29,12 +29,6 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
-
-        # Buffer stuff
-        self.__dict__["buffer_size"] = 16384
-        self.__dict__["pos"] = 0
-        self.__dict__["buffer"] = ""
-
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -82,76 +76,57 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-
-    def write(self, data, flags=0):
-        origlen = len(data)
-        sent = 0
+    def sendall(self, data, flags=0):
         while True:
-            try:
-                sent = self.__dict__["conn"].send(data)
-            except (SSL.WantReadError, SSL.WantWriteError):
-                continue
-            if sent == len(data):
-                break
-            data = data[sent:]
-
-        return origlen
-
-    def recv(self, amt):
-        return self.read(amt)
-
-    send = write
-
-    sendall = write
-
-    def tell(self):
-        return self.__dict__["pos"]
-
-    def seek(self, pos, mode=0):
-        raise NotImplementedError, "seek"
-
-    def read(self, amt, flags=0):
-        # Initially, the buffer size is the default buffer size.
-        # Unfortunately, pending() does not return meaningful data until
-        # recv() is called, so we only adjust the buffer size after the
-        # first read
-        buffer_size = self.__dict__["buffer_size"]
-        # Read only the specified amount of data
-        while amt is None or len(self.__dict__["buffer"]) < amt:
-            # if amt is None (read till the end), fills in self.__dict__["buffer"]
-            if amt is not None:
-                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
-
-            try:
-                data = self.__dict__["conn"].recv(buffer_size)
-            except SSL.ZeroReturnError:
-                # Nothing more to be read
-                break
-            except (SSL.WantReadError, SSL.WantWriteError):
-                # Try again
-                continue
-
-            self.__dict__["buffer"] = self.__dict__["buffer"] + data
-
-            # More bytes to read?
-            pending = self.__dict__["conn"].pending()
-            if pending == 0:
-                # we're done here
-                break
-
-        if amt:
-            ret = self.__dict__["buffer"][:amt]
-            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
-        else:
-            ret = self.__dict__["buffer"]
-            self.__dict__["buffer"] = ""
-
-        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
-        return ret
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in write:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].sendall(data, flags)
+                    except SSL.SysCallError, e:
+                        if e[0] == 32:      # Broken Pipe
+                            self.close()
+                        else:
+                            raise socket.error(e)
+                    except SSL.WantWriteError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
+    def recv(self, bufsize, flags=0):
+        while True:
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in read:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].recv(bufsize, flags)
+                    except SSL.ZeroReturnError:
+                        return None
+                    except SSL.WantReadError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
 
 class PlgFileObject(socket._fileobject):
-    def read(self, bufsize, flags=0):
-        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Tue Jan 24 01:12:43 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:12:43 -0500
Subject: extras-buildsys ChangeLog,1.126.2.30,1.126.2.31
Message-ID: <200601240113.k0O1DEkO028580@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28536

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.30
retrieving revision 1.126.2.31
diff -u -r1.126.2.30 -r1.126.2.31
--- ChangeLog	24 Jan 2006 01:11:09 -0000	1.126.2.30
+++ ChangeLog	24 Jan 2006 01:12:36 -0000	1.126.2.31
@@ -1,3 +1,8 @@
+2006-01-23  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Revert previous commit, causing too much trouble
+
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
     * server/Builder.py



From fedora-extras-commits at redhat.com  Tue Jan 24 01:19:08 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:19:08 -0500
Subject: extras-buildsys/common SSLConnection.py,1.6,1.7
Message-ID: <200601240119.k0O1J8Zs028643@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28609/common

Modified Files:
	SSLConnection.py 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: SSLConnection.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/SSLConnection.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SSLConnection.py	22 Jan 2006 05:59:12 -0000	1.6
+++ SSLConnection.py	24 Jan 2006 01:19:01 -0000	1.7
@@ -29,12 +29,6 @@
         self.__dict__["close_refcount"] = 0
         self.__dict__["closed"] = False
         self.__dict__["timeout"] = self.DEFAULT_TIMEOUT
-
-        # Buffer stuff
-        self.__dict__["buffer_size"] = 16384
-        self.__dict__["pos"] = 0
-        self.__dict__["buffer"] = ""
-
     def __del__(self):
         self.__dict__["conn"].close()
     def __getattr__(self,name):
@@ -82,76 +76,57 @@
             self.shutdown()
             self.__dict__["conn"].close()
             self.__dict__["closed"] = True
-
-    def write(self, data, flags=0):
-        origlen = len(data)
-        sent = 0
+    def sendall(self, data, flags=0):
         while True:
-            try:
-                sent = self.__dict__["conn"].send(data)
-            except (SSL.WantReadError, SSL.WantWriteError):
-                continue
-            if sent == len(data):
-                break
-            data = data[sent:]
-
-        return origlen
-
-    def recv(self, amt):
-        return self.read(amt)
-
-    send = write
-
-    sendall = write
-
-    def tell(self):
-        return self.__dict__["pos"]
-
-    def seek(self, pos, mode=0):
-        raise NotImplementedError, "seek"
-
-    def read(self, amt, flags=0):
-        # Initially, the buffer size is the default buffer size.
-        # Unfortunately, pending() does not return meaningful data until
-        # recv() is called, so we only adjust the buffer size after the
-        # first read
-        buffer_size = self.__dict__["buffer_size"]
-        # Read only the specified amount of data
-        while amt is None or len(self.__dict__["buffer"]) < amt:
-            # if amt is None (read till the end), fills in self.__dict__["buffer"]
-            if amt is not None:
-                buffer_size = min(amt - len(self.__dict__["buffer"]), buffer_size)
-
-            try:
-                data = self.__dict__["conn"].recv(buffer_size)
-            except SSL.ZeroReturnError:
-                # Nothing more to be read
-                break
-            except (SSL.WantReadError, SSL.WantWriteError):
-                # Try again
-                continue
-
-            self.__dict__["buffer"] = self.__dict__["buffer"] + data
-
-            # More bytes to read?
-            pending = self.__dict__["conn"].pending()
-            if pending == 0:
-                # we're done here
-                break
-
-        if amt:
-            ret = self.__dict__["buffer"][:amt]
-            self.__dict__["buffer"] = self.__dict__["buffer"][amt:]
-        else:
-            ret = self.__dict__["buffer"]
-            self.__dict__["buffer"] = ""
-
-        self.__dict__["pos"] = self.__dict__["pos"] + len(ret)
-        return ret
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([], [self.__dict__["conn"]], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in write:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].sendall(data, flags)
+                    except SSL.SysCallError, e:
+                        if e[0] == 32:      # Broken Pipe
+                            self.close()
+                        else:
+                            raise socket.error(e)
+                    except SSL.WantWriteError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
+    def recv(self, bufsize, flags=0):
+        while True:
+            # Use select() to simulate a socket timeout without setting the socket
+            # to non-blocking mode
+            (read, write, error) = select.select([self.__dict__["conn"]], [], [], self.__dict__["timeout"])
+            if self.__dict__["conn"] in read:
+                starttime = time.time()
+                while True:
+                    try:
+                        return self.__dict__["conn"].recv(bufsize, flags)
+                    except SSL.ZeroReturnError:
+                        return None
+                    except SSL.WantReadError:
+                        time.sleep(0.1)
+
+                    curtime = time.time()
+                    if curtime - starttime > self.__dict__["timeout"]:
+                        raise socket.timeout
+            else:
+                raise socket.timeout
+            if self.__dict__["conn"] in error:
+                raise socket.error
+        return None
 
 class PlgFileObject(socket._fileobject):
-    def read(self, bufsize, flags=0):
-        return self._sock.read(bufsize, flags)
     def close(self):
         """
         socket._fileobject doesn't actually _close_ the socket,



From fedora-extras-commits at redhat.com  Tue Jan 24 01:19:03 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:19:03 -0500
Subject: extras-buildsys ChangeLog,1.159,1.160
Message-ID: <200601240119.k0O1JXs5028646@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28609

Modified Files:
	ChangeLog 
Log Message:
2006-01-23  Dan Williams  <dcbw at redhat.com>

    * common/SSLConnection.py
        - Revert previous commit, causing too much trouble




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog	22 Jan 2006 06:00:29 -0000	1.159
+++ ChangeLog	24 Jan 2006 01:18:55 -0000	1.160
@@ -1,3 +1,8 @@
+2006-01-23  Dan Williams  <dcbw at redhat.com>
+
+    * common/SSLConnection.py
+        - Revert previous commit, causing too much trouble
+
 2006-01-22  Dan Williams  <dcbw at redhat.com>
 
     * server/Builder.py



From fedora-extras-commits at redhat.com  Tue Jan 24 01:24:49 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:24:49 -0500
Subject: rpms/plague/devel plague.spec,1.21,1.22 sources,1.20,1.21
Message-ID: <200601240124.k0O1OpEv028715@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28694

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
- Revert SSL fixes from last build




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plague.spec	22 Jan 2006 06:18:22 -0000	1.21
+++ plague.spec	24 Jan 2006 01:24:49 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
+- Revert SSL fixes from last build
+
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
 - Don't traceback when killing jobs on builders
 - Work around SSL hanging issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	22 Jan 2006 06:18:22 -0000	1.20
+++ sources	24 Jan 2006 01:24:49 -0000	1.21
@@ -1 +1 @@
-dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2
+a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:25:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:25:23 -0500
Subject: rpms/plague/FC-4 plague.spec,1.19,1.20 sources,1.18,1.19
Message-ID: <200601240125.k0O1Ptm8028775@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28754

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
- Revert SSL fixes from last build




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plague.spec	22 Jan 2006 06:20:24 -0000	1.19
+++ plague.spec	24 Jan 2006 01:25:22 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
+- Revert SSL fixes from last build
+
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
 - Don't traceback when killing jobs on builders
 - Work around SSL hanging issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 06:20:24 -0000	1.18
+++ sources	24 Jan 2006 01:25:22 -0000	1.19
@@ -1 +1 @@
-dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2
+a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:26:34 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:26:34 -0500
Subject: rpms/plague/FC-3 plague.spec,1.19,1.20 sources,1.18,1.19
Message-ID: <200601240127.k0O1R6IO028801@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28781

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
- Revert SSL fixes from last build




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- plague.spec	22 Jan 2006 06:21:25 -0000	1.19
+++ plague.spec	24 Jan 2006 01:26:34 -0000	1.20
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
+- Revert SSL fixes from last build
+
 * Sun Jan 22 2006 Dan Williams <dcbw at redhat.com> 0.4.3-3
 - Don't traceback when killing jobs on builders
 - Work around SSL hanging issues


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 06:21:25 -0000	1.18
+++ sources	24 Jan 2006 01:26:34 -0000	1.19
@@ -1 +1 @@
-dd5de17df2b585e333d95e5d80a9c11a  plague-0.4.3.tar.bz2
+a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:35:35 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:35:35 -0500
Subject: extras-buildsys/server Builder.py,1.20.2.5,1.20.2.6
Message-ID: <200601240135.k0O1ZZpe028920@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28902/server

Modified Files:
      Tag: STABLE_0_4
	Builder.py 
Log Message:
Restore builder connection timeout


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- Builder.py	22 Jan 2006 06:05:24 -0000	1.20.2.5
+++ Builder.py	24 Jan 2006 01:35:27 -0000	1.20.2.6
@@ -94,7 +94,7 @@
         else:
             certs = None
 
-        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
+        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
         self._server_lock = threading.Lock()
 
         threading.Thread.__init__(self)



From fedora-extras-commits at redhat.com  Tue Jan 24 01:36:04 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:36:04 -0500
Subject: extras-buildsys/server Builder.py,1.26,1.27
Message-ID: <200601240136.k0O1a42C028949@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28931/server

Modified Files:
	Builder.py 
Log Message:
Restore builder connection timeout


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Builder.py	22 Jan 2006 06:00:35 -0000	1.26
+++ Builder.py	24 Jan 2006 01:35:57 -0000	1.27
@@ -93,7 +93,7 @@
             certs['ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
             certs['peer_ca_cert'] = self._server_cfg.get_str("SSL", "ca_cert")
 
-        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs)
+        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
         self._server_lock = threading.Lock()
 
         threading.Thread.__init__(self)



From fedora-extras-commits at redhat.com  Tue Jan 24 01:38:12 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:38:12 -0500
Subject: rpms/plague/devel plague.spec,1.22,1.23 sources,1.21,1.22
Message-ID: <200601240138.k0O1ciID028999@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28977

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
- Restore builder connection timeout




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- plague.spec	24 Jan 2006 01:24:49 -0000	1.22
+++ plague.spec	24 Jan 2006 01:38:12 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
+- Restore builder connection timeout
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
 - Revert SSL fixes from last build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	24 Jan 2006 01:24:49 -0000	1.21
+++ sources	24 Jan 2006 01:38:12 -0000	1.22
@@ -1 +1 @@
-a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2
+e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:39:35 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:39:35 -0500
Subject: rpms/plague/FC-4 plague.spec,1.20,1.21 sources,1.19,1.20
Message-ID: <200601240140.k0O1e8BA029035@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29012

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
- Restore builder connection timeout




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plague.spec	24 Jan 2006 01:25:22 -0000	1.20
+++ plague.spec	24 Jan 2006 01:39:35 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
+- Restore builder connection timeout
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
 - Revert SSL fixes from last build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Jan 2006 01:25:22 -0000	1.19
+++ sources	24 Jan 2006 01:39:35 -0000	1.20
@@ -1 +1 @@
-a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2
+e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 01:40:22 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Mon, 23 Jan 2006 20:40:22 -0500
Subject: rpms/plague/FC-3 plague.spec,1.20,1.21 sources,1.19,1.20
Message-ID: <200601240140.k0O1es53029060@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29041

Modified Files:
	plague.spec sources 
Log Message:
* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
- Restore builder connection timeout




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plague.spec	24 Jan 2006 01:26:34 -0000	1.20
+++ plague.spec	24 Jan 2006 01:40:22 -0000	1.21
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
+- Restore builder connection timeout
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-4
 - Revert SSL fixes from last build
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	24 Jan 2006 01:26:34 -0000	1.19
+++ sources	24 Jan 2006 01:40:22 -0000	1.20
@@ -1 +1 @@
-a2ece07c0a1e43d30cd289a360704acf  plague-0.4.3.tar.bz2
+e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 02:19:07 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Mon, 23 Jan 2006 21:19:07 -0500
Subject: rpms/mlmmj/FC-3 .cvsignore, 1.7, 1.8 mlmmj.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <200601240219.k0O2JdvL031162@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mlmmj/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31141

Modified Files:
	.cvsignore mlmmj.spec sources 
Log Message:
* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
- New upstream release (Fixes for address handling).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 13:35:52 -0000	1.7
+++ .cvsignore	24 Jan 2006 02:19:07 -0000	1.8
@@ -1 +1 @@
-mlmmj-1.2.10.tar.bz2
+mlmmj-1.2.11.tar.bz2


Index: mlmmj.spec
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/mlmmj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mlmmj.spec	18 Jan 2006 13:35:52 -0000	1.14
+++ mlmmj.spec	24 Jan 2006 02:19:07 -0000	1.15
@@ -2,7 +2,7 @@
 
 Summary: Mailserver-independent ezmlm-like mailing list manager
 Name: mlmmj
-Version: 1.2.10
+Version: 1.2.11
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
@@ -48,6 +48,9 @@
 %{_mandir}/man1/mlmmj-*
 
 %changelog
+* Tue Jan 24 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.11-1
+- New upstream release (Fixes for address handling).
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.2.10-1
 - New upstream release. All users should upgrade.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mlmmj/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 13:35:52 -0000	1.7
+++ sources	24 Jan 2006 02:19:07 -0000	1.8
@@ -1 +1 @@
-09e48b5ad71e796a0c78113e8435efed  mlmmj-1.2.10.tar.bz2
+dac2f49183225ec750a0d69952b66275  mlmmj-1.2.11.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 03:39:30 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 23 Jan 2006 22:39:30 -0500
Subject: rpms/scim-anthy/FC-4 scim-anthy-wide-latin.diff, NONE,
	1.1 scim-anthy.spec, 1.22, 1.23
Message-ID: <200601240340.k0O3e3XG000766@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv746

Modified Files:
	scim-anthy.spec 
Added Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]

scim-anthy-wide-latin.diff:

--- NEW FILE scim-anthy-wide-latin.diff ---
--- src/scim_anthy_imengine.cpp.old	2006-01-20 22:53:48.000000000 +0900
+++ src/scim_anthy_imengine.cpp	2006-01-20 22:54:17.000000000 +0900
@@ -262,7 +262,7 @@
 
     // for wide Latin mode
     if (m_preedit.get_input_mode () == SCIM_ANTHY_MODE_WIDE_LATIN)
-        process_key_event_wide_latin_mode (key);
+        return process_key_event_wide_latin_mode (key);
 
     // for other mode
     if (get_typing_method () != SCIM_ANTHY_TYPING_METHOD_NICOLA ||


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- scim-anthy.spec	1 Dec 2005 11:48:41 -0000	1.22
+++ scim-anthy.spec	24 Jan 2006 03:39:30 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           scim-anthy
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,6 +8,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
+Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -46,6 +48,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
+- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
+  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]
+
 * Thu Dec  1 2005 Akira TAGOH <tagoh at redhat.com> - 0.8.0-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Tue Jan 24 04:21:22 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 23 Jan 2006 23:21:22 -0500
Subject: rpms/scim-anthy/FC-3 scim-anthy-wide-latin.diff, NONE,
	1.1 scim-anthy.spec, 1.15, 1.16
Message-ID: <200601240421.k0O4LsXE002669@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2649

Modified Files:
	scim-anthy.spec 
Added Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]

scim-anthy-wide-latin.diff:

--- NEW FILE scim-anthy-wide-latin.diff ---
--- src/scim_anthy_imengine.cpp.old	2006-01-20 22:53:48.000000000 +0900
+++ src/scim_anthy_imengine.cpp	2006-01-20 22:54:17.000000000 +0900
@@ -262,7 +262,7 @@
 
     // for wide Latin mode
     if (m_preedit.get_input_mode () == SCIM_ANTHY_MODE_WIDE_LATIN)
-        process_key_event_wide_latin_mode (key);
+        return process_key_event_wide_latin_mode (key);
 
     // for other mode
     if (get_typing_method () != SCIM_ANTHY_TYPING_METHOD_NICOLA ||


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- scim-anthy.spec	1 Dec 2005 11:39:47 -0000	1.15
+++ scim-anthy.spec	24 Jan 2006 04:21:22 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           scim-anthy
 Version:        0.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,6 +8,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
+Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -46,6 +48,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
+- scim-anthy-wide-latin.diff: applied to fix a problem that the input character
+  appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]
+
 * Thu Dec  1 2005 Akira TAGOH <tagoh at redhat.com> - 0.8.0-1
 - New upstream release.
 



From fedora-extras-commits at redhat.com  Tue Jan 24 08:24:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 24 Jan 2006 03:24:50 -0500
Subject: rpms/allegro/devel allegro-4.2.0-nostrip.patch, NONE,
	1.1 allegro.spec, 1.20, 1.21
Message-ID: <200601240825.k0O8PX1G011008@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10988

Modified Files:
	allegro.spec 
Added Files:
	allegro-4.2.0-nostrip.patch 
Log Message:
* Mon Jan 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-4
- add allegro-4.2.0-nostrip.patch, so that the main .so file
  doesn't get stripped and we actually get debuginfo for it in
  allegro-debuginfo


allegro-4.2.0-nostrip.patch:

--- NEW FILE allegro-4.2.0-nostrip.patch ---
--- allegro-4.2.0/misc/deplib.sh.nostrip	2006-01-23 21:35:02.000000000 +0100
+++ allegro-4.2.0/misc/deplib.sh	2006-01-23 21:35:09.000000000 +0100
@@ -70,7 +70,7 @@
 done
 echo "$prev"
 echo ""
-write_code alleg LIBALLEG -s
+write_code alleg LIBALLEG ""
 echo ""
 echo ""
 


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- allegro.spec	21 Jan 2006 08:08:41 -0000	1.20
+++ allegro.spec	24 Jan 2006 08:24:49 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        3
+Release:        4
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -14,6 +14,7 @@
 Source:         http://download.sourceforge.net/alleg/allegro-%{version}.tar.gz
 Patch1:         allegro-4.0.3-libdir.patch
 Patch2:         allegro-4.0.3-cfg.patch
+Patch3:         allegro-4.2.0-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
@@ -119,7 +120,7 @@
 %setup -q
 %patch1 -p0 -b .libdir
 %patch2 -p0 -b .cfg
-
+%patch3 -p1 -z .nostrip
 
 %build
 %configure \
@@ -206,6 +207,11 @@
 
 
 %changelog
+* Mon Jan 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-4
+- add allegro-4.2.0-nostrip.patch, so that the main .so file
+  doesn't get stripped and we actually get debuginfo for it in
+  allegro-debuginfo
+
 * Fri Jan 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-3
 - update / fix BuildRequires for modular X (bz 178245)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 09:31:03 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 24 Jan 2006 04:31:03 -0500
Subject: fedora-security/audit fc4,1.136,1.137 fc5,1.46,1.47
Message-ID: <200601240931.k0O9V3TU013430@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13408

Modified Files:
	fc4 fc5 
Log Message:
Deal with updates from yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- fc4	23 Jan 2006 19:55:02 -0000	1.136
+++ fc4	24 Jan 2006 09:30:55 -0000	1.137
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
-CVE-2006-0321 ignore (fetchmail) 6.3.X only affected (fixed in 6.3.2)
+CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
@@ -101,6 +101,7 @@
 CVE-2005-3388 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3357 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
+CVE-2005-3356 VULNERABLE (kernel)
 CVE-2005-3353 backport (php) [since FEDORA-2005-1062]
 CVE-2005-3352 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052]
 CVE-2005-3351 backport (spamassassin) [since FEDORA-2005-1066]
@@ -938,6 +939,7 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
+CVE-2004-0592 version (kernel, not upstream flaw)
 CVE-2004-0587 version (kernel, not upstream flaw)
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
@@ -1306,6 +1308,7 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- fc5	23 Jan 2006 19:55:02 -0000	1.46
+++ fc5	24 Jan 2006 09:30:55 -0000	1.47
@@ -113,6 +113,7 @@
 CVE-2005-3388 version (php, fixed 5.1.1)
 CVE-2005-3358 version (kernel, fixed 2.6.11)
 CVE-2005-3357 VULNERABLE (httpd, affects 2.2.0) bz#177914
+CVE-2005-3356 VULNERABLE (kernel)
 CVE-2005-3353 version (php, not 5.0)
 CVE-2005-3352 VULNERABLE (httpd, fixed 2.2.1) bz#177913
 CVE-2005-3351 version (spamassassin, fixed 3.1.0)
@@ -994,6 +995,7 @@
 CVE-2004-0597 version (libpng, fixed 1.2.6)
 CVE-2004-0595 version (php, fixed 4.3.8)
 CVE-2004-0594 version (php, fixed 4.3.8)
+CVE-2004-0592 version (kernel, not upstream flaw)
 CVE-2004-0587 version (kernel) not upstream flaw
 CVE-2004-0558 version (cups, fixed 1.1.21)
 CVE-2004-0557 version (sox, fixed after 12.17.4)
@@ -1359,6 +1361,7 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)
 CVE-2002-1363 version (libpng, fixed 1.2.6)



From fedora-extras-commits at redhat.com  Tue Jan 24 10:22:11 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 24 Jan 2006 05:22:11 -0500
Subject: rpms/blackbox/devel blackbox.spec,1.10,1.11
Message-ID: <200601241022.k0OAMhVa015435@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/blackbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15397/blackbox/devel

Modified Files:
	blackbox.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178651 & #178652)



Index: blackbox.spec
===================================================================
RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- blackbox.spec	3 Nov 2005 15:11:47 -0000	1.10
+++ blackbox.spec	24 Jan 2006 10:22:10 -0000	1.11
@@ -1,14 +1,20 @@
 Summary: Very small and fast Window Manager
 Name: blackbox
 Version: 0.70.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://blackboxwm.sourceforge.net/
 Source0: http://dl.sf.net/blackboxwm/blackbox-%{version}.tar.bz2
 Source1: blackbox.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: xorg-x11-devel, gcc-c++
+BuildRequires: gcc-c++, pkgconfig
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXt-devel, libXext-devel
+%endif
 
 %description
 Blackbox is a window manager for the X Window environment, which is
@@ -76,34 +82,37 @@
 
 
 %changelog
-* Thu Nov  3 2005 Mattthias Saou <http://freshrpms.net/> 0.70.1-1
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.70.1-2
+- Add conditional to build with/without modular X depending on FC version.
+
+* Thu Nov  3 2005 Matthias Saou <http://freshrpms.net/> 0.70.1-1
 - Update to 0.70.1.
 
-* Sat Mar 12 2005 Mattthias Saou <http://freshrpms.net/> 0.70.0-1
+* Sat Mar 12 2005 Matthias Saou <http://freshrpms.net/> 0.70.0-1
 - Update to 0.70.0.
 - Use bz2 source instead of gz.
 - Add devel sub-package for the libbt stuff.
 
-* Tue Nov 16 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-10
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-10
 - Bump release to provide Extras upgrade path.
 
-* Mon Nov 15 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-9
+* Mon Nov 15 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-9
 - Added gcc 3.4 patch from Arch Linux.
 
-* Thu May  6 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+* Thu May  6 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-8
 - Removed switchdesk file, it doesn't work because of hardcoded stuff.
 
-* Wed Mar 24 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-8
+* Wed Mar 24 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-8
 - Removed explicit XFree86 dependency.
 
-* Mon Feb 23 2004 Mattthias Saou <http://freshrpms.net/> 0.65.0-7
+* Mon Feb 23 2004 Matthias Saou <http://freshrpms.net/> 0.65.0-7
 - Added blackbox.desktop file for xsessions based on the GNOME one.
 
 * Tue Feb 10 2004 Scott R. Godin <nospam at webdragon.net> 0.65.0-6
 - Patch for #include <cassert> in Window.cc
 - Fixed nls problem, left in --disable just in case. Smile, Matthias. :-)
 
-* Fri Nov 14 2003 Mattthias Saou <http://freshrpms.net/> 0.65.0-5
+* Fri Nov 14 2003 Matthias Saou <http://freshrpms.net/> 0.65.0-5
 - Rebuild for Fedora Core 1.
 
 * Wed May 14 2003 Matthias Saou <http://freshrpms.net/>



From fedora-extras-commits at redhat.com  Tue Jan 24 10:22:17 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 24 Jan 2006 05:22:17 -0500
Subject: rpms/bbkeys/devel bbkeys.spec,1.8,1.9
Message-ID: <200601241022.k0OAMoec015438@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/bbkeys/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15397/bbkeys/devel

Modified Files:
	bbkeys.spec 
Log Message:
Changes for modular X, rebuild for FC5 (#178651 & #178652)



Index: bbkeys.spec
===================================================================
RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- bbkeys.spec	8 Apr 2005 09:39:22 -0000	1.8
+++ bbkeys.spec	24 Jan 2006 10:22:17 -0000	1.9
@@ -1,13 +1,19 @@
 Summary: Completely configurable key-combo grabber for blackbox
 Name: bbkeys
 Version: 0.9.0
-Release: 1
+Release: 2%{?dist}
 License: GPL
 Group: User Interface/Desktops
 URL: http://bbkeys.sourceforge.net/
 Source: http://dl.sf.net/bbkeys/bbkeys-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: blackbox-devel, XFree86-devel
+BuildRequires: blackbox-devel
+# Use monolithic X up to FC4, and modular X for FC5+
+%if 0%{?fedora} < 5
+BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libX11-devel, libXext-devel
+%endif
 
 %description
 bbkeys is a configurable key-grabber designed for the blackbox window manager
@@ -48,6 +54,9 @@
 
 
 %changelog
+* Mon Jan 23 2006 Matthias Saou <http://freshrpms.net/> 0.9.0-2
+- Add conditional to build with/without modular X depending on FC version.
+
 * Fri Apr  1 2005 Matthias Saou <http://freshrpms.net/> 0.9.0-1
 - Update to 0.9.0.
 



From fedora-extras-commits at redhat.com  Tue Jan 24 11:09:42 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 24 Jan 2006 06:09:42 -0500
Subject: rpms/digikam/FC-3 .cvsignore, 1.6, 1.7 digikam.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200601241110.k0OBAFOq017355@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/digikam/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17334

Modified Files:
	.cvsignore digikam.spec sources 
Log Message:
- Remove libtool-ltdl-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Jan 2006 23:16:18 -0000	1.6
+++ .cvsignore	24 Jan 2006 11:09:42 -0000	1.7
@@ -1,3 +1 @@
-digikam-0.7.4.tar.bz2
-digikam-0.8.0.tar.bz2
 digikam-0.8.1.tar.bz2


Index: digikam.spec
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/digikam.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- digikam.spec	23 Jan 2006 23:16:18 -0000	1.7
+++ digikam.spec	24 Jan 2006 11:09:42 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		digikam
 Version:	0.8.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A digital camera accessing & photo management application
 
 Group:		Applications/Multimedia
@@ -12,7 +12,7 @@
 BuildRequires:	qt-devel kdelibs-devel arts-devel gphoto2-devel >= 2.0.0
 BuildRequires:	imlib2-devel libkexif-devel >= 0.2 libkipi-devel >= 0.1
 BuildRequires:	libtiff-devel sqlite-devel >= 3.0.0 gettext pkgconfig
-BuildRequires:	desktop-file-utils libtool-ltdl-devel
+BuildRequires:	desktop-file-utils
 Requires(post):	desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -119,6 +119,9 @@
 %{_libdir}/libdigikam.so
 
 %changelog
+* Tue Jan 24 2006 Marcin Garski <mgarski at post.pl> 0.8.1-2
+- Remove libtool-ltdl-devel
+
 * Mon Jan 23 2006 Marcin Garski <mgarski at post.pl> 0.8.1-1
 - Add --enable-final
 - Remove GCC 4.1 patch, applied upstream


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/digikam/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Jan 2006 23:16:18 -0000	1.6
+++ sources	24 Jan 2006 11:09:42 -0000	1.7
@@ -1,2 +1 @@
-9a0eaf4cb8e10d082b54b920a6244890  digikam-0.8.0.tar.bz2
 2672c510a78256a034a666f0e237eb3f  digikam-0.8.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 13:01:39 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 08:01:39 -0500
Subject: extras-buildsys/server Builder.py,1.27,1.28
Message-ID: <200601241301.k0OD1d3B021116@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21089/server

Modified Files:
	Builder.py 
Log Message:
Increase builder sleep time to 20s to combat SSL hanging


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Builder.py	24 Jan 2006 01:35:57 -0000	1.27
+++ Builder.py	24 Jan 2006 13:01:09 -0000	1.28
@@ -354,7 +354,7 @@
 
             self._server_lock.release()
 
-            time.sleep(3)
+            time.sleep(20)
     
     def available(self):
         """



From fedora-extras-commits at redhat.com  Tue Jan 24 13:13:05 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 08:13:05 -0500
Subject: extras-buildsys/server Builder.py,1.20.2.6,1.20.2.7
Message-ID: <200601241313.k0ODD5uR021229@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21211/server

Modified Files:
      Tag: STABLE_0_4
	Builder.py 
Log Message:
Increase builder sleep time to 20s to combat SSL hanging


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.20.2.6
retrieving revision 1.20.2.7
diff -u -r1.20.2.6 -r1.20.2.7
--- Builder.py	24 Jan 2006 01:35:27 -0000	1.20.2.6
+++ Builder.py	24 Jan 2006 13:12:56 -0000	1.20.2.7
@@ -353,7 +353,7 @@
 
             self._server_lock.release()
 
-            time.sleep(3)
+            time.sleep(20)
     
     def available(self):
         """



From fedora-extras-commits at redhat.com  Tue Jan 24 13:59:30 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Tue, 24 Jan 2006 08:59:30 -0500
Subject: rpms/gstreamer-python/devel .cvsignore, 1.3,
	1.4 gstreamer-python.spec, 1.8, 1.9 sources, 1.3, 1.4
Message-ID: <200601241400.k0OE039a021352@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/gstreamer-python/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21325

Modified Files:
	.cvsignore gstreamer-python.spec sources 
Log Message:
update to gst-python 0.10.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Feb 2005 18:47:33 -0000	1.3
+++ .cvsignore	24 Jan 2006 13:59:30 -0000	1.4
@@ -1 +1 @@
-gst-python-0.8.1.tar.bz2
+gst-python-0.10.2.tar.bz2


Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/gstreamer-python.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gstreamer-python.spec	19 May 2005 15:46:32 -0000	1.8
+++ gstreamer-python.spec	24 Jan 2006 13:59:30 -0000	1.9
@@ -1,11 +1,13 @@
-%define         gst_minver      0.8.7
-%define         gstp_minver     0.8.5
+%define         gst_minver      0.10.2
+%define         gstpb_minver    0.10.2
+%define         pygtk_minver    2.8.0
+%define         majorminor      0.10
 %define         gstreamer       gstreamer
 
 Name:           %{gstreamer}-python
-Version:        0.8.1
-Release:        6
-Summary:        Python bindings for GStreamer.
+Version:        0.10.2
+Release:        1%{?dist}
+Summary:        Python bindings for GStreamer
 
 Group:          Development/Languages
 License:        LGPL
@@ -14,27 +16,25 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       python >= 2
-Requires:       pygtk2 >= 2.4.0
-Requires:       %{gstreamer} >= %{_gst_minver}
-Requires:       %{gstreamer}-plugins >= %{_gstp_minver}
+Requires:       pygtk2 >= %{pygtk_minver}
+Requires:       %{gstreamer} >= %{gst_minver}
+Requires:       %{gstreamer}-plugins-base >= %{gstpb_minver}
 
 BuildRequires:  python >= 2
 BuildRequires:  python-devel >= 2
-BuildRequires:  pygtk2-devel >= 2.4.0
+BuildRequires:  pygtk2-devel >= %{pygtk_minver}
 
 # xwindowlistener needs X11 headers
-BuildRequires:  XFree86-devel
+BuildRequires:  libX11-devel
 
-BuildRequires:  %{gstreamer}-devel >= %{_gst_minver}
-BuildRequires:  %{gstreamer}-plugins-devel >= %{_gstp_minver}
+BuildRequires:  %{gstreamer}-devel >= %{gst_minver}
+BuildRequires:  %{gstreamer}-plugins-base-devel >= %{gstpb_minver}
 
 # sigh, libtool
 BuildRequires:  gcc-c++
 
 # no sense in splitting off a devel package just yet
 Provides:       %{gstreamer}-python-devel = %{version}-%{release}
-Requires:       pygtk2-devel
-Requires:       gstreamer-devel
 
 %description
 This module contains a wrapper that allows GStreamer applications
@@ -53,11 +53,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 %makeinstall
-# The __init__.py* files go into lib instead of lib64, so fix that
-if [ "%{_lib}" != "lib" ]; then
-    %{__mv} %{buildroot}%{_prefix}/lib/python?.?/site-packages/gst/__init__.* \
-            %{buildroot}%{_libdir}/python?.?/site-packages/gst/
-fi
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 %clean
@@ -66,16 +61,20 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%doc examples/gst/*.py examples/gstplay/*.py
-%{_libdir}/python?.?/site-packages/gst
+%doc examples/*.py
+%{_libdir}/python?.?/site-packages/gst-%{majorminor}
+%{_libdir}/python?.?/site-packages/pygst.py
+%{_libdir}/python?.?/site-packages/pygst.pth
 %dir %{_datadir}/gst-python
-%{_datadir}/gst-python/examples
-%dir %{_datadir}/gst-python/2.0/
-%dir %{_datadir}/gst-python/2.0/defs/
-%{_datadir}/gst-python/2.0/defs/*.defs
-%{_libdir}/pkgconfig/gst-python-0.8.pc
+%{_datadir}/gst-python/%{majorminor}/examples
+%{_datadir}/gst-python/%{majorminor}/defs/*.defs
+%{_libdir}/pkgconfig/gst-python-%{majorminor}.pc
 
 %changelog
+* Tue Jan 24 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- update to GStreamer Python Bindings 0.10.2
+- remove -devel requirements
+
 * Thu May 19 2005 Thomas Vander Stichele <thomas at apestaart dot org> - 0.8.1-6
 - disable docs build - they're already in the tarball
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gstreamer-python/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Feb 2005 18:47:33 -0000	1.3
+++ sources	24 Jan 2006 13:59:30 -0000	1.4
@@ -1 +1 @@
-4a7e23b885c6ec8a7d300714f2106ba2  gst-python-0.8.1.tar.bz2
+e29366d227204e211d867577ff8e7b89  gst-python-0.10.2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 15:31:42 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 24 Jan 2006 10:31:42 -0500
Subject: rpms/ipython/FC-3 .cvsignore, 1.5, 1.6 ipython.spec, 1.5,
	1.6 sources, 1.6, 1.7
Message-ID: <200601241532.k0OFWFB9026197@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26142/FC-3

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
update to new upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Jan 2006 15:34:54 -0000	1.5
+++ .cvsignore	24 Jan 2006 15:31:42 -0000	1.6
@@ -1 +1 @@
-ipython-0.7.0.tar.gz
+ipython-0.7.1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ipython.spec	12 Jan 2006 15:34:54 -0000	1.5
+++ ipython.spec	24 Jan 2006 15:31:42 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
+- Update to new upstream 0.7.1
+
 * Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
 - Update to new upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2006 15:34:54 -0000	1.6
+++ sources	24 Jan 2006 15:31:42 -0000	1.7
@@ -1 +1 @@
-3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz
+ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 15:31:48 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 24 Jan 2006 10:31:48 -0500
Subject: rpms/ipython/FC-4 .cvsignore, 1.6, 1.7 ipython.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200601241532.k0OFWL9t026202@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26142/FC-4

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
update to new upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jan 2006 15:35:00 -0000	1.6
+++ .cvsignore	24 Jan 2006 15:31:48 -0000	1.7
@@ -1 +1 @@
-ipython-0.7.0.tar.gz
+ipython-0.7.1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/ipython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ipython.spec	12 Jan 2006 15:35:00 -0000	1.7
+++ ipython.spec	24 Jan 2006 15:31:48 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
+- Update to new upstream 0.7.1
+
 * Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
 - Update to new upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2006 15:35:00 -0000	1.6
+++ sources	24 Jan 2006 15:31:48 -0000	1.7
@@ -1 +1 @@
-3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz
+ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 15:31:54 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Tue, 24 Jan 2006 10:31:54 -0500
Subject: rpms/ipython/devel .cvsignore, 1.6, 1.7 ipython.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200601241532.k0OFWQTm026207@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26142/devel

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
update to new upstream version 0.7.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	12 Jan 2006 15:35:16 -0000	1.6
+++ .cvsignore	24 Jan 2006 15:31:54 -0000	1.7
@@ -1 +1 @@
-ipython-0.7.0.tar.gz
+ipython-0.7.1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ipython.spec	12 Jan 2006 15:35:16 -0000	1.7
+++ ipython.spec	24 Jan 2006 15:31:54 -0000	1.8
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.0
+Version:        0.7.1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
+- Update to new upstream 0.7.1
+
 * Thu Jan 12 2006 Shahms E. King <shahms at shahms.com> 0.7-1
 - Update to new upstream 0.7.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	12 Jan 2006 15:35:16 -0000	1.6
+++ sources	24 Jan 2006 15:31:54 -0000	1.7
@@ -1 +1 @@
-3be8bae6c7c2153b6e57d3214c52c841  ipython-0.7.0.tar.gz
+ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 15:34:40 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Tue, 24 Jan 2006 10:34:40 -0500
Subject: devel/gstreamer-python gstreamer-python.spec,1.9,1.10
Message-ID: <200601241535.k0OFZDxI026349@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/devel/gstreamer-python
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26332

Modified Files:
	gstreamer-python.spec 
Log Message:
change to include *.py*



Index: gstreamer-python.spec
===================================================================
RCS file: /cvs/extras/devel/gstreamer-python/gstreamer-python.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gstreamer-python.spec	24 Jan 2006 13:59:30 -0000	1.9
+++ gstreamer-python.spec	24 Jan 2006 15:34:40 -0000	1.10
@@ -63,7 +63,7 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 %doc examples/*.py
 %{_libdir}/python?.?/site-packages/gst-%{majorminor}
-%{_libdir}/python?.?/site-packages/pygst.py
+%{_libdir}/python?.?/site-packages/pygst.py*
 %{_libdir}/python?.?/site-packages/pygst.pth
 %dir %{_datadir}/gst-python
 %{_datadir}/gst-python/%{majorminor}/examples



From fedora-extras-commits at redhat.com  Tue Jan 24 16:06:22 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:06:22 -0500
Subject: rpms/php-pear-DB - New directory
Message-ID: <200601241606.k0OG6O3U028272@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28263/php-pear-DB

Log Message:
Directory /cvs/extras/rpms/php-pear-DB added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:06:28 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:06:28 -0500
Subject: rpms/php-pear-DB/devel - New directory
Message-ID: <200601241606.k0OG6oCH028289@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28263/php-pear-DB/devel

Log Message:
Directory /cvs/extras/rpms/php-pear-DB/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:07:29 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:07:29 -0500
Subject: mock mock.py,1.33,1.34
Message-ID: <200601241607.k0OG7TD8028340@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28244

Modified Files:
	mock.py 
Log Message:
Add an option to create a new process group so that both mock and
all of its children can be easily killed with kill(-<mock pid>) without
killing mock's parent (ie, plague-builder).



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mock.py	19 Jan 2006 21:33:30 -0000	1.33
+++ mock.py	24 Jan 2006 16:07:11 -0000	1.34
@@ -648,6 +648,8 @@
             help="Arbitrary, unique extension to append to buildroot directory name")
     parser.add_option("--quiet", action ="store_true", dest="quiet", 
             default=False, help="quiet down output")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -711,7 +713,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)



From fedora-extras-commits at redhat.com  Tue Jan 24 16:07:27 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:07:27 -0500
Subject: rpms/php-pear-DB Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601241607.k0OG7Te8028341@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318

Added Files:
	Makefile import.log 
Log Message:
Setup of module php-pear-DB


--- NEW FILE Makefile ---
# Top level Makefile for module php-pear-DB
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:07:34 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:07:34 -0500
Subject: rpms/php-pear-DB/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601241607.k0OG7aRY028361@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28318/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module php-pear-DB


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:09:07 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:09:07 -0500
Subject: rpms/php-pear-DB/devel php-pear-DB.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200601241609.k0OG9eNH028445@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28400/devel

Modified Files:
	.cvsignore sources 
Added Files:
	php-pear-DB.spec 
Log Message:
auto-import php-pear-DB-1.7.6-3 on branch devel from php-pear-DB-1.7.6-3.src.rpm


--- NEW FILE php-pear-DB.spec ---
%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear)

Summary: PEAR: Database Abstraction Layer
Name: php-pear-DB
Version: 1.7.6
Release: 3
License: The PHP License
Group: Development/Libraries
Source0: http://pear.php.net/get/DB-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://pear.php.net/package/DB
BuildArchitectures: noarch
BuildRequires: php-pear
Provides: php-pear(DB) = 1.7.6
Requires: php >= 4.2.0, php-pear(PEAR)
Requires(post): php-pear
Requires(postun): php-pear

%description
DB is a database abstraction layer for PHP providing:

* an OO-style query API
* portability features that make programs written for one DBMS work with 
  other DBMS's
* a DSN (data source name) format for specifying database servers
* prepare/execute (bind) emulation for databases that don't support it natively
* a result object for each query response
* portable error codes
* sequence emulation
* sequential and non-sequential row fetching as well as bulk fetching
* formats fetched rows as associative arrays, ordered arrays or objects
* row limit support
* transactions support
* table information interface
* DocBook and phpDocumentor API documentation

DB layers itself on top of PHP's existing database extensions.

%prep
%setup -c -T
pear -v -c pearrc \
        -d php_dir=%{peardir} \
        -d doc_dir=/docs \
        -d bin_dir=%{_bindir} \
        -d data_dir=%{peardir}/data \
        -d test_dir=%{peardir}/tests \
        -d ext_dir=%{_libdir} \
        -s

%build

%install
rm -rf %{buildroot}
pear -c pearrc install --nodeps -R %{buildroot} %{SOURCE0}

# Clean up unnecessary files
rm -f pearrc
rm -f %{buildroot}%{peardir}/.filemap
rm -f %{buildroot}%{peardir}/.lock
rm -rf %{buildroot}%{peardir}/.registry
rm -rf %{buildroot}%{peardir}/.channels
rm -rf %{buildroot}%{peardir}/.depdb*

# Sort out documentation
mv %{buildroot}/docs/DB/* .
rm -rf %{buildroot}/docs

# Install XML package description
mkdir -p %{buildroot}%{_var}/lib/pear
tar -xzf %{SOURCE0} package.xml
cp -p package.xml %{buildroot}%{_var}/lib/pear/DB.xml

%clean
rm -rf %{buildroot}

%post
pear install --nodeps --soft --force --register-only %{_var}/lib/pear/DB.xml >/dev/null

%postun
if [ "$1" -eq "0" ]; then
    pear uninstall --nodeps --ignore-errors --register-only DB >/dev/null
fi

%files
%defattr(-,root,root)
%doc doc/IDEAS doc/MAINTAINERS doc/STATUS doc/TESTERS
%{_var}/lib/pear/DB.xml
%{peardir}/tests/DB
%{peardir}/DB.php
%{peardir}/DB

%changelog
* Tue Jan 24 2006 Tim Jackson <rpm at timj.co.uk> 1.7.6-3
- Requires(post,postun) php-pear

* Sat Dec 31 2005 Tim Jackson <rpm at timj.co.uk> 1.7.6-2
- Rearranged so it makes more sense
- Remove external license file
- peardir definition now comes from "pear config-get"
- BR php-pear
- shorten description
- be explicit about the files in the package
- use macro for /var
- remove versioning from pear(PEAR) dep; 1.0b1 is very old

* Sat Dec 31 2005 Tim Jackson <rpm at timj.co.uk> 1.7.6-1
- First RPM build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Jan 2006 16:07:34 -0000	1.1
+++ .cvsignore	24 Jan 2006 16:09:07 -0000	1.2
@@ -0,0 +1 @@
+DB-1.7.6.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2006 16:07:34 -0000	1.1
+++ sources	24 Jan 2006 16:09:07 -0000	1.2
@@ -0,0 +1 @@
+b5ff032f7e8873174e3e7fc21b7ec696  DB-1.7.6.tgz



From fedora-extras-commits at redhat.com  Tue Jan 24 16:08:39 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:08:39 -0500
Subject: rpms/php-pear-DB import.log,1.1,1.2
Message-ID: <200601241609.k0OG9fOZ028446@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/php-pear-DB
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28400

Modified Files:
	import.log 
Log Message:
auto-import php-pear-DB-1.7.6-3 on branch devel from php-pear-DB-1.7.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/php-pear-DB/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Jan 2006 16:07:27 -0000	1.1
+++ import.log	24 Jan 2006 16:08:39 -0000	1.2
@@ -0,0 +1 @@
+php-pear-DB-1_7_6-3:HEAD:php-pear-DB-1.7.6-3.src.rpm:1138118912



From fedora-extras-commits at redhat.com  Tue Jan 24 16:15:55 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:15:55 -0500
Subject: rpms/mock/devel mock-0.4-setpgrp.patch,NONE,1.1 mock.spec,1.9,1.10
Message-ID: <200601241616.k0OGGRKM028583@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28558

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
- Add option to create new process group so mock and its children
    may be more easily killed



mock-0.4-setpgrp.patch:

--- NEW FILE mock-0.4-setpgrp.patch ---
--- mock-0.4/mock.py.setpgrp	2006-01-24 11:10:40.000000000 -0500
+++ mock-0.4/mock.py	2006-01-24 11:12:08.000000000 -0500
@@ -621,6 +621,8 @@
             help="path for state dirresulting files to be put")
     parser.add_option("--uniqueext", action="store", type="string", default=None,
             help="Arbitrary, unique extension to append to buildroot directory name")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -683,7 +685,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mock.spec	18 Jan 2006 22:10:57 -0000	1.9
+++ mock.spec	24 Jan 2006 16:15:54 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
+Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -19,6 +20,7 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
+%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -68,6 +70,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
+- Add option to create new process group so mock and its children
+    may be more easily killed
+
 * Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
 - Add unpackaged files fix from RH#163576 (Adrian Reber)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 16:17:06 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:17:06 -0500
Subject: rpms/mock/FC-4 mock-0.4-setpgrp.patch,NONE,1.1 mock.spec,1.9,1.10
Message-ID: <200601241617.k0OGHcVT028777@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28704

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
- Add option to create new process group so mock and its children
    may be more easily killed



mock-0.4-setpgrp.patch:

--- NEW FILE mock-0.4-setpgrp.patch ---
--- mock-0.4/mock.py.setpgrp	2006-01-24 11:10:40.000000000 -0500
+++ mock-0.4/mock.py	2006-01-24 11:12:08.000000000 -0500
@@ -621,6 +621,8 @@
             help="path for state dirresulting files to be put")
     parser.add_option("--uniqueext", action="store", type="string", default=None,
             help="Arbitrary, unique extension to append to buildroot directory name")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -683,7 +685,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mock.spec	18 Jan 2006 22:16:27 -0000	1.9
+++ mock.spec	24 Jan 2006 16:17:06 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
+Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -19,6 +20,7 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
+%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -68,6 +70,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
+- Add option to create new process group so mock and its children
+    may be more easily killed
+
 * Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
 - Add unpackaged files fix from RH#163576 (Adrian Reber)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 16:18:10 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 11:18:10 -0500
Subject: rpms/mock/FC-3 mock-0.4-setpgrp.patch,NONE,1.1 mock.spec,1.9,1.10
Message-ID: <200601241618.k0OGIhuE028851@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28828

Modified Files:
	mock.spec 
Added Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
- Add option to create new process group so mock and its children
    may be more easily killed



mock-0.4-setpgrp.patch:

--- NEW FILE mock-0.4-setpgrp.patch ---
--- mock-0.4/mock.py.setpgrp	2006-01-24 11:10:40.000000000 -0500
+++ mock-0.4/mock.py	2006-01-24 11:12:08.000000000 -0500
@@ -621,6 +621,8 @@
             help="path for state dirresulting files to be put")
     parser.add_option("--uniqueext", action="store", type="string", default=None,
             help="Arbitrary, unique extension to append to buildroot directory name")
+    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
+            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -683,7 +685,12 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-    
+
+    # If requested, become a process group leader so that us and
+    # _all_ of our children can more easily be killed with kill(2)
+    if options.setpgrp:
+        os.setpgrp()
+
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)


Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mock.spec	18 Jan 2006 22:23:07 -0000	1.9
+++ mock.spec	24 Jan 2006 16:18:10 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,6 +11,7 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
+Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -19,6 +20,7 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
+%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -68,6 +70,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
+- Add option to create new process group so mock and its children
+    may be more easily killed
+
 * Wed Jan 18 2006 Dan Williams <dcbw at redhat.com> - 0.4-3
 - Add unpackaged files fix from RH#163576 (Adrian Reber)
 



From fedora-extras-commits at redhat.com  Tue Jan 24 16:20:16 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:20:16 -0500
Subject: owners owners.list,1.562,1.563
Message-ID: <200601241620.k0OGKXxi028918@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28901

Modified Files:
	owners.list 
Log Message:
Add php-pear-DB owner



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.562
retrieving revision 1.563
diff -u -r1.562 -r1.563
--- owners.list	22 Jan 2006 23:58:06 -0000	1.562
+++ owners.list	24 Jan 2006 16:20:15 -0000	1.563
@@ -981,6 +981,7 @@
 Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|php-pear-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-mailparse|PECL package for parsing and working with email messages|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-pdo|PECL package for PHP Data Objects Interface|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 24 16:38:50 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:38:50 -0500
Subject: rpms/altermime - New directory
Message-ID: <200601241638.k0OGcqjC029119@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29111/altermime

Log Message:
Directory /cvs/extras/rpms/altermime added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:38:55 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:38:55 -0500
Subject: rpms/altermime/devel - New directory
Message-ID: <200601241638.k0OGcviC029134@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29111/altermime/devel

Log Message:
Directory /cvs/extras/rpms/altermime/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:15 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:15 -0500
Subject: rpms/altermime Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601241639.k0OGdHdd029168@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29156

Added Files:
	Makefile import.log 
Log Message:
Setup of module altermime


--- NEW FILE Makefile ---
# Top level Makefile for module altermime
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:21 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:21 -0500
Subject: rpms/altermime/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601241639.k0OGdNUZ029188@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29156/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module altermime


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:50 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:50 -0500
Subject: rpms/altermime import.log,1.1,1.2
Message-ID: <200601241640.k0OGeNrH029262@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29224

Modified Files:
	import.log 
Log Message:
auto-import altermime-0.3.6-1 on branch devel from altermime-0.3.6-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/altermime/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Jan 2006 16:39:15 -0000	1.1
+++ import.log	24 Jan 2006 16:39:50 -0000	1.2
@@ -0,0 +1 @@
+altermime-0_3_6-1:HEAD:altermime-0.3.6-1.src.rpm:1138120784



From fedora-extras-commits at redhat.com  Tue Jan 24 16:39:56 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:39:56 -0500
Subject: rpms/altermime/devel altermime.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601241640.k0OGeSB9029266@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/altermime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29224/devel

Modified Files:
	.cvsignore sources 
Added Files:
	altermime.spec 
Log Message:
auto-import altermime-0.3.6-1 on branch devel from altermime-0.3.6-1.src.rpm


--- NEW FILE altermime.spec ---
Name:           altermime
Version:        0.3.6
Release:        1%{?dist}
Summary:        Alter MIME-encoded mailpacks

Group:          Applications/Internet
License:        BSD
URL:            http://www.pldaniels.com/altermime/
Source0:        http://www.pldaniels.com/altermime/altermime-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
alterMIME is a small program which is used to alter MIME-encoded mailpacks.

alterMIME can:

 * Insert disclaimers
 * Insert arbitary X-headers
 * Modify existing headers
 * Remove attachments based on filename or content-type
 * Replace attachments based on filename 

%prep
%setup -q


%build
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
# Makefile has hardcoded paths
%{__mkdir_p} %{buildroot}%{_bindir}
%{__install} -m 755 altermime %{buildroot}%{_bindir}/

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%{_bindir}/*

%doc CHANGELOG LICENCE README


%changelog
* Wed Jan 11 2006 Tim Jackson <rpm at timj.co.uk> 0.3.6-1
- Intial build for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/altermime/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Jan 2006 16:39:20 -0000	1.1
+++ .cvsignore	24 Jan 2006 16:39:56 -0000	1.2
@@ -0,0 +1 @@
+altermime-0.3.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/altermime/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Jan 2006 16:39:20 -0000	1.1
+++ sources	24 Jan 2006 16:39:56 -0000	1.2
@@ -0,0 +1 @@
+a9dc3962b00e4a6d6f3b93f10858bd35  altermime-0.3.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 16:53:47 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Tue, 24 Jan 2006 11:53:47 -0500
Subject: owners owners.list,1.563,1.564
Message-ID: <200601241654.k0OGsJrt029333@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29316

Modified Files:
	owners.list 
Log Message:
Add altermime owner



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- owners.list	24 Jan 2006 16:20:15 -0000	1.563
+++ owners.list	24 Jan 2006 16:53:47 -0000	1.564
@@ -30,6 +30,7 @@
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|altermime|Alter MIME-encoded mailpacks|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|anjuta|GNOME IDE for C and C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 24 17:15:18 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:15:18 -0500
Subject: mock mock.py,1.34,1.35
Message-ID: <200601241715.k0OHFIdd031210@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31192

Modified Files:
	mock.py 
Log Message:
Back out setpgrp patch, found a better way to do it in plague


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mock.py	24 Jan 2006 16:07:11 -0000	1.34
+++ mock.py	24 Jan 2006 17:15:10 -0000	1.35
@@ -648,8 +648,6 @@
             help="Arbitrary, unique extension to append to buildroot directory name")
     parser.add_option("--quiet", action ="store_true", dest="quiet", 
             default=False, help="quiet down output")
-    parser.add_option("--setpgrp", action ="store_true", dest="setpgrp", 
-            default=False, help="starts a new process group for mock")
 
     return parser.parse_args()
     
@@ -713,12 +711,7 @@
     if len(args) < 1:
         error("No srpm or command specified - nothing to do")
         sys.exit(50)
-
-    # If requested, become a process group leader so that us and
-    # _all_ of our children can more easily be killed with kill(2)
-    if options.setpgrp:
-        os.setpgrp()
-
+    
     # read in the config file by chroot name
     if options.chroot.endswith('.cfg'):
         cfg = '%s/%s' % (config_path, options.chroot)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:16:33 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:16:33 -0500
Subject: rpms/mock/devel mock.spec, 1.10, 1.11 mock-0.4-setpgrp.patch, 1.1,
	NONE
Message-ID: <200601241717.k0OHH6hv031257@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31238

Modified Files:
	mock.spec 
Removed Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
- Back out setpgrp patch, found a better way to do it in plague




Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mock.spec	24 Jan 2006 16:15:54 -0000	1.10
+++ mock.spec	24 Jan 2006 17:16:33 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
-Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -20,7 +19,6 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
-%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -70,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
+- Back out setpgrp patch, found a better way to do it in plague
+
 * Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
 - Add option to create new process group so mock and its children
     may be more easily killed


--- mock-0.4-setpgrp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 24 17:18:05 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:18:05 -0500
Subject: rpms/mock/FC-4 mock.spec,1.10,1.11 mock-0.4-setpgrp.patch,1.1,NONE
Message-ID: <200601241718.k0OHIbXK031314@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31297

Modified Files:
	mock.spec 
Removed Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
- Back out setpgrp patch, found a better way to do it in plague




Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mock.spec	24 Jan 2006 16:17:06 -0000	1.10
+++ mock.spec	24 Jan 2006 17:18:04 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
-Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -20,7 +19,6 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
-%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -70,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
+- Back out setpgrp patch, found a better way to do it in plague
+
 * Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
 - Add option to create new process group so mock and its children
     may be more easily killed


--- mock-0.4-setpgrp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 24 17:20:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:20:23 -0500
Subject: rpms/mock/FC-3 mock.spec,1.10,1.11 mock-0.4-setpgrp.patch,1.1,NONE
Message-ID: <200601241720.k0OHKtIW031395@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/mock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31375

Modified Files:
	mock.spec 
Removed Files:
	mock-0.4-setpgrp.patch 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
- Back out setpgrp patch, found a better way to do it in plague




Index: mock.spec
===================================================================
RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mock.spec	24 Jan 2006 16:18:10 -0000	1.10
+++ mock.spec	24 Jan 2006 17:20:23 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -11,7 +11,6 @@
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
 Patch0: mock-0.4-unpackaged-files-fix.patch
-Patch1: mock-0.4-setpgrp.patch
 
 %description
 Mock takes a srpm and builds it in a chroot
@@ -20,7 +19,6 @@
 %setup -q
 
 %patch0 -p1 -b .unpackaged-files-fix
-%patch1 -p1 -b .setpgrp
 
 %build
 make
@@ -70,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-5
+- Back out setpgrp patch, found a better way to do it in plague
+
 * Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> - 0.4-4
 - Add option to create new process group so mock and its children
     may be more easily killed


--- mock-0.4-setpgrp.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 24 17:40:09 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:40:09 -0500
Subject: extras-buildsys/common ExecUtils.py,1.4,1.5
Message-ID: <200601241740.k0OHe9Af031595@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31541/common

Modified Files:
	ExecUtils.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ExecUtils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/ExecUtils.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExecUtils.py	14 Nov 2005 19:13:01 -0000	1.4
+++ ExecUtils.py	24 Jan 2006 17:39:46 -0000	1.5
@@ -58,7 +58,7 @@
     fd = os.open(filespec, flags, 0644)
     return (fd, True)
 
-def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2):
+def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2, setpgrp=True):
     cmd = os.path.abspath(cmd)
     if not os.access (cmd, os.X_OK):
         raise RuntimeError(cmd + " can not be run")
@@ -75,6 +75,10 @@
 
     childpid = os.fork()
     if (not childpid):
+        # Become leader of a new process group if requested
+        if setpgrp:
+            os.setpgrp()
+
         if stdin != 0:
             os.dup2(stdin, 0)
             os.close(stdin)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:39:42 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:39:42 -0500
Subject: extras-buildsys ChangeLog,1.160,1.161
Message-ID: <200601241740.k0OHeCBT031598@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31541

Modified Files:
	ChangeLog 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog	24 Jan 2006 01:18:55 -0000	1.160
+++ ChangeLog	24 Jan 2006 17:39:23 -0000	1.161
@@ -1,3 +1,13 @@
+2006-01-24  Dan Williams  <dcbw at redhat.com>
+
+    * common/ExecUtils.py
+        - (exec_with_redirect): by default, have child start a new
+            process group
+
+    * builder/builder.py
+        - (_handle_death): kill child's entire process group, not just
+            the child itself
+
 2006-01-23  Dan Williams  <dcbw at redhat.com>
 
     * common/SSLConnection.py



From fedora-extras-commits at redhat.com  Tue Jan 24 17:40:07 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:40:07 -0500
Subject: extras-buildsys/builder builder.py,1.49,1.50
Message-ID: <200601241740.k0OHebih031603@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31541/builder

Modified Files:
	builder.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- builder.py	18 Nov 2005 14:34:05 -0000	1.49
+++ builder.py	24 Jan 2006 17:39:40 -0000	1.50
@@ -133,10 +133,12 @@
         if self._status != 'cleanup':
             # Kill a running non-cleanup mock process, if any
             if self._childpid:
+                child_pgroup = 0 - self._childpid
                 try:
-                    os.kill(self._childpid, 9)
+                    # Kill all members of the child's process group
+                    os.kill(child_pgroup, 9)
                 except OSError, e:
-                    self._log("ERROR: Couldn't kill process %d: %s\n" % (self._childpid, e))
+                    self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e))
                 else:
                     # Ensure child process is reaped
                     self._log("Waiting for mock process %d to exit...\n" % self._childpid)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:45:46 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:45:46 -0500
Subject: extras-buildsys/common ExecUtils.py,1.2.2.2,1.2.2.3
Message-ID: <200601241745.k0OHjkhh031686@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31636/common

Modified Files:
      Tag: STABLE_0_4
	ExecUtils.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ExecUtils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/ExecUtils.py,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- ExecUtils.py	14 Nov 2005 19:15:22 -0000	1.2.2.2
+++ ExecUtils.py	24 Jan 2006 17:45:38 -0000	1.2.2.3
@@ -58,7 +58,7 @@
     fd = os.open(filespec, flags, 0644)
     return (fd, True)
 
-def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2):
+def exec_with_redirect(cmd, argv, stdin=0, stdout=1, stderr=2, setpgrp=True):
     cmd = os.path.abspath(cmd)
     if not os.access (cmd, os.X_OK):
         raise RuntimeError(cmd + " can not be run")
@@ -75,6 +75,10 @@
 
     childpid = os.fork()
     if (not childpid):
+        # Become leader of a new process group if requested
+        if setpgrp:
+            os.setpgrp()
+
         if stdin != 0:
             os.dup2(stdin, 0)
             os.close(stdin)



From fedora-extras-commits at redhat.com  Tue Jan 24 17:45:35 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:45:35 -0500
Subject: extras-buildsys ChangeLog,1.126.2.31,1.126.2.32
Message-ID: <200601241746.k0OHk5R8031689@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31636

Modified Files:
      Tag: STABLE_0_4
	ChangeLog 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.126.2.31
retrieving revision 1.126.2.32
diff -u -r1.126.2.31 -r1.126.2.32
--- ChangeLog	24 Jan 2006 01:12:36 -0000	1.126.2.31
+++ ChangeLog	24 Jan 2006 17:45:26 -0000	1.126.2.32
@@ -1,3 +1,13 @@
+2006-01-24  Dan Williams  <dcbw at redhat.com>
+
+    * common/ExecUtils.py
+        - (exec_with_redirect): by default, have child start a new
+            process group
+
+    * builder/builder.py
+        - (_handle_death): kill child's entire process group, not just
+            the child itself
+
 2006-01-23  Dan Williams  <dcbw at redhat.com>
 
     * common/SSLConnection.py



From fedora-extras-commits at redhat.com  Tue Jan 24 17:45:40 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 12:45:40 -0500
Subject: extras-buildsys/builder builder.py,1.44.2.5,1.44.2.6
Message-ID: <200601241746.k0OHkBeE031692@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31636/builder

Modified Files:
      Tag: STABLE_0_4
	builder.py 
Log Message:
2006-01-24  Dan Williams  <dcbw at redhat.com>

    * common/ExecUtils.py
        - (exec_with_redirect): by default, have child start a new
            process group

    * builder/builder.py
        - (_handle_death): kill child's entire process group, not just
            the child itself




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.44.2.5
retrieving revision 1.44.2.6
diff -u -r1.44.2.5 -r1.44.2.6
--- builder.py	18 Nov 2005 15:07:55 -0000	1.44.2.5
+++ builder.py	24 Jan 2006 17:45:33 -0000	1.44.2.6
@@ -133,10 +133,12 @@
         if self._status != 'cleanup':
             # Kill a running non-cleanup mock process, if any
             if self._childpid:
+                child_pgroup = 0 - self._childpid
                 try:
-                    os.kill(self._childpid, 9)
+                    # Kill all members of the child's process group
+                    os.kill(child_pgroup, 9)
                 except OSError, e:
-                    self._log("ERROR: Couldn't kill process %d: %s\n" % (self._childpid, e))
+                    self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e))
                 else:
                     # Ensure child process is reaped
                     self._log("Waiting for mock process %d to exit...\n" % self._childpid)



From fedora-extras-commits at redhat.com  Tue Jan 24 19:07:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 14:07:23 -0500
Subject: rpms/plague/devel plague.spec,1.23,1.24 sources,1.22,1.23
Message-ID: <200601241907.k0OJ7vUt002932@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2828

Modified Files:
	plague.spec sources 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
- Increase build server builder thread sleep time to work around SSL issues
- Spawn mock in a new process group, and when killing jobs kill the entire
    process group.  Hopefully fix orphaned rpmbuild processes on job kill




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plague.spec	24 Jan 2006 01:38:12 -0000	1.23
+++ plague.spec	24 Jan 2006 19:07:00 -0000	1.24
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,11 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
+- Increase build server builder thread sleep time to work around SSL issues
+- Spawn mock in a new process group, and when killing jobs kill the entire
+    process group.  Hopefully fix orphaned rpmbuild processes on job kill
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
 - Restore builder connection timeout
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/devel/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	24 Jan 2006 01:38:12 -0000	1.22
+++ sources	24 Jan 2006 19:07:00 -0000	1.23
@@ -1 +1 @@
-e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2
+6282064ae35d13f6b72744400c8a49c0  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 19:07:39 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 14:07:39 -0500
Subject: rpms/plague/FC-4 plague.spec,1.21,1.22 sources,1.20,1.21
Message-ID: <200601241908.k0OJ8CoB002949@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2908

Modified Files:
	plague.spec sources 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
- Increase build server builder thread sleep time to work around SSL issues
- Spawn mock in a new process group, and when killing jobs kill the entire
    process group.  Hopefully fix orphaned rpmbuild processes on job kill




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plague.spec	24 Jan 2006 01:39:35 -0000	1.21
+++ plague.spec	24 Jan 2006 19:07:39 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,11 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
+- Increase build server builder thread sleep time to work around SSL issues
+- Spawn mock in a new process group, and when killing jobs kill the entire
+    process group.  Hopefully fix orphaned rpmbuild processes on job kill
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
 - Restore builder connection timeout
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-4/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Jan 2006 01:39:35 -0000	1.20
+++ sources	24 Jan 2006 19:07:39 -0000	1.21
@@ -1 +1 @@
-e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2
+6282064ae35d13f6b72744400c8a49c0  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 19:08:26 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Tue, 24 Jan 2006 14:08:26 -0500
Subject: rpms/plague/FC-3 plague.spec,1.21,1.22 sources,1.20,1.21
Message-ID: <200601241909.k0OJ9ftc003116@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/plague/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2950

Modified Files:
	plague.spec sources 
Log Message:
* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
- Increase build server builder thread sleep time to work around SSL issues
- Spawn mock in a new process group, and when killing jobs kill the entire
    process group.  Hopefully fix orphaned rpmbuild processes on job kill




Index: plague.spec
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plague.spec	24 Jan 2006 01:40:22 -0000	1.21
+++ plague.spec	24 Jan 2006 19:08:26 -0000	1.22
@@ -3,7 +3,7 @@
 Summary: Distributed build system for RPMs
 Name: plague
 Version: 0.4.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2
@@ -144,6 +144,11 @@
 
 
 %changelog
+* Tue Jan 24 2006 Dan Williams <dcbw at redhat.com> 0.4.3-6
+- Increase build server builder thread sleep time to work around SSL issues
+- Spawn mock in a new process group, and when killing jobs kill the entire
+    process group.  Hopefully fix orphaned rpmbuild processes on job kill
+
 * Mon Jan 23 2006 Dan Williams <dcbw at redhat.com> 0.4.3-5
 - Restore builder connection timeout
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plague/FC-3/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	24 Jan 2006 01:40:22 -0000	1.20
+++ sources	24 Jan 2006 19:08:26 -0000	1.21
@@ -1 +1 @@
-e9272201ba40bec3215770887b5c8b42  plague-0.4.3.tar.bz2
+6282064ae35d13f6b72744400c8a49c0  plague-0.4.3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 24 19:44:10 2006
From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz))
Date: Tue, 24 Jan 2006 14:44:10 -0500
Subject: rpms/vpnc/devel vpnc-0.3.3-disconnect.patch, NONE, 1.1 vpnc.spec,
	1.9, 1.10
Message-ID: <200601241944.k0OJihxp003709@cvs-int.fedora.redhat.com>

Author: tmraz

Update of /cvs/extras/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3687

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.3.3-disconnect.patch 
Log Message:
* Tue Jan 24 2006 Tomas Mraz <tmraz at redhat.com> 0.3.3-5
- send the disconnect packet properly (patch by Laurence Moindrot)


vpnc-0.3.3-disconnect.patch:

--- NEW FILE vpnc-0.3.3-disconnect.patch ---
--- vpnc-0.3.3/tunip.c.disconnect	2005-05-05 12:25:00.000000000 +0200
+++ vpnc-0.3.3/tunip.c	2006-01-24 14:58:20.000000000 +0100
@@ -863,12 +863,7 @@
 		}
 	}
 	
-	sock = socket(AF_INET, SOCK_DGRAM, 0);
-	if (sock >= 0) {
-		sendto(sock, kill_packet, kill_packet_size, 0,
-			kill_dest, sizeof(struct sockaddr_in));
-		close(sock);
-	}
+	sendrecv(NULL,0,kill_packet,kill_packet_size,1);
 	tun_close(oursa->tun_fd, oursa->tun_name);
 	if (pidfile)
 		unlink(pidfile); /* ignore errors */
--- vpnc-0.3.3/vpnc.h.disconnect	2006-01-24 14:58:33.000000000 +0100
+++ vpnc-0.3.3/vpnc.h	2006-01-24 14:58:11.000000000 +0100
@@ -62,4 +62,6 @@
 extern const supported_algo_t *get_dh_group_ike(void);
 extern const supported_algo_t *get_dh_group_ipsec(int server_setting);
 
+extern ssize_t sendrecv(void *recvbuf, size_t recvbufsize, void *tosend, size_t sendsize, int sendonly);
+
 #endif
--- vpnc-0.3.3/vpnc.c.disconnect	2006-01-24 14:51:11.000000000 +0100
+++ vpnc-0.3.3/vpnc.c	2006-01-24 14:55:38.000000000 +0100
@@ -323,7 +323,7 @@
    new packet is put in RECVBUF of size RECVBUFSIZE and the actual size
    of the new packet is returned.  */
 
-static ssize_t
+ssize_t
 sendrecv(void *recvbuf, size_t recvbufsize, void *tosend, size_t sendsize, int sendonly)
 {
 	struct pollfd pfd;
@@ -2125,7 +2125,7 @@
 	/* Create the delete payload, now that we have all the information.  */
 	{
 		struct isakmp_payload *d_isakmp, *d_ipsec;
-		uint32_t del_msgid;
+		uint8_t del_msgid;
 
 		gcry_randomize((uint8_t *) & del_msgid, sizeof(del_msgid), GCRY_WEAK_RANDOM);
 		d_isakmp = new_isakmp_payload(ISAKMP_PAYLOAD_D);
@@ -2152,7 +2152,7 @@
 		memcpy(d_ipsec->u.d.spi[1], &s->tothem_esp_spi, 4);
 		phase2_authpacket(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL,
 			del_msgid, &s->kill_packet, &s->kill_packet_size,
-			nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length);
+			0, 0, 0, 0);
 		isakmp_crypt(s, s->kill_packet, s->kill_packet_size, 1);
 	}
 	DEBUG(2, printf("S7.8\n"));


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vpnc.spec	10 Oct 2005 08:21:55 -0000	1.9
+++ vpnc.spec	24 Jan 2006 19:44:10 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        4
+Release:        5
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -13,6 +13,7 @@
 Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.3.3-ip-output.patch
 Patch3:		vpnc-0.3.3-no-srcport.patch
+Patch4:		vpnc-0.3.3-disconnect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
@@ -30,6 +31,7 @@
 %patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .ip-output
 %patch3 -p1 -b .no-srcport
+%patch4 -p1 -b .disconnect
 
 %build
 make PREFIX=/usr
@@ -62,6 +64,9 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Tue Jan 24 2006 Tomas Mraz <tmraz at redhat.com> 0.3.3-5
+- send the disconnect packet properly (patch by Laurence Moindrot)
+
 * Thu Sep 22 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-4
 - improve compatibility with some Ciscos
 



From fedora-extras-commits at redhat.com  Tue Jan 24 22:44:00 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 24 Jan 2006 17:44:00 -0500
Subject: rpms/git-core/devel .cvsignore, 1.15, 1.16 git.spec, 1.3,
	1.4 sources, 1.15, 1.16
Message-ID: <200601242244.k0OMiXLw010777@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10754

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2006 05:03:53 -0000	1.15
+++ .cvsignore	24 Jan 2006 22:44:00 -0000	1.16
@@ -1 +1 @@
-git-1.1.2.tar.gz
+git-1.1.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git.spec	16 Jan 2006 05:03:53 -0000	1.3
+++ git.spec	24 Jan 2006 22:44:00 -0000	1.4
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.2
+Version: 	1.1.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 24 2006 Chris Wright <chrisw at redhat.com> 1.1.4-1
+- git-1.1.4
+
 * Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
 - git-1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jan 2006 05:03:53 -0000	1.15
+++ sources	24 Jan 2006 22:44:00 -0000	1.16
@@ -1 +1 @@
-b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz
+8a3ebe9070f738f4fc502b3a9fb7f3f5  git-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 22:45:54 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 24 Jan 2006 17:45:54 -0500
Subject: rpms/git-core/FC-4 .cvsignore, 1.15, 1.16 git.spec, 1.3, 1.4 sources,
	1.15, 1.16
Message-ID: <200601242246.k0OMkQn6010855@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10834

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2006 05:07:14 -0000	1.15
+++ .cvsignore	24 Jan 2006 22:45:53 -0000	1.16
@@ -1 +1 @@
-git-1.1.2.tar.gz
+git-1.1.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git.spec	16 Jan 2006 05:07:14 -0000	1.3
+++ git.spec	24 Jan 2006 22:45:53 -0000	1.4
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.2
+Version: 	1.1.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 24 2006 Chris Wright <chrisw at redhat.com> 1.1.4-1
+- git-1.1.4
+
 * Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
 - git-1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jan 2006 05:07:14 -0000	1.15
+++ sources	24 Jan 2006 22:45:53 -0000	1.16
@@ -1 +1 @@
-b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz
+8a3ebe9070f738f4fc502b3a9fb7f3f5  git-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 24 22:46:30 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Tue, 24 Jan 2006 17:46:30 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.4,1.5
Message-ID: <200601242247.k0OMl2Zr010919@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10861

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix missing requires (#178834)


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-sudoku.spec	16 Dec 2005 18:33:37 -0000	1.4
+++ gnome-sudoku.spec	24 Jan 2006 22:46:30 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
@@ -19,6 +19,8 @@
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
+Requires:   python-numeric
+
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -67,6 +69,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-4
+- Missing Requires: python-numeric (thanks to Brent Fox) (#178834)
+
 * Fri Dec 16 2005 Paul W. Frields <stickster at gmail.com> - 0.4.0-3
 - Fix broken full screen option
 



From fedora-extras-commits at redhat.com  Tue Jan 24 22:47:36 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Tue, 24 Jan 2006 17:47:36 -0500
Subject: rpms/git-core/FC-3 .cvsignore, 1.15, 1.16 git.spec, 1.3, 1.4 sources,
	1.15, 1.16
Message-ID: <200601242248.k0OMm8qe011001@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git-core/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10969

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Jan 2006 05:09:22 -0000	1.15
+++ .cvsignore	24 Jan 2006 22:47:36 -0000	1.16
@@ -1 +1 @@
-git-1.1.2.tar.gz
+git-1.1.4.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- git.spec	16 Jan 2006 05:09:22 -0000	1.3
+++ git.spec	24 Jan 2006 22:47:36 -0000	1.4
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.1.2
+Version: 	1.1.4
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Tue Jan 24 2006 Chris Wright <chrisw at redhat.com> 1.1.4-1
+- git-1.1.4
+
 * Sun Jan 15 2006 Chris Wright <chrisw at redhat.com> 1.1.2-1
 - git-1.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Jan 2006 05:09:22 -0000	1.15
+++ sources	24 Jan 2006 22:47:36 -0000	1.16
@@ -1 +1 @@
-b83aabef7d0b6124bf9a2f1bcf0e4081  git-1.1.2.tar.gz
+8a3ebe9070f738f4fc502b3a9fb7f3f5  git-1.1.4.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 01:29:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Tue, 24 Jan 2006 20:29:06 -0500
Subject: rpms/sobby/FC-4 .cvsignore, 1.3, 1.4 sobby.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200601250129.k0P1TdP4018495@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/sobby/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18473

Modified Files:
	.cvsignore sobby.spec sources 
Log Message:
0.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Dec 2005 20:19:34 -0000	1.3
+++ .cvsignore	25 Jan 2006 01:29:04 -0000	1.4
@@ -1 +1 @@
-sobby-0.2.0.tar.gz
+sobby-0.3.0.tar.gz


Index: sobby.spec
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sobby.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sobby.spec	17 Jan 2006 21:18:13 -0000	1.3
+++ sobby.spec	25 Jan 2006 01:29:04 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           sobby
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.3.0
+Release:        0%{?dist}
 Summary:        Standalone obby server
 
 Group:          Applications/Internet
@@ -40,6 +40,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-1
+- 0.3.0
+
 * Tue Jan 17 2006 Luke Macken <lmacken at redhat.com> - 0.2.0-3
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sobby/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Dec 2005 20:19:34 -0000	1.3
+++ sources	25 Jan 2006 01:29:04 -0000	1.4
@@ -1 +1 @@
-68e740d9ad051e7939de29fa2c28da56  sobby-0.2.0.tar.gz
+5408fc08d610be5aac4476c6ea6277f9  sobby-0.3.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 02:08:00 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 24 Jan 2006 21:08:00 -0500
Subject: rpms/linphone/devel linphone.spec,1.16,1.17
Message-ID: <200601250208.k0P28Wh5020388@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20371

Modified Files:
	linphone.spec 
Log Message:
Fixed selecting entry from address book (#177189)


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- linphone.spec	3 Jan 2006 12:05:15 -0000	1.16
+++ linphone.spec	25 Jan 2006 02:08:00 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -11,6 +11,7 @@
 Patch1:         linphone-1.2.0-ortp.patch
 Patch2:         linphone-1.1.0-Werror.patch
 Patch3:         linphone-1.2.0-maxrtp.patch
+Patch4:         linphone-1.2.0-gtkentry.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
@@ -47,6 +48,7 @@
 %patch1 -p 1 -b .ortp
 %patch2 -p 1 -b .Werror
 %patch3 -p 1 -b .maxrtp
+%patch4 -p 1 -b .gtkentry
 rm -r oRTP
 
 %build
@@ -99,6 +101,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Jan 24 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-2
+- Fixed selecting entry from address book (#177189)
+
 * Tue Jan  3 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.0-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Wed Jan 25 02:10:16 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 24 Jan 2006 21:10:16 -0500
Subject: rpms/linphone/devel linphone-1.2.0-gtkentry.patch,NONE,1.1
Message-ID: <200601250210.k0P2AN2f020444@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20431

Added Files:
	linphone-1.2.0-gtkentry.patch 
Log Message:
And of course the patch...

linphone-1.2.0-gtkentry.patch:

--- NEW FILE linphone-1.2.0-gtkentry.patch ---
--- linphone-1.2.0/gnome/addressbook.c.gtkentry	2006-01-22 10:22:24.000000000 -0500
+++ linphone-1.2.0/gnome/addressbook.c	2006-01-22 10:23:12.000000000 -0500
@@ -164,7 +164,7 @@
 		gtk_tree_model_get (model, &iter,SIP_ADDRESS_COLUMN , &address, -1);
 	}
 	if (address!=NULL){
-		gtk_entry_set_text (GTK_ENTRY(gnome_entry_gtk_entry(GNOME_ENTRY(addressentry))),address);
+		gtk_entry_set_text (GTK_ENTRY(addressentry),address);
 		g_free(address);
 	}
 	gtk_widget_destroy(ab);



From fedora-extras-commits at redhat.com  Wed Jan 25 04:59:57 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Tue, 24 Jan 2006 23:59:57 -0500
Subject: rpms/Canna/devel Canna.spec,1.2,1.3
Message-ID: <200601250500.k0P50TbY025624@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/Canna/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25596

Modified Files:
	Canna.spec 
Log Message:
* Wed Jan 25 2006 Akira TAGOH <tagoh at redhat.com> - 3.7p3-15
- BuildRequires imake instead of XFree86-devel. (#178656)


Index: Canna.spec
===================================================================
RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Canna.spec	26 Sep 2005 09:39:52 -0000	1.2
+++ Canna.spec	25 Jan 2006 04:59:56 -0000	1.3
@@ -6,7 +6,7 @@
 Summary: A Japanese character set input system.
 Name: Canna
 Version: 3.7p3
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: Distributable
 Group: System Environment/Libraries
 URL: http://www.nec.co.jp/japanese/product/computer/soft/canna/
@@ -41,7 +41,7 @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp
-BuildPrereq: XFree86-devel,cpp,gawk
+BuildRequires: imake cpp gawk
 Obsoletes: tamago
 
 %description
@@ -324,6 +324,9 @@
 %{_libdir}/libcanna16.so.*
 
 %changelog
+* Wed Jan 25 2006 Akira TAGOH <tagoh at redhat.com> - 3.7p3-15
+- BuildRequires imake instead of XFree86-devel. (#178656)
+
 * Mon Sep 26 2005 Akira TAGOH <tagoh at redhat.com> - 3.7p3-14
 - Imported into Extras.
 



From fedora-extras-commits at redhat.com  Wed Jan 25 05:38:27 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 25 Jan 2006 00:38:27 -0500
Subject: rpms/scim-skk/FC-4 .cvsignore, 1.5, 1.6 scim-skk.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200601250538.k0P5cx90027460@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27439

Modified Files:
	.cvsignore scim-skk.spec sources 
Log Message:
update to 0.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Dec 2005 10:16:18 -0000	1.5
+++ .cvsignore	25 Jan 2006 05:38:27 -0000	1.6
@@ -1 +1 @@
-scim-skk-0.5.1.tar.gz
+scim-skk-0.5.2.tar.gz


Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-skk.spec	17 Dec 2005 10:16:18 -0000	1.8
+++ scim-skk.spec	25 Jan 2006 05:38:27 -0000	1.9
@@ -1,5 +1,5 @@
 Name:	    scim-skk
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-1
+- update to 0.5.2
+
 * Sat Dec 17 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.1-1
 - update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2005 10:16:18 -0000	1.5
+++ sources	25 Jan 2006 05:38:27 -0000	1.6
@@ -1 +1 @@
-b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz
+69d789660439c248e507da63c90ad70a  scim-skk-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 05:40:30 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 25 Jan 2006 00:40:30 -0500
Subject: rpms/scim-skk/devel scim-skk.spec,1.8,1.9 sources,1.5,1.6
Message-ID: <200601250541.k0P5f2aI027520@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27501

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.2



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- scim-skk.spec	17 Dec 2005 10:17:01 -0000	1.8
+++ scim-skk.spec	25 Jan 2006 05:40:30 -0000	1.9
@@ -1,5 +1,5 @@
 Name:	    scim-skk
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-1
+- update to 0.5.2
+
 * Sat Dec 17 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.1-1
 - update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2005 10:17:01 -0000	1.5
+++ sources	25 Jan 2006 05:40:30 -0000	1.6
@@ -1 +1 @@
-b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz
+69d789660439c248e507da63c90ad70a  scim-skk-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 05:43:59 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Wed, 25 Jan 2006 00:43:59 -0500
Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.9,1.10 sources,1.5,1.6
Message-ID: <200601250544.k0P5iWoJ027581@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/rpms/scim-skk/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27562

Modified Files:
	scim-skk.spec sources 
Log Message:
update to 0.5.2



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-skk.spec	17 Dec 2005 10:19:39 -0000	1.9
+++ scim-skk.spec	25 Jan 2006 05:43:59 -0000	1.10
@@ -1,5 +1,5 @@
 Name:	    scim-skk
-Version:	0.5.1
+Version:	0.5.2
 Release:	1%{?dist}
 Summary:	SCIM IMEngine module for skk
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.2-1
+- update to 0.5.2
+
 * Sat Dec 17 2005 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.5.1-1
 - update to 0.5.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2005 10:19:39 -0000	1.5
+++ sources	25 Jan 2006 05:43:59 -0000	1.6
@@ -1 +1 @@
-b2371a62949667f8f2d92b69a65b213d  scim-skk-0.5.1.tar.gz
+69d789660439c248e507da63c90ad70a  scim-skk-0.5.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 05:53:42 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 00:53:42 -0500
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.5,1.6
Message-ID: <200601250554.k0P5sEJl027660@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27641

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix additional requires and synchronize spec


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-sudoku.spec	24 Jan 2006 22:46:30 -0000	1.5
+++ gnome-sudoku.spec	25 Jan 2006 05:53:42 -0000	1.6
@@ -3,14 +3,16 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%if %{fedora} <= 4
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -19,7 +21,7 @@
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
-Requires:   python-numeric
+Requires:   python-numeric, gnome-python2-canvas
 
 
 %description
@@ -29,7 +31,9 @@
 
 %prep
 %setup -q
+%if %{fedora} <= 4
 %patch0 -p1
+%endif
 # Fix one hardcoding instance
 sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
 # This must be something internal to the developer's system
@@ -69,6 +73,10 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
+- Fix missing Requires: gnome-python2-canvas
+- Enable conditional to synchronize spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-4
 - Missing Requires: python-numeric (thanks to Brent Fox) (#178834)
 



From fedora-extras-commits at redhat.com  Wed Jan 25 05:54:35 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 00:54:35 -0500
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec,1.3,1.4
Message-ID: <200601250555.k0P5t8Ck027688@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27671

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix additional requires and synchronize spec


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-sudoku.spec	16 Dec 2005 17:27:30 -0000	1.3
+++ gnome-sudoku.spec	25 Jan 2006 05:54:35 -0000	1.4
@@ -3,13 +3,16 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        2%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+%if %{fedora} <= 4
+Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -18,6 +21,8 @@
 BuildRequires:	desktop-file-utils
 Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:   gnome-python2-gnomeprint, python-imaging, gnome-python2-gconf
+Requires:   python-numeric, gnome-python2-canvas
+
 
 %description
 GNOME Sudoku is a Japanese logic puzzle game.  GNOME Sudoku takes care
@@ -26,6 +31,9 @@
 
 %prep
 %setup -q
+%if %{fedora} <= 4
+%patch0 -p1
+%endif
 # Fix one hardcoding instance
 sed -i 's!/usr/local!%{_prefix}!g' src/lib/game_selector.py
 # This must be something internal to the developer's system
@@ -65,6 +73,16 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
+- Fix missing Requires: gnome-python2-canvas
+- Enable conditional to synchronize spec
+
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-4
+- Missing Requires: python-numeric (thanks to Brent Fox) (#178834)
+
+* Fri Dec 16 2005 Paul W. Frields <stickster at gmail.com> - 0.4.0-3
+- Fix broken full screen option
+
 * Fri Dec 16 2005 Paul W. Frields <stickster at gmail.com> - 0.4.0-2
 - Fix missing Requires: gnome-python2-gconf (thanks to Paul Dickson) (#175911)
 



From fedora-extras-commits at redhat.com  Wed Jan 25 06:19:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 01:19:19 -0500
Subject: rpms/xmldiff/FC-4 xmldiff-0.6.7-clean-tmp.patch, NONE,
	1.1 xmldiff.spec, 1.2, 1.3
Message-ID: <200601250619.k0P6Jpsl029589@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29569

Modified Files:
	xmldiff.spec 
Added Files:
	xmldiff-0.6.7-clean-tmp.patch 
Log Message:
Prevent temp file logjam (#177800)

xmldiff-0.6.7-clean-tmp.patch:

--- NEW FILE xmldiff-0.6.7-clean-tmp.patch ---
diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev
--- xmldiff-0.6.7-original/bin/xmlrev	2006-01-24 22:10:13.000000000 -0800
+++ xmldiff-0.6.7/bin/xmlrev	2006-01-24 22:11:17.000000000 -0800
@@ -10,7 +10,7 @@
 TMPFILE_D=$(mktemp /tmp/xmlrev.xupdate.XXXXXX) || exit 1
 TMPFILE_XSLT=$(mktemp /tmp/xmlrev.xslt.XXXXXX) || exit 1
 TMPFILES="$TMPFILE_S $TMPFILE_X $TMPFILE_D $TMPFILE_XSLT"
-
+trap "rm -f $TMPFILES" exit
 
 function guess_doc_type() {
     # $1 filepath
@@ -124,5 +124,3 @@
 	revision "$1" "$2"
 	;;
 esac
-
-rm -f $TMPFILES


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldiff.spec	12 Jan 2006 15:53:42 -0000	1.2
+++ xmldiff.spec	25 Jan 2006 06:19:19 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -12,6 +12,7 @@
 # No license in original tarball, but referenced in docs
 Source1:	GPL
 Patch0:		xmldiff-0.6.7-xsldata.patch
+Patch1:		xmldiff-0.6.7-clean-tmp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 for i in man/*.1 __pkginfo__.py doc/*.txt
 do
 	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
+- Prevent temp file logjam (#177800)
+
 * Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
 - Add Requires: file
 - xmlrev: use proper XSL location



From fedora-extras-commits at redhat.com  Wed Jan 25 06:20:05 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Wed, 25 Jan 2006 01:20:05 -0500
Subject: rpms/xmldiff/devel xmldiff-0.6.7-clean-tmp.patch, NONE,
	1.1 xmldiff.spec, 1.2, 1.3
Message-ID: <200601250620.k0P6Kbtd029620@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600

Modified Files:
	xmldiff.spec 
Added Files:
	xmldiff-0.6.7-clean-tmp.patch 
Log Message:
Prevent temp file logjam (#177800)

xmldiff-0.6.7-clean-tmp.patch:

--- NEW FILE xmldiff-0.6.7-clean-tmp.patch ---
diff -uNr xmldiff-0.6.7-original/bin/xmlrev xmldiff-0.6.7/bin/xmlrev
--- xmldiff-0.6.7-original/bin/xmlrev	2006-01-24 22:10:13.000000000 -0800
+++ xmldiff-0.6.7/bin/xmlrev	2006-01-24 22:11:17.000000000 -0800
@@ -10,7 +10,7 @@
 TMPFILE_D=$(mktemp /tmp/xmlrev.xupdate.XXXXXX) || exit 1
 TMPFILE_XSLT=$(mktemp /tmp/xmlrev.xslt.XXXXXX) || exit 1
 TMPFILES="$TMPFILE_S $TMPFILE_X $TMPFILE_D $TMPFILE_XSLT"
-
+trap "rm -f $TMPFILES" exit
 
 function guess_doc_type() {
     # $1 filepath
@@ -124,5 +124,3 @@
 	revision "$1" "$2"
 	;;
 esac
-
-rm -f $TMPFILES


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldiff.spec	12 Jan 2006 15:53:48 -0000	1.2
+++ xmldiff.spec	25 Jan 2006 06:20:05 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -12,6 +12,7 @@
 # No license in original tarball, but referenced in docs
 Source1:	GPL
 Patch0:		xmldiff-0.6.7-xsldata.patch
+Patch1:		xmldiff-0.6.7-clean-tmp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	python
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 for i in man/*.1 __pkginfo__.py doc/*.txt
 do
 	iconv -f iso-8859-1 -t UTF-8 "$i" > "${i}_" ; mv "${i}_" "$i"
@@ -82,6 +84,9 @@
 
 
 %changelog
+* Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
+- Prevent temp file logjam (#177800)
+
 * Thu Jan 12 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-5
 - Add Requires: file
 - xmlrev: use proper XSL location



From fedora-extras-commits at redhat.com  Wed Jan 25 08:40:28 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 03:40:28 -0500
Subject: rpms/tinyerp/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tinyerp-client.patch, 1.2, 1.3 tinyerp-server, 1.2,
	1.3 tinyerp-server.patch, 1.3, 1.4 tinyerp.spec, 1.11, 1.12
Message-ID: <200601250841.k0P8f02o001062@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1023

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server 
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script
 - fixed using localization for the client
 - include all distributed addons



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 14:43:00 -0000	1.4
+++ .cvsignore	25 Jan 2006 08:40:27 -0000	1.5
@@ -1,2 +1,2 @@
-tinyerp-client-3.1.1.tar.gz
-tinyerp-server-3.1.1.tar.gz
+tinyerp-client-3.2.0.tar.gz
+tinyerp-server-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 14:43:00 -0000	1.4
+++ sources	25 Jan 2006 08:40:27 -0000	1.5
@@ -1,2 +1,2 @@
-c2c36a43704b470190e771b478f3f771  tinyerp-client-3.1.1.tar.gz
-eceb59222b7df18ac157ca50a20e8c67  tinyerp-server-3.1.1.tar.gz
+e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
+6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 14:43:00 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 08:40:27 -0000	1.3
@@ -1,21 +1,22 @@
-diff -Nru tinyerp-client-3.1.1.orig/setup.py tinyerp-client-3.1.1/setup.py
---- tinyerp-client-3.1.1.orig/setup.py	2005-09-18 16:19:18.000000000 +0200
-+++ tinyerp-client-3.1.1/setup.py	2005-11-28 15:30:40.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
+diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
+--- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
++++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+@@ -73,14 +73,13 @@
+ import pango
  
- name = 'tinyerp-client'
--version = '3.0.2'
-+version = '3.1.1'
+ # end testing
+-APP = 'terp'
+-DIR = 'po'
++APP = 'tinyerp-client'
  
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -49,7 +49,7 @@
-               ['bin/terp.glade', 'bin/tipoftheday.txt'])]
-     return files
+ locale.setlocale(locale.LC_ALL, '')
+-gettext.bindtextdomain(APP, DIR)
++gettext.bindtextdomain(APP)
+ gettext.textdomain(APP)
+-gettext.install(APP, DIR, unicode=1)
+-gtk.glade.bindtextdomain(APP, DIR)
++gettext.install(APP, unicode=1)
++gtk.glade.bindtextdomain(APP)
  
--included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
-+included_plugins = ['workflow_print']
+ import options
  
- def find_plugins():
-     for plugin in included_plugins:


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server	18 Dec 2005 20:12:51 -0000	1.2
+++ tinyerp-server	25 Jan 2006 08:40:27 -0000	1.3
@@ -27,24 +27,25 @@
 [ -z "/usr/bin/tinyerp-server" ] && exit 0
 
 RETVAL=0
+PIDFILE=/var/spool/tinyerp/tinyerp-server.pid
+LOCKFILE=/var/lock/subsys/tinyerp-server
 
 start() {
     echo -n $"Starting $prog: "
     daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
 
     RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
     echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-    	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/spool/tinyerp/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -61,11 +62,22 @@
 }    
 
 condrestart() {
-    [ -e /var/lock/subsys/tinyerp-server ] && restart || :
+    [ -e $LOCKFILE ] && restart || :
 }
 
 rhstatus() { 
-    status tinyerp-server
+    if [ -f $PIDFILE ] ; then
+        checkpid `cat $PIDFILE`
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+	    echo  $"$prog is running..."
+	else
+	    echo  $"$prog is stopped"
+	fi
+    else
+    	echo  $"$prog is stopped"
+    fi
+    return $RETVAL
 }
 
 case "$1" in

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server.patch	18 Dec 2005 20:14:37 -0000	1.3
+++ tinyerp-server.patch	25 Jan 2006 08:40:27 -0000	1.4
@@ -1,39 +1,21 @@
-diff -Nru tinyerp-server-3.1.1.orig/bin/PKG-INFO tinyerp-server-3.1.1/bin/PKG-INFO
---- tinyerp-server-3.1.1.orig/bin/PKG-INFO	2005-09-12 09:11:17.000000000 +0200
-+++ tinyerp-server-3.1.1/bin/PKG-INFO	2005-11-28 15:30:50.000000000 +0100
-@@ -1,6 +1,6 @@
- Metadata-Version: 1.1
- Name: Tiny ERP
--Version: 2.0.9
-+Version: 3.1.1
- Author: Tiny.be
- Author-email: fp at tiny be
- Maintainer: Tiny.be
-diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
---- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
-@@ -21,7 +21,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-server'
--version = '3.0.2'
-+version = '3.1.1'
- 
+diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
+--- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
++++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
+@@ -26,9 +26,11 @@
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -61,9 +61,9 @@
-     '''Build list of data files to be installed'''
-     files = [(opj('share', 'man', 'man1'),
-               ['man/tinyerp-server.1']),
--             (opj('share','doc', 'tinyerp-server'), 
-+             (opj('share','doc', 'tinyerp-server-%s' % version), 
-               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
--             (opj('share','doc','tinyerp-server', 'i18n'), 
-+             (opj('share','doc','tinyerp-server-%s' % version, 'i18n'), 
-               glob.glob('doc/i18n/*')),
-              (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-               glob.glob('bin/addons/custom/*xml') + 
-@@ -104,8 +104,9 @@
+ 
+-included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter',
++included_addons = ['account', 'audittrail', 'base', 'base_partner_relation',
++		   'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter',
+                    'marketing', 'mrp',
+-                   'network', 'product', 'project', 'purchase', 'sale',
++                   'network', 'product', 'product_electronic', 'product_expiry',
++		   'project', 'purchase', 'sale', 'scrum',
+                    'stock', 'subscription']
+ 
+ required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -104,8 +106,9 @@
  # create startup script
  start_script = \
  "#!/bin/sh\n\


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tinyerp.spec	18 Dec 2005 20:12:51 -0000	1.11
+++ tinyerp.spec	25 Jan 2006 08:40:27 -0000	1.12
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.1.1
-Release:	5%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
 Requires(pre):	fedora-usermgmt
 Requires(postun):	fedora-usermgmt
 
@@ -100,9 +101,9 @@
 %files server
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
-%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
-%{_sysconfdir}/logrotate.d/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -134,6 +135,12 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
+- update to upstream tinyerp 3.2.0
+- fixed status function in the init.d script
+- fixed using localization for the client
+- include all distributed addons
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
 - improved startup script, suggested by Enrico Scholz



From fedora-extras-commits at redhat.com  Wed Jan 25 09:14:04 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:14:04 -0500
Subject: rpms/tinyerp/FC-3 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 tinyerp-client.patch, 1.2, 1.3 tinyerp-server, 1.2,
	1.3 tinyerp-server.patch, 1.3, 1.4 tinyerp.spec, 1.9, 1.10
Message-ID: <200601250914.k0P9Ep2i003231@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3148

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server 
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script
 - fixed using localization for the client
 - include all distributed addons



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 14:40:32 -0000	1.4
+++ .cvsignore	25 Jan 2006 09:14:04 -0000	1.5
@@ -1,2 +1,2 @@
-tinyerp-client-3.1.1.tar.gz
-tinyerp-server-3.1.1.tar.gz
+tinyerp-client-3.2.0.tar.gz
+tinyerp-server-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 14:40:32 -0000	1.4
+++ sources	25 Jan 2006 09:14:04 -0000	1.5
@@ -1,2 +1,2 @@
-c2c36a43704b470190e771b478f3f771  tinyerp-client-3.1.1.tar.gz
-eceb59222b7df18ac157ca50a20e8c67  tinyerp-server-3.1.1.tar.gz
+e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
+6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 14:40:32 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 09:14:04 -0000	1.3
@@ -1,21 +1,22 @@
-diff -Nru tinyerp-client-3.1.1.orig/setup.py tinyerp-client-3.1.1/setup.py
---- tinyerp-client-3.1.1.orig/setup.py	2005-09-18 16:19:18.000000000 +0200
-+++ tinyerp-client-3.1.1/setup.py	2005-11-28 15:30:40.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
+diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
+--- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
++++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+@@ -73,14 +73,13 @@
+ import pango
  
- name = 'tinyerp-client'
--version = '3.0.2'
-+version = '3.1.1'
+ # end testing
+-APP = 'terp'
+-DIR = 'po'
++APP = 'tinyerp-client'
  
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -49,7 +49,7 @@
-               ['bin/terp.glade', 'bin/tipoftheday.txt'])]
-     return files
+ locale.setlocale(locale.LC_ALL, '')
+-gettext.bindtextdomain(APP, DIR)
++gettext.bindtextdomain(APP)
+ gettext.textdomain(APP)
+-gettext.install(APP, DIR, unicode=1)
+-gtk.glade.bindtextdomain(APP, DIR)
++gettext.install(APP, unicode=1)
++gtk.glade.bindtextdomain(APP)
  
--included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
-+included_plugins = ['workflow_print']
+ import options
  
- def find_plugins():
-     for plugin in included_plugins:


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server	18 Dec 2005 20:19:12 -0000	1.2
+++ tinyerp-server	25 Jan 2006 09:14:04 -0000	1.3
@@ -27,24 +27,25 @@
 [ -z "/usr/bin/tinyerp-server" ] && exit 0
 
 RETVAL=0
+PIDFILE=/var/spool/tinyerp/tinyerp-server.pid
+LOCKFILE=/var/lock/subsys/tinyerp-server
 
 start() {
     echo -n $"Starting $prog: "
     daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
 
     RETVAL=$?
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/tinyerp-server
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
     echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/spool/tinyerp/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-    	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/spool/tinyerp/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -61,11 +62,22 @@
 }    
 
 condrestart() {
-    [ -e /var/lock/subsys/tinyerp-server ] && restart || :
+    [ -e $LOCKFILE ] && restart || :
 }
 
 rhstatus() { 
-    status tinyerp-server
+    if [ -f $PIDFILE ] ; then
+        checkpid `cat $PIDFILE`
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+	    echo  $"$prog is running..."
+	else
+	    echo  $"$prog is stopped"
+	fi
+    else
+    	echo  $"$prog is stopped"
+    fi
+    return $RETVAL
 }
 
 case "$1" in

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server.patch	18 Dec 2005 20:19:12 -0000	1.3
+++ tinyerp-server.patch	25 Jan 2006 09:14:04 -0000	1.4
@@ -1,39 +1,21 @@
-diff -Nru tinyerp-server-3.1.1.orig/bin/PKG-INFO tinyerp-server-3.1.1/bin/PKG-INFO
---- tinyerp-server-3.1.1.orig/bin/PKG-INFO	2005-09-12 09:11:17.000000000 +0200
-+++ tinyerp-server-3.1.1/bin/PKG-INFO	2005-11-28 15:30:50.000000000 +0100
-@@ -1,6 +1,6 @@
- Metadata-Version: 1.1
- Name: Tiny ERP
--Version: 2.0.9
-+Version: 3.1.1
- Author: Tiny.be
- Author-email: fp at tiny be
- Maintainer: Tiny.be
-diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
---- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-12-18 20:51:56.000000000 +0100
-@@ -21,7 +21,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-server'
--version = '3.0.2'
-+version = '3.1.1'
- 
+diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
+--- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
++++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
+@@ -26,9 +26,11 @@
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -61,9 +61,9 @@
-     '''Build list of data files to be installed'''
-     files = [(opj('share', 'man', 'man1'),
-               ['man/tinyerp-server.1']),
--             (opj('share','doc', 'tinyerp-server'), 
-+             (opj('share','doc', 'tinyerp-server-%s' % version), 
-               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
--             (opj('share','doc','tinyerp-server', 'i18n'), 
-+             (opj('share','doc','tinyerp-server-%s' % version, 'i18n'), 
-               glob.glob('doc/i18n/*')),
-              (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-               glob.glob('bin/addons/custom/*xml') + 
-@@ -104,8 +104,9 @@
+ 
+-included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter',
++included_addons = ['account', 'audittrail', 'base', 'base_partner_relation',
++		   'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter',
+                    'marketing', 'mrp',
+-                   'network', 'product', 'project', 'purchase', 'sale',
++                   'network', 'product', 'product_electronic', 'product_expiry',
++		   'project', 'purchase', 'sale', 'scrum',
+                    'stock', 'subscription']
+ 
+ required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -104,8 +106,9 @@
  # create startup script
  start_script = \
  "#!/bin/sh\n\


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tinyerp.spec	18 Dec 2005 20:19:12 -0000	1.9
+++ tinyerp.spec	25 Jan 2006 09:14:04 -0000	1.10
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.1.1
-Release:	5%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -38,6 +38,7 @@
 Requires:	libxslt-python, python-imaging
 Requires:	python-psycopg, python-reportlab
 Requires:	graphviz, pyparsing, postgresql-server
+Requires:	ghostscript
 Requires(pre):	fedora-usermgmt
 Requires(postun):	fedora-usermgmt
 
@@ -100,9 +101,9 @@
 %files server
 %attr(750,tinyerp,tinyerp) %dir /var/log/tinyerp
 %attr(750,tinyerp,tinyerp) %dir /var/spool/tinyerp
-%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
 %{_sysconfdir}/rc.d/init.d/tinyerp-server
-%{_sysconfdir}/logrotate.d/tinyerp-server
+%config(noreplace) %{_sysconfdir}/tinyerp-server.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/tinyerp-server
 %{_bindir}/tinyerp-server
 %{python_sitelib}/tinyerp-server/   
 %{_defaultdocdir}/%{name}-server-%{version}/
@@ -134,6 +135,12 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
+- update to upstream tinyerp 3.2.0
+- fixed status function in the init.d script
+- fixed using localization for the client
+- include all distributed addons
+
 * Sun Dec 18 2005 Dan Horak <dan at danny.cz> 3.1.1-5
 - added Requires(postun) to the -server package (Ville Skytt??)
 - improved startup script, suggested by Enrico Scholz



From fedora-extras-commits at redhat.com  Wed Jan 25 09:22:50 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:22:50 -0500
Subject: rpms/tinyerp/devel tinyerp-client.patch, 1.2, 1.3 tinyerp-server,
	1.1, 1.2 tinyerp.spec, 1.11, 1.12
Message-ID: <200601250923.k0P9NNQA003513@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3487

Modified Files:
	tinyerp-client.patch tinyerp-server tinyerp.spec 
Log Message:
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script
 - fixed using localization for the client
 - include all distributed addons


tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-client.patch	28 Nov 2005 15:01:50 -0000	1.2
+++ tinyerp-client.patch	25 Jan 2006 09:22:50 -0000	1.3
@@ -1,21 +1,22 @@
-diff -Nru tinyerp-client-3.1.1.orig/setup.py tinyerp-client-3.1.1/setup.py
---- tinyerp-client-3.1.1.orig/setup.py	2005-09-18 16:19:18.000000000 +0200
-+++ tinyerp-client-3.1.1/setup.py	2005-11-28 15:30:40.000000000 +0100
-@@ -18,7 +18,7 @@
- opj = os.path.join
+diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
+--- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
++++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+@@ -73,14 +73,13 @@
+ import pango
  
- name = 'tinyerp-client'
--version = '3.0.2'
-+version = '3.1.1'
+ # end testing
+-APP = 'terp'
+-DIR = 'po'
++APP = 'tinyerp-client'
  
- # get python short version
- py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -49,7 +49,7 @@
-               ['bin/terp.glade', 'bin/tipoftheday.txt'])]
-     return files
+ locale.setlocale(locale.LC_ALL, '')
+-gettext.bindtextdomain(APP, DIR)
++gettext.bindtextdomain(APP)
+ gettext.textdomain(APP)
+-gettext.install(APP, DIR, unicode=1)
+-gtk.glade.bindtextdomain(APP, DIR)
++gettext.install(APP, unicode=1)
++gtk.glade.bindtextdomain(APP)
  
--included_plugins = ['auction_lots_html', 'huissier', 'slideshow', 'workflow_print']
-+included_plugins = ['workflow_print']
+ import options
  
- def find_plugins():
-     for plugin in included_plugins:


Index: tinyerp-server
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tinyerp-server	20 Nov 2005 18:25:32 -0000	1.1
+++ tinyerp-server	25 Jan 2006 09:22:50 -0000	1.2
@@ -27,40 +27,25 @@
 [ -z "/usr/bin/tinyerp-server" ] && exit 0
 
 RETVAL=0
+PIDFILE=/var/spool/tinyerp/tinyerp-server.pid
+LOCKFILE=/var/lock/subsys/tinyerp-server
 
 start() {
-    # create temporary startup script to get pid of the server process
-    cat > /tmp/tinyerp-server.run << EOF
-/usr/bin/tinyerp-server $OPTS >> /var/log/tinyerp/tinyerp-server.log 2>&1 &
-echo \$! > /tmp/tinyerp-server.pid
-EOF
-    chmod 0755 /tmp/tinyerp-server.run
-    
     echo -n $"Starting $prog: "
-    su -l tinyerp -c "/tmp/tinyerp-server.run"
+    daemon --user tinyerp --check tinyerp-server "/usr/bin/setsid /usr/bin/tinyerp-server $OPTS &"
+
     RETVAL=$?
-    
-    if [ $RETVAL -eq 0 ]; then
-        mv /tmp/tinyerp-server.pid /var/run
-	
-        touch /var/lock/subsys/tinyerp-server
-        echo_success
-        echo
-    else
-	echo_failure
-	echo
-    fi
-    rm -f /tmp/tinyerp-server.run
+    [ $RETVAL -eq 0 ] && touch $LOCKFILE
+    echo
     return $RETVAL
 }
 
 stop() {
     echo -n  $"Stopping $prog: "
-    kill -TERM `cat /var/run/tinyerp-server.pid` > /dev/null 2>&1
+    kill -TERM `cat $PIDFILE` > /dev/null 2>&1
     RETVAL=$?
     if [ $RETVAL -eq 0 ] ; then
-    	rm -f /var/lock/subsys/tinyerp-server
-    	rm -f /var/run/tinyerp-server.pid
+    	rm -f $PIDFILE $LOCKFILE
 
 	echo_success
 	echo 
@@ -77,11 +62,22 @@
 }    
 
 condrestart() {
-    [ -e /var/lock/subsys/tinyerp-server ] && restart || :
+    [ -e $LOCKFILE ] && restart || :
 }
 
 rhstatus() { 
-    status tinyerp-server
+    if [ -f $PIDFILE ] ; then
+        checkpid `cat $PIDFILE`
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ] ; then
+	    echo  $"$prog is running..."
+	else
+	    echo  $"$prog is stopped"
+	fi
+    else
+    	echo  $"$prog is stopped"
+    fi
+    return $RETVAL
 }
 
 case "$1" in


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tinyerp.spec	4 Jan 2006 11:19:48 -0000	1.11
+++ tinyerp.spec	25 Jan 2006 09:22:50 -0000	1.12
@@ -2,8 +2,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.1.1
-Release:	6%{?dist}
+Version:	3.2.0
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -19,7 +19,7 @@
 BuildRequires:	python, pygtk2-devel, pygtk2-libglade
 BuildRequires:	python-psycopg, libxslt-python, pydot
 BuildRequires:	desktop-file-utils
-BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base, xorg-x11-fonts-misc
+BuildRequires:	xorg-x11-server-Xvfb, xorg-x11-fonts-base
 Requires:	pygtk2, pygtk2-libglade, pydot
 Patch0:		tinyerp-client.patch
 Patch1:		tinyerp-server.patch
@@ -136,6 +136,12 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
+- update to upstream tinyerp 3.2.0
+- fixed status function in the init.d script
+- fixed using localization for the client
+- include all distributed addons
+
 * Wed Jan  4 2006 Dan Horak <dan at danny.cz> 3.1.1-6
 - added new Xorg dependencies
 



From fedora-extras-commits at redhat.com  Wed Jan 25 09:24:24 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:24:24 -0500
Subject: rpms/tinyerp/devel .cvsignore,1.4,1.5 sources,1.4,1.5
Message-ID: <200601250924.k0P9OuL2003546@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3526

Modified Files:
	.cvsignore sources 
Log Message:
 - add new sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 15:01:50 -0000	1.4
+++ .cvsignore	25 Jan 2006 09:24:24 -0000	1.5
@@ -1,2 +1,2 @@
-tinyerp-client-3.1.1.tar.gz
-tinyerp-server-3.1.1.tar.gz
+tinyerp-client-3.2.0.tar.gz
+tinyerp-server-3.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 15:01:50 -0000	1.4
+++ sources	25 Jan 2006 09:24:24 -0000	1.5
@@ -1,2 +1,2 @@
-c2c36a43704b470190e771b478f3f771  tinyerp-client-3.1.1.tar.gz
-eceb59222b7df18ac157ca50a20e8c67  tinyerp-server-3.1.1.tar.gz
+e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
+6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 09:40:10 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Wed, 25 Jan 2006 04:40:10 -0500
Subject: rpms/tinyerp/devel tinyerp-server.patch, 1.2, 1.3 tinyerp.spec, 1.12,
	1.13
Message-ID: <200601250940.k0P9egKD003684@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3657

Modified Files:
	tinyerp-server.patch tinyerp.spec 
Log Message:
 - add updated server patch


tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tinyerp-server.patch	28 Nov 2005 15:01:50 -0000	1.2
+++ tinyerp-server.patch	25 Jan 2006 09:40:10 -0000	1.3
@@ -1,35 +1,28 @@
-diff -Nru tinyerp-server-3.1.1.orig/bin/PKG-INFO tinyerp-server-3.1.1/bin/PKG-INFO
---- tinyerp-server-3.1.1.orig/bin/PKG-INFO	2005-09-12 09:11:17.000000000 +0200
-+++ tinyerp-server-3.1.1/bin/PKG-INFO	2005-11-28 15:30:50.000000000 +0100
-@@ -1,6 +1,6 @@
- Metadata-Version: 1.1
- Name: Tiny ERP
--Version: 2.0.9
-+Version: 3.1.1
- Author: Tiny.be
- Author-email: fp at tiny be
- Maintainer: Tiny.be
-diff -Nru tinyerp-server-3.1.1.orig/setup.py tinyerp-server-3.1.1/setup.py
---- tinyerp-server-3.1.1.orig/setup.py	2005-09-18 16:16:19.000000000 +0200
-+++ tinyerp-server-3.1.1/setup.py	2005-11-28 15:30:50.000000000 +0100
-@@ -21,7 +21,7 @@
- opj = os.path.join
- 
- name = 'tinyerp-server'
--version = '3.0.2'
-+version = '3.1.1'
- 
+diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
+--- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
++++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
+@@ -26,9 +26,11 @@
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
-@@ -61,9 +61,9 @@
-     '''Build list of data files to be installed'''
-     files = [(opj('share', 'man', 'man1'),
-               ['man/tinyerp-server.1']),
--             (opj('share','doc', 'tinyerp-server'), 
-+             (opj('share','doc', 'tinyerp-server-%s' % version), 
-               [f for f in glob.glob('doc/*') if os.path.isfile(f)]),
--             (opj('share','doc','tinyerp-server', 'i18n'), 
-+             (opj('share','doc','tinyerp-server-%s' % version, 'i18n'), 
-               glob.glob('doc/i18n/*')),
-              (opj('lib', 'python%s' % py_short_version, 'site-packages', 'tinyerp-server', 'addons', 'custom'),
-               glob.glob('bin/addons/custom/*xml') + 
+ 
+-included_addons = ['account', 'base', 'crm', 'custom', 'hr', 'letter',
++included_addons = ['account', 'audittrail', 'base', 'base_partner_relation',
++		   'crm', 'custom', 'delivery', 'edi', 'esale', 'hr', 'letter',
+                    'marketing', 'mrp',
+-                   'network', 'product', 'project', 'purchase', 'sale',
++                   'network', 'product', 'product_electronic', 'product_expiry',
++		   'project', 'purchase', 'sale', 'scrum',
+                    'stock', 'subscription']
+ 
+ required_modules = [('psycopg', 'PostgreSQL module'),
+@@ -104,8 +106,9 @@
+ # create startup script
+ start_script = \
+ "#!/bin/sh\n\
++echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\
+ cd %s/lib/python%s/site-packages/tinyerp-server\n\
+-exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable)
++exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable)
+ # write script
+ f = open('tinyerp-server', 'w')
+ f.write(start_script)


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tinyerp.spec	25 Jan 2006 09:22:50 -0000	1.12
+++ tinyerp.spec	25 Jan 2006 09:40:10 -0000	1.13
@@ -3,7 +3,7 @@
 
 Name:		tinyerp
 Version:	3.2.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-2
+- add updated server patch
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script



From fedora-extras-commits at redhat.com  Wed Jan 25 09:54:00 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 25 Jan 2006 04:54:00 -0500
Subject: rpms/lighttpd/devel lighttpd-1.4.9-mod_fastcgi-fix.patch, NONE,
	1.1 lighttpd.spec, 1.18, 1.19
Message-ID: <200601250954.k0P9sWMi003782@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3757

Modified Files:
	lighttpd.spec 
Added Files:
	lighttpd-1.4.9-mod_fastcgi-fix.patch 
Log Message:
Add mod_fastcgi-fix patch to fix crash on backend overload.


lighttpd-1.4.9-mod_fastcgi-fix.patch:

--- NEW FILE lighttpd-1.4.9-mod_fastcgi-fix.patch ---
--- lighttpd-1.4.9.orig/src/mod_fastcgi.c	2006-01-14 00:10:56.000000000 -0800
+++ lighttpd-1.4.9/src/mod_fastcgi.c	2006-01-24 13:06:33.710585506 -0800
@@ -2854,7 +2854,7 @@
 			 * -> EAGAIN */
 
 			log_error_write(srv, __FILE__, __LINE__, "ssdsdb", 
-				"backend is overloaded, we disable it for a 2 seconds and send the request to another backend instead:"
+				"backend is overloaded, we disable it for a 2 seconds and send the request to another backend instead:",
 				"reconnects:", hctx->reconnects,
 				"load:", host->load,
 				host->unixsocket);


Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lighttpd.spec	16 Jan 2006 10:18:56 -0000	1.18
+++ lighttpd.spec	25 Jan 2006 09:54:00 -0000	1.19
@@ -3,7 +3,7 @@
 Summary: Lightning fast webserver with light system requirements
 Name: lighttpd
 Version: 1.4.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.lighttpd.net/
@@ -16,6 +16,7 @@
 Source13: http://www.lighttpd.net/light_button.png
 Source14: http://www.lighttpd.net/light_logo.png
 Patch0: lighttpd-1.3.10-defaultconf.patch
+Patch1: lighttpd-1.4.9-mod_fastcgi-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -67,6 +68,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
+%patch1 -pB -b .mod_fastcgi-fix
 
 
 %build
@@ -173,6 +175,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-2
+- Add mod_fastcgi-fix patch to fix crash on backend overload.
+
 * Mon Jan 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.9-1
 - Update to 1.4.9.
 



From fedora-extras-commits at redhat.com  Wed Jan 25 09:57:47 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Wed, 25 Jan 2006 04:57:47 -0500
Subject: rpms/lighttpd/devel lighttpd.spec,1.19,1.20
Message-ID: <200601250958.k0P9wJk5003868@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/lighttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3851

Modified Files:
	lighttpd.spec 
Log Message:
Fix typo in new %patch line.



Index: lighttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- lighttpd.spec	25 Jan 2006 09:54:00 -0000	1.19
+++ lighttpd.spec	25 Jan 2006 09:57:47 -0000	1.20
@@ -68,7 +68,7 @@
 %prep
 %setup
 %patch0 -p1 -b .defaultconf
-%patch1 -pB -b .mod_fastcgi-fix
+%patch1 -p1 -b .mod_fastcgi-fix
 
 
 %build



From fedora-extras-commits at redhat.com  Wed Jan 25 10:07:51 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Wed, 25 Jan 2006 05:07:51 -0500
Subject: rpms/allegro/devel allegro-4.0.3-cfg.patch, 1.1, 1.2 allegro.spec, 
	1.21, 1.22
Message-ID: <200601251008.k0PA8QxR005673@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/allegro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5651/allegro/devel

Modified Files:
	allegro-4.0.3-cfg.patch allegro.spec 
Log Message:
* Wed Jan 25 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-5
- update default allegro configuration to use sound successfully,
  thanks to Hans de Goede (#178383)
- add timidity++ dependency



allegro-4.0.3-cfg.patch:

Index: allegro-4.0.3-cfg.patch
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.0.3-cfg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- allegro-4.0.3-cfg.patch	13 Feb 2005 22:10:46 -0000	1.1
+++ allegro-4.0.3-cfg.patch	25 Jan 2006 10:07:50 -0000	1.2
@@ -1,6 +1,15 @@
---- allegro.cfg~	2003-04-19 10:06:46.000000000 +0300
-+++ allegro.cfg	2005-02-13 23:41:13.339829153 +0200
-@@ -529,22 +529,21 @@
+--- allegro-4.2.0/allegro.cfg.config	2005-05-13 20:37:56.000000000 +0200
++++ allegro-4.2.0/allegro.cfg	2006-01-25 10:49:42.000000000 +0100
+@@ -548,7 +548,7 @@
+ 
+ 
+ # patch set for the DIGMID software wavetable driver
+-patches = 
++patches = /usr/share/timidity/timidity.cfg
+ 
+ 
+ 
+@@ -647,22 +647,21 @@
  
  
  # edit these shell commands to whatever helper programs you want to use...


Index: allegro.spec
===================================================================
RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- allegro.spec	24 Jan 2006 08:24:49 -0000	1.21
+++ allegro.spec	25 Jan 2006 10:07:50 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           allegro
 Version:        4.2.0
-Release:        4
+Release:        5
 
 Summary:        A game programming library
 Summary(es):    Una libreria de programacion de juegos
@@ -19,7 +19,7 @@
 BuildRequires:  esound-devel, texinfo, perl, arts-devel
 BuildRequires:  xorg-x11-proto-devel, libX11-devel, libXext-devel, libXt-devel
 BuildRequires:  libXpm-devel, libXcursor-devel, libXxf86vm-devel
-BuildRequires:  libXxf86dga-devel
+BuildRequires:  libXxf86dga-devel, timidity++
 
 %description
 Allegro is a cross-platform library intended for use in computer games
@@ -119,7 +119,7 @@
 %prep
 %setup -q
 %patch1 -p0 -b .libdir
-%patch2 -p0 -b .cfg
+%patch2 -p1 -b .config
 %patch3 -p1 -z .nostrip
 
 %build
@@ -207,6 +207,11 @@
 
 
 %changelog
+* Wed Jan 25 2006 Jindrich Novy <jnovy at redhat.com> 4.2.0-5
+- update default allegro configuration to use sound successfully,
+  thanks to Hans de Goede (#178383)
+- add timidity++ dependency
+
 * Mon Jan 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 4.2.0-4
 - add allegro-4.2.0-nostrip.patch, so that the main .so file
   doesn't get stripped and we actually get debuginfo for it in



From fedora-extras-commits at redhat.com  Wed Jan 25 12:51:47 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 25 Jan 2006 07:51:47 -0500
Subject: rpms/cernlib/devel cernlib.m4,1.2,1.3 cernlib.spec,1.17,1.18
Message-ID: <200601251252.k0PCqKMR010073@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10049

Modified Files:
	cernlib.m4 cernlib.spec 
Log Message:
newer cernlib.m4



Index: cernlib.m4
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cernlib.m4	14 Dec 2005 16:52:26 -0000	1.2
+++ cernlib.m4	25 Jan 2006 12:51:47 -0000	1.3
@@ -16,7 +16,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-dnl A basic axample of the macro usage:
+dnl A basic example of the macro usage:
 dnl 
 dnl AC_LIB_CERNLIB(kernlib,CLTOU,
 dnl [
@@ -33,15 +33,15 @@
 dnl - if the binary program 'cernlib-static' or 'cernlib' is in the path it is 
 dnl   assumed that a static linking using the information reported by that 
 dnl   script is wanted.
-dnl - otherwise if the environment variable CERNLIB exists it is assumed to be the
-dnl   location of the static library.
+dnl - otherwise if the environment variable CERNLIB exists it is assumed to 
+dnl   be the location of the static library.
 dnl - otherwise if the environment variable CERN_ROOT exists it is assumed 
 dnl   that CERN_ROOT/lib is the location of the static library.
 dnl - otherwise a simple linking is performed.
 dnl 
 dnl If a dynamic linking is selected:
-dnl - if the binary program 'cernlib' is in the path it is assumed that it is the 
-dnl   debian script and it is called with -dy.
+dnl - if the binary program 'cernlib' is in the path it is assumed that it 
+dnl   is the debian script and it is called with -dy.
 dnl - otherwise a simple linking is performed.
 dnl
 dnl AC_LIB_CERNLIB ([LIBRARY = kernlib], [FUNCTION = CLTOU], [ACTION-IF-FOUND],
@@ -57,7 +57,9 @@
 # AC_CERNLIB check for cernlib location and whether it should be 
 # statically linked or not.
 AC_DEFUN([AC_CERNLIB], [
+CERNLIB_PATH=
 CERNLIB_LIB_PATH=
+CERNLIB_BIN_PATH=
 CERNLIB_STATIC=yes
 AC_ARG_WITH(static_cernlib,
 [  --with-static-cernlib             link statically with the cernlib],
@@ -65,16 +67,25 @@
 
 AC_ARG_WITH(cernlib,
 [  --with-cernlib           cernlib location],
-[  CERNLIB_LIB_PATH=$withval    ])
+[  CERNLIB_PATH=$withval    
+   CERNLIB_LIB_PATH=$CERNLIB_PATH/lib
+   CERNLIB_BIN_PATH=$CERNLIB_PATH/bin
+])
 
+CERNLIB_BIN=
 
 if test "z$CERNLIB_STATIC" != "zno"; then    
     CERNLIB_STATIC=yes
-    if test "z$CERNLIB_LIB_PATH" = z; then
+    if test "z$CERNLIB_PATH" = z; then
         AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no)
         if test $CERNLIB_BIN = no; then
             AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
         fi
+    else
+        AC_PATH_PROG(CERNLIB_BIN, cernlib-static, no, [$CERNLIB_BIN_PATH:$PATH])
+        if test $CERNLIB_BIN = no; then
+            AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH])
+        fi
         if test $CERNLIB_BIN = no; then
             if test "z$CERNLIB" != z -a -d "$CERNLIB"; then
                CERNLIB_LIB_PATH=$CERNLIB
@@ -86,8 +97,10 @@
         fi
     fi
 else
-    AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
-    if test "z$CERNLIB_LIB_PATH" != z; then
+    if test "z$CERNLIB_PATH" = z; then
+         AC_PATH_PROG(CERNLIB_BIN, cernlib, no)
+    else
+         AC_PATH_PROG(CERNLIB_BIN, cernlib, no, [$CERNLIB_BIN_PATH:$PATH])
          LDFLAGS="$LDFLAGS -L$CERNLIB_LIB_PATH"
     fi
 fi


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cernlib.spec	17 Jan 2006 22:34:44 -0000	1.17
+++ cernlib.spec	25 Jan 2006 12:51:47 -0000	1.18
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       12%{?dist}
+Release:       12%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -712,7 +712,7 @@
 %doc debian/debhelper/zftp.README.debian
 
 %changelog
-* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12
+* Tue Jan 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-12.1
 - attempt a rebuild against newer openmotif
 
 * Tue Dec 20 2005 Patrice Dumas <dumas at centre-cired.fr> - 2005-11.4



From fedora-extras-commits at redhat.com  Wed Jan 25 12:56:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 07:56:36 -0500
Subject: rpms/dosbox/devel dosbox-gcc4.1.patch, NONE, 1.1 dosbox.spec, 1.14,
	1.15
Message-ID: <200601251257.k0PCv88M010192@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10167

Modified Files:
	dosbox.spec 
Added Files:
	dosbox-gcc4.1.patch 
Log Message:
- add gcc4.1 patch (178618)


dosbox-gcc4.1.patch:

--- NEW FILE dosbox-gcc4.1.patch ---
--- include/programs.h	2006-01-24 21:13:38.000000000 +0000
+++ include/programs.h	2006-01-24 21:13:56.000000000 +0000
@@ -40,7 +40,7 @@
 	CommandLine * cmd;
 	DOS_PSP * psp;
 	virtual void Run(void)=0;
-	bool Program::GetEnvStr(const char * entry,std::string & result);
+	bool GetEnvStr(const char * entry,std::string & result);
 	bool GetEnvNum(Bitu num,std::string & result);
 	Bitu GetEnvCount(void);
 	bool SetEnv(const char * entry,const char * new_string);


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dosbox.spec	22 Jan 2006 20:55:07 -0000	1.14
+++ dosbox.spec	25 Jan 2006 12:56:36 -0000	1.15
@@ -11,6 +11,7 @@
 Source1:        dosbox.desktop
 Source2:        dosbox.png
 Patch0:         dosbox-x86-64-build.patch
+Patch1:         dosbox-gcc4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure --enable-shots
@@ -75,6 +77,7 @@
 0.64-7
 - add dist
 - rebuild
+- add gcc4.1 patch
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.64-6



From fedora-extras-commits at redhat.com  Wed Jan 25 13:12:32 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Jan 2006 08:12:32 -0500
Subject: rpms/yumex/devel .cvsignore, 1.8, 1.9 sources, 1.11, 1.12 yumex.spec,
	1.12, 1.13
Message-ID: <200601251313.k0PDD4B6012030@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12009

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
New Release 0.99.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	6 Jan 2006 12:34:06 -0000	1.8
+++ .cvsignore	25 Jan 2006 13:12:32 -0000	1.9
@@ -1 +1 @@
-yumex-0.45-2.tar.gz
+yumex-0.99.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	6 Jan 2006 12:34:06 -0000	1.11
+++ sources	25 Jan 2006 13:12:32 -0000	1.12
@@ -1 +1 @@
-9c064934cf21ca340b45ff13ca232e55  yumex-0.45-2.tar.gz
+cd368053d51a8ac4a22c6171c17e4ba6  yumex-0.99.1.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yumex.spec	6 Jan 2006 12:35:45 -0000	1.12
+++ yumex.spec	25 Jan 2006 13:12:32 -0000	1.13
@@ -1,14 +1,12 @@
-%define   build_v 2
-
 Name:     yumex
-Version:  0.45
-Release:  2.0%{?dist}
+Version:  0.99.1
+Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
 Group:    Applications/System
 License:  GPL
 URL:      http://linux.rasmil.dk/yumex
-Source0:  http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}-%{build_v}.tar.gz
+Source0:  http://linux.rasmil.dk/dnl/yumex/%{name}-%{version}.tar.gz
 BuildRoot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
@@ -56,9 +54,9 @@
 %doc COPYING ChangeLog
 %{_datadir}/pixmaps/yumex
 %{_datadir}/yumex
-
 %{_bindir}/yumex
-
+/usr/lib/python?.?/site-packages/yumex
+/usr/lib/python?.?/site-packages/yumgui
 %config(noreplace)  %{_sysconfdir}/yumex.profiles.conf
 %config(noreplace)  %{_sysconfdir}/yumex.conf
 %config(noreplace) %{_sysconfdir}/pam.d/yumex
@@ -67,6 +65,13 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Tue Jan 24 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.1-1.0
+- Development Release 0.99.1-1.0
+- Changed versioning from X.Y to X.Y.Z
+- Remove build_v
+- Removed build_v from source0
+- Added /usr/lib/python?.?/site-packages/yumex to %files
+- Added /usr/lib/python?.?/site-packages/yumgui to %files
 * Fri Jan 6 2006 Tim Lauridsen <tla at rasmil.dk> - 0.45-2.0
 - Development Release 0.45-2.0
 - Lot of changes, check the changelog.



From fedora-extras-commits at redhat.com  Wed Jan 25 13:53:09 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:53:09 -0500
Subject: rpms/perl-Crypt-SmbHash - New directory
Message-ID: <200601251353.k0PDrBc6012197@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/perl-Crypt-SmbHash

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-SmbHash added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 25 13:53:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:53:15 -0500
Subject: rpms/perl-Crypt-SmbHash/devel - New directory
Message-ID: <200601251353.k0PDrHBm012212@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12189/perl-Crypt-SmbHash/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-SmbHash/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Jan 25 13:53:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:53:56 -0500
Subject: rpms/perl-Crypt-SmbHash Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601251353.k0PDrw6m012246@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12234

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-SmbHash


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-SmbHash
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Jan 25 13:54:02 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:54:02 -0500
Subject: rpms/perl-Crypt-SmbHash/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601251354.k0PDs4L5012266@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12234/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-SmbHash


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Wed Jan 25 13:54:45 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:54:45 -0500
Subject: rpms/perl-Crypt-SmbHash import.log,1.1,1.2
Message-ID: <200601251355.k0PDtHQj012334@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-SmbHash-0.12-2 on branch devel from perl-Crypt-SmbHash-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-SmbHash/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Jan 2006 13:53:56 -0000	1.1
+++ import.log	25 Jan 2006 13:54:45 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-SmbHash-0_12-2:HEAD:perl-Crypt-SmbHash-0.12-2.src.rpm:1138197274



From fedora-extras-commits at redhat.com  Wed Jan 25 13:54:51 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:54:51 -0500
Subject: rpms/perl-Crypt-SmbHash/devel perl-Crypt-SmbHash.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601251355.k0PDtNoV012338@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-SmbHash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-SmbHash.spec 
Log Message:
auto-import perl-Crypt-SmbHash-0.12-2 on branch devel from perl-Crypt-SmbHash-0.12-2.src.rpm


--- NEW FILE perl-Crypt-SmbHash.spec ---
Summary:	Pure-perl Lanman and NT MD4 hash functions
Name:		perl-Crypt-SmbHash
Version:	0.12
Release:	2%{?dist}
License:	GPL
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-SmbHash/
Source0:	http://search.cpan.org/CPAN/authors/id/B/BJ/BJKUIT/Crypt-SmbHash-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires:	perl(Digest::MD4)
Requires:	perl(Digest::MD4)
BuildArch:	noarch

%description
This module generates Lanman and NT MD4 style password hashes, using perl-only
code for portability. The module aids in the administration of Samba style
systems.

%prep
%setup -q -n Crypt-SmbHash-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%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} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%{perl_vendorlib}/Crypt/
%{_mandir}/man3/Crypt::SmbHash.3pm*

%changelog
* Wed Jan 25 2006 Paul Howarth <paul at city-fan.org> 0.12-2
- Added buildreq perl(Digest::MD4) to ensure that the test suite runs in the
  same environment as the installed package will do (i.e. with the optional
  Digest::MD4 module installed)

* Tue Jan 17 2006 Paul Howarth <paul at city-fan.org> 0.12-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-SmbHash/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Jan 2006 13:54:02 -0000	1.1
+++ .cvsignore	25 Jan 2006 13:54:51 -0000	1.2
@@ -0,0 +1 @@
+Crypt-SmbHash-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-SmbHash/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Jan 2006 13:54:02 -0000	1.1
+++ sources	25 Jan 2006 13:54:51 -0000	1.2
@@ -0,0 +1 @@
+a6e3f4d65a89bfcc9ba0c69691e6105b  Crypt-SmbHash-0.12.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 13:58:54 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 08:58:54 -0500
Subject: owners owners.list,1.564,1.565
Message-ID: <200601251359.k0PDxQIk012435@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12418

Modified Files:
	owners.list 
Log Message:
Add perl-Crypt-SmbHash



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.564
retrieving revision 1.565
diff -u -r1.564 -r1.565
--- owners.list	24 Jan 2006 16:53:47 -0000	1.564
+++ owners.list	25 Jan 2006 13:58:54 -0000	1.565
@@ -780,6 +780,7 @@
 Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Jan 25 14:02:43 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 09:02:43 -0500
Subject: rpms/dosbox/devel dosbox-64bit-gcc4.1.patch, NONE, 1.1 dosbox.spec, 
	1.15, 1.16
Message-ID: <200601251403.k0PE3YZh014188@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14152

Modified Files:
	dosbox.spec 
Added Files:
	dosbox-64bit-gcc4.1.patch 
Log Message:
- apply upstream patch
- fix typos


dosbox-64bit-gcc4.1.patch:

--- NEW FILE dosbox-64bit-gcc4.1.patch ---
diff -ru dosbox-0.63-orig/include/mem.h dosbox-0.63/include/mem.h
--- dosbox-0.63-orig/include/mem.h	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/include/mem.h	2006-01-18 10:22:29.183958360 +0100
@@ -77,10 +77,6 @@
 	off[3]=(Bit8u)(val >> 24);
 };
 
-#define MLEB(_MLE_VAL_) (_MLE_VAL_)
-#define MLEW(_MLE_VAL_) ((_MLE_VAL_ >> 8) | (_MLE_VAL_ << 8))
-#define MLED(_MLE_VAL_) ((_MLE_VAL_ >> 24)|((_MLE_VAL_ >> 8)&0xFF00)|((_MLE_VAL_ << 8)&0xFF0000)|((_MLE_VAL_ << 24)&0xFF000000))
-
 #else
 
 INLINE Bit8u host_readb(HostPt off) {
@@ -102,16 +98,20 @@
 	*(Bit32u *)(off)=val;
 };
 
-#define MLEB(_MLE_VAL_) (_MLE_VAL_)
-#define MLEW(_MLE_VAL_) (_MLE_VAL_)
-#define MLED(_MLE_VAL_) (_MLE_VAL_)
-
 #endif
 
-#define WLE(VAR_,VAL_)						\
-	if (sizeof(VAR_)==1) VAR_=MLEB(VAL_);	\
-	if (sizeof(VAR_)==2) VAR_=MLEW(VAL_);	\
-	if (sizeof(VAR_)==4) VAR_=MLED(VAL_);
+
+INLINE void var_write(Bit8u * var, Bit8u val) {
+	host_writeb((HostPt)var, val);
+}
+
+INLINE void var_write(Bit16u * var, Bit16u val) {
+	host_writew((HostPt)var, val);
+}
+
+INLINE void var_write(Bit32u * var, Bit32u val) {
+	host_writed((HostPt)var, val);
+}
 
 /* The Folowing six functions are slower but they recognize the paged memory system */
 
diff -ru dosbox-0.63-orig/include/programs.h dosbox-0.63/include/programs.h
--- dosbox-0.63-orig/include/programs.h	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/include/programs.h	2006-01-18 10:22:29.184958208 +0100
@@ -40,7 +40,7 @@
 	CommandLine * cmd;
 	DOS_PSP * psp;
 	virtual void Run(void)=0;
-	bool Program::GetEnvStr(const char * entry,std::string & result);
+	bool GetEnvStr(const char * entry,std::string & result);
 	bool GetEnvNum(Bitu num,std::string & result);
 	Bitu GetEnvCount(void);
 	bool SetEnv(const char * entry,const char * new_string);
diff -ru dosbox-0.63-orig/src/dos/cdrom_image.cpp dosbox-0.63/src/dos/cdrom_image.cpp
--- dosbox-0.63-orig/src/dos/cdrom_image.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/dos/cdrom_image.cpp	2006-01-18 10:22:51.518562984 +0100
@@ -32,6 +32,8 @@
 
 #if !defined(WIN32)
 #include <libgen.h>
+#else
+#include <string.h>
 #endif
 
 using namespace std;
@@ -387,6 +389,22 @@
 	return (pvd[0] == 1 && !strncmp((char*)(&pvd[1]), "CD001", 5) && pvd[6] == 1);
 }
 
+#if defined(WIN32)
+static string dirname(char * file) {
+	char * sep = strrchr(file, '\\');
+	if (sep == NULL)
+		sep = strrchr(file, '/');
+	if (sep == NULL)
+		return "";
+	else {
+		int len = (int)(sep - file);
+		char tmp[MAX_FILENAME_LENGTH];
+		strncpy(tmp, file, len);
+		return tmp;
+	}
+}
+#endif
+
 bool CDROM_Interface_Image::LoadCueSheet(char *cuefile)
 {
 	Track track = {0, 0, 0, 0, 0, 0, false, NULL};
@@ -399,11 +417,7 @@
 	bool canAddTrack = false;
 	char tmp[MAX_FILENAME_LENGTH];	// dirname can change its argument
 	strncpy(tmp, cuefile, MAX_FILENAME_LENGTH);
-#if defined(WIN32)
-	string pathname("");
-#else
 	string pathname(dirname(tmp));
-#endif
 	ifstream in;
 	in.open(cuefile, ios::in);
 	if (in.fail()) return false;
@@ -572,13 +586,11 @@
 	if (stat(filename.c_str(), &test) == 0) return true;
 	
 	// check if file with path relative to cue file exists
-#ifndef WIN32
 	string tmpstr(pathname + "/" + filename);
 	if (stat(tmpstr.c_str(), &test) == 0) {
 		filename = tmpstr;
 		return true;
 	}
-#endif
 	// finally check if file is in a dosbox local drive
 	char fullname[CROSS_LEN];
 	char tmp[CROSS_LEN];
diff -ru dosbox-0.63-orig/src/dos/drive_cache.cpp dosbox-0.63/src/dos/drive_cache.cpp
--- dosbox-0.63-orig/src/dos/drive_cache.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/dos/drive_cache.cpp	2006-01-18 10:22:29.185958056 +0100
@@ -317,7 +317,8 @@
 {
 	char* cpos = strchr(shortName,'~');
 	if (cpos) {
-		Bits compareCount1	= (int)cpos - (int)shortName;
+/* the following code is replaced as it's not safe when char* is 64 bits */
+/*		Bits compareCount1	= (int)cpos - (int)shortName;
 		char* endPos		= strchr(cpos,'.');
 		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
 		
@@ -327,6 +328,18 @@
 
 		compareCount2 -= numberSize;
 		if (compareCount2>compareCount1) compareCount1 = compareCount2;
+*/
+		size_t compareCount1 = strcspn(shortName,"~");
+		size_t numberSize    = strcspn(cpos,".");
+		size_t compareCount2 = strcspn(compareName,".");
+		if(compareCount2 > 8) compareCount2 = 8;
+		/* We want 
+		 * compareCount2 -= numberSize;
+		 * if (compareCount2>compareCount1) compareCount1 = compareCount2;
+		 * but to prevent negative numbers: 
+		 */
+		if(compareCount2 > compareCount1 + numberSize)
+			compareCount1 = compareCount2 - numberSize;
 		return strncmp(compareName,shortName,compareCount1);
 	}
 	return strcmp(compareName,shortName);
diff -ru dosbox-0.63-orig/src/dos/drive_local.cpp dosbox-0.63/src/dos/drive_local.cpp
--- dosbox-0.63-orig/src/dos/drive_local.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/dos/drive_local.cpp	2006-01-18 10:22:29.185958056 +0100
@@ -409,7 +409,7 @@
 	//TODO Give some doserrorcode;
 		return false;//ERROR
 	}
-	int ret=fseek(fhandle,*pos,seektype);
+	int ret=fseek(fhandle,*reinterpret_cast<Bit32s*>(pos),seektype);
 	if (ret!=0) {
 		// Out of file range, pretend everythings ok 
 		// and move file pointer top end of file... ?! (Black Thorne)
diff -ru dosbox-0.63-orig/src/gui/midi_alsa.h dosbox-0.63/src/gui/midi_alsa.h
--- dosbox-0.63-orig/src/gui/midi_alsa.h	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/gui/midi_alsa.h	2006-01-18 10:22:29.186957904 +0100
@@ -112,7 +112,7 @@
 			}
 			break;
 		default:
-			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (int)msg);
+			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08lx", (long)msg);
 			send_event(1);
 			break;
 		}
diff -ru dosbox-0.63-orig/src/ints/int10_vesa.cpp dosbox-0.63/src/ints/int10_vesa.cpp
--- dosbox-0.63-orig/src/ints/int10_vesa.cpp	2006-01-18 09:57:43.000000000 +0100
+++ dosbox-0.63/src/ints/int10_vesa.cpp	2006-01-18 10:22:29.186957904 +0100
@@ -133,27 +133,27 @@
 	VideoModeBlock * mblock=&ModeList_VGA[i];
 	switch (mblock->type) {
 	case M_LIN8:		//Linear 8-bit
-		WLE(minfo.ModeAttributes,0x9b);
-		WLE(minfo.WinAAttributes,0x7);	//Exists/readable/writable
-		WLE(minfo.WinGranularity,64);
-		WLE(minfo.WinSize,64);
-		WLE(minfo.WinASegment,0xa000);
-//		WLE(minfo.WinBSegment,0xa000);
-		WLE(minfo.WinFuncPtr,CALLBACK_RealPointer(callback.setwindow));
-		WLE(minfo.BytesPerScanLine,mblock->swidth);
-		WLE(minfo.NumberOfPlanes,0x1);
-		WLE(minfo.BitsPerPixel,0x08);
-		WLE(minfo.NumberOfBanks,0x1);
-		WLE(minfo.MemoryModel,0x04);	//packed pixel
-		WLE(minfo.NumberOfImagePages,0x05);
-		WLE(minfo.Reserved_page,0x1);
+		var_write(&minfo.ModeAttributes,0x9b);
+		var_write(&minfo.WinAAttributes,0x7);	//Exists/readable/writable
+		var_write(&minfo.WinGranularity,64);
+		var_write(&minfo.WinSize,64);
+		var_write(&minfo.WinASegment,0xa000);
+//		var_write(&minfo.WinBSegment,0xa000);
+		var_write(&minfo.WinFuncPtr,CALLBACK_RealPointer(callback.setwindow));
+		var_write(&minfo.BytesPerScanLine,mblock->swidth);
+		var_write(&minfo.NumberOfPlanes,0x1);
+		var_write(&minfo.BitsPerPixel,0x08);
+		var_write(&minfo.NumberOfBanks,0x1);
+		var_write(&minfo.MemoryModel,0x04);	//packed pixel
+		var_write(&minfo.NumberOfImagePages,0x05);
+		var_write(&minfo.Reserved_page,0x1);
 		break;
 	}
-	WLE(minfo.XResolution,mblock->swidth);
-	WLE(minfo.YResolution,mblock->sheight);
-	WLE(minfo.XCharSize,mblock->cwidth);
-	WLE(minfo.YCharSize,mblock->cheight);
-	WLE(minfo.PhysBasePtr,S3_LFB_BASE);
+	var_write(&minfo.XResolution,mblock->swidth);
+	var_write(&minfo.YResolution,mblock->sheight);
+	var_write(&minfo.XCharSize,mblock->cwidth);
+	var_write(&minfo.YCharSize,mblock->cheight);
+	var_write(&minfo.PhysBasePtr,S3_LFB_BASE);
 
 	MEM_BlockWrite(buf,&minfo,sizeof(MODE_INFO));
 	return 0x00;


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- dosbox.spec	25 Jan 2006 12:56:36 -0000	1.15
+++ dosbox.spec	25 Jan 2006 14:02:43 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           dosbox
 Version:        0.63
-Release:        7%{?dist}
+Release:        8%{?dist}
 
 Summary:        x86/DOS emulator with sound and graphics
 
@@ -10,8 +10,8 @@
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1:        dosbox.desktop
 Source2:        dosbox.png
-Patch0:         dosbox-x86-64-build.patch
-Patch1:         dosbox-gcc4.1.patch
+# See upstream bug 1414547
+Patch0:         dosbox-64bit-gcc4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -33,8 +33,7 @@
 
 %prep
 %setup -q
-%patch0
-%patch1
+%patch0 -p1
 
 %build
 %configure --enable-shots
@@ -73,18 +72,23 @@
 
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.63-8
+- apply upstream patch
+- fix typos
+
 * Sun Jan 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.64-7
+0.63-7
 - add dist
 - rebuild
 - add gcc4.1 patch
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.64-6
+0.63-6
 - add a x86_64 bugfix from upstream 
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-0.64-5
+0.63-5
 - more build fixes and cleanups...
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>



From fedora-extras-commits at redhat.com  Wed Jan 25 14:48:15 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Wed, 25 Jan 2006 09:48:15 -0500
Subject: rpms/yumex/devel .cvsignore, 1.9, 1.10 sources, 1.12,
	1.13 yumex.spec, 1.13, 1.14
Message-ID: <200601251448.k0PEmlj8014354@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14332

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.99.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	25 Jan 2006 13:12:32 -0000	1.9
+++ .cvsignore	25 Jan 2006 14:48:15 -0000	1.10
@@ -1 +1 @@
-yumex-0.99.1.tar.gz
+yumex-0.99.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	25 Jan 2006 13:12:32 -0000	1.12
+++ sources	25 Jan 2006 14:48:15 -0000	1.13
@@ -1 +1 @@
-cd368053d51a8ac4a22c6171c17e4ba6  yumex-0.99.1.tar.gz
+c1515a14e7e23d3cd77adb299cd3f820  yumex-0.99.2.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yumex.spec	25 Jan 2006 13:12:32 -0000	1.13
+++ yumex.spec	25 Jan 2006 14:48:15 -0000	1.14
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.1
+Version:  0.99.2
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Jan 25 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.2-1.0
+- Development Release 0.99.2-1.0
 * Tue Jan 24 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.1-1.0
 - Development Release 0.99.1-1.0
 - Changed versioning from X.Y to X.Y.Z



From fedora-extras-commits at redhat.com  Wed Jan 25 15:01:38 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:01:38 -0500
Subject: rpms/libpolyxmass/FC-4 .cvsignore, 1.2, 1.3 libpolyxmass.spec, 1.4, 
	1.5 sources, 1.2, 1.3
Message-ID: <200601251502.k0PF2B0Q016390@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpolyxmass/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14641/FC-4

Modified Files:
	.cvsignore libpolyxmass.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 06:43:44 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:01:38 -0000	1.3
@@ -1 +1 @@
-libpolyxmass-0.8.9.tar.gz
+libpolyxmass-0.9.0.tar.gz


Index: libpolyxmass.spec
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-4/libpolyxmass.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpolyxmass.spec	21 Oct 2005 07:35:17 -0000	1.4
+++ libpolyxmass.spec	25 Jan 2006 15:01:38 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libpolyxmass
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        5%{?dist}
 Summary:        Polymer chemistry-related functionalities
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.8.9/libpolyxmass-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.9.0/libpolyxmass-0.9.0.tar.gz
 Patch0:         libpolyxmass-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.9-4
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 06:43:44 -0000	1.2
+++ sources	25 Jan 2006 15:01:38 -0000	1.3
@@ -1 +1 @@
-859c8a2c9a79c256e2fc83e371f1c07b  libpolyxmass-0.8.9.tar.gz
+e452336b89ea6ff09a86680e2cd951a0  libpolyxmass-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:01:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:01:44 -0500
Subject: rpms/libpolyxmass/devel .cvsignore, 1.2, 1.3 libpolyxmass.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601251502.k0PF2XQG016399@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpolyxmass/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14641/devel

Modified Files:
	.cvsignore libpolyxmass.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 06:43:44 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:01:44 -0000	1.3
@@ -1 +1 @@
-libpolyxmass-0.8.9.tar.gz
+libpolyxmass-0.9.0.tar.gz


Index: libpolyxmass.spec
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/devel/libpolyxmass.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpolyxmass.spec	21 Oct 2005 07:35:17 -0000	1.4
+++ libpolyxmass.spec	25 Jan 2006 15:01:44 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libpolyxmass
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        5%{?dist}
 Summary:        Polymer chemistry-related functionalities
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.8.9/libpolyxmass-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.9.0/libpolyxmass-0.9.0.tar.gz
 Patch0:         libpolyxmass-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.9-4
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 06:43:44 -0000	1.2
+++ sources	25 Jan 2006 15:01:44 -0000	1.3
@@ -1 +1 @@
-859c8a2c9a79c256e2fc83e371f1c07b  libpolyxmass-0.8.9.tar.gz
+e452336b89ea6ff09a86680e2cd951a0  libpolyxmass-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:01:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:01:32 -0500
Subject: rpms/libpolyxmass/FC-3 .cvsignore, 1.2, 1.3 libpolyxmass.spec, 1.4, 
	1.5 sources, 1.2, 1.3
Message-ID: <200601251502.k0PF2YhT016402@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/libpolyxmass/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14641/FC-3

Modified Files:
	.cvsignore libpolyxmass.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Oct 2005 06:43:44 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:01:32 -0000	1.3
@@ -1 +1 @@
-libpolyxmass-0.8.9.tar.gz
+libpolyxmass-0.9.0.tar.gz


Index: libpolyxmass.spec
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-3/libpolyxmass.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libpolyxmass.spec	21 Oct 2005 07:35:17 -0000	1.4
+++ libpolyxmass.spec	25 Jan 2006 15:01:32 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           libpolyxmass
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        5%{?dist}
 Summary:        Polymer chemistry-related functionalities
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.8.9/libpolyxmass-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/libpolyxmass/downloads/0.9.0/libpolyxmass-0.9.0.tar.gz
 Patch0:         libpolyxmass-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -78,6 +78,10 @@
 %{_libdir}/pkgconfig/libpolyxmass.pc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Fri Oct 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.8.9-4
 - add dist


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libpolyxmass/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Oct 2005 06:43:44 -0000	1.2
+++ sources	25 Jan 2006 15:01:32 -0000	1.3
@@ -1 +1 @@
-859c8a2c9a79c256e2fc83e371f1c07b  libpolyxmass-0.8.9.tar.gz
+e452336b89ea6ff09a86680e2cd951a0  libpolyxmass-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:24:23 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:24:23 -0500
Subject: rpms/polyxmass-bin/FC-3 .cvsignore, 1.2,
	1.3 polyxmass-bin-src-makefile.patch, 1.1,
	1.2 polyxmass-bin.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251524.k0PFOuQS016670@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-bin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16608/FC-3

Modified Files:
	.cvsignore polyxmass-bin-src-makefile.patch polyxmass-bin.spec 
	sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 08:59:05 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:24:23 -0000	1.3
@@ -1 +1 @@
-polyxmass-bin-0.8.9.tar.gz
+polyxmass-bin-0.9.0.tar.gz

polyxmass-bin-src-makefile.patch:

Index: polyxmass-bin-src-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/polyxmass-bin-src-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polyxmass-bin-src-makefile.patch	24 Oct 2005 08:59:05 -0000	1.1
+++ polyxmass-bin-src-makefile.patch	25 Jan 2006 15:24:23 -0000	1.2
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2005-08-10 17:10:52.000000000 +0200
-+++ src/Makefile.am	2005-09-06 21:49:50.000000000 +0200
-@@ -146,10 +146,9 @@
+--- src/Makefile.am.orig	2006-01-25 16:19:51.000000000 +0100
++++ src/Makefile.am	2006-01-25 16:20:05.000000000 +0100
+@@ -145,8 +145,7 @@
  	-DG_LOG_DOMAIN=\"polyxmass\"\
  	-I$(prefix)/include \
  	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
@@ -10,19 +10,3 @@
  
  polyxmass_LDFLAGS = \
  	-L$(prefix)/lib \
- 	-L/usr/lib -L/usr/local/lib -lpopt \
--	$(POLYXMASSBIN_LIBS)
-\ No newline at end of file
-+	$(POLYXMASSBIN_LIBS)
---- src/Makefile.in.orig	2005-09-02 14:57:54.000000000 +0200
-+++ src/Makefile.in	2005-09-06 21:49:55.000000000 +0200
-@@ -310,8 +310,7 @@
- 	-DG_LOG_DOMAIN=\"polyxmass\"\
- 	-I$(prefix)/include \
- 	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
--	$(POLYXMASSBIN_CFLAGS)\
--	-Werror
-+	$(POLYXMASSBIN_CFLAGS)
- 
- 
- polyxmass_LDFLAGS = \


Index: polyxmass-bin.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/polyxmass-bin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-bin.spec	24 Oct 2005 10:01:01 -0000	1.2
+++ polyxmass-bin.spec	25 Jan 2006 15:24:23 -0000	1.3
@@ -1,17 +1,17 @@
 Name:           polyxmass-bin
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        The GNU polyxmass software suite
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org/
-Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.8.9/polyxmass-bin-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.9.0/polyxmass-bin-0.9.0.tar.gz
 Source1:        polyxmass.desktop
 Patch0:         polyxmass-bin-src-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libpolyxmass-devel >= 0.8.9
+BuildRequires:  libpolyxmass-devel >= 0.9.0
 BuildRequires:  gtk2-devel >= 2.4.10
 BuildRequires:  librsvg2-devel >= 2.7.2
 BuildRequires:  libgnomecanvas-devel >= 2.6.1
@@ -72,10 +72,16 @@
 %exclude %{_datadir}/doc/polyxmass-bin
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-4
 - add dist
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-3
 - add icon to desktop file
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 08:59:05 -0000	1.2
+++ sources	25 Jan 2006 15:24:23 -0000	1.3
@@ -1 +1 @@
-18cef92ef87bf355990d4f71b45aa53f  polyxmass-bin-0.8.9.tar.gz
+070dcf6bdd2147fcfb9bda354b437751  polyxmass-bin-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:24:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:24:29 -0500
Subject: rpms/polyxmass-bin/FC-4 .cvsignore, 1.2,
	1.3 polyxmass-bin-src-makefile.patch, 1.1,
	1.2 polyxmass-bin.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251525.k0PFP1rv016679@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-bin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16608/FC-4

Modified Files:
	.cvsignore polyxmass-bin-src-makefile.patch polyxmass-bin.spec 
	sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 08:59:05 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:24:29 -0000	1.3
@@ -1 +1 @@
-polyxmass-bin-0.8.9.tar.gz
+polyxmass-bin-0.9.0.tar.gz

polyxmass-bin-src-makefile.patch:

Index: polyxmass-bin-src-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/polyxmass-bin-src-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polyxmass-bin-src-makefile.patch	24 Oct 2005 08:59:05 -0000	1.1
+++ polyxmass-bin-src-makefile.patch	25 Jan 2006 15:24:29 -0000	1.2
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2005-08-10 17:10:52.000000000 +0200
-+++ src/Makefile.am	2005-09-06 21:49:50.000000000 +0200
-@@ -146,10 +146,9 @@
+--- src/Makefile.am.orig	2006-01-25 16:19:51.000000000 +0100
++++ src/Makefile.am	2006-01-25 16:20:05.000000000 +0100
+@@ -145,8 +145,7 @@
  	-DG_LOG_DOMAIN=\"polyxmass\"\
  	-I$(prefix)/include \
  	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
@@ -10,19 +10,3 @@
  
  polyxmass_LDFLAGS = \
  	-L$(prefix)/lib \
- 	-L/usr/lib -L/usr/local/lib -lpopt \
--	$(POLYXMASSBIN_LIBS)
-\ No newline at end of file
-+	$(POLYXMASSBIN_LIBS)
---- src/Makefile.in.orig	2005-09-02 14:57:54.000000000 +0200
-+++ src/Makefile.in	2005-09-06 21:49:55.000000000 +0200
-@@ -310,8 +310,7 @@
- 	-DG_LOG_DOMAIN=\"polyxmass\"\
- 	-I$(prefix)/include \
- 	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
--	$(POLYXMASSBIN_CFLAGS)\
--	-Werror
-+	$(POLYXMASSBIN_CFLAGS)
- 
- 
- polyxmass_LDFLAGS = \


Index: polyxmass-bin.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/polyxmass-bin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-bin.spec	24 Oct 2005 10:01:01 -0000	1.2
+++ polyxmass-bin.spec	25 Jan 2006 15:24:29 -0000	1.3
@@ -1,17 +1,17 @@
 Name:           polyxmass-bin
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        The GNU polyxmass software suite
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org/
-Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.8.9/polyxmass-bin-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.9.0/polyxmass-bin-0.9.0.tar.gz
 Source1:        polyxmass.desktop
 Patch0:         polyxmass-bin-src-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libpolyxmass-devel >= 0.8.9
+BuildRequires:  libpolyxmass-devel >= 0.9.0
 BuildRequires:  gtk2-devel >= 2.4.10
 BuildRequires:  librsvg2-devel >= 2.7.2
 BuildRequires:  libgnomecanvas-devel >= 2.6.1
@@ -72,10 +72,16 @@
 %exclude %{_datadir}/doc/polyxmass-bin
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-4
 - add dist
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-3
 - add icon to desktop file
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 08:59:05 -0000	1.2
+++ sources	25 Jan 2006 15:24:29 -0000	1.3
@@ -1 +1 @@
-18cef92ef87bf355990d4f71b45aa53f  polyxmass-bin-0.8.9.tar.gz
+070dcf6bdd2147fcfb9bda354b437751  polyxmass-bin-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:24:35 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:24:35 -0500
Subject: rpms/polyxmass-bin/devel .cvsignore, 1.2,
	1.3 polyxmass-bin-src-makefile.patch, 1.1,
	1.2 polyxmass-bin.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251525.k0PFP7lf016688@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-bin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16608/devel

Modified Files:
	.cvsignore polyxmass-bin-src-makefile.patch polyxmass-bin.spec 
	sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 08:59:05 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:24:35 -0000	1.3
@@ -1 +1 @@
-polyxmass-bin-0.8.9.tar.gz
+polyxmass-bin-0.9.0.tar.gz

polyxmass-bin-src-makefile.patch:

Index: polyxmass-bin-src-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/polyxmass-bin-src-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polyxmass-bin-src-makefile.patch	24 Oct 2005 08:59:05 -0000	1.1
+++ polyxmass-bin-src-makefile.patch	25 Jan 2006 15:24:35 -0000	1.2
@@ -1,6 +1,6 @@
---- src/Makefile.am.orig	2005-08-10 17:10:52.000000000 +0200
-+++ src/Makefile.am	2005-09-06 21:49:50.000000000 +0200
-@@ -146,10 +146,9 @@
+--- src/Makefile.am.orig	2006-01-25 16:19:51.000000000 +0100
++++ src/Makefile.am	2006-01-25 16:20:05.000000000 +0100
+@@ -145,8 +145,7 @@
  	-DG_LOG_DOMAIN=\"polyxmass\"\
  	-I$(prefix)/include \
  	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
@@ -10,19 +10,3 @@
  
  polyxmass_LDFLAGS = \
  	-L$(prefix)/lib \
- 	-L/usr/lib -L/usr/local/lib -lpopt \
--	$(POLYXMASSBIN_LIBS)
-\ No newline at end of file
-+	$(POLYXMASSBIN_LIBS)
---- src/Makefile.in.orig	2005-09-02 14:57:54.000000000 +0200
-+++ src/Makefile.in	2005-09-06 21:49:55.000000000 +0200
-@@ -310,8 +310,7 @@
- 	-DG_LOG_DOMAIN=\"polyxmass\"\
- 	-I$(prefix)/include \
- 	-I$(top_srcdir) -I../intl -DLOCALEDIR=\"$(localedir)\" \
--	$(POLYXMASSBIN_CFLAGS)\
--	-Werror
-+	$(POLYXMASSBIN_CFLAGS)
- 
- 
- polyxmass_LDFLAGS = \


Index: polyxmass-bin.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/polyxmass-bin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-bin.spec	24 Oct 2005 10:01:01 -0000	1.2
+++ polyxmass-bin.spec	25 Jan 2006 15:24:35 -0000	1.3
@@ -1,17 +1,17 @@
 Name:           polyxmass-bin
-Version:        0.8.9
-Release:        4%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 Summary:        The GNU polyxmass software suite
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org/
-Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.8.9/polyxmass-bin-0.8.9.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-bin/downloads/0.9.0/polyxmass-bin-0.9.0.tar.gz
 Source1:        polyxmass.desktop
 Patch0:         polyxmass-bin-src-makefile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libpolyxmass-devel >= 0.8.9
+BuildRequires:  libpolyxmass-devel >= 0.9.0
 BuildRequires:  gtk2-devel >= 2.4.10
 BuildRequires:  librsvg2-devel >= 2.7.2
 BuildRequires:  libgnomecanvas-devel >= 2.6.1
@@ -72,10 +72,16 @@
 %exclude %{_datadir}/doc/polyxmass-bin
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.0-1
+- version upgrade
+
 * Mon Oct 24 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-4
 - add dist
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.9-3
 - add icon to desktop file
 
 * Sun Oct 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-bin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 08:59:05 -0000	1.2
+++ sources	25 Jan 2006 15:24:35 -0000	1.3
@@ -1 +1 @@
-18cef92ef87bf355990d4f71b45aa53f  polyxmass-bin-0.8.9.tar.gz
+070dcf6bdd2147fcfb9bda354b437751  polyxmass-bin-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:33:15 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:33:15 -0500
Subject: rpms/polyxmass-doc/FC-3 .cvsignore, 1.2, 1.3 polyxmass-doc.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601251533.k0PFXldX016911@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-doc/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856/FC-3

Modified Files:
	.cvsignore polyxmass-doc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 22:07:11 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:33:15 -0000	1.3
@@ -1 +1 @@
-polyxmass-doc-0.8.7.tar.gz
+polyxmass-doc-0.8.8.tar.gz


Index: polyxmass-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-3/polyxmass-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-doc.spec	1 Nov 2005 22:21:35 -0000	1.2
+++ polyxmass-doc.spec	25 Jan 2006 15:33:15 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           polyxmass-doc
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.8
+Release:        1%{?dist}
 Summary:        Documentation for polyxmass
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.7/polyxmass-doc-0.8.7.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.8/polyxmass-doc-0.8.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
@@ -45,7 +45,12 @@
 %exclude %{_datadir}/doc/polyxmass-doc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.8-1
+- version upgrade
+
 * Tue Nov 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.7-2
 - add dist
 
 * Tue Sep 06 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 22:07:11 -0000	1.2
+++ sources	25 Jan 2006 15:33:15 -0000	1.3
@@ -1 +1 @@
-276c0e1bcbbb3605ba03dbec62958d7f  polyxmass-doc-0.8.7.tar.gz
+b0adea8c38cc85a6cd9156d9700bda74  polyxmass-doc-0.8.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:33:21 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:33:21 -0500
Subject: rpms/polyxmass-doc/FC-4 .cvsignore, 1.2, 1.3 polyxmass-doc.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200601251533.k0PFXrbc016916@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-doc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856/FC-4

Modified Files:
	.cvsignore polyxmass-doc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 22:07:11 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:33:21 -0000	1.3
@@ -1 +1 @@
-polyxmass-doc-0.8.7.tar.gz
+polyxmass-doc-0.8.8.tar.gz


Index: polyxmass-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-4/polyxmass-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-doc.spec	1 Nov 2005 22:21:35 -0000	1.2
+++ polyxmass-doc.spec	25 Jan 2006 15:33:21 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           polyxmass-doc
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.8
+Release:        1%{?dist}
 Summary:        Documentation for polyxmass
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.7/polyxmass-doc-0.8.7.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.8/polyxmass-doc-0.8.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
@@ -45,7 +45,12 @@
 %exclude %{_datadir}/doc/polyxmass-doc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.8-1
+- version upgrade
+
 * Tue Nov 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.7-2
 - add dist
 
 * Tue Sep 06 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 22:07:11 -0000	1.2
+++ sources	25 Jan 2006 15:33:21 -0000	1.3
@@ -1 +1 @@
-276c0e1bcbbb3605ba03dbec62958d7f  polyxmass-doc-0.8.7.tar.gz
+b0adea8c38cc85a6cd9156d9700bda74  polyxmass-doc-0.8.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:33:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 25 Jan 2006 10:33:27 -0500
Subject: rpms/polyxmass-doc/devel .cvsignore, 1.2, 1.3 polyxmass-doc.spec,
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200601251533.k0PFXxo1016921@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/polyxmass-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16856/devel

Modified Files:
	.cvsignore polyxmass-doc.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	1 Nov 2005 22:07:11 -0000	1.2
+++ .cvsignore	25 Jan 2006 15:33:26 -0000	1.3
@@ -1 +1 @@
-polyxmass-doc-0.8.7.tar.gz
+polyxmass-doc-0.8.8.tar.gz


Index: polyxmass-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/devel/polyxmass-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- polyxmass-doc.spec	1 Nov 2005 22:21:35 -0000	1.2
+++ polyxmass-doc.spec	25 Jan 2006 15:33:26 -0000	1.3
@@ -1,12 +1,12 @@
 Name:           polyxmass-doc
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.8
+Release:        1%{?dist}
 Summary:        Documentation for polyxmass
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://www.polyxmass.org
-Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.7/polyxmass-doc-0.8.7.tar.gz
+Source0:        http://www.polyxmass.org/polyxmass-common-data-doc/downloads/0.8.8/polyxmass-doc-0.8.8.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:  noarch
@@ -45,7 +45,12 @@
 %exclude %{_datadir}/doc/polyxmass-doc
 
 %changelog
+* Wed Jan 25 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.8-1
+- version upgrade
+
 * Tue Nov 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.8.7-2
 - add dist
 
 * Tue Sep 06 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/polyxmass-doc/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	1 Nov 2005 22:07:11 -0000	1.2
+++ sources	25 Jan 2006 15:33:26 -0000	1.3
@@ -1 +1 @@
-276c0e1bcbbb3605ba03dbec62958d7f  polyxmass-doc-0.8.7.tar.gz
+b0adea8c38cc85a6cd9156d9700bda74  polyxmass-doc-0.8.8.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 15:58:09 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Wed, 25 Jan 2006 10:58:09 -0500
Subject: rpms/python-twisted/devel python-twisted.spec,1.3,1.4
Message-ID: <200601251558.k0PFwfhN017085@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17063

Modified Files:
	python-twisted.spec 
Log Message:
rebuild for rawhide


Index: python-twisted.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted/devel/python-twisted.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-twisted.spec	6 Apr 2005 22:13:30 -0000	1.3
+++ python-twisted.spec	25 Jan 2006 15:58:08 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Event-driven networking framework written in Python
 Name: python-twisted
 Version: 1.3.0
-Release: 3
+Release: 4
 
 License: LGPL
 Group: Applications/Internet
@@ -76,6 +76,10 @@
 
 
 %changelog
+* Wed Jan 25 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 1.3.0-4
+- rebuilt for rawhide, current package installs for python2.3
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Wed Jan 25 16:34:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 25 Jan 2006 11:34:46 -0500
Subject: rpms/perl-Chart/devel .cvsignore, 1.2, 1.3 perl-Chart.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601251635.k0PGZJjF019003@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-Chart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18974

Modified Files:
	.cvsignore perl-Chart.spec sources 
Log Message:
* Wed Jan 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.1-1
- 2.4.1.
- Don't ship rgb.txt in docs.
- Specfile cleanups.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	17 Jan 2005 21:07:15 -0000	1.2
+++ .cvsignore	25 Jan 2006 16:34:46 -0000	1.3
@@ -1 +1 @@
-Chart-2.3.tar.gz
+Chart-2.4.1.tar.gz


Index: perl-Chart.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/perl-Chart.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Chart.spec	6 Apr 2005 22:12:43 -0000	1.3
+++ perl-Chart.spec	25 Jan 2006 16:34:46 -0000	1.4
@@ -1,19 +1,16 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Chart
-Version:        2.3
-Release:        3
-
+Version:        2.4.1
+Release:        1%{?dist}
 Summary:        Perl module for producing many types of charts
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Chart/
-Source0:        http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-2.3.tar.gz
+Source0:        http://www.cpan.org/authors/id/C/CH/CHARTGRP/Chart-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(GD) >= 1.20
+BuildRequires:  perl(GD) >= 1.20
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -22,7 +19,7 @@
 
 %prep
 %setup -q -n Chart-%{version}
-chmod 644 Chart/*.pm TODO doc/Documentation.pdf
+chmod -c 644 Chart/*.pm TODO Documentation.pdf
 
 
 %build
@@ -38,7 +35,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -48,12 +45,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO doc/Documentation.pdf rgb.txt
-%{perl_vendorlib}/Chart
+%doc README TODO Documentation.pdf
+%{perl_vendorlib}/Chart*
+%{_mandir}/man3/Chart.3*
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Jan 25 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.1-1
+- 2.4.1.
+- Don't ship rgb.txt in docs.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3-3
 - rebuilt
 
 * Sun Jul 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:2.3-2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Chart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	17 Jan 2005 21:07:15 -0000	1.2
+++ sources	25 Jan 2006 16:34:46 -0000	1.3
@@ -1 +1 @@
-809540667dd703353af30147ef27b67d  Chart-2.3.tar.gz
+5e7a80badfb8bf6e29b21879689bcc2f  Chart-2.4.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 16:36:13 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 25 Jan 2006 11:36:13 -0500
Subject: rpms/perl-String-CRC32/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-String-CRC32.spec, 1.2, NONE sources, 1.2, NONE
Message-ID: <200601251636.k0PGaFBS019061@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19007

Removed Files:
	.cvsignore Makefile perl-String-CRC32.spec sources 
Log Message:
Removing devel branch as perl-String-CRC32 is in rawhide

Self-removal now mentioned at http://fedoraproject.org/wiki/Extras/CVSSyncNeeded



--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-String-CRC32.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Jan 25 21:12:34 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Wed, 25 Jan 2006 16:12:34 -0500
Subject: rpms/libnjb/devel libnjb.perms, NONE, 1.1 libnjb.rules, NONE,
	1.1 libnjb.spec, 1.4, 1.5
Message-ID: <200601252113.k0PLD7lB029333@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29310

Modified Files:
	libnjb.spec 
Added Files:
	libnjb.perms libnjb.rules 
Log Message:
Fixes in resp to bug 178543



--- NEW FILE libnjb.perms ---
<libnjb>=/dev/libnjb*
<console> 0600 <libnjb> 0600 root


--- NEW FILE libnjb.rules ---
# libnjb.rules a udev rules file for libnjb devices
# created by Linus Walleij, ENJOY!

SUBSYSTEM!="usb_device", ACTION!="add", GOTO="nomad_rules_end"

# Creative Nomad Jukebox
SYSFS{idVendor}=="0471", SYSFS{idProduct}=="0222", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox 2
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4100", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox 3
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4101", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4108", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen USB 2.0
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="410b", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen NX
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4109", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Xtra
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4110", SYMLINK+="libnjb-%k"
# Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4111", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Touch
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411b", SYMLINK+="libnjb-%k"
# Creative Zen (Zen Micro variant)
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411d", SYMLINK+="libnjb-%k"
# Creative Nomad Jukebox Zen Micro
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="411e", SYMLINK+="libnjb-%k"
# Second Generation Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4126", SYMLINK+="libnjb-%k"
# Dell Pocket DJ
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4127", SYMLINK+="libnjb-%k"
# Creative Zen Sleek
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="4136", SYMLINK+="libnjb-%k"
# Third Generation Dell Digital Jukebox
SYSFS{idVendor}=="041e", SYSFS{idProduct}=="412f", SYMLINK+="libnjb-%k"

LABEL="nomad_rules_end"


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnjb.spec	12 Oct 2005 18:46:48 -0000	1.4
+++ libnjb.spec	25 Jan 2006 21:12:33 -0000	1.5
@@ -6,21 +6,24 @@
 # test building a Fedora Extras package, define the following
 # two macros in .rpmmacros:
 #
-# %dist .fc4
-# %fedora 4
+# %dist .fc5
+# %fedora 5
 #
 
 Name:		libnjb
 Version:	2.2.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
 Group:		System Environment/Libraries
-Source:		http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1:	libnjb.rules
+Source2:	libnjb.perms
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 License:	BSD
-Requires:	hotplug
+Requires:	udev
+Requires:	pam
 BuildRequires:	libusb-devel
 BuildRequires:	zlib-devel
 BuildRequires:	ncurses-devel
@@ -67,10 +70,12 @@
 %makeinstall
 # Remove libtool archive remnant
 rm -f $RPM_BUILD_ROOT%{_libdir}/libnjb.la
-# Install hotplug scripts so they are up to date
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-install -p -m 755 nomadjukebox $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
-install -p -m 644 nomad.usermap $RPM_BUILD_ROOT%{_sysconfdir}/hotplug/usb
+# Install udev rules file.
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-libnjb.rules
+# Install device permissions
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libnjb.perms
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog ChangeLog-old FAQ \
 INSTALL LICENSE HACKING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -84,8 +89,8 @@
 %files
 %defattr(-, root, root)
 %{_libdir}/*.so.*
-%config(noreplace) %{_sysconfdir}/hotplug/usb/*
-
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
 %files examples
 %defattr(-, root, root)
 %{_bindir}/*
@@ -100,6 +105,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Linus Walleij <triad at df.lth.se> 2.2.4-2
+- Fix udev problem, let go of hotplug, fix console perms.
+- Still working on libusb vs udev issues.
 * Wed Oct 12 2005 Linus Walleij <triad at df.lth.se> 2.2.4-1
 - New upstream release.
 * Mon Sep 19 2005 Linus Walleij <triad at df.lth.se> 2.2.3-1



From fedora-extras-commits at redhat.com  Wed Jan 25 21:37:56 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 25 Jan 2006 16:37:56 -0500
Subject: rpms/liferea/devel .cvsignore, 1.18, 1.19 liferea.spec, 1.27,
	1.28 sources, 1.19, 1.20
Message-ID: <200601252138.k0PLcTR0029513@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29487

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Wed Jan 25 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-2
- Update to 1.0.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Jan 2006 01:54:37 -0000	1.18
+++ .cvsignore	25 Jan 2006 21:37:56 -0000	1.19
@@ -1 +1 @@
-liferea-1.0.1.tar.gz
+liferea-1.0.2.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- liferea.spec	17 Jan 2006 01:54:37 -0000	1.27
+++ liferea.spec	25 Jan 2006 21:37:56 -0000	1.28
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.1
+Version:        1.0.2
 Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -94,6 +94,9 @@
 
 
 %changelog
+* Wed Jan 25 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-2
+- Update to 1.0.2.
+
 * Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
 - Update to 1.0.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Jan 2006 01:54:37 -0000	1.19
+++ sources	25 Jan 2006 21:37:56 -0000	1.20
@@ -1 +1 @@
-c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz
+45cd555c60ce7f8a2eda4b776118e939  liferea-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Jan 25 22:04:32 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 25 Jan 2006 17:04:32 -0500
Subject: rpms/grads/devel grads.spec,1.4,1.5
Message-ID: <200601252205.k0PM56NE031424@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31407

Modified Files:
	grads.spec 
Log Message:
* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
- add BR on readline-devel close #178285



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grads.spec	21 Dec 2005 08:02:35 -0000	1.4
+++ grads.spec	25 Jan 2006 22:04:32 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.1
+Release:        6%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -32,11 +32,10 @@
 BuildRequires:  hdf-devel 
 %endif
 BuildRequires:  udunits-devel netcdf-devel 
-#BuildRequires:  opendap-devel
+BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-#Requires:       
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -107,7 +106,10 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5.1
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+- add BR on readline-devel close #178285
+
+* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-4



From fedora-extras-commits at redhat.com  Thu Jan 26 06:56:13 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 01:56:13 -0500
Subject: rpms/system-config-control/FC-4 sources,1.2,1.3
Message-ID: <200601260656.k0Q6ujXQ014602@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14570/FC-4

Modified Files:
	sources 
Log Message:
Updated source


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 11:44:48 -0000	1.2
+++ sources	26 Jan 2006 06:56:12 -0000	1.3
@@ -1 +1 @@
-b38cb9e8aaba1b17930a249ad1a7e199  system-config-control-1.0.tar.bz2
+6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 06:56:18 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 01:56:18 -0500
Subject: rpms/system-config-control/devel sources,1.2,1.3
Message-ID: <200601260656.k0Q6upvE014605@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14570/devel

Modified Files:
	sources 
Log Message:
Updated source


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Nov 2005 11:44:48 -0000	1.2
+++ sources	26 Jan 2006 06:56:18 -0000	1.3
@@ -1 +1 @@
-b38cb9e8aaba1b17930a249ad1a7e199  system-config-control-1.0.tar.bz2
+6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 07:17:19 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Thu, 26 Jan 2006 02:17:19 -0500
Subject: rpms/python-myghty/devel .cvsignore, 1.4, 1.5 python-myghty.spec,
	1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200601260717.k0Q7Hpsj016416@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16393

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
1.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Jan 2006 08:53:33 -0000	1.4
+++ .cvsignore	26 Jan 2006 07:17:19 -0000	1.5
@@ -1 +1 @@
-Myghty-0.99a.tar.gz
+Myghty-1.0.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-myghty.spec	4 Jan 2006 09:17:21 -0000	1.4
+++ python-myghty.spec	26 Jan 2006 07:17:19 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        0.99a
+Version:        1.0
 Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 1.0-1
+- 1.0
+
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 0.99a-1
 - Bump to 0.99a
 - Install with --old-and-unmanageable to avoid Python Eggs annoyance


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Jan 2006 08:53:33 -0000	1.4
+++ sources	26 Jan 2006 07:17:19 -0000	1.5
@@ -1 +1 @@
-09953871f9616e4c5f6059fc6bf06b7e  Myghty-0.99a.tar.gz
+4329dea233683c2e073036ea48f23fd8  Myghty-1.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 07:34:09 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 26 Jan 2006 02:34:09 -0500
Subject: rpms/azureus/devel azureus-themed.patch, NONE, 1.1 Azureus.desktop, 
	1.2, 1.3 azureus.script, 1.2, 1.3 azureus.spec, 1.6, 1.7
Message-ID: <200601260734.k0Q7Ygsp016533@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16505

Modified Files:
	Azureus.desktop azureus.script azureus.spec 
Added Files:
	azureus-themed.patch 
Log Message:
Revision -18.  Theme some icons with java-gnome.


azureus-themed.patch:

--- NEW FILE azureus-themed.patch ---
--- org/gudy/azureus2/ui/swt/ImageRepository.java~	2006-01-25 23:03:14.000000000 -0800
+++ org/gudy/azureus2/ui/swt/ImageRepository.java	2006-01-25 23:08:05.000000000 -0800
@@ -18,6 +18,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.util.*;
 
 /**
@@ -45,6 +47,25 @@
     loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
   }
 
+  private static org.gnu.gtk.IconTheme iconTheme;
+
+  public static String getThemedIcon (String name, String def)
+  {
+    try
+      {
+	if (iconTheme == null)
+	  iconTheme = org.gnu.gtk.IconTheme.getDefault();
+
+	return iconTheme.lookupIcon (name, 24, 
+				     org.gnu.gtk.IconLookupFlags.NO_SVG)
+	  .getFilename();
+      }
+    catch (Exception ex)
+      {
+	return def;
+      }
+  }
+
   public static void loadImages(Display display) {
     loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
     loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
@@ -88,20 +109,44 @@
     //ToolBar Icons
 
     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif", "cb_open_no_default");
+    loadImage(display, 
+	      getThemedIcon ("fileopen", "org/gudy/azureus2/ui/icons/toolbar/open_no_default.gif"), 
+	      "cb_open_no_default");
     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_folder.gif", "cb_open_folder");
     loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open_url.gif", "cb_open_url");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/new.gif", "cb_new");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/up.gif", "cb_up");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/down.gif", "cb_down");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/top.gif", "cb_top");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/bottom.gif", "cb_bottom");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/run.gif", "cb_run");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/start.gif", "cb_start");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/stop.gif", "cb_stop");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/remove.gif", "cb_remove");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/host.gif", "cb_host");
-    loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/publish.gif", "cb_publish");
+    loadImage(display, 
+	      getThemedIcon ("filenew", "org/gudy/azureus2/ui/icons/toolbar/new.gif"), 
+	      "cb_new");
+    loadImage(display, 
+	      getThemedIcon ("gtk-go-up", "org/gudy/azureus2/ui/icons/toolbar/up.gif"), 
+	      "cb_up");
+    loadImage(display, 
+	      getThemedIcon ("gtk-go-down", "org/gudy/azureus2/ui/icons/toolbar/down.gif"),
+	      "cb_down");
+    loadImage(display, 
+	      getThemedIcon ("gtk-goto-top", "org/gudy/azureus2/ui/icons/toolbar/top.gif"), 
+	      "cb_top");
+    loadImage(display, 
+	      getThemedIcon ("gtk-goto-bottom", "org/gudy/azureus2/ui/icons/toolbar/bottom.gif"), 
+	      "cb_bottom");
+    loadImage(display, 
+	      getThemedIcon ("exec", "org/gudy/azureus2/ui/icons/toolbar/run.gif"), 
+	      "cb_run");
+    loadImage(display, 
+	      getThemedIcon ("gtk-go-forward", "org/gudy/azureus2/ui/icons/toolbar/start.gif"), 
+	      "cb_start");
+    loadImage(display, 
+	      getThemedIcon ("gtk-stop", "org/gudy/azureus2/ui/icons/toolbar/stop.gif"), 
+	      "cb_stop");
+    loadImage(display, 
+	      getThemedIcon ("edit_remove", "org/gudy/azureus2/ui/icons/toolbar/remove.gif"), 
+	      "cb_remove");
+    loadImage(display, 
+	      getThemedIcon ("gohome", "org/gudy/azureus2/ui/icons/toolbar/host.gif"), 
+	      "cb_host");
+    loadImage(display, 
+	      getThemedIcon ("icon-html", "org/gudy/azureus2/ui/icons/toolbar/publish.gif"), 
+	      "cb_publish");
 
     //Status icons
     loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
@@ -138,6 +183,16 @@
     Image im = getImage(name,false);
     if(null == im) {
       InputStream is = loader.getResourceAsStream(res);
+      if (is == null)
+	{
+	  try
+	    {
+	      is = new FileInputStream (res);
+	    }
+	  catch (FileNotFoundException fnf)
+	    {
+	    }
+	}
       if(null != is) {
         if(alpha == 255) {
           im = new Image(display, is);


Index: Azureus.desktop
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/Azureus.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Azureus.desktop	22 Jan 2006 05:51:23 -0000	1.2
+++ Azureus.desktop	26 Jan 2006 07:34:09 -0000	1.3
@@ -7,5 +7,5 @@
 Terminal=false
 Type=Application
 MimeType=application/x-bittorrent
-Categories=Application;Network;FileTransfer;P2P;GTK;Java
+Categories=Application;Network;FileTransfer;P2P;GTK;Java;
 


Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus.script	21 Jan 2006 17:04:07 -0000	1.2
+++ azureus.script	26 Jan 2006 07:34:09 -0000	1.3
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
+CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- azureus.spec	22 Jan 2006 05:53:36 -0000	1.6
+++ azureus.spec	26 Jan 2006 07:34:09 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -29,11 +29,12 @@
 Patch9:         azureus-no-bouncycastle.patch
 Patch10:        azureus-cache-size.patch
 Patch11:        azureus-remove-manifest-classpath.patch
+Patch12:        azureus-themed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
-BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
-Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto
+BuildRequires:  jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java
+Requires:       jakarta-commons-cli, libswt3-gtk2, log4j, gnu-crypto, libgtk-java, glib-java
 Requires:       libgcj >= 4.1.0-0.15
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -61,12 +62,13 @@
 %patch9 -p0
 %patch10 -p0
 %patch11 -p0
+%patch12 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
 %build
 mkdir -p build/libs
-build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto
+build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -144,6 +146,12 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-18
+- Theme CoolBar icons with azureus-themed.patch.
+- Add libgtk-java and glib-java dependencies to spec file.
+- Add gtk2.8 and glib0.2 to azureus.script.
+- Add missing semi-colon to Azureus.desktop.
+
 * Sat Jan 21 2006 Anthony Green <green at redhat.com> - 2.3.0.6-17
 - Use "$@" instead of $* in azureus.script (thanks ivazquez).
 - Improve .desktop file.



From fedora-extras-commits at redhat.com  Thu Jan 26 07:35:54 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Thu, 26 Jan 2006 02:35:54 -0500
Subject: rpms/azureus/devel azureus.spec,1.7,1.8
Message-ID: <200601260736.k0Q7aQqt016586@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16569

Modified Files:
	azureus.spec 
Log Message:
Bump revision.



Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- azureus.spec	26 Jan 2006 07:34:09 -0000	1.7
+++ azureus.spec	26 Jan 2006 07:35:54 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -146,7 +146,7 @@
 %{_libdir}/gcj/*
 
 %changelog
-* Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-18
+* Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-19
 - Theme CoolBar icons with azureus-themed.patch.
 - Add libgtk-java and glib-java dependencies to spec file.
 - Add gtk2.8 and glib0.2 to azureus.script.



From fedora-extras-commits at redhat.com  Thu Jan 26 08:25:35 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 26 Jan 2006 03:25:35 -0500
Subject: rpms/perl-Test-Pod-Coverage/FC-4 .cvsignore, 1.2,
	1.3 perl-Test-Pod-Coverage.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601260826.k0Q8Q7gM018614@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18553/FC-4

Modified Files:
	.cvsignore perl-Test-Pod-Coverage.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2005 19:51:56 -0000	1.2
+++ .cvsignore	26 Jan 2006 08:25:35 -0000	1.3
@@ -1 +1 @@
-Test-Pod-Coverage-1.06.tar.gz
+Test-Pod-Coverage-1.08.tar.gz


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4/perl-Test-Pod-Coverage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Pod-Coverage.spec	12 May 2005 22:35:33 -0000	1.4
+++ perl-Test-Pod-Coverage.spec	26 Jan 2006 08:25:35 -0000	1.5
@@ -1,19 +1,19 @@
 Name:           perl-Test-Pod-Coverage
-Version:        1.06
-Release:        3%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Pod-Coverage/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Pod::Coverage)
-BuildRequires:  perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Pod), perl(Test::Builder::Tester)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Checks for POD coverage in files for your distribution.
@@ -36,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.08-1
+- Update to 1.08.
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-3
 - Add dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2005 19:51:56 -0000	1.2
+++ sources	26 Jan 2006 08:25:35 -0000	1.3
@@ -1 +1 @@
-2e9991d4ac04149179fa60f621b3f42f  Test-Pod-Coverage-1.06.tar.gz
+33405cca7c75b7b89c06ba30eea66692  Test-Pod-Coverage-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 08:25:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 26 Jan 2006 03:25:01 -0500
Subject: rpms/perl-Test-Pod-Coverage/FC-3 .cvsignore, 1.2,
	1.3 perl-Test-Pod-Coverage.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601260826.k0Q8Q4Up018609@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18553/FC-3

Modified Files:
	.cvsignore perl-Test-Pod-Coverage.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2005 19:51:56 -0000	1.2
+++ .cvsignore	26 Jan 2006 08:25:01 -0000	1.3
@@ -1 +1 @@
-Test-Pod-Coverage-1.06.tar.gz
+Test-Pod-Coverage-1.08.tar.gz


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3/perl-Test-Pod-Coverage.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Pod-Coverage.spec	13 Jan 2005 19:51:56 -0000	1.1
+++ perl-Test-Pod-Coverage.spec	26 Jan 2006 08:25:01 -0000	1.2
@@ -1,22 +1,19 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`perl -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Test-Pod-Coverage
-Version:        1.06
-Release:        1
-Epoch:          0
+Version:        1.08
+Release:        1%{?dist}
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Pod-Coverage/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Pod::Coverage)
-BuildRequires:  perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Pod), perl(Test::Builder::Tester)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Checks for POD coverage in files for your distribution.
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,6 +52,15 @@
 
 
 %changelog
+* Thu Jan 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.08-1
+- Update to 1.08.
+
+* Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-3
+- Add dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.06-2
+- rebuilt
+
 * Thu Jun 24 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.06-1
 - Update to 1.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2005 19:51:56 -0000	1.2
+++ sources	26 Jan 2006 08:25:01 -0000	1.3
@@ -1 +1 @@
-2e9991d4ac04149179fa60f621b3f42f  Test-Pod-Coverage-1.06.tar.gz
+33405cca7c75b7b89c06ba30eea66692  Test-Pod-Coverage-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 08:25:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Thu, 26 Jan 2006 03:25:49 -0500
Subject: rpms/perl-Test-Pod-Coverage/devel .cvsignore, 1.2,
	1.3 perl-Test-Pod-Coverage.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601260826.k0Q8QLbZ018619@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-Pod-Coverage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18553/devel

Modified Files:
	.cvsignore perl-Test-Pod-Coverage.spec sources 
Log Message:
Update to 1.08.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2005 19:51:56 -0000	1.2
+++ .cvsignore	26 Jan 2006 08:25:49 -0000	1.3
@@ -1 +1 @@
-Test-Pod-Coverage-1.06.tar.gz
+Test-Pod-Coverage-1.08.tar.gz


Index: perl-Test-Pod-Coverage.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/perl-Test-Pod-Coverage.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Test-Pod-Coverage.spec	12 May 2005 22:35:33 -0000	1.4
+++ perl-Test-Pod-Coverage.spec	26 Jan 2006 08:25:49 -0000	1.5
@@ -1,19 +1,19 @@
 Name:           perl-Test-Pod-Coverage
-Version:        1.06
-Release:        3%{?dist}
+Version:        1.08
+Release:        1%{?dist}
 Summary:        Check for pod coverage in your distribution
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Test-Pod-Coverage/
-Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-1.06.tar.gz
+Source0:        http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-Coverage-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
 BuildRequires:  perl(Pod::Coverage)
-BuildRequires:  perl(Test::More), perl(Test::Pod), perl(Test::Builder::Tester)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(Test::Pod), perl(Test::Builder::Tester)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Checks for POD coverage in files for your distribution.
@@ -36,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.08-1
+- Update to 1.08.
+
 * Thu May 12 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-3
 - Add dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Pod-Coverage/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2005 19:51:56 -0000	1.2
+++ sources	26 Jan 2006 08:25:49 -0000	1.3
@@ -1 +1 @@
-2e9991d4ac04149179fa60f621b3f42f  Test-Pod-Coverage-1.06.tar.gz
+33405cca7c75b7b89c06ba30eea66692  Test-Pod-Coverage-1.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 11:40:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 26 Jan 2006 06:40:28 -0500
Subject: rpms/emelfm2/devel .cvsignore, 1.4, 1.5 emelfm2.spec, 1.6,
	1.7 sources, 1.4, 1.5
Message-ID: <200601261141.k0QBf0Bu025016@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24995

Modified Files:
	.cvsignore emelfm2.spec sources 
Log Message:
update to 0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Dec 2005 21:19:30 -0000	1.4
+++ .cvsignore	26 Jan 2006 11:40:28 -0000	1.5
@@ -1 +1 @@
-emelfm2-0.1.4.tar.gz
+emelfm2-0.1.5.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emelfm2.spec	29 Dec 2005 21:06:19 -0000	1.6
+++ emelfm2.spec	26 Jan 2006 11:40:28 -0000	1.7
@@ -1,12 +1,12 @@
 Name:           emelfm2
-Version:        0.1.4
+Version:        0.1.5
 Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPL
-URL:            http://emelfm2.org/
-Source0:        http://emelfm2.org/rel/emelfm2-%{version}.tar.gz
+URL:            http://emelfm2.net/
+Source0:        http://emelfm2.net/rel/emelfm2-%{version}.tar.gz
 Patch0:		%{name}-0.1.2-makefile.config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +23,9 @@
 %patch0 -p0 -b .orig
 sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
 # fix for x86_64 libs
-sed -i 's|$(PREFIX)/lib/$(TARGET)/$(LIBS)/|$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/|' Makefile
+sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
 # fix broken icon in emelfm2.desktop
-sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
+sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
 make %{?_smp_mflags}
@@ -63,6 +63,9 @@
 
 	
 %changelog
+* Thu Jan 26 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.5-1
+- Update to 0.1.5.
+
 * Thu Dec 29 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.4-1
 - Update to 0.1.4.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Dec 2005 21:19:30 -0000	1.4
+++ sources	26 Jan 2006 11:40:28 -0000	1.5
@@ -1 +1 @@
-da39b1d017366fb41700c5d40365a1ae  emelfm2-0.1.4.tar.gz
+826e9edf31431a0b6a2c0208a475df54  emelfm2-0.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 11:56:26 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 26 Jan 2006 06:56:26 -0500
Subject: rpms/emelfm2/FC-4 .cvsignore, 1.3, 1.4 emelfm2.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601261156.k0QBuwK8025437@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25416

Modified Files:
	.cvsignore emelfm2.spec sources 
Log Message:
update to 0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 19:44:04 -0000	1.3
+++ .cvsignore	26 Jan 2006 11:56:26 -0000	1.4
@@ -1 +1 @@
-emelfm2-0.1.3.tar.gz
+emelfm2-0.1.5.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-4/emelfm2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emelfm2.spec	21 Nov 2005 19:44:04 -0000	1.3
+++ emelfm2.spec	26 Jan 2006 11:56:26 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           emelfm2
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPL
-URL:            http://emelfm2.org/
-Source0:        http://emelfm2.org/rel/emelfm2-%{version}.tar.gz
+URL:            http://emelfm2.net/
+Source0:        http://emelfm2.net/rel/emelfm2-%{version}.tar.gz
 Patch0:		%{name}-0.1.2-makefile.config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +23,9 @@
 %patch0 -p0 -b .orig
 sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
 # fix for x86_64 libs
-sed -i 's|$(PREFIX)/lib/$(TARGET)/$(LIBS)/|$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/|' Makefile
+sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
 # fix broken icon in emelfm2.desktop
-sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
+sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
 make %{?_smp_mflags}
@@ -63,8 +63,14 @@
 
 	
 %changelog
+* Thu Jan 26 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.5-1
+- Update to 0.1.5.
+
+* Thu Dec 29 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.4-1
+- Update to 0.1.4.
+
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-2
-- Removed nonexistent ROADMAP from %doc.
+- Removed nonexistant ROADMAP from %doc.
 
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-1
 - Update to 0.1.3.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 19:44:04 -0000	1.3
+++ sources	26 Jan 2006 11:56:26 -0000	1.4
@@ -1 +1 @@
-0f1412c28211aa4afa66cbd297eb9abd  emelfm2-0.1.3.tar.gz
+826e9edf31431a0b6a2c0208a475df54  emelfm2-0.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 11:57:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Thu, 26 Jan 2006 06:57:58 -0500
Subject: rpms/emelfm2/FC-3 .cvsignore, 1.3, 1.4 emelfm2.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601261158.k0QBwVdE025510@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/emelfm2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25489

Modified Files:
	.cvsignore emelfm2.spec sources 
Log Message:
update to 0.1.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 19:44:56 -0000	1.3
+++ .cvsignore	26 Jan 2006 11:57:58 -0000	1.4
@@ -1 +1 @@
-emelfm2-0.1.3.tar.gz
+emelfm2-0.1.5.tar.gz


Index: emelfm2.spec
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-3/emelfm2.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emelfm2.spec	21 Nov 2005 19:44:56 -0000	1.3
+++ emelfm2.spec	26 Jan 2006 11:57:58 -0000	1.4
@@ -1,12 +1,12 @@
 Name:           emelfm2
-Version:        0.1.3
-Release:        2%{?dist}
+Version:        0.1.5
+Release:        1%{?dist}
 Summary:        A file manager that implements the popular two-pane design
 
 Group:          Applications/File
 License:        GPL
-URL:            http://emelfm2.org/
-Source0:        http://emelfm2.org/rel/emelfm2-%{version}.tar.gz
+URL:            http://emelfm2.net/
+Source0:        http://emelfm2.net/rel/emelfm2-%{version}.tar.gz
 Patch0:		%{name}-0.1.2-makefile.config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -23,9 +23,9 @@
 %patch0 -p0 -b .orig
 sed -i 's!%PREFIX%'!'%{_prefix}!' Makefile.config
 # fix for x86_64 libs
-sed -i 's|$(PREFIX)/lib/$(TARGET)/$(LIBS)/|$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/|' Makefile
+sed -i 's!$(PREFIX)/lib/$(TARGET)/$(LIBS)/!$(PREFIX)/%{_lib}/$(TARGET)/$(LIBS)/!' Makefile
 # fix broken icon in emelfm2.desktop
-sed -i 's!emelfm2/icon_emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
+sed -i 's!emelfm2/emelfm2_48.png!%{_datadir}/pixmaps/emelfm2/emelfm2_48.png!' docs/desktop_environment/%{name}.desktop
 
 %build
 make %{?_smp_mflags}
@@ -63,8 +63,14 @@
 
 	
 %changelog
+* Thu Jan 26 2006 Christoph Wickert <fedora wickert arcor de> - 0.1.5-1
+- Update to 0.1.5.
+
+* Thu Dec 29 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.4-1
+- Update to 0.1.4.
+
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-2
-- Removed nonexistent ROADMAP from %doc.
+- Removed nonexistant ROADMAP from %doc.
 
 * Mon Nov 21 2005 Christoph Wickert <fedora wickert arcor de> - 0.1.3-1
 - Update to 0.1.3.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emelfm2/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 19:44:56 -0000	1.3
+++ sources	26 Jan 2006 11:57:58 -0000	1.4
@@ -1 +1 @@
-0f1412c28211aa4afa66cbd297eb9abd  emelfm2-0.1.3.tar.gz
+826e9edf31431a0b6a2c0208a475df54  emelfm2-0.1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 12:35:57 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:35:57 -0500
Subject: rpms/system-config-control import.log,1.2,1.3
Message-ID: <200601261236.k0QCaTX5027497@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27456

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-4 on branch devel from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	14 Nov 2005 11:44:42 -0000	1.2
+++ import.log	26 Jan 2006 12:35:57 -0000	1.3
@@ -1 +1,2 @@
 system-config-control-1_0-3:HEAD:system-config-control-1.0-3.src.rpm:1131968670
+system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947



From fedora-extras-commits at redhat.com  Thu Jan 26 12:36:03 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:36:03 -0500
Subject: rpms/system-config-control/devel sources,1.3,1.4
Message-ID: <200601261236.k0QCaZRu027505@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27456/devel

Modified Files:
	sources 
Log Message:
auto-import system-config-control-1.0-4 on branch devel from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jan 2006 06:56:18 -0000	1.3
+++ sources	26 Jan 2006 12:36:03 -0000	1.4
@@ -1 +1 @@
-6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2
+2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 12:38:09 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:38:09 -0500
Subject: rpms/system-config-control import.log,1.3,1.4
Message-ID: <200601261238.k0QCcfKq027605@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27573

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-4 on branch FC-4 from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	26 Jan 2006 12:35:57 -0000	1.3
+++ import.log	26 Jan 2006 12:38:09 -0000	1.4
@@ -1,2 +1,3 @@
 system-config-control-1_0-3:HEAD:system-config-control-1.0-3.src.rpm:1131968670
 system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947
+system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074



From fedora-extras-commits at redhat.com  Thu Jan 26 12:38:15 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Thu, 26 Jan 2006 07:38:15 -0500
Subject: rpms/system-config-control/FC-4 sources,1.3,1.4
Message-ID: <200601261238.k0QCcl4C027608@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27573/FC-4

Modified Files:
	sources 
Log Message:
auto-import system-config-control-1.0-4 on branch FC-4 from system-config-control-1.0-4.src.rpm
update into 1.0-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Jan 2006 06:56:12 -0000	1.3
+++ sources	26 Jan 2006 12:38:14 -0000	1.4
@@ -1 +1 @@
-6e27b90be45f8e2b24b4e382fbd263ed  system-config-control-1.0.tar.bz2
+2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 14:56:18 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 26 Jan 2006 09:56:18 -0500
Subject: rpms/js/devel js-1.5-va_copy.patch, NONE, 1.1 js.spec, 1.6,
	1.7 js-va_copy.patch, 1.1, NONE
Message-ID: <200601261456.k0QEuots031680@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31660

Modified Files:
	js.spec 
Added Files:
	js-1.5-va_copy.patch 
Removed Files:
	js-va_copy.patch 
Log Message:
Update to 1.5 final, add pkgconfig file (#178993).


js-1.5-va_copy.patch:

--- NEW FILE js-1.5-va_copy.patch ---
diff -Naupr js.orig/src/config/Linux_All.mk js/src/config/Linux_All.mk
--- js.orig/src/config/Linux_All.mk	2005-05-10 21:53:44.000000000 +0200
+++ js/src/config/Linux_All.mk	2006-01-26 11:38:12.000000000 +0100
@@ -91,8 +91,12 @@ endif
 JS_EDITLINE = 1
 
 ifeq ($(CPU_ARCH),x86_64)
-# Use VA_COPY() standard macro on x86-64
-# FIXME: better use it everywhere
+# Use va_copy() standard macro on x86-64
+OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
+endif
+
+ifeq ($(CPU_ARCH),ppc)
+# Use va_copy() standard macro on ppc too
 OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy
 endif
 
diff -Naupr js.orig/src/jsprf.c js/src/jsprf.c
--- js.orig/src/jsprf.c	2004-09-24 05:31:15.000000000 +0200
+++ js/src/jsprf.c	2006-01-26 11:34:52.000000000 +0100
@@ -55,7 +55,7 @@
 ** and requires array notation.
 */
 #ifdef HAVE_VA_COPY
-#define VARARGS_ASSIGN(foo, bar)        VA_COPY(foo,bar)
+#define VARARGS_ASSIGN(foo, bar)        va_copy(foo,bar)
 #elif defined(HAVE_VA_LIST_AS_ARRAY)
 #define VARARGS_ASSIGN(foo, bar)        foo[0] = bar[0]
 #else


Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- js.spec	19 Apr 2005 20:19:07 -0000	1.6
+++ js.spec	26 Jan 2006 14:56:17 -0000	1.7
@@ -1,11 +1,9 @@
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 
-%define real_version 1.5-rc6a
-
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 0.rc6a.6
+Release: 1
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -13,15 +11,14 @@
 %endif
 Group: Development/Languages
 URL: http://www.mozilla.org/js/
-Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{real_version}.tar.gz
+Source: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz
 Patch0: js-make.patch
 Patch1: js-shlib.patch
-Patch2: js-perlconnect.patch
-Patch3: js-va_copy.patch
-Patch4: js-ldflags.patch
+Patch2: js-1.5-va_copy.patch
+Patch3: js-ldflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: perl >= 1:5.6.1 readline-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires: perl >= 1:5.6.1, readline-devel
 Provides: libjs = %{version}-%{release}
 
 %description
@@ -29,10 +26,11 @@
 This package has been created for purposes of Sablotron and is suitable
 for embedding in applications.
 
+
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}, pkgconfig
 Provides: libjs-devel = %{version}-%{release}
 
 %description devel
@@ -40,73 +38,106 @@
 documentation for %{name}. If you like to develop programs using %{name},
 you will need to install %{name}-devel.
 
+
 %prep
 %setup -q -n %{name}
 %patch0 -b .make
 %patch1 -b .shlib
-%patch2 -b .perl
-%patch3 -p 1 -b .vacopy
-%patch4 -b .ldflags
-cp src/perlconnect/README.html src/README.perlconnect.html
+%patch2 -p1 -b .vacopy
+%patch3 -b .ldflags
+%{__cp} src/perlconnect/README.html src/README.perlconnect.html
+
+# Create pkgconfig file
+%{__cat} > libjs.pc << EOF
+prefix=%{_prefix}
+exec_prefix=${_prefix}
+libdir=${_libdir}
+includedir=${_includedir}
+
+Name: libjs
+Description: JS library
+Requires:
+Version: %{version}
+Libs: -L${libdir} -ljs
+Cflags: -I${includedir}
+EOF
+
 
 %build
 export BUILD_OPT=1
 %{__make} -C src -f Makefile.ref \
-	XCFLAGS="%{optflags} -fPIC" \
-	BUILD_OPT="1" \
+    XCFLAGS="%{optflags} -fPIC" \
+    BUILD_OPT="1" \
 %if 0%{!?_without_readline:1}
-	JS_READLINE="1" \
+    JS_READLINE="1" \
 %endif
-	JS_PERLCONNECT="1"
+    JS_PERLCONNECT="1"
 cd src/perlconnect
-MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
-%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
+    MAKEFLAGS=-s %{__perl} Makefile.PL INSTALLDIRS=vendor
+    %{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"
 cd -
 
+
 %install
 %{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_bindir} \
-			%{buildroot}%{_libdir} \
-			%{buildroot}%{_includedir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/js %{buildroot}%{_bindir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/jscpucfg %{buildroot}%{_bindir}
-%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.so %{buildroot}%{_libdir}/libjs.so.1
+%{__mkdir_p} %{buildroot}%{_bindir} \
+             %{buildroot}%{_libdir}/pkgconfig \
+             %{buildroot}%{_includedir}
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/{js,jscpucfg} \
+    %{buildroot}%{_bindir}/
+%{__install} -m 0755 src/Linux_All_OPT.OBJ/libjs.{a,so} \
+    %{buildroot}%{_libdir}/
+%{__mv} %{buildroot}%{_libdir}/libjs.so %{buildroot}%{_libdir}/libjs.so.1
 %{__ln_s} -nf libjs.so.1 %{buildroot}%{_libdir}/libjs.so
-%{__install} -m0755 src/Linux_All_OPT.OBJ/libjs.a %{buildroot}%{_libdir}
-%{__install} -m0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
-  %{buildroot}%{_includedir}
+%{__install} -m 0644 src/js*.h src/Linux_All_OPT.OBJ/jsautocfg.h \
+  %{buildroot}%{_includedir}/
+%{__install} -m 0644 libjs.pc \
+    %{buildroot}%{_libdir}/pkgconfig/
 %{__make} -C src/perlconnect pure_install PERL_INSTALL_ROOT=%{buildroot}
 find %{buildroot} -type f -name .packlist -o -name jsperlbuild.pl | xargs -r rm
 find %{buildroot} -type f -name '*.bs' -a -size 0 | xargs -r rm
-chmod -R u+w %{buildroot}/*
+
+
+%clean
+%{__rm} -rf %{buildroot}
+
 
 %check || :
 ln -s libjs.so src/Linux_All_OPT.OBJ/libjs.so.1
 LD_LIBRARY_PATH=`pwd`/src/Linux_All_OPT.OBJ %{__make} -C src/perlconnect test
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
+%doc src/README*.html src/perlconnect/bg.jpg
 %{_bindir}/js
 %{_libdir}/*.so.*
-%{perl_vendorarch}/auto/JS
+%{perl_vendorarch}/auto/JS/
 %{perl_vendorarch}/*.pm
 
 %files devel
 %defattr(-, root, root, 0755)
-%doc src/README*.html src/perlconnect/bg.jpg
 %{_bindir}/jscpucfg
+%{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 %{_libdir}/*.a
 %{_includedir}/js*.h
 
+
 %changelog
+* Thu Jan 26 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-1
+- Update to 1.5.0 final.
+- Spec file cleanups.
+- Move docs from devel to main, since we need the license there.
+- Remove no longer needed js-perlconnect.patch.
+- Update js-1.5-va_copy.patch.
+- Include a pkgconfig file (#178993).
+
 * Tue Apr 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 1.5-0.rc6a.6
 - Link shared lib with libperl.
 
@@ -130,3 +161,4 @@
 
 * Tue Mar 02 2004 Dag Wieers <dag at wieers.com> - 1.5-0.rc6
 - Initial package. (using DAR)
+


--- js-va_copy.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 14:59:14 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 26 Jan 2006 09:59:14 -0500
Subject: rpms/js/devel js.spec,1.7,1.8
Message-ID: <200601261459.k0QExkCc031738@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31697

Modified Files:
	js.spec 
Log Message:
Add dist to release in order to backport more easily to FC4.



Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- js.spec	26 Jan 2006 14:56:17 -0000	1.7
+++ js.spec	26 Jan 2006 14:59:14 -0000	1.8
@@ -3,7 +3,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 1
+Release: 1%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else



From fedora-extras-commits at redhat.com  Thu Jan 26 15:25:33 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 26 Jan 2006 10:25:33 -0500
Subject: rpms/libxml++/FC-3 libxml++.spec,1.5,1.6
Message-ID: <200601261526.k0QFQ60K001170@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1123/FC-3

Modified Files:
	libxml++.spec 
Log Message:
Rebuild to address rh #178592.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-3/libxml++.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libxml++.spec	24 Oct 2005 20:12:33 -0000	1.5
+++ libxml++.spec	26 Jan 2006 15:25:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           libxml++
 Version:        2.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.12.0-2
+- Rebuilt to address RH #178592
+
 * Thu Sep 08 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 2.12.0-1
 - Version 2.12.0
 - Use --disable-static for configure.



From fedora-extras-commits at redhat.com  Thu Jan 26 15:25:39 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 26 Jan 2006 10:25:39 -0500
Subject: rpms/libxml++/FC-4 libxml++.spec,1.11,1.12
Message-ID: <200601261526.k0QFQB4W001173@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1123/FC-4

Modified Files:
	libxml++.spec 
Log Message:
Rebuild to address rh #178592.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/FC-4/libxml++.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libxml++.spec	9 Sep 2005 04:21:52 -0000	1.11
+++ libxml++.spec	26 Jan 2006 15:25:39 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libxml++
 Version:        2.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -39,7 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.12.0-2
+- Rebuilt to address RH #178592
+
 * Thu Sep 08 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 2.12.0-1
 - Version 2.12.0
 - Use --disable-static for configure.



From fedora-extras-commits at redhat.com  Thu Jan 26 15:25:45 2006
From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon))
Date: Thu, 26 Jan 2006 10:25:45 -0500
Subject: rpms/libxml++/devel libxml++.spec,1.10,1.11
Message-ID: <200601261526.k0QFQHSD001176@cvs-int.fedora.redhat.com>

Author: icon

Update of /cvs/extras/rpms/libxml++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1123/devel

Modified Files:
	libxml++.spec 
Log Message:
Rebuild to address rh #178592.



Index: libxml++.spec
===================================================================
RCS file: /cvs/extras/rpms/libxml++/devel/libxml++.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libxml++.spec	9 Sep 2005 04:26:50 -0000	1.10
+++ libxml++.spec	26 Jan 2006 15:25:45 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libxml++
 Version:        2.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
 Group:          System Environment/Libraries
@@ -39,7 +39,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f {}
+find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
 # Modify temporary working directories for files section.
 rm -rf _reference _examples _manual
 mkdir -m 755 _reference _examples _manual
@@ -78,6 +78,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Konstantin Ryabitsev <icon at fedoraproject.org> - 2.12.0-2
+- Rebuilt to address RH #178592
+
 * Thu Sep 08 2005 Konstantin Ryabitsev <icon at linux.duke.edu> - 2.12.0-1
 - Version 2.12.0
 - Use --disable-static for configure.



From fedora-extras-commits at redhat.com  Thu Jan 26 15:42:51 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Thu, 26 Jan 2006 10:42:51 -0500
Subject: rpms/js/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200601261543.k0QFhNNQ001471@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1452

Modified Files:
	.cvsignore sources 
Log Message:
Commit new sources, oops.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/js/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:47:15 -0000	1.2
+++ .cvsignore	26 Jan 2006 15:42:51 -0000	1.3
@@ -1 +1 @@
-js-1.5-rc6a.tar.gz
+js-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/js/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:47:15 -0000	1.2
+++ sources	26 Jan 2006 15:42:51 -0000	1.3
@@ -1 +1 @@
-43e55003be28b4329b9005aedcc0f015  js-1.5-rc6a.tar.gz
+863bb6462f4ce535399a7c6276ae6776  js-1.5.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 17:00:50 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:00:50 -0500
Subject: rpms/ushare - New directory
Message-ID: <200601261700.k0QH0qOK003474@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466/ushare

Log Message:
Directory /cvs/extras/rpms/ushare added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 17:00:56 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:00:56 -0500
Subject: rpms/ushare/devel - New directory
Message-ID: <200601261700.k0QH0woX003490@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3466/ushare/devel

Log Message:
Directory /cvs/extras/rpms/ushare/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 17:01:42 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:01:42 -0500
Subject: rpms/ushare Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601261701.k0QH1ivG005220@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208

Added Files:
	Makefile import.log 
Log Message:
Setup of module ushare


--- NEW FILE Makefile ---
# Top level Makefile for module ushare
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 17:01:48 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:01:48 -0500
Subject: rpms/ushare/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601261701.k0QH1o0j005251@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5208/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ushare


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 17:03:57 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:03:57 -0500
Subject: rpms/ushare import.log,1.1,1.2
Message-ID: <200601261704.k0QH4T1W005357@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5319

Modified Files:
	import.log 
Log Message:
auto-import ushare-0.9.5-4 on branch devel from ushare-0.9.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ushare/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 17:01:42 -0000	1.1
+++ import.log	26 Jan 2006 17:03:57 -0000	1.2
@@ -0,0 +1 @@
+ushare-0_9_5-4:HEAD:ushare-0.9.5-4.src.rpm:1138295015



From fedora-extras-commits at redhat.com  Thu Jan 26 17:04:04 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:04:04 -0500
Subject: rpms/ushare/devel ushare-0.9.5-buffer.diff, NONE, 1.1 ushare.init, 
	NONE, 1.1 ushare.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601261704.k0QH4aOP005361@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5319/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ushare-0.9.5-buffer.diff ushare.init ushare.spec 
Log Message:
auto-import ushare-0.9.5-4 on branch devel from ushare-0.9.5-4.src.rpm

ushare-0.9.5-buffer.diff:

--- NEW FILE ushare-0.9.5-buffer.diff ---
--- ushare-0.9.5/src/buffer.c   2005-11-26 15:03:55.000000000 -0500
+++ ushare-0.9.5.p/src/buffer.c   2005-12-21 21:38:38.000000000 -0500
@@ -62,7 +62,7 @@
   len = buffer->len + strlen (str);
   if (len >= buffer->capacity)
   {
-    buffer->capacity = MIN (len, 2 * buffer->capacity);
+    buffer->capacity = MAX (len+1, 2 * buffer->capacity);
     buffer->buf = realloc (buffer->buf, buffer->capacity);
   }
 
@@ -74,14 +74,23 @@
 buffer_appendf (struct buffer_t *buffer, const char *format, ...)
 {
   char str[BUFFER_DEFAULT_CAPACITY];
+  int size;
   va_list va;
 
   if (!buffer || !format)
     return;
 
   va_start (va, format);
-  vsprintf (str, format, va);
-  buffer_append (buffer, str);
+  if ((size = vsnprintf (str, BUFFER_DEFAULT_CAPACITY, format, va))
+      >= BUFFER_DEFAULT_CAPACITY)
+  {
+    char* dynstr = (char*) malloc (size+1);
+    vsnprintf (dynstr,size+1,format,va);
+    buffer_append (buffer, dynstr);
+    free (dynstr);
+  }
+  else
+    buffer_append (buffer, str);
   va_end (va);
 } 


--- NEW FILE ushare.init ---
#!/bin/sh
#
# ushare		This shell script takes care of starting and stopping ushare.
#
# chkconfig: - 75 25
# description:	uShare UPnP A/V Media Server.
#

# Source function library.
. /etc/rc.d/init.d/functions

# Source networking configuration.
. /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

OPTIONS=""
prog=ushare
DESC="UPnP A/V Media Server"

[ -r "/etc/ushare.conf" ] && . /etc/ushare.conf
# abort if no shared directory is defined
[ -z "$USHARE_DIR" ] && exit 0


start() {
	echo -n $"Starting $prog: "
	daemon --user ushare $prog -D
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
}

stop() {
	echo -n $"Stopping $prog: "
	killproc $prog
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog /var/run/ircd.pid
}

reload() {
	echo -n $"Reloading $prog: "
	killproc $prog -HUP
	RETVAL=$?
	echo
}

# See how we were called.
case "$1" in
  start)
	start
	;;
  stop)
	stop
	;;
  status)
	status $prog
	RETVAL=$?
	;;
  restart)
	stop
	start
	;;
  condrestart)
	if [ -f /var/lock/subsys/$prog ]; then
	  stop
	  start
	fi
	;;
  reload)
	reload
	;;
  *)
	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status"
	exit 1
esac

exit $RETVAL


--- NEW FILE ushare.spec ---
Summary: UPnP (TM) A/V Media Server
Name: ushare
Version: 0.9.5
Release: 4%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://ushare.geexbox.org/

Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2
Source1:ushare.init
Patch0:	ushare-0.9.5-buffer.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: libupnp-devel
Requires(pre): fedora-usermgmt
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service, /sbin/chkconfig
Requires(postun): /sbin/service

%description
uShare is a UPnP (TM) A/V Media Server. It implements the server 
component that provides UPnP media devices with information on 
available multimedia files. uShare uses the built-in http server 
of libupnp to stream the files to clients.

%prep
%setup -q
%patch0 -p1

%build
%configure
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%makeinstall
%{__rm} -rf   %{buildroot}%{_sysconfdir}/init.d
%{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ushare
%{__mkdir_p} %{buildroot}%{_var}/lib/ushare
%find_lang %{name}

%clean
rm -rf %{buildroot}

%pre
%{_sbindir}/fedora-useradd 21 -s /sbin/nologin -M -r -d %{_var}/lib/ushare \
    -c "ushare service account" ushare &>/dev/null || :

%post
/sbin/chkconfig --add ushare

%preun
if [ $1 -eq 0 ]; then
    /sbin/service ushare stop &>/dev/null || :
    /sbin/chkconfig --del ushare
fi

%postun
if [ $1 -ge 1 ]; then
    /sbin/service ushare condrestart &>/dev/null || :
fi

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{_bindir}/ushare
%config(noreplace) %{_sysconfdir}/ushare.conf
%{_initrddir}/ushare
%{_mandir}/man1/*
%attr(770,ushare,ushare) %dir %{_var}/lib/ushare/

%changelog
* Tue Dec 27 2005 Eric Tanguy 0.9.5-4
- Use %find_lang macro instead of %{_datadir}/locale/*

* Tue Dec 27 2005 Eric Tanguy 0.9.5-3
- Drop "Requires: libupnp"
- replace %{_sysconfdir}/ushare.conf by %config(noreplace) %{_sysconfdir}/ushare.conf

* Tue Dec 27 2005 Eric Tanguy 0.9.5-2
- add patch for buffer

* Tue Dec 27 2005 Eric Tanguy 0.9.5-1
- First build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 17:01:48 -0000	1.1
+++ .cvsignore	26 Jan 2006 17:04:03 -0000	1.2
@@ -0,0 +1 @@
+ushare-0.9.5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 17:01:48 -0000	1.1
+++ sources	26 Jan 2006 17:04:03 -0000	1.2
@@ -0,0 +1 @@
+2f5371f84a17548988bdd4f0fbe781ff  ushare-0.9.5.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 17:08:41 2006
From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy))
Date: Thu, 26 Jan 2006 12:08:41 -0500
Subject: owners owners.list,1.565,1.566
Message-ID: <200601261709.k0QH9DLs005419@cvs-int.fedora.redhat.com>

Author: tanguy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5400

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.565
retrieving revision 1.566
diff -u -r1.565 -r1.566
--- owners.list	25 Jan 2006 13:58:54 -0000	1.565
+++ owners.list	26 Jan 2006 17:08:41 -0000	1.566
@@ -569,6 +569,7 @@
 Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libtunepimp|A library for creating MusicBrainz enabled tagging applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libuninameslist|Library that provides Unicode names and annotations|otaylor at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|libupnp|Universal Plug and Play (UPnP) SDK|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual|An abstraction library for audio visualisation plugins|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libvisual-plugins|Plugins for use with libvisual|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxfce4mcs|Multi-channel settings management support for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1272,6 +1273,7 @@
 Fedora Extras|upx|The Ultimate Packer for eXecutables|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ushare|UPnP (TM) A/V Media Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|util-vserver|Linux virtual server utilities|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|wtogami at redhat.com
 Fedora Extras|utrac|Universal Text Recognizer and Converter|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|uudeview|Applications for uuencoding, uudecoding, ..|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 26 17:59:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 12:59:32 -0500
Subject: rpms/gsview/devel gsview.spec,1.14,1.15
Message-ID: <200601261800.k0QI04QQ005629@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gsview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5603

Modified Files:
	gsview.spec 
Log Message:
* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-5
- %post/%postun: update-desktop-database 



Index: gsview.spec
===================================================================
RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gsview.spec	5 Aug 2005 19:31:56 -0000	1.14
+++ gsview.spec	26 Jan 2006 17:59:32 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: PostScript and PDF previewer
 Name: 	 gsview
 Version: 4.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: Aladdin Free Public License, Ghostgum Software Pty Ltd
 Group: 	 Applications/Publishing
@@ -100,6 +100,13 @@
 rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*}
 
 
+%post
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
 %files
 %defattr(-, root, root)
 %{_bindir}/*
@@ -116,6 +123,9 @@
 
 
 %changelog
+* Fri Oct 21 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-5
+- %%post/%%postun: update-desktop-database 
+
 * Fri Aug  5 2005 Rex Dieter <rexdieter[AT]users.sf.net> 4.7-4
 - ExcludeArch: ppc (sed busted?)
 



From fedora-extras-commits at redhat.com  Thu Jan 26 18:01:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:01:08 -0500
Subject: rpms/lyx/devel lyx-1.4.0-helpers.patch, NONE, 1.1 lyx.spec, 1.16,
	1.17 lyx-1.3.7-helpers.patch, 1.1, NONE lyx-1.3.7-noxfonts.patch,
	1.1, NONE
Message-ID: <200601261801.k0QI1xdO007403@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7370

Modified Files:
	lyx.spec 
Added Files:
	lyx-1.4.0-helpers.patch 
Removed Files:
	lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch 
Log Message:
* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
- 1.4.0pre3


lyx-1.4.0-helpers.patch:

--- NEW FILE lyx-1.4.0-helpers.patch ---
--- lyx-1.4.0pre3/lib/configure.helpers	2005-12-24 03:57:10.000000000 -0600
+++ lyx-1.4.0pre3/lib/configure	2006-01-23 07:29:27.000000000 -0600
@@ -811,7 +811,7 @@
 echo $ac_n "checking for a Postscript previewer""... $ac_c"
 echo "$ac_t"""
 PS_VIEWER=
-for ac_prog in gsview32 gv "ghostview -swap" kghostview
+for ac_prog in evince gsview32 gsview kghostview ggv gv "ghostview -swap" 
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -849,7 +849,7 @@
 echo $ac_n "checking for a PDF previewer""... $ac_c"
 echo "$ac_t"""
 PDF_VIEWER=
-for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview
+for ac_prog in acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview 
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog ; ac_word=$2
@@ -923,7 +923,7 @@
 echo $ac_n "checking for a HTML previewer""... $ac_c"
 echo "$ac_t"""
 HTML_VIEWER=
-for ac_prog in "mozilla file://\$\$p\$\$i" netscape
+for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" 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
--- lyx-1.4.0pre3/lib/configure.m4.helpers	2005-09-08 04:20:12.000000000 -0500
+++ lyx-1.4.0pre3/lib/configure.m4	2006-01-23 07:27:26.000000000 -0600
@@ -286,17 +286,17 @@
 SEARCH_PROG([for a LaTeX -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i")
 
 # Search something to preview postscript
-SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview)
+SEARCH_PROG([for a Postscript previewer],PS_VIEWER,evince gsview32 gsview kghostview ggv gv "ghostview -swap")
 EPS_VIEWER=$PS_VIEWER
 
 # Search for a program to preview pdf
-SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview)
+SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview)
 
 # Search something to preview dvi
-SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi)
+SEARCH_PROG([for a DVI previewer],DVI_VIEWER, kdvi xdvi windvi yap)
 
 # Search something to preview html
-SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape)
+SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i " "mozilla file://\$\$p\$\$i" netscape)
 
 # Search for a program to convert ps to pdf
 SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- lyx.spec	20 Jan 2006 16:08:32 -0000	1.16
+++ lyx.spec	26 Jan 2006 18:01:08 -0000	1.17
@@ -1,17 +1,18 @@
 
+%define beta pre3
+
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.3.7 
-Release: 2%{?dist}
+Version: 1.4.0
+Release: 0.1.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:	 ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2
+Source:  ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-1.4.0pre3.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: lyx-1.3.7-helpers.patch
-Patch2: lyx-1.3.7-noxfonts.patch
+Patch1: lyx-1.4.0-helpers.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -32,13 +33,15 @@
 # xforms frontend
 BuildRequires: xforms-devel
 BuildRequires: libjpeg-devel
-%if "{?fedora}" > "4"
+%if "%{?fedora}" > "4"
 BuildRequires: libXpm-devel
 %endif
 
 BuildRequires: desktop-file-utils
+BuildRequires: python
 BuildRequires: aiksaurus-devel
 BuildRequires: aspell-devel
+BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
 
@@ -91,60 +94,50 @@
 
 %prep
 
-%setup -q
+%setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
-%patch2 -p1 -b .noxfonts
 
 # ./autogen.sh
 
 
 %build
 
-unset LINGUAS ||:
-
 # QT
-test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh
+unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include
-%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" }
+
+for frontend in qt xforms ; do
+
 %configure \
-  --with-frontend=qt \
+  --disable-rpath \
+  --enable-compression-support \
+  --with-frontend=$frontend \
   --enable-optimization="$RPM_OPT_FLAGS" \
   --with-aiksaurus \
-  --with-pspell \
+  --with-aspell \
   --without-warnings --disable-debug --disable-dependency-tracking
 
-make %{?_smp_mflags} && \
- cp -a src/lyx lyx-qt
+#--with-included-boost
 
-# Intermediate cleanup 
+# Intermediate cleanup
 # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
 make -C src/frontends clean
 
-# XFORMS
-%configure \
-  --with-frontend=xforms \
-  --enable-optimization="$RPM_OPT_FLAGS" \
-  --with-aiksaurus \
-  --with-pspell \
-  --without-warnings --disable-debug --disable-dependency-tracking
+make %{?_smp_mflags}
 
-make %{?_smp_mflags} && \
-cp -a src/lyx lyx-xforms
+done
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-unset LINGUAS ||:
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 ## Handle front-ends
 install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx
-install -p -m0755 -D lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
-install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
-
+install -p -m0755 -D src/lyx-qt     $RPM_BUILD_ROOT%{_bindir}/lyx-qt
+install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms
 
 # Set up the lyx-specific class files where TeX can see them
 texmf=%{_datadir}/texmf
@@ -154,7 +147,7 @@
 
 # KDE already has a nice builtin crystalsvg icon, 
 # but this is for gnome's benefit (gtk2 < 2.6)
-install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
+#install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -168,12 +161,12 @@
 
 
 %post
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-texhash >& /dev/null ||:
-cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
+texhash > /dev/null 2>&1 ||:
+cd %{_datadir}/lyx && ./configure 
 
 %postun
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 texhash >& /dev/null ||:
 
 # Catch installed/uninstalled helpers
@@ -196,11 +189,11 @@
 %defattr(-,root,root,-)
 %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README
 %{_bindir}/lyx
-%{_bindir}/noweb2lyx
-%{_bindir}/reLyX
+%{_bindir}/lyxclient
+%{_bindir}/tex2lyx
 #{_datadir}/applications/*-lyx.desktop
-%{_datadir}/pixmaps/*
-%{_mandir}/man?/*
+#{_datadir}/pixmaps/*
+%{_mandir}/man1/*
 %{_datadir}/lyx/
 %{_datadir}/texmf/tex/latex/lyx/
 %verify(not md5 size mtime) %{_datadir}/lyx/*.lst
@@ -219,6 +212,12 @@
 
 
 %changelog
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
+- 1.4.0pre3
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-4
+- cleanup/fix snarfing of intermediate frontend builds.
+
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3.7-2
 - BR: libXpm-devel
 


--- lyx-1.3.7-helpers.patch DELETED ---


--- lyx-1.3.7-noxfonts.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 18:06:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:06:33 -0500
Subject: rpms/lyx/devel .cvsignore,1.4,1.5 sources,1.5,1.6
Message-ID: <200601261807.k0QI7SmN007467@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7448

Modified Files:
	.cvsignore sources 
Log Message:
new-sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Jan 2006 15:37:52 -0000	1.4
+++ .cvsignore	26 Jan 2006 18:06:33 -0000	1.5
@@ -1 +1 @@
-lyx-1.3.7.tar.bz2
+lyx-1.4.0pre3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Jan 2006 15:37:52 -0000	1.5
+++ sources	26 Jan 2006 18:06:33 -0000	1.6
@@ -1 +1 @@
-cef9a2fca128c32ffa04c214d02cde04  lyx-1.3.7.tar.bz2
+d1e83cf590c2682b37cea2729608ac77  lyx-1.4.0pre3.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 18:22:09 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:22:09 -0500
Subject: rpms/kdocker/devel kdocker.spec,1.3,1.4
Message-ID: <200601261822.k0QIMgCh007715@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7692

Modified Files:
	kdocker.spec 
Log Message:
mod-X fix(es)



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdocker.spec	22 Jan 2006 02:45:07 -0000	1.3
+++ kdocker.spec	26 Jan 2006 18:22:09 -0000	1.4
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 4%{?dist}
+Release: 4%{?dist}.1
 
 Group:   User Interface/Desktops
 License: GPL
@@ -14,6 +14,10 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
+%if "%{?fedora}" > "4"
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+%endif
 
 %description
 KDocker will help you dock any application in the system tray. This means you



From fedora-extras-commits at redhat.com  Thu Jan 26 18:23:10 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Thu, 26 Jan 2006 13:23:10 -0500
Subject: rpms/yumex/devel .cvsignore, 1.10, 1.11 sources, 1.13,
	1.14 yumex.spec, 1.14, 1.15
Message-ID: <200601261823.k0QINgn8007786@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7760

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.99.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	25 Jan 2006 14:48:15 -0000	1.10
+++ .cvsignore	26 Jan 2006 18:23:10 -0000	1.11
@@ -1 +1 @@
-yumex-0.99.2.tar.gz
+yumex-0.99.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	25 Jan 2006 14:48:15 -0000	1.13
+++ sources	26 Jan 2006 18:23:10 -0000	1.14
@@ -1 +1 @@
-c1515a14e7e23d3cd77adb299cd3f820  yumex-0.99.2.tar.gz
+9ed0c02ee3b77528f201a22254348c75  yumex-0.99.3.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- yumex.spec	25 Jan 2006 14:48:15 -0000	1.14
+++ yumex.spec	26 Jan 2006 18:23:10 -0000	1.15
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.2
+Version:  0.99.3
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Wed Jan 26 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.3-1.0
+- Development Release 0.99.3-1.0
 * Wed Jan 25 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.2-1.0
 - Development Release 0.99.2-1.0
 * Tue Jan 24 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.1-1.0



From fedora-extras-commits at redhat.com  Thu Jan 26 18:36:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 13:36:00 -0500
Subject: rpms/apollon/devel apollon.spec,1.1,1.2
Message-ID: <200601261836.k0QIaWWG007880@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7863

Modified Files:
	apollon.spec 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-4
- drop libacl hack



Index: apollon.spec
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/apollon.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apollon.spec	20 Dec 2005 15:14:06 -0000	1.1
+++ apollon.spec	26 Jan 2006 18:36:00 -0000	1.2
@@ -2,7 +2,7 @@
 Summary: Filesharing client
 Name:	 apollon
 Version: 1.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPL
 Group: 	 Applications/Internet
@@ -20,8 +20,6 @@
 
 BuildRequires: qt-devel >= 1:3.3
 BuildRequires: kdelibs-devel >= 6:3.3
-# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602
-BuildRequires: libacl-devel
 
 %description
 A filesharing client which uses giFT.
@@ -112,6 +110,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-4
+- drop libacl hack
+
 * Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-3
 - BR: libacl-devel (workaround kdelibs bug #170602)
 



From fedora-extras-commits at redhat.com  Thu Jan 26 19:39:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:39:34 -0500
Subject: rpms/libksba/devel libksba.spec,1.15,1.16
Message-ID: <200601261940.k0QJe6X1009883@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libksba/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9862

Modified Files:
	libksba.spec 
Log Message:
* Wed Nov 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.13-2
- remove hacks
- drop self Obsoletes



Index: libksba.spec
===================================================================
RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libksba.spec	30 Nov 2005 16:47:45 -0000	1.15
+++ libksba.spec	26 Jan 2006 19:39:33 -0000	1.16
@@ -1,9 +1,7 @@
 Summary: X.509 library
 Name:    libksba
 Version: 0.9.13
-Release: 1%{?dist}.1
-#Version: 0.9.11
-#Release: 3%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:   System Environment/Libraries
 URL:     http://www.gnupg.org/
@@ -11,22 +9,8 @@
 Source1: ftp://ftp.gnupg.org/gcrypt/alpha/libksba/libksba-%{version}.tar.bz2.sig
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Try to help x86_64 gnupg2/gpgsm crashes/issues
-Patch1: libksba-0.9.13-gl.patch
-
 BuildRequires: libgpg-error >= 0.7
 BuildRequires: libgcrypt-devel >= 1.2.0
-BuildRequires: automake
-BuildRequires: bison
-
-# Version 0.9.12-1 had issues (see gnupg2 pkg, 'make check' 
-# failures on x86_64), drop when resolved
-%if "%{version}" == "0.9.12"
-ExcludeArch: x86_64
-%endif
-%if "%{version}" == "0.9.11"
-Obsoletes: libksba = 0.9.12-1%{?dist}
-%endif
 
 %description
 KSBA is a library designed to build software based on the X.509 and
@@ -38,9 +22,6 @@
 Requires: %{name} = %{version}-%{release}
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-%if "%{version}" == "0.9.11"
-Obsoletes: libksba-devel = 0.9.12-1%{?dist}
-%endif
 %description devel
 %{summary}.
 
@@ -48,10 +29,6 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .gl
-
-./autogen.sh
-
 
 %build
 %configure \
@@ -61,7 +38,7 @@
 make %{?_smp_mflags}
 
 
-%check || :
+%check ||:
 make check
 
 
@@ -106,6 +83,10 @@
 
 
 %changelog
+* Wed Nov 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.13-2
+- remove hacks
+- drop self Obsoletes
+
 * Wed Nov 30 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.13-1
 - 0.9.13
 



From fedora-extras-commits at redhat.com  Thu Jan 26 19:47:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:47:49 -0500
Subject: rpms/sbcl/devel sbcl-0.9.9-permissive.patch, NONE, 1.1 sbcl.spec,
	1.32, 1.33 sbcl-0.9.6-permissive.patch, 1.1, NONE
Message-ID: <200601261948.k0QJmL5t009991@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9971

Modified Files:
	sbcl.spec 
Added Files:
	sbcl-0.9.9-permissive.patch 
Removed Files:
	sbcl-0.9.6-permissive.patch 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
- 0.9.9


sbcl-0.9.9-permissive.patch:

--- NEW FILE sbcl-0.9.9-permissive.patch ---
--- sbcl-0.9.9/make-target-contrib.sh.permissive	2006-01-24 11:14:48.000000000 -0600
+++ sbcl-0.9.9/make-target-contrib.sh	2006-01-26 13:45:41.000000000 -0600
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed
+    # test -f $i/test-passed && rm $i/test-passed
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sbcl.spec	31 Dec 2005 21:03:00 -0000	1.32
+++ sbcl.spec	26 Jan 2006 19:47:49 -0000	1.33
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -66,7 +66,7 @@
 Patch5: sbcl-0.9.5-make-config-fix.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
-Patch7: sbcl-0.9.6-permissive.patch
+Patch7: sbcl-0.9.9-permissive.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
+- 0.9.9
+
 * Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
 - 0.9.8
 


--- sbcl-0.9.6-permissive.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 19:50:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:50:32 -0500
Subject: rpms/sbcl/devel .cvsignore,1.8,1.9 sources,1.8,1.9
Message-ID: <200601261951.k0QJp5rJ010028@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009

Modified Files:
	.cvsignore sources 
Log Message:
update sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Dec 2005 21:03:00 -0000	1.8
+++ .cvsignore	26 Jan 2006 19:50:32 -0000	1.9
@@ -1,4 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.8-source.tar.bz2
 sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 sbcl-0.9.8-x86-linux-binary.tar.bz2
+sbcl-0.9.9-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2005 21:03:00 -0000	1.8
+++ sources	26 Jan 2006 19:50:32 -0000	1.9
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
 294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2
+4aafb2ce07bd7933f7edec29b404a595  sbcl-0.9.9-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 19:52:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:52:39 -0500
Subject: rpms/sbcl/devel sbcl.spec,1.33,1.34
Message-ID: <200601261953.k0QJrBT7010067@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10046

Modified Files:
	sbcl.spec 
Log Message:
update binary bootstraps, omitted from src.rpm by default



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sbcl.spec	26 Jan 2006 19:47:49 -0000	1.33
+++ sbcl.spec	26 Jan 2006 19:52:39 -0000	1.34
@@ -27,7 +27,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -35,7 +35,7 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -45,7 +45,7 @@
 ## ppc section
 # Latest powerpc-linux bootstrap, busted:
 # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 # another possible ppc bootstrap to try
 #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h



From fedora-extras-commits at redhat.com  Thu Jan 26 19:55:04 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:55:04 -0500
Subject: rpms/sbcl/FC-4 sbcl-0.9.9-permissive.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 sbcl.spec, 1.31, 1.32 sources, 1.7,
	1.8 sbcl-0.9.6-permissive.patch, 1.1, NONE
Message-ID: <200601261955.k0QJta5F010161@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10134

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-0.9.9-permissive.patch 
Removed Files:
	sbcl-0.9.6-permissive.patch 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
- 0.9.9


sbcl-0.9.9-permissive.patch:

--- NEW FILE sbcl-0.9.9-permissive.patch ---
--- sbcl-0.9.9/make-target-contrib.sh.permissive	2006-01-24 11:14:48.000000000 -0600
+++ sbcl-0.9.9/make-target-contrib.sh	2006-01-26 13:45:41.000000000 -0600
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed
+    # test -f $i/test-passed && rm $i/test-passed
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 10:42:48 -0000	1.7
+++ .cvsignore	26 Jan 2006 19:55:03 -0000	1.8
@@ -1,4 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.8-source.tar.bz2
 sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 sbcl-0.9.8-x86-linux-binary.tar.bz2
+sbcl-0.9.9-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sbcl.spec	1 Jan 2006 10:42:48 -0000	1.31
+++ sbcl.spec	26 Jan 2006 19:55:03 -0000	1.32
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -27,7 +27,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -35,7 +35,7 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -45,7 +45,7 @@
 ## ppc section
 # Latest powerpc-linux bootstrap, busted:
 # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 # another possible ppc bootstrap to try
 #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
@@ -66,7 +66,7 @@
 Patch5: sbcl-0.9.5-make-config-fix.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
-Patch7: sbcl-0.9.6-permissive.patch
+Patch7: sbcl-0.9.9-permissive.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
+- 0.9.9
+
 * Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
 - 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 10:42:48 -0000	1.7
+++ sources	26 Jan 2006 19:55:03 -0000	1.8
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
 294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2
+4aafb2ce07bd7933f7edec29b404a595  sbcl-0.9.9-source.tar.bz2


--- sbcl-0.9.6-permissive.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 19:56:23 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:56:23 -0500
Subject: rpms/sbcl/FC-3 sbcl-0.9.9-permissive.patch, NONE, 1.1 .cvsignore,
	1.7, 1.8 sbcl.spec, 1.27, 1.28 sources, 1.7, 1.8
Message-ID: <200601261956.k0QJutXa010197@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10172

Modified Files:
	.cvsignore sbcl.spec sources 
Added Files:
	sbcl-0.9.9-permissive.patch 
Log Message:
* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
- 0.9.9


sbcl-0.9.9-permissive.patch:

--- NEW FILE sbcl-0.9.9-permissive.patch ---
--- sbcl-0.9.9/make-target-contrib.sh.permissive	2006-01-24 11:14:48.000000000 -0600
+++ sbcl-0.9.9/make-target-contrib.sh	2006-01-26 13:45:41.000000000 -0600
@@ -51,7 +51,7 @@
 for i in contrib/*; do
     test -d $i && test -f $i/Makefile || continue;
     # export INSTALL_DIR=$SBCL_HOME/`basename $i `
-    test -f $i/test-passed && rm $i/test-passed
+    # test -f $i/test-passed && rm $i/test-passed
     $GNUMAKE -C $i test && touch $i/test-passed
 done
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Jan 2006 10:42:22 -0000	1.7
+++ .cvsignore	26 Jan 2006 19:56:22 -0000	1.8
@@ -1,4 +1,4 @@
 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-sbcl-0.9.8-source.tar.bz2
 sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 sbcl-0.9.8-x86-linux-binary.tar.bz2
+sbcl-0.9.9-source.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sbcl.spec	1 Jan 2006 10:42:22 -0000	1.27
+++ sbcl.spec	26 Jan 2006 19:56:22 -0000	1.28
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.8
+Version: 0.9.9
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -27,7 +27,7 @@
 Source2: customize-target-features.lisp 
 
 ## x86 section
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.5-x86-linux-binary.tar.bz2
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -35,7 +35,7 @@
 %endif
 
 ## x86_64 section
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -45,7 +45,7 @@
 ## ppc section
 # Latest powerpc-linux bootstrap, busted:
 # buildsys.fedoraproject.org/logs/development/1131-sbcl-0.9.4-14.fc5/ppc/build.log
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
 # another possible ppc bootstrap to try
 #Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
@@ -66,7 +66,7 @@
 Patch5: sbcl-0.9.5-make-config-fix.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
-Patch7: sbcl-0.9.6-permissive.patch
+Patch7: sbcl-0.9.9-permissive.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -226,6 +226,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.9-1
+- 0.9.9
+
 * Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-1
 - 0.9.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	1 Jan 2006 10:42:22 -0000	1.7
+++ sources	26 Jan 2006 19:56:22 -0000	1.8
@@ -1,4 +1,4 @@
 3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-4a8a3de71aff073b4e23e5bc2e432b27  sbcl-0.9.8-source.tar.bz2
 294b9133aa3d0195a0ad8d562bf9c7d5  sbcl-0.9.8-x86-64-linux-binary.tar.bz2
 900ae4d2353fd9371d6ebaef40180038  sbcl-0.9.8-x86-linux-binary.tar.bz2
+4aafb2ce07bd7933f7edec29b404a595  sbcl-0.9.9-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 19:59:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 14:59:55 -0500
Subject: rpms/gnupg2/FC-4 .cvsignore, 1.6, 1.7 gnupg2.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <200601262000.k0QK0RXO010299@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10259

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
- 1.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Oct 2005 16:20:45 -0000	1.6
+++ .cvsignore	26 Jan 2006 19:59:54 -0000	1.7
@@ -1,2 +1,2 @@
-gnupg-1.9.19.tar.bz2
-gnupg-1.9.19.tar.bz2.sig
+gnupg-1.9.20.tar.bz2
+gnupg-1.9.20.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/gnupg2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnupg2.spec	5 Dec 2005 14:44:40 -0000	1.15
+++ gnupg2.spec	26 Jan 2006 19:59:54 -0000	1.16
@@ -4,10 +4,11 @@
 # it can use other implementations too (including non-pcsc ones).
 %define pcsc_lib libpcsclite.so.0
 
-Summary: GNU utility for secure communication and data storage
+Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.19
-Release: 8%{?dist}
+Version: 1.9.20
+Release: 1%{?dist}
+
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -36,7 +37,7 @@
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
 #BuildRequires: libksba-devel = 0.9.11
 #else
-BuildRequires: libksba-devel >= 0.9.12
+BuildRequires: libksba-devel >= 0.9.13
 #endif
 
 BuildRequires: gettext
@@ -74,9 +75,9 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-%ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
-%endif
+#ifarch x86_64
+#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+#endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -84,9 +85,9 @@
 %build
 
 %configure \
-  --disable-dependency-tracking \
   --disable-rpath \
-  --enable-gpg
+  --disable-dependency-tracking \
+  --enable-gpg 
 
 make %{?_smp_mflags}
 
@@ -95,7 +96,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-#make check ||:
+make check ||:
 
 
 %install
@@ -104,6 +105,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # enable auto-startup/shutdown of gpg-agent 
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
 install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
 install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
@@ -124,7 +126,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
@@ -134,6 +136,7 @@
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
+%{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
+- 1.9.20
+
 * Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.19-8
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Oct 2005 16:20:45 -0000	1.7
+++ sources	26 Jan 2006 19:59:54 -0000	1.8
@@ -1,2 +1,2 @@
-8084256a61aa90e0173d436bf1e6f82b  gnupg-1.9.19.tar.bz2
-9646e2b0f68474c5b1c8d37a09fb56d1  gnupg-1.9.19.tar.bz2.sig
+93899203fc0530f03e146d49b65c1e28  gnupg-1.9.20.tar.bz2
+76e3a5c1ac153c24a4fd3e0e83b0e9f6  gnupg-1.9.20.tar.bz2.sig



From fedora-extras-commits at redhat.com  Thu Jan 26 20:01:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 15:01:38 -0500
Subject: rpms/gnupg2/FC-3 .cvsignore, 1.5, 1.6 gnupg2.spec, 1.10,
	1.11 sources, 1.6, 1.7
Message-ID: <200601262002.k0QK2WqN012072@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/gnupg2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12048

Modified Files:
	.cvsignore gnupg2.spec sources 
Log Message:
* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
- 1.9.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	31 Oct 2005 16:22:47 -0000	1.5
+++ .cvsignore	26 Jan 2006 20:01:37 -0000	1.6
@@ -1,2 +1,2 @@
-gnupg-1.9.19.tar.bz2
-gnupg-1.9.19.tar.bz2.sig
+gnupg-1.9.20.tar.bz2
+gnupg-1.9.20.tar.bz2.sig


Index: gnupg2.spec
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/gnupg2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gnupg2.spec	5 Dec 2005 15:16:53 -0000	1.10
+++ gnupg2.spec	26 Jan 2006 20:01:37 -0000	1.11
@@ -4,10 +4,11 @@
 # it can use other implementations too (including non-pcsc ones).
 %define pcsc_lib libpcsclite.so.0
 
-Summary: GNU utility for secure communication and data storage
+Summary: Utility for secure communication and data storage
 Name:    gnupg2
-Version: 1.9.19
-Release: 8%{?dist}
+Version: 1.9.20
+Release: 1%{?dist}
+
 License: GPL
 Group:   Applications/System
 Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/gnupg-%{version}.tar.bz2
@@ -36,7 +37,7 @@
 # Hard-code libksba-0.9.11 for now (x86_64 'make check' fails)
 #BuildRequires: libksba-devel = 0.9.11
 #else
-BuildRequires: libksba-devel >= 0.9.12
+BuildRequires: libksba-devel >= 0.9.13
 #endif
 
 BuildRequires: gettext
@@ -74,9 +75,9 @@
 %patch1 -p1 -b .lvalue
 %patch2 -p1 -b .testverbose
 
-%ifarch x86_64
-sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
-%endif
+#ifarch x86_64
+#sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure
+#endif
 
 sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c
 
@@ -84,9 +85,9 @@
 %build
 
 %configure \
-  --disable-dependency-tracking \
   --disable-rpath \
-  --enable-gpg
+  --disable-dependency-tracking \
+  --enable-gpg 
 
 make %{?_smp_mflags}
 
@@ -95,7 +96,7 @@
 ## Allows for better debugability (doesn't work, fixme)
 # echo "debug-allow-core-dumps" >> tests/gpgsm.conf
 # (sometimes?) expect one failure (reported upstream)
-#make check ||:
+make check ||:
 
 
 %install
@@ -104,6 +105,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # enable auto-startup/shutdown of gpg-agent 
+# Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/{env,shutdown}
 install -p -m0755 %{SOURCE10} $RPM_BUILD_ROOT%{_prefix}/env/
 install -p -m0755 %{SOURCE11} $RPM_BUILD_ROOT%{_prefix}/shutdown/
@@ -124,7 +126,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
 #docs say to install suid root, but we won't, for now.
 #attr(4755,root,root) %{_bindir}/gpg2
@@ -134,6 +136,7 @@
 %{_bindir}/gpg-agent
 %{_bindir}/gpgconf
 %{_bindir}/gpgkey2ssh
+%{_bindir}/gpgparsemail
 %{_bindir}/gpgsm*
 %{_bindir}/kbxutil
 %{_bindir}/scdaemon
@@ -153,6 +156,9 @@
 
 
 %changelog
+* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.20-1
+- 1.9.20
+
 * Thu Dec 01 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.9.19-8
 - include gpg-agent-(startup|shutdown) scripts (#136533)
 - BR: libksba-devel >= 1.9.12 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnupg2/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Oct 2005 16:22:47 -0000	1.6
+++ sources	26 Jan 2006 20:01:37 -0000	1.7
@@ -1,2 +1,2 @@
-8084256a61aa90e0173d436bf1e6f82b  gnupg-1.9.19.tar.bz2
-9646e2b0f68474c5b1c8d37a09fb56d1  gnupg-1.9.19.tar.bz2.sig
+93899203fc0530f03e146d49b65c1e28  gnupg-1.9.20.tar.bz2
+76e3a5c1ac153c24a4fd3e0e83b0e9f6  gnupg-1.9.20.tar.bz2.sig



From fedora-extras-commits at redhat.com  Thu Jan 26 20:28:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 26 Jan 2006 15:28:08 -0500
Subject: rpms/sbcl/FC-3 sbcl-0.9.6-permissive.patch,1.1,NONE
Message-ID: <200601262028.k0QKSBhe012368@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12357

Removed Files:
	sbcl-0.9.6-permissive.patch 
Log Message:
drop old patch



--- sbcl-0.9.6-permissive.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:10:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:10:39 -0500
Subject: rpms/perl-Text-Levenshtein - New directory
Message-ID: <200601262110.k0QLAfWA014569@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14561/perl-Text-Levenshtein

Log Message:
Directory /cvs/extras/rpms/perl-Text-Levenshtein added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:10:45 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:10:45 -0500
Subject: rpms/perl-Text-Levenshtein/devel - New directory
Message-ID: <200601262110.k0QLAlMg014584@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14561/perl-Text-Levenshtein/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-Levenshtein/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:11:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:11:49 -0500
Subject: rpms/perl-Text-Levenshtein Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262111.k0QLBpD1014623@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14611

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-Levenshtein


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-Levenshtein
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:11:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:11:55 -0500
Subject: rpms/perl-Text-Levenshtein/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262112.k0QLCFY2014644@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14611/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-Levenshtein


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:13:47 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:13:47 -0500
Subject: rpms/perl-Text-Levenshtein import.log,1.1,1.2
Message-ID: <200601262114.k0QLEJdB014742@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14708

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-Levenshtein-0.05-2 on branch devel from perl-Text-Levenshtein-0.05-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Levenshtein/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:11:49 -0000	1.1
+++ import.log	26 Jan 2006 21:13:47 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-Levenshtein-0_05-2:HEAD:perl-Text-Levenshtein-0.05-2.src.rpm:1138310014



From fedora-extras-commits at redhat.com  Thu Jan 26 21:13:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:13:53 -0500
Subject: rpms/perl-Text-Levenshtein/devel perl-Text-Levenshtein.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262114.k0QLEQ4C014746@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Text-Levenshtein/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14708/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-Levenshtein.spec 
Log Message:
auto-import perl-Text-Levenshtein-0.05-2 on branch devel from perl-Text-Levenshtein-0.05-2.src.rpm


--- NEW FILE perl-Text-Levenshtein.spec ---
Name:           perl-Text-Levenshtein
Version:        0.05
Release:        2%{?dist}
Summary:        Text::Levenshtein Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Text-Levenshtein/
Source0:        http://www.cpan.org/modules/by-module/Text/Text-Levenshtein-0.05.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Text::Levenshtein is an implementation of the Levenshtein edit
distance in Perl.

%prep
%setup -q -n Text-Levenshtein-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Fri Sep 16 2005 Steven Pritchard <steve at kspei.com> 0.05-2
- Remove core module Test::More dependency.

* Sat Aug 27 2005 Steven Pritchard <steve at kspei.com> 0.05-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Levenshtein/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:11:55 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:13:52 -0000	1.2
@@ -0,0 +1 @@
+Text-Levenshtein-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Levenshtein/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:11:55 -0000	1.1
+++ sources	26 Jan 2006 21:13:52 -0000	1.2
@@ -0,0 +1 @@
+481bf8c903db6ba7e5c9251140e1b98f  Text-Levenshtein-0.05.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:20 -0500
Subject: rpms/perl-Crypt-DES_EDE3 - New directory
Message-ID: <200601262120.k0QLKMu0014834@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14826/perl-Crypt-DES_EDE3

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DES_EDE3 added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:25 -0500
Subject: rpms/perl-Crypt-DES_EDE3/devel - New directory
Message-ID: <200601262120.k0QLKRvB014849@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14826/perl-Crypt-DES_EDE3/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:52 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:52 -0500
Subject: rpms/perl-Crypt-DES_EDE3 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262120.k0QLKsXM014883@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-DES_EDE3


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-DES_EDE3
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:20:58 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:20:58 -0500
Subject: rpms/perl-Crypt-DES_EDE3/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262121.k0QLL0fn014905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14871/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-DES_EDE3


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:13 -0500
Subject: rpms/perl-Convert-PEM - New directory
Message-ID: <200601262122.k0QLMFqg015036@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15028/perl-Convert-PEM

Log Message:
Directory /cvs/extras/rpms/perl-Convert-PEM added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:19 -0500
Subject: rpms/perl-Convert-PEM/devel - New directory
Message-ID: <200601262122.k0QLMLgu015053@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15028/perl-Convert-PEM/devel

Log Message:
Directory /cvs/extras/rpms/perl-Convert-PEM/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:21:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:21:49 -0500
Subject: rpms/perl-Crypt-DES_EDE3 import.log,1.1,1.2
Message-ID: <200601262122.k0QLMLqo015057@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14967

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-DES_EDE3-0.01-2 on branch devel from perl-Crypt-DES_EDE3-0.01-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:20:52 -0000	1.1
+++ import.log	26 Jan 2006 21:21:49 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-DES_EDE3-0_01-2:HEAD:perl-Crypt-DES_EDE3-0.01-2.src.rpm:1138310494



From fedora-extras-commits at redhat.com  Thu Jan 26 21:21:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:21:55 -0500
Subject: rpms/perl-Crypt-DES_EDE3/devel perl-Crypt-DES_EDE3.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262122.k0QLMR7x015071@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14967/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-DES_EDE3.spec 
Log Message:
auto-import perl-Crypt-DES_EDE3-0.01-2 on branch devel from perl-Crypt-DES_EDE3-0.01-2.src.rpm


--- NEW FILE perl-Crypt-DES_EDE3.spec ---
Name:           perl-Crypt-DES_EDE3
Version:        0.01
Release:        2%{?dist}
Summary:        Crypt::DES_EDE3 Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Crypt-DES_EDE3/
Source0:        http://www.cpan.org/modules/by-module/Crypt/Crypt-DES_EDE3-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Crypt::DES)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is Crypt::DES_EDE3, a module implementing Triple-DES EDE
(encrypt-decrypt-encrypt) encryption and decryption.

%prep
%setup -q -n Crypt-DES_EDE3-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard <steve at kspei.com> 0.01-2
- Minor spec cleanup.
- Include license files.

* Fri Aug 26 2005 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:20:58 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:21:54 -0000	1.2
@@ -0,0 +1 @@
+Crypt-DES_EDE3-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-DES_EDE3/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:20:58 -0000	1.1
+++ sources	26 Jan 2006 21:21:54 -0000	1.2
@@ -0,0 +1 @@
+fde1995efa0735407a5f7c4a4c8147bc  Crypt-DES_EDE3-0.01.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:47 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:47 -0500
Subject: rpms/perl-Convert-PEM Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262122.k0QLMnhh015132@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Convert-PEM


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Convert-PEM
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:22:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:22:53 -0500
Subject: rpms/perl-Convert-PEM/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262122.k0QLMtNP015153@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15118/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Convert-PEM


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:40 -0500
Subject: rpms/perl-Convert-ASCII-Armour - New directory
Message-ID: <200601262123.k0QLNgxe015236@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15215/perl-Convert-ASCII-Armour

Log Message:
Directory /cvs/extras/rpms/perl-Convert-ASCII-Armour added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:46 -0500
Subject: rpms/perl-Convert-ASCII-Armour/devel - New directory
Message-ID: <200601262123.k0QLNmdT015269@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15215/perl-Convert-ASCII-Armour/devel

Log Message:
Directory /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:40 -0500
Subject: rpms/perl-Convert-PEM import.log,1.1,1.2
Message-ID: <200601262124.k0QLOCE4015305@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15217

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-PEM-0.07-2 on branch devel from perl-Convert-PEM-0.07-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-PEM/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:22:47 -0000	1.1
+++ import.log	26 Jan 2006 21:23:40 -0000	1.2
@@ -0,0 +1 @@
+perl-Convert-PEM-0_07-2:HEAD:perl-Convert-PEM-0.07-2.src.rpm:1138310607



From fedora-extras-commits at redhat.com  Thu Jan 26 21:24:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:24:13 -0500
Subject: rpms/perl-Convert-ASCII-Armour Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601262124.k0QLOFjR015321@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Convert-ASCII-Armour


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Convert-ASCII-Armour
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:24:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:24:19 -0500
Subject: rpms/perl-Convert-ASCII-Armour/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262124.k0QLOL5u015346@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Convert-ASCII-Armour


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:23:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:23:46 -0500
Subject: rpms/perl-Convert-PEM/devel perl-Convert-PEM.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262124.k0QLOIja015329@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-PEM/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15217/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Convert-PEM.spec 
Log Message:
auto-import perl-Convert-PEM-0.07-2 on branch devel from perl-Convert-PEM-0.07-2.src.rpm


--- NEW FILE perl-Convert-PEM.spec ---
Name:           perl-Convert-PEM
Version:        0.07
Release:        2%{?dist}
Summary:        Convert::PEM Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Convert-PEM/
Source0:        http://www.cpan.org/modules/by-module/Convert/Convert-PEM-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Crypt::DES_EDE3)
BuildRequires:  perl(Convert::ASN1) >= 0.10
BuildRequires:  perl(Class::ErrorHandler)
Requires:       perl(Crypt::DES_EDE3)
Requires:       perl(Convert::ASN1) >= 0.10
Requires:       perl(Class::ErrorHandler)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is Convert::PEM, a module implementing read/write access
to ASN.1-encoded PEM files (with optional encryption).

%prep
%setup -q -n Convert-PEM-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README ToDo COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard <steve at kspei.com> 0.07-2
- Remove explicit core module dependencies.
- Include license files.

* Thu Aug 25 2005 Steven Pritchard <steve at kspei.com> 0.07-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-PEM/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:22:53 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:23:46 -0000	1.2
@@ -0,0 +1 @@
+Convert-PEM-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-PEM/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:22:53 -0000	1.1
+++ sources	26 Jan 2006 21:23:46 -0000	1.2
@@ -0,0 +1 @@
+d2188dd87446004c8da882b5a1f20412  Convert-PEM-0.07.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:02 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:02 -0500
Subject: rpms/perl-CPAN-DistnameInfo - New directory
Message-ID: <200601262125.k0QLP4DO015450@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15442/perl-CPAN-DistnameInfo

Log Message:
Directory /cvs/extras/rpms/perl-CPAN-DistnameInfo added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:14 -0500
Subject: rpms/perl-CPAN-DistnameInfo/devel - New directory
Message-ID: <200601262125.k0QLPGOD015480@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15442/perl-CPAN-DistnameInfo/devel

Log Message:
Directory /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:13 -0500
Subject: rpms/perl-Convert-ASCII-Armour import.log,1.1,1.2
Message-ID: <200601262125.k0QLPsGX015520@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15452

Modified Files:
	import.log 
Log Message:
auto-import perl-Convert-ASCII-Armour-1.4-2 on branch devel from perl-Convert-ASCII-Armour-1.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:24:12 -0000	1.1
+++ import.log	26 Jan 2006 21:25:13 -0000	1.2
@@ -0,0 +1 @@
+perl-Convert-ASCII-Armour-1_4-2:HEAD:perl-Convert-ASCII-Armour-1.4-2.src.rpm:1138310692



From fedora-extras-commits at redhat.com  Thu Jan 26 21:25:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:25:19 -0500
Subject: rpms/perl-Convert-ASCII-Armour/devel perl-Convert-ASCII-Armour.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262125.k0QLPsL1015521@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Convert-ASCII-Armour.spec 
Log Message:
auto-import perl-Convert-ASCII-Armour-1.4-2 on branch devel from perl-Convert-ASCII-Armour-1.4-2.src.rpm


--- NEW FILE perl-Convert-ASCII-Armour.spec ---
Name:           perl-Convert-ASCII-Armour
Version:        1.4
Release:        2%{?dist}
Summary:        Convert::ASCII::Armour Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Convert-ASCII-Armour/
Source0:        http://www.cpan.org/modules/by-module/Convert/Convert-ASCII-Armour-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Compress::Zlib)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module converts hashes of binary octets into ASCII messages
suitable for transfer over 6-bit clean transport channels.  The
encoded ASCII resembles PGP's armoured messages, but are in no way
compatible with PGP.

%prep
%setup -q -n Convert-ASCII-Armour-%{version}

for file in lib/Convert/ASCII/*.pm ; do
    %{__perl} -pi -e '$_=undef if (/^\#\!/ and $.==1)' $file
done

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC COPYING
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Sep 17 2005 Steven Pritchard <steve at kspei.com> 1.4-2
- Minor spec cleanup.
- Remove explicit dependencies on core modules.
- Remove #! lines from *.pm to quiet rpmlint.

* Sat Aug 27 2005 Steven Pritchard <steve at kspei.com> 1.4-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:24:18 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:25:19 -0000	1.2
@@ -0,0 +1 @@
+Convert-ASCII-Armour-1.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Convert-ASCII-Armour/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:24:18 -0000	1.1
+++ sources	26 Jan 2006 21:25:19 -0000	1.2
@@ -0,0 +1 @@
+7e0e61ff6b014062d6feecaea3f09018  Convert-ASCII-Armour-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:26:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:26:09 -0500
Subject: rpms/perl-CPAN-DistnameInfo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262126.k0QLQB7a015586@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15572

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-CPAN-DistnameInfo


--- NEW FILE Makefile ---
# Top level Makefile for module perl-CPAN-DistnameInfo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:26:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:26:20 -0500
Subject: rpms/perl-CPAN-DistnameInfo/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262126.k0QLQMlr015606@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15572/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-CPAN-DistnameInfo


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:26:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:26:56 -0500
Subject: rpms/perl-Parse-CPAN-Packages - New directory
Message-ID: <200601262126.k0QLQwPX015675@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15663/perl-Parse-CPAN-Packages

Log Message:
Directory /cvs/extras/rpms/perl-Parse-CPAN-Packages added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:01 -0500
Subject: rpms/perl-Parse-CPAN-Packages/devel - New directory
Message-ID: <200601262127.k0QLR3Ou015703@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15663/perl-Parse-CPAN-Packages/devel

Log Message:
Directory /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:01 -0500
Subject: rpms/perl-CPAN-DistnameInfo import.log,1.1,1.2
Message-ID: <200601262127.k0QLRXsg015761@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15679

Modified Files:
	import.log 
Log Message:
auto-import perl-CPAN-DistnameInfo-0.06-1 on branch devel from perl-CPAN-DistnameInfo-0.06-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-DistnameInfo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:26:09 -0000	1.1
+++ import.log	26 Jan 2006 21:27:01 -0000	1.2
@@ -0,0 +1 @@
+perl-CPAN-DistnameInfo-0_06-1:HEAD:perl-CPAN-DistnameInfo-0.06-1.src.rpm:1138310811



From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:07 -0500
Subject: rpms/perl-CPAN-DistnameInfo/devel perl-CPAN-DistnameInfo.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262127.k0QLRdxJ015783@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15679/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-CPAN-DistnameInfo.spec 
Log Message:
auto-import perl-CPAN-DistnameInfo-0.06-1 on branch devel from perl-CPAN-DistnameInfo-0.06-1.src.rpm


--- NEW FILE perl-CPAN-DistnameInfo.spec ---
Name:           perl-CPAN-DistnameInfo
Version:        0.06
Release:        1%{?dist}
Summary:        CPAN::DistnameInfo Perl module
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/CPAN-DistnameInfo/
Source0:        http://www.cpan.org/modules/by-module/CPAN/CPAN-DistnameInfo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Many online services that are centered around CPAN attempt to
associate multiple uploads by extracting a distribution name from the
filename of the upload. For most distributions this is easy as they
have used ExtUtils::MakeMaker or Module::Build to create the
distribution, which results in a uniform name. But sadly not all
uploads are created in this way.

CPAN::DistnameInfo uses heuristics that have been learnt by
http://search.cpan.org/ to extract the distribution name and version
from filenames and also report if the version is to be treated as a
developer release.

%prep
%setup -q -n CPAN-DistnameInfo-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 19 2005 Steven Pritchard <steve at kspei.com> 0.06-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:26:19 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:27:07 -0000	1.2
@@ -0,0 +1 @@
+CPAN-DistnameInfo-0.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-CPAN-DistnameInfo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:26:19 -0000	1.1
+++ sources	26 Jan 2006 21:27:07 -0000	1.2
@@ -0,0 +1 @@
+f7154ef1681ce5d236e984d7ce72e3ac  CPAN-DistnameInfo-0.06.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:32 -0500
Subject: rpms/perl-Parse-CPAN-Packages Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601262127.k0QLRYZ6015764@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15749

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Parse-CPAN-Packages


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Parse-CPAN-Packages
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:27:38 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:27:38 -0500
Subject: rpms/perl-Parse-CPAN-Packages/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601262127.k0QLRemT015786@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15749/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Parse-CPAN-Packages


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 21:28:08 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:28:08 -0500
Subject: rpms/perl-Parse-CPAN-Packages import.log,1.1,1.2
Message-ID: <200601262128.k0QLSeCW015905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15851

Modified Files:
	import.log 
Log Message:
auto-import perl-Parse-CPAN-Packages-2.25-1 on branch devel from perl-Parse-CPAN-Packages-2.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 21:27:31 -0000	1.1
+++ import.log	26 Jan 2006 21:28:08 -0000	1.2
@@ -0,0 +1 @@
+perl-Parse-CPAN-Packages-2_25-1:HEAD:perl-Parse-CPAN-Packages-2.25-1.src.rpm:1138310881



From fedora-extras-commits at redhat.com  Thu Jan 26 21:28:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 16:28:13 -0500
Subject: rpms/perl-Parse-CPAN-Packages/devel perl-Parse-CPAN-Packages.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262128.k0QLSkPi015909@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15851/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Parse-CPAN-Packages.spec 
Log Message:
auto-import perl-Parse-CPAN-Packages-2.25-1 on branch devel from perl-Parse-CPAN-Packages-2.25-1.src.rpm


--- NEW FILE perl-Parse-CPAN-Packages.spec ---
Name:           perl-Parse-CPAN-Packages
Version:        2.25
Release:        1%{?dist}
Summary:        Parse::CPAN::Packages - Parse 02packages.details.txt.gz
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Parse-CPAN-Packages/
Source0:        http://www.cpan.org/modules/by-module/Parse/Parse-CPAN-Packages-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(CPAN::DistnameInfo)
BuildRequires:  perl(Class::Accessor::Fast)
BuildRequires:  perl(IO::Zlib)
BuildRequires:  perl(Module::Build)
BuildRequires:  perl(Sort::Versions)
Requires:       perl(CPAN::DistnameInfo)
Requires:       perl(Class::Accessor::Fast)
Requires:       perl(IO::Zlib)
Requires:       perl(Sort::Versions)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The Comprehensive Perl Archive Network (CPAN) is a very useful
collection of Perl code. It has several indices of the files that it
hosts, including a file named "02packages.details.txt.gz" in the
"modules" directory. This file contains lots of useful information and
this module provides a simple interface to the data contained within.

%prep
%setup -q -n Parse-CPAN-Packages-%{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 -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

perldoc -t perlgpl > COPYING
perldoc -t perlartistic > Artistic

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README COPYING Artistic
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Sep 19 2005 Steven Pritchard <steve at kspei.com> 2.25-1
- Specfile autogenerated.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 21:27:37 -0000	1.1
+++ .cvsignore	26 Jan 2006 21:28:13 -0000	1.2
@@ -0,0 +1 @@
+Parse-CPAN-Packages-2.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Parse-CPAN-Packages/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 21:27:37 -0000	1.1
+++ sources	26 Jan 2006 21:28:13 -0000	1.2
@@ -0,0 +1 @@
+10e167a0e35d0caefc52d6118e9e99e3  Parse-CPAN-Packages-2.25.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 21:28:27 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 26 Jan 2006 16:28:27 -0500
Subject: rpms/nagios/devel nagios.spec,1.2,1.3
Message-ID: <200601262129.k0QLT0Dc015938@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15888

Modified Files:
	nagios.spec 
Log Message:
Fixed bugzilla #49609


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
+++ nagios.spec	26 Jan 2006 21:28:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 1.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -120,7 +120,7 @@
 %post
 /sbin/chkconfig --add %{name} || :
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
-%{_sbindir}/usermod -G %{name} apache || :
+%{_sbindir}/usermod -a -G %{name} apache || :
 
 %postun
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
+- Fixed usermod -a issue, Bugzilla #49609
+
 * Sun Jan 15 2005 Mike McGrath <imlinux at gmail.com> 1.3-14
 - Fedora friendly spec file
 



From fedora-extras-commits at redhat.com  Thu Jan 26 21:47:48 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Thu, 26 Jan 2006 16:47:48 -0500
Subject: rpms/liferea/FC-4 .cvsignore, 1.18, 1.19 liferea.spec, 1.23,
	1.24 sources, 1.19, 1.20
Message-ID: <200601262148.k0QLmL7q016058@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16037

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Thu Jan 26 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-1
- Update to 1.0.2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	17 Jan 2006 05:32:57 -0000	1.18
+++ .cvsignore	26 Jan 2006 21:47:48 -0000	1.19
@@ -1 +1 @@
-liferea-1.0.1.tar.gz
+liferea-1.0.2.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- liferea.spec	17 Jan 2006 05:32:57 -0000	1.23
+++ liferea.spec	26 Jan 2006 21:47:48 -0000	1.24
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.1
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -92,6 +92,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.2-1
+- Update to 1.0.2.
+
 * Mon Jan 16 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.1-1
 - Update to 1.0.1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources	17 Jan 2006 05:32:57 -0000	1.19
+++ sources	26 Jan 2006 21:47:48 -0000	1.20
@@ -1 +1 @@
-c5510e98cf0867268d7ded84c5f0bcda  liferea-1.0.1.tar.gz
+45cd555c60ce7f8a2eda4b776118e939  liferea-1.0.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:02:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:02:45 -0500
Subject: rpms/kernel-module-thinkpad/FC-4 .cvsignore, 1.4, NONE Makefile, 1.2,
	NONE branch, 1.1, NONE kernel-module-thinkpad-README.Fedora, 1.1,
	NONE kernel-module-thinkpad-percpu.patch, 1.1,
	NONE kernel-module-thinkpad.spec, 1.7, NONE sources, 1.4, NONE
Message-ID: <200601262202.k0QM2lpt017967@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kernel-module-thinkpad/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713/FC-4

Removed Files:
	.cvsignore Makefile branch 
	kernel-module-thinkpad-README.Fedora 
	kernel-module-thinkpad-percpu.patch 
	kernel-module-thinkpad.spec sources 
Log Message:
Never shipped, remove.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-thinkpad-README.Fedora DELETED ---


--- kernel-module-thinkpad-percpu.patch DELETED ---


--- kernel-module-thinkpad.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:02:25 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:02:25 -0500
Subject: rpms/kernel-module-thinkpad/FC-3 .cvsignore, 1.3, NONE Makefile, 1.2,
	NONE branch, 1.1, NONE kernel-module-thinkpad-kmodhelper, 1.1,
	NONE kernel-module-thinkpad-rpm.patch, 1.1,
	NONE kernel-module-thinkpad.makedev, 1.1,
	NONE kernel-module-thinkpad.spec, 1.4, NONE sources, 1.3, NONE
Message-ID: <200601262202.k0QM2hXQ017956@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kernel-module-thinkpad/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713/FC-3

Removed Files:
	.cvsignore Makefile branch kernel-module-thinkpad-kmodhelper 
	kernel-module-thinkpad-rpm.patch 
	kernel-module-thinkpad.makedev kernel-module-thinkpad.spec 
	sources 
Log Message:
Never shipped, remove.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- kernel-module-thinkpad-kmodhelper DELETED ---


--- kernel-module-thinkpad-rpm.patch DELETED ---


--- kernel-module-thinkpad.makedev DELETED ---


--- kernel-module-thinkpad.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:03:20 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:03:20 -0500
Subject: rpms/kernel-module-thinkpad/devel .cvsignore, 1.4, NONE Makefile,
	1.2, NONE kernel-module-thinkpad-console.perms, 1.1,
	NONE kernel-module-thinkpad-percpu.patch, 1.1,
	NONE kernel-module-thinkpad.modules, 1.1,
	NONE kernel-module-thinkpad.spec, 1.13, NONE sources, 1.4, NONE
Message-ID: <200601262203.k0QM3M9u018019@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/kernel-module-thinkpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17713/devel

Removed Files:
	.cvsignore Makefile kernel-module-thinkpad-console.perms 
	kernel-module-thinkpad-percpu.patch 
	kernel-module-thinkpad.modules kernel-module-thinkpad.spec 
	sources 
Log Message:
Never shipped, remove.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- kernel-module-thinkpad-console.perms DELETED ---


--- kernel-module-thinkpad-percpu.patch DELETED ---


--- kernel-module-thinkpad.modules DELETED ---


--- kernel-module-thinkpad.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:04:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:04:42 -0500
Subject: rpms/amavisd-new - New directory
Message-ID: <200601262204.k0QM4i5C018106@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/amavisd-new

Log Message:
Directory /cvs/extras/rpms/amavisd-new added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:05:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:05:09 -0500
Subject: rpms/amavisd-new/devel - New directory
Message-ID: <200601262205.k0QM5BoN018118@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18095/amavisd-new/devel

Log Message:
Directory /cvs/extras/rpms/amavisd-new/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:06:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:06:41 -0500
Subject: rpms/amavisd-new/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262206.k0QM6hcq018183@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18153/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module amavisd-new


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:06:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:06:23 -0500
Subject: rpms/amavisd-new Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262206.k0QM6e1S018166@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18153

Added Files:
	Makefile import.log 
Log Message:
Setup of module amavisd-new


--- NEW FILE Makefile ---
# Top level Makefile for module amavisd-new
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:09:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:09:51 -0500
Subject: rpms/thinkpad-kmod-common - New directory
Message-ID: <200601262209.k0QM9rU2018316@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18308/thinkpad-kmod-common

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod-common added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:10:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:10:15 -0500
Subject: rpms/thinkpad-kmod-common/devel - New directory
Message-ID: <200601262210.k0QMAH2v018336@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18308/thinkpad-kmod-common/devel

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod-common/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:12:08 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:12:08 -0500
Subject: rpms/thinkpad-kmod-common Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262212.k0QMCAfI018436@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18421

Added Files:
	Makefile import.log 
Log Message:
Setup of module thinkpad-kmod-common


--- NEW FILE Makefile ---
# Top level Makefile for module thinkpad-kmod-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:11:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:11:41 -0500
Subject: rpms/amavisd-new import.log,1.1,1.2
Message-ID: <200601262212.k0QMCUxF018440@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18362

Modified Files:
	import.log 
Log Message:
auto-import amavisd-new-2.3.3-4 on branch devel from amavisd-new-2.3.3-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:06:23 -0000	1.1
+++ import.log	26 Jan 2006 22:11:40 -0000	1.2
@@ -0,0 +1 @@
+amavisd-new-2_3_3-4:HEAD:amavisd-new-2.3.3-4.src.rpm:1138313438



From fedora-extras-commits at redhat.com  Thu Jan 26 22:11:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 26 Jan 2006 17:11:54 -0500
Subject: rpms/amavisd-new/devel README.fedora, NONE, 1.1 amavis-clamd.conf, 
	NONE, 1.1 amavis-clamd.init, NONE, 1.1 amavis-clamd.sysconfig,
	NONE, 1.1 amavisd-condrestart.patch, NONE,
	1.1 amavisd-conf.patch, NONE, 1.1 amavisd-db.patch, NONE,
	1.1 amavisd-init.patch, NONE, 1.1 amavisd-new.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262212.k0QMCac0018461@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18362/devel

Modified Files:
	.cvsignore sources 
Added Files:
	README.fedora amavis-clamd.conf amavis-clamd.init 
	amavis-clamd.sysconfig amavisd-condrestart.patch 
	amavisd-conf.patch amavisd-db.patch amavisd-init.patch 
	amavisd-new.spec 
Log Message:
auto-import amavisd-new-2.3.3-4 on branch devel from amavisd-new-2.3.3-4.src.rpm


--- NEW FILE README.fedora ---
INSTALLATION
------------
Installing amavisd-new from Fedora Extras is simple.  First, install
the amavisd-new package:

  yum -y install amavisd-new

Don't be alarmed at the number of dependencies this installs.  This
package tries to be as full-featured as possible, including many
optional components for amavisd-new.

Next, configure amavisd-new to start on boot:

  chkconfig --level 2345 amavisd on

If you want to use the Clam Antivirus daemon (recommended), set it to
start on boot as well:

  chkconfig --level 2345 clamd.amavisd on

When you are ready, start the clamd.amavisd (optional but recommended)
and amavisd services:

  service clamd.amavisd start
  service amavisd start

Check /var/log/maillog for startup messages from both daemons.

The next step is to integrate amavisd with your MTA.

POSTFIX
-------
The simplest method for enabling amavisd-new support in postfix is to
use the content_filter configuration option to tell postfix to relay
mail through amavisd-new using SMTP.  In this configuration, incoming
mail passes from postfix to amavisd and back to postfix.  (Mail never
actually leaves the control of postfix however, since amavisd does not
answer OK until it scans the message and transfers it back to postfix.
The worst that can happen is a failure at just the right time could
allow a message to be queued twice.)

Add the following to /etc/postfix/main.cf:

  content_filter = smtp:[127.0.0.1]:10024

You will probably also want to limit the number of postfix processes
to keep mail from coming in faster than it can be processed by adding
the following to /etc/postfix/main.cf:

  default_process_limit = 20

Add the following to /etc/postfix/master.cf:

  127.0.0.1:10025 inet n - - - 0 smtpd -o content_filter=

Be sure to read the TUNING section in README.postfix for information
on process limits.

SENDMAIL
--------
See README.sendmail* in this directory.

Please note that amavisd-new's milter functionality is not enabled in
this package.

EXIM
----
See README.exim* in this directory.


--- NEW FILE amavis-clamd.conf ---
# Use system logger.
LogSyslog

# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
LogFacility LOG_MAIL

# This option allows you to save a process identifier of the listening
# daemon (main thread).
PidFile /var/run/amavisd/clamd.pid

# Remove stale socket after unclean shutdown.
# Default: disabled
FixStaleSocket

# Run as a selected user (clamd must be started by root).
User amavis

# Path to a local socket file the daemon will listen on.
LocalSocket /var/spool/amavisd/clamd.sock


--- NEW FILE amavis-clamd.init ---
#!/bin/bash
#
# chkconfig: - 78 32
# description: The clamd server running for amavisd

CLAMD_SERVICE=amavisd
. /usr/share/clamav/clamd-wrapper


--- NEW FILE amavis-clamd.sysconfig ---
CLAMD_CONFIGFILE=/etc/clamd.d/amavisd.conf
CLAMD_SOCKET=/var/spool/amavisd/clamd.sock
CLAMD_OPTIONS=

amavisd-condrestart.patch:

--- NEW FILE amavisd-condrestart.patch ---
--- amavisd_init.sh.orig	2004-02-23 16:09:02.000000000 -0600
+++ amavisd_init.sh	2004-02-23 16:13:52.000000000 -0600
@@ -60,8 +60,12 @@
 	action $"Reloading ${prog_base}:" ${prog} -c ${prog_config_file} reload
 	RETVAL=$?
 	;;
+  condrestart)
+	[ -f /var/lock/subsys/${prog_base} ] && $0 restart || :
+	RETVAL=$?
+	;;
   *)
-	echo "Usage: $0 {start|stop|status|restart|reload}"
+	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
 	exit 1
 esac
 

amavisd-conf.patch:

--- NEW FILE amavisd-conf.patch ---
--- amavisd-new-2.3.2/amavisd.conf.orig	2005-06-29 05:26:05.000000000 -0500
+++ amavisd-new-2.3.2/amavisd.conf	2005-07-06 12:22:21.000000000 -0500
@@ -14,23 +14,23 @@
 # @bypass_spam_checks_maps  = (1);  # uncomment to DISABLE anti-spam code
 
 $max_servers = 2;            # number of pre-forked children (2..15 is common)
-$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis)
-$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis)
+$daemon_user  = 'amavis';    # (no default;  customary: vscan or amavis)
+$daemon_group = 'amavis';    # (no default;  customary: vscan or amavis)
 
 $mydomain = 'example.com';   # a convenient default for other settings
 
-$MYHOME   = '/var/amavis';   # a convenient default for other settings
+$MYHOME   = '/var/spool/amavisd';   # a convenient default for other settings
 $TEMPBASE = "$MYHOME/tmp";   # working directory, needs to be created manually
 $ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR
-$QUARANTINEDIR = '/var/virusmails';
+$QUARANTINEDIR = undef;
 # $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
 
 # $daemon_chroot_dir = $MYHOME;   # chroot directory or undef
 
 # $db_home   = "$MYHOME/db";
 # $helpers_home = "$MYHOME/var";  # prefer $MYHOME clean and owned by root?
-# $pid_file  = "$MYHOME/var/amavisd.pid";
-# $lock_file = "$MYHOME/var/amavisd.lock";
+$pid_file  = "/var/run/amavisd/amavisd.pid";
+$lock_file = "/var/run/amavisd/amavisd.lock";
 #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
 
 @local_domains_maps = ( [".$mydomain"] );
@@ -65,11 +65,11 @@
 #     ["DBI:SQLite:dbname=$MYHOME/sql/mail_prefs.sqlite", '', ''] );
 # @storage_sql_dsn = @lookup_sql_dsn;  # none, same, or separate database
 
-$virus_admin               = "virusalert\@$mydomain";  # notifications recip.
+$virus_admin               = undef;  # notifications recip.
 
-$mailfrom_notify_admin     = "virusalert\@$mydomain";  # notifications sender
-$mailfrom_notify_recip     = "virusalert\@$mydomain";  # notifications sender
-$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
+$mailfrom_notify_admin     = undef;  # notifications sender
+$mailfrom_notify_recip     = undef;  # notifications sender
+$mailfrom_notify_spamadmin = undef; # notifications sender
 $mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
 
 @addr_extension_virus_maps      = ('virus');
@@ -99,10 +99,10 @@
 # $notify_method  = 'smtp:[127.0.0.1]:10025';
 # $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
 
-# $final_virus_destiny      = D_DISCARD;
-# $final_banned_destiny     = D_BOUNCE;
-# $final_spam_destiny       = D_BOUNCE;
-# $final_bad_header_destiny = D_PASS;
+$final_virus_destiny      = D_DISCARD;
+$final_banned_destiny     = D_BOUNCE;
+$final_spam_destiny       = D_DISCARD;
+$final_bad_header_destiny = D_BOUNCE;
 
 
 # SOME OTHER VARIABLES WORTH CONSIDERING (see amavisd.conf-default for all)
@@ -286,10 +286,10 @@
 # ['Sophos SAVI', \&sophos_savi ],
 
 # ### http://www.clamav.net/
-# ['ClamAV-clamd',
-#   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"],
-#   qr/\bOK$/, qr/\bFOUND$/,
-#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
+['ClamAV-clamd',
+  \&ask_daemon, ["CONTSCAN {}\n", "/var/spool/amavisd/clamd.sock"],
+  qr/\bOK$/, qr/\bFOUND$/,
+  qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ],
 # # NOTE: the easiest is to run clamd under the same user as amavisd; match the
 # # socket name (LocalSocket) in clamav.conf to the socket name in this entry
 # # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"],

amavisd-db.patch:

--- NEW FILE amavisd-db.patch ---
--- ./amavisd-nanny.org	2005-09-19 15:26:59.000000000 +0200
+++ ./amavisd-nanny	2005-09-19 15:27:37.000000000 +0200
@@ -51,7 +51,7 @@
 my($activettl) = 10*60; # stuck active children are sent a SIGTERM after this
                         # many seconds
 
-my($db_home) = '/var/amavis/db';  # DB databases directory
+my($db_home) = '/var/spool/amavisd/db';  # DB databases directory
 my($dbfile)  = 'nanny.db';
 my($wakeuptime) = 2;  # seconds
 
--- ./amavisd-agent.org	2005-09-19 15:28:15.000000000 +0200
+++ ./amavisd-agent	2005-09-19 15:20:24.000000000 +0200
@@ -107,7 +107,7 @@
 # main program starts here
   $SIG{INT} = sub { die "\n" };  # do the END code block
   my($env) = BerkeleyDB::Env->new(
-    '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
+    '-Home'=>'/var/spool/amavisd/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
   defined $env or die "BDB no env: $BerkeleyDB::Error $!";
   my($db) = BerkeleyDB::Hash->new(
     '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env );

amavisd-init.patch:

--- NEW FILE amavisd-init.patch ---
--- amavisd-new-2.3.2.orig/amavisd_init.sh	2002-11-15 22:22:47.000000000 -0600
+++ amavisd-new-2.3.2/amavisd_init.sh	2005-07-06 16:11:23.000000000 -0500
@@ -4,10 +4,10 @@
 #		(to be used with version amavisd-new-20020630 or later)
 #
 
-# chkconfig: 2345 79 31
+# chkconfig: - 79 31
 # description: amavisd is an interface between MTA and content checkers
 # processname: amavisd
-# pidfile: /var/amavis/amavisd.pid
+# pidfile: /var/run/amavisd/amavisd.pid
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -19,7 +19,7 @@
 prog="/usr/sbin/amavisd"
 prog_base="$(basename ${prog})"
 
-prog_config_file="/etc/amavisd.conf"
+prog_config_file="/etc/amavisd/amavisd.conf"
 
 # Source configuration.
 [ -e /etc/sysconfig/${prog_base} ] && . /etc/sysconfig/${prog_base}


--- NEW FILE amavisd-new.spec ---
#%%define prerelease rc1

Summary:        Email filter with virus scanner and spamassassin support
Name:           amavisd-new
Version:        2.3.3
Release:        4%{?prerelease:.%{prerelease}}
License:        GPL
Group:          Applications/System
URL:            http://www.ijs.si/software/amavisd/
Source0:        http://www.ijs.si/software/amavisd/amavisd-new-%{version}%{?prerelease:-%{prerelease}}.tar.gz
Source1:        amavis-clamd.init
Source2:        amavis-clamd.conf
Source3:        amavis-clamd.sysconfig
Source4:        README.fedora
Patch0:         amavisd-conf.patch
Patch1:         amavisd-init.patch
Patch2:         amavisd-condrestart.patch
Patch3:         amavisd-db.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-root/
Requires:       smtpdaemon
Requires:       /usr/sbin/clamd, /etc/clamd.d
Requires:       tmpwatch
Requires:       bzip2
Requires:       gzip
Requires:       lha
Requires:       cpio
Requires:       freeze
Requires:       lzop
Requires:       nomarch
Requires:       zoo
Requires:       cabextract
Requires:       /usr/bin/ar
# We probably should parse the fetch_modules() code in amavisd for this list.
# These are just the dependencies that don't get picked up otherwise.
Requires:       perl(IO::Stringy)
Requires:       perl(MIME::Body)
Requires:       perl(MIME::Decoder::Base64)
Requires:       perl(MIME::Decoder::Binary)
Requires:       perl(MIME::Decoder::Gzip64)
Requires:       perl(MIME::Decoder::NBit)
Requires:       perl(MIME::Decoder::QuotedPrint)
Requires:       perl(MIME::Decoder::UU)
Requires:       perl(MIME::Head)
Requires:       perl(Mail::Field)
Requires:       perl(Mail::Header)
Requires:       perl(Mail::Internet)
Requires:       perl(Mail::SpamAssassin)
Requires:       perl(Archive::Tar)
Requires:       perl(Archive::Zip)
Requires:       perl(Convert::TNEF)
Requires:       perl(Convert::UUlib)
Requires:       perl(URI)
Requires:       perl(Net::DNS)
Requires:       perl(Net::LDAP)
Requires:       perl(DBI)
Requires:       perl(DBD::mysql)
Requires:       perl(DBD::SQLite)
Requires:       perl(Razor2::Client::Version)
Requires:       perl(Authen::SASL)
Requires:       perl(Mail::SPF::Query)
Requires:       perl(Compress::Zlib) >= 1.35
BuildArch:      noarch

%description
amavisd-new is a high-performance and reliable interface between mailer
(MTA) and one or more content checkers: virus scanners, and/or
Mail::SpamAssassin Perl module. It is written in Perl, assuring high
reliability, portability and maintainability. It talks to MTA via (E)SMTP
or LMTP, or by using helper programs. No timing gaps exist in the design,
which could cause a mail loss.

%prep
%setup -q -n %{name}-%{version}%{?prerelease:-%{prerelease}}
%patch0 -p1
%patch1 -p1
%patch2 -p0
%patch3 -p0
cp -a %{SOURCE4} README_FILES/

%build

%install
rm -rf "$RPM_BUILD_ROOT"

mkdir -p $RPM_BUILD_ROOT%{_sbindir}
install -m755 amavisd $RPM_BUILD_ROOT%{_sbindir}/
( cd $RPM_BUILD_ROOT%{_sbindir} && ln -s clamd clamd.amavisd )

mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -m755 amavisd-{agent,nanny} $RPM_BUILD_ROOT%{_bindir}/

mkdir -p $RPM_BUILD_ROOT%{_initrddir}
install -m755 amavisd_init.sh $RPM_BUILD_ROOT%{_initrddir}/amavisd
install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/clamd.amavisd

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/amavisd
install -m644 amavisd.conf $RPM_BUILD_ROOT%{_sysconfdir}/amavisd/

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d
install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/clamd.d/amavisd.conf

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/clamd.amavisd

mkdir -p $RPM_BUILD_ROOT/var/spool/amavisd/{tmp,db}
touch $RPM_BUILD_ROOT/var/spool/amavisd/clamd.sock
mkdir -p $RPM_BUILD_ROOT/var/run/amavisd/

%clean
rm -rf "$RPM_BUILD_ROOT"

%pre
if ! id amavis > /dev/null 2>&1 ; then
    useradd -r -s /sbin/nologin -d /var/spool/amavisd amavis
fi

%preun
if [ "$1" = 0 ]; then
    chkconfig --del amavisd
    chkconfig --del clamd.amavisd
fi

%post
chkconfig --add amavisd
service amavisd condrestart
chkconfig --add clamd.amavisd
service clamd.amavisd condrestart

%files
%defattr(-,root,root)
%doc AAAREADME.first LDAP.schema LICENSE RELEASE_NOTES TODO
%doc README_FILES test-messages amavisd.conf-*
%dir %{_sysconfdir}/amavisd/
%attr(755,root,root) %{_initrddir}/amavisd
%attr(755,root,root) %{_initrddir}/clamd.amavisd
%config(noreplace) %{_sysconfdir}/amavisd/amavisd.conf
%config(noreplace) %{_sysconfdir}/clamd.d/amavisd.conf
%config(noreplace) %{_sysconfdir}/sysconfig/clamd.amavisd
%{_sbindir}/amavisd
%{_sbindir}/clamd.amavisd
%{_bindir}/amavisd-*
%dir %attr(700,amavis,amavis) /var/spool/amavisd
%dir %attr(700,amavis,amavis) /var/spool/amavisd/tmp
%dir %attr(700,amavis,amavis) /var/spool/amavisd/db
%dir %attr(755,amavis,amavis) /var/run/amavisd
%ghost /var/spool/amavisd/clamd.sock

%changelog
* Wed Sep 21 2005 Steven Pritchard <steve at kspei.com> 2.3.3-4
- Add TODO and amavisd.conf-* to %%doc

* Mon Sep 19 2005 Steven Pritchard <steve at kspei.com> 2.3.3-3
- Add amavisd-db.patch to fix the path to the db directory in
  amavisd-agent and amavisd-nanny.  (Thanks to Julien Tognazzi.)

* Fri Sep 02 2005 Steven Pritchard <steve at kspei.com> 2.3.3-2
- Requires: perl(Compress::Zlib) >= 1.35

* Thu Sep 01 2005 Steven Pritchard <steve at kspei.com> 2.3.3-1
- Update to 2.3.3
- Remove explicit dependencies on core perl modules

* Fri Aug 19 2005 Steven Pritchard <steve at kspei.com> 2.3.2-10
- Recommend using 127.0.0.1 instead of localhost in README.fedora
- .deb support requires ar

* Wed Aug 17 2005 Steven Pritchard <steve at kspei.com> 2.3.2-9
- Set $virus_admin, $mailfrom_notify_admin, $mailfrom_notify_recip,
  and $mailfrom_notify_spamadmin to undef in the default config to
  turn off notification emails

* Fri Aug 12 2005 Steven Pritchard <steve at kspei.com> 2.3.2-8
- Add dependencies for freeze, lzop, nomarch, zoo, cabextract

* Wed Jul 27 2005 Steven Pritchard <steve at kspei.com> 2.3.2-7
- Add README.fedora with simplified Postfix instructions

* Mon Jul 25 2005 Steven Pritchard <steve at kspei.com> 2.3.2-6
- Create /var/spool/amavisd/db

* Thu Jul 21 2005 Steven Pritchard <steve at kspei.com> 2.3.2-5
- Add perl(Mail::SPF::Query) (now packaged for Extras) dependency
- Drop /var/log/amavisd since we weren't using it
- Fix paths for clamd.sock and amavisd.pid in a couple of places

* Tue Jul 12 2005 Steven Pritchard <steve at kspei.com> 2.3.2-4
- Add a bunch of other missing Requires (both actually required modules
  and optional modules)

* Tue Jul 12 2005 Steven Pritchard <steve at kspei.com> 2.3.2-3
- Add missing Requires: perl(Convert::TNEF)

* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> 2.3.2-2
- Fix init script ordering
- Don't enable amavisd by default

* Wed Jul 06 2005 Steven Pritchard <steve at kspei.com> 2.3.2-1
- Update to 2.3.2

* Wed Jun 29 2005 Steven Pritchard <steve at kspei.com> 2.3.2-0.1.rc1
- Update to 2.3.2-rc1
- Fedora Extras clamav integration
- Drop amavisd-syslog.patch (Unix::Syslog is in Extras)

* Mon Feb 23 2004 Steven Pritchard <steve at kspei.com> 0.20030616.p7-0.fdr.0.1
- Add amavisd-syslog.patch to eliminate Unix::Syslog dependency
- Add in clamd helper
- Fix up init script
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:06:41 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
@@ -0,0 +1 @@
+amavisd-new-2.3.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:06:41 -0000	1.1
+++ sources	26 Jan 2006 22:11:54 -0000	1.2
@@ -0,0 +1 @@
+0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:12:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:12:32 -0500
Subject: rpms/thinkpad-kmod-common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262212.k0QMCYm4018457@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18421/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module thinkpad-kmod-common


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:13:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:13:53 -0500
Subject: rpms/thinkpad-kmod-common import.log,1.1,1.2
Message-ID: <200601262214.k0QMEfL3018605@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18532

Modified Files:
	import.log 
Log Message:
auto-import thinkpad-kmod-common-5.8-5 on branch devel from thinkpad-kmod-common-5.8-5.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod-common/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:12:08 -0000	1.1
+++ import.log	26 Jan 2006 22:13:53 -0000	1.2
@@ -0,0 +1 @@
+thinkpad-kmod-common-5_8-5:HEAD:thinkpad-kmod-common-5.8-5.src.rpm:1138313645



From fedora-extras-commits at redhat.com  Thu Jan 26 22:14:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:14:12 -0500
Subject: rpms/thinkpad-kmod-common/devel thinkpad-kmod-common-console.perms, 
	NONE, 1.1 thinkpad-kmod-common.modules, NONE,
	1.1 thinkpad-kmod-common.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601262214.k0QMEi5l018609@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18532/devel

Modified Files:
	.cvsignore sources 
Added Files:
	thinkpad-kmod-common-console.perms 
	thinkpad-kmod-common.modules thinkpad-kmod-common.spec 
Log Message:
auto-import thinkpad-kmod-common-5.8-5 on branch devel from thinkpad-kmod-common-5.8-5.src.rpm
Initial import.


--- NEW FILE thinkpad-kmod-common-console.perms ---
# console.perms definitions for ThinkPad devices, http://tpctl.sourceforge.net/

<console>  0600 /dev/thinkpad 0600 root


--- NEW FILE thinkpad-kmod-common.modules ---
#!/bin/sh

# Script for loading ThinkPad modules at boot time.

modprobe thinkpad >/dev/null 2>&1


--- NEW FILE thinkpad-kmod-common.spec ---
%define debug_package %{nil}
%define kmod_name     thinkpad

Name:           %{kmod_name}-kmod-common
Version:        5.8
Release:        5%{?dist}
Summary:        Supplemental kernel modules for ThinkPad?? laptop computers

License:        GPL
Group:          System Environment/Kernel
URL:            http://tpctl.sourceforge.net/
Source0:        http://download.sf.net/tpctl/%{kmod_name}_%{version}.tar.gz
Source1:        %{name}-console.perms
Source2:        %{name}.modules
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	kmod-%{kmod_name} = %{version}
Requires:       pam >= 0.79-8
Requires:       initscripts >= 8.08-1

ExclusiveArch:  i386

%description
This package contains common files for kernel modules that interface
the System Management Application Program Interface (SMAPI) BIOS found
in some ThinkPad?? laptop computers, and drivers for certain ThinkPad
hardware components.

ThinkPad is a registered trademark of Lenovo in the United States,
other countries, or both.


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


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 644 man/thinkpad.4 $RPM_BUILD_ROOT%{_mandir}/man4/thinkpad.4
install -Dpm 644 %{SOURCE1} \
    $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.perms.d/60-thinkpad.perms
install -Dpm 755 %{SOURCE2} \
    $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/thinkpad.modules


%clean
rm -rf $RPM_BUILD_ROOT


%files 
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README SUPPORTED-MODELS TECHNOTES
%config(noreplace) %{_sysconfdir}/security/console.perms.d/*-thinkpad.perms
%{_sysconfdir}/sysconfig/modules/thinkpad.modules
%{_mandir}/man4/thinkpad.4*


%changelog
* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-5
- Rename to thinkpad-kmod-common.

* Mon Dec 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-4
- Provide kmod-config(thinkpad).

* Mon Dec 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-3
- Resync with old kernel-module-thinkpad-5.8-2:
  - Autoload modules at boot time.
  - Add console.perms.d snippet, drop obsolete README.Fedora.

* Sun Dec 18 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 5.8-2
- Split into thinkpad and thinkpad-kmod.

* Sat Apr  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-1
- Adjust for FC4 kernel-devel.
- Drop console.perms munging, document it in README.Fedora instead.

* Sat Jan  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.3
- Patch to work with kernel 2.6.10.
- Drop udev stuff and thinkpad group, intruduce console.perms munging.

* Sun Dec  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.2
- Drop support for kernels < 2.6, require udev, clean up specfile.
- Install modules into /lib/modules/$uname/updates/thinkpad
  (was /lib/modules/$uname/thinkpad).

* Mon Nov 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.1
- Update to 5.8.
- Patch to work with kernel 2.6.9 (final).

* Wed Sep 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.7-0.fdr.1
- Update to 5.7.

* Sat Sep 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.2
- Reset module file modes to 644 for 2.6 kernels too.
- Drop private copy of kmodhelper, use the one in fedora-rpmdevtools instead
  (2.4 kernels only).

* Tue Sep  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.1
- Update to 5.6, parmdesc patch applied upstream.
- Patch to honor kernel optflags for 2.6 kernels.

* Fri Jul 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.5-0.fdr.1
- Update to 5.5.
- Clean up kernel >= 2.6 support.

* Sun Mar 14 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.4
- Fix README path in %%description (#503).
- Avoid misleading build error message when no kernel-source is installed.

* Mon Feb  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.3
- Update to kmodhelper 0.9.8.

* Sat Jan 31 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.2
- Further spec cleanups, kmodhelper 0.9.7.

* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.1
- Update to 5.0, and kmodhelper to 0.9.6.
- Use MAKEDEV again.

* Thu Jan  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.2.trial1
- Cosmetic specfile changes.

* Sun Dec 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.1.trial1
- Update to 4.999-trial1.
- Experimental, untested support for kernel 2.6.
- New version (0.9.5) of kmodhelper.

* Sat Dec 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.7
- Honor --target again.
- New version of kmodhelper.

* Fri Dec 19 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.6
- Pretty much reworked specfile, it should now be relatively easy to build
  modules for all kernel variants if one so desires.
- Back to providing kernel-module instead of kernel-modules because the
  naming scheme doesn't coexist prettily with up2date's kernel-modules
  behavior.
- Run depmod only if installing/uninstalling modules for the running kernel.

* Sat Dec  6 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.5
- Require /boot/vmlinuz-%%{kversion} (bug 503).
- Provide kernel-modules instead of kernel-module (bug 503).
- Build modules with the correct $CC.

* Tue Nov 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.4
- Don't use MAKEDEV to create /dev/thinkpad.

* Sat Nov 22 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.3
- Use sourceforge.net tarball.

* Sun Nov 16 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.2
- Add kernel config location workararound for .nptl kernels.

* Sat Oct 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.1
- Update to 4.8.
- Include kernel cflags scripts in the package.

* Tue Jul 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.2
- Nuke reference to README.modules.conf in %%description (bug 503).
- Use fedora-rpm-helper.

* Thu Jul 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.1
- Update to 4.6.
- Drop README.modules.conf; upstream README has the necessary info.

* Sat May 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.4-0.fdr.1
- Update to 4.4 (from Debian).
- Un-hardwire 2.4.x build.
- Use proper kernel CFLAGS.
- Require specific kernel version.
- Use /dev/MAKEDEV for creating the device node, and own it.
- %%{buildroot} -> $RPM_BUILD_ROOT.
- Post(un)install scriptlet cleanups.

* Fri Apr 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.4
- Actually build for a 2.4.x kernel, hardwired for now (#214).

* Mon Apr 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.3
- Rename to kernel-module-thinkpad.
- Obsolete kernel-mod-thinkpad.
- Add ExclusiveArch: i586 i686.
- Fix missing epoch in kernel-source dependency.

* Mon Apr  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.2
- Actually include README.modules.conf (#8 comment 13).

* Sat Apr  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.1
- Update to 4.3.
- More spec file cleanups.

* Mon Mar 31 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.3
- Small spec cleanups.

* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.2
- %%postun tricks for better cleanup after erase.

* Thu Mar 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.1
- Updated according to Fedora naming guidelines RC3.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.4
- Proof-of-concept for new kernel module packaging guideline proposal.
- Create group and /dev/thinkpad only on new install.
- Renamed to thinkpad-kernel.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.3
- Do install_modules instead of install in %%install to avoid unnecessary
  modprobing (#8).

* Sat Feb 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.2
- Add support for %%kernel define.

* Sat Feb  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.1
- First Fedora release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:12:32 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:14:12 -0000	1.2
@@ -0,0 +1 @@
+thinkpad_5.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:12:32 -0000	1.1
+++ sources	26 Jan 2006 22:14:12 -0000	1.2
@@ -0,0 +1 @@
+288ab19587bb3a8a4d6097448059b4c6  thinkpad_5.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:16:20 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Thu, 26 Jan 2006 17:16:20 -0500
Subject: rpms/nagios/FC-4 nagios.spec,1.2,1.3
Message-ID: <200601262216.k0QMGrid018679@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18657

Modified Files:
	nagios.spec 
Log Message:
Fixed bugzilla #49609


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nagios.spec	19 Jan 2006 23:22:41 -0000	1.2
+++ nagios.spec	26 Jan 2006 22:16:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 1.3
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -120,7 +120,7 @@
 %post
 /sbin/chkconfig --add %{name} || :
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
-%{_sbindir}/usermod -G %{name} apache || :
+%{_sbindir}/usermod -a -G %{name} apache || :
 
 %postun
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
+- Fixed usermod -a issue, Bugzilla #49609
+
 * Sun Jan 15 2005 Mike McGrath <imlinux at gmail.com> 1.3-14
 - Fedora friendly spec file
 



From fedora-extras-commits at redhat.com  Thu Jan 26 22:19:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:19:33 -0500
Subject: rpms/thinkpad-kmod/devel - New directory
Message-ID: <200601262219.k0QMJZ2X018795@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/thinkpad-kmod/devel

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:19:16 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:19:16 -0500
Subject: rpms/thinkpad-kmod - New directory
Message-ID: <200601262219.k0QMJWpx018783@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774/thinkpad-kmod

Log Message:
Directory /cvs/extras/rpms/thinkpad-kmod added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:19:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:19:56 -0500
Subject: rpms/thinkpad-kmod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262219.k0QMJwel018831@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819

Added Files:
	Makefile import.log 
Log Message:
Setup of module thinkpad-kmod


--- NEW FILE Makefile ---
# Top level Makefile for module thinkpad-kmod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:20:05 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:20:05 -0500
Subject: rpms/thinkpad-kmod/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262220.k0QMK7Rr018851@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18819/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module thinkpad-kmod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:21:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:21:40 -0500
Subject: rpms/thinkpad-kmod import.log,1.1,1.2
Message-ID: <200601262222.k0QMMCQ5018941@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18900

Modified Files:
	import.log 
Log Message:
auto-import thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4 on branch devel from thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:19:54 -0000	1.1
+++ import.log	26 Jan 2006 22:21:37 -0000	1.2
@@ -0,0 +1 @@
+thinkpad-kmod-5_8-9_2_6_14_1_1656_FC4:HEAD:thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4.src.rpm:1138314107



From fedora-extras-commits at redhat.com  Thu Jan 26 22:21:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:21:46 -0500
Subject: rpms/thinkpad-kmod/devel kmodtool, NONE,
	1.1 thinkpad-kmod-2615pm.patch, NONE,
	1.1 thinkpad-kmod-percpu.patch, NONE, 1.1 thinkpad-kmod.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262222.k0QMMIxs018954@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18900/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kmodtool thinkpad-kmod-2615pm.patch thinkpad-kmod-percpu.patch 
	thinkpad-kmod.spec 
Log Message:
auto-import thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4 on branch devel from thinkpad-kmod-5.8-9.2.6.14_1.1656_FC4.src.rpm
Initial import.


--- NEW FILE kmodtool ---
#!/bin/bash

# kmodtool - Helper script for building kernel module RPMs
# Copyright (c) 2003-2006 Ville Skytt?? <ville.skytta at iki.fi>,
#                         Thorsten Leemhuis <fedora at leemhuis.info>
#
# 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.

myprog="kmodtool"
myver="0.10.3"
knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
kmod_name=
kver=
verrel=
variant=

get_verrel ()
{
  verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
}

print_verrel ()
{
  get_verrel $@ || return $?
  echo "${verrel}"
}

get_variant ()
{
  variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
  [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
}

print_variant ()
{
  get_variant $@ || return $?
  echo "${variant}"
}


get_rpmtemplate ()
{
    local variant="${1}"
    local dashvariant="${variant:+-${variant}}"
    cat <<EOF
%package       -n kmod-${kmod_name}${dashvariant}
Summary:          ${kmod_name} kernel module(s)
Group:            System Environment/Kernel
Provides:         kernel-module = ${verrel}${variant}
Provides:         kmod-${kmod_name} = %{version}-%{release}
Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
Requires:         ${kmod_name}-kmod-common = %{version}
Requires(post):   /sbin/depmod
Requires(postun): /sbin/depmod
BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
%description   -n kmod-${kmod_name}${dashvariant}
This package provides the ${kmod_name} kernel modules built for the Linux
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
%post          -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aeF /boot/System.map-${verrel}${variant} ${verrel}${variant} > /dev/null || :
%postun        -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
%files         -n kmod-${kmod_name}${dashvariant}
%defattr(644,root,root,755)
/lib/modules/${verrel}${variant}/extra/${kmod_name}/

EOF
}

print_rpmtemplate ()
{
  kmod_name="${1}"
  shift
  kver="${1}"
  get_verrel "${1}"
  shift
  if [ -z "${kmod_name}" ] ; then
    echo "Please provide the kmodule-name as first parameter." >&2
    exit 2
  elif [ -z "${kver}" ] ; then
    echo "Please provide the kver as second parameter." >&2
    exit 2
  elif [ -z "${verrel}" ] ; then
    echo "Couldn't find out the verrel." >&2
    exit 2
  fi

  for variant in "$@" ; do
    get_rpmtemplate "${variant}"
  done
}

usage ()
{
  cat <<EOF
You called: ${invocation}

Usage: ${myprog} <command> <option>+
 Commands:
  verrel <uname>                               
    - Get "base" version-release.
  variant <uname>                               
    - Get variant from uname.
  rpmtemplate <mainpgkname> <uname> <variants> 
    - Return a template for
  version  
    - Output version number and exit.
EOF
}

invocation="$(basename ${0}) $@"
while [ "${1}" ] ; do
  case "${1}" in
    verrel)
      shift
      print_verrel $@
      exit $?
      ;;
    variant)
      shift
      print_variant $@
      exit $?
      ;;
    rpmtemplate)
      shift
      print_rpmtemplate "$@"
      exit $?
      ;;
    version)
      echo "${myprog} ${myver}"
      exit 0
      ;;
    *)
      echo "Error: Unknown option '${1}'." >&2
      usage >&2
      exit 2
      ;;
  esac
done

# Local variables:
# mode: sh
# sh-indentation: 2
# indent-tabs-mode: nil
# End:
# ex: ts=2 sw=2 et

thinkpad-kmod-2615pm.patch:

--- NEW FILE thinkpad-kmod-2615pm.patch ---
--- 2.6/drivers/thinkpadpm.c~	2004-09-19 12:32:57.000000000 +0300
+++ 2.6/drivers/thinkpadpm.c	2005-12-26 20:18:07.000000000 +0200
@@ -39,6 +39,9 @@
 #include <linux/apm_bios.h>
 #include <linux/pm.h>
 #include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+#include <linux/pm_legacy.h>
+#endif
 #include "thinkpad_common.h"
 #include "thinkpadpm.h"
 
@@ -472,7 +475,7 @@
 {
 
 	/*** Set up APM BIOS interface ***/
-	if ( !pm_active ) {
+	if ( !PM_IS_ACTIVE() ) {
 		printk(KERN_INFO "thinkpadpm: Power management not active. :-(\n");
 		return -ENODEV;
 	}

thinkpad-kmod-percpu.patch:

--- NEW FILE thinkpad-kmod-percpu.patch ---
--- 2.6/drivers/thinkpadpm.c~	2004-09-19 12:32:57.000000000 +0300
+++ 2.6/drivers/thinkpadpm.c	2005-01-08 01:18:48.000000000 +0200
@@ -169,11 +169,11 @@
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
 #define get_gdt_table()	(cpu_gdt_table[get_cpu()])
-#define put_gdt_table()	put_cpu()
 #else
-#define get_gdt_table()	(get_cpu_ptr(cpu_gdt_table))
-#define put_gdt_table()	put_cpu_ptr(cpu_gdt_table)
+#include <linux/percpu.h>
+#define get_gdt_table()	(per_cpu(cpu_gdt_table, get_cpu()))
 #endif
+#define put_gdt_table()	put_cpu()
 
 /**
  *	apm_bios_call	-	Make an APM BIOS 32bit call


--- NEW FILE thinkpad-kmod.spec ---
# stuff to be implemented externally:
Source10: kmodtool
%define   kmodtool sh %{SOURCE10}
# end stuff to be ...

                %define kmod_name thinkpad
                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}

Name:           %{kmod_name}-kmod
Summary:        %{kmod_name} kernel modules
Version:        5.8
Release:        9.%(echo %{kverrel} | tr - _)

URL:            http://tpctl.sourceforge.net/
Source0:        http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
Patch0:		%{name}-percpu.patch
Patch1:         %{name}-2615pm.patch
License:        GPL
Group:          System Environment/Kernel
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Do other arch thinkpads (that we care about) exist?
ExclusiveArch:  i586 i686

%description
This package provides %{kmod_name} kernel modules.

# magic hidden here:
%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}

%prep
# to understand the magic better or to debug it, uncomment this:
#%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null
#sleep 5

%setup -q -T -c -a 0
cd %{kmod_name}-%{version}
%{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile
sed -i 's|depmod -a|echo depmod -a disabled|' 2.6/drivers/Makefile
%patch0 -p0
%patch1 -p0
cd ..
for kvariant in %{kvariants} ; do
    cp -a %{kmod_name}-%{version}* _kmod_build_$kvariant
done


%build
for kvariant in %{kvariants} ; do
    make %{?_smp_mflags} -C _kmod_build_$kvariant/2.6/drivers V=1 \
       KSRC=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}
done
    

%install
rm -rf $RPM_BUILD_ROOT
for kvariant in %{kvariants} ; do
    make -C _kmod_build_$kvariant/2.6/drivers install \
        MODULESROOT=$RPM_BUILD_ROOT/lib/modules/%{kverrel}$kvariant/extra
done
chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-9
- Remove "up" == "" support, related cleanups.

* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-8
- Add RHEL4 compatibility (packaging, not code).

* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-7
- Convert to using new kmodhelper.

* Wed Jan  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-6
- Drop 2.6.15pre support hack.

* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-5
- s/kmod-config(thinkpad)/thinkpad-kmod-common/

* Mon Dec 26 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-4
- Require kmod-config(thinkpad).

* Mon Dec 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-3
- Don't build xen-* or smp modules by default.
- Hack to build with kernel >= 2.6.15 without legacy PM configured.

* Sun Dec 18 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 5.8-2
- Split into thinkpad and thinkpad-kmod.
- Adjust to new Fedora Extras kernel module scheme.

* Sat Apr  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-1
- Adjust for FC4 kernel-devel.
- Drop console.perms munging, document it in README.Fedora instead.

* Sat Jan  8 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.3
- Patch to work with kernel 2.6.10.
- Drop udev stuff and thinkpad group, intruduce console.perms munging.

* Sun Dec  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.2
- Drop support for kernels < 2.6, require udev, clean up specfile.
- Install modules into /lib/modules/$uname/updates/thinkpad
  (was /lib/modules/$uname/thinkpad).

* Mon Nov 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.8-0.fdr.1
- Update to 5.8.
- Patch to work with kernel 2.6.9 (final).

* Wed Sep 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.7-0.fdr.1
- Update to 5.7.

* Sat Sep 11 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.2
- Reset module file modes to 644 for 2.6 kernels too.
- Drop private copy of kmodhelper, use the one in fedora-rpmdevtools instead
  (2.4 kernels only).

* Tue Sep  7 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.6-0.fdr.1
- Update to 5.6, parmdesc patch applied upstream.
- Patch to honor kernel optflags for 2.6 kernels.

* Fri Jul 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.5-0.fdr.1
- Update to 5.5.
- Clean up kernel >= 2.6 support.

* Sun Mar 14 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.4
- Fix README path in %%description (#503).
- Avoid misleading build error message when no kernel-source is installed.

* Mon Feb  9 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.3
- Update to kmodhelper 0.9.8.

* Sat Jan 31 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.2
- Further spec cleanups, kmodhelper 0.9.7.

* Fri Jan 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.0-0.fdr.1
- Update to 5.0, and kmodhelper to 0.9.6.
- Use MAKEDEV again.

* Thu Jan  8 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.2.trial1
- Cosmetic specfile changes.

* Sun Dec 28 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.999-0.fdr.0.1.trial1
- Update to 4.999-trial1.
- Experimental, untested support for kernel 2.6.
- New version (0.9.5) of kmodhelper.

* Sat Dec 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.7
- Honor --target again.
- New version of kmodhelper.

* Fri Dec 19 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.6
- Pretty much reworked specfile, it should now be relatively easy to build
  modules for all kernel variants if one so desires.
- Back to providing kernel-module instead of kernel-modules because the
  naming scheme doesn't coexist prettily with up2date's kernel-modules
  behavior.
- Run depmod only if installing/uninstalling modules for the running kernel.

* Sat Dec  6 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.5
- Require /boot/vmlinuz-%%{kversion} (bug 503).
- Provide kernel-modules instead of kernel-module (bug 503).
- Build modules with the correct $CC.

* Tue Nov 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.4
- Don't use MAKEDEV to create /dev/thinkpad.

* Sat Nov 22 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.3
- Use sourceforge.net tarball.

* Sun Nov 16 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.2
- Add kernel config location workararound for .nptl kernels.

* Sat Oct 11 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.8-0.fdr.1
- Update to 4.8.
- Include kernel cflags scripts in the package.

* Tue Jul 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.2
- Nuke reference to README.modules.conf in %%description (bug 503).
- Use fedora-rpm-helper.

* Thu Jul 24 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.6-0.fdr.1
- Update to 4.6.
- Drop README.modules.conf; upstream README has the necessary info.

* Sat May 17 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.4-0.fdr.1
- Update to 4.4 (from Debian).
- Un-hardwire 2.4.x build.
- Use proper kernel CFLAGS.
- Require specific kernel version.
- Use /dev/MAKEDEV for creating the device node, and own it.
- %%{buildroot} -> $RPM_BUILD_ROOT.
- Post(un)install scriptlet cleanups.

* Fri Apr 25 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.4
- Actually build for a 2.4.x kernel, hardwired for now (#214).

* Mon Apr 21 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.3
- Rename to kernel-module-thinkpad.
- Obsolete kernel-mod-thinkpad.
- Add ExclusiveArch: i586 i686.
- Fix missing epoch in kernel-source dependency.

* Mon Apr  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.2
- Actually include README.modules.conf (#8 comment 13).

* Sat Apr  5 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.3-0.fdr.1
- Update to 4.3.
- More spec file cleanups.

* Mon Mar 31 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.3
- Small spec cleanups.

* Sun Mar 30 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.2
- %%postun tricks for better cleanup after erase.

* Thu Mar 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:3.7-0.fdr.1
- Updated according to Fedora naming guidelines RC3.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.4
- Proof-of-concept for new kernel module packaging guideline proposal.
- Create group and /dev/thinkpad only on new install.
- Renamed to thinkpad-kernel.

* Sun Feb 23 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.3
- Do install_modules instead of install in %%install to avoid unnecessary
  modprobing (#8).

* Sat Feb 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.2
- Add support for %%kernel define.

* Sat Feb  8 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.7-1.fedora.1
- First Fedora release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:20:04 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:21:45 -0000	1.2
@@ -0,0 +1 @@
+thinkpad_5.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:20:04 -0000	1.1
+++ sources	26 Jan 2006 22:21:45 -0000	1.2
@@ -0,0 +1 @@
+288ab19587bb3a8a4d6097448059b4c6  thinkpad_5.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Jan 26 22:25:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:25:00 -0500
Subject: owners owners.list,1.566,1.567
Message-ID: <200601262225.k0QMPX7Q019046@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19027

Modified Files:
	owners.list 
Log Message:
-kernel-module-thinkpad, +thinkpad-kmod*


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- owners.list	26 Jan 2006 17:08:41 -0000	1.566
+++ owners.list	26 Jan 2006 22:25:00 -0000	1.567
@@ -451,7 +451,6 @@
 Fedora Extras|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|kernel-module-thinkpad|IBM ThinkPad support kernel modules|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|
 Fedora Extras|kickpim|KDE kicker applet to access addressbook|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kid3|Efficient ID3 tagger|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1234,6 +1233,8 @@
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 26 22:28:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:28:28 -0500
Subject: rpms/lirc-kmod-common - New directory
Message-ID: <200601262228.k0QMSU7n019103@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19095/lirc-kmod-common

Log Message:
Directory /cvs/extras/rpms/lirc-kmod-common added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:28:34 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:28:34 -0500
Subject: rpms/lirc-kmod-common/devel - New directory
Message-ID: <200601262228.k0QMSaOT019118@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19095/lirc-kmod-common/devel

Log Message:
Directory /cvs/extras/rpms/lirc-kmod-common/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:28:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:28:54 -0500
Subject: rpms/lirc-kmod-common Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262228.k0QMSutG019153@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19140

Added Files:
	Makefile import.log 
Log Message:
Setup of module lirc-kmod-common


--- NEW FILE Makefile ---
# Top level Makefile for module lirc-kmod-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:29:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:29:00 -0500
Subject: rpms/lirc-kmod-common/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262229.k0QMT2cr019173@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19140/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lirc-kmod-common


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:29:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:29:32 -0500
Subject: rpms/lirc-kmod-common/devel lirc-kmod-common.spec,NONE,1.1
Message-ID: <200601262229.k0QMTYfB019225@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19200/devel

Added Files:
	lirc-kmod-common.spec 
Log Message:
auto-import lirc-kmod-common-0.8.0-2 on branch devel from lirc-kmod-common-0.8.0-2.src.rpm
Initial import.


--- NEW FILE lirc-kmod-common.spec ---
# TODO: udev rules

%define kmod_name lirc

Name:           %{kmod_name}-kmod-common
Version:        0.8.0
Release:        2%{?dist}
Summary:        Common files for LIRC kernel modules

Group:          System Environment/Kernel
License:        GPL
URL:            http://www.lirc.org/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       lirc = %{version}
Requires:       kmod-%{kmod_name} = %{version}
Requires:       udev

%description
%{summary}.


%prep
%setup -q -T -c


%install
rm -rf $RPM_BUILD_ROOT
# TODO: udev rules?


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)


%changelog
* Wed Dec 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
- Remove kmod-config(lirc) provision.

* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-1
- First build.



From fedora-extras-commits at redhat.com  Thu Jan 26 22:29:26 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:29:26 -0500
Subject: rpms/lirc-kmod-common import.log,1.1,1.2
Message-ID: <200601262229.k0QMTwbw019236@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod-common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19200

Modified Files:
	import.log 
Log Message:
auto-import lirc-kmod-common-0.8.0-2 on branch devel from lirc-kmod-common-0.8.0-2.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod-common/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:28:54 -0000	1.1
+++ import.log	26 Jan 2006 22:29:26 -0000	1.2
@@ -0,0 +1 @@
+lirc-kmod-common-0_8_0-2:HEAD:lirc-kmod-common-0.8.0-2.src.rpm:1138314586



From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:27 -0500
Subject: rpms/lirc-kmod/devel - New directory
Message-ID: <200601262233.k0QMXU14019391@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19368/lirc-kmod/devel

Log Message:
Directory /cvs/extras/rpms/lirc-kmod/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:12 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:12 -0500
Subject: rpms/lirc-kmod - New directory
Message-ID: <200601262233.k0QMXGMv019376@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19368/lirc-kmod

Log Message:
Directory /cvs/extras/rpms/lirc-kmod added to the repository




From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:48 -0500
Subject: rpms/lirc-kmod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601262233.k0QMXolQ019448@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19435

Added Files:
	Makefile import.log 
Log Message:
Setup of module lirc-kmod


--- NEW FILE Makefile ---
# Top level Makefile for module lirc-kmod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:54 -0500
Subject: rpms/lirc-kmod/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601262233.k0QMXusW019475@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19435/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lirc-kmod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Thu Jan 26 22:33:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:33:40 -0500
Subject: owners owners.list,1.567,1.568
Message-ID: <200601262234.k0QMYCKk019486@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19405

Modified Files:
	owners.list 
Log Message:
+lirc-kmod*


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.567
retrieving revision 1.568
diff -u -r1.567 -r1.568
--- owners.list	26 Jan 2006 22:25:00 -0000	1.567
+++ owners.list	26 Jan 2006 22:33:39 -0000	1.568
@@ -585,6 +585,8 @@
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lirc|The Linux Infrared Remote Control package|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod|LIRC kernel modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|lirc-kmod-common|Common files for LIRC kernel module packages|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|lmarbles|Atomix clone where you create figures out of marbles|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lock-keys-applet|A GNOME panel applet that shows the status of the lock keys|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Jan 26 22:35:17 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:35:17 -0500
Subject: rpms/lirc-kmod import.log,1.1,1.2
Message-ID: <200601262235.k0QMZoDU019570@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19529

Modified Files:
	import.log 
Log Message:
auto-import lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5 on branch devel from lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5.src.rpm
Initial import.


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Jan 2006 22:33:48 -0000	1.1
+++ import.log	26 Jan 2006 22:35:17 -0000	1.2
@@ -0,0 +1 @@
+lirc-kmod-0_8_0-1_2_6_15_1_1864_FC5:HEAD:lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5.src.rpm:1138314924



From fedora-extras-commits at redhat.com  Thu Jan 26 22:35:23 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 26 Jan 2006 17:35:23 -0500
Subject: rpms/lirc-kmod/devel kmodtool, NONE, 1.1 lirc-kmod-0.8.0-2616.patch,
	NONE, 1.1 lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch, NONE,
	1.1 lirc-kmod.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601262235.k0QMZtem019576@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19529/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kmodtool lirc-kmod-0.8.0-2616.patch 
	lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch lirc-kmod.spec 
Log Message:
auto-import lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5 on branch devel from lirc-kmod-0.8.0-1.2.6.15_1.1864_FC5.src.rpm
Initial import.


--- NEW FILE kmodtool ---
#!/bin/bash

# kmodtool - Helper script for building kernel module RPMs
# Copyright (c) 2003-2006 Ville Skytt?? <ville.skytta at iki.fi>,
#                         Thorsten Leemhuis <fedora at leemhuis.info>
#
# 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.

myprog="kmodtool"
myver="0.10.3"
knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
kmod_name=
kver=
verrel=
variant=

get_verrel ()
{
  verrel="$(echo "${1-$(uname -r)}" | sed 's/'${knownvariants}'$//')"
}

print_verrel ()
{
  get_verrel $@ || return $?
  echo "${verrel}"
}

get_variant ()
{
  variant="$(echo "${1-$(uname -r)}" | sed 's/^.*'${knownvariants}'$/\1/')"
  [ "${variant}" != "${1-$(uname -r)}" ] || variant='""'
}

print_variant ()
{
  get_variant $@ || return $?
  echo "${variant}"
}


get_rpmtemplate ()
{
    local variant="${1}"
    local dashvariant="${variant:+-${variant}}"
    cat <<EOF
%package       -n kmod-${kmod_name}${dashvariant}
Summary:          ${kmod_name} kernel module(s)
Group:            System Environment/Kernel
Provides:         kernel-module = ${verrel}${variant}
Provides:         kmod-${kmod_name} = %{version}-%{release}
Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
Requires:         ${kmod_name}-kmod-common = %{version}
Requires(post):   /sbin/depmod
Requires(postun): /sbin/depmod
BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}
%description   -n kmod-${kmod_name}${dashvariant}
This package provides the ${kmod_name} kernel modules built for the Linux
kernel ${verrel}${variant} for the %{_target_cpu} family of processors.
%post          -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aeF /boot/System.map-${verrel}${variant} ${verrel}${variant} > /dev/null || :
%postun        -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
%files         -n kmod-${kmod_name}${dashvariant}
%defattr(644,root,root,755)
/lib/modules/${verrel}${variant}/extra/${kmod_name}/

EOF
}

print_rpmtemplate ()
{
  kmod_name="${1}"
  shift
  kver="${1}"
  get_verrel "${1}"
  shift
  if [ -z "${kmod_name}" ] ; then
    echo "Please provide the kmodule-name as first parameter." >&2
    exit 2
  elif [ -z "${kver}" ] ; then
    echo "Please provide the kver as second parameter." >&2
    exit 2
  elif [ -z "${verrel}" ] ; then
    echo "Couldn't find out the verrel." >&2
    exit 2
  fi

  for variant in "$@" ; do
    get_rpmtemplate "${variant}"
  done
}

usage ()
{
  cat <<EOF
You called: ${invocation}

Usage: ${myprog} <command> <option>+
 Commands:
  verrel <uname>                               
    - Get "base" version-release.
  variant <uname>                               
    - Get variant from uname.
  rpmtemplate <mainpgkname> <uname> <variants> 
    - Return a template for
  version  
    - Output version number and exit.
EOF
}

invocation="$(basename ${0}) $@"
while [ "${1}" ] ; do
  case "${1}" in
    verrel)
      shift
      print_verrel $@
      exit $?
      ;;
    variant)
      shift
      print_variant $@
      exit $?
      ;;
    rpmtemplate)
      shift
      print_rpmtemplate "$@"
      exit $?
      ;;
    version)
      echo "${myprog} ${myver}"
      exit 0
      ;;
    *)
      echo "Error: Unknown option '${1}'." >&2
      usage >&2
      exit 2
      ;;
  esac
done

# Local variables:
# mode: sh
# sh-indentation: 2
# indent-tabs-mode: nil
# End:
# ex: ts=2 sw=2 et

lirc-kmod-0.8.0-2616.patch:

--- NEW FILE lirc-kmod-0.8.0-2616.patch ---
Index: drivers/lirc_atiusb/lirc_atiusb.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_atiusb/lirc_atiusb.c,v
retrieving revision 1.51
diff -u -r1.51 lirc_atiusb.c
--- drivers/lirc_atiusb/lirc_atiusb.c	29 Oct 2005 14:18:53 -0000	1.51
+++ drivers/lirc_atiusb/lirc_atiusb.c	21 Jan 2006 21:27:35 -0000
@@ -1180,7 +1180,9 @@
 }
 
 static struct usb_driver usb_remote_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	usb_remote_probe,
 	.disconnect =	usb_remote_disconnect,
Index: drivers/lirc_i2c/lirc_i2c.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_i2c/lirc_i2c.c,v
retrieving revision 1.35
diff -u -r1.35 lirc_i2c.c
--- drivers/lirc_i2c/lirc_i2c.c	20 Oct 2005 18:25:58 -0000	1.35
+++ drivers/lirc_i2c/lirc_i2c.c	21 Jan 2006 21:27:36 -0000
@@ -360,9 +360,18 @@
 static int ir_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
 static struct i2c_driver driver = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+        driver: {
+                 name:  "lirc_i2c",
+        },
+        id:             I2C_DRIVERID_INFRARED,
+#else
         name:           "i2c ir driver",
-        id:             I2C_DRIVERID_EXP3, /* FIXME */
+        id:             I2C_DRIVERID_EXP3,
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
         flags:          I2C_DF_NOTIFY,
+#endif
         attach_adapter: ir_probe,
         detach_client:  ir_detach,
         command:        ir_command,
Index: drivers/lirc_igorplugusb/lirc_igorplugusb.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_igorplugusb/lirc_igorplugusb.c,v
retrieving revision 1.7
diff -u -r1.7 lirc_igorplugusb.c
--- drivers/lirc_igorplugusb/lirc_igorplugusb.c	21 Mar 2005 14:39:38 -0000	1.7
+++ drivers/lirc_igorplugusb/lirc_igorplugusb.c	21 Jan 2006 21:27:36 -0000
@@ -615,7 +615,9 @@
 };
 
 static struct usb_driver usb_remote_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	usb_remote_probe,
 	.disconnect =	usb_remote_disconnect,
Index: drivers/lirc_imon/lirc_imon.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_imon/lirc_imon.c,v
retrieving revision 1.9
diff -u -r1.9 lirc_imon.c
--- drivers/lirc_imon/lirc_imon.c	3 Dec 2005 15:18:07 -0000	1.9
+++ drivers/lirc_imon/lirc_imon.c	21 Jan 2006 21:27:37 -0000
@@ -201,7 +201,9 @@
 
 /* USB Device data */
 static struct usb_driver imon_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner 		= THIS_MODULE,
+#endif
 	.name 		= MOD_NAME,
 	.probe 		= imon_probe,
 	.disconnect 	= imon_disconnect,
Index: drivers/lirc_mceusb/lirc_mceusb.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_mceusb/lirc_mceusb.c,v
retrieving revision 1.10
diff -u -r1.10 lirc_mceusb.c
--- drivers/lirc_mceusb/lirc_mceusb.c	29 Oct 2005 14:18:53 -0000	1.10
+++ drivers/lirc_mceusb/lirc_mceusb.c	21 Jan 2006 21:27:37 -0000
@@ -222,7 +222,9 @@
 
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver mceusb_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	mceusb_probe,
 	.disconnect =	mceusb_disconnect,
Index: drivers/lirc_mceusb2/lirc_mceusb2.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_mceusb2/lirc_mceusb2.c,v
retrieving revision 1.2
diff -u -r1.2 lirc_mceusb2.c
--- drivers/lirc_mceusb2/lirc_mceusb2.c	29 Oct 2005 14:18:53 -0000	1.2
+++ drivers/lirc_mceusb2/lirc_mceusb2.c	21 Jan 2006 21:27:38 -0000
@@ -585,7 +585,9 @@
 }
 
 static struct usb_driver usb_remote_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	usb_remote_probe,
 	.disconnect =	usb_remote_disconnect,
Index: drivers/lirc_sasem/lirc_sasem.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_sasem/lirc_sasem.c,v
retrieving revision 1.12
diff -u -r1.12 lirc_sasem.c
--- drivers/lirc_sasem/lirc_sasem.c	3 Dec 2005 15:18:07 -0000	1.12
+++ drivers/lirc_sasem/lirc_sasem.c	21 Jan 2006 21:27:38 -0000
@@ -189,7 +189,9 @@
 
 /* USB Device data */
 static struct usb_driver sasem_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner 		= THIS_MODULE,
+#endif
 	.name 		= MOD_NAME,
 	.probe 		= sasem_probe,
 	.disconnect 	= sasem_disconnect,
Index: drivers/lirc_streamzap/lirc_streamzap.c
===================================================================
RCS file: /cvsroot/lirc/lirc/drivers/lirc_streamzap/lirc_streamzap.c,v
retrieving revision 1.15
diff -u -r1.15 lirc_streamzap.c
--- drivers/lirc_streamzap/lirc_streamzap.c	6 Jan 2006 07:18:03 -0000	1.15
+++ drivers/lirc_streamzap/lirc_streamzap.c	21 Jan 2006 21:27:39 -0000
@@ -177,7 +177,9 @@
 /* usb specific object needed to register this driver with the usb subsystem */
 
 static struct usb_driver streamzap_driver = {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
 	.owner =	THIS_MODULE,
+#endif
 	.name =		DRIVER_NAME,
 	.probe =	streamzap_probe,
 	.disconnect =	streamzap_disconnect,

lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch:

--- NEW FILE lirc-kmod-0.8.0pre2-gpio-no-bttvp.patch ---
--- drivers/lirc_gpio/lirc_gpio.c~	2005-04-14 15:04:44.000000000 +0300
+++ drivers/lirc_gpio/lirc_gpio.c	2005-12-28 01:55:23.000000000 +0200
@@ -50,10 +50,9 @@
 #include "../drivers/char/bttvp.h"
 #else
 #include "../drivers/media/video/bttv.h"
-#include "../drivers/media/video/bttvp.h"
 #endif
 
-#if BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45)
+#if defined(BTTV_VERSION_CODE) && BTTV_VERSION_CODE < KERNEL_VERSION(0,7,45)
 #error "*******************************************************"
 #error " Sorry, this driver needs bttv version 0.7.45 or       "
 #error " higher. If you are using the bttv package, copy it to "


--- NEW FILE lirc-kmod.spec ---
# TODO: cmdir: (req: extra hw driver, http://www.innovationone.ca/)

# stuff to be implemented externally:
Source10: kmodtool
%define   kmodtool sh %{SOURCE10}
# end stuff to be ...

                %define kmod_name lirc
                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}

Name:           %{kmod_name}-kmod
Version:        0.8.0
Release:        1.%(echo %{kverrel} | tr - _)
Summary:        LIRC kernel modules

Group:          System Environment/Kernel
License:        GPL
URL:            http://www.lirc.org/
Source0:        http://download.sf.net/lirc/%{kmod_name}-%{version}.tar.bz2
Patch0:         %{name}-0.8.0pre2-gpio-no-bttvp.patch
Patch1:         %{name}-0.8.0-2616.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
LIRC is a package that allows you to decode and send infra-red and
other signals of many (but not all) commonly used remote controls.
Included applications include daemons which decode the received
signals as well as user space applications which allow controlling a
computer with a remote control.  This package contains additional
kernel modules to support additional remote control units.

# magic hidden here:
%{expand:%(%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null)}

%prep
# to understand the magic better or to debug it, uncomment this:
#%{kmodtool} rpmtemplate %{kmod_name} %{kverrel} %{kvariants} 2>/dev/null
#sleep 5

%setup -q -c -T -a 0
cd lirc-%{version}*
%patch0 -p0
%patch1 -p0
# *cough*
echo %{kverrel} | grep -q _FC5 && sed -i s/2,6,16/2,6,15/ \
    drivers/lirc_{i2c,imon,sasem,streamzap,*usb*}/lirc_*.c
# http://sf.net/tracker/?func=detail&aid=1406110&group_id=5444&atid=105444
sed -i -e 's/<asm\/segment\.h>/<asm\/uaccess.h>/' drivers/lirc_*/lirc_*.c
cd ..
for kvariant in %{kvariants} ; do
    cp -a lirc-%{version}* _kmod_build_$kvariant
done


%build
for kvariant in %{kvariants}
do
    ksrc=%{_usrsrc}/kernels/%{kverrel}${kvariant:+-$kvariant}-%{_target_cpu}

    cd _kmod_build_$kvariant

    # cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels), needs
    # additional hw driver from http://www.innovationone.ca/
    nobuild="cmdir"
    # gpio: missing drivers/media/video/bttv.h in kernel-devel
    [ -e $ksrc/drivers/media/video/bttv.h ] || nobuild="$nobuild gpio"
    # parallel: not smp safe
    grep -q ^CONFIG_SMP=y $ksrc/.config && nobuild="$nobuild parallel"
    for drv in $nobuild ; do
        sed -i -e "s/^\\s*(lirc_dev lirc_$drv)//" -e "s/^\\s*lirc_$drv//" \
            configure*
    done
    touch -r aclocal.m4 configure.in # avoid autofoo re-run

    %configure \
        --enable-sandboxed \
        --with-kerneldir=$ksrc \
        --with-moduledir=/lib/modules/%{kverrel}$kvariant/extra/%{kmod_name} \
        --with-driver=all
    make %{?_smp_mflags} -C drivers

    cd ..
done


%install
rm -rf $RPM_BUILD_ROOT
for dir in _kmod_build_* ; do
    make -C $dir/drivers install DESTDIR=$RPM_BUILD_ROOT
done
chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/*


%clean
rm -rf $RPM_BUILD_ROOT


%changelog
* Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-1
- 0.8.0.
- Hopefully fix lirc_{it87,serial,sir} on PPC, thanks to upstream.
- Hopefully fix i2c and usb drivers with kernel >= 2.6.15.
- Remove "up" == "" support, related cleanups.

* Tue Jan 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.9.pre4
- Add RHEL4 compatibility.

* Sat Jan 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.8.pre4
- 0.8.0pre4.
- Build all variants in separate dirs again for proper -debuginfo reasons.

* Sun Jan  8 2006 Thorsten Leemhuis <fedora at leemhuis.info> - 0.8.0-0.7.pre3
- Experiment with a new fedora-kmodhelper
- use a different approach for extracting/build/install

* Wed Jan  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.6.pre3
- Drop 2.6.15pre support hack.
- Clean up unneeded kernel-devel build dependency.

* Sun Jan  1 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.5.pre3
- 0.8.0pre3.

* Wed Dec 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.5.pre2
- Build non-UP modules against the correct source tree, D'oh!
- Patch gpio driver to not require bttvp.h (private), build and ship it
  if bttv.h is in kernel-devel.
- Disable parallel driver with SMP.

* Wed Dec 28 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.4.pre2
- s/kmod-config(lirc)/lirc-kmod-common/

* Tue Dec 27 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-0.3.pre2
- Split from the main lirc package, adapt to new kmod standard.
- Disable debugging features.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Jan 2006 22:33:54 -0000	1.1
+++ .cvsignore	26 Jan 2006 22:35:23 -0000	1.2
@@ -0,0 +1 @@
+lirc-0.8.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Jan 2006 22:33:54 -0000	1.1
+++ sources	26 Jan 2006 22:35:23 -0000	1.2
@@ -0,0 +1 @@
+0bf28bf82c7766a462f90927b6bf3af1  lirc-0.8.0.tar.bz2



From fedora-extras-commits at redhat.com  Thu Jan 26 22:47:33 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 26 Jan 2006 17:47:33 -0500
Subject: rpms/octave/FC-4 octave.spec,1.22,1.23
Message-ID: <200601262248.k0QMm6De019638@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19619

Modified Files:
	octave.spec 
Log Message:
Rebuilt for new hdf5 libraries


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- octave.spec	11 Nov 2005 22:33:49 -0000	1.22
+++ octave.spec	26 Jan 2006 22:47:33 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.1.72
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-2
+- Rebuild for new release of hdf5.
+
 * Fri Nov 11 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-1
 - New upstream release, remove old patch.
 



From fedora-extras-commits at redhat.com  Thu Jan 26 22:49:15 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 26 Jan 2006 17:49:15 -0500
Subject: rpms/octave/devel octave.spec,1.27,1.28
Message-ID: <200601262249.k0QMnlBs019722@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19705

Modified Files:
	octave.spec 
Log Message:
Rebuilt for new hdf5 libraries


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- octave.spec	19 Dec 2005 22:23:04 -0000	1.27
+++ octave.spec	26 Jan 2006 22:49:15 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -131,6 +131,9 @@
 
 
 %changelog
+* Thu Jan 26 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-5
+- Rebuild for new release of hdf5.
+
 * Mon Dec 19 2005 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.4-4
 - Rebuild for gcc 4.1.
 



From fedora-extras-commits at redhat.com  Fri Jan 27 05:09:49 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 27 Jan 2006 00:09:49 -0500
Subject: rpms/byzanz/devel .cvsignore, 1.2, 1.3 byzanz.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601270510.k0R5ALsv000362@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv337

Modified Files:
	.cvsignore byzanz.spec sources 
Log Message:
Update to 0.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 19:52:04 -0000	1.2
+++ .cvsignore	27 Jan 2006 05:09:48 -0000	1.3
@@ -1 +1 @@
-byzanz-0.0.3.tar.gz
+byzanz-0.1.0.tar.gz


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- byzanz.spec	19 Jan 2006 20:00:27 -0000	1.2
+++ byzanz.spec	27 Jan 2006 05:09:48 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
-Version: 0.0.3
-Release: 3%{?dist}
+Version: 0.1.0
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -15,6 +15,10 @@
 BuildRequires: gnome-vfs2-devel >= 2.12.0
 BuildRequires: libgnomeui-devel >= 2.12.0
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 %description
 Byzanz is a desktop recorder. Just like Istanbul. But it doesn't
 record to Ogg Theora, but to GIF.
@@ -28,21 +32,55 @@
 
 %install
 rm -rf %{buildroot}
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=%{buildroot} install
 %find_lang byzanz
 
 %clean
 rm -rf %{buildroot}
 
+%pre
+if [ $1 -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    if [ -f %{_sysconfdir}/gconf/schemas/byzanz.schemas ]; then
+        gconftool-2 --makefile-uninstall-rule \
+          %{_sysconfdir}/gconf/schemas/byzanz.schemas >/dev/null || :
+        killall -HUP gconfd-2 || :
+    fi
+fi
+
+%preun
+if [ $1 -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/byzanz.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/byzanz.schemas > /dev/null || :
+killall -HUP gconfd-2 || :
+
 %files -f byzanz.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS
 
+%{_sysconfdir}/gconf/schemas/byzanz.schemas
 %{_bindir}/byzanz-record
 %{_libdir}/bonobo/servers/ByzanzApplet.server
 %{_libexecdir}/byzanz-applet
+%{_datadir}/gnome-2.0/ui/byzanzapplet.xml
+%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-area.png
+%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-screen.png
+%{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png
 
 %changelog
+* Thu Jan 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.0-1
+- Update to 0.1.0
+- Add scriptlet for installing GConf schema.
+
 * Thu Jan 19 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.0.3-3
 - Bump release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 19:52:04 -0000	1.2
+++ sources	27 Jan 2006 05:09:48 -0000	1.3
@@ -1 +1 @@
-3c57cd11aba49fe05f77709cd9a7d609  byzanz-0.0.3.tar.gz
+3637e3a078aec602606ad053512b1209  byzanz-0.1.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 05:19:59 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Fri, 27 Jan 2006 00:19:59 -0500
Subject: rpms/byzanz/devel byzanz.spec,1.3,1.4
Message-ID: <200601270520.k0R5KVwj000480@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/rpms/byzanz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv463

Modified Files:
	byzanz.spec 
Log Message:
Add post and postun scripts to update the GTK+ icon cache.


Index: byzanz.spec
===================================================================
RCS file: /cvs/extras/rpms/byzanz/devel/byzanz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- byzanz.spec	27 Jan 2006 05:09:48 -0000	1.3
+++ byzanz.spec	27 Jan 2006 05:19:59 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A desktop recorder
 Name: byzanz
 Version: 0.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.freedesktop.org/~company/byzanz/
@@ -62,6 +62,16 @@
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/byzanz.schemas > /dev/null || :
 killall -HUP gconfd-2 || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f byzanz.lang
 %defattr(-,root,root,-)
@@ -77,6 +87,9 @@
 %{_datadir}/icons/hicolor/24x24/apps/byzanz-record-window.png
 
 %changelog
+* Thu Jan 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.0-2
+- Add post and postun scripts to update the GTK+ icon cache.
+
 * Thu Jan 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.1.0-1
 - Update to 0.1.0
 - Add scriptlet for installing GConf schema.



From fedora-extras-commits at redhat.com  Fri Jan 27 06:48:23 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 27 Jan 2006 01:48:23 -0500
Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.3,
	1.4 NetworkManager-vpnc.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601270648.k0R6mtPA002493@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2467

Modified Files:
	.cvsignore NetworkManager-vpnc.spec sources 
Log Message:
* Fri Jan 27 2006 Dan Williams <dcbw at redhat.com> - 0.5.0-1
- CVS snapshot for compatibility new NetworkManager




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	18 Aug 2005 19:48:19 -0000	1.3
+++ .cvsignore	27 Jan 2006 06:48:22 -0000	1.4
@@ -1,2 +1,3 @@
 NetworkManager-vpnc-0.2.tar.gz
 NetworkManager-vpnc-0.3.tar.gz
+NetworkManager-vpnc-0.5.0.tar.gz


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NetworkManager-vpnc.spec	6 Dec 2005 20:15:54 -0000	1.5
+++ NetworkManager-vpnc.spec	27 Jan 2006 06:48:22 -0000	1.6
@@ -1,4 +1,4 @@
-%define nm_version          0.4.1
+%define nm_version          0.5.1
 %define dbus_version        0.35
 %define gtk2_version        2.6.0
 %define vpnc_version        0.3.3-3
@@ -6,8 +6,8 @@
 
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
-Version: 0.3
-Release: 3
+Version: 0.5.0
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -84,6 +84,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Fri Jan 27 2006 Dan Williams <dcbw at redhat.com> - 0.5.0-1
+- CVS snapshot for compatibility new NetworkManager
+
 * Tue Dec  6 2005 Jeremy Katz <katzj at redhat.com> - 0.3-3
 - rebuild for new dbus
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Aug 2005 19:48:19 -0000	1.3
+++ sources	27 Jan 2006 06:48:22 -0000	1.4
@@ -1 +1 @@
-1dbc51c83118494a20cf9446a667585b  NetworkManager-vpnc-0.3.tar.gz
+45ffcb2a1c03c545db0c8d8a4fcbd885  NetworkManager-vpnc-0.5.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 07:31:22 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:31:22 -0500
Subject: rpms/system-config-control import.log,1.4,1.5
Message-ID: <200601270731.k0R7VsXv004741@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-5 on branch devel from system-config-control-1.0-5.src.rpm
Changed the interface


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	26 Jan 2006 12:38:09 -0000	1.4
+++ import.log	27 Jan 2006 07:31:21 -0000	1.5
@@ -1,3 +1,4 @@
 system-config-control-1_0-3:HEAD:system-config-control-1.0-3.src.rpm:1131968670
 system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947
 system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074
+system-config-control-1_0-5:HEAD:system-config-control-1.0-5.src.rpm:1138347078



From fedora-extras-commits at redhat.com  Fri Jan 27 07:31:28 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:31:28 -0500
Subject: rpms/system-config-control/devel sources, 1.4,
	1.5 system-config-control.spec, 1.2, 1.3
Message-ID: <200601270732.k0R7W0b2004747@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706/devel

Modified Files:
	sources system-config-control.spec 
Log Message:
auto-import system-config-control-1.0-5 on branch devel from system-config-control-1.0-5.src.rpm
Changed the interface


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jan 2006 12:36:03 -0000	1.4
+++ sources	27 Jan 2006 07:31:27 -0000	1.5
@@ -1 +1 @@
-2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2
+39c7bbc5ff84d6331d204adf577f3bbe  system-config-control-1.0.tar.bz2


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-control.spec	17 Jan 2006 08:54:10 -0000	1.2
+++ system-config-control.spec	27 Jan 2006 07:31:27 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base



From fedora-extras-commits at redhat.com  Fri Jan 27 07:45:00 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:45:00 -0500
Subject: rpms/system-config-control import.log,1.5,1.6
Message-ID: <200601270745.k0R7jWeJ005064@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5029

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-5 on branch FC-4 from system-config-control-1.0-5.src.rpm
1_0-5 new version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	27 Jan 2006 07:31:21 -0000	1.5
+++ import.log	27 Jan 2006 07:44:59 -0000	1.6
@@ -2,3 +2,4 @@
 system-config-control-1_0-4:HEAD:system-config-control-1.0-4.src.rpm:1138278947
 system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074
 system-config-control-1_0-5:HEAD:system-config-control-1.0-5.src.rpm:1138347078
+system-config-control-1_0-5:FC-4:system-config-control-1.0-5.src.rpm:1138347895



From fedora-extras-commits at redhat.com  Fri Jan 27 07:45:05 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:45:05 -0500
Subject: rpms/system-config-control/FC-4 sources, 1.4,
	1.5 system-config-control.spec, 1.2, 1.3
Message-ID: <200601270745.k0R7jc9W005068@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5029/FC-4

Modified Files:
	sources system-config-control.spec 
Log Message:
auto-import system-config-control-1.0-5 on branch FC-4 from system-config-control-1.0-5.src.rpm
1_0-5 new version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Jan 2006 12:38:14 -0000	1.4
+++ sources	27 Jan 2006 07:45:05 -0000	1.5
@@ -1 +1 @@
-2a2a9a7239a85abf6793d67784fa653f  system-config-control-1.0.tar.bz2
+39c7bbc5ff84d6331d204adf577f3bbe  system-config-control-1.0.tar.bz2


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/FC-4/system-config-control.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- system-config-control.spec	17 Jan 2006 08:56:40 -0000	1.2
+++ system-config-control.spec	27 Jan 2006 07:45:05 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base



From fedora-extras-commits at redhat.com  Fri Jan 27 07:49:35 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:49:35 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.3,
	NONE
Message-ID: <200601270749.k0R7nbcE005210@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5201

Removed Files:
	system-config-control.spec 
Log Message:
removed spec which is giving tag errors


--- system-config-control.spec DELETED ---



From fedora-extras-commits at redhat.com  Fri Jan 27 07:50:28 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:50:28 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.4,
	1.5
Message-ID: <200601270751.k0R7p1Dg005248@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5227

Added Files:
	system-config-control.spec 
Log Message:
added new system-config-control.spec


Index: system-config-control.spec
===================================================================
RCS file: system-config-control.spec
diff -N system-config-control.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ system-config-control.spec	27 Jan 2006 07:50:28 -0000	1.5
@@ -0,0 +1,58 @@
+Summary: Centralized tool for Fedora configuration utilities
+Name: system-config-control
+Version: 1.0
+Release: 5%{?dist}
+URL: http://www.indianoss.org/
+License: GPL
+Group: System Environment/Base
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+Source0: http://download.sourceforge.net/indianoss/%{name}-%{version}.tar.bz2
+BuildRequires: desktop-file-utils, gettext, intltool
+Requires: usermode, firstboot
+
+%description
+System-config-control provides an organized and centralized interface to all of
+Fedora's configuration utilities. It also hooks into firstboot, allowing these
+tools to be run after initial installation.
+
+%prep
+%setup -q
+
+%build
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make INSTROOT=$RPM_BUILD_ROOT install
+desktop-file-install --delete-original          \
+  --vendor fedora                               \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --mode 0644                                   \
+  --add-category X-Fedora                       \
+  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
+%find_lang %{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+%{_bindir}/%{name}
+%{_datadir}/%{name}/
+%{_datadir}/firstboot/modules/*
+%{_datadir}/applications/*.desktop
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/security/console.apps/%{name}
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
+
+%changelog
+* Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
+- Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
+- Added icons in the tabs of the categories.
+
+* Fri Oct 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.0-3
+- cleanups for Fedora
+
+* Mon Oct  3 2005 Ankit Patel <ankit644 at yahoo.com>
+- Initial build.



From fedora-extras-commits at redhat.com  Fri Jan 27 07:59:45 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 02:59:45 -0500
Subject: rpms/system-config-control/devel system-config-control.spec, 1.5,
	1.6
Message-ID: <200601270800.k0R80IhQ005351@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5326

Modified Files:
	system-config-control.spec 
Log Message:
Updated spec file


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- system-config-control.spec	27 Jan 2006 07:50:28 -0000	1.5
+++ system-config-control.spec	27 Jan 2006 07:59:45 -0000	1.6
@@ -47,6 +47,10 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
+* Fri Jan 27 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-5
+- Modified the GUI and the some tools inside it.
+- This is done by Tejas Dinkar.
+
 * Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4
 - Added polish translations done by "Piotr \"Raven\" Dr??g" <raven at pmail.pl>.
 - Added icons in the tabs of the categories.



From fedora-extras-commits at redhat.com  Fri Jan 27 08:14:11 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 03:14:11 -0500
Subject: rpms/system-config-control import.log,1.6,1.7
Message-ID: <200601270814.k0R8EhX6007266@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232

Modified Files:
	import.log 
Log Message:
auto-import system-config-control-1.0-6 on branch devel from system-config-control-1.0-6.src.rpm
1_0-6 version


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	27 Jan 2006 07:44:59 -0000	1.6
+++ import.log	27 Jan 2006 08:14:11 -0000	1.7
@@ -3,3 +3,4 @@
 system-config-control-1_0-4:FC-4:system-config-control-1.0-4.src.rpm:1138279074
 system-config-control-1_0-5:HEAD:system-config-control-1.0-5.src.rpm:1138347078
 system-config-control-1_0-5:FC-4:system-config-control-1.0-5.src.rpm:1138347895
+system-config-control-1_0-6:HEAD:system-config-control-1.0-6.src.rpm:1138349641



From fedora-extras-commits at redhat.com  Fri Jan 27 08:14:17 2006
From: fedora-extras-commits at redhat.com (Ankit Patel (ankit))
Date: Fri, 27 Jan 2006 03:14:17 -0500
Subject: rpms/system-config-control/devel sources, 1.5,
	1.6 system-config-control.spec, 1.6, 1.7
Message-ID: <200601270814.k0R8En7D007270@cvs-int.fedora.redhat.com>

Author: ankit

Update of /cvs/extras/rpms/system-config-control/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7232/devel

Modified Files:
	sources system-config-control.spec 
Log Message:
auto-import system-config-control-1.0-6 on branch devel from system-config-control-1.0-6.src.rpm
1_0-6 version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Jan 2006 07:31:27 -0000	1.5
+++ sources	27 Jan 2006 08:14:16 -0000	1.6
@@ -1 +1 @@
-39c7bbc5ff84d6331d204adf577f3bbe  system-config-control-1.0.tar.bz2
+16b6866bd808a706930a5dfffa47ccbd  system-config-control-1.0.tar.bz2


Index: system-config-control.spec
===================================================================
RCS file: /cvs/extras/rpms/system-config-control/devel/system-config-control.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- system-config-control.spec	27 Jan 2006 07:59:45 -0000	1.6
+++ system-config-control.spec	27 Jan 2006 08:14:16 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: Centralized tool for Fedora configuration utilities
 Name: system-config-control
 Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.indianoss.org/
 License: GPL
 Group: System Environment/Base
@@ -47,8 +47,8 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/%{name}
 
 %changelog
-* Fri Jan 27 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-5
-- Modified the GUI and the some tools inside it.
+* Fri Jan 27 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-6
+- Modified the GUI.
 - This is done by Tejas Dinkar.
 
 * Tue Jan 17 2006 Ankit Patel <ankit644 at yahoo.com> 1.0-4



From fedora-extras-commits at redhat.com  Fri Jan 27 09:08:02 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Jan 2006 04:08:02 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.12, 1.13 rxvt-unicode.spec,
	1.14, 1.15 sources, 1.12, 1.13
Message-ID: <200601270909.k0R99ADD011138@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11070/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Jan 2006 07:57:34 -0000	1.12
+++ .cvsignore	27 Jan 2006 09:08:02 -0000	1.13
@@ -1 +1 @@
-rxvt-unicode-7.2.tar.bz2
+rxvt-unicode-7.3a.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rxvt-unicode.spec	23 Jan 2006 07:57:34 -0000	1.14
+++ rxvt-unicode.spec	27 Jan 2006 09:08:02 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.2
+Version:        7.3a
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.3a-1
+- version upgrade
+
 * Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.2-1
 - version upgrade (should resolve #178561)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Jan 2006 07:57:34 -0000	1.12
+++ sources	27 Jan 2006 09:08:02 -0000	1.13
@@ -1 +1 @@
-8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2
+832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 27 09:08:11 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Jan 2006 04:08:11 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.12, 1.13 rxvt-unicode.spec,
	1.14, 1.15 sources, 1.12, 1.13
Message-ID: <200601270909.k0R99SAu011146@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11070/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Jan 2006 07:57:39 -0000	1.12
+++ .cvsignore	27 Jan 2006 09:08:10 -0000	1.13
@@ -1 +1 @@
-rxvt-unicode-7.2.tar.bz2
+rxvt-unicode-7.3a.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- rxvt-unicode.spec	23 Jan 2006 07:57:39 -0000	1.14
+++ rxvt-unicode.spec	27 Jan 2006 09:08:10 -0000	1.15
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.2
+Version:        7.3a
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.3a-1
+- version upgrade
+
 * Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.2-1
 - version upgrade (should resolve #178561)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Jan 2006 07:57:39 -0000	1.12
+++ sources	27 Jan 2006 09:08:10 -0000	1.13
@@ -1 +1 @@
-8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2
+832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 27 09:08:41 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 27 Jan 2006 04:08:41 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.12, 1.13 rxvt-unicode.spec,
	1.18, 1.19 sources, 1.12, 1.13
Message-ID: <200601270909.k0R99Ssx011147@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11070/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	23 Jan 2006 07:57:45 -0000	1.12
+++ .cvsignore	27 Jan 2006 09:08:41 -0000	1.13
@@ -1 +1 @@
-rxvt-unicode-7.2.tar.bz2
+rxvt-unicode-7.3a.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rxvt-unicode.spec	23 Jan 2006 07:57:45 -0000	1.18
+++ rxvt-unicode.spec	27 Jan 2006 09:08:41 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.2
+Version:        7.3a
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.3a-1
+- version upgrade
+
 * Mon Jan 23 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.2-1
 - version upgrade (should resolve #178561)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	23 Jan 2006 07:57:45 -0000	1.12
+++ sources	27 Jan 2006 09:08:41 -0000	1.13
@@ -1 +1 @@
-8d4ee96c3ab49a22d397edd2b3c0aa3c  rxvt-unicode-7.2.tar.bz2
+832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2



From fedora-extras-commits at redhat.com  Fri Jan 27 10:10:12 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Fri, 27 Jan 2006 05:10:12 -0500
Subject: rpms/alltray/devel alltray-0.65-preload.patch, NONE,
	1.1 alltray.spec, 1.4, 1.5
Message-ID: <200601271010.k0RAAitf013365@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13345

Modified Files:
	alltray.spec 
Added Files:
	alltray-0.65-preload.patch 
Log Message:
Ooone mooore tiiime!

alltray-0.65-preload.patch:

--- NEW FILE alltray-0.65-preload.patch ---
--- alltray-0.65/configure.orig	2006-01-27 05:01:01.000000000 -0500
+++ alltray-0.65/configure	2006-01-27 05:05:48.000000000 -0500
@@ -21425,19 +21425,19 @@
 
 _HAVE_LD_PRELOAD=no
 
-if { ac_try='$CC -c ./ld_preload.c'
+if { ac_try='$CC $CFLAGS -c ./ld_preload.c'
   { (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_try='$CC -shared -o ./ld_preload_lib1.so ./ld_preload_lib1.c'
+ if { ac_try='$CC $CFLAGS -shared -o ./ld_preload_lib1.so ./ld_preload_lib1.c'
   { (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_try='$CC -shared -o ./ld_preload_lib2.so ./ld_preload_lib2.c'
+  if { ac_try='$CC $CFLAGS -shared -o ./ld_preload_lib2.so ./ld_preload_lib2.c'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- alltray.spec	19 Jan 2006 23:12:41 -0000	1.4
+++ alltray.spec	27 Jan 2006 10:10:11 -0000	1.5
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://alltray.sourceforge.net/
 Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
+Patch:          alltray-0.65-preload.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel desktop-file-utils
@@ -18,6 +19,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .preload
 
 %build
 export CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -50,6 +52,7 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
-* Thu Jan 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
+* Thu Jan 27 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-1
 - Added -fPIC to CFLAGS
+- Added preload patch
 - Initial RPM release



From fedora-extras-commits at redhat.com  Fri Jan 27 15:02:13 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Fri, 27 Jan 2006 10:02:13 -0500
Subject: rpms/azureus/devel azureus.script,1.3,1.4 azureus.spec,1.8,1.9
Message-ID: <200601271503.k0RF32Tl022886@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22848

Modified Files:
	azureus.script azureus.spec 
Log Message:
-20 release.
Remove junit reference from startup script.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.script,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- azureus.script	26 Jan 2006 07:34:09 -0000	1.3
+++ azureus.script	27 Jan 2006 15:02:12 -0000	1.4
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-CLASSPATH=`build-classpath junit jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"
+CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 gtk2.8 glib0.2 Azureus2` java -Dgnu.gcj.runtime.VMClassLoader.library_control=never org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- azureus.spec	26 Jan 2006 07:35:54 -0000	1.8
+++ azureus.spec	27 Jan 2006 15:02:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -146,6 +146,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-20
+- Remove junit reference from startup script.
+
 * Wed Jan 25 2006 Anthony Green <green at redhat.com> - 2.3.0.6-19
 - Theme CoolBar icons with azureus-themed.patch.
 - Add libgtk-java and glib-java dependencies to spec file.



From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:10 -0500
Subject: rpms/xfce4-quicklauncher-plugin - New directory
Message-ID: <200601271756.k0RHuCLu026984@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26976/xfce4-quicklauncher-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-quicklauncher-plugin added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:16 -0500
Subject: rpms/xfce4-quicklauncher-plugin/devel - New directory
Message-ID: <200601271756.k0RHuI5M026999@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26976/xfce4-quicklauncher-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:36 -0500
Subject: rpms/xfce4-quicklauncher-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601271756.k0RHuciA027033@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27021

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-quicklauncher-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-quicklauncher-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Jan 27 17:56:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:56:41 -0500
Subject: rpms/xfce4-quicklauncher-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601271756.k0RHuipN027053@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27021/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-quicklauncher-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Fri Jan 27 17:57:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:57:53 -0500
Subject: rpms/xfce4-quicklauncher-plugin import.log,1.1,1.2
Message-ID: <200601271758.k0RHwQNC027189@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27155

Modified Files:
	import.log 
Log Message:
auto-import xfce4-quicklauncher-plugin-0.81-2.fc4 on branch devel from xfce4-quicklauncher-plugin-0.81-2.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Jan 2006 17:56:35 -0000	1.1
+++ import.log	27 Jan 2006 17:57:53 -0000	1.2
@@ -0,0 +1 @@
+xfce4-quicklauncher-plugin-0_81-2_fc4:HEAD:xfce4-quicklauncher-plugin-0.81-2.fc4.src.rpm:1138384665



From fedora-extras-commits at redhat.com  Fri Jan 27 17:57:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 12:57:59 -0500
Subject: rpms/xfce4-quicklauncher-plugin/devel
	xfce4-quicklauncher-plugin.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601271758.k0RHwVmV027193@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27155/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
auto-import xfce4-quicklauncher-plugin-0.81-2.fc4 on branch devel from xfce4-quicklauncher-plugin-0.81-2.fc4.src.rpm


--- NEW FILE xfce4-quicklauncher-plugin.spec ---
Name:		xfce4-quicklauncher-plugin
Version:	0.81
Release:	2%{?dist}
Summary:	Quicklauncher plugin for the Xfce panel

Group:		User Interface/Desktops
License:	GPL
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
BuildRequires:	gettext

%description
This plugin allows you to have lots of launchers in the Xfce panel, displaying 
them on several lines.

%prep
%setup -q
# fix permission of AUTHORS and COPYING
%__chmod 0664 {AUTHORS,COPYING}

%build
%configure --disable-static
make %{?_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 {} ';'
%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Fri Nov 18 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-1
- Initial Fedora Extras release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Jan 2006 17:56:41 -0000	1.1
+++ .cvsignore	27 Jan 2006 17:57:59 -0000	1.2
@@ -0,0 +1 @@
+xfce4-quicklauncher-plugin-0.81.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Jan 2006 17:56:41 -0000	1.1
+++ sources	27 Jan 2006 17:57:59 -0000	1.2
@@ -0,0 +1 @@
+98231ea7afe226ca7cbdc5c51ea3d16e  xfce4-quicklauncher-plugin-0.81.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 19:36:32 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 27 Jan 2006 14:36:32 -0500
Subject: rpms/tclhttpd/FC-3 tclhttpd.spec, 1.3, 1.4 tclhttpd_fedora.1.patch, 
	1.2, 1.3
Message-ID: <200601271937.k0RJb4ds031534@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31478/FC-3

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Start server as root, then let it switch itself to the tclhttpd user.  This
will allow the server to listen on privileged ports.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclhttpd.spec	21 Jan 2006 05:18:23 -0000	1.3
+++ tclhttpd.spec	27 Jan 2006 19:36:31 -0000	1.4
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -131,6 +131,12 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
+- Updated patch so that tclhttpd starts as root and then switches to
+  the tclhttpd user.  This is necessary if tclhttpd is to listen
+  on port 80.
+* Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
+- Check if the tclhttpd user exists before trying to create it
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-3/tclhttpd_fedora.1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd_fedora.1.patch	16 Jan 2006 01:48:31 -0000	1.2
+++ tclhttpd_fedora.1.patch	27 Jan 2006 19:36:31 -0000	1.3
@@ -201,7 +201,7 @@
 +'start')
 +        echo -n $"Starting $prog: "
 +        ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-+	daemon --user tclhttpd $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
++	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
 +        RETVAL=$?
 +        echo
 +        [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd



From fedora-extras-commits at redhat.com  Fri Jan 27 19:36:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 27 Jan 2006 14:36:38 -0500
Subject: rpms/tclhttpd/FC-4 tclhttpd.spec, 1.3, 1.4 tclhttpd_fedora.1.patch, 
	1.2, 1.3
Message-ID: <200601271937.k0RJbAct031544@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31478/FC-4

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Start server as root, then let it switch itself to the tclhttpd user.  This
will allow the server to listen on privileged ports.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclhttpd.spec	21 Jan 2006 05:18:28 -0000	1.3
+++ tclhttpd.spec	27 Jan 2006 19:36:38 -0000	1.4
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -131,6 +131,12 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
+- Updated patch so that tclhttpd starts as root and then switches to
+  the tclhttpd user.  This is necessary if tclhttpd is to listen
+  on port 80.
+* Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
+- Check if the tclhttpd user exists before trying to create it
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd_fedora.1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd_fedora.1.patch	16 Jan 2006 01:48:37 -0000	1.2
+++ tclhttpd_fedora.1.patch	27 Jan 2006 19:36:38 -0000	1.3
@@ -201,7 +201,7 @@
 +'start')
 +        echo -n $"Starting $prog: "
 +        ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-+	daemon --user tclhttpd $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
++	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
 +        RETVAL=$?
 +        echo
 +        [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd



From fedora-extras-commits at redhat.com  Fri Jan 27 19:36:44 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 27 Jan 2006 14:36:44 -0500
Subject: rpms/tclhttpd/devel tclhttpd.spec, 1.3, 1.4 tclhttpd_fedora.1.patch,
	1.2, 1.3
Message-ID: <200601271937.k0RJbGxH031551@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31478/devel

Modified Files:
	tclhttpd.spec tclhttpd_fedora.1.patch 
Log Message:
Start server as root, then let it switch itself to the tclhttpd user.  This
will allow the server to listen on privileged ports.




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tclhttpd.spec	21 Jan 2006 05:18:34 -0000	1.3
+++ tclhttpd.spec	27 Jan 2006 19:36:43 -0000	1.4
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -131,6 +131,12 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
+- Updated patch so that tclhttpd starts as root and then switches to
+  the tclhttpd user.  This is necessary if tclhttpd is to listen
+  on port 80.
+* Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
+- Check if the tclhttpd user exists before trying to create it
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.

tclhttpd_fedora.1.patch:

Index: tclhttpd_fedora.1.patch
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd_fedora.1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tclhttpd_fedora.1.patch	16 Jan 2006 01:35:32 -0000	1.2
+++ tclhttpd_fedora.1.patch	27 Jan 2006 19:36:43 -0000	1.3
@@ -201,7 +201,7 @@
 +'start')
 +        echo -n $"Starting $prog: "
 +        ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-+	daemon --user tclhttpd $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
++	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
 +        RETVAL=$?
 +        echo
 +        [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd



From fedora-extras-commits at redhat.com  Fri Jan 27 20:10:12 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:10:12 -0500
Subject: rpms/nagios/devel nagios.htaccess, NONE, 1.1 .cvsignore, 1.2,
	1.3 nagios.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601272010.k0RKAjw3001120@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1083/devel

Modified Files:
	.cvsignore nagios.spec sources 
Added Files:
	nagios.htaccess 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch devel from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


--- NEW FILE nagios.htaccess ---
ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
<Directory /usr/lib/nagios/cgi-bin/>
   Options ExecCGI
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

Alias /nagios/ /usr/share/nagios/html/
<Directory /usr/share/nagios/html/>
   Options None
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

# For SSL-servers
#ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
#<Directory /usr/lib/nagios/cgi-bin/>
#   Options ExecCGI
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>
#
#Alias /nagios/ /usr/share/nagios/html/
#<Directory /usr/share/nagios/html/>
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
+++ .cvsignore	27 Jan 2006 20:10:12 -0000	1.3
@@ -1 +1 @@
-nagios-1.3.tar.gz
+nagios-2.0rc2.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/nagios.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nagios.spec	26 Jan 2006 21:28:27 -0000	1.3
+++ nagios.spec	27 Jan 2006 20:10:12 -0000	1.4
@@ -1,13 +1,14 @@
 Name: nagios
-Version: 1.3
-Release: 15%{?dist}
+Version: 2.0
+Release: 0.1.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPL
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz
 Source1: nagios.logrotate
+Source2: nagios.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8
@@ -49,7 +50,7 @@
 may compile against.
 
 %prep
-%setup -q
+%setup -q -n nagios-2.0rc2
 
 %build
 ./configure \
@@ -79,8 +80,7 @@
 %{__sed} -e "s|resource.cfg|private/resource.cfg|" \
 	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
 %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
-%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
-	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora
+echo >> html/stylesheets/common.css
 
 %install
 rm -rf %{buildroot}
@@ -94,8 +94,8 @@
 %{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
+%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
 %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
 %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
@@ -133,7 +133,7 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
-%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
+%doc Changelog INSTALLING LICENSE README UPGRADING 
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_libdir}/%{name}/cgi-bin/*cgi
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Jan 27 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.1.rc2
+- Using 2.0rc2 tarball
+
 * Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
 - Fixed usermod -a issue, Bugzilla #49609
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 22:47:20 -0000	1.2
+++ sources	27 Jan 2006 20:10:12 -0000	1.3
@@ -1 +1 @@
-2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz
+373124639093919dc8858a243d760f84  nagios-2.0rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 20:09:56 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:09:56 -0500
Subject: rpms/nagios import.log,1.2,1.3
Message-ID: <200601272011.k0RKB0FJ001123@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1083

Modified Files:
	import.log 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch devel from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	19 Jan 2006 22:47:14 -0000	1.2
+++ import.log	27 Jan 2006 20:09:55 -0000	1.3
@@ -1 +1,2 @@
 nagios-1_3-14:HEAD:nagios-1.3-14.src.rpm:1137710827
+nagios-2_0-0_1_rc2:HEAD:nagios-2.0-0.1.rc2.src.rpm:1138392575



From fedora-extras-commits at redhat.com  Fri Jan 27 20:47:57 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:47:57 -0500
Subject: rpms/nagios import.log,1.3,1.4
Message-ID: <200601272048.k0RKmTMn001421@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386

Modified Files:
	import.log 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch FC-4 from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nagios/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	27 Jan 2006 20:09:55 -0000	1.3
+++ import.log	27 Jan 2006 20:47:56 -0000	1.4
@@ -1,2 +1,3 @@
 nagios-1_3-14:HEAD:nagios-1.3-14.src.rpm:1137710827
 nagios-2_0-0_1_rc2:HEAD:nagios-2.0-0.1.rc2.src.rpm:1138392575
+nagios-2_0-0_1_rc2:FC-4:nagios-2.0-0.1.rc2.src.rpm:1138394872



From fedora-extras-commits at redhat.com  Fri Jan 27 20:48:02 2006
From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath))
Date: Fri, 27 Jan 2006 15:48:02 -0500
Subject: rpms/nagios/FC-4 nagios.htaccess, NONE, 1.1 .cvsignore, 1.2,
	1.3 nagios.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601272048.k0RKmZoi001427@cvs-int.fedora.redhat.com>

Author: mmcgrath

Update of /cvs/extras/rpms/nagios/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1386/FC-4

Modified Files:
	.cvsignore nagios.spec sources 
Added Files:
	nagios.htaccess 
Log Message:
auto-import nagios-2.0-0.1.rc2 on branch FC-4 from nagios-2.0-0.1.rc2.src.rpm
Updated to Nagios 2.0rc2


--- NEW FILE nagios.htaccess ---
ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
<Directory /usr/lib/nagios/cgi-bin/>
   Options ExecCGI
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

Alias /nagios/ /usr/share/nagios/html/
<Directory /usr/share/nagios/html/>
   Options None
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>

# For SSL-servers
#ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/
#<Directory /usr/lib/nagios/cgi-bin/>
#   Options ExecCGI
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>
#
#Alias /nagios/ /usr/share/nagios/html/
#<Directory /usr/share/nagios/html/>
#   Options None
#   SSLRequireSSL
#   order deny,allow
#   deny from all
#   AuthType Basic
#   AuthUserFile /site/cfg/passwd
#   AuthGroupFile /site/cfg/group
#   AuthName "nagios"
#   require group nagios
#   Satisfy Any
#</Directory>



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Jan 2006 22:47:20 -0000	1.2
+++ .cvsignore	27 Jan 2006 20:48:02 -0000	1.3
@@ -1 +1 @@
-nagios-1.3.tar.gz
+nagios-2.0rc2.tar.gz


Index: nagios.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/nagios.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nagios.spec	26 Jan 2006 22:16:20 -0000	1.3
+++ nagios.spec	27 Jan 2006 20:48:02 -0000	1.4
@@ -1,13 +1,14 @@
 Name: nagios
-Version: 1.3
-Release: 15%{?dist}
+Version: 2.0
+Release: 0.1.rc2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
 License: GPL
 URL: http://www.nagios.org/
-Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}.tar.gz
+Source0: http://dl.sourceforge.net/nagios/%{name}-%{version}rc2.tar.gz
 Source1: nagios.logrotate
+Source2: nagios.htaccess
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8
@@ -49,7 +50,7 @@
 may compile against.
 
 %prep
-%setup -q
+%setup -q -n nagios-2.0rc2
 
 %build
 ./configure \
@@ -79,8 +80,7 @@
 %{__sed} -e "s|resource.cfg|private/resource.cfg|" \
 	 -e "s|command_file=/var/log/nagios/rw/nagios.cmd|command_file=%{_localstatedir}/spool/%{name}/nagios.cmd|" < sample-config/nagios.cfg > sample-config/nagios.cfg.fedora
 %{__mv} -f sample-config/nagios.cfg.fedora sample-config/nagios.cfg
-%{__sed} -e "s|/usr/lib/nagios/cgi/|%{_libdir}/%{name}/cgi-bin/|" \
-	 -e "s|/usr/share/nagios/|%{_datadir}/%{name}/html/|" < contrib/htaccess.sample > contrib/htaccess.sample.fedora
+echo >> html/stylesheets/common.css
 
 %install
 rm -rf %{buildroot}
@@ -94,8 +94,8 @@
 %{__install} -D -m 0755 cgi/*cgi %{buildroot}/%{_libdir}/%{name}/cgi-bin/
 %{__install} -D -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 %{__install} -d -m 0755 %{buildroot}/%{_libdir}/%{name}/plugins/eventhandlers
-%{__install} -D -m 0644 common/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
-%{__install} -D -m 0644 contrib/htaccess.sample.fedora %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+%{__install} -D -m 0644 include/locations.h %{buildroot}/%{_includedir}/%{name}/locations.h
+%{__install} -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 %{__install} -D -m 0755 daemon-init.fedora %{buildroot}/%{_initrddir}/%{name}
 %{__install} -d -m 0755 html/ %{buildroot}/%{_datadir}/%{name}/html
 %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/log/%{name}/archives
@@ -133,7 +133,7 @@
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/html
 %doc %{_datadir}/%{name}/html/docs
-%doc Changelog INSTALLING LICENSE README UPGRADING pkg/rpm/nagios.logrotate
+%doc Changelog INSTALLING LICENSE README UPGRADING 
 %{_datadir}/%{name}/html/[^d]*
 %{_sbindir}/*
 %{_libdir}/%{name}/cgi-bin/*cgi
@@ -153,6 +153,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Fri Jan 27 2006 Mike McGrath <imlinux at gmail.com> 2.0-0.1.rc2
+- Using 2.0rc2 tarball
+
 * Thu Jan 26 2006 Mike McGrath <imlinux at gmail.com> 1.3-15
 - Fixed usermod -a issue, Bugzilla #49609
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nagios/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Jan 2006 22:47:20 -0000	1.2
+++ sources	27 Jan 2006 20:48:02 -0000	1.3
@@ -1 +1 @@
-2011df334cb0206dbb054606c6a2dc84  nagios-1.3.tar.gz
+373124639093919dc8858a243d760f84  nagios-2.0rc2.tar.gz



From fedora-extras-commits at redhat.com  Fri Jan 27 23:57:40 2006
From: fedora-extras-commits at redhat.com (Jonathan Blandford (jrb))
Date: Fri, 27 Jan 2006 18:57:40 -0500
Subject: rpms/istanbul/devel istanbul.spec,1.3,1.4
Message-ID: <200601272358.k0RNwCED007503@cvs-int.fedora.redhat.com>

Author: jrb

Update of /cvs/extras/rpms/istanbul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7486/devel

Modified Files:
	istanbul.spec 
Log Message:
now require gstreamer08-python



Index: istanbul.spec
===================================================================
RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- istanbul.spec	7 Jan 2006 21:09:29 -0000	1.3
+++ istanbul.spec	27 Jan 2006 23:57:39 -0000	1.4
@@ -8,7 +8,7 @@
 Summary: Desktop Session Recorder 
 Name: istanbul 
 Version: 0.1.1 
-Release: 6
+Release: 7
 License: GPL
 Group: Applications/Multimedia
 URL: http://live.gnome.org/Istanbul 
@@ -19,7 +19,7 @@
 Requires: gnome-desktop >= 2.6.0
 Requires: gstreamer08 >= %gstreamer_version
 Requires: gstreamer08-plugins >= %gstreamer_plugins_version
-Requires: gstreamer-python
+Requires: gstreamer08-python
 
 BuildRequires: python, python-devel
 BuildRequires: desktop-file-utils
@@ -92,6 +92,9 @@
 %{python_sitelib}/%{name}/configure/*.py*
 
 %changelog
+* Fri Jan 27 2006 Jonathan Blandford <jrb at redhat.com> - 0.1.1-6
+- change gstreamer-python to gstreamer08-python
+
 * Sat Jan 07 2006 Jef Spaleta <jspaleta at gmail.com> - 0.1.1-6
 - Change requirements to gstreamer08* to match rawhide change
 



From fedora-extras-commits at redhat.com  Sat Jan 28 00:19:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:19:33 -0500
Subject: rpms/xfce4-diskperf-plugin - New directory
Message-ID: <200601280019.k0S0JZZb009412@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9404/xfce4-diskperf-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-diskperf-plugin added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 28 00:19:38 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:19:38 -0500
Subject: rpms/xfce4-diskperf-plugin/devel - New directory
Message-ID: <200601280019.k0S0JeJo009427@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9404/xfce4-diskperf-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-diskperf-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Jan 28 00:19:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:19:58 -0500
Subject: rpms/xfce4-diskperf-plugin Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601280020.k0S0K0xi009461@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9449

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-diskperf-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-diskperf-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Jan 28 00:20:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:20:04 -0500
Subject: rpms/xfce4-diskperf-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601280020.k0S0K6tH009481@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9449/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-diskperf-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sat Jan 28 00:20:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:20:59 -0500
Subject: rpms/xfce4-diskperf-plugin import.log,1.1,1.2
Message-ID: <200601280021.k0S0LVad009551@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517

Modified Files:
	import.log 
Log Message:
auto-import xfce4-diskperf-plugin-1.5-4.fc4 on branch devel from xfce4-diskperf-plugin-1.5-4.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Jan 2006 00:19:58 -0000	1.1
+++ import.log	28 Jan 2006 00:20:58 -0000	1.2
@@ -0,0 +1 @@
+xfce4-diskperf-plugin-1_5-4_fc4:HEAD:xfce4-diskperf-plugin-1.5-4.fc4.src.rpm:1138407650



From fedora-extras-commits at redhat.com  Sat Jan 28 00:21:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 19:21:04 -0500
Subject: rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601280021.k0S0LbZ7009555@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9517/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-diskperf-plugin.spec 
Log Message:
auto-import xfce4-diskperf-plugin-1.5-4.fc4 on branch devel from xfce4-diskperf-plugin-1.5-4.fc4.src.rpm


--- NEW FILE xfce4-diskperf-plugin.spec ---
Name:		xfce4-diskperf-plugin
Version:	1.5
Release:	4%{?dist}
Summary:	Disk performance plugin for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
The DiskPerf plugin displays disk/partition performance (bytes transfered per
second) based on data provided by the kernel.

%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 -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
- Add libxfcegui4-devel BuildReqs.
- Fix %defattr.

* Mon Nov 14 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-3
- Initial Fedora Extras version.
- Rebuild for XFCE 4.2.3.
- disable-static instead of removing .a files.

* Fri Sep 23 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-2.fc4.cw
- Add libxml2 BuildReqs.

* Sat Jul 09 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-1.fc4.cw
- Rebuild for Core 4.

* Wed Apr 13 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-1.fc3.cw
- Initial RPM release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Jan 2006 00:20:03 -0000	1.1
+++ .cvsignore	28 Jan 2006 00:21:04 -0000	1.2
@@ -0,0 +1 @@
+xfce4-diskperf-plugin-1.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Jan 2006 00:20:03 -0000	1.1
+++ sources	28 Jan 2006 00:21:04 -0000	1.2
@@ -0,0 +1 @@
+cb1b2637166b8a4355b3df85e593640f  xfce4-diskperf-plugin-1.5.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 00:29:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 19:29:15 -0500
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.5,
	1.6 perl-Config-Tiny.spec, 1.9, 1.10 sources, 1.5, 1.6
Message-ID: <200601280029.k0S0Tlhm009647@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9626

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Update to 2.04.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	30 Dec 2005 16:25:37 -0000	1.5
+++ .cvsignore	28 Jan 2006 00:29:14 -0000	1.6
@@ -1 +1 @@
-Config-Tiny-2.03.tar.gz
+Config-Tiny-2.04.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-Config-Tiny.spec	30 Dec 2005 16:25:37 -0000	1.9
+++ perl-Config-Tiny.spec	28 Jan 2006 00:29:14 -0000	1.10
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.03
+Version:        2.04
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -53,6 +53,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.04-1
+- Updated to 2.04.
+
 * Fri Dec 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.03-1
 - Updated to 2.03.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	30 Dec 2005 16:25:37 -0000	1.5
+++ sources	28 Jan 2006 00:29:14 -0000	1.6
@@ -1 +1 @@
-14b7c75fec38fd59fdf6390093946d7d  Config-Tiny-2.03.tar.gz
+d14e3691a3fc357daa7ebe3af018c6b4  Config-Tiny-2.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 00:47:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 19:47:06 -0500
Subject: rpms/perl-WWW-Mechanize/FC-3 .cvsignore, 1.3,
	1.4 perl-WWW-Mechanize.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601280047.k0S0lcI5009946@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-WWW-Mechanize/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/FC-3

Modified Files:
	.cvsignore perl-WWW-Mechanize.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2005 19:17:50 -0000	1.3
+++ .cvsignore	28 Jan 2006 00:47:06 -0000	1.4
@@ -1 +1 @@
-WWW-Mechanize-1.14.tar.gz
+WWW-Mechanize-1.16.tar.gz


Index: perl-WWW-Mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-3/perl-WWW-Mechanize.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-WWW-Mechanize.spec	31 Aug 2005 19:46:21 -0000	1.4
+++ perl-WWW-Mechanize.spec	28 Jan 2006 00:47:06 -0000	1.5
@@ -3,8 +3,8 @@
 #  --with livetests          enable live tests
 #
 Name:           perl-WWW-Mechanize
-Version:        1.14
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Automates web page form & link interaction
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Nov 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Wed Aug 31 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-2
 - Added Test::LongString to the live tests build requirements.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2005 19:17:50 -0000	1.3
+++ sources	28 Jan 2006 00:47:06 -0000	1.4
@@ -1 +1 @@
-47e8b334967da901899672cfcf279f14  WWW-Mechanize-1.14.tar.gz
+1fda15f7c031105cd0e2b9bbdafb647f  WWW-Mechanize-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 00:47:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 19:47:12 -0500
Subject: rpms/perl-WWW-Mechanize/FC-4 .cvsignore, 1.3,
	1.4 perl-WWW-Mechanize.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601280047.k0S0liLb009951@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-WWW-Mechanize/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9896/FC-4

Modified Files:
	.cvsignore perl-WWW-Mechanize.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Aug 2005 19:17:51 -0000	1.3
+++ .cvsignore	28 Jan 2006 00:47:12 -0000	1.4
@@ -1 +1 @@
-WWW-Mechanize-1.14.tar.gz
+WWW-Mechanize-1.16.tar.gz


Index: perl-WWW-Mechanize.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-4/perl-WWW-Mechanize.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-WWW-Mechanize.spec	31 Aug 2005 19:46:22 -0000	1.4
+++ perl-WWW-Mechanize.spec	28 Jan 2006 00:47:12 -0000	1.5
@@ -3,8 +3,8 @@
 #  --with livetests          enable live tests
 #
 Name:           perl-WWW-Mechanize
-Version:        1.14
-Release:        2%{?dist}
+Version:        1.16
+Release:        1%{?dist}
 Summary:        Automates web page form & link interaction
 
 Group:          Development/Libraries
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Thu Nov 10 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.16-1
+- Update to 1.16.
+
 * Wed Aug 31 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-2
 - Added Test::LongString to the live tests build requirements.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-WWW-Mechanize/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Aug 2005 19:17:51 -0000	1.3
+++ sources	28 Jan 2006 00:47:12 -0000	1.4
@@ -1 +1 @@
-47e8b334967da901899672cfcf279f14  WWW-Mechanize-1.14.tar.gz
+1fda15f7c031105cd0e2b9bbdafb647f  WWW-Mechanize-1.16.tar.gz



From fedora-extras-commits at redhat.com  Sat Jan 28 01:00:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 20:00:14 -0500
Subject: rpms/perl-XML-Simple/devel .cvsignore, 1.4, NONE Makefile, 1.2,
	NONE perl-XML-Simple.spec, 1.7, NONE sources, 1.4, NONE
Message-ID: <200601280100.k0S10GOD010215@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-XML-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10203

Removed Files:
	.cvsignore Makefile perl-XML-Simple.spec sources 
Log Message:
perl-XML-Simple is a FC-5 core package


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-XML-Simple.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Jan 28 01:27:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 20:27:35 -0500
Subject: owners owners.list,1.568,1.569
Message-ID: <200601280128.k0S1S7tb012154@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12135

Modified Files:
	owners.list 
Log Message:
add xfce4-diskperf-plugin & xfce4-quicklauncher-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- owners.list	26 Jan 2006 22:33:39 -0000	1.568
+++ owners.list	28 Jan 2006 01:27:35 -0000	1.569
@@ -1327,6 +1327,7 @@
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-cpugraph-plugin|CPU monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-datetime-plugin|Date/time plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1338,6 +1339,7 @@
 Fedora Extras|xfce4-netload-plugin|Network-load monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-quicklauncher-plugin|Quicklauncher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 28 02:07:57 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 27 Jan 2006 21:07:57 -0500
Subject: rpms/perl-Net-SSLeay/devel
	perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch, 
	NONE, 1.1 perl-Net-SSLeay.spec, 1.6, 1.7
Message-ID: <200601280208.k0S28T1J014028@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Net-SSLeay/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13993

Modified Files:
	perl-Net-SSLeay.spec 
Added Files:
	perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch 
Log Message:
- CVE-2005-0106: patch from Mandriva
  http://wwwnew.mandriva.com/security/advisories?name=MDKSA-2006:023
- Other references:
  http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2005-0106
  http://www.ubuntu.com/usn/usn-113-1


perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch:

--- NEW FILE perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch ---
--- Net_SSLeay.pm-1.25/SSLeay.pm.cve-2005-0106	2006-01-25 12:37:11.540102265 -0700
+++ Net_SSLeay.pm-1.25/SSLeay.pm	2006-01-25 12:38:16.994260984 -0700
@@ -1853,8 +1853,8 @@
     my ($rn_seed_file, $seed, $egd_path) = @_;
     my $rnsf = defined($rn_seed_file) && -r $rn_seed_file;
 
+    $egd_path = '';
     $egd_path = $ENV{'EGD_PATH'} if $ENV{'EGD_PATH'};
-    $egd_path = '/tmp/entropy'   unless $egd_path;
     
     RAND_seed(rand() + $$);  # Stir it with time and pid
     
@@ -1865,7 +1865,7 @@
     RAND_load_file($rn_seed_file, -s _) if $rnsf;
     RAND_seed($seed) if $seed;
     RAND_seed($ENV{RND_SEED}) if $ENV{RND_SEED};
-    RAND_egd($egd_path) if -S $egd_path;
+    RAND_egd($egd_path) if -e $egd_path && -S $egd_path;
     RAND_load_file($Net::SSLeay::random_device, $Net::SSLeay::how_random/8)
 	if -r $Net::SSLeay::random_device;
 }


Index: perl-Net-SSLeay.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSLeay/devel/perl-Net-SSLeay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Net-SSLeay.spec	15 Jan 2006 12:25:16 -0000	1.6
+++ perl-Net-SSLeay.spec	28 Jan 2006 02:07:50 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Net-SSLeay
 Version:        1.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Perl extension for using OpenSSL
 
 Group:          Development/Libraries
@@ -8,11 +8,12 @@
 URL:            http://search.cpan.org/dist/Net_SSLeay.pm/
 Source0:        http://www.cpan.org/authors/id/F/FL/FLORA/Net_SSLeay.pm-%{version}.tar.gz
 Patch0:         %{name}-test14.patch
+Patch1:          perl-Net-SSLeay-1.2.5-CVE-2005-0106.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl
 BuildRequires:  openssl-devel
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Provides:       perl-Net_SSLeay = %{version}-%{release}
 
 %description
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n Net_SSLeay.pm-%{version}
 %patch0 -p0
+%patch1 -p1
 cp -p Net-SSLeay-Handle-*/Changes Changes.Net-SSLeay-Handle
 chmod -c 644 examples/*
 %{__perl} -pi -e 's|/usr/local/bin/perl|%{__perl}|' examples/*.pl
@@ -65,6 +67,10 @@
 
 
 %changelog
+* Fri Jan 27 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.30-2
+- CVE-2005-0106: patch from Mandriva
+  http://wwwnew.mandriva.com/security/advisories?name=MDKSA-2006:023
+
 * Sun Jan 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.30-1
 - 1.30.
 - Optionally run the test suite during build with "--with tests".



From fedora-extras-commits at redhat.com  Sat Jan 28 04:39:51 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 23:39:51 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.2, 1.3
Message-ID: <200601280440.k0S4eOTu018248@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18229

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
add libXt-devel for modular X, replace libX11-devel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-modemlights-plugin.spec	30 Dec 2005 13:45:26 -0000	1.2
+++ xfce4-modemlights-plugin.spec	28 Jan 2006 04:39:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildRequires:	libX11-devel
+BuildRequires:	libXt-devel
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -39,6 +39,10 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Sat Jan 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-5
+- Add libXt-devel BuildReqs.
+- Drop libX11-devel.
+
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-4
 - Add libX11-devel BuildReqs for modular X.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 04:41:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Fri, 27 Jan 2006 23:41:23 -0500
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.3, 1.4
Message-ID: <200601280441.k0S4ftYf018294@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18277

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
fix date in changelog


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-modemlights-plugin.spec	28 Jan 2006 04:39:51 -0000	1.3
+++ xfce4-modemlights-plugin.spec	28 Jan 2006 04:41:23 -0000	1.4
@@ -39,7 +39,7 @@
 %{_datadir}/xfce4/*
 
 %changelog
-* Sat Jan 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-5
+* Sat Jan 28 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-5
 - Add libXt-devel BuildReqs.
 - Drop libX11-devel.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 07:46:47 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Sat, 28 Jan 2006 02:46:47 -0500
Subject: rpms/irssi/devel irssi.spec,1.12,1.13
Message-ID: <200601280747.k0S7lJSg023987@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23970

Modified Files:
	irssi.spec 
Log Message:
irssi/devel: disabled gc support..


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- irssi.spec	21 Dec 2005 08:09:33 -0000	1.12
+++ irssi.spec	28 Jan 2006 07:46:46 -0000	1.13
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
@@ -11,7 +11,8 @@
 Source0:	http://irssi.org/files/irssi-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires:	ncurses-devel openssl-devel zlib-devel 
-BuildRequires:	pkgconfig gc-devel glib2-devel
+BuildRequires:	pkgconfig glib2-devel
+# BuildRequires:	gc-devel 
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -41,7 +42,8 @@
 	--with-proxy			\
 	--with-bot			\
 	--with-perl=module		\
-	--with-perl-lib=vendor --with-gc
+	--with-perl-lib=vendor 
+# --with-gc
 make %{?_smp_mflags}
 
 
@@ -81,6 +83,9 @@
 %{_includedir}/irssi
 
 %changelog
+* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-2perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)?dist}
+- Disabled gc support
+
 * Sun Dec 11 2005 Dams <anvil[AT]livna.org> - 0.8.10-1
 - Updated to final 0.8.10
 



From fedora-extras-commits at redhat.com  Sat Jan 28 11:44:58 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Sat, 28 Jan 2006 06:44:58 -0500
Subject: rpms/autotrace/devel autotrace.spec,1.11,1.12
Message-ID: <200601281145.k0SBjUbb032202@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/autotrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32183

Modified Files:
	autotrace.spec 
Log Message:
* Sat Jan 28 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-11
- rebuild




Index: autotrace.spec
===================================================================
RCS file: /cvs/extras/rpms/autotrace/devel/autotrace.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- autotrace.spec	17 Jan 2006 12:26:49 -0000	1.11
+++ autotrace.spec	28 Jan 2006 11:44:57 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           autotrace
 Version:        0.31.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Summary:        Utility for converting bitmaps to vector graphics
 
@@ -86,6 +86,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-11
+- rebuild
+
 * Tue Jan 17 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 0.31.1-10
 - add BuildRequires on freetype-devel
 



From fedora-extras-commits at redhat.com  Sat Jan 28 12:50:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Jan 2006 07:50:41 -0500
Subject: rpms/lirc-kmod/devel kmodtool,1.1,1.2 lirc-kmod.spec,1.1,1.2
Message-ID: <200601281251.k0SCpD7q001895@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1861

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool	26 Jan 2006 22:35:23 -0000	1.1
+++ kmodtool	28 Jan 2006 12:50:41 -0000	1.2
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.3"
+myver="0.10.4"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
 kmod_name=
 kver=
@@ -59,13 +59,17 @@
 {
     local variant="${1}"
     local dashvariant="${variant:+-${variant}}"
+    case "$verrel" in
+        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
+        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
+    esac
     cat <<EOF
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
 Provides:         kernel-module = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{version}-%{release}
-Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
+Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lirc-kmod.spec	26 Jan 2006 22:35:23 -0000	1.1
+++ lirc-kmod.spec	28 Jan 2006 12:50:41 -0000	1.2
@@ -11,7 +11,7 @@
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        1.%(echo %{kverrel} | tr - _)
+Release:        2.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-2
+- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.
+
 * Sat Jan 21 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-1
 - 0.8.0.
 - Hopefully fix lirc_{it87,serial,sir} on PPC, thanks to upstream.



From fedora-extras-commits at redhat.com  Sat Jan 28 12:51:09 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 28 Jan 2006 07:51:09 -0500
Subject: rpms/thinkpad-kmod/devel kmodtool, 1.1, 1.2 thinkpad-kmod.spec, 1.1,
	1.2
Message-ID: <200601281251.k0SCpf9O001905@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1882

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-10
- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kmodtool	26 Jan 2006 22:21:45 -0000	1.1
+++ kmodtool	28 Jan 2006 12:51:08 -0000	1.2
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.3"
+myver="0.10.4"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)'
 kmod_name=
 kver=
@@ -59,13 +59,17 @@
 {
     local variant="${1}"
     local dashvariant="${variant:+-${variant}}"
+    case "$verrel" in
+        *.EL*) kdep="kernel${dashvariant}-%{_target_cpu} = ${verrel}" ;;
+        *)     kdep="kernel-%{_target_cpu} = ${verrel}${variant}"     ;;
+    esac
     cat <<EOF
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
 Provides:         kernel-module = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{version}-%{release}
-Requires:         kernel${dashvariant}-%{_target_cpu} = ${verrel}
+Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- thinkpad-kmod.spec	26 Jan 2006 22:21:45 -0000	1.1
+++ thinkpad-kmod.spec	28 Jan 2006 12:51:08 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.8
-Release:        9.%(echo %{kverrel} | tr - _)
+Release:        10.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-10
+- Update kmodtool to 0.10.4, fixes support for non-UP FC kernels.
+
 * Fri Jan 20 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.8-9
 - Remove "up" == "" support, related cleanups.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 13:37:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 08:37:03 -0500
Subject: rpms/plt-scheme/FC-4 .cvsignore, 1.5, 1.6 plt-scheme.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200601281337.k0SDbZXT003877@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3856

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Dec 2005 21:21:34 -0000	1.5
+++ .cvsignore	28 Jan 2006 13:37:03 -0000	1.6
@@ -1 +1 @@
-plt-300-src-unix.tgz
+plt-301-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plt-scheme.spec	19 Dec 2005 21:21:34 -0000	1.13
+++ plt-scheme.spec	28 Jan 2006 13:37:03 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        300
+Version:        301
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/301/plt/plt-301-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 301-1
+- new version 301
+
 * Mon Dec 19 2005 Gerard Milmeister <gemi at bluewin.ch> - 300-1
 - New Version 300
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2005 21:21:34 -0000	1.5
+++ sources	28 Jan 2006 13:37:03 -0000	1.6
@@ -1 +1 @@
-0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz
+61f43172460bb297edcf3e0c3599a5e2  plt-301-src-unix.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 13:39:30 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 08:39:30 -0500
Subject: rpms/plt-scheme/FC-3 .cvsignore, 1.4, 1.5 plt-scheme.spec, 1.8,
	1.9 sources, 1.5, 1.6
Message-ID: <200601281340.k0SDe3V6003923@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3885/FC-3

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 21:28:35 -0000	1.4
+++ .cvsignore	28 Jan 2006 13:39:30 -0000	1.5
@@ -1 +1 @@
-plt-300-src-unix.tgz
+plt-301-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/plt-scheme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plt-scheme.spec	19 Dec 2005 21:28:35 -0000	1.8
+++ plt-scheme.spec	28 Jan 2006 13:39:30 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        300
+Version:        301
 Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/301/plt/plt-301-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,7 @@
 drawing toolbox for drawing to windows, bitmaps, and printer devices;
 and an editor toolbox for creating multimedia editors.
 
+
 %prep
 %setup -q -n plt
 %ifarch x86_64
@@ -56,6 +57,7 @@
 %configure --enable-gl --enable-xrender --enable-xft
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/plt
@@ -81,6 +83,7 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+
 # get-base.ss causes error during install
 find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
@@ -127,6 +130,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 301-1
+- new version 301
+
 * Mon Dec 19 2005 Gerard Milmeister <gemi at bluewin.ch> - 300-1
 - New Version 300
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2005 21:28:35 -0000	1.5
+++ sources	28 Jan 2006 13:39:30 -0000	1.6
@@ -1 +1 @@
-0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz
+61f43172460bb297edcf3e0c3599a5e2  plt-301-src-unix.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 13:39:36 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 08:39:36 -0500
Subject: rpms/plt-scheme/devel .cvsignore, 1.4, 1.5 plt-scheme.spec, 1.21,
	1.22 sources, 1.5, 1.6
Message-ID: <200601281340.k0SDe8T2003930@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3885/devel

Modified Files:
	.cvsignore plt-scheme.spec sources 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Dec 2005 21:28:40 -0000	1.4
+++ .cvsignore	28 Jan 2006 13:39:36 -0000	1.5
@@ -1 +1 @@
-plt-300-src-unix.tgz
+plt-301-src-unix.tgz


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plt-scheme.spec	2 Jan 2006 23:14:23 -0000	1.21
+++ plt-scheme.spec	28 Jan 2006 13:39:36 -0000	1.22
@@ -1,12 +1,12 @@
 Name:           plt-scheme
-Version:        300
-Release:        3%{?dist}
+Version:        301
+Release:        1%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
 License:        LGPL
 URL:            http://www.drscheme.org
-Source:		http://download.plt-scheme.org/bundles/300/plt/plt-300-src-unix.tgz
+Source:		http://download.plt-scheme.org/bundles/301/plt/plt-301-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -96,6 +96,7 @@
 
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/man
 rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes
+
 # get-base.ss causes error during install
 find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f
 
@@ -142,6 +143,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 301-1
+- new version 301
+
 * Wed Dec 21 2005 Gerard Milmeister <gemi at bluewin.ch> - 300-2
 - xft patch no longer necessary
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Dec 2005 21:28:40 -0000	1.5
+++ sources	28 Jan 2006 13:39:36 -0000	1.6
@@ -1 +1 @@
-0e1d7d5dd06b3c290faa2d609e3df43f  plt-300-src-unix.tgz
+61f43172460bb297edcf3e0c3599a5e2  plt-301-src-unix.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 13:44:15 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sat, 28 Jan 2006 08:44:15 -0500
Subject: owners owners.list,1.569,1.570
Message-ID: <200601281344.k0SDimtu004074@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4057

Modified Files:
	owners.list 
Log Message:
Taking orphaned bluefish package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.569
retrieving revision 1.570
diff -u -r1.569 -r1.570
--- owners.list	28 Jan 2006 01:27:35 -0000	1.569
+++ owners.list	28 Jan 2006 13:44:15 -0000	1.570
@@ -75,7 +75,7 @@
 Fedora Extras|blender|3D modeling, animation, rendering and post-production|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|bluefish|A GTK2 web development application for experienced users|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|bluefish|A GTK2 web development application for experienced users|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Jan 28 14:52:56 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Jan 2006 09:52:56 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.13, 
	1.14
Message-ID: <200601281453.k0SErStc006212@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6193

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-6
- rebuild against new e-d-s.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- contact-lookup-applet.spec	17 Jan 2006 15:25:22 -0000	1.13
+++ contact-lookup-applet.spec	28 Jan 2006 14:52:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-6
+- rebuild against new e-d-s.
+
 * Tue Jan 17 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-5
 - Rebuild for evolution-data-server dep.
 - Bump.



From fedora-extras-commits at redhat.com  Sat Jan 28 14:55:04 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 28 Jan 2006 09:55:04 -0500
Subject: rpms/contact-lookup-applet/devel contact-lookup-applet.spec, 1.14, 
	1.15
Message-ID: <200601281455.k0SEtabX006298@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/contact-lookup-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6276

Modified Files:
	contact-lookup-applet.spec 
Log Message:
* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-7
- Bump.



Index: contact-lookup-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/contact-lookup-applet/devel/contact-lookup-applet.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- contact-lookup-applet.spec	28 Jan 2006 14:52:55 -0000	1.14
+++ contact-lookup-applet.spec	28 Jan 2006 14:55:03 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		contact-lookup-applet
 Version:	0.13
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Contact Lookup Applet
 
 Group:		Applications/Communications
@@ -44,6 +44,9 @@
 %{_datadir}/lookup-applet/%{name}.glade
 
 %changelog
+* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-7
+- Bump.
+
 * Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 0.13-6
 - rebuild against new e-d-s.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 15:05:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 28 Jan 2006 10:05:39 -0500
Subject: rpms/grads/FC-3 grads.spec,1.6,1.7
Message-ID: <200601281506.k0SF6FsD008129@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8111

Modified Files:
	grads.spec 
Log Message:
* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
- add BR on readline-devel close #178285



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grads.spec	23 Dec 2005 09:37:04 -0000	1.6
+++ grads.spec	28 Jan 2006 15:05:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        5%{?dist}.3
+Release:        6%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -30,12 +30,14 @@
 ExcludeArch:    x86_64
 
 # no hdf on ppc
+%ifnarch ppc
+BuildRequires:  hdf-devel 
+%endif
 BuildRequires:  udunits-devel netcdf-devel 
-#BuildRequires:  opendap-devel
+BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-#Requires:       
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -68,7 +70,7 @@
 
 %build
 ./bootstrap
-# pass the -L and -I flags for hdf even though there is no hdf
+# pass the -L and -I flags for hdf on ppc even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -90,6 +92,9 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
+%ifnarch ppc
+%{_bindir}/gradshdf
+%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -103,7 +108,10 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5.3
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+- add BR on readline-devel close #178285
+
+* Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5
 - don't build the hdf interface on ppc, there is no hdf package
 
 * Tue Dec 13 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-4



From fedora-extras-commits at redhat.com  Sat Jan 28 15:17:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 28 Jan 2006 10:17:40 -0500
Subject: rpms/grads/FC-3 grads.spec,1.7,1.8
Message-ID: <200601281518.k0SFID88008264@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8247

Modified Files:
	grads.spec 
Log Message:
no hdf on FC-3



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- grads.spec	28 Jan 2006 15:05:39 -0000	1.7
+++ grads.spec	28 Jan 2006 15:17:40 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        6%{?dist}
+Release:        6%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -29,10 +29,7 @@
 # configure fails on x86_64
 ExcludeArch:    x86_64
 
-# no hdf on ppc
-%ifnarch ppc
-BuildRequires:  hdf-devel 
-%endif
+# no hdf on FC-3
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
@@ -92,9 +89,6 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
-%ifnarch ppc
-%{_bindir}/gradshdf
-%endif
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -108,7 +102,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6.1
 - add BR on readline-devel close #178285
 
 * Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5



From fedora-extras-commits at redhat.com  Sat Jan 28 18:45:44 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sat, 28 Jan 2006 13:45:44 -0500
Subject: rpms/exo/devel exo.spec,1.10,1.11
Message-ID: <200601281846.k0SIkGGA014335@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/exo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14315

Modified Files:
	exo.spec 
Log Message:
Add imake and libXt-devel to BR to allow detection of modular xorg



Index: exo.spec
===================================================================
RCS file: /cvs/extras/rpms/exo/devel/exo.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- exo.spec	17 Aug 2005 17:00:03 -0000	1.10
+++ exo.spec	28 Jan 2006 18:45:43 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: Application library for the Xfce desktop environment
 Name: exo
 Version: 0.3.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: LGPL
 URL: http://libexo.os-cillation.com/
 Source0: http://download.berlios.de/xfce-goodies/exo-0.3.0.tar.bz2
@@ -18,6 +18,8 @@
 BuildRequires: pygtk2-devel
 BuildRequires: gettext
 BuildRequires: python-devel
+BuildRequires: imake
+BuildRequires: libXt-devel
 
 %description
 Extension library for Xfce, targeted at application development.
@@ -71,6 +73,9 @@
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Jan 28 2006 Kevin Fenzi <kevin at tummy.com> - 0.3.0-11.fc5
+- Add imake and libXt-devel to BR to allow detection of modular xorg
+
 * Wed Aug 17 2005 Kevin Fenzi <kevin at tummy.com> - 0.3.0-10.fc5
 - Rebuild for new libcairo and libpixman
 



From fedora-extras-commits at redhat.com  Sat Jan 28 19:35:07 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 14:35:07 -0500
Subject: rpms/pl/FC-3 .cvsignore,1.4,1.5 pl.spec,1.14,1.15 sources,1.4,1.5
Message-ID: <200601281935.k0SJZed4016418@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16363/FC-3

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Jan 2006 22:25:57 -0000	1.4
+++ .cvsignore	28 Jan 2006 19:35:07 -0000	1.5
@@ -1,3 +1,3 @@
+pl-5.6.3.tar.gz
 HTMLmanual.tar.gz
-pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/pl.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- pl.spec	2 Jan 2006 22:25:57 -0000	1.14
+++ pl.spec	28 Jan 2006 19:35:07 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.0
+Version:	5.6.3
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -28,6 +28,7 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
@@ -39,6 +40,7 @@
    tar zxf %{SOURCE2}
 )
 
+
 %build
 %configure
 make COFLAGS="$RPM_OPT_FLAGS"
@@ -48,6 +50,7 @@
 make COFLAGS="$RPM_OPT_FLAGS"
 cd ..
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
@@ -64,9 +67,11 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
@@ -76,7 +81,11 @@
 %{_libdir}/pl*
 %{_bindir}/*
 
+
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.3-1
+- new version 5.6.3
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
 - new version 5.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Jan 2006 22:25:57 -0000	1.4
+++ sources	28 Jan 2006 19:35:07 -0000	1.5
@@ -1,3 +1,3 @@
+6b83cbe448a6d2b0655a426d2e9cdcad  pl-5.6.3.tar.gz
 6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
-ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 19:35:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 14:35:13 -0500
Subject: rpms/pl/FC-4 .cvsignore,1.5,1.6 pl.spec,1.17,1.18 sources,1.5,1.6
Message-ID: <200601281935.k0SJZjvY016423@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16363/FC-4

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:10:54 -0000	1.5
+++ .cvsignore	28 Jan 2006 19:35:13 -0000	1.6
@@ -1,3 +1,3 @@
+pl-5.6.3.tar.gz
 HTMLmanual.tar.gz
-pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- pl.spec	2 Jan 2006 22:10:54 -0000	1.17
+++ pl.spec	28 Jan 2006 19:35:13 -0000	1.18
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.0
+Version:	5.6.3
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,7 +7,7 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.3-1
+- new version 5.6.3
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
 - new version 5.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 22:10:54 -0000	1.5
+++ sources	28 Jan 2006 19:35:13 -0000	1.6
@@ -1,3 +1,3 @@
+6b83cbe448a6d2b0655a426d2e9cdcad  pl-5.6.3.tar.gz
 6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
-ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 19:35:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 28 Jan 2006 14:35:19 -0500
Subject: rpms/pl/devel .cvsignore,1.5,1.6 pl.spec,1.20,1.21 sources,1.5,1.6
Message-ID: <200601281935.k0SJZpAB016428@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16363/devel

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Jan 2006 22:29:20 -0000	1.5
+++ .cvsignore	28 Jan 2006 19:35:19 -0000	1.6
@@ -1,3 +1,3 @@
+pl-5.6.3.tar.gz
 HTMLmanual.tar.gz
-pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- pl.spec	2 Jan 2006 22:53:37 -0000	1.20
+++ pl.spec	28 Jan 2006 19:35:19 -0000	1.21
@@ -1,13 +1,13 @@
 Name:		pl
-Version:	5.6.0
-Release:	2%{?dist}
+Version:	5.6.3
+Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         pl-5.4.6-rpath.patch
@@ -38,6 +38,7 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
@@ -49,6 +50,7 @@
    tar zxf %{SOURCE2}
 )
 
+
 %build
 %configure
 make COFLAGS="$RPM_OPT_FLAGS"
@@ -58,6 +60,7 @@
 make COFLAGS="$RPM_OPT_FLAGS"
 cd ..
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
@@ -74,9 +77,11 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
@@ -86,7 +91,11 @@
 %{_libdir}/pl*
 %{_bindir}/*
 
+
 %changelog
+* Sat Jan 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.3-1
+- new version 5.6.3
+
 * Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
 - new version 5.6.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Jan 2006 22:29:20 -0000	1.5
+++ sources	28 Jan 2006 19:35:19 -0000	1.6
@@ -1,3 +1,3 @@
+6b83cbe448a6d2b0655a426d2e9cdcad  pl-5.6.3.tar.gz
 6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
-ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz



From fedora-extras-commits at redhat.com  Sat Jan 28 20:10:50 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Sat, 28 Jan 2006 15:10:50 -0500
Subject: rpms/irssi/devel irssi.spec,1.13,1.14
Message-ID: <200601282011.k0SKBMUa018401@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/irssi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18384

Modified Files:
	irssi.spec 
Log Message:
devel/irssi: emacs rpm-mode borked changelog in previous commit


Index: irssi.spec
===================================================================
RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- irssi.spec	28 Jan 2006 07:46:46 -0000	1.13
+++ irssi.spec	28 Jan 2006 20:10:50 -0000	1.14
@@ -3,7 +3,7 @@
 Summary:	Modular text mode IRC client with Perl scripting
 Name:		irssi
 Version:	0.8.10
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 License:	GPL
 Group:		Applications/Communications
@@ -83,7 +83,10 @@
 %{_includedir}/irssi
 
 %changelog
-* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-2perl_vendorarch	%(eval "`perl -V:installvendorarch`"; echo $installvendorarch)?dist}
+* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-3
+- Fixed changelog -_-
+
+* Sat Jan 28 2006 Dams <anvil[AT]livna.org> - 0.8.10-2
 - Disabled gc support
 
 * Sun Dec 11 2005 Dams <anvil[AT]livna.org> - 0.8.10-1



From fedora-extras-commits at redhat.com  Sat Jan 28 20:48:42 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 15:48:42 -0500
Subject: rpms/xmldiff/FC-4 xmldiff.spec,1.3,1.4
Message-ID: <200601282049.k0SKnEcT018671@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18639/FC-4

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch: x86_64 (#177083)


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmldiff.spec	25 Jan 2006 06:19:19 -0000	1.3
+++ xmldiff.spec	28 Jan 2006 20:48:42 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,6 +24,7 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
+ExcludeArch:	x86_64  # see bug #177083
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
+- ExcludeArch: x86_64 (#177083)
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
 - Prevent temp file logjam (#177800)
 



From fedora-extras-commits at redhat.com  Sat Jan 28 20:48:48 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 15:48:48 -0500
Subject: rpms/xmldiff/devel xmldiff.spec,1.3,1.4
Message-ID: <200601282049.k0SKnKex018674@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18639/devel

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch: x86_64 (#177083)


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xmldiff.spec	25 Jan 2006 06:20:05 -0000	1.3
+++ xmldiff.spec	28 Jan 2006 20:48:47 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,6 +24,7 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
+ExcludeArch:	x86_64  # see bug #177083
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -84,6 +85,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
+- ExcludeArch: x86_64 (#177083)
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-6
 - Prevent temp file logjam (#177800)
 



From fedora-extras-commits at redhat.com  Sat Jan 28 21:35:57 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat, 28 Jan 2006 16:35:57 -0500
Subject: rpms/azureus/devel azureus-no-shared-plugins.patch, NONE,
	1.1 azureus-no-shared-plugins2.patch, NONE, 1.1 azureus.spec,
	1.9, 1.10
Message-ID: <200601282136.k0SLaTx8020722@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20695

Modified Files:
	azureus.spec 
Added Files:
	azureus-no-shared-plugins.patch 
	azureus-no-shared-plugins2.patch 
Log Message:
Rev to -21.  Patches to remove ability to install "shared" plugins.


azureus-no-shared-plugins.patch:

--- NEW FILE azureus-no-shared-plugins.patch ---
--- org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java~	2005-11-22 14:28:02.000000000 -0500
+++ org/gudy/azureus2/ui/swt/pluginsinstaller/IPWListPanel.java	2006-01-27 23:12:16.000000000 -0500
@@ -237,21 +237,15 @@
   	}
   
 	public boolean 
-	isNextEnabled() 
+	isFinishEnabled() 
 	{
 		return(((InstallPluginWizard)wizard).getPluginList().size() > 0 );
 	}
 	
-	public boolean 
-	isFinishEnabled() 
-	{
-	   return false ;
+	public IWizardPanel getFinishPanel() {
+	    return new IPWFinishPanel(wizard,this);
 	}
 	
-  public IWizardPanel getNextPanel() {
-    return new IPWInstallModePanel(wizard,this);
-  }
-	
   public void updateList() {
     ArrayList list = new ArrayList();
     TableItem[] items = pluginList.getItems();
@@ -261,7 +255,7 @@
       }
     }
     ((InstallPluginWizard)wizard).setPluginList(list);
-    ((InstallPluginWizard)wizard).setNextEnabled( isNextEnabled() );
+    ((InstallPluginWizard)wizard).setFinishEnabled( isFinishEnabled() );
     
   }
 }

azureus-no-shared-plugins2.patch:

--- NEW FILE azureus-no-shared-plugins2.patch ---
--- org/gudy/azureus2/ui/swt/views/ConfigView.java~	2005-11-20 14:43:58.000000000 -0500
+++ org/gudy/azureus2/ui/swt/views/ConfigView.java	2006-01-28 13:17:26.000000000 -0500
@@ -539,37 +539,6 @@
       }
     });
 
-    label = new Label(infoGroup, SWT.WRAP);
-    label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    Messages.setLanguageText(label, "ConfigView.pluginlist.whereToPutOr");
-
-    label = new Label(infoGroup, SWT.WRAP);
-    gridData = new GridData(GridData.FILL_HORIZONTAL);
-    gridData.horizontalIndent = 10;
-    label.setLayoutData(gridData);
-    label.setText(sAppPluginDir);
-    label.setForeground(Colors.blue);
-    label.setCursor(Cursors.handCursor);
-    
- 
-    final String _sAppPluginDir = sAppPluginDir;
-    
-    //TODO : Fix it for windows
-    label.addMouseListener(new MouseAdapter() {
-      public void mouseUp(MouseEvent arg0) {
-        if(_sAppPluginDir.endsWith("/plugins/") || _sAppPluginDir.endsWith("\\plugins\\")) {
-          File f = new File(_sAppPluginDir);
-          if(f.exists() && f.isDirectory()) {
-            Program.launch(_sAppPluginDir);
-          } else {
-            String azureusDir = _sAppPluginDir.substring(0,_sAppPluginDir.length() - 9);
-            System.out.println(azureusDir);
-            Program.launch(azureusDir);
-          }
-        }
-      }
-    });
-    
     List pluginIFs = Arrays.asList( azureus_core.getPluginManager().getPlugins());
     
     Collections.sort( 
@@ -609,10 +578,6 @@
       
       	user_plugin = true;
       	
-      }else if (sDirName.length() > sAppPluginDir.length() && 
-            sDirName.substring(0, sAppPluginDir.length()).equals(sAppPluginDir)){
-      	
-      	sDirName = sDirName.substring(sAppPluginDir.length());
       }
       
       // Blank means it's internal


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- azureus.spec	27 Jan 2006 15:02:12 -0000	1.9
+++ azureus.spec	28 Jan 2006 21:35:57 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           azureus
 Version:        2.3.0.6
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        A BitTorrent Client
 
 Group:          Applications/Internet
@@ -30,6 +30,8 @@
 Patch10:        azureus-cache-size.patch
 Patch11:        azureus-remove-manifest-classpath.patch
 Patch12:        azureus-themed.patch
+Patch13:        azureus-no-shared-plugins.patch
+Patch14:        azureus-no-shared-plugins2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, jpackage-utils >= 1.5, xml-commons-apis
@@ -63,6 +65,8 @@
 %patch10 -p0
 %patch11 -p0
 %patch12 -p0
+%patch13 -p0
+%patch14 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
@@ -146,6 +150,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-21
+- Add azureus-no-shared-plugins.patch.
+- Add azureus-no-shared-plugins2.patch.
+
 * Fri Jan 27 2006 Anthony Green <green at redhat.com> - 2.3.0.6-20
 - Remove junit reference from startup script.
 



From fedora-extras-commits at redhat.com  Sat Jan 28 21:44:30 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 28 Jan 2006 16:44:30 -0500
Subject: rpms/scmxx/devel scmxx.spec, 1.2, 1.3 sources, 1.2, 1.3 .cvsignore, 
	1.2, 1.3
Message-ID: <200601282145.k0SLj28E020852@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/scmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20829

Modified Files:
	scmxx.spec sources .cvsignore 
Log Message:
Updated to 0.8.2



Index: scmxx.spec
===================================================================
RCS file: /cvs/extras/rpms/scmxx/devel/scmxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scmxx.spec	26 Jul 2005 12:13:04 -0000	1.2
+++ scmxx.spec	28 Jan 2006 21:44:30 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Exchange data with Siemens mobile phones
 Name: scmxx
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Group: Applications/Communications
 License: GPL
@@ -35,7 +35,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS LICENSE CHANGELOG README
+%doc AUTHORS BUGS LICENSE CHANGELOG README docs/gsmcharset.txt
 %{_bindir}/scmxx
 %{_mandir}/man1/scmxx.1.gz
 %lang(de) %{_mandir}/de/man1/scmxx.1.gz
@@ -43,5 +43,9 @@
 %lang(ru) %{_mandir}/ru/man1/scmxx.1.gz
 
 %changelog
+* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
+- Updated to 0.8.2
+
 * Tue Jul 14 2005 Andreas Thienemann <andreas at bawue.net> 0.8.0-1
 - Initial specfile
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scmxx/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2005 12:09:45 -0000	1.2
+++ sources	28 Jan 2006 21:44:30 -0000	1.3
@@ -1 +1 @@
-21de1f98864e296da2cb6b424112361c  scmxx-0.8.0.tar.bz2
+a9cf309ae87a6ecde49cfcc8c456cec7  scmxx-0.8.2.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scmxx/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2005 12:09:45 -0000	1.2
+++ .cvsignore	28 Jan 2006 21:44:30 -0000	1.3
@@ -1 +1 @@
-scmxx-0.8.0.tar.bz2
+scmxx-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:05:44 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 28 Jan 2006 17:05:44 -0500
Subject: rpms/scmxx/FC-4 .cvsignore, 1.2, 1.3 scmxx.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601282206.k0SM6ZdJ022751@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/scmxx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22729

Modified Files:
	.cvsignore scmxx.spec sources 
Log Message:
* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
- Updated to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2005 12:09:45 -0000	1.2
+++ .cvsignore	28 Jan 2006 22:05:43 -0000	1.3
@@ -1 +1 @@
-scmxx-0.8.0.tar.bz2
+scmxx-0.8.2.tar.bz2


Index: scmxx.spec
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-4/scmxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scmxx.spec	26 Jul 2005 12:13:04 -0000	1.2
+++ scmxx.spec	28 Jan 2006 22:05:43 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Exchange data with Siemens mobile phones
 Name: scmxx
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Group: Applications/Communications
 License: GPL
@@ -35,7 +35,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS LICENSE CHANGELOG README
+%doc AUTHORS BUGS LICENSE CHANGELOG README docs/gsmcharset.txt
 %{_bindir}/scmxx
 %{_mandir}/man1/scmxx.1.gz
 %lang(de) %{_mandir}/de/man1/scmxx.1.gz
@@ -43,5 +43,9 @@
 %lang(ru) %{_mandir}/ru/man1/scmxx.1.gz
 
 %changelog
+* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
+- Updated to 0.8.2
+
 * Tue Jul 14 2005 Andreas Thienemann <andreas at bawue.net> 0.8.0-1
 - Initial specfile
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2005 12:09:45 -0000	1.2
+++ sources	28 Jan 2006 22:05:43 -0000	1.3
@@ -1 +1 @@
-21de1f98864e296da2cb6b424112361c  scmxx-0.8.0.tar.bz2
+a9cf309ae87a6ecde49cfcc8c456cec7  scmxx-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:09:20 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 28 Jan 2006 17:09:20 -0500
Subject: rpms/scmxx/FC-3 .cvsignore, 1.2, 1.3 scmxx.spec, 1.2, 1.3 sources,
	1.2, 1.3
Message-ID: <200601282209.k0SM9rMa022823@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/scmxx/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22799

Modified Files:
	.cvsignore scmxx.spec sources 
Log Message:
* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
- Updated to 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jul 2005 12:09:45 -0000	1.2
+++ .cvsignore	28 Jan 2006 22:09:20 -0000	1.3
@@ -1 +1 @@
-scmxx-0.8.0.tar.bz2
+scmxx-0.8.2.tar.bz2


Index: scmxx.spec
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-3/scmxx.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scmxx.spec	26 Jul 2005 12:13:04 -0000	1.2
+++ scmxx.spec	28 Jan 2006 22:09:20 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Exchange data with Siemens mobile phones
 Name: scmxx
-Version: 0.8.0
+Version: 0.8.2
 Release: 1%{?dist}
 Group: Applications/Communications
 License: GPL
@@ -35,7 +35,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS BUGS LICENSE CHANGELOG README
+%doc AUTHORS BUGS LICENSE CHANGELOG README docs/gsmcharset.txt
 %{_bindir}/scmxx
 %{_mandir}/man1/scmxx.1.gz
 %lang(de) %{_mandir}/de/man1/scmxx.1.gz
@@ -43,5 +43,9 @@
 %lang(ru) %{_mandir}/ru/man1/scmxx.1.gz
 
 %changelog
+* Sat Jan 28 2006 Andreas Thienemann <andreas at bawue.net> 0.8.2-1
+- Updated to 0.8.2
+
 * Tue Jul 14 2005 Andreas Thienemann <andreas at bawue.net> 0.8.0-1
 - Initial specfile
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scmxx/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jul 2005 12:09:45 -0000	1.2
+++ sources	28 Jan 2006 22:09:20 -0000	1.3
@@ -1 +1 @@
-21de1f98864e296da2cb6b424112361c  scmxx-0.8.0.tar.bz2
+a9cf309ae87a6ecde49cfcc8c456cec7  scmxx-0.8.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:22:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 28 Jan 2006 17:22:45 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.13, 1.14 rxvt-unicode.spec,
	1.15, 1.16 sources, 1.13, 1.14
Message-ID: <200601282223.k0SMNHeg022978@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Jan 2006 09:08:02 -0000	1.13
+++ .cvsignore	28 Jan 2006 22:22:45 -0000	1.14
@@ -1 +1 @@
-rxvt-unicode-7.3a.tar.bz2
+rxvt-unicode-7.4.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rxvt-unicode.spec	27 Jan 2006 09:08:02 -0000	1.15
+++ rxvt-unicode.spec	28 Jan 2006 22:22:45 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.3a
+Version:        7.4
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.4-1
+- version upgrade
+
 * Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.3a-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jan 2006 09:08:02 -0000	1.13
+++ sources	28 Jan 2006 22:22:45 -0000	1.14
@@ -1 +1 @@
-832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2
+553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:22:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 28 Jan 2006 17:22:51 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.13, 1.14 rxvt-unicode.spec,
	1.15, 1.16 sources, 1.13, 1.14
Message-ID: <200601282223.k0SMNN0f022983@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Jan 2006 09:08:10 -0000	1.13
+++ .cvsignore	28 Jan 2006 22:22:51 -0000	1.14
@@ -1 +1 @@
-rxvt-unicode-7.3a.tar.bz2
+rxvt-unicode-7.4.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rxvt-unicode.spec	27 Jan 2006 09:08:10 -0000	1.15
+++ rxvt-unicode.spec	28 Jan 2006 22:22:51 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.3a
+Version:        7.4
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.4-1
+- version upgrade
+
 * Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.3a-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jan 2006 09:08:10 -0000	1.13
+++ sources	28 Jan 2006 22:22:51 -0000	1.14
@@ -1 +1 @@
-832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2
+553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:22:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 28 Jan 2006 17:22:59 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.13, 1.14 rxvt-unicode.spec,
	1.19, 1.20 sources, 1.13, 1.14
Message-ID: <200601282223.k0SMNVMa022988@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22923/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	27 Jan 2006 09:08:41 -0000	1.13
+++ .cvsignore	28 Jan 2006 22:22:59 -0000	1.14
@@ -1 +1 @@
-rxvt-unicode-7.3a.tar.bz2
+rxvt-unicode-7.4.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- rxvt-unicode.spec	27 Jan 2006 09:08:41 -0000	1.19
+++ rxvt-unicode.spec	28 Jan 2006 22:22:59 -0000	1.20
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.3a
+Version:        7.4
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.4-1
+- version upgrade
+
 * Fri Jan 27 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.3a-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	27 Jan 2006 09:08:41 -0000	1.13
+++ sources	28 Jan 2006 22:22:59 -0000	1.14
@@ -1 +1 @@
-832ecf5687b65f039ae1286415f545c3  rxvt-unicode-7.3a.tar.bz2
+553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2



From fedora-extras-commits at redhat.com  Sat Jan 28 22:30:19 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 17:30:19 -0500
Subject: rpms/xmldiff/FC-4 xmldiff.spec,1.4,1.5
Message-ID: <200601282230.k0SMUxa9023168@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23134/FC-4

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch includes spurious values from misplaced comment


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/FC-4/xmldiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmldiff.spec	28 Jan 2006 20:48:42 -0000	1.4
+++ xmldiff.spec	28 Jan 2006 22:30:19 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,7 +24,8 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
-ExcludeArch:	x86_64  # see bug #177083
+# see bug #177083
+ExcludeArch:	x86_64
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-8
+- ExcludeArch includes spurious values from misplaced comment
+
 * Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
 - ExcludeArch: x86_64 (#177083)
 



From fedora-extras-commits at redhat.com  Sat Jan 28 22:30:36 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Sat, 28 Jan 2006 17:30:36 -0500
Subject: rpms/xmldiff/devel xmldiff.spec,1.4,1.5
Message-ID: <200601282231.k0SMV9FD023172@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/xmldiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23134/devel

Modified Files:
	xmldiff.spec 
Log Message:
ExcludeArch includes spurious values from misplaced comment


Index: xmldiff.spec
===================================================================
RCS file: /cvs/extras/rpms/xmldiff/devel/xmldiff.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmldiff.spec	28 Jan 2006 20:48:47 -0000	1.4
+++ xmldiff.spec	28 Jan 2006 22:30:36 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           xmldiff
 Version:        0.6.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tree to tree correction between XML documents
 
 Group:          Applications/Text
@@ -24,7 +24,8 @@
 Requires:   /usr/bin/sgmlnorm
 Requires:   /usr/bin/xsltproc
 
-ExcludeArch:	x86_64  # see bug #177083
+# see bug #177083
+ExcludeArch:	x86_64
 
 %description
 The xmldiff utility extracts differences between two XML files. It
@@ -85,6 +86,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-8
+- ExcludeArch includes spurious values from misplaced comment
+
 * Sat Jan 28 2006 Paul W. Frields <stickster at gmail.com> - 0.6.7-7
 - ExcludeArch: x86_64 (#177083)
 



From fedora-extras-commits at redhat.com  Sun Jan 29 03:30:59 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:30:59 -0500
Subject: rpms/tclsoap - New directory
Message-ID: <200601290331.k0T3V1mJ032683@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/tclsoap

Log Message:
Directory /cvs/extras/rpms/tclsoap added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:05 -0500
Subject: rpms/tclsoap/devel - New directory
Message-ID: <200601290331.k0T3V7xc032698@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/tclsoap/devel

Log Message:
Directory /cvs/extras/rpms/tclsoap/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:17 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:17 -0500
Subject: rpms/tclsoap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601290331.k0T3VJqE032734@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32722

Added Files:
	Makefile import.log 
Log Message:
Setup of module tclsoap


--- NEW FILE Makefile ---
# Top level Makefile for module tclsoap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:23 -0500
Subject: rpms/tclsoap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601290331.k0T3VP11032754@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32722/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tclsoap


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:46 -0500
Subject: rpms/tclsoap import.log,1.1,1.2
Message-ID: <200601290332.k0T3WIMw000363@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv325

Modified Files:
	import.log 
Log Message:
auto-import tclsoap-1.6.7-1 on branch devel from tclsoap-1.6.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tclsoap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 03:31:17 -0000	1.1
+++ import.log	29 Jan 2006 03:31:45 -0000	1.2
@@ -0,0 +1 @@
+tclsoap-1_6_7-1:HEAD:tclsoap-1.6.7-1.src.rpm:1138505502



From fedora-extras-commits at redhat.com  Sun Jan 29 03:31:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:31:51 -0500
Subject: rpms/tclsoap/devel tclsoap.patch, NONE, 1.1 tclsoap.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601290332.k0T3WOhC000367@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclsoap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv325/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tclsoap.patch tclsoap.spec 
Log Message:
auto-import tclsoap-1.6.7-1 on branch devel from tclsoap-1.6.7-1.src.rpm

tclsoap.patch:

--- NEW FILE tclsoap.patch ---
diff -Naur --exclude '*.swp' tclsoap1.6.7/Makefile.in tclsoap1.6.7.new/Makefile.in
--- tclsoap1.6.7/Makefile.in	2003-09-06 10:08:46.000000000 -0700
+++ tclsoap1.6.7.new/Makefile.in	2004-11-06 13:07:03.000000000 -0800
@@ -150,7 +150,16 @@
 install-doc: doc
 
 test:
-	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/tests/all.tcl`
+	if test -f pkgIndex.tcl ; then \
+	    cp -f pkgIndex.tcl pkgIndex.tcl.bak ; \
+	fi
+	sed -e "s#\\\$$dir#$(srcdir)/\\\$$dir#" < $(srcdir)/pkgIndex.tcl > pkgIndex.tcl.new
+	mv pkgIndex.tcl.new pkgIndex.tcl
+	TCLLIBPATH=. \
+	$(TCLSH_PROG) `$(CYGPATH) $(srcdir)/tests/all.tcl` $(TESTFLAGS)
+	if test -f pkgIndex.tcl.bak ; then \
+	    mv -f pkgIndex.tcl.bak pkgIndex.tcl ; \
+	fi
 
 depend:
 
diff -Naur --exclude '*.swp' tclsoap1.6.7/SOAP.tcl tclsoap1.6.7.new/SOAP.tcl
--- tclsoap1.6.7/SOAP.tcl	2003-09-06 10:08:46.000000000 -0700
+++ tclsoap1.6.7.new/SOAP.tcl	2004-11-06 08:24:09.000000000 -0800
@@ -17,16 +17,19 @@
 catch {package require uri::urn};       # tcllib 1.2
 package require SOAP::Utils;            # TclSOAP
 package require rpcvar;                 # TclSOAP 
+catch {package require xml};            # Needed for dom 3.0
 
 # -------------------------------------------------------------------------
 
 namespace eval ::SOAP {variable domVersion}
 if {[catch {package require SOAP::dom 1.0} ::SOAP::domVersion]} {
-    if { [catch {package require dom 2.0} ::SOAP::domVersion]} {
-        if { [catch {package require dom 1.6} ::SOAP::domVersion]} {
-            error "require dom package greater than 1.6"
-        }
-        package require SOAP::xpath;    # TclSOAP
+    if { [catch {package require dom 3.0} ::SOAP::domVersion]} {
+	if { [catch {package require dom 2.0} ::SOAP::domVersion]} {
+	    if { [catch {package require dom 1.6} ::SOAP::domVersion]} {
+		error "require dom package greater than 1.6"
+	    }
+	    package require SOAP::xpath;    # TclSOAP
+	}
     }
     proc ::SOAP::createDocument {name} {
         set doc [dom::DOMImplementation create]
diff -Naur --exclude '*.swp' tclsoap1.6.7/xpath.tcl tclsoap1.6.7.new/xpath.tcl
--- tclsoap1.6.7/xpath.tcl	2003-09-06 10:08:46.000000000 -0700
+++ tclsoap1.6.7.new/xpath.tcl	2004-11-06 08:34:31.000000000 -0800
@@ -14,9 +14,13 @@
 # for more details.
 # -------------------------------------------------------------------------
 
-if { [catch {package require dom 2.0}] } {
-    if { [catch {package require dom 1.6}] } {
-        error "require dom package greater than 1.6"
+catch {package require xml};            # Needed for dom 3.0
+
+if { [catch {package require dom 3.0}] } {
+    if { [catch {package require dom 2.0}] } {
+        if { [catch {package require dom 1.6}] } {
+            error "require dom package greater than 1.6"
+        }
     }
 }
 


--- NEW FILE tclsoap.spec ---
Summary:  Tcl commands for SOAP remote procedure calls
Name: tclsoap
Version: 1.6.7
Release: 1%{?dist}
License: MIT
URL: http://tclsoap.sourceforge.net/
Group: Development/Libraries
Source0:        http://download.sourceforge.net/tclsoap/TclSOAP-1.6.7.tar.gz
Patch0: tclsoap.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: tcl
Requires: tcl tcldom

%description
Provides support for building clients and servers for the
SOAP remote procedure call protocol from Tcl. SOAP is an 
XML based RPC mechanism which provides cross-platform
cross language compatibility.

%prep
%setup -q -n %{name}%{version}
%patch0 -p1
chmod a-x doc/*

%build
%configure --libdir=%{_datadir}
# Nothing to build.  Don't run 'make'

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%{_datadir}/%{name}%{version}
%doc CHANGES LICENSE DESCRIPTION.txt TclSOAP.ANN
%doc doc/*

%changelog
* Sat Dec 10 2005 Wart <wart at kobold.org> - 1.6.7-1
- Initial spec file.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tclsoap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 03:31:23 -0000	1.1
+++ .cvsignore	29 Jan 2006 03:31:51 -0000	1.2
@@ -0,0 +1 @@
+TclSOAP-1.6.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tclsoap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 03:31:23 -0000	1.1
+++ sources	29 Jan 2006 03:31:51 -0000	1.2
@@ -0,0 +1 @@
+6e07a5dad13233851fc9eecd9f7319e1  TclSOAP-1.6.7.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 03:42:52 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 28 Jan 2006 22:42:52 -0500
Subject: owners owners.list,1.570,1.571
Message-ID: <200601290343.k0T3hOhs000482@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv465

Modified Files:
	owners.list 
Log Message:
Added tclsoap




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.570
retrieving revision 1.571
diff -u -r1.570 -r1.571
--- owners.list	28 Jan 2006 13:44:15 -0000	1.570
+++ owners.list	29 Jan 2006 03:42:52 -0000	1.571
@@ -1212,6 +1212,7 @@
 Fedora Extras|tcldom|DOM bindings for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclhttpd|Tcl Web+Application server|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tcllib|Standard Tcl library|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|tclsoap|Tcl commands for SOAP remote procedure calls|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tclxml|XML parser for Tcl|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|tdl|To-do list manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|Terminal|Xfce Terminal Emulator|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 03:57:44 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 28 Jan 2006 22:57:44 -0500
Subject: rpms/foremost/FC-4 .cvsignore, 1.2, 1.3 foremost.spec, 1.1,
	1.2 sources, 1.2, 1.3 foremost-config.patch, 1.1, NONE
Message-ID: <200601290358.k0T3wGYU000558@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/foremost/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv537

Modified Files:
	.cvsignore foremost.spec sources 
Removed Files:
	foremost-config.patch 
Log Message:
* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
- Upgrade to 1.1.
- Rework the config patch as a sed replacement.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/foremost/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2005 19:43:50 -0000	1.2
+++ .cvsignore	29 Jan 2006 03:57:43 -0000	1.3
@@ -1 +1 @@
-foremost-1.0.tar.gz
+foremost-1.1.tar.gz


Index: foremost.spec
===================================================================
RCS file: /cvs/extras/rpms/foremost/FC-4/foremost.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foremost.spec	30 Sep 2005 19:43:50 -0000	1.1
+++ foremost.spec	29 Jan 2006 03:57:43 -0000	1.2
@@ -1,19 +1,16 @@
 Name:           foremost
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Recover files by "carving" them from a raw disk
 
 Group:          Applications/File
 License:        GPL
 URL:            http://foremost.sf.net
-# Upstream isn't versioning their tarballs!  They list the md5sum of their
-# present tarball on the web page so this should make it easier to decide if
-# they've updated without me noticing.
-# MD5Sum:
-# 6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
-Source0:        http://foremost.sourceforge.net/pkg/foremost-1.0.tar.gz
+# Upstream wasn't versioning their tarballs.  Record of the latest md5sum in
+# case that happens again.
+# b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz
+Source0:        http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
 Source1:       COPYING
-Patch0:		foremost-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,13 +24,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
+sed -i 's!/usr/local/etc/foremost.conf!%{_sysconfdir}/foremost.conf!' config.c
 sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile
 cp %{SOURCE1} .
 
 %build
-# Binary files were left in the distributed tarball.
-make clean
 make %{?_smp_mflags} CONF=%{_sysconfdir}
 
 %install
@@ -45,6 +40,7 @@
     CONF=$RPM_BUILD_ROOT%{_sysconfdir}
 
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/foremost.conf
+chmod 0644 CHANGES README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,9 +50,13 @@
 %doc README CHANGES COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/*
+%config(noreplace) %{_sysconfdir}/foremost.conf
 
 %changelog
+* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
+- Upgrade to 1.1.
+- Rework the config patch as a sed replacement.
+
 * Thu Sep 29 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.0-4
 - Fix permissions on installed foremost.conf file.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/foremost/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2005 19:43:50 -0000	1.2
+++ sources	29 Jan 2006 03:57:43 -0000	1.3
@@ -1 +1 @@
-6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
+b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz


--- foremost-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 29 04:23:56 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 28 Jan 2006 23:23:56 -0500
Subject: rpms/foremost/devel .cvsignore, 1.2, 1.3 foremost.spec, 1.1,
	1.2 sources, 1.2, 1.3 foremost-config.patch, 1.1, NONE
Message-ID: <200601290424.k0T4OTFh002497@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/foremost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2454

Modified Files:
	.cvsignore foremost.spec sources 
Removed Files:
	foremost-config.patch 
Log Message:
* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
- Upgrade to 1.1.
- Rework the config patch as a sed replacement.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/foremost/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Sep 2005 19:43:50 -0000	1.2
+++ .cvsignore	29 Jan 2006 04:23:56 -0000	1.3
@@ -1 +1 @@
-foremost-1.0.tar.gz
+foremost-1.1.tar.gz


Index: foremost.spec
===================================================================
RCS file: /cvs/extras/rpms/foremost/devel/foremost.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- foremost.spec	30 Sep 2005 19:43:50 -0000	1.1
+++ foremost.spec	29 Jan 2006 04:23:56 -0000	1.2
@@ -1,19 +1,16 @@
 Name:           foremost
-Version:        1.0
-Release:        4%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Recover files by "carving" them from a raw disk
 
 Group:          Applications/File
 License:        GPL
 URL:            http://foremost.sf.net
-# Upstream isn't versioning their tarballs!  They list the md5sum of their
-# present tarball on the web page so this should make it easier to decide if
-# they've updated without me noticing.
-# MD5Sum:
-# 6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
-Source0:        http://foremost.sourceforge.net/pkg/foremost-1.0.tar.gz
+# Upstream wasn't versioning their tarballs.  Record of the latest md5sum in
+# case that happens again.
+# b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz
+Source0:        http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
 Source1:       COPYING
-Patch0:		foremost-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,13 +24,11 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
+sed -i 's!/usr/local/etc/foremost.conf!%{_sysconfdir}/foremost.conf!' config.c
 sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile
 cp %{SOURCE1} .
 
 %build
-# Binary files were left in the distributed tarball.
-make clean
 make %{?_smp_mflags} CONF=%{_sysconfdir}
 
 %install
@@ -45,6 +40,7 @@
     CONF=$RPM_BUILD_ROOT%{_sysconfdir}
 
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/foremost.conf
+chmod 0644 CHANGES README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -54,9 +50,13 @@
 %doc README CHANGES COPYING
 %{_bindir}/*
 %{_mandir}/man1/*
-%config(noreplace) %{_sysconfdir}/*
+%config(noreplace) %{_sysconfdir}/foremost.conf
 
 %changelog
+* Sat Jan 28 2006 Toshio Kuratomi <toshio at tiki-lounge.com> 1.1-1
+- Upgrade to 1.1.
+- Rework the config patch as a sed replacement.
+
 * Thu Sep 29 2005 Toshio Kuratomi <toshio at tiki-lounge.com> 1.0-4
 - Fix permissions on installed foremost.conf file.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/foremost/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Sep 2005 19:43:50 -0000	1.2
+++ sources	29 Jan 2006 04:23:56 -0000	1.3
@@ -1 +1 @@
-6e77f71e4003e06de394d500a1d972c7  foremost-1.0.tar.gz
+b606cc602f38f0e370531f5c7911addb  foremost-1.1.tar.gz


--- foremost-config.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Jan 29 04:24:04 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 28 Jan 2006 23:24:04 -0500
Subject: rpms/gquilt/devel .cvsignore, 1.6, 1.7 gquilt.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200601290424.k0T4Oafc002503@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2476

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Dec 2005 01:11:42 -0000	1.6
+++ .cvsignore	29 Jan 2006 04:24:04 -0000	1.7
@@ -1 +1 @@
-gquilt-0.15.tar.gz
+gquilt-0.16.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/gquilt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gquilt.spec	7 Dec 2005 01:11:42 -0000	1.5
+++ gquilt.spec	29 Jan 2006 04:24:04 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.15
+Version:	0.16
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	pygtk2, quilt
+Requires:	pygtk2 >= 2.6, quilt
 
 %description
 quilt is a tool for managing a series of patches by keeping track
@@ -51,6 +51,10 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Sat Jan 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 0.16-1
+- Update to latest release
+- Require pygtk2 >= 2.6
+
 * Mon Dec 5 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 0.15-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Dec 2005 01:11:42 -0000	1.6
+++ sources	29 Jan 2006 04:24:04 -0000	1.7
@@ -1 +1 @@
-b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz
+4d1b5e44130b0a55f8ec25f22780b272  gquilt-0.16.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 04:25:54 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Sat, 28 Jan 2006 23:25:54 -0500
Subject: rpms/gquilt/FC-4 .cvsignore, 1.6, 1.7 gquilt.spec, 1.5, 1.6 sources,
	1.6, 1.7
Message-ID: <200601290426.k0T4QZFn002613@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/gquilt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2591

Modified Files:
	.cvsignore gquilt.spec sources 
Log Message:
Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	7 Dec 2005 01:31:41 -0000	1.6
+++ .cvsignore	29 Jan 2006 04:25:53 -0000	1.7
@@ -1 +1 @@
-gquilt-0.15.tar.gz
+gquilt-0.16.tar.gz


Index: gquilt.spec
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/gquilt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gquilt.spec	7 Dec 2005 01:31:41 -0000	1.5
+++ gquilt.spec	29 Jan 2006 04:25:53 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		gquilt
-Version:	0.15
+Version:	0.16
 Release:	1%{?dist}
 License:	GPL
 Group:		Development/Tools
@@ -9,7 +9,7 @@
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	desktop-file-utils
-Requires:	pygtk2, quilt
+Requires:	pygtk2 >= 2.6, quilt
 
 %description
 quilt is a tool for managing a series of patches by keeping track
@@ -51,6 +51,10 @@
 rm -rf "$RPM_BUILD_ROOT"
 
 %changelog
+* Sat Jan 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 0.16-1
+- Update to latest release
+- Require pygtk2 >= 2.6
+
 * Mon Dec 5 2005 Josh Boyer <jwboyer at jdub.homelinux.org> 0.15-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gquilt/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Dec 2005 01:31:41 -0000	1.6
+++ sources	29 Jan 2006 04:25:53 -0000	1.7
@@ -1 +1 @@
-b0a5eee0811471f50f9ee8fba5838a84  gquilt-0.15.tar.gz
+4d1b5e44130b0a55f8ec25f22780b272  gquilt-0.16.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 05:03:38 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 29 Jan 2006 00:03:38 -0500
Subject: owners owners.list,1.571,1.572
Message-ID: <200601290504.k0T54EFS004502@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4481

Modified Files:
	owners.list 
Log Message:
taking ownership of firestarter



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -r1.571 -r1.572
--- owners.list	29 Jan 2006 03:42:52 -0000	1.571
+++ owners.list	29 Jan 2006 05:03:38 -0000	1.572
@@ -214,7 +214,7 @@
 Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|liljencrantz at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|flim|Emacs library for handling email messages|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|flow-tools|Tool set for working with NetFlow data|i at stingr.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 05:29:35 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 29 Jan 2006 00:29:35 -0500
Subject: rpms/firestarter/devel firestarter-1.0.3-nobrowser.patch, NONE,
	1.1 firestarter-1.0.3-services.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 firestarter.spec, 1.15, 1.16 sources, 1.8, 1.9
Message-ID: <200601290530.k0T5U8rY004698@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658

Modified Files:
	.cvsignore firestarter.spec sources 
Added Files:
	firestarter-1.0.3-nobrowser.patch 
	firestarter-1.0.3-services.patch 
Log Message:
fixes bug #178040
I'm not going to request build until bug #160431 is fixed and #179248
has been looked at (and maybe fixed)


firestarter-1.0.3-nobrowser.patch:

--- NEW FILE firestarter-1.0.3-nobrowser.patch ---
diff -ur firestarter-1.0.3/src/menus.c firestarter-1.0.3-patched/src/menus.c
--- firestarter-1.0.3/src/menus.c	2005-01-29 07:32:08.000000000 -0500
+++ firestarter-1.0.3-patched/src/menus.c	2006-01-17 11:12:06.000000000 -0500
@@ -34,8 +34,6 @@
 
 static GtkUIManager *ui_manager;
 
-static void open_homepage (void);
-static void open_manual (void);
 static void copy_selected (void);
 
 /* Normal items */
@@ -67,8 +65,6 @@
 	{ "EditRule", FIRESTARTER_STOCK_EDIT, N_("_Edit Rule"), NULL, N_("Edit the selected rule"), policyview_edit_rule },
 	{ "ApplyPolicy", GTK_STOCK_APPLY, N_("A_pply Policy"), NULL, N_("Apply the changes made the policy"), policyview_apply },
 
-	{ "OpenManual", GTK_STOCK_HELP, N_("Online Users' _Manual"), NULL, N_("Open the online users' manual in a browser"), open_manual },
-	{ "OpenHomepage", GTK_STOCK_HOME, N_("Firestarter _Homepage"), NULL, N_("Open the Firestarter homepage in a browser"), open_homepage },
 	{ "ShowAbout", GNOME_STOCK_ABOUT, N_("_About"), NULL, N_("About Firestarter"), G_CALLBACK (show_about) },
 
 	{ "AllowInboundFrom", NULL, N_("Allow Connections From Source"), NULL, N_("Allow all connections from this source"), hitview_allow_host },
@@ -146,8 +142,6 @@
 	"      <menuitem action='ApplyPolicy'/>"
 	"    </menu>"
 	"    <menu action='HelpMenu'>"
-	"      <menuitem action='OpenManual'/>"
-	"      <menuitem action='OpenHomepage'/>"
 	"      <separator/>"
 	"      <menuitem action='ShowAbout'/>"
 	"    </menu>"
@@ -538,18 +532,6 @@
 	g_object_set (G_OBJECT (action), "sensitive", enabled, NULL);
 }
 
-static void
-open_homepage (void)
-{
-	gnome_url_show ("http://www.fs-security.com", NULL);
-}
-
-static void
-open_manual (void)
-{
-	gnome_url_show ("http://www.fs-security.com/docs/", NULL);
-}
-
 /* [ copy_selected ]
  * Copy the selection in the active view to the clipboard
  */

firestarter-1.0.3-services.patch:

--- NEW FILE firestarter-1.0.3-services.patch ---
diff -ur firestarter-1.0.3/src/service.c firestarter-1.0.3.patched/src/service.c
--- firestarter-1.0.3/src/service.c	2005-01-29 04:32:08.000000000 -0800
+++ firestarter-1.0.3.patched/src/service.c	2006-01-17 04:34:43.000000000 -0800
@@ -22,7 +22,9 @@
 } Service;
 
 Service user_services[] = {
+        {"APCUPSD", "3551"},
 	{"BitTorrent", "6881-6889"},
+        {"CUPS", "631"},
 	{"DHCP", "67-68"},
 	{"DNS", "53"},
 	{"FTP", "20-21"},


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	2 Jun 2005 14:46:10 -0000	1.8
+++ .cvsignore	29 Jan 2006 05:29:35 -0000	1.9
@@ -1 +1,2 @@
 firestarter-1.0.3.tar.gz
+20050107-fs-manual.pdf


Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- firestarter.spec	18 Aug 2005 20:07:21 -0000	1.15
+++ firestarter.spec	29 Jan 2006 05:29:35 -0000	1.16
@@ -1,13 +1,17 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://firestarter.sourceforge.net
 Source0:	http://download.sourceforge.net/firestarter/firestarter-1.0.3.tar.gz
+Source1:	20050107-fs-manual.pdf
+#Source1:	http://www.fs-security.com/docs/fs-manual.pdf
 Patch0:		firestarter-1.0.3-pam.patch
+Patch1:		firestarter-1.0.3-services.patch
+Patch2:		firestarter-1.0.3-nobrowser.patch      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -34,7 +38,9 @@
 %prep
 %setup -q
 %patch0 -p1 -b .pam
-
+%patch1 -p1 -b .services
+%patch2 -p1 -b .nobrowser
+cp %{SOURCE1} ./fs-manual.pdf
 
 %build
 %configure
@@ -52,7 +58,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 
 mv ${RPM_BUILD_ROOT}/%{_bindir}/firestarter ${RPM_BUILD_ROOT}/%{_sbindir}
-ln -s %{_bindir}/consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter
+ln -s consolehelper ${RPM_BUILD_ROOT}/%{_bindir}/firestarter
 
 touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/configuration
 touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/firestarter/events-filter-hosts
@@ -115,34 +121,37 @@
 %postun
 if [ "$1" = "0" ]; then
     if [ -e /etc/dhclient-exit-hooks ]; then
-        grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > /etc/dhclient-exit-hooks.tmp
-        mv /etc/dhclient-exit-hooks.tmp /etc/dhclient-exit-hooks
+        NEW_CONF=`mktemp -t firestarter.XXXXXX`
+        grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF}
+        cat ${NEW_CONF} > /etc/dhclient-exit-hooks
     fi
 fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README ChangeLog AUTHORS TODO COPYING CREDITS
+%doc README ChangeLog AUTHORS TODO COPYING CREDITS fs-manual.pdf
 %attr(755,root,root) %{_sbindir}/firestarter
 %{_bindir}/firestarter
-%config %{_initrddir}/firestarter
+%{_initrddir}/firestarter
 %{_sysconfdir}/gconf/schemas/firestarter.schemas
 %{_sysconfdir}/pam.d/firestarter
 %{_sysconfdir}/security/console.apps/%{name}
 %dir %attr(700,root,root) %{_sysconfdir}/firestarter
 %dir %attr(700,root,root) %{_sysconfdir}/firestarter/inbound
 %dir %attr(700,root,root) %{_sysconfdir}/firestarter/outbound
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports
-%config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/*
-%config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/*
+# ghosted
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/configuration
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-hosts
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/events-filter-ports
+%ghost %config(missingok,noreplace) %attr(700,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firestarter.sh
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/firewall
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/sysctl-tuning
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-pre
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/user-post
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/inbound/*
+%ghost %config(missingok,noreplace) %attr(400,root,root) %verify(not md5 mode mtime size) %{_sysconfdir}/firestarter/outbound/*
+# end ghosted
 %{_sysconfdir}/firestarter/non-routables
 %{_datadir}/applications/fedora-firestarter.desktop
 %{_datadir}/pixmaps/*
@@ -150,6 +159,12 @@
 
 
 %changelog
+* Tue Jan 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-7
+- add CUPS and APCUPSD to services
+- don't open browser window since it runs as root (bug #178040)
+- add PDF documentation
+- some spec file cleanup
+
 * Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.3-6
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	2 Jun 2005 14:46:10 -0000	1.8
+++ sources	29 Jan 2006 05:29:35 -0000	1.9
@@ -1 +1,2 @@
 f46860a9e16dac4b693bd05f16370b03  firestarter-1.0.3.tar.gz
+61b03e662802b885d5305bd225038010  20050107-fs-manual.pdf



From fedora-extras-commits at redhat.com  Sun Jan 29 07:02:02 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Sun, 29 Jan 2006 02:02:02 -0500
Subject: rpms/octave/FC-4 octave-2.1.72-freqz.patch, NONE, 1.1 octave.spec, 
	1.23, 1.24
Message-ID: <200601290702.k0T72YeR008406@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8386

Modified Files:
	octave.spec 
Added Files:
	octave-2.1.72-freqz.patch 
Log Message:
Fix bug #179242. The patch is taken from octave CVS, where it's already fixed.

octave-2.1.72-freqz.patch:

--- NEW FILE octave-2.1.72-freqz.patch ---
Index: scripts/signal/freqz.m
--- scripts/signal/freqz.m	2006-01-29 00:46:27.000000000 -0600
+++ scripts/signal/freqz.m	2006-01-29 00:53:57.000000000 -0600
@@ -84,7 +84,7 @@
     region = Fs = [];
   elseif (nargin == 4)
     Fs = [];
-    if (! isstr (region) && ! isempty (region))
+    if (! ischar (region) && ! isempty (region))
       Fs = region; 
       region = [];
     endif
@@ -114,26 +114,27 @@
     endif
   endif
 
-  a = a(:).';
-  b = b(:).';
+  a = a(:);
+  b = b(:);
 
   if (! isscalar (n)) ## Explicit frequency vector given
     w = f = n;
     if (nargin == 4)  ## Sampling rate Fs was specified
       w = 2*pi*f/Fs;
     endif
-    hb = polyval (fliplr(b), exp(-j*w));
-    ha = polyval (fliplr(a), exp(-j*w));
+    hb = polyval (fliplr(b), exp(j*w));
+    ha = polyval (fliplr(a), exp(j*w));
   elseif (strcmp (region, "whole"))
-    f = Fs * (0:n-1) / n;
-    ## polyval(fliplr(P),exp(-jw)) is O(p n) and fft(x) is O(n log(n)), where p is the 
-    ## order of the the polynomial P.  For small p it would be faster to use polyval  
-    ## but in practice the overhead for polyval is much higher and the little bit of
-    ## time saved isn't worth the extra code.
+    f = Fs * (0:n-1)' / n;
+    ## polyval(fliplr(P),exp(jw)) is O(p n) and fft(x) is O(n log(n)),
+    ## where p is the order of the the polynomial P.  For small p it
+    ## would be faster to use polyval but in practice the overhead for
+    ## polyval is much higher and the little bit of time saved isn't
+    ## worth the extra code.
     hb = fft (postpad (b, n));
     ha = fft (postpad (a, n));
   else
-    f = Fs/2 * (0:n-1) / n;
+    f = Fs/2 * (0:n-1)' / n;
     hb = fft (postpad (b, 2*n))(1:n);
     ha = fft (postpad (a, 2*n))(1:n);
   endif
@@ -169,9 +170,9 @@
 %!test # Sampling frequency properly interpreted
 %! b = [1 1 1]/3;
 %! [h,f] = freqz(b,1,16,320);
-%! assert(f,[0:15]*10,10*eps);
+%! assert(f,[0:15]'*10,10*eps);
 %! [h2,f2] = freqz(b,1,[0:15]*10,320);
 %! assert(f2,[0:15]*10,10*eps);
-%! assert(h,h2,20*eps);
+%! assert(h,h2',20*eps);
 %! [h3,f3] = freqz(b,1,32,'whole',320);
-%! assert(f3,[0:31]*10,10*eps);
+%! assert(f3,[0:31]'*10,10*eps);


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- octave.spec	26 Jan 2006 22:47:33 -0000	1.23
+++ octave.spec	29 Jan 2006 07:02:01 -0000	1.24
@@ -1,12 +1,13 @@
 Name:           octave
 Version:        2.1.72
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
 Group:          Applications/Engineering
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
+Patch0:         octave-2.1.72-freqz.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Sat Jan 28 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-3
+- Patch to fix bug #179242.
+
 * Thu Jan 26 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.1.72-2
 - Rebuild for new release of hdf5.
 



From fedora-extras-commits at redhat.com  Sun Jan 29 07:09:05 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:09:05 -0500
Subject: rpms/bidiv - New directory
Message-ID: <200601290709.k0T79Btq008486@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8477/bidiv

Log Message:
Directory /cvs/extras/rpms/bidiv added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 07:09:16 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:09:16 -0500
Subject: rpms/bidiv/devel - New directory
Message-ID: <200601290709.k0T79I0n008500@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8477/bidiv/devel

Log Message:
Directory /cvs/extras/rpms/bidiv/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 07:10:25 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:10:25 -0500
Subject: rpms/bidiv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601290710.k0T7AS45008557@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8525/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bidiv


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 07:10:06 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:10:06 -0500
Subject: rpms/bidiv Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601290710.k0T7AP0O008540@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8525

Added Files:
	Makefile import.log 
Log Message:
Setup of module bidiv


--- NEW FILE Makefile ---
# Top level Makefile for module bidiv
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 07:12:39 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:12:39 -0500
Subject: rpms/bidiv import.log,1.1,1.2
Message-ID: <200601290713.k0T7DBcP008660@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8611

Modified Files:
	import.log 
Log Message:
auto-import bidiv-1.5-1 on branch devel from bidiv-1.5-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bidiv/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 07:10:06 -0000	1.1
+++ import.log	29 Jan 2006 07:12:38 -0000	1.2
@@ -0,0 +1 @@
+bidiv-1_5-1:HEAD:bidiv-1.5-1.src.rpm:1138525944



From fedora-extras-commits at redhat.com  Sun Jan 29 07:13:01 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:13:01 -0500
Subject: rpms/bidiv/devel bidiv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200601290713.k0T7DXk8008664@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/bidiv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8611/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bidiv.spec 
Log Message:
auto-import bidiv-1.5-1 on branch devel from bidiv-1.5-1.src.rpm


--- NEW FILE bidiv.spec ---
Summary: Display logical Hebrew on unidirectional terminals
Name: bidiv
Version: 1.5
Release: 1%{?dist}
URL: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/
Source: http://ftp.ivrix.org.il/pub/ivrix/src/cmdline/%{name}-%{version}.tgz
License: GPL
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: fribidi-devel

%description
Bidiv (BiDirectional Viewer) is a simple utility for converting logical-Hebrew
input to visual-Hebrew output. This is useful for reading Hebrew mail messages,
viewing Hebrew texts, etc.

%prep
%setup -q -n bidiv

%build
make PREFIX=%{buildroot} CC_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}

%install
rm -rf %{buildroot}
install -d %{buildroot}%{_bindir}
install -d %{buildroot}%{_mandir}/man1
make PREFIX=%{buildroot}%{_prefix} \
     MAN_PATH=%{buildroot}%{_mandir} install

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README COPYING
%{_prefix}/bin/bidiv
%{_mandir}/man1/bidiv.1*
# and what about %{_mandir}/he/man1/bidiv.1 ? ;)

%changelog
* Sat Jan  7 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 1.5-1
- new upstream version.
* Mon Dec 26 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 1.4-3
- smp_flags and GPL text added, Provides removed
* Thu Nov 17 2005 Dan Kenigsberg <danken at cs.technion.ac.il> 1.4-2
- beautification for Fedora Extras
* Mon Feb 19 2001 Tzafrir Cohen <tzafrir at technion.ac.il> 1.4-1
- initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bidiv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 07:10:25 -0000	1.1
+++ .cvsignore	29 Jan 2006 07:12:58 -0000	1.2
@@ -0,0 +1 @@
+bidiv-1.5.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bidiv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 07:10:25 -0000	1.1
+++ sources	29 Jan 2006 07:12:58 -0000	1.2
@@ -0,0 +1 @@
+e1a951dac153c3998e6276e11f681ac4  bidiv-1.5.tgz



From fedora-extras-commits at redhat.com  Sun Jan 29 07:18:27 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 29 Jan 2006 02:18:27 -0500
Subject: owners owners.list,1.572,1.573
Message-ID: <200601290719.k0T7IxBd008723@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8706/owners

Modified Files:
	owners.list 
Log Message:
add entry for bidiv (bidirectional text filter)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.572
retrieving revision 1.573
diff -u -r1.572 -r1.573
--- owners.list	29 Jan 2006 05:03:38 -0000	1.572
+++ owners.list	29 Jan 2006 07:18:27 -0000	1.573
@@ -67,6 +67,7 @@
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|bin2iso|Convert ".bin" files into ISO or WAV|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 09:29:01 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 04:29:01 -0500
Subject: rpms/themes-backgrounds-gnome import.log,1.4,1.5
Message-ID: <200601290929.k0T9TdYu018601@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18566

Modified Files:
	import.log 
Log Message:
auto-import themes-backgrounds-gnome-0.4-1 on branch devel from themes-backgrounds-gnome-0.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 05:27:35 -0000	1.4
+++ import.log	29 Jan 2006 09:29:00 -0000	1.5
@@ -1,3 +1,4 @@
 themes-backgrounds-gnome-0_3-0_fdr_2:HEAD:themes-backgrounds-gnome-0.3-0.fdr.2.src.rpm:1099891601
 themes-backgrounds-gnome-0_3-0_fdr_2_1:HEAD:themes-backgrounds-gnome-0.3-0.fdr.2.1.src.rpm:1099891649
 themes-backgrounds-gnome-0_3-0_fdr_2_1_90:HEAD:themes-backgrounds-gnome-0.3-0.fdr.2.1.90.src.rpm:1099891655
+themes-backgrounds-gnome-0_4-1:HEAD:themes-backgrounds-gnome-0.4-1.src.rpm:1138526930



From fedora-extras-commits at redhat.com  Sun Jan 29 09:29:07 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 04:29:07 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.xml,
	NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 themes-backgrounds-gnome.spec, 1.6, 1.7
Message-ID: <200601290929.k0T9Tgaf018606@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18566/devel

Modified Files:
	.cvsignore sources themes-backgrounds-gnome.spec 
Added Files:
	themes-backgrounds-gnome.xml 
Log Message:
auto-import themes-backgrounds-gnome-0.4-1 on branch devel from themes-backgrounds-gnome-0.4-1.src.rpm


--- NEW FILE themes-backgrounds-gnome.xml ---
<?xml version="1.0"?>
<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
<wallpapers>
  <wallpaper>
    <name>GNOME-Dagg_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Dagg_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Brazil.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Brazil.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-RedFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-RedFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-ThePeninsula_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-ThePeninsula_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-H2gnOme.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-H2gnOme.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PoppySeed_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PoppySeed_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-TreeFace_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-TreeFace_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-GettingBusy_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-GettingBusy_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Diken_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Diken_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-LiquidAmethyst.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-LiquidAmethyst.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Petrklic_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Petrklic_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GreenThirst_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GreenThirst_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FlowerMacro1_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FlowerMacro1_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Orangenavy.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Orangenavy.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Iceland_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Iceland_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMELand_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMELand_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Sand_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Sand_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Superclean_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Superclean_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Transparent_1280x1024.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Transparent_1280x1024.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MnchenBotanischerGarten_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MnchenBotanischerGarten_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-CityPlosion_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-CityPlosion_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-OrangeGnomeMail_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-OrangeGnomeMail_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>Penguingang_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/Penguingang_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-YellowCosmos.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-YellowCosmos.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PebbleBeach_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PebbleBeach_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-RightFoot_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-RightFoot_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MarigoldMacro_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MarigoldMacro_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MolvenoFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MolvenoFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-RustyPipes_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-RustyPipes_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-November_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-November_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SunsetOverCoalOil_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SunsetOverCoalOil_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Sella_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Sella_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Blue_Motion_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Blue_Motion_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GnomeOrb_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GnomeOrb_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Heaven-CampD_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Heaven-CampD_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-WinterInFinland_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-WinterInFinland_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-WaspOn_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WaspOn_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMEInXalapaVeracruzMexico_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMEInXalapaVeracruzMexico_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GnomeGallery_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GnomeGallery_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-PieceOfSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-PieceOfSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Glassy_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Glassy_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-CloudsInTheSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-CloudsInTheSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-RealShoot_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-RealShoot_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-DrinkItClean02_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-DrinkItClean02_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Nature_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Nature_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-ForMilk01_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-ForMilk01_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-DesktopForNuts_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-DesktopForNuts_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-MykonosSky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-MykonosSky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-ColorfulLines_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-ColorfulLines_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Mountains_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Mountains_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-MauiView1_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-MauiView1_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SouthwestSunset_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SouthwestSunset_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-Mraky_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-Mraky_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-OrangeMoss_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-OrangeMoss_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Simple.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Simple.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FlowerBlueScan_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FlowerBlueScan_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMESomewhere_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMESomewhere_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Happygnome_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Happygnome_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FlowerMacro2_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FlowerMacro2_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-HeronIslandSunset_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-HeronIslandSunset_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Orange.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Orange.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FencedView_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FencedView_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Moss_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Moss_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Gel.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Gel.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMERisingSun_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMERisingSun_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-FreshFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-FreshFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Waterlily_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Waterlily_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-GreenField_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-GreenField_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-MetallicBall_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-MetallicBall_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-RensowFenster_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-RensowFenster_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Crob_1024x768.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Crob_1024x768.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-MagnesiumPunchout_perspective_1280x1024.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-IceChapel_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-IceChapel_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Lava.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Lava.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Grass_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Grass_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Stone_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Stone_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-GaloppingHorses_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-GaloppingHorses_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SmallDuckie_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SmallDuckie_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SunsetNearPocinovice_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SunsetNearPocinovice_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-Smoer_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-Smoer_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-ReindeerFur_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-ReindeerFur_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-Leaves_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-Leaves_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-WinterAlsaceFrance_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-WinterAlsaceFrance_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-ChatsworthFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-ChatsworthFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-LonelyTree_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-LonelyTree_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-AutumnTree_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-AutumnTree_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-TreeFern_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-TreeFern_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FluidCode_1600x1200.png</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FluidCode_1600x1200.png</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-BlueScape_1024x768.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-BlueScape_1024x768.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-FloridaFlower_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-FloridaFlower_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-YellowLichen_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-YellowLichen_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>OTHER-NesstovRectimn_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/OTHER-NesstovRectimn_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-GNOMEFlowers_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-GNOMEFlowers_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>GNOME-NearSmrzovice_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/GNOME-NearSmrzovice_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
  <wallpaper>
    <name>NATURE-SnowBench_1600x1200.jpg</name>
    <filename>/usr/share/backgrounds/images/themes-backgrounds-gnome/NATURE-SnowBench_1600x1200.jpg</filename>
    <options>stretched</options>
    <shade_type>solid</shade_type>
    <pcolor>#FFFFFF</pcolor>
    <scolor>#000000</scolor>
  </wallpaper>
</wallpapers>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:26:41 -0000	1.2
+++ .cvsignore	29 Jan 2006 09:29:07 -0000	1.3
@@ -1 +1 @@
-themes-backgrounds-gnome-0.3.tar.bz2
+themes-backgrounds-gnome-0.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:26:41 -0000	1.2
+++ sources	29 Jan 2006 09:29:07 -0000	1.3
@@ -1 +1 @@
-d0d1ef5ef309b91be322f6c5d3ed4833  themes-backgrounds-gnome-0.3.tar.bz2
+be0978e025cbf6a2a60f55eadcaf30cf  themes-backgrounds-gnome-0.4.tar.bz2


Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- themes-backgrounds-gnome.spec	6 Apr 2005 22:13:33 -0000	1.6
+++ themes-backgrounds-gnome.spec	29 Jan 2006 09:29:07 -0000	1.7
@@ -1,44 +1,46 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
-Version:        0.3
-Release:        3
-
+Version:        0.4
+Release:        1
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
-Source0:        themes-backgrounds-gnome-0.3.tar.bz2
+Source0:        themes-backgrounds-gnome-0.4.tar.bz2
+Source1:        themes-backgrounds-gnome.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 %description
 Assorted Backgrounds from art.gnome.org.
 
-
 %prep
 %setup -q
 
-
 %build
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/backgrounds/images/art.gnome.org
-cp *.* ${RPM_BUILD_ROOT}/%{_datadir}/backgrounds/images/art.gnome.org/
-
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/themes-backgrounds-gnome
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
+install -m644 * $RPM_BUILD_ROOT%{_datadir}/backgrounds/images/themes-backgrounds-gnome
+install -m664 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%dir %{_datadir}/backgrounds/
-%dir %{_datadir}/backgrounds/images/
-%{_datadir}/backgrounds/images/art.gnome.org/
-
+%{_datadir}/backgrounds/images/themes-backgrounds-gnome/*
+%{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Tue Jan 17 2006 Chris Chabot <chabotc at xs4all.nl> - 0.4-1
+- Upped major version, many new goodies present
+- Changed ownership of this package to me
+- Changed 'cp' into 'install -m 644'
+- Removed %dir ownership of _datadir/backgrounds/images
+- Added themes-backgrounds-gnome.xml so gnome picks up the new backgrounds
+ 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Jan 29 09:53:30 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 04:53:30 -0500
Subject: owners owners.list,1.573,1.574
Message-ID: <200601290954.k0T9s20C018787@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18770

Modified Files:
	owners.list 
Log Message:
Took ownership of themes-backgrounds-gnome


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -r1.573 -r1.574
--- owners.list	29 Jan 2006 07:18:27 -0000	1.573
+++ owners.list	29 Jan 2006 09:53:30 -0000	1.574
@@ -1236,7 +1236,7 @@
 Fedora Extras|tetex-xcolor|Driver-independent color extensions for LaTeX and pdfLaTeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|TeXmacs|A structured wysiwyg scientific text editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|texmaker|LaTeX Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|themes-backgrounds-gnome|Assorted Backgrounds from art.gnome.org|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|thttpd|Tiny, turbo, throttleable lightweight http server|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 10:00:28 2006
From: fedora-extras-commits at redhat.com (Chris Chabot (chabotc))
Date: Sun, 29 Jan 2006 05:00:28 -0500
Subject: rpms/themes-backgrounds-gnome/devel themes-backgrounds-gnome.spec,
	1.7, 1.8
Message-ID: <200601291001.k0TA1011018833@cvs-int.fedora.redhat.com>

Author: chabotc

Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18816

Modified Files:
	themes-backgrounds-gnome.spec 
Log Message:
Minor fixes


Index: themes-backgrounds-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- themes-backgrounds-gnome.spec	29 Jan 2006 09:29:07 -0000	1.7
+++ themes-backgrounds-gnome.spec	29 Jan 2006 10:00:27 -0000	1.8
@@ -1,7 +1,7 @@
 Summary:        Assorted Backgrounds from art.gnome.org
 Name:           themes-backgrounds-gnome
 Version:        0.4
-Release:        1
+Release:        2%{?dist}
 License:        GPL
 Group:          User Interface/Desktops
 URL:            http://art.gnome.org
@@ -30,10 +30,14 @@
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/backgrounds/images/themes-backgrounds-gnome/*
+%{_datadir}/backgrounds/images/themes-backgrounds-gnome
 %{_datadir}/gnome-background-properties/themes-backgrounds-gnome.xml
 
 %changelog
+* Sun Jan 29 2006 Chris Chabot <chabotc at xs4all.nl> - 0.4-2
+- Added dist tag to release field
+- Fixed dir ownership of themes-backgrounds-gnome
+
 * Tue Jan 17 2006 Chris Chabot <chabotc at xs4all.nl> - 0.4-1
 - Upped major version, many new goodies present
 - Changed ownership of this package to me



From fedora-extras-commits at redhat.com  Sun Jan 29 12:21:15 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:21:15 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.8, 1.9 abcm2ps.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200601291221.k0TCLlrZ024490@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24432/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Dec 2005 18:25:43 -0000	1.8
+++ .cvsignore	29 Jan 2006 12:21:14 -0000	1.9
@@ -1,2 +1,2 @@
-abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip
+abcm2ps-4.12.5.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcm2ps.spec	31 Dec 2005 18:25:43 -0000	1.8
+++ abcm2ps.spec	29 Jan 2006 12:21:14 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.3
+Version:        4.12.5
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
+- new version 4.12.5
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.12.3-1
 - New Version 4.12.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2005 18:25:43 -0000	1.8
+++ sources	29 Jan 2006 12:21:14 -0000	1.9
@@ -1,2 +1,2 @@
-dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
+582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 12:21:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:21:21 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.8, 1.9 abcm2ps.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200601291221.k0TCLsxe024495@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24432/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	31 Dec 2005 18:25:50 -0000	1.8
+++ .cvsignore	29 Jan 2006 12:21:21 -0000	1.9
@@ -1,2 +1,2 @@
-abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip
+abcm2ps-4.12.5.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcm2ps.spec	31 Dec 2005 18:25:50 -0000	1.8
+++ abcm2ps.spec	29 Jan 2006 12:21:21 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.3
+Version:        4.12.5
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
+- new version 4.12.5
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.12.3-1
 - New Version 4.12.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	31 Dec 2005 18:25:50 -0000	1.8
+++ sources	29 Jan 2006 12:21:21 -0000	1.9
@@ -1,2 +1,2 @@
-dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
+582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 12:21:27 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:21:27 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.8, 1.9 abcm2ps.spec, 1.8,
	1.9 sources, 1.8, 1.9
Message-ID: <200601291222.k0TCM00F024500@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24432/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	28 Dec 2005 19:54:33 -0000	1.8
+++ .cvsignore	29 Jan 2006 12:21:27 -0000	1.9
@@ -1,2 +1,2 @@
-abcm2ps-4.12.3.tar.gz
 abcplus_en-1.0.4.zip
+abcm2ps-4.12.5.tar.gz


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abcm2ps.spec	28 Dec 2005 19:54:33 -0000	1.8
+++ abcm2ps.spec	29 Jan 2006 12:21:27 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.3
+Version:        4.12.5
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.3.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
+- new version 4.12.5
+
 * Wed Dec 28 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.12.3-1
 - New Version 4.12.3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	28 Dec 2005 19:54:33 -0000	1.8
+++ sources	29 Jan 2006 12:21:27 -0000	1.9
@@ -1,2 +1,2 @@
-dce1d84f6da39e7e95e2873d598f94b9  abcm2ps-4.12.3.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
+582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 12:37:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:37:13 -0500
Subject: rpms/clisp/FC-3 .cvsignore, 1.4, 1.5 clisp.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200601291237.k0TCbjPH024738@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683/FC-3

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.38


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 19:40:14 -0000	1.4
+++ .cvsignore	29 Jan 2006 12:37:13 -0000	1.5
@@ -1 +1 @@
-clisp-2.37.tar.bz2
+clisp-2.38.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/clisp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clisp.spec	3 Jan 2006 19:40:14 -0000	1.11
+++ clisp.spec	29 Jan 2006 12:37:13 -0000	1.12
@@ -1,18 +1,19 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.37
-Release: 	2%{?dist}
+Version:	2.38
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.38.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
-BuildRequires:	XFree86-devel
+BuildRequires:  xorg-x11-devel
 ExcludeArch:	ppc ppc64
 
+
 %description
 ANSI Common Lisp is a high-level, general-purpose programming
 language.  GNU CLISP is a Common Lisp implementation by Bruno Haible
@@ -43,6 +44,7 @@
 %description devel
 Files necessary for linking CLISP.
 
+
 %prep
 %setup -q
 
@@ -111,6 +113,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.38-1
+- new version 2.38
+
 * Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
 - new version 2.37
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 19:40:14 -0000	1.5
+++ sources	29 Jan 2006 12:37:13 -0000	1.6
@@ -1 +1 @@
-f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2
+960e1f6e232415c59b6978f92e62f30b  clisp-2.38.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 12:37:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:37:19 -0500
Subject: rpms/clisp/FC-4 .cvsignore, 1.5, 1.6 clisp.spec, 1.15, 1.16 sources,
	1.5, 1.6
Message-ID: <200601291237.k0TCbphr024743@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683/FC-4

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.38


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2006 18:13:19 -0000	1.5
+++ .cvsignore	29 Jan 2006 12:37:19 -0000	1.6
@@ -1 +1 @@
-clisp-2.37.tar.bz2
+clisp-2.38.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/clisp.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- clisp.spec	3 Jan 2006 18:41:20 -0000	1.15
+++ clisp.spec	29 Jan 2006 12:37:19 -0000	1.16
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.37
-Release: 	2%{?dist}
+Version:	2.38
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.38.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -114,6 +114,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.38-1
+- new version 2.38
+
 * Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
 - new version 2.37
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 18:13:19 -0000	1.5
+++ sources	29 Jan 2006 12:37:19 -0000	1.6
@@ -1 +1 @@
-f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2
+960e1f6e232415c59b6978f92e62f30b  clisp-2.38.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 12:37:25 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 29 Jan 2006 07:37:25 -0500
Subject: rpms/clisp/devel .cvsignore, 1.4, 1.5 clisp.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200601291237.k0TCbvnY024748@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/clisp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24683/devel

Modified Files:
	.cvsignore clisp.spec sources 
Log Message:
new version 2.38


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Jan 2006 19:41:16 -0000	1.4
+++ .cvsignore	29 Jan 2006 12:37:24 -0000	1.5
@@ -1 +1 @@
-clisp-2.37.tar.bz2
+clisp-2.38.tar.bz2


Index: clisp.spec
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/clisp.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- clisp.spec	3 Jan 2006 19:55:26 -0000	1.11
+++ clisp.spec	29 Jan 2006 12:37:24 -0000	1.12
@@ -1,12 +1,12 @@
 Name:		clisp
 Summary:	Common Lisp (ANSI CL) implementation
-Version:	2.37
-Release: 	3%{?dist}
+Version:	2.38
+Release: 	1%{?dist}
 
 Group:		Development/Languages
 License:	GPL
 URL:		http://sourceforge.net/projects/clisp
-Source:		http://download.sourceforge.net/clisp/clisp-2.37.tar.bz2
+Source:		http://download.sourceforge.net/clisp/clisp-2.38.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	readline-devel, gettext, pcre-devel, postgresql-devel
 BuildRequires:	libsigsegv-devel, db4-devel, zlib-devel
@@ -53,6 +53,7 @@
 %description devel
 Files necessary for linking CLISP.
 
+
 %prep
 %setup -q
 
@@ -122,6 +123,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.38-1
+- new version 2.38
+
 * Tue Jan  3 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.37-1
 - new version 2.37
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clisp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 19:41:16 -0000	1.5
+++ sources	29 Jan 2006 12:37:24 -0000	1.6
@@ -1 +1 @@
-f2445b3935b6f97b443d9548c38872e9  clisp-2.37.tar.bz2
+960e1f6e232415c59b6978f92e62f30b  clisp-2.38.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 13:45:29 2006
From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa))
Date: Sun, 29 Jan 2006 08:45:29 -0500
Subject: rpms/balsa/devel .cvsignore, 1.10, 1.11 balsa.spec, 1.13,
	1.14 sources, 1.10, 1.11
Message-ID: <200601291346.k0TDk1UU026789@cvs-int.fedora.redhat.com>

Author: pawsa

Update of /cvs/extras/rpms/balsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26765

Modified Files:
	.cvsignore balsa.spec sources 
Log Message:
- update to upstream 2.3.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	6 Jan 2006 23:07:17 -0000	1.10
+++ .cvsignore	29 Jan 2006 13:45:29 -0000	1.11
@@ -1,2 +1,2 @@
 gmime-2.1.17.tar.bz2
-balsa-2.3.9.tar.bz2
+balsa-2.3.10.tar.bz2


Index: balsa.spec
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- balsa.spec	6 Jan 2006 23:07:17 -0000	1.13
+++ balsa.spec	29 Jan 2006 13:45:29 -0000	1.14
@@ -2,7 +2,7 @@
 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell
 
 Name:           balsa
-Version:        2.3.9
+Version:        2.3.10
 Release:        1%{?dist}
 Summary:        Mail Client
 
@@ -103,6 +103,9 @@
 
 
 %changelog
+* Sun Jan 29 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.10-1
+- update to upstream 2.3.10
+
 * Sat Jan  7 2006 Pawel Salek <pawsa at theochem.kth.se> - 2.3.9-1
 - update to 2.3.9.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/balsa/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	6 Jan 2006 23:07:17 -0000	1.10
+++ sources	29 Jan 2006 13:45:29 -0000	1.11
@@ -1,2 +1,2 @@
 4be55ee55e4b3966bd51fadbf5fb323b  gmime-2.1.17.tar.bz2
-65872d953f0c3c7d2dc50bb09f800629  balsa-2.3.9.tar.bz2
+55900922195886be867cd5060548ff7f  balsa-2.3.10.tar.bz2



From fedora-extras-commits at redhat.com  Sun Jan 29 17:10:59 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun, 29 Jan 2006 12:10:59 -0500
Subject: rpms/gweled/devel gweled.spec,1.11,1.12
Message-ID: <200601291711.k0THBW1w001936@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gweled/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1916

Modified Files:
	gweled.spec 
Log Message:
Fix build in devel (mv behaviour changed)


Index: gweled.spec
===================================================================
RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gweled.spec	5 Oct 2005 17:46:44 -0000	1.11
+++ gweled.spec	29 Jan 2006 17:10:58 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gweled
 Version:        0.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 
 Summary:        Swapping gem game
 
@@ -47,7 +47,7 @@
   --add-category X-Fedora                              \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 mkdir $RPM_BUILD_ROOT%{_localstatedir}/lib/
-mv $RPM_BUILD_ROOT%{_localstatedir}/games/ $RPM_BUILD_ROOT%{_localstatedir}/lib/games/
+mv $RPM_BUILD_ROOT%{_localstatedir}/games/ $RPM_BUILD_ROOT%{_localstatedir}/lib/
 
 
 %clean
@@ -66,6 +66,9 @@
 %{_datadir}/sounds/%{name}/
 
 %changelog
+* Sun Jan 29 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-3
+- Fix build in devel (mv behaviour changed)
+
 * Tue Oct 05 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.7-2
 - Use dist
 



From fedora-extras-commits at redhat.com  Sun Jan 29 18:31:18 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 29 Jan 2006 13:31:18 -0500
Subject: rpms/w3c-markup-validator/devel
	w3c-markup-validator-0.7.1-cg231.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 sources, 1.2, 1.3 w3c-markup-validator.spec, 1.5, 1.6
Message-ID: <200601291831.k0TIVpeT004079@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4055

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.1-cg231.patch 
Log Message:
(build still disabled)

* Sun Jan 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.1-1
- Require opensp >= 1.5, not openjade.
- Patch to work with Config::General 2.31.

* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi>
- 0.7.1.

* Fri Sep 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-1
- 0.7.0.


w3c-markup-validator-0.7.1-cg231.patch:

--- NEW FILE w3c-markup-validator-0.7.1-cg231.patch ---
--- validator/httpd/cgi-bin/check	2005/10/13 05:35:17	1.432.2.5
+++ validator/httpd/cgi-bin/check	2006/01/26 20:21:41	1.432.2.6
@@ -306,9 +306,17 @@
 $File->{H} = $H;
 
 # Read friendly error message file
-my $error_messages_list =  File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'error_messages.cfg');
-my %config_opts = (-ConfigFile => $error_messages_list);
-my %rsrc = Config::General->new(%config_opts)->getall();
+my %rsrc = Config::General->new(
+  -MergeDuplicateBlocks => 1,
+  -ConfigFile           => File::Spec->catfile($CFG->{Paths}->{Templates},
+                                               $lang, 'error_messages.cfg'),
+  )->getall();
+# Config::General workarounds for <msg 0> issues:
+$rsrc{msg}{0} ||=
+  delete($rsrc{'msg 0'}) ||                   # < 2.31
+  { original => delete($rsrc{msg}{original}), #   2.31
+    verbose  => delete($rsrc{msg}{verbose}),
+  };
 $RSRC = \%rsrc;
 
 $T->param(cfg_home_page => $CFG->{'Home Page'});


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 05:31:31 -0000	1.2
+++ .cvsignore	29 Jan 2006 18:31:17 -0000	1.3
@@ -1,2 +1,2 @@
-sgml-lib-0_6_7.tar.gz
-validator-0_6_7.tar.gz
+sgml-lib-0_7_1.tar.gz
+validator-0_7_1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 05:31:31 -0000	1.2
+++ sources	29 Jan 2006 18:31:17 -0000	1.3
@@ -1,2 +1,2 @@
-db6088a83583a33b902d52c2d499acea  sgml-lib-0_6_7.tar.gz
-5322f884eb75ddb7b27e56154d74452f  validator-0_6_7.tar.gz
+9bb2e4a04730dec300922bd9a92b622e  sgml-lib-0_7_1.tar.gz
+c4336201cf8ea48fce809d716bdc0d9d  validator-0_7_1.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- w3c-markup-validator.spec	10 Jun 2005 06:37:45 -0000	1.5
+++ w3c-markup-validator.spec	29 Jan 2006 18:31:17 -0000	1.6
@@ -1,19 +1,23 @@
-Name:           w3c-markup-validator
-Version:        0.6.7
-Release:        2
+%{expand: %%define tbver %(echo %{version} | tr . _)}
 
+Name:           w3c-markup-validator
+Version:        0.7.1
+Release:        1
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
 License:        W3C Software License
 URL:            http://validator.w3.org/
-Source0:        http://validator.w3.org/dist/validator-0_6_7.tar.gz
-Source1:        http://validator.w3.org/dist/sgml-lib-0_6_7.tar.gz
+Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
+Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
+Patch0:         %{name}-0.7.1-cg231.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl
-Requires:       httpd, openjade >= 1.3.2, %{name}-libs = %{version}
+BuildRequires:  %{__perl}
+Requires:       httpd
+Requires:       opensp >= 1.5
+Requires:       %{name}-libs = %{version}
 Obsoletes:      w3c-validator
 
 %description
@@ -50,56 +54,42 @@
 
 %setup -q -a 1 -n validator-%{version}
 mv validator-%{version}/htdocs/sgml-lib .
+%patch0 -p1
 
-# Localize config files
-perl -pi -e \
-  's|\bwww-validator\@w3\.org\b|root\@localhost| ;
-   s|/validator\.w3\.org/|/localhost/%{name}/| ;
-   s|/usr/local/validator/htdocs/config/|%{_sysconfdir}/w3c/| ;
-   s|/usr/local/validator/htdocs/|%{_datadir}/%{name}/| ;
-   s|^(SGML\s+Library\s+).*|${1}%{_datadir}/sgml/%{name}|' \
+# Localize configs.
+%{__perl} -pi -e \
+  's|/usr/local/validator\b|%{_datadir}/%{name}|' \
+  htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/*
+%{__perl} -pi -e \
+  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}| ;
+   s|\bwww-validator\@w3\.org\b|root\@localhost| ;
+   s|/validator\.w3\.org/|/localhost/w3c-validator/|' \
   htdocs/config/validator.conf
-perl -pi -e \
-  's|/usr/share/w3c-markup-validator|%{_datadir}/%{name}|g' \
-  httpd/conf/httpd.conf
-
-# Cleanup of unused files
-rm -f htdocs/config/verbosemsg.rc
 
 # Move config out of the way
 mv htdocs/config __config
 
-# Fixup permissions
-find . -type d | xargs chmod 755
-find . -type f | xargs chmod 644
-chmod 755 httpd/cgi-bin/check
-
 
 %build
-# Not
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# Script
-cp -p httpd/cgi-bin/check $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # Config files
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c
-cp -p __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-cp -p httpd/conf/httpd.conf \
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c
+install -pm 644 __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c
+install -Dpm 644 httpd/conf/httpd.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
 
-# HTML and stuff
-cp -pR htdocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+# Scripts, HTML, etc.
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pR httpd/cgi-bin htdocs share $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # SGML library
-mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/sgml
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/sgml
 cp -pR sgml-lib $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml
 touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat
 
 
@@ -108,22 +98,20 @@
 
 
 %post
-if [ $1 -eq 1 ] ; then
-  %{_initrddir}/httpd reload &>/dev/null || :
-fi
+[ $1 -eq 1 ] && %{_initrddir}/httpd reload &>/dev/null || :
 
 %postun
 %{_initrddir}/httpd reload &>/dev/null || :
 
 %post libs
-for catalog in "mathml.soc sgml.soc svg.soc xhtml.soc xml.soc"; do
+for catalog in sgml.soc xml.soc ; do
   install-catalog --add \
     %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
     %{_datadir}/sgml/%{name}/$catalog >/dev/null 2>&1 || :
 done
 
 %preun libs
-for catalog in "mathml.soc sgml.soc svg.soc xhtml.soc xml.soc"; do
+for catalog in sgml.soc xml.soc ; do
   install-catalog --remove \
     %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
     %{_datadir}/sgml/%{name}/$catalog >/dev/null 2>&1 || :
@@ -132,18 +120,29 @@
 
 %files
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%config(noreplace) %{_sysconfdir}/w3c
-%{_datadir}/%{name}
+# Configs not "noreplace", they're incompatible in 0.6.7 vs 0.7.x.
+%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config %{_sysconfdir}/w3c/
+%{_datadir}/%{name}/
 
 %files libs
 %defattr(-,root,root,-)
 %ghost %config %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat
-%{_datadir}/sgml/%{name}
+%{_datadir}/sgml/%{name}/
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sun Jan 29 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.1-1
+- Require opensp >= 1.5, not openjade.
+- Patch to work with Config::General 2.31.
+
+* Sat Oct  8 2005 Ville Skytt?? <ville.skytta at iki.fi>
+- 0.7.1.
+
+* Fri Sep 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.7.0-1
+- 0.7.0.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.7-2
 - rebuilt
 
 * Sun Jul 25 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.7-0.fdr.1



From fedora-extras-commits at redhat.com  Sun Jan 29 18:55:11 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 29 Jan 2006 13:55:11 -0500
Subject: rpms/libxfcegui4/devel libxfcegui4.spec,1.9,1.10
Message-ID: <200601291855.k0TIth4C004205@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/libxfcegui4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4176

Modified Files:
	libxfcegui4.spec 
Log Message:
Add BuildRequires for modular xorg



Index: libxfcegui4.spec
===================================================================
RCS file: /cvs/extras/rpms/libxfcegui4/devel/libxfcegui4.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxfcegui4.spec	11 Nov 2005 16:43:29 -0000	1.9
+++ libxfcegui4.spec	29 Jan 2006 18:55:11 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: GTK widgets for Xfce
 Name: libxfcegui4
 Version: 4.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 URL: http://www.xfce.org/
 Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/libxfcegui4-4.2.3.tar.gz
@@ -14,6 +14,8 @@
 BuildRequires: libxfce4util-devel >= %{version}
 BuildRequires: dbh-devel
 BuildRequires: libxml2-devel >= 2.4.0
+BuildRequires: imake
+BuildRequires: libXt-devel
 
 %description
 The package includes various gtk widgets for Xfce.
@@ -67,6 +69,9 @@
 %{_datadir}/gtk-doc/html/libxfcegui4
 
 %changelog
+* Sun Jan 29 2006 Kevin Fenzi <kevin at scrye.com> - 4.2.3-3.fc5
+- Add BuildRequires for modular xorg
+
 * Thu Nov 10 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.3-2.fc4
 - disable-static instead of removing .a files
 



From fedora-extras-commits at redhat.com  Sun Jan 29 19:34:46 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 14:34:46 -0500
Subject: owners owners.list,1.574,1.575
Message-ID: <200601291935.k0TJZIld006122@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6105

Modified Files:
	owners.list 
Log Message:

  Description:
    Take ownership of blender




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.574
retrieving revision 1.575
diff -u -r1.574 -r1.575
--- owners.list	29 Jan 2006 09:53:30 -0000	1.574
+++ owners.list	29 Jan 2006 19:34:45 -0000	1.575
@@ -73,7 +73,7 @@
 Fedora Extras|bittorrent|BitTorrent swarming network file transfer tool|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|blackbox|Very small and fast Window Manager|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|blacs|Basic Linear Algebra Communication Subprograms|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|blender|3D modeling, animation, rendering and post-production|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|blender|3D modeling, animation, rendering and post-production|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bluefish|A GTK2 web development application for experienced users|paul at city-fan.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 19:40:18 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 14:40:18 -0500
Subject: owners owners.list,1.575,1.576
Message-ID: <200601291940.k0TJeolJ006149@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6130

Modified Files:
	owners.list 
Log Message:

  Description:
    Take ownership of openal.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- owners.list	29 Jan 2006 19:34:45 -0000	1.575
+++ owners.list	29 Jan 2006 19:40:18 -0000	1.576
@@ -690,7 +690,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|Jochen at herr-schmitt.de|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 19:59:33 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 14:59:33 -0500
Subject: rpms/blender/FC-4 .cvsignore, 1.7, 1.8 blender.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <200601292000.k0TK06Ui006221@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6187

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    Update to new upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Jan 2006 19:45:51 -0000	1.7
+++ .cvsignore	29 Jan 2006 19:59:33 -0000	1.8
@@ -1 +1 @@
-blender-2.40.tar.gz
+blender-2.41.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/blender.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blender.spec	19 Jan 2006 20:03:10 -0000	1.15
+++ blender.spec	29 Jan 2006 19:59:33 -0000	1.16
@@ -1,5 +1,5 @@
 Name:           blender
-Version:        2.40
+Version:        2.41
 Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
@@ -46,7 +46,7 @@
 
 
 %prep
-%setup -q 
+%setup -q -n blender
 
 %build
 sed -i "s/use_openal =.*/use_openal = 'true'/g;" SConstruct
@@ -93,6 +93,9 @@
 
 
 %changelog
+* Sun Jan 30 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.41-1
+_ Update to new upstream relase.
+
 * Thu Jan 19 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-1
 - Add libtiff-devel as BuildRequire2.
 - Update to new upstream release.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Jan 2006 19:45:51 -0000	1.7
+++ sources	29 Jan 2006 19:59:33 -0000	1.8
@@ -1 +1 @@
-3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz
+f6b54ff73c37aaca4d3f5babdd156fbf  blender-2.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 20:14:39 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 29 Jan 2006 15:14:39 -0500
Subject: rpms/gnotime/devel gnotime.spec,1.13,1.14
Message-ID: <200601292015.k0TKFFxZ008078@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/gnotime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8036

Modified Files:
	gnotime.spec 
Log Message:
* Sun Jan 29 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-2
- Modular xorg BuildRequires.



Index: gnotime.spec
===================================================================
RCS file: /cvs/extras/rpms/gnotime/devel/gnotime.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnotime.spec	17 Jan 2006 17:49:46 -0000	1.13
+++ gnotime.spec	29 Jan 2006 20:14:39 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gnotime
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tracks and reports time spent
 
 Group:          Applications/Productivity
@@ -16,6 +16,8 @@
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 BuildRequires:  qof-devel >= 0.6.0
+BuildRequires:	libSM-devel
+BuildRequires:	libX11-devel
 # Patch0 modifies configure.in so we need autoconf
 BuildRequires: autoconf
 # To get rid of rpath, we need to use a fedora libtool
@@ -111,10 +113,13 @@
 %{_sysconfdir}/gconf/schemas/*
 
 %changelog
+* Sun Jan 29 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-2
+- Modular xorg BuildRequires.
+
 * Sun Jan 15 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-1
 - Rebuild against new qof-0.6.1.
 - Patch to fix the build for the qof-0.6 series.
-
+ 
 * Fri Sep 30 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.2.2-0
 - Update to 2.2.2.
 - Remove all patches as they've been merged upstream.



From fedora-extras-commits at redhat.com  Sun Jan 29 20:41:17 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 15:41:17 -0500
Subject: owners owners.list,1.576,1.577
Message-ID: <200601292041.k0TKfnLo008259@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8240

Modified Files:
	owners.list 
Log Message:

  Description:
    revoke erronous edition of openal. revoke taking ownership.




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.576
retrieving revision 1.577
diff -u -r1.576 -r1.577
--- owners.list	29 Jan 2006 19:40:18 -0000	1.576
+++ owners.list	29 Jan 2006 20:41:17 -0000	1.577
@@ -690,7 +690,7 @@
 Fedora Extras|octave|A high-level language for numerical computations|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|octave-forge|Contributed functions for octave|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|Jochen at herr-schmitt.de|
+Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 20:42:58 2006
From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr))
Date: Sun, 29 Jan 2006 15:42:58 -0500
Subject: rpms/blender/devel .cvsignore, 1.7, 1.8 blender.spec, 1.15,
	1.16 sources, 1.7, 1.8
Message-ID: <200601292043.k0TKhUZ7008286@cvs-int.fedora.redhat.com>

Author: s4504kr

Update of /cvs/extras/rpms/blender/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8265

Modified Files:
	.cvsignore blender.spec sources 
Log Message:

  Description:
    Update to new upstream release.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	19 Jan 2006 16:24:33 -0000	1.7
+++ .cvsignore	29 Jan 2006 20:42:58 -0000	1.8
@@ -1 +1 @@
-blender-2.40.tar.gz
+blender-2.41.tar.gz


Index: blender.spec
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/blender.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- blender.spec	19 Jan 2006 22:10:08 -0000	1.15
+++ blender.spec	29 Jan 2006 20:42:58 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           blender
-Version:        2.40
-Release:        2%{?dist}
+Version:        2.41
+Release:        1%{?dist}
 
 Summary:        3D modeling, animation, rendering and post-production
 
@@ -51,7 +51,7 @@
 
 
 %prep
-%setup -q 
+%setup -q -n blender
 # %patch0 -p1 -b .x86_64
 
 %build
@@ -99,6 +99,9 @@
 
 
 %changelog
+* Sun Jan 30 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.41-1
+- Update to new upstream release.
+
 * Wed Jan 18 2006 Jochen Schmitt <Jochen herr-schmitt de> 2.40-2
 - New upstream release.
 - adapting to mudular X.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/blender/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Jan 2006 16:24:33 -0000	1.7
+++ sources	29 Jan 2006 20:42:58 -0000	1.8
@@ -1 +1 @@
-3b58026ca9d0b26292ef39d7e2353f31  blender-2.40.tar.gz
+f6b54ff73c37aaca4d3f5babdd156fbf  blender-2.41.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 20:59:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 15:59:53 -0500
Subject: rpms/asa - New directory
Message-ID: <200601292059.k0TKxtXf008408@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/asa

Log Message:
Directory /cvs/extras/rpms/asa added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 20:59:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 15:59:58 -0500
Subject: rpms/asa/devel - New directory
Message-ID: <200601292100.k0TL00IZ008423@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/asa/devel

Log Message:
Directory /cvs/extras/rpms/asa/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 21:00:20 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:00:20 -0500
Subject: rpms/asa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601292100.k0TL0M5D008466@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454

Added Files:
	Makefile import.log 
Log Message:
Setup of module asa


--- NEW FILE Makefile ---
# Top level Makefile for module asa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 21:00:25 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:00:25 -0500
Subject: rpms/asa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601292100.k0TL0ShY008486@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8454/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module asa


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 21:00:59 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:00:59 -0500
Subject: rpms/asa import.log,1.1,1.2
Message-ID: <200601292101.k0TL1WdR010261@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8522

Modified Files:
	import.log 
Log Message:
auto-import asa-1.2-1 on branch devel from asa-1.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/asa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 21:00:20 -0000	1.1
+++ import.log	29 Jan 2006 21:00:59 -0000	1.2
@@ -0,0 +1 @@
+asa-1_2-1:HEAD:asa-1.2-1.src.rpm:1138568410



From fedora-extras-commits at redhat.com  Sun Jan 29 21:01:06 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:01:06 -0500
Subject: rpms/asa/devel asa.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200601292101.k0TL1cqB010265@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8522/devel

Modified Files:
	.cvsignore sources 
Added Files:
	asa.spec 
Log Message:
auto-import asa-1.2-1 on branch devel from asa-1.2-1.src.rpm


--- NEW FILE asa.spec ---
Name:           asa
Version:        1.2
Release:        1
Summary:        Convert Fortran carriage control characters

Group:          Development/Tools
License:        GPL
# version 1.1 is at that url.
URL:            http://www.ibiblio.org/pub/Linux/devel/lang/fortran/!INDEX.short.html
Source0:        http://archive.debian.org/debian-archive/dists/slink/main/source/text/asa_1.2.orig.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description

A POSIX.2 compliant asa(1), for converting Fortran carriage control
characters to line printer control characters.


%prep
%setup -q


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT

%{__install} -d -m755 $RPM_BUILD_ROOT%{_bindir}/
%{__install} -d -m755 $RPM_BUILD_ROOT%{_mandir}/man1
%{__install} -m755 asa $RPM_BUILD_ROOT%{_bindir}/
%{__install} -m644 asa.1 $RPM_BUILD_ROOT%{_mandir}/man1/ 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README COPYING asa-example.doc
%{_bindir}/asa
%{_mandir}/*/asa*


%changelog
* Mon Dec 12 2005 Patrice Dumas <dumas at centre-cired.fr> - 1.2-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/asa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 21:00:25 -0000	1.1
+++ .cvsignore	29 Jan 2006 21:01:06 -0000	1.2
@@ -0,0 +1 @@
+asa_1.2.orig.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/asa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 21:00:25 -0000	1.1
+++ sources	29 Jan 2006 21:01:06 -0000	1.2
@@ -0,0 +1 @@
+07c5951b7f893a46f014ff7ca9948dca  asa_1.2.orig.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:06:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:06:39 -0500
Subject: rpms/asa/devel asa.spec,1.1,1.2
Message-ID: <200601292107.k0TL7FGk010351@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/asa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10332

Modified Files:
	asa.spec 
Log Message:
Add dist tag



Index: asa.spec
===================================================================
RCS file: /cvs/extras/rpms/asa/devel/asa.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- asa.spec	29 Jan 2006 21:01:06 -0000	1.1
+++ asa.spec	29 Jan 2006 21:06:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           asa
 Version:        1.2
-Release:        1
+Release:        1%{?dist}
 Summary:        Convert Fortran carriage control characters
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sun Jan 29 21:17:38 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun, 29 Jan 2006 16:17:38 -0500
Subject: rpms/libnjb/devel .cvsignore, 1.5, 1.6 libnjb.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200601292118.k0TLIA5I010484@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10463

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2005 18:46:48 -0000	1.5
+++ .cvsignore	29 Jan 2006 21:17:38 -0000	1.6
@@ -1 +1 @@
-libnjb-2.2.4.tar.gz
+libnjb-2.2.5.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/libnjb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libnjb.spec	25 Jan 2006 21:12:33 -0000	1.5
+++ libnjb.spec	29 Jan 2006 21:17:38 -0000	1.6
@@ -11,8 +11,8 @@
 #
 
 Name:		libnjb
-Version:	2.2.4
-Release:	2%{?dist}
+Version:	2.2.5
+Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
 
@@ -105,6 +105,8 @@
 
 
 %changelog
+* Sun Jan 29 2006 Linus Walleij <triad at df.lth.se> 2.2.5-1
+- New upstream release.
 * Wed Jan 25 2006 Linus Walleij <triad at df.lth.se> 2.2.4-2
 - Fix udev problem, let go of hotplug, fix console perms.
 - Still working on libusb vs udev issues.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2005 18:46:48 -0000	1.5
+++ sources	29 Jan 2006 21:17:38 -0000	1.6
@@ -1 +1 @@
-2c61a997cd781e45bcb78e3469a0f0f0  libnjb-2.2.4.tar.gz
+f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:19:46 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun, 29 Jan 2006 16:19:46 -0500
Subject: rpms/libnjb/FC-4 .cvsignore, 1.5, 1.6 libnjb.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200601292120.k0TLKIT4010551@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10528

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2005 18:47:37 -0000	1.5
+++ .cvsignore	29 Jan 2006 21:19:46 -0000	1.6
@@ -1 +1 @@
-libnjb-2.2.4.tar.gz
+libnjb-2.2.5.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/libnjb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnjb.spec	12 Oct 2005 18:47:37 -0000	1.4
+++ libnjb.spec	29 Jan 2006 21:19:46 -0000	1.5
@@ -11,7 +11,7 @@
 #
 
 Name:		libnjb
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Sun Jan 29 2006 Linus Walleij <triad at df.lth.se> 2.2.5-1
+- New upstream release.
 * Wed Oct 12 2005 Linus Walleij <triad at df.lth.se> 2.2.4-1
 - New upstream release.
 * Mon Sep 19 2005 Linus Walleij <triad at df.lth.se> 2.2.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2005 18:47:37 -0000	1.5
+++ sources	29 Jan 2006 21:19:46 -0000	1.6
@@ -1 +1 @@
-2c61a997cd781e45bcb78e3469a0f0f0  libnjb-2.2.4.tar.gz
+f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:20:59 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun, 29 Jan 2006 16:20:59 -0500
Subject: rpms/libnjb/FC-3 .cvsignore, 1.5, 1.6 libnjb.spec, 1.4, 1.5 sources,
	1.5, 1.6
Message-ID: <200601292121.k0TLLVoc010616@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/libnjb/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10595

Modified Files:
	.cvsignore libnjb.spec sources 
Log Message:
New upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Oct 2005 18:48:32 -0000	1.5
+++ .cvsignore	29 Jan 2006 21:20:59 -0000	1.6
@@ -1 +1 @@
-libnjb-2.2.4.tar.gz
+libnjb-2.2.5.tar.gz


Index: libnjb.spec
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/libnjb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libnjb.spec	12 Oct 2005 18:48:32 -0000	1.4
+++ libnjb.spec	29 Jan 2006 21:20:59 -0000	1.5
@@ -11,7 +11,7 @@
 #
 
 Name:		libnjb
-Version:	2.2.4
+Version:	2.2.5
 Release:	1%{?dist}
 Summary:	A software library for talking to the Creative Nomad Jukeboxes and Dell DJs
 URL:		http://libnjb.sourceforge.net/
@@ -100,6 +100,8 @@
 
 
 %changelog
+* Sun Jan 29 2006 Linus Walleij <triad at df.lth.se> 2.2.5-1
+- New upstream release.
 * Wed Oct 12 2005 Linus Walleij <triad at df.lth.se> 2.2.4-1
 - New upstream release.
 * Mon Sep 19 2005 Linus Walleij <triad at df.lth.se> 2.2.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnjb/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Oct 2005 18:48:32 -0000	1.5
+++ sources	29 Jan 2006 21:20:59 -0000	1.6
@@ -1 +1 @@
-2c61a997cd781e45bcb78e3469a0f0f0  libnjb-2.2.4.tar.gz
+f7461574b9a28ed1c79fb40d3d307d78  libnjb-2.2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Jan 29 21:41:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 29 Jan 2006 16:41:06 -0500
Subject: rpms/fbdesk/devel fbdesk.spec,1.8,1.9
Message-ID: <200601292141.k0TLfcOJ010702@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fbdesk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10685

Modified Files:
	fbdesk.spec 
Log Message:
- modular X



Index: fbdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fbdesk.spec	6 Apr 2005 22:11:37 -0000	1.8
+++ fbdesk.spec	29 Jan 2006 21:41:06 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           fbdesk
 Version:        1.2.1
-Release:        2
+Release:        3
 
 Summary:        Icon Manager for Fluxbox
 
@@ -9,10 +9,11 @@
 URL:            http://fluxbox.sourceforge.net/fbdesk/
 Source0:        http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:  XFree86-devel
 BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
 BuildRequires:  pkgconfig
+BuildRequires:  libICE-devel libSM-devel libX11-devel libXext-devel
+BuildRequires:  libXft-devel libXpm-devel libXrender-devel
 Requires:       fluxbox
 
 %description
@@ -47,6 +48,10 @@
 
 
 %changelog
+* Sun Jan 29 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.2.1-3
+- modular X
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Sun Jan 29 21:54:31 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 29 Jan 2006 16:54:31 -0500
Subject: owners owners.list,1.577,1.578
Message-ID: <200601292155.k0TLt3gs010860@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10837

Modified Files:
	owners.list 
Log Message:
add asa



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -r1.577 -r1.578
--- owners.list	29 Jan 2006 20:41:17 -0000	1.577
+++ owners.list	29 Jan 2006 21:54:30 -0000	1.578
@@ -46,6 +46,7 @@
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Jan 29 21:56:44 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 29 Jan 2006 16:56:44 -0500
Subject: rpms/fbdesk/devel fbdesk.spec,1.9,1.10
Message-ID: <200601292157.k0TLvGY0010883@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fbdesk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10841

Modified Files:
	fbdesk.spec 
Log Message:
- more modular x fixes



Index: fbdesk.spec
===================================================================
RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fbdesk.spec	29 Jan 2006 21:41:06 -0000	1.9
+++ fbdesk.spec	29 Jan 2006 21:56:44 -0000	1.10
@@ -26,7 +26,7 @@
 
 
 %build
-%configure
+%configure --x-includes=%{_includedir} --x-libraries=%{_libdir}
 %{__make} %{?_smp_mflags}
 
 %{__make} check



From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:03 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:03 -0500
Subject: rpms/xfce4-screenshooter-plugin - New directory
Message-ID: <200601292356.k0TNu5To016292@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16275/xfce4-screenshooter-plugin

Log Message:
Directory /cvs/extras/rpms/xfce4-screenshooter-plugin added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:08 -0500
Subject: rpms/xfce4-screenshooter-plugin/devel - New directory
Message-ID: <200601292356.k0TNuAt8016323@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16275/xfce4-screenshooter-plugin/devel

Log Message:
Directory /cvs/extras/rpms/xfce4-screenshooter-plugin/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:27 -0500
Subject: rpms/xfce4-screenshooter-plugin Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200601292356.k0TNuT5r016409@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16389

Added Files:
	Makefile import.log 
Log Message:
Setup of module xfce4-screenshooter-plugin


--- NEW FILE Makefile ---
# Top level Makefile for module xfce4-screenshooter-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Jan 29 23:56:32 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:56:32 -0500
Subject: rpms/xfce4-screenshooter-plugin/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200601292356.k0TNuY07016445@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16389/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xfce4-screenshooter-plugin


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Sun Jan 29 23:57:25 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:57:25 -0500
Subject: rpms/xfce4-screenshooter-plugin import.log,1.1,1.2
Message-ID: <200601292357.k0TNvv7N016748@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16619

Modified Files:
	import.log 
Log Message:
auto-import xfce4-screenshooter-plugin-0.0.8-1.fc4 on branch devel from xfce4-screenshooter-plugin-0.0.8-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Jan 2006 23:56:26 -0000	1.1
+++ import.log	29 Jan 2006 23:57:24 -0000	1.2
@@ -0,0 +1 @@
+xfce4-screenshooter-plugin-0_0_8-1_fc4:HEAD:xfce4-screenshooter-plugin-0.0.8-1.fc4.src.rpm:1138579037



From fedora-extras-commits at redhat.com  Sun Jan 29 23:57:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 18:57:30 -0500
Subject: rpms/xfce4-screenshooter-plugin/devel
	xfce4-screenshooter-plugin.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601292358.k0TNw3Jp016768@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16619/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
auto-import xfce4-screenshooter-plugin-0.0.8-1.fc4 on branch devel from xfce4-screenshooter-plugin-0.0.8-1.fc4.src.rpm


--- NEW FILE xfce4-screenshooter-plugin.spec ---
Name:		xfce4-screenshooter-plugin
Version:	0.0.8
Release:	1%{?dist}
Summary:	Screenshot utility for the Xfce panel

Group:		User Interface/Desktops
License:	BSD
URL:		http://xfce-goodies.berlios.de/
Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel

%description
The Screenshooter plugin allows you to take screenshots from the Xfce panel.

%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 -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf $RPM_BUILD_ROOT

%files 
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README TODO
%{_libdir}/xfce4/panel-plugins/*.so

%changelog
* Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-1
- Initial Fedora Extras version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Jan 2006 23:56:32 -0000	1.1
+++ .cvsignore	29 Jan 2006 23:57:30 -0000	1.2
@@ -0,0 +1 @@
+xfce4-screenshooter-plugin-0.0.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Jan 2006 23:56:32 -0000	1.1
+++ sources	29 Jan 2006 23:57:30 -0000	1.2
@@ -0,0 +1 @@
+b9195d25ae587ae3f48cd2b215cd45d3  xfce4-screenshooter-plugin-0.0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 00:14:52 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:14:52 -0500
Subject: rpms/lagan - New directory
Message-ID: <200601300014.k0U0EscZ019207@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19189/lagan

Log Message:
Directory /cvs/extras/rpms/lagan added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 00:14:57 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:14:57 -0500
Subject: rpms/lagan/devel - New directory
Message-ID: <200601300014.k0U0ExWc019222@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19189/lagan/devel

Log Message:
Directory /cvs/extras/rpms/lagan/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 00:15:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:15:17 -0500
Subject: rpms/lagan Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601300015.k0U0FJXI019258@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19246

Added Files:
	Makefile import.log 
Log Message:
Setup of module lagan


--- NEW FILE Makefile ---
# Top level Makefile for module lagan
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 30 00:15:28 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:15:28 -0500
Subject: rpms/lagan/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601300015.k0U0FUfA019278@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19246/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lagan


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 30 00:16:15 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:16:15 -0500
Subject: rpms/lagan import.log,1.1,1.2
Message-ID: <200601300016.k0U0GlqQ019361@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321

Modified Files:
	import.log 
Log Message:
auto-import lagan-1.21-1 on branch devel from lagan-1.21-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lagan/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Jan 2006 00:15:17 -0000	1.1
+++ import.log	30 Jan 2006 00:16:15 -0000	1.2
@@ -0,0 +1 @@
+lagan-1_21-1:HEAD:lagan-1.21-1.src.rpm:1138580166



From fedora-extras-commits at redhat.com  Mon Jan 30 00:16:21 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:16:21 -0500
Subject: rpms/lagan/devel lagan.spec, NONE, 1.1 lagan12-chris.patch, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601300016.k0U0Gr5w019365@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/rpms/lagan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lagan.spec lagan12-chris.patch 
Log Message:
auto-import lagan-1.21-1 on branch devel from lagan-1.21-1.src.rpm


--- NEW FILE lagan.spec ---
Name:           lagan
Version:        1.21
Release:        1%{?dist}
Summary:        Local, global, and multiple alignment of DNA sequences

Group:          Applications/Engineering
License:        GPL
URL:            http://lagan.stanford.edu
Source0:        http://lagan.stanford.edu/lagan_web/lagan12.tar.gz
Patch0:         lagan12-chris.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
LAGAN toolkit is a set of tools for local, global, and multiple alignment of
DNA sequences.  Please visit http://lagan.stanford.edu for publications
describing LAGAN and its components.

The 4 main parts of LAGAN are:

1. CHAOS local alignment tool
2. LAGAN pairwise global alignment tool
3. MLAGAN multiple global alignment tool.
4. Shuffle-LAGAN pairwise glocal alignment


%prep
%setup -q -n lagan12
%patch0 -p1 -b .chris
sed -i 's/^CC .*$/CC = gcc $(RPM_OPT_FLAGS)/;
	s/^CPP .*$/CPP = g++ $(RPM_OPT_FLAGS)/' Makefile
sed -i 's|getenv ("LAGAN_DIR")|"%_libdir/lagan"|g' *.c* utils/*.c*
sed -i 's|$ENV{LAGAN_DIR}|"%_libdir/lagan"|g' *.pl utils/*.pl
sed -i 's|$LAGAN_DIR|%_libdir/lagan|g' Readmes/README.shuffle


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/%_bindir $RPM_BUILD_ROOT/%_libdir/lagan/utils
install -m755 chaos ${RPM_BUILD_ROOT}%{_bindir}
install -m755 mlagan ${RPM_BUILD_ROOT}%{_bindir}
install -m755 lagan.pl ${RPM_BUILD_ROOT}%{_bindir}/lagan
install -m755 slagan.pl ${RPM_BUILD_ROOT}%{_bindir}/slagan
for f in anal_gloc.pl anchors glocal order rechaos.pl; do
  install -m755 $f $RPM_BUILD_ROOT/%_libdir/lagan
done
for f in bin2bl bin2mf cextract cmerge2.pl contigorder cstat dotplot \
  draft.pl fa2xfa getbounds getcontigpos getlength getoverlap Glue \
  mextract.pl mf2bin.pl mpretty.pl mproject.pl mrunfile.pl mrunpairs.pl \
  mrun.pl mviz.pl rc scorealign scorecontigs seqmerge; do
  install -m755 utils/$f $RPM_BUILD_ROOT/%_libdir/lagan/utils
done
install -m644 *.txt $RPM_BUILD_ROOT/%_libdir/lagan
rm -f Readmes/*.chris


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Readmes/* sample.*
%_bindir/chaos
%_bindir/lagan
%_bindir/mlagan
%_bindir/slagan
%_libdir/lagan/



%changelog
* Mon Jan 30 2006 Christian Iseli <Christian.Iseli at licr.org> 1.21-1
 - Use _libdir instead of _libexecdir and kill all LAGAN_DIR refs.

* Thu Nov 17 2005 Christian Iseli <Christian.Iseli at licr.org> 1.21-0
 - Create spec file.

lagan12-chris.patch:

--- NEW FILE lagan12-chris.patch ---
--- lagan12/utils/scorecontigs.c.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/scorecontigs.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <assert.h>
@@ -234,6 +235,13 @@
   return r;
 }
 
+inline int getdata (rangelist **ranges, int *offs, int j, int i){
+  i -= offs[j];
+  if (i >= 0 && i < ranges[j]->seqlen)
+    return ranges[j]->score[i];
+  return 0;
+}
+
 inline int match (rangelist **ranges, int numContigs, int i, int j, int *offs){
   int k;
   for (k = 0; k < numContigs; k++)
@@ -257,13 +265,6 @@
   printf ("\n");
 }
 
-inline int getdata (rangelist **ranges, int *offs, int j, int i){
-  i -= offs[j];
-  if (i >= 0 && i < ranges[j]->seqlen)
-    return ranges[j]->score[i];
-  return 0;
-}
-
 void printRanges (rangelist **ranges, int numContigs, int seqLen, int *offs){
   int i, j, start = 0, end;
   int *score = (int *) malloc (sizeof (int) * numContigs);
--- lagan12/utils/getbounds.c.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/getbounds.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
--- lagan12/utils/mrunpairs.pl.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/mrunpairs.pl	2006-01-30 01:05:25.000000000 +0100
@@ -5,7 +5,7 @@
 
 # VISTA .plotfile defaults
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +87,6 @@
     @params[++$j] = "\"()\"";
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -189,7 +184,7 @@
 	$mparams = "$mparams $s";
     }
     
-    $mlagan = "$lagandir/mlagan$mfiles$mparams > $outprefix.out";
+    $mlagan = "mlagan$mfiles$mparams > $outprefix.out";
     print "\n$mlagan\n\n";
     if(`$mlagan`) { print "\n\n"; exit(1); }
 
--- lagan12/utils/draft.pl.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/draft.pl	2006-01-30 01:05:25.000000000 +0100
@@ -109,7 +109,7 @@
     $skip1 = $skip2 = 0;
     # make alignments
     if (!$lazyflag || !(-e "$contigs[$i].mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i] -mfa $arglist -out $contigs[$i].mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
@@ -128,7 +128,7 @@
     }
 
     if (!$lazyflag || !(-e "$contigs[$i].rc.mfa")){
-	$execute = "perl $lagandir/lagan.pl $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
+	$execute = "lagan $ARGV[0] $contigs[$i].rc -mfa $arglist -out $contigs[$i].rc.mfa";
 	$execute = $execute." -gap $anchgapstart $anchgapcont" if ($usebounds);
 	`$execute`;
 	$ex_val = $? >> 8;
--- lagan12/utils/mrunfile.pl.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/mrunfile.pl	2006-01-30 01:05:25.000000000 +0100
@@ -8,7 +8,7 @@
     exit(1);
 }
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 
 $filename = $ARGV[0];
@@ -48,11 +48,6 @@
     }
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 if ($pairwise) {
     $mexecs = "mrunpairs.pl";
 } else {
--- lagan12/utils/getlength.c.chris	2003-09-22 19:06:55.000000000 +0200
+++ lagan12/utils/getlength.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <assert.h>
--- lagan12/utils/mviz.pl.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/mviz.pl	2006-01-30 01:05:25.000000000 +0100
@@ -4,7 +4,7 @@
 # This script requires the environment variables:
 # LAGAN_DIR and VISTA_DIR
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -57,11 +57,6 @@
 
 $seqfile = @ARGV[0];
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 for ($i=0; $i<@vparams; $i+=2) {
     if (@vparams[$i] eq "--regmin") { $paregmin = @vparams[$i+1]; }
     elsif (@vparams[$i] eq "--regmax") { $paregmax = @vparams[$i+1]; }
--- lagan12/utils/scorealign.c.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/scorealign.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <assert.h>
 #include <math.h>
@@ -401,10 +402,6 @@
   char *lagan_dir;
 
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir){
-    fprintf (stderr, "Error: $LAGAN_DIR not set.\n");
-    exit (1);
-  }
 
   sprintf (line, "%s/%s", lagan_dir, filename);
   fprintf (stderr, "%s\n", line);
--- lagan12/utils/seqmerge.c.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/seqmerge.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <assert.h>
--- lagan12/utils/mrun.pl.chris	2003-09-22 19:06:56.000000000 +0200
+++ lagan12/utils/mrun.pl	2006-01-30 01:05:25.000000000 +0100
@@ -5,7 +5,7 @@
 
 # VISTA .plotfile defaults
 
-($lagandir = $ENV{LAGAN_DIR}) or die "LAGAN_DIR not set";
+$lagandir = $ENV{LAGAN_DIR};
 
 $paregmin = 75;
 $paregmax = 100;
@@ -87,11 +87,6 @@
     exit(1);
 }
 
-if ($lagandir eq "") {
-    print ("Must specify environment variable LAGAN_DIR\n");
-    exit(1);
-}
-
 $mextstr = "$lagandir/utils/mextract.pl $filename";
 print "$mextstr\n";
 if(!`$mextstr`) { print "\nMulti-FASTA extraction failure...\n"; exit(1); }
@@ -169,7 +164,7 @@
     $mparams = "$mparams $s";
 }
 
-$mlagan = "$lagandir/mlagan$mfiles$mparams > $prefix.out";
+$mlagan = "mlagan$mfiles$mparams > $prefix.out";
 print STDERR "\n$mlagan\n\n";
 if(`$mlagan`) { print "\n\n"; exit(1); }
 
--- lagan12/slagan.pl.chris	2003-10-20 13:29:56.000000000 +0200
+++ lagan12/slagan.pl	2006-01-30 01:05:25.000000000 +0100
@@ -84,7 +84,7 @@
 chomp $seq1len;
 chomp $seq2len;
 
-`$lagandir/chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
+`chaos $seq1 $seq2 $chaos_fl > chaos.$$`;
 if ($?) { exit(1); }
 `$lagandir/glocal chaos.$$ $glocal_fl > out.$$`;
 @regs = `$lagandir/anal_gloc.pl < out.$$`;
@@ -138,7 +138,7 @@
     if ($extra2) {
        `$lagandir/utils/fa2xfa $seq2 $startreg2 $endreg2 2 $rcf > seq2$k.$$.masked\n`;
     }
-   `$lagandir/lagan.pl seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
+   `lagan seq1$k.$$ seq2$k.$$ $arglist $lagan_fl -mfa -out lagan.$k.$$\n`;
     $suff = "";
     if ($outfile) {
 	$suff = " >> $outfile";
--- lagan12/mlagan.c.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/mlagan.c	2006-01-30 01:05:25.000000000 +0100
@@ -824,10 +824,6 @@
 
   outfile = stdout;
   lagan_dir = getenv ("LAGAN_DIR");
-  if (!lagan_dir) {
-    fprintf(stderr, "Environment variable LAGAN_DIR not set\n");
-    exit(1);
-  }
 
   buildcache();
   initLib();
--- lagan12/translate.c.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/translate.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "fchaos.h"
 #include "translate.h"
 #include "assert.h"
--- lagan12/lagan.pl.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/lagan.pl	2006-01-30 01:05:25.000000000 +0100
@@ -105,13 +105,13 @@
 	$rundraft = 1;
     }
     elsif ($ARGV[$i] =~ /-cons/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-draftskipfr/){
-	$draftparams = $draftparams." -skipfr $ARGV[$++i]";
+	$draftparams = $draftparams." -skipfr ".$ARGV[++$i];
     }
     elsif ($ARGV[$i] =~ /-lazy/){
-	$draftparams = $draftparams." -cons $ARGV[$++i]";
+	$draftparams = $draftparams." -cons ".$ARGV[++$i];
     }
 
     else {
@@ -233,7 +233,7 @@
 #    `$lagandir/utils/rm $infofilename` if ($binfile);
 }
 
-`rm $secondName` if ($rcflag);
+`rm $secondName` if ($rcFlag);
 `rm $$.*`;
 if ($?) { exit(1); }
 
--- lagan12/Readmes/README.FIRST.chris	2003-11-10 11:30:28.000000000 +0100
+++ lagan12/Readmes/README.FIRST	2006-01-30 01:05:25.000000000 +0100
@@ -30,8 +30,7 @@
 glocal as well as many tools in the utils directory. 
 
 You may also need to go into all the .pl file, and change the first line
-to call your perl interpreter. You must also specify an environment
-variable $LAGAN_DIR to point to the directory where you installed LAGAN.
+to call your perl interpreter.
 
 Because LAGAN uses no system-dependent or implementation dependent 
 libraries it should compile on all platforms and ANSI C compilers. 
--- lagan12/Readmes/README.shuffle.chris	2003-09-23 13:08:17.000000000 +0200
+++ lagan12/Readmes/README.shuffle	2006-01-30 01:05:25.000000000 +0100
@@ -13,14 +13,13 @@
 If you received Shuffle-LAGAN as part of the LAGAN toolkit it is installed 
 automatically with the rest of the package. If you got it seperately, you 
 should merge the included files into the directories used by CHAOS and 
-LAGAN (i.e. contents of the utils subdirectory should go into 
-$LAGAN_DIR/utils). The code assumes $LAGAN_DIR has been set. 
+LAGAN.
 
 
 2. Running
 Just give it two sequences and let it roll:
 
-#slagan.pl seq1.fa seq2.fa 
+#slagan seq1.fa seq2.fa 
 
 3. Input
 
--- lagan12/Readmes/README.chaos.chris	2003-11-10 11:32:58.000000000 +0100
+++ lagan12/Readmes/README.chaos	2006-01-30 01:05:25.000000000 +0100
@@ -29,13 +29,7 @@
 
 Because CHAOS uses no system-dependent or implementation dependent libraries
 it should compile on all platforms and ANSI C compilers. If you have problems
-compiling the sources please e-mail the author. You will need to also set the
-environment variable LAGAN_DIR to the directory where you installed CHAOS. in
-c-shell this can be done by executing
-
-% setenv LAGAN_DIR `pwd`
-
-on the prompt. For other shells the command differs.
+compiling the sources please e-mail the author.
 
 II Description
    CHAOS is a heuristic local alignment tool optimized for non-coding 
--- lagan12/Readmes/README.lagan.chris	2003-09-23 14:35:27.000000000 +0200
+++ lagan12/Readmes/README.lagan	2006-01-30 01:05:25.000000000 +0100
@@ -20,7 +20,7 @@
 3. Doing global alignment in a limited area of thw NW matrix given the set of 
 anchors (order tool).
 
-lagan.pl is the main executable that calls the three steps.
+lagan is the main executable that calls the three steps.
 
 II Usage
 
--- lagan12/rechaos.pl.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/rechaos.pl	2006-01-30 01:05:25.000000000 +0100
@@ -181,11 +181,11 @@
 #    print STDERR "-----------------\n";
 #    print STDERR `cat $$.anchs.pairs`;
 #    print STDERR "-----------------\n";
-#    print STDERR "$lagandir/chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
+#    print STDERR "chaos $seq1 $seq2 -wl $wordlen -nd $degeneracy -co $cutoff $extraparams $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp";
 
 # PERFORM THE ALIGNMENTS USING CHAOS
 
-    `$lagandir/chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
+    `chaos $seq1 $seq2 $extraparams -wl $wordlen -nd $degeneracy -co $cutoff $gfc $chaosfl -pairs $$.anchs.pairs > $$.anchtemp`;
     if ($?) { exit(1); }
 
 # ADD IN BOUNDARIES
@@ -238,7 +238,6 @@
     @b2new = 0;
     @e1new = 0;
     @e2new = 0;
-    @scores = 0;
 
     $app_str = "";
     
--- lagan12/global.c.chris	2003-09-22 19:06:54.000000000 +0200
+++ lagan12/global.c	2006-01-30 01:05:25.000000000 +0100
@@ -1,5 +1,6 @@
 #include "global.h"
 #include <stdlib.h>
+#include <stdio.h>
 
 extern int indeces[256];
 
--- lagan12/glocal.c.chris	2006-01-30 01:05:40.000000000 +0100
+++ lagan12/glocal.c	2006-01-30 01:06:36.000000000 +0100
@@ -123,9 +123,9 @@
     
     /* Put -infinity in cBound and dBound and rightCBound */
     
-    cBound * c = createCBound ( LONG_MIN / 2, dummyownerLeft );
-    dBound * d = createDBound ( LONG_MIN / 2, dummyownerLeft );
-    dBound * rightC = createDBound ( LONG_MIN / 2, dummyownerRight );
+    cBound * c = createCBound ( INT_MIN / 2, dummyownerLeft );
+    dBound * d = createDBound ( INT_MIN / 2, dummyownerLeft );
+    dBound * rightC = createDBound ( INT_MIN / 2, dummyownerRight );
 
     insertCBound ( cBoundTreeRoot[i], c, i );
     insertDBound ( dBoundTreeRoot[i], d, i );
@@ -1680,7 +1680,7 @@
 	    
 	if ( ( cSucc != NULL ) && 
 	     ( cSucc->intpoint == NULL ) &&
-	     ( cSucc->column != LONG_MIN / 2 ) ){
+	     ( cSucc->column != INT_MIN / 2 ) ){
 
 	  point * intpt = createPoint ( ( cSucc->column - ( curpoint->y - curpoint->x ) ),
 					( cSucc->column ),
@@ -1848,7 +1848,7 @@
 	    
 	// Add intersection of d->diagonal and curpoint->column.
 	
-	if ( d->diagonal != LONG_MIN / 2 ){
+	if ( d->diagonal != INT_MIN / 2 ){
 	  
 	  point * intpt = createPoint ( ( curpoint->y - d->diagonal ),
 					( curpoint->y ),
@@ -1905,7 +1905,7 @@
 	      
 	  if ( ( dPred != NULL ) && 
 	       ( dPred->intpoint == NULL ) &&
-	       ( dPred->diagonal != LONG_MIN / 2 ) ){
+	       ( dPred->diagonal != INT_MIN / 2 ) ){
 	    
 	    point * intpt = createPoint ( ( curpoint->y - dPred->diagonal ),
 					  ( curpoint->y ),
@@ -2279,7 +2279,7 @@
     
     if ( ( dPred != NULL ) && 
 	 ( dPred->intpoint == NULL ) &&
-	 ( dPred->diagonal !=  LONG_MIN / 2 ) ){
+	 ( dPred->diagonal !=  INT_MIN / 2 ) ){
       
       point * intpt = createPoint ( ( curpoint->y - dPred->diagonal ),
 				    ( curpoint->y ),


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2006 00:15:28 -0000	1.1
+++ .cvsignore	30 Jan 2006 00:16:20 -0000	1.2
@@ -0,0 +1 @@
+lagan12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lagan/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2006 00:15:28 -0000	1.1
+++ sources	30 Jan 2006 00:16:20 -0000	1.2
@@ -0,0 +1 @@
+e45c9287d04b31924115869588f1fb61  lagan12.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 00:32:02 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Sun, 29 Jan 2006 19:32:02 -0500
Subject: owners owners.list,1.578,1.579
Message-ID: <200601300032.k0U0WZ89019510@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19491

Modified Files:
	owners.list 
Log Message:
add xfce4-screenshooter-plugin


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.578
retrieving revision 1.579
diff -u -r1.578 -r1.579
--- owners.list	29 Jan 2006 21:54:30 -0000	1.578
+++ owners.list	30 Jan 2006 00:32:02 -0000	1.579
@@ -1343,6 +1343,7 @@
 Fedora Extras|xfce4-notes-plugin|Notes plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-quicklauncher-plugin|Quicklauncher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-screenshooter-plugin|Screenshot utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 30 00:34:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Sun, 29 Jan 2006 19:34:58 -0500
Subject: owners owners.list,1.579,1.580
Message-ID: <200601300035.k0U0ZU1O019547@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19528

Modified Files:
	owners.list 
Log Message:
Add lagan


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- owners.list	30 Jan 2006 00:32:02 -0000	1.579
+++ owners.list	30 Jan 2006 00:34:58 -0000	1.580
@@ -480,6 +480,7 @@
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcms|Color Management System|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Jan 30 09:58:33 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 30 Jan 2006 04:58:33 -0500
Subject: rpms/js/devel js.spec,1.8,1.9
Message-ID: <200601300959.k0U9x6L9006167@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/js/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6148

Modified Files:
	js.spec 
Log Message:
Fix .pc file.



Index: js.spec
===================================================================
RCS file: /cvs/extras/rpms/js/devel/js.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- js.spec	26 Jan 2006 14:59:14 -0000	1.8
+++ js.spec	30 Jan 2006 09:58:33 -0000	1.9
@@ -3,7 +3,7 @@
 Summary: JavaScript interpreter and libraries
 Name: js
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 %if 0%{?_without_readline:1}
 License: MPL/GPL/LGPL
 %else
@@ -48,7 +48,7 @@
 %{__cp} src/perlconnect/README.html src/README.perlconnect.html
 
 # Create pkgconfig file
-%{__cat} > libjs.pc << EOF
+%{__cat} > libjs.pc << 'EOF'
 prefix=%{_prefix}
 exec_prefix=${_prefix}
 libdir=${_libdir}
@@ -130,6 +130,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-2
+- Fix .pc file.
+
 * Thu Jan 26 2006 Matthias Saou <http://freshrpms.net/> 1.5.0-1
 - Update to 1.5.0 final.
 - Spec file cleanups.



From fedora-extras-commits at redhat.com  Mon Jan 30 10:16:08 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 30 Jan 2006 05:16:08 -0500
Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.8, 1.9 scim-anthy.spec, 1.23,
	1.24 sources, 1.10, 1.11 scim-anthy-wide-latin.diff, 1.1, NONE
Message-ID: <200601301016.k0UAGek5008114@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8088

Modified Files:
	.cvsignore scim-anthy.spec sources 
Removed Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
- New upstream release.
- scim-anthy-wide-latin.diff: removed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	1 Dec 2005 11:48:41 -0000	1.8
+++ .cvsignore	30 Jan 2006 10:16:07 -0000	1.9
@@ -1,3 +1,4 @@
 scim-anthy-0.6.1.tar.gz
 scim-anthy-0.7.1.tar.gz
 scim-anthy-0.8.0.tar.gz
+scim-anthy-0.9.0.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- scim-anthy.spec	24 Jan 2006 03:39:30 -0000	1.23
+++ scim-anthy.spec	30 Jan 2006 10:16:07 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           scim-anthy
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,7 +8,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
-Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -48,6 +46,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
+- New upstream release.
+- scim-anthy-wide-latin.diff: removed.
+
 * Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
 - scim-anthy-wide-latin.diff: applied to fix a problem that the input character
   appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Dec 2005 11:48:41 -0000	1.10
+++ sources	30 Jan 2006 10:16:07 -0000	1.11
@@ -1 +1 @@
-869df30ecbbbfe43b0758f3b074ed0c9  scim-anthy-0.8.0.tar.gz
+5e4742d011cdbf3554cc276f74a11ea9  scim-anthy-0.9.0.tar.gz


--- scim-anthy-wide-latin.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 30 10:21:32 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 30 Jan 2006 05:21:32 -0500
Subject: rpms/scim-anthy/FC-3 .cvsignore, 1.7, 1.8 scim-anthy.spec, 1.16,
	1.17 sources, 1.8, 1.9 scim-anthy-wide-latin.diff, 1.1, NONE
Message-ID: <200601301022.k0UAM43R008243@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/scim-anthy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8215

Modified Files:
	.cvsignore scim-anthy.spec sources 
Removed Files:
	scim-anthy-wide-latin.diff 
Log Message:
* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
- New upstream release.
- scim-anthy-wide-latin.diff: removed.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Dec 2005 11:39:47 -0000	1.7
+++ .cvsignore	30 Jan 2006 10:21:32 -0000	1.8
@@ -1,3 +1,4 @@
 scim-anthy-0.6.1.tar.gz
 scim-anthy-0.7.1.tar.gz
 scim-anthy-0.8.0.tar.gz
+scim-anthy-0.9.0.tar.gz


Index: scim-anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/scim-anthy.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- scim-anthy.spec	24 Jan 2006 04:21:22 -0000	1.16
+++ scim-anthy.spec	30 Jan 2006 10:21:32 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           scim-anthy
-Version:        0.8.0
-Release:        2%{?dist}
+Version:        0.9.0
+Release:        1%{?dist}
 
 License:        GPL
 URL:            http://scim-imengine.sourceforge.jp/
@@ -8,7 +8,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scim-devel
 BuildRequires:	anthy-devel >= 6700b-1
-Patch0:		scim-anthy-wide-latin.diff
 
 Summary:        SCIM IMEngine for anthy for Japanese input
 Group:          System Environment/Libraries
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 
 %build
@@ -48,6 +46,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Akira TAGOH <tagoh at redhat.com> - 0.9.0-1
+- New upstream release.
+- scim-anthy-wide-latin.diff: removed.
+
 * Tue Jan 24 2006 Akira TAGOH <tagoh at redhat.com> - 0.8.0-2
 - scim-anthy-wide-latin.diff: applied to fix a problem that the input character
   appears twice with the full size alphanumeric mode. [scim-imengine-dev:894]


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scim-anthy/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	1 Dec 2005 11:39:47 -0000	1.8
+++ sources	30 Jan 2006 10:21:32 -0000	1.9
@@ -1 +1 @@
-869df30ecbbbfe43b0758f3b074ed0c9  scim-anthy-0.8.0.tar.gz
+5e4742d011cdbf3554cc276f74a11ea9  scim-anthy-0.9.0.tar.gz


--- scim-anthy-wide-latin.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 30 10:58:28 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Mon, 30 Jan 2006 05:58:28 -0500
Subject: rpms/mail-notification/devel mail-notification.spec,1.15,1.16
Message-ID: <200601301059.k0UAx1XW008556@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8535

Modified Files:
	mail-notification.spec 
Log Message:
rebuild


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mail-notification.spec	17 Jan 2006 18:07:27 -0000	1.15
+++ mail-notification.spec	30 Jan 2006 10:58:28 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-10
+- rebuild
+
 * Thu Jan 17 2006 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 2.0-9
 - fixes for evolution >= 2.5
 



From fedora-extras-commits at redhat.com  Mon Jan 30 13:42:32 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Jan 2006 08:42:32 -0500
Subject: rpms/tinyerp/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tinyerp-client.patch, 1.3, 1.4 tinyerp-server.patch, 1.4,
	1.5 tinyerp.spec, 1.10, 1.11
Message-ID: <200601301343.k0UDh4Bd014675@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14637

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream tinyerp 3.2.1
- fixed filename for the czech translation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2006 09:14:04 -0000	1.5
+++ .cvsignore	30 Jan 2006 13:42:31 -0000	1.6
@@ -1,2 +1,2 @@
-tinyerp-client-3.2.0.tar.gz
-tinyerp-server-3.2.0.tar.gz
+tinyerp-client-3.2.1.tgz
+tinyerp-server-3.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2006 09:14:04 -0000	1.5
+++ sources	30 Jan 2006 13:42:31 -0000	1.6
@@ -1,2 +1,2 @@
-e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
-6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz
+5e588d39d139f6b66c9f66e59e089d4c  tinyerp-client-3.2.1.tgz
+4acbbd8e8fac798ea3e9da08e076b465  tinyerp-server-3.2.1.tgz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-client.patch	25 Jan 2006 09:14:04 -0000	1.3
+++ tinyerp-client.patch	30 Jan 2006 13:42:31 -0000	1.4
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
---- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
-+++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py
+--- client.orig/bin/tinyerp-client.py	2006-01-27 11:50:28.000000000 +0100
++++ client/bin/tinyerp-client.py	2006-01-30 14:22:52.000000000 +0100
 @@ -73,14 +73,13 @@
  import pango
  
@@ -20,3 +20,15 @@
  
  import options
  
+diff -Nru client.orig/setup.py client/setup.py
+--- client.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ client/setup.py	2006-01-30 14:22:58.000000000 +0100
+@@ -18,7 +18,7 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-client'
+-version = '3.2.0'
++version = '3.2.1'
+ 
+ # get python short version
+ py_short_version = '%s.%s' % sys.version_info[:2]

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp-server.patch	25 Jan 2006 09:14:04 -0000	1.4
+++ tinyerp-server.patch	30 Jan 2006 13:42:31 -0000	1.5
@@ -1,7 +1,13 @@
-diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
---- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
-+++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
-@@ -26,9 +26,11 @@
+diff -Nru server.orig/setup.py server/setup.py
+--- server.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ server/setup.py	2006-01-30 14:23:25.000000000 +0100
+@@ -21,14 +21,16 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-server'
+-version = '3.2.0'
++version = '3.2.1'
+ 
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tinyerp.spec	25 Jan 2006 09:14:04 -0000	1.10
+++ tinyerp.spec	30 Jan 2006 13:42:31 -0000	1.11
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.2.0
+Version:	3.2.1
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz
-Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
+Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz
+Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -51,18 +51,20 @@
 %patch1
 
 %build
-cd tinyerp-client-%{version}
+cd client
+# fix filename for the czech translation
+mv bin/po/cz.po bin/po/cs.po
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd client
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ..
 %find_lang tinyerp-client
@@ -135,6 +137,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dan Horak <dan at danny.cz> 3.2.1-1
+- update to upstream tinyerp 3.2.1
+- fixed filename for the czech translation
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script



From fedora-extras-commits at redhat.com  Mon Jan 30 13:52:51 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Jan 2006 08:52:51 -0500
Subject: rpms/tinyerp/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tinyerp-client.patch, 1.3, 1.4 tinyerp-server.patch, 1.4,
	1.5 tinyerp.spec, 1.12, 1.13
Message-ID: <200601301353.k0UDrO6s014785@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14752

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream tinyerp 3.2.1
- fixed filename for the czech translation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2006 08:40:27 -0000	1.5
+++ .cvsignore	30 Jan 2006 13:52:51 -0000	1.6
@@ -1,2 +1,2 @@
-tinyerp-client-3.2.0.tar.gz
-tinyerp-server-3.2.0.tar.gz
+tinyerp-client-3.2.1.tgz
+tinyerp-server-3.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2006 08:40:27 -0000	1.5
+++ sources	30 Jan 2006 13:52:51 -0000	1.6
@@ -1,2 +1,2 @@
-e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
-6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz
+5e588d39d139f6b66c9f66e59e089d4c  tinyerp-client-3.2.1.tgz
+4acbbd8e8fac798ea3e9da08e076b465  tinyerp-server-3.2.1.tgz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-client.patch	25 Jan 2006 08:40:27 -0000	1.3
+++ tinyerp-client.patch	30 Jan 2006 13:52:51 -0000	1.4
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
---- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
-+++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py
+--- client.orig/bin/tinyerp-client.py	2006-01-27 11:50:28.000000000 +0100
++++ client/bin/tinyerp-client.py	2006-01-30 14:22:52.000000000 +0100
 @@ -73,14 +73,13 @@
  import pango
  
@@ -20,3 +20,15 @@
  
  import options
  
+diff -Nru client.orig/setup.py client/setup.py
+--- client.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ client/setup.py	2006-01-30 14:22:58.000000000 +0100
+@@ -18,7 +18,7 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-client'
+-version = '3.2.0'
++version = '3.2.1'
+ 
+ # get python short version
+ py_short_version = '%s.%s' % sys.version_info[:2]

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tinyerp-server.patch	25 Jan 2006 08:40:27 -0000	1.4
+++ tinyerp-server.patch	30 Jan 2006 13:52:51 -0000	1.5
@@ -1,7 +1,13 @@
-diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
---- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
-+++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
-@@ -26,9 +26,11 @@
+diff -Nru server.orig/setup.py server/setup.py
+--- server.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ server/setup.py	2006-01-30 14:23:25.000000000 +0100
+@@ -21,14 +21,16 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-server'
+-version = '3.2.0'
++version = '3.2.1'
+ 
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tinyerp.spec	25 Jan 2006 08:40:27 -0000	1.12
+++ tinyerp.spec	30 Jan 2006 13:52:51 -0000	1.13
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.2.0
+Version:	3.2.1
 Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz
-Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
+Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz
+Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -51,18 +51,20 @@
 %patch1
 
 %build
-cd tinyerp-client-%{version}
+cd client
+# fix filename for the czech translation
+mv bin/po/cz.po bin/po/cs.po
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd client
 /usr/X11R6/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ..
 %find_lang tinyerp-client
@@ -135,6 +137,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dan Horak <dan at danny.cz> 3.2.1-1
+- update to upstream tinyerp 3.2.1
+- fixed filename for the czech translation
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-1
 - update to upstream tinyerp 3.2.0
 - fixed status function in the init.d script



From fedora-extras-commits at redhat.com  Mon Jan 30 13:56:00 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Mon, 30 Jan 2006 08:56:00 -0500
Subject: rpms/tinyerp/devel .cvsignore, 1.5, 1.6 sources, 1.5,
	1.6 tinyerp-client.patch, 1.3, 1.4 tinyerp-server.patch, 1.3,
	1.4 tinyerp.spec, 1.13, 1.14
Message-ID: <200601301356.k0UDuXoX014878@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/tinyerp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14843

Modified Files:
	.cvsignore sources tinyerp-client.patch tinyerp-server.patch 
	tinyerp.spec 
Log Message:
- update to upstream tinyerp 3.2.1
- fixed filename for the czech translation



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Jan 2006 09:24:24 -0000	1.5
+++ .cvsignore	30 Jan 2006 13:56:00 -0000	1.6
@@ -1,2 +1,2 @@
-tinyerp-client-3.2.0.tar.gz
-tinyerp-server-3.2.0.tar.gz
+tinyerp-client-3.2.1.tgz
+tinyerp-server-3.2.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Jan 2006 09:24:24 -0000	1.5
+++ sources	30 Jan 2006 13:56:00 -0000	1.6
@@ -1,2 +1,2 @@
-e99d5d27b9f2bc3171f255448c7626b9  tinyerp-client-3.2.0.tar.gz
-6371dfe2d3220320cc8b183be7bb2d38  tinyerp-server-3.2.0.tar.gz
+5e588d39d139f6b66c9f66e59e089d4c  tinyerp-client-3.2.1.tgz
+4acbbd8e8fac798ea3e9da08e076b465  tinyerp-server-3.2.1.tgz

tinyerp-client.patch:

Index: tinyerp-client.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-client.patch	25 Jan 2006 09:22:50 -0000	1.3
+++ tinyerp-client.patch	30 Jan 2006 13:56:00 -0000	1.4
@@ -1,6 +1,6 @@
-diff -Nru tinyerp-client-3.2.0.orig/bin/tinyerp-client.py tinyerp-client-3.2.0/bin/tinyerp-client.py
---- tinyerp-client-3.2.0.orig/bin/tinyerp-client.py	2006-01-23 19:51:49.000000000 +0100
-+++ tinyerp-client-3.2.0/bin/tinyerp-client.py	2006-01-25 09:12:57.000000000 +0100
+diff -Nru client.orig/bin/tinyerp-client.py client/bin/tinyerp-client.py
+--- client.orig/bin/tinyerp-client.py	2006-01-27 11:50:28.000000000 +0100
++++ client/bin/tinyerp-client.py	2006-01-30 14:22:52.000000000 +0100
 @@ -73,14 +73,13 @@
  import pango
  
@@ -20,3 +20,15 @@
  
  import options
  
+diff -Nru client.orig/setup.py client/setup.py
+--- client.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ client/setup.py	2006-01-30 14:22:58.000000000 +0100
+@@ -18,7 +18,7 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-client'
+-version = '3.2.0'
++version = '3.2.1'
+ 
+ # get python short version
+ py_short_version = '%s.%s' % sys.version_info[:2]

tinyerp-server.patch:

Index: tinyerp-server.patch
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tinyerp-server.patch	25 Jan 2006 09:40:10 -0000	1.3
+++ tinyerp-server.patch	30 Jan 2006 13:56:00 -0000	1.4
@@ -1,7 +1,13 @@
-diff -Nru tinyerp-server-3.2.0.orig/setup.py tinyerp-server-3.2.0/setup.py
---- tinyerp-server-3.2.0.orig/setup.py	2006-01-23 19:51:48.000000000 +0100
-+++ tinyerp-server-3.2.0/setup.py	2006-01-25 09:24:39.000000000 +0100
-@@ -26,9 +26,11 @@
+diff -Nru server.orig/setup.py server/setup.py
+--- server.orig/setup.py	2006-01-23 10:43:47.000000000 +0100
++++ server/setup.py	2006-01-30 14:23:25.000000000 +0100
+@@ -21,14 +21,16 @@
+ opj = os.path.join
+ 
+ name = 'tinyerp-server'
+-version = '3.2.0'
++version = '3.2.1'
+ 
  # get python short version
  py_short_version = '%s.%s' % sys.version_info[:2]
  


Index: tinyerp.spec
===================================================================
RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- tinyerp.spec	25 Jan 2006 09:40:10 -0000	1.13
+++ tinyerp.spec	30 Jan 2006 13:56:00 -0000	1.14
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		tinyerp
-Version:	3.2.0
-Release:	2%{?dist}
+Version:	3.2.1
+Release:	1%{?dist}
 License:	GPL
 Group:		Applications/Productivity
 Summary:	Open Source ERP Client
 URL:		http://tinyerp.org
-Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tar.gz
-Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tar.gz
+Source0:	http://tinyerp.org/download/sources/tinyerp-server-%{version}.tgz
+Source1:	http://tinyerp.org/download/sources/tinyerp-client-%{version}.tgz
 Source2:	tinyerp.desktop
 Source3:	tinyerp-server.conf
 Source4:	tinyerp-server
@@ -52,18 +52,19 @@
 %patch1
 
 %build
-cd tinyerp-client-%{version}
+cd client
+mv bin/po/cz.po bin/po/cs.po
 /usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py build
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-cd tinyerp-client-%{version}
+cd client
 /usr/bin/Xvfb :69 -nolisten tcp -ac -terminate &
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
-cd ../tinyerp-server-%{version}
+cd ../server
 DISPLAY=:69 ./setup.py install --root=$RPM_BUILD_ROOT
 cd ..
 %find_lang tinyerp-client
@@ -136,6 +137,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dan Horak <dan at danny.cz> 3.2.1-1
+- update to upstream tinyerp 3.2.1
+- fixed filename for the czech translation
+
 * Wed Jan 25 2006 Dan Horak <dan at danny.cz> 3.2.0-2
 - add updated server patch
 



From fedora-extras-commits at redhat.com  Mon Jan 30 16:00:43 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 30 Jan 2006 11:00:43 -0500
Subject: rpms/octave-forge/FC-4 .cvsignore, 1.4, 1.5 octave-forge.spec, 1.19,
	1.20 sources, 1.4, 1.5 octave-forge-2005.06.13-legend.patch, 1.1, NONE
Message-ID: <200601301601.k0UG1F7l020542@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18821

Modified Files:
	.cvsignore octave-forge.spec sources 
Removed Files:
	octave-forge-2005.06.13-legend.patch 
Log Message:
New upstream release & various specfile changes.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	13 Jun 2005 14:25:54 -0000	1.4
+++ .cvsignore	30 Jan 2006 16:00:43 -0000	1.5
@@ -1 +1 @@
-octave-forge-2005.06.13.patched.tar.gz
+octave-forge-2006.01.28.patched.tar.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- octave-forge.spec	12 Nov 2005 01:53:50 -0000	1.19
+++ octave-forge.spec	30 Jan 2006 16:00:43 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           octave-forge
-Version:        2005.06.13
-Release:        11%{?dist}
+Version:        2006.01.28
+Release:        1%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,15 +15,9 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
-Patch0:         %{name}-2005.06.13-legend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
-## Octave-forge installs in a directory tree specific to the installed
-## version of octave, so the following version dependency is necessary.
-%define octave_ep  6
-%define octave_ver %(echo "disp(octave_config_info.version)" | octave -qf)
-Requires:	octave = %{octave_ep}:%{octave_ver} ImageMagick
+Requires:       octave >= 2.1.69 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel
 BuildRequires:  xorg-x11-devel libjpeg-devel libpng-devel pcre-devel
 BuildRequires:  ncurses-devel libtermcap-devel gsl-devel qhull-devel
@@ -38,8 +32,7 @@
 
 %prep
 %setup -q
-%patch0 -p0
-echo %{octave_ver}
+
 
 %build
 %configure
@@ -47,17 +40,15 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%define host_type %(echo "disp(octave_config_info.canonical_host_type)" | octave -qf)
-%define site_dir octave/%{octave_ver}/site
-make install prefix=$RPM_BUILD_ROOT%{_prefix} \
-	bindir=$RPM_BUILD_ROOT%{_bindir} \
-	mandir=$RPM_BUILD_ROOT%{_mandir} \
-	MPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/m/octave-forge \
-	OPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/oct/%{host_type}/octave-forge \
-	XPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/exec/%{host_type} \
-	ALTPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m \
-	ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/%{site_dir}/octave-forge-alternative/m/octave-forge \
-	ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/%{site_dir}/octave-forge-alternative/oct/%{host_type}
+ALTPATHNAME=octave/site/octave-forge-alternative
+HOSTTYPE=`octave-config -p CANONICAL_HOST_TYPE`
+%makeinstall \
+  MPATH=$RPM_BUILD_ROOT`octave-config -p LOCALFCNFILEDIR`/octave-forge \
+  OPATH=$RPM_BUILD_ROOT`octave-config -p LOCALAPIOCTFILEDIR`/octave-forge \
+  XPATH=$RPM_BUILD_ROOT`octave-config -p LOCALARCHLIBDIR`/octave-forge \
+  ALTPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m \
+  ALTMPATH=$RPM_BUILD_ROOT%{_datadir}/$ALTPATHNAME/m/octave-forge \
+  ALTOPATH=$RPM_BUILD_ROOT%{_libexecdir}/$ALTPATHNAME/oct/$HOSTTYPE
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +65,11 @@
 
 
 %changelog
+* Mon Jan 30 2006 Quentin Spencer <qspencer at users.sf.net> 2001.01.28-1
+- New release. Remove old patch.
+- Change installation paths so they now depend on the octave API version
+  rather than the octave version, which will make updates less frequent.
+
 * Fri Nov 11 2005 Quentin Spencer <qspencer at users.sf.net> 2005.06.13-11
 - Rebuild for new version of octave (2.1.72).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	13 Jun 2005 14:25:54 -0000	1.4
+++ sources	30 Jan 2006 16:00:43 -0000	1.5
@@ -1 +1 @@
-460aecb7aa96689901bd96a04e55fb40  octave-forge-2005.06.13.patched.tar.gz
+8192ee6bc3784e35180623592de4303f  octave-forge-2006.01.28.patched.tar.gz


--- octave-forge-2005.06.13-legend.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Jan 30 16:22:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 30 Jan 2006 11:22:52 -0500
Subject: rpms/dxpc/devel dxpc.spec,1.6,1.7
Message-ID: <200601301623.k0UGNeuc020800@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dxpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20781

Modified Files:
	dxpc.spec 
Log Message:
* Mon Jan 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-3
- drop BR: XFree86-devel
- add BR: xorg-x11-devel/libXt-devel



Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- dxpc.spec	6 Apr 2005 22:11:37 -0000	1.6
+++ dxpc.spec	30 Jan 2006 16:22:52 -0000	1.7
@@ -1,19 +1,23 @@
+
 Summary: Differential X Protocol Compressor
 Name:    dxpc
 Version: 3.8.2
-Release: 2
+Release: 3%{?dist} 
 
-Source:  http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
 License: BSD
-Group:   User Interface/X
+Group:	 User Interface/X
 URL:     http://www.vigor.nu/dxpc/
+Source:  http://www.vigor.nu/dxpc/%{version}/dxpc-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires: lzo-devel >= 1.08
-BuildRequires: XFree86-devel
-Requires:      lzo >= 1.08
+Patch1: dxpc-3.8.2-mandir.patch
 
-Patch1:  dxpc-3.8.2-mandir.patch
+BuildRequires: lzo-devel >= 1.08
+%if "%{?fedora}" > "4"
+BuildRequires: libXt-devel
+%else
+BuildRequires: xorg-x11-devel
+%endif
 
 %description
 dxpc is an X protocol compressor designed to improve the
@@ -28,7 +32,8 @@
 
 
 %build
-%configure %{?configure_opts}
+%configure 
+
 make %{?_smp_mflags}
 
 
@@ -49,6 +54,10 @@
 
 
 %changelog
+* Mon Jan 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-3
+- drop BR: XFree86-devel
+- add BR: xorg-x11-devel/libXt-devel
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
@@ -57,3 +66,4 @@
 
 * Tue Jun 17 2003 Rex Dieter <rexdieter at sf.net> 0:3.8.2-0.fdr.0
 - 3.8.2
+



From fedora-extras-commits at redhat.com  Mon Jan 30 16:26:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 30 Jan 2006 11:26:48 -0500
Subject: rpms/dxpc/devel dxpc.spec,1.7,1.8
Message-ID: <200601301627.k0UGRLdx020888@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/dxpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20811

Modified Files:
	dxpc.spec 
Log Message:
include bugzilla reference



Index: dxpc.spec
===================================================================
RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dxpc.spec	30 Jan 2006 16:22:52 -0000	1.7
+++ dxpc.spec	30 Jan 2006 16:26:48 -0000	1.8
@@ -55,8 +55,8 @@
 
 %changelog
 * Mon Jan 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.8.2-3
-- drop BR: XFree86-devel
-- add BR: xorg-x11-devel/libXt-devel
+- drop BR: XFree86-devel (#179283)
+- add BR: xorg-x11-devel/libXt-devel (#179283)
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt



From fedora-extras-commits at redhat.com  Mon Jan 30 16:37:15 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 30 Jan 2006 11:37:15 -0500
Subject: rpms/gparted/devel .cvsignore, 1.3, 1.4 gparted.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200601301637.k0UGbmNU020966@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20943

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Mon Jan 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2-1
- New release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Jan 2006 01:12:59 -0000	1.3
+++ .cvsignore	30 Jan 2006 16:37:15 -0000	1.4
@@ -1 +1 @@
-gparted-0.1.tar.bz2
+gparted-0.2.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gparted.spec	12 Jan 2006 01:12:59 -0000	1.3
+++ gparted.spec	30 Jan 2006 16:37:15 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.1
+Version: 0.2
 Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Jan 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2-1
+- New release
+
 * Wed Jan 11 2006 Deji Akingunola <dakingun at gmail.com> - 0.1-1
 - New release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Jan 2006 01:12:59 -0000	1.3
+++ sources	30 Jan 2006 16:37:15 -0000	1.4
@@ -1 +1 @@
-f0e212b8f03918b320ca6b4ad86d4afb  gparted-0.1.tar.bz2
+250008cfbb87ef78298951bc999c6621  gparted-0.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:44:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:44:28 -0500
Subject: rpms/konversation/devel konversation-gcc41.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 konversation.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200601301645.k0UGj06k021072@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21047

Modified Files:
	.cvsignore konversation.spec sources 
Added Files:
	konversation-gcc41.patch 
Log Message:
Update to 0.19



konversation-gcc41.patch:

--- NEW FILE konversation-gcc41.patch ---
--- konversation-0.19-orig/konversation/src/searchbar.h	2006-01-30 02:43:47.000000000 -0600
+++ konversation-0.19/konversation/src/searchbar.h	2006-01-30 09:44:39.000000000 -0600
@@ -55,7 +55,7 @@
 
         void focusInEvent(QFocusEvent* e);
         virtual void showEvent(QShowEvent* e);
-        bool SearchBar::focusedChild();
+        bool focusedChild();
     public slots:
 
         virtual void hide();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2005 19:44:46 -0000	1.2
+++ .cvsignore	30 Jan 2006 16:44:28 -0000	1.3
@@ -1 +1 @@
-konversation-0.18.tar.bz2
+konversation-0.19.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- konversation.spec	22 Dec 2005 15:08:48 -0000	1.4
+++ konversation.spec	30 Jan 2006 16:44:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           konversation
-Version:        0.18
-Release:        6%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,10 +9,10 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.2, desktop-file-utils
-Requires:       kdebase >= 3.2
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+Requires:       kdebase >= 3.4
 
-patch0: kdegcc4.patch
+patch0: konversation-gcc41.patch
 
 %description
 A simple and easy to use IRC client for KDE with support for
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+%patch0 -p1 -b .gcc41
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -83,9 +83,11 @@
 
 
 %changelog
+<<<<<<< konversation.spec
+* Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
+- update to 0.19
 * Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6
 - Rebuild for gcc 4.1
-
 * Sat Oct 20 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-5
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist 
 - add %post and %postun scriptlets  to notify of new icons per


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2005 19:44:46 -0000	1.2
+++ sources	30 Jan 2006 16:44:28 -0000	1.3
@@ -1 +1 @@
-87eceaaad4223d17380cd1f8dfe8123f  konversation-0.18.tar.bz2
+2194967b21276315a29258ccc557c429  konversation-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:45:52 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:45:52 -0500
Subject: rpms/konversation/devel konversation.spec,1.5,1.6
Message-ID: <200601301646.k0UGkO07021120@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21101

Modified Files:
	konversation.spec 
Log Message:
fix changelog



Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/devel/konversation.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- konversation.spec	30 Jan 2006 16:44:28 -0000	1.5
+++ konversation.spec	30 Jan 2006 16:45:52 -0000	1.6
@@ -83,7 +83,6 @@
 
 
 %changelog
-<<<<<<< konversation.spec
 * Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
 - update to 0.19
 * Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6



From fedora-extras-commits at redhat.com  Mon Jan 30 16:47:28 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:47:28 -0500
Subject: rpms/konversation/FC-3 konversation-gcc41.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 konversation.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601301648.k0UGm0jS021193@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21169

Modified Files:
	.cvsignore konversation.spec sources 
Added Files:
	konversation-gcc41.patch 
Log Message:
Update to 0.19


konversation-gcc41.patch:

--- NEW FILE konversation-gcc41.patch ---
--- konversation-0.19-orig/konversation/src/searchbar.h	2006-01-30 02:43:47.000000000 -0600
+++ konversation-0.19/konversation/src/searchbar.h	2006-01-30 09:44:39.000000000 -0600
@@ -55,7 +55,7 @@
 
         void focusInEvent(QFocusEvent* e);
         virtual void showEvent(QShowEvent* e);
-        bool SearchBar::focusedChild();
+        bool focusedChild();
     public slots:
 
         virtual void hide();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2005 19:44:46 -0000	1.2
+++ .cvsignore	30 Jan 2006 16:47:28 -0000	1.3
@@ -1 +1 @@
-konversation-0.18.tar.bz2
+konversation-0.19.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-3/konversation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- konversation.spec	23 Oct 2005 04:56:07 -0000	1.3
+++ konversation.spec	30 Jan 2006 16:47:28 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           konversation
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,10 +9,10 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.2, desktop-file-utils
-Requires:       kdebase >= 3.2
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+Requires:       kdebase >= 3.4
 
-patch0: kdegcc4.patch
+patch0: konversation-gcc41.patch
 
 %description
 A simple and easy to use IRC client for KDE with support for
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+%patch0 -p1 -b .gcc41
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -83,18 +83,25 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
+- update to 0.19
+* Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6
+- Rebuild for gcc 4.1
 * Sat Oct 20 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-5
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist 
 - add %post and %postun scriptlets  to notify of new icons per
-touch --no-create %{_datadir}/icons/hicolor || :
 - http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#implementation_notes
+
 * Sun Jul 03 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-4
 - Explicly export QT lib and include dirs  for x86_64 build issue
+
 * Tue Jun 28 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-3
 - Destop-file-install,  change gcc4 patch  to configure  
   remove unneeded build deps.
+
 * Mon Jun 27 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-2
 - Fix build requires,set QT, %%lang'ify LOCALE bits and HTML docs
   move automake to prep
+
 * Sat Jun 25 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2005 19:44:46 -0000	1.2
+++ sources	30 Jan 2006 16:47:28 -0000	1.3
@@ -1 +1 @@
-87eceaaad4223d17380cd1f8dfe8123f  konversation-0.18.tar.bz2
+2194967b21276315a29258ccc557c429  konversation-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:50:03 2006
From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil))
Date: Mon, 30 Jan 2006 11:50:03 -0500
Subject: rpms/konversation/FC-4 konversation-gcc41.patch, NONE,
	1.1 .cvsignore, 
	1.2, 1.3 konversation.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200601301650.k0UGoZIj021266@cvs-int.fedora.redhat.com>

Author: ausil

Update of /cvs/extras/rpms/konversation/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21242

Modified Files:
	.cvsignore konversation.spec sources 
Added Files:
	konversation-gcc41.patch 
Log Message:
Update to 0.19


konversation-gcc41.patch:

--- NEW FILE konversation-gcc41.patch ---
--- konversation-0.19-orig/konversation/src/searchbar.h	2006-01-30 02:43:47.000000000 -0600
+++ konversation-0.19/konversation/src/searchbar.h	2006-01-30 09:44:39.000000000 -0600
@@ -55,7 +55,7 @@
 
         void focusInEvent(QFocusEvent* e);
         virtual void showEvent(QShowEvent* e);
-        bool SearchBar::focusedChild();
+        bool focusedChild();
     public slots:
 
         virtual void hide();


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Jun 2005 19:44:46 -0000	1.2
+++ .cvsignore	30 Jan 2006 16:50:03 -0000	1.3
@@ -1 +1 @@
-konversation-0.18.tar.bz2
+konversation-0.19.tar.bz2


Index: konversation.spec
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-4/konversation.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- konversation.spec	23 Oct 2005 04:56:08 -0000	1.3
+++ konversation.spec	30 Jan 2006 16:50:03 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           konversation
-Version:        0.18
-Release:        5%{?dist}
+Version:        0.19
+Release:        1%{?dist}
 Summary:        Konversation is a user friendly IRC client for KDE
 
 Group:          Applications/Internet
@@ -9,10 +9,10 @@
 Source0:        http://download.berlios.de/konversation/konversation-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  kdebase-devel  >= 3.2, desktop-file-utils
-Requires:       kdebase >= 3.2
+BuildRequires:  kdebase-devel  >= 3.4, desktop-file-utils
+Requires:       kdebase >= 3.4
 
-patch0: kdegcc4.patch
+patch0: konversation-gcc41.patch
 
 %description
 A simple and easy to use IRC client for KDE with support for
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+%patch0 -p1 -b .gcc41
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -83,18 +83,25 @@
 
 
 %changelog
+* Mon Jan 30 2006 Dennis Gilmore <dennis at ausil.us> - 0.19-1
+- update to 0.19
+* Thu Dec 22 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-6
+- Rebuild for gcc 4.1
 * Sat Oct 20 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-5
 - add BuildRequires desktop-file-utils  http://fedoraproject.org/wiki/QAChecklist 
 - add %post and %postun scriptlets  to notify of new icons per
-touch --no-create %{_datadir}/icons/hicolor || :
 - http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#implementation_notes
+
 * Sun Jul 03 2005 Dennis Gilmore <dennis at ausil.us> - 0.18-4
 - Explicly export QT lib and include dirs  for x86_64 build issue
+
 * Tue Jun 28 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-3
 - Destop-file-install,  change gcc4 patch  to configure  
   remove unneeded build deps.
+
 * Mon Jun 27 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-2
 - Fix build requires,set QT, %%lang'ify LOCALE bits and HTML docs
   move automake to prep
+
 * Sat Jun 25 2005  Dennis Gilmore <dennis at ausil.us> - 0.18-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/konversation/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Jun 2005 19:44:46 -0000	1.2
+++ sources	30 Jan 2006 16:50:03 -0000	1.3
@@ -1 +1 @@
-87eceaaad4223d17380cd1f8dfe8123f  konversation-0.18.tar.bz2
+2194967b21276315a29258ccc557c429  konversation-0.19.tar.bz2



From fedora-extras-commits at redhat.com  Mon Jan 30 16:54:55 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 30 Jan 2006 11:54:55 -0500
Subject: rpms/mercurial/devel .cvsignore, 1.5, 1.6 mercurial.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200601301655.k0UGtRQh021423@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21402

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
- update to 0.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 21:07:51 -0000	1.5
+++ .cvsignore	30 Jan 2006 16:54:55 -0000	1.6
@@ -1 +1 @@
-mercurial-0.7.tar.gz
+mercurial-0.8.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mercurial.spec	22 Sep 2005 18:45:44 -0000	1.5
+++ mercurial.spec	30 Jan 2006 16:54:55 -0000	1.6
@@ -1,6 +1,6 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.7
+Version: 0.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -34,6 +34,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
+- update to 0.8
+
 * Thu Sep 22 2005 Jeremy Katz <katzj at redhat.com> 
 - add contributors to %%doc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 21:07:51 -0000	1.5
+++ sources	30 Jan 2006 16:54:55 -0000	1.6
@@ -1 +1 @@
-c024ca9ed3ef35af8c5618316b6ab00a  mercurial-0.7.tar.gz
+4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 16:56:30 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 30 Jan 2006 11:56:30 -0500
Subject: rpms/mercurial/FC-4 mercurial.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200601301657.k0UGv2uC021491@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/mercurial/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21472

Modified Files:
	mercurial.spec sources 
Log Message:
* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
- update to 0.8



Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mercurial.spec	20 Sep 2005 21:31:23 -0000	1.4
+++ mercurial.spec	30 Jan 2006 16:56:30 -0000	1.5
@@ -1,6 +1,6 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.7
+Version: 0.8
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
@@ -30,10 +30,16 @@
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
-%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
 
 
 %changelog
+* Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
+- update to 0.8
+
+* Thu Sep 22 2005 Jeremy Katz <katzj at redhat.com> 
+- add contributors to %%doc
+
 * Tue Sep 20 2005 Jeremy Katz <katzj at redhat.com> - 0.7
 - update to 0.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 21:31:23 -0000	1.5
+++ sources	30 Jan 2006 16:56:30 -0000	1.6
@@ -1 +1 @@
-c024ca9ed3ef35af8c5618316b6ab00a  mercurial-0.7.tar.gz
+4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 19:27:19 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 30 Jan 2006 14:27:19 -0500
Subject: rpms/enchant/devel .cvsignore, 1.5, 1.6 enchant.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601301927.k0UJRq9S027433@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27408

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.2.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2005 21:02:27 -0000	1.5
+++ .cvsignore	30 Jan 2006 19:27:19 -0000	1.6
@@ -1 +1 @@
-enchant-1.2.0.tar.gz
+enchant-1.2.1.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- enchant.spec	22 Oct 2005 21:02:27 -0000	1.6
+++ enchant.spec	30 Jan 2006 19:27:19 -0000	1.7
@@ -1,13 +1,12 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
 URL: http://www.abisource.com/
-Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -62,6 +61,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan 30 2006 Marc Maurer <uwog at abisource.com> 1:1.2.1-1.fc5
+- Update to 1.2.1
+- Drop glib Require
+
 * Sat Oct 22 2005 Marc Maurer <uwog at abisource.com> 1:1.2.0-1.fc5
 - Update to 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2005 21:02:27 -0000	1.5
+++ sources	30 Jan 2006 19:27:19 -0000	1.6
@@ -1 +1 @@
-e44a734a85fbbadf898fb935ac346f31  enchant-1.2.0.tar.gz
+841542c0bf89b5c7b8a85f4bc682f70b  enchant-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 20:02:54 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:02:54 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.9, 1.10 abcm2ps.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200601302003.k0UK3Qib029435@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29404

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jan 2006 12:21:21 -0000	1.9
+++ .cvsignore	30 Jan 2006 20:02:54 -0000	1.10
@@ -1,2 +1,2 @@
-abcplus_en-1.0.4.zip
 abcm2ps-4.12.5.tar.gz
+abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcm2ps.spec	29 Jan 2006 12:21:21 -0000	1.9
+++ abcm2ps.spec	30 Jan 2006 20:02:54 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.5
+Version:        4.12.6
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.6.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.6-1
+- new version 4.12.6
+
 * Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
 - new version 4.12.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jan 2006 12:21:21 -0000	1.9
+++ sources	30 Jan 2006 20:02:54 -0000	1.10
@@ -1,2 +1,2 @@
-99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
 582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:05:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:05:13 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.9, 1.10 abcm2ps.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200601302005.k0UK5kVH029495@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29452/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jan 2006 12:21:27 -0000	1.9
+++ .cvsignore	30 Jan 2006 20:05:13 -0000	1.10
@@ -1,2 +1,2 @@
-abcplus_en-1.0.4.zip
 abcm2ps-4.12.5.tar.gz
+abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcm2ps.spec	29 Jan 2006 12:21:27 -0000	1.9
+++ abcm2ps.spec	30 Jan 2006 20:05:13 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.5
+Version:        4.12.6
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.6.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.6-1
+- new version 4.12.6
+
 * Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
 - new version 4.12.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jan 2006 12:21:27 -0000	1.9
+++ sources	30 Jan 2006 20:05:13 -0000	1.10
@@ -1,2 +1,2 @@
-99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
 582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:04:53 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:04:53 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.9, 1.10 abcm2ps.spec, 1.9,
	1.10 sources, 1.9, 1.10
Message-ID: <200601302005.k0UK5hwI029490@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29452/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jan 2006 12:21:14 -0000	1.9
+++ .cvsignore	30 Jan 2006 20:04:53 -0000	1.10
@@ -1,2 +1,2 @@
-abcplus_en-1.0.4.zip
 abcm2ps-4.12.5.tar.gz
+abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abcm2ps.spec	29 Jan 2006 12:21:14 -0000	1.9
+++ abcm2ps.spec	30 Jan 2006 20:04:53 -0000	1.10
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.5
+Version:        4.12.6
 Release:        1%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://moinejf.free.fr
-Source0:        http://moinejf.free.fr/abcm2ps-4.12.5.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.6.tar.gz
 Source1:	http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -52,6 +52,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.6-1
+- new version 4.12.6
+
 * Sun Jan 29 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.5-1
 - new version 4.12.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jan 2006 12:21:14 -0000	1.9
+++ sources	30 Jan 2006 20:04:53 -0000	1.10
@@ -1,2 +1,2 @@
-99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip
 582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:11:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:11:03 -0500
Subject: rpms/abcm2ps/FC-3 .cvsignore, 1.10, 1.11 abcm2ps.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200601302012.k0UKCBeO029680@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600/FC-3

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Jan 2006 20:04:53 -0000	1.10
+++ .cvsignore	30 Jan 2006 20:11:02 -0000	1.11
@@ -1,2 +1,2 @@
-abcm2ps-4.12.5.tar.gz
+abcm2ps-4.12.6.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/abcm2ps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcm2ps.spec	30 Jan 2006 20:04:53 -0000	1.10
+++ abcm2ps.spec	30 Jan 2006 20:11:02 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           abcm2ps
 Version:        4.12.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-3/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jan 2006 20:04:53 -0000	1.10
+++ sources	30 Jan 2006 20:11:02 -0000	1.11
@@ -1,2 +1,2 @@
-582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:11:42 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:11:42 -0500
Subject: rpms/abcm2ps/devel .cvsignore, 1.10, 1.11 abcm2ps.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200601302012.k0UKCEDn029685@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600/devel

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Jan 2006 20:05:13 -0000	1.10
+++ .cvsignore	30 Jan 2006 20:11:41 -0000	1.11
@@ -1,2 +1,2 @@
-abcm2ps-4.12.5.tar.gz
+abcm2ps-4.12.6.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcm2ps.spec	30 Jan 2006 20:05:13 -0000	1.10
+++ abcm2ps.spec	30 Jan 2006 20:11:41 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           abcm2ps
 Version:        4.12.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jan 2006 20:05:13 -0000	1.10
+++ sources	30 Jan 2006 20:11:41 -0000	1.11
@@ -1,2 +1,2 @@
-582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:11:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 30 Jan 2006 15:11:21 -0500
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.10, 1.11 abcm2ps.spec, 1.10,
	1.11 sources, 1.10, 1.11
Message-ID: <200601302012.k0UKCQ75029690@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29600/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Jan 2006 20:02:54 -0000	1.10
+++ .cvsignore	30 Jan 2006 20:11:20 -0000	1.11
@@ -1,2 +1,2 @@
-abcm2ps-4.12.5.tar.gz
+abcm2ps-4.12.6.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- abcm2ps.spec	30 Jan 2006 20:02:54 -0000	1.10
+++ abcm2ps.spec	30 Jan 2006 20:11:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           abcm2ps
 Version:        4.12.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A program to typeset ABC tunes into Postscript
 
 Group:          Applications/Multimedia


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Jan 2006 20:02:54 -0000	1.10
+++ sources	30 Jan 2006 20:11:20 -0000	1.11
@@ -1,2 +1,2 @@
-582d55c3d743362bc1f8bfb1546929cd  abcm2ps-4.12.5.tar.gz
+aadcf61727a549b9b90ecf3bc25e3cde  abcm2ps-4.12.6.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 20:16:41 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 30 Jan 2006 15:16:41 -0500
Subject: rpms/fftw3/devel .cvsignore, 1.2, 1.3 fftw3.spec, 1.2, 1.3 sources, 
	1.2, 1.3
Message-ID: <200601302017.k0UKHDFw029888@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/fftw3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29861

Modified Files:
	.cvsignore fftw3.spec sources 
Log Message:
New release and specfile bugfix.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fftw3/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Apr 2005 18:30:22 -0000	1.2
+++ .cvsignore	30 Jan 2006 20:16:40 -0000	1.3
@@ -1 +1 @@
-fftw-3.0.1.tar.gz
+fftw-3.1.tar.gz


Index: fftw3.spec
===================================================================
RCS file: /cvs/extras/rpms/fftw3/devel/fftw3.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fftw3.spec	22 Apr 2005 15:56:01 -0000	1.2
+++ fftw3.spec	30 Jan 2006 20:16:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           fftw3
-Version:        3.0.1
-Release:        3
+Version:        3.1
+Release:        1
 Summary:        Fast Fourier Transform library
 %define real_name fftw
 
@@ -109,6 +109,7 @@
 %doc %{_mandir}/man?/*
 %doc %{_infodir}/*.info*
 %exclude %{_libdir}/*.la
+%exclude %{_infodir}/dir
 %{_bindir}/*
 %{_includedir}/*
 %{_libdir}/pkgconfig/*
@@ -116,6 +117,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Mon Jan 30 2006 Quentin Spencer <qspencer at users.sf.net> 3.1-1
+- New release.
+- Exclude /usr/share/info/dir from package (bug 179295).
+
 * Fri Apr 22 2005 Quentin Spencer <qspencer at users.sf.net> 3.0.1-3
 - Changed gcc-g77 to gcc-gfortran
 - replaced file removal at install with %exclude


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fftw3/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Apr 2005 18:30:22 -0000	1.2
+++ sources	30 Jan 2006 20:16:40 -0000	1.3
@@ -1 +1 @@
-76cd21ecc9a7bed6343566c473c36477  fftw-3.0.1.tar.gz
+911515569a8abdc7dbb207d53f34e60b  fftw-3.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 21:21:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Mon, 30 Jan 2006 16:21:07 -0500
Subject: rpms/cln/devel cln.spec,1.16,1.17
Message-ID: <200601302121.k0ULLdqm000673@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv656

Modified Files:
	cln.spec 
Log Message:
Fix build error due to unpackaged file


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/devel/cln.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cln.spec	16 Jan 2006 21:40:26 -0000	1.16
+++ cln.spec	30 Jan 2006 21:21:06 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -76,8 +76,12 @@
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
 %exclude %{_libdir}/*.la
+%exclude %{_infodir}/dir
 
 %changelog
+* Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-3
+- Exclude /usr/share/info/dir from package (bug 178660).
+
 * Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-2
 - Update source URL.
 



From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:21 -0500
Subject: rpms/lacewing - New directory
Message-ID: <200601302132.k0ULWN5p000745@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv737/lacewing

Log Message:
Directory /cvs/extras/rpms/lacewing added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:27 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:27 -0500
Subject: rpms/lacewing/devel - New directory
Message-ID: <200601302132.k0ULWTIZ000761@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv737/lacewing/devel

Log Message:
Directory /cvs/extras/rpms/lacewing/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:46 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:46 -0500
Subject: rpms/lacewing Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601302132.k0ULWm2a000796@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv784

Added Files:
	Makefile import.log 
Log Message:
Setup of module lacewing


--- NEW FILE Makefile ---
# Top level Makefile for module lacewing
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 30 21:32:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:32:52 -0500
Subject: rpms/lacewing/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601302132.k0ULWsWB000816@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv784/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module lacewing


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 30 21:34:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:34:05 -0500
Subject: rpms/lacewing import.log,1.1,1.2
Message-ID: <200601302134.k0ULYbLf000941@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv889

Modified Files:
	import.log 
Log Message:
auto-import lacewing-1.10-3 on branch devel from lacewing-1.10-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lacewing/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Jan 2006 21:32:46 -0000	1.1
+++ import.log	30 Jan 2006 21:34:05 -0000	1.2
@@ -0,0 +1 @@
+lacewing-1_10-3:HEAD:lacewing-1.10-3.src.rpm:1138657598



From fedora-extras-commits at redhat.com  Mon Jan 30 21:34:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 30 Jan 2006 16:34:11 -0500
Subject: rpms/lacewing/devel lacewing-fullscreen.patch, NONE,
	1.1 lacewing-nicecpu.patch, NONE, 1.1 lacewing.desktop, NONE,
	1.1 lacewing.patch, NONE, 1.1 lacewing.png, NONE,
	1.1 lacewing.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601302134.k0ULYhMH000945@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/lacewing/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv889/devel

Modified Files:
	.cvsignore sources 
Added Files:
	lacewing-fullscreen.patch lacewing-nicecpu.patch 
	lacewing.desktop lacewing.patch lacewing.png lacewing.spec 
Log Message:
auto-import lacewing-1.10-3 on branch devel from lacewing-1.10-3.src.rpm

lacewing-fullscreen.patch:

--- NEW FILE lacewing-fullscreen.patch ---
diff -ur lacewing.orig/config.h lacewing/config.h
--- lacewing.orig/config.h	2006-01-21 13:00:59.000000000 +0100
+++ lacewing/config.h	2006-01-21 11:19:54.000000000 +0100
@@ -792,6 +792,7 @@
  int run_vsync; // on or off
  int sound_volume; // sound fx volume; if 0 sound effects not played
  int ambience_volume; // if 0 ambience not played
+ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED
 };
 
 struct starstruct
diff -ur lacewing.orig/main.c lacewing/main.c
--- lacewing.orig/main.c	2006-01-21 13:00:59.000000000 +0100
+++ lacewing/main.c	2006-01-21 11:20:18.000000000 +0100
@@ -245,7 +245,7 @@
 
    set_color_depth(8);
 
-   if (set_gfx_mode(GFX_AUTODETECT, 640, 480, 0, 0) != 0)
+   if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0)
    {
       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
       allegro_message("Unable to set 640x480 mode\n%s\n", allegro_error);
diff -ur lacewing.orig/menu.c lacewing/menu.c
--- lacewing.orig/menu.c	2006-01-21 13:00:59.000000000 +0100
+++ lacewing/menu.c	2006-01-21 11:54:18.000000000 +0100
@@ -61,6 +61,7 @@
 #define KP_WAIT_SHORT 5
 
 extern struct optionstruct options;
+extern RGB palet [256];
 
 enum
 {
@@ -604,7 +605,7 @@
   char ostr [50];
   char istr [10];
 
-  for (i = 0; i < 32; i ++)
+  for (i = 0; i < 33; i ++)
   {
 
    col = COLOUR_GREEN6;
@@ -663,114 +664,121 @@
        strcat(ostr, itoa(options.ambience_volume, istr, 10));
      break;
     case 4:
+     strcpy(ostr, "Full Screen - ");
+     if (options.windowed == GFX_AUTODETECT_WINDOWED)
+      strcat(ostr, "Off");
+       else
+        strcat(ostr, "On");
+     break;
+    case 5:
      strcpy(ostr, "Video Sync - ");
      if (options.run_vsync == 0)
       strcat(ostr, "Off");
        else
         strcat(ostr, "On");
      break;
-    case 5:
+    case 6:
      strcpy(ostr, "Test Speakers");
      break;
-    case 6:
+    case 7:
      strcpy(ostr, "Test Keys");
      break;
-    case 7:
+    case 8:
      strcpy(ostr, "");
      break;
-    case 8:
+    case 9:
      col = COLOUR_GREY6;
      strcpy(ostr, "Player 1 Keys");
      break;
-    case 9:
+    case 10:
      strcpy(ostr, "Forwards - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_THRUST]));
      break;
-    case 10:
+    case 11:
      strcpy(ostr, "Left - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_LEFT]));
      break;
-    case 11:
+    case 12:
      strcpy(ostr, "Right - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_RIGHT]));
      break;
-    case 12:
+    case 13:
      strcpy(ostr, "Brake - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_BRAKE]));
      break;
-    case 13:
+    case 14:
      strcpy(ostr, "Fire Cannon - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_FIRE1]));
      break;
-    case 14:
+    case 15:
      strcpy(ostr, "Fire Secondary - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_FIRE2]));
      break;
-    case 15:
+    case 16:
      strcpy(ostr, "Upgrade - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_UPGRADE]));
      break;
-    case 16:
+    case 17:
      strcpy(ostr, "Slide Left - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_LEFT1]));
      break;
-    case 17:
+    case 18:
      strcpy(ostr, "Slide Right - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_RIGHT1]));
      break;
-    case 18:
+    case 19:
      strcpy(ostr, "Toggle Linked Fire - ");
      strcat(ostr, scancode_to_keyname(player[0].keys [CMD_LINK]));
      break;
-    case 19:
+    case 20:
      col = COLOUR_GREY6;
      strcpy(ostr, "Player 2 Keys");
      break;
-    case 20:
+    case 21:
      strcpy(ostr, "Forwards - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_THRUST]));
      break;
-    case 21:
+    case 22:
      strcpy(ostr, "Left - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LEFT]));
      break;
-    case 22:
+    case 23:
      strcpy(ostr, "Right - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_RIGHT]));
      break;
-    case 23:
+    case 24:
      strcpy(ostr, "Brake - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_BRAKE]));
      break;
-    case 24:
+    case 25:
      strcpy(ostr, "Fire Cannon - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_FIRE1]));
      break;
-    case 25:
+    case 26:
      strcpy(ostr, "Fire Secondary - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_FIRE2]));
      break;
-    case 26:
+    case 27:
      strcpy(ostr, "Upgrade - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_UPGRADE]));
      break;
-    case 27:
+    case 28:
      strcpy(ostr, "Slide Left - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LEFT1]));
      break;
-    case 28:
+    case 29:
      strcpy(ostr, "Slide Right - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_RIGHT1]));
      break;
-    case 29:
+    case 30:
      strcpy(ostr, "Toggle Linked Fire - ");
      strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LINK]));
      break;
-    case 30:
+    case 31:
      strcpy(ostr, "");
 //     strcat(ostr, scancode_to_keyname(player[1].keys [CMD_LINK])
      break;
-    case 31:
+    case 32:
      strcpy(ostr, "Exit");
      break;
 
@@ -798,10 +806,10 @@
  {
 //  case 5:
 //  case 6:
-  case 7:
   case 8:
-  case 19:
-  case 30:
+  case 9:
+  case 20:
+  case 31:
    return 1;
  }
 
@@ -1116,13 +1124,13 @@
    }
    break;
   case MENU_OPTIONS:
-   if (menu_index == 31)
+   if (menu_index == 32)
    {
     play_sound(WAV_MENU2);
     change_menu(MENU_MAIN);
     break;
    }
-   if (menu_index < 9)
+   if (menu_index < 10)
    {
     switch(menu_index)
     {
@@ -1148,18 +1156,33 @@
       play_sound(WAV_MENU1);
       return;
      case 4:
+      if (options.windowed == GFX_AUTODETECT_WINDOWED)
+       options.windowed = GFX_AUTODETECT_FULLSCREEN;
+        else
+         options.windowed = GFX_AUTODETECT_WINDOWED;
+      play_sound(WAV_MENU1);
+      if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0)
+      {
+       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
+       allegro_message("Error switching fullscreen / windowed mode\n%s\n",
+        allegro_error);
+       exit(1);
+      }
+      set_palette(palet);
+      return;
+     case 5:
       if (options.run_vsync == 1)
        options.run_vsync = 0;
         else
          options.run_vsync = 1;
       play_sound(WAV_MENU1);
       return;
-     case 5:
+     case 6:
       test_speakers();
       ticked = 0;
 // test speakers
       return;
-     case 6:
+     case 7:
       play_sound(WAV_MENU2);
       jam_keys();
       return;
@@ -1268,7 +1291,7 @@
   if (option_index() == -1)
    return;
 
-  if (menu_index < 20)
+  if (menu_index < 21)
    player[0].keys [option_index()] = inputted;
     else
      player[1].keys [option_index()] = inputted;
@@ -1282,35 +1305,35 @@
 {
   switch(menu_index)
   {
-   case 9:
-   case 20:
-    return CMD_THRUST;
    case 10:
    case 21:
-    return CMD_LEFT;
+    return CMD_THRUST;
    case 11:
    case 22:
-    return CMD_RIGHT;
+    return CMD_LEFT;
    case 12:
    case 23:
-    return CMD_BRAKE;
+    return CMD_RIGHT;
    case 13:
    case 24:
-    return CMD_FIRE1;
+    return CMD_BRAKE;
    case 14:
    case 25:
-    return CMD_FIRE2;
+    return CMD_FIRE1;
    case 15:
    case 26:
-    return CMD_UPGRADE;
+    return CMD_FIRE2;
    case 16:
    case 27:
-    return CMD_LEFT1;
+    return CMD_UPGRADE;
    case 17:
    case 28:
-    return CMD_RIGHT1;
+    return CMD_LEFT1;
    case 18:
    case 29:
+    return CMD_RIGHT1;
+   case 19:
+   case 30:
     return CMD_LINK;
   }
 
@@ -1391,7 +1414,7 @@
   case MENU_OPTIONS:
     which_menu = MENU_OPTIONS;
     menu_index = 1;
-    menu_index_max = 31;
+    menu_index_max = 32;
     menu_index_min = 1;
     break;
   case MENU_DUEL:
@@ -2827,6 +2850,7 @@
  options.run_vsync = get_config_int("Options", "Run_vsync", 0);
  options.sound_volume = get_config_int("Options", "Sound_volume", 100);
  options.ambience_volume = get_config_int("Options", "Ambience_volume", 100);
+ options.windowed = get_config_int("Options", "Windowed", GFX_AUTODETECT_FULLSCREEN);
 
  for (i = 0; i < NO_CMDS; i ++)
  {
@@ -2905,6 +2929,7 @@
  set_config_int("Options", "Run_vsync", options.run_vsync);
  set_config_int("Options", "Sound_volume", options.sound_volume);
  set_config_int("Options", "Ambience_volume", options.ambience_volume);
+ set_config_int("Options", "Windowed", options.windowed);
 
  for (i = 0; i < NO_CMDS; i ++)
  {

lacewing-nicecpu.patch:

--- NEW FILE lacewing-nicecpu.patch ---
diff -ur lacewing.orig/display.c lacewing/display.c
--- lacewing.orig/display.c	2006-01-21 13:31:40.000000000 +0100
+++ lacewing/display.c	2006-01-21 13:21:34.000000000 +0100
@@ -3140,7 +3140,7 @@
  do
  {
   while(ticked == 0)
-   rest(0);
+   rest(1);
     
   waiting--;
   ticked--;
diff -ur lacewing.orig/game.c lacewing/game.c
--- lacewing.orig/game.c	2006-01-21 13:31:40.000000000 +0100
+++ lacewing/game.c	2006-01-21 13:21:37.000000000 +0100
@@ -180,7 +180,7 @@
    frames_skipped++;
 
   while(ticked == 0)
-   rest(0);
+   rest(1);
 
   ticked --;
 
diff -ur lacewing.orig/menu.c lacewing/menu.c
--- lacewing.orig/menu.c	2006-01-21 13:32:08.000000000 +0100
+++ lacewing/menu.c	2006-01-21 13:29:55.000000000 +0100
@@ -361,7 +361,7 @@
   menu_input();
 
   while(ticked == 0)
-   rest(0);
+   rest(1);
   ticked --;
 
  } while(TRUE);
@@ -403,7 +403,8 @@
 
   text_mode(-1);
 
-  vsync();
+  if (options.run_vsync > 0)
+   vsync();
 
   RGB title_colour [1];
 
@@ -1375,7 +1376,9 @@
 
  game.type = game_type;
 
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
+ 
  clear_bitmap(screen);
 
  begin_game();
@@ -1599,7 +1602,7 @@
   }
 
   while (ticked == 0)
-   rest(0);
+   rest(1);
 
   ticked --;
 
@@ -3203,12 +3206,13 @@
 //   textprintf_centre(menu_bmp, small_font, 320, 305, COLOUR_YELLOW8, "your time, like ");
    if (county2 > 99)
     textprintf_centre(menu_bmp, small_font, 320, 380, COLOUR_YELLOW5, "Press Space to continue.");
-   vsync();
+   if (options.run_vsync > 0)
+    vsync();
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
   }
 
   while (ticked == 0)
-   rest(0);
+   rest(1);
   ticked --;
 
   county2 ++;


--- NEW FILE lacewing.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Lacewing
GenericName=Asteroid like game
Comment=A cross between Spacewar and Centipede
Exec=lacewing
Icon=lacewing.png
Terminal=false
Type=Application
Categories=Game;ArcadeGame
Version=1.10


lacewing.patch:

--- NEW FILE lacewing.patch ---
diff -urN lacewing.orig/Makefile lacewing/Makefile
--- lacewing.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ lacewing/Makefile	2006-01-20 13:14:27.000000000 +0100
@@ -0,0 +1,28 @@
+PREFIX  = /home/opt
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS  = -g -Wall -O2
+LDFLAGS = `allegro-config --libs`
+DEFINES = -DDATADIR=\"$(DATADIR)/\"
+OBJS    = actor.o bullet.o cloud.o cmds.o displ_in.o display.o eclass.o \
+          enemy.o game.o input.o levels.o main.o menu.o palette.o pickup.o \
+          score.o ships.o sound.o stars.o stuff.o upgrades.o
+TARGET  = lacewing
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(DATADIR)/gfx
+	mkdir -p $(DATADIR)/sound/ambi
+	install -p -m 755 $(TARGET) $(PREFIX)/bin
+	install -p -m 644 lacew.cfg $(DATADIR)
+	install -p -m 644 gfx/* $(DATADIR)/gfx
+	install -p -m 644 sound/*.wav $(DATADIR)/sound
+	install -p -m 644 sound/ambi/* $(DATADIR)/sound/ambi
+	
+clean:
+	rm -f $(OBJS) $(TARGET) *~
diff -urN lacewing.orig/config.h lacewing/config.h
--- lacewing.orig/config.h	2003-11-24 21:54:40.000000000 +0100
+++ lacewing/config.h	2006-01-20 14:34:10.000000000 +0100
@@ -37,6 +37,8 @@
 
 #define ATTACK_NONE -1
 
+#define MAX_FRAMESKIP 4
+
 struct armoury
 {
  char *name;
@@ -1067,3 +1069,13 @@
 
 
 
+/* compat defines */
+#include <stdio.h>
+
+#ifndef DATADIR
+#define DATADIR
+#endif
+
+#define PI M_PI
+#define itoa(integer, buf, bufsize) \
+ (snprintf(buf, bufsize, "%d", integer), buf)
diff -urN lacewing.orig/displ_in.c lacewing/displ_in.c
--- lacewing.orig/displ_in.c	2003-11-25 01:25:16.000000000 +0100
+++ lacewing/displ_in.c	2006-01-20 00:28:03.000000000 +0100
@@ -89,7 +89,7 @@
  RGB temp_palette [256];
  RGB temp_palette3 [1024];
 
- DATAFILE *datf = load_datafile("gfx\\data.dat");
+ DATAFILE *datf = load_datafile(DATADIR "gfx/data.dat");
  if (datf == NULL)
  {
   set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
@@ -107,7 +107,7 @@
  textprintf_centre(screen, font, 320, 200, COLOUR_GREEN8, "Loading}...");
  textprintf_centre(screen, font2, 320, 200, COLOUR_YELLOW8, "Loading}...");
 
- BITMAP *temp_bitmap = load_bitmap("gfx\\ship8_i.bmp", temp_palette);
+ BITMAP *temp_bitmap = load_bitmap(DATADIR "gfx/ship8_i.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap");
@@ -205,7 +205,7 @@
 
 // Load in enemy bitmaps:
 
- temp_bitmap = load_bitmap("gfx\\enemy1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy1.bmp not loaded correctly?)");
@@ -251,7 +251,7 @@
 
  destroy_bitmap(temp_bitmap);
 
- temp_bitmap = load_bitmap("gfx\\enemy3.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy3.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy3.bmp not loaded correctly?)");
@@ -273,7 +273,7 @@
  destroy_bitmap(temp_bitmap);
 // destroy_bitmap(temp_bitmap2);
 
- temp_bitmap = load_bitmap("gfx\\small1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small1.bmp not loaded correctly?)");
@@ -287,7 +287,7 @@
  destroy_bitmap(temp_bitmap);
 
 
- temp_bitmap = load_bitmap("gfx\\small2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small2.bmp not loaded correctly?)");
@@ -300,7 +300,7 @@
 
  destroy_bitmap(temp_bitmap);
 
- temp_bitmap = load_bitmap("gfx\\enemy2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy2.bmp not loaded correctly?)");
@@ -313,7 +313,7 @@
 
  destroy_bitmap(temp_bitmap);
  
- temp_bitmap = load_bitmap("gfx\\lships.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/lships.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (lships.bmp not loaded correctly?)");
diff -urN lacewing.orig/display.c lacewing/display.c
--- lacewing.orig/display.c	2003-11-25 01:27:20.000000000 +0100
+++ lacewing/display.c	2006-01-20 14:32:31.000000000 +0100
@@ -53,7 +53,6 @@
 BITMAP *player2;
 //extern volatile int frames_per_second;
 extern volatile int ticked;
-extern int slacktime;
 
 extern struct optionstruct options;
 
@@ -3093,12 +3092,10 @@
 // textprintf(bmp, small_font, 20, 110, 5, "Xs %i  Ys %i  TS %f  DS %f  Drag %i",
 //  actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed), hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed) * game.drag, actor[player[play].actor_controlled].drag_amount);
 // textprintf(bmp, small_font, 20, 60, 5, "Stack %i", stackavail());
-// textprintf(bmp, small_font, 20, 90, 5, "Slack %i", slacktime);
 // textprintf(bmp, small_font, 20, 100, 5, "Lock %i", actor[0].lock);
 //textprintf(bmp, smallfont, 20, 50, 5, "Fps} %i", frames_per_second);
 /* textprintf(bmp, font, 20, 50, 5, "Fps} %i", frames_per_second);
  textprintf(bmp, font2, 20, 50, 5, "Fps} %i", frames_per_second);
- textprintf(bmp, font, 20, 80, 5, "Slack} %i", slacktime);
  textprintf(bmp, font, 20, 110, 5, "Xs} %i  Ys} %i  Drag} %i",
   actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, actor[player[play].actor_controlled].drag_amount);
  textprintf(bmp, font, 20, 140, 5, "X} %i  Y} %i ",
@@ -3107,7 +3104,6 @@
   enemy[0].angle, enemy[0].attribute [ATTRIB_SWERVER_ANGLE], enemy[0].attacking, enemy[0].recycle);
  textprintf(bmp, font, 20, 200, 5, "Lock} %i ", actor[0].lock);*/
 /* textprintf(bmp, small_font, 20, 50, 5, "FPS %i", frames_per_second);
- textprintf(bmp, small_font, 20, 60, 5, "SLACK %i", slacktime);
  textprintf(bmp, small_font, 20, 70, 5, "XS %i  YS %i  DRAG %i",
   actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, actor[player[play].actor_controlled].drag_amount);
  textprintf(bmp, small_font, 20, 80, 5, "X %i  Y %i ",
@@ -3128,10 +3124,11 @@
 
 void level_announcement(void)
 {
+ int frames_skipped = 0;
+ int waiting = 30;
 
  clear_bitmap(screen);
 
- int waiting = 30;
 
  if (arena.level == 1)
   waiting = 60;
@@ -3142,11 +3139,20 @@
 
  do
  {
-  while(ticked > 0)
+  while(ticked == 0)
+   rest(0);
+    
+  waiting--;
+  ticked--;
+
+  /* skip drawing if we can't keep up */
+  if (ticked && (frames_skipped < MAX_FRAMESKIP))
   {
-   waiting --;
-   ticked --;
-  };
+   frames_skipped++;
+   continue;
+  }
+  frames_skipped = 0;
+
   if ((waiting / 5) % 2 == 0)
   {
    textprintf_centre(screen, font, 320, 240, COLOUR_GREEN4 + (waiting / 2) % 4, "Get}  Ready}");
diff -urN lacewing.orig/game.c lacewing/game.c
--- lacewing.orig/game.c	2003-10-06 00:35:54.000000000 +0200
+++ lacewing/game.c	2006-01-20 14:32:11.000000000 +0100
@@ -64,12 +64,12 @@
 
 extern volatile unsigned char ticked;
 extern volatile int framecounter;
-extern int slacktime;
 
 
 void game_loop(void)
 {
  int playing = 1;
+ int frames_skipped = 0;
  
  counter = 0;
 
@@ -168,19 +168,20 @@
 
      
    }
-   
-  if (ticked == 0)
+
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    run_display();
+   frames_skipped = 0;
 //   framecounter++;
   }
+  else
+   frames_skipped++;
+
+  while(ticked == 0)
+   rest(0);
 
-  slacktime = 0;
-  
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
   ticked --;
 
   counter ++;
diff -urN lacewing.orig/main.c lacewing/main.c
--- lacewing.orig/main.c	2003-11-22 13:33:22.000000000 +0100
+++ lacewing/main.c	2006-01-20 14:03:49.000000000 +0100
@@ -96,11 +96,10 @@
 
 #include "allegro.h"
 
-#include <conio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pc.h>
 #include <math.h>
+#include <stdio.h>
 
 #include "config.h"
 
@@ -150,17 +149,16 @@
 //volatile int framecounter;
 //volatile int frames_per_second;
 
-volatile int inputcounter = 0;
-volatile int inputs_per_second = 0;
+//volatile int inputcounter = 0;
+//volatile int inputs_per_second = 0;
 
-volatile int turncounter = 0;
-volatile int turns_per_second = 0;
+//volatile int turncounter = 0;
+//volatile int turns_per_second = 0;
 
 void tickover(void);
 
 volatile unsigned char ticked;
 //volatile unsigned char tick_counter;
-int slacktime;
 // --- end timer interupt
 
 
@@ -199,33 +197,13 @@
 
 int main(void)
 {
-
- cprintf("\n\rHello and welcome to Lacewing version 1.10!");
- cprintf("\n\rCopyright 2003 by Linley Henzell & Captain Pork.\n\r");
- cprintf("\n\rLacewing is free software published under the");
- cprintf("\n\rGeneral Public Licence. It can be modified and");
- cprintf("\n\rredistributed under certain conditions and comes");
- cprintf("\n\rwith no warranties of any kind.");
- cprintf("\n\rPlease read the LICENCE.TXT file for more information.\n\r");
- cprintf("\n\rPress Q to Quit, or any other key to continue...\n\r");
-
- char rkey;
-
- int randcount; // doesn't matter if it's not initialised - better, actually
-
- do
- {
-   randcount ++;
- }
-  while(kbhit() == 0);
-  
- rkey = getch();
- if (rkey == 'q' || rkey == 'Q')
-  return 0;
- if (rkey == 0)
-  getch();
-
- srandom(randcount);
+ printf("Hello and welcome to Lacewing version 1.10!");
+ printf("\nCopyright 2003 by Linley Henzell & Captain Pork.\n");
+ printf("\nLacewing is free software published under the");
+ printf("\nGeneral Public Licence. It can be modified and");
+ printf("\nredistributed under certain conditions and comes");
+ printf("\nwith no warranties of any kind.");
+ printf("\nPlease read the LICENCE.TXT file for more information.\n");
 
  init_at_startup();
 
@@ -242,9 +220,9 @@
 {
 
    allegro_init();
-
-   set_config_file("lacew.cfg");
    
+   init_config();
+
    install_keyboard();
    install_timer();
 
@@ -257,8 +235,8 @@
 //   LOCK_VARIABLE (tick_counter);
 //   LOCK_VARIABLE (frames_per_second);
 //   LOCK_VARIABLE (framecounter);
-   LOCK_VARIABLE (turns_per_second);
-   LOCK_VARIABLE (turncounter);
+//   LOCK_VARIABLE (turns_per_second);
+//   LOCK_VARIABLE (turncounter);
 //   LOCK_VARIABLE (inputs_per_second);
 //   LOCK_VARIABLE (inputcounter);
 
diff -urN lacewing.orig/menu.c lacewing/menu.c
--- lacewing.orig/menu.c	2003-11-25 01:53:04.000000000 +0100
+++ lacewing/menu.c	2006-01-20 14:33:30.000000000 +0100
@@ -138,7 +138,6 @@
 int option_index(void);
 void enter_keystroke(void);
 int option_jump(int direction);
-void init_config(void);
 void save_config(void);
 
 void choose_ships(void);
@@ -205,7 +204,6 @@
 void init_menus_once_only(void)
 {
  text_mode(-1);
- init_config();
 
  menu_bmp = create_bitmap(640, 480);
 
@@ -226,7 +224,7 @@
 
  RGB temp_palette [256];
 
- BITMAP *temp_bmp = load_bitmap("gfx\\title_i.bmp", temp_palette);
+ BITMAP *temp_bmp = load_bitmap(DATADIR "gfx/title_i.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -246,7 +244,7 @@
 
  destroy_bitmap(temp_bmp);
 
- temp_bmp = load_bitmap("gfx\\title_o.bmp", temp_palette);
+ temp_bmp = load_bitmap(DATADIR "gfx/title_o.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -266,7 +264,7 @@
 
  destroy_bitmap(temp_bmp);
 
- temp_bmp = load_bitmap("gfx\\title_s.bmp", temp_palette);
+ temp_bmp = load_bitmap(DATADIR "gfx/title_s.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -286,7 +284,7 @@
 
  destroy_bitmap(temp_bmp);
 
- upgrade_box1 = load_bitmap("gfx\\upg_box.bmp", temp_palette);
+ upgrade_box1 = load_bitmap(DATADIR "gfx/upg_box.bmp", temp_palette);
 
  if (!upgrade_box1)
  {
@@ -295,7 +293,7 @@
       exit(1);
  }
 
- upgrade_box2 = load_bitmap("gfx\\upg_box2.bmp", temp_palette);
+ upgrade_box2 = load_bitmap(DATADIR "gfx/upg_box2.bmp", temp_palette);
 
  if (!upgrade_box2)
  {
@@ -304,7 +302,7 @@
       exit(1);
  }
 
- upgrade_box3 = load_bitmap("gfx\\upg_box3.bmp", temp_palette);
+ upgrade_box3 = load_bitmap(DATADIR "gfx/upg_box3.bmp", temp_palette);
 
  if (!upgrade_box3)
  {
@@ -324,7 +322,8 @@
 
 void menu_loop(void)
 {
-
+ int frames_skipped = 0;
+ 
  which_menu = MENU_MAIN;
  menu_index_max = 4;
  menu_index_min = 0;
@@ -347,20 +346,21 @@
   if (which_menu == MENU_SCORES || which_menu == MENU_ENTER_SCORES)
    make_bouncies_move();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    menu_display();
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
   menu_input();
 
-  slacktime = 0;
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
+  while(ticked == 0)
+   rest(0);
   ticked --;
 
  } while(TRUE);
@@ -1431,8 +1431,6 @@
  game.single_player = 0;
  game.users = 1;
 
- int county = 0;
-
  int keypress_wait1 = KP_WAIT_SHORT;
  int keypress_wait2 = KP_WAIT_SHORT;
  int waiting = 5;
@@ -1577,10 +1575,8 @@
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
   }
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
+  while (ticked == 0)
+   rest(0);
 
   ticked --;
 
@@ -2451,7 +2447,7 @@
 
       set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
 //      clrscr();
-      allegro_message("\n\rBye bye!                           ");
+//      allegro_message("\n\rBye bye!                           ");
 //      free(palet);
       exit(0);
 
@@ -2762,17 +2758,69 @@
 
 }
 
+/* Function(s) to find the homedir of a user under Unix */
+#ifdef __unix__
+#include <pwd.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(__DECC) && defined(VMS)
+#include <unixlib.h>
+static char *vms_to_unix_buffer = NULL;
+static int convert_vms_to_unix(char *vms_dir_name)
+{
+	vms_to_unix_buffer = vms_dir_name;
+}
+#endif
+
+/* 
+ * Locate user's home directory.
+ */
+char *get_home_dir(void)
+{
+	struct passwd *pw;
+
+	if (!(pw = getpwuid(getuid())))
+	{ 
+		fprintf(stderr, "Who are you? Not found in passwd database!!\n");
+		return NULL;
+	}
+
+#if defined(__DECC) && defined(VMS)
+	/* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix
+	   Format. */
+	decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1);
+	return vms_to_unix_buffer;
+#else
+	return pw->pw_dir;
+#endif
+}
+#endif /* defined __unix__ */
+
 void init_config(void)
 {
-
-set_config_file("lacew.cfg");
-
-
  char miscstring [40];
  char wstring [40];
  char itstring [40];
  int i;
-
+#ifdef __unix__   
+ char config_file_name[512];
+ char *home_dir = get_home_dir();
+ int using_global_cfg = 1;
+   
+ snprintf(config_file_name, sizeof(config_file_name)/sizeof(char), "%s/.%s",
+  home_dir? home_dir:".", "lacew.cfg");
+      
+ /* does the cfg file exist? */
+ if (access(config_file_name, R_OK) == 0)
+ {
+  override_config_file(config_file_name);
+  using_global_cfg = 0;
+ }
+ else
+#endif   
+  override_config_file(DATADIR "lacew.cfg");
+  
+ srandom(get_config_int("Misc", "Seed", 0));
 
  options.sound_init = get_config_int("Options", "Sound_init", 1);
  options.sound_mode = get_config_int("Options", "Sound_mode", SOUNDMODE_STEREO);
@@ -2835,7 +2883,12 @@
   strcat(miscstring, itoa(i, itstring, 10));
   strcpy(hs_coop[i].name, get_config_string(wstring, miscstring, "CaptainP"));
  }
-
+#ifdef __unix__
+ /* make sure any changes get written to the per user file and not to
+    the global file */
+ if (using_global_cfg)
+  override_config_file(config_file_name);
+#endif
 }
 
 void save_config(void)
@@ -2845,6 +2898,8 @@
  char itstring [40];
  int i;
 
+ set_config_int("Misc", "Seed", random());
+
 // options.sound_init = get_config_int("Options", "Sound_init", 1);
  set_config_int("Options", "Sound_mode", options.sound_mode);
  set_config_int("Options", "Run_vsync", options.run_vsync);
@@ -3102,7 +3157,6 @@
 void display_victory_screen(void)
 {
 
- int county = 0;
  int county2 = 0;
 
  do
@@ -3128,11 +3182,8 @@
    blit(menu_bmp, screen, 0, 0, 0, 0, 640, 480);
   }
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
-
+  while (ticked == 0)
+   rest(0);
   ticked --;
 
   county2 ++;
diff -urN lacewing.orig/menu.h lacewing/menu.h
--- lacewing.orig/menu.h	2003-09-04 19:28:36.000000000 +0200
+++ lacewing/menu.h	2006-01-20 13:10:33.000000000 +0100
@@ -1,3 +1,5 @@
 void init_menus_once_only(void);
 
 void menu_loop(void);
+
+void init_config(void);
diff -urN lacewing.orig/ships.c lacewing/ships.c
--- lacewing.orig/ships.c	2003-09-04 20:51:46.000000000 +0200
+++ lacewing/ships.c	2006-01-18 22:10:54.000000000 +0100
@@ -55,7 +55,8 @@
 0, // system 3 status 2
 BRAKES_DRAG, // brake type
 5, // brake strength
-1000 // armour                   },
+1000 // armour
+},
 {
 "Arrow",
 6000, // radius
diff -urN lacewing.orig/sound.c lacewing/sound.c
--- lacewing.orig/sound.c	2003-10-06 22:22:16.000000000 +0200
+++ lacewing/sound.c	2006-01-20 00:33:01.000000000 +0100
@@ -41,7 +41,6 @@
 #include "config.h"
 #include "globvars.h"
 
-#include "conio.h"
 #include "math.h"
 //DATAFILE *soundf;
 
@@ -114,7 +113,7 @@
 
    
    sound_active = 1;
-
+   
    if (options.sound_init == 0)
    {
 //    cprintf("\n\r\n\rSound disabled in proj.cfg.");
@@ -128,12 +127,8 @@
    reserve_voices(10, 0);
    if (install_sound (DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) == -1)
    {
-//    allegro_message("\n\r\n\rSound autodetect failed.");
+    printf("Warning: %s, sound disabled\n", allegro_error);
     sound_active = 0;
-    rest(300);
-    do
-    {
-    } while (keypressed() == 0);
    }
    set_volume(255, 0);
 
@@ -263,7 +258,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".\\sound\\");
+ strcpy(sfile_name, DATADIR "sound/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
@@ -678,7 +673,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".\\sound\\ambi\\");
+ strcpy(sfile_name, DATADIR "sound/ambi/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
diff -urN lacewing.orig/stars.c lacewing/stars.c
--- lacewing.orig/stars.c	2003-08-06 01:32:04.000000000 +0200
+++ lacewing/stars.c	2006-01-18 22:13:12.000000000 +0100
@@ -56,7 +56,7 @@
  int j = 0;
  int k = 1;
 
- if (game[0].users == 2)
+ if (game.users == 2)
   k = 2;
 
  for (j = 0; j < k; j ++)


--- NEW FILE lacewing.spec ---
Name:           lacewing
Version:        1.10
Release:        3%{?dist}
Summary:        Asteroid like game with many different ships
Group:          Amusements/Games
License:        GPL
URL:            http://users.olis.net.au/zel/
Source0:        http://users.olis.net.au/zel/lwsrc.zip
Source1:        http://users.olis.net.au/zel/lwdata.zip
Source2:        lacewing.desktop
Source3:        lacewing.png
Patch0:         lacewing.patch
Patch1:         lacewing-fullscreen.patch
Patch2:         lacewing-nicecpu.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel desktop-file-utils

%description
Asteroid like game where you can choose a type of ship and depending on the
type of ship can pickup a number of upgrades during the game.

Lacewing is an arcade-style shoot-em-up which plays a little bit like a cross
between Spacewar and Centipede. It has a decidedly retro style to it. It has
a single-player mode, and also co-operative and duel modes for two players
(split-screen).


%prep
%setup -q -c
unzip -qqo %{SOURCE1}
%patch0 -p1 -z .unix
%patch1 -p1 -z .fullscreen
%patch2 -p1 -z .nicecpu
%{__sed} -i 's/\r//' readme.txt licence.txt
chmod 644 readme.txt licence.txt


%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix}


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE2}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE3} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc readme.txt licence.txt
%{_bindir}/lacewing
%{_datadir}/lacewing
%{_datadir}/applications/fedora-lacewing.desktop
%{_datadir}/icons/hicolor/48x48/apps/lacewing.png

%changelog
* Mon Jan 30 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-3
- Summary and Description text fixes (bz 178568)

* Sun Jan 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-2
- Some minor spec file cleanups (bz 178568):
  - use %%{_prefix} instead of /usr
  - use advised scriplets from the Wiki (use %%{_bindir}, || : )
  - run sed on doc files to convert DOS line-ends to UNIX ones
  - don't mark the default default settings file %%config as suggested
    in comment 5

* Sat Jan 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.10-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2006 21:32:51 -0000	1.1
+++ .cvsignore	30 Jan 2006 21:34:11 -0000	1.2
@@ -0,0 +1,2 @@
+lwdata.zip
+lwsrc.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lacewing/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2006 21:32:51 -0000	1.1
+++ sources	30 Jan 2006 21:34:11 -0000	1.2
@@ -0,0 +1,2 @@
+70040f8882414057a6243d8fb568a72f  lwdata.zip
+2de183840c0ec3603cc324c0b64fd856  lwsrc.zip



From fedora-extras-commits at redhat.com  Mon Jan 30 21:37:02 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Mon, 30 Jan 2006 16:37:02 -0500
Subject: rpms/gramps/devel gramps.spec,1.14,1.15
Message-ID: <200601302137.k0ULbYmt000999@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gramps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv982

Modified Files:
	gramps.spec 
Log Message:
* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-4
- Add require for shared-mime-info.
- Remove mime.cache.
- Use python-abi.



Index: gramps.spec
===================================================================
RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gramps.spec	14 Dec 2005 22:08:45 -0000	1.14
+++ gramps.spec	30 Jan 2006 21:37:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gramps
 Version:        2.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -19,7 +19,7 @@
 BuildRequires:  gnome-vfs2-devel
 BuildRequires:  pygtk2
 BuildRequires:  pygtk2-libglade
-BuildRequires:  python-devel >= 2.3
+BuildRequires:  python-devel
 BuildRequires:  scrollkeeper
 BuildRequires:	GConf2
 
@@ -31,12 +31,14 @@
 Requires:       ImageMagick
 Requires:       pygtk2
 Requires:       pygtk2-libglade
-Requires:       python >= 2.3
+Requires:   	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
 Requires:       rcs
 Requires:	python-reportlab >= 1.20
 Requires:	graphviz
+Requires(post): shared-mime-info
 Requires(post):   scrollkeeper
 Requires(post):   GConf2
+Requires(postun): shared-mime-info
 Requires(postun): scrollkeeper
 Requires(postun): GConf2
 
@@ -62,7 +64,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -rf ${RPM_BUILD_ROOT}%{_localstatedir}/scrollkeeper
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome/
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/application
+rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{application,mime.cache}
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mime/{globs,magic,XMLnamespaces,aliases,subclasses}
 mkdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 cp -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/%{name}.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
@@ -83,17 +85,16 @@
 GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`	\
 	gconftool-2 --makefile-install-rule 		\
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
-update-desktop-database %{_datadir}/applications &> /dev/null
-update-mime-database %{_datadir}/mime &> /dev/null
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
-/usr/bin/pkill gconfd || /bin/true
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
 
 
 %postun
-if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
+scrollkeeper-update -q || :
 if [ "$1" = "0" ]; then
-  update-desktop-database %{_datadir}/applications &> /dev/null
-  update-mime-database %{_datadir}/mime &> /dev/null
+  update-desktop-database &> /dev/null ||:
+  update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
 
 
@@ -114,6 +115,11 @@
 
 
 %changelog
+* Sat Jan 28 2006 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-4
+- Add require for shared-mime-info.
+- Remove mime.cache.
+- Use python-abi.
+
 * Wed Dec 14 2005 Brian Pepple <bdpepple at ameritech.net> - 2.0.9-3
 - Add requires for gnome-python2-gnomeprint.
 



From fedora-extras-commits at redhat.com  Mon Jan 30 21:48:31 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 16:48:31 -0500
Subject: rpms/openal/FC-4 openal-arch.patch,NONE,1.1 openal.spec,1.11,1.12
Message-ID: <200601302149.k0ULn3ch001185@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1165

Modified Files:
	openal.spec 
Added Files:
	openal-arch.patch 
Log Message:
- add arch patch from Jochen Schmitt


openal-arch.patch:

--- NEW FILE openal-arch.patch ---
--- openal-0.0.8/src/Makefile.in.org	2006-01-30 17:52:29.000000000 +0100
+++ openal-0.0.8/src/Makefile.in	2006-01-30 17:53:40.000000000 +0100
@@ -327,7 +327,7 @@
 
 
 # Add compiler flags.
-libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
+libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS) $(ARCH_INCLUDES)
 
 # The -no-undefined flag is neccessary for building DLLs on Windows.
 libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openal.spec	20 Jan 2006 08:23:19 -0000	1.11
+++ openal.spec	30 Jan 2006 21:48:30 -0000	1.12
@@ -8,6 +8,7 @@
 URL:            http://www.openal.org/
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
+Patch0:         openal-arch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -43,6 +44,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 21:55:01 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 30 Jan 2006 16:55:01 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.20,1.21
Message-ID: <200601302155.k0ULtYVx001343@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1323

Modified Files:
	denyhosts.spec 
Log Message:
* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-3
- Delete stray .pyo and .pyc files that appear for no reason.



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- denyhosts.spec	14 Jan 2006 17:49:50 -0000	1.20
+++ denyhosts.spec	30 Jan 2006 21:55:01 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	2%{?dist}
+release:	3%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -73,6 +73,10 @@
   touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
 done
 
+find $RPM_BUILD_ROOT -name \*.pyo -exec rm {} \;
+[-f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc ] && \
+  rm $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,6 +123,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-3
+- Delete stray .pyo and .pyc files that appear for no reason.
+
 * Fri Jan 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-2
 - Clean up %post script; just call condrestart and don't bother with
   the call to --upgrade099.



From fedora-extras-commits at redhat.com  Mon Jan 30 22:15:57 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 30 Jan 2006 17:15:57 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.21,1.22
Message-ID: <200601302216.k0UMGTdT003444@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3427

Modified Files:
	denyhosts.spec 
Log Message:
* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
- Simplify "[ -f ... ] && rm" to "rm -f".



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- denyhosts.spec	30 Jan 2006 21:55:01 -0000	1.21
+++ denyhosts.spec	30 Jan 2006 22:15:56 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	3%{?dist}
+release:	4%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -74,8 +74,7 @@
 done
 
 find $RPM_BUILD_ROOT -name \*.pyo -exec rm {} \;
-[-f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc ] && \
-  rm $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
+rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
 
 
 %clean
@@ -123,6 +122,9 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
+- Simplify "[ -f ... ] && rm" to "rm -f".
+
 * Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-3
 - Delete stray .pyo and .pyc files that appear for no reason.
 



From fedora-extras-commits at redhat.com  Mon Jan 30 22:33:44 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 30 Jan 2006 17:33:44 -0500
Subject: rpms/firestarter/devel firestarter.spec,1.16,1.17
Message-ID: <200601302234.k0UMYGIk003518@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3500

Modified Files:
	firestarter.spec 
Log Message:
fixed post scriptlet



Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- firestarter.spec	29 Jan 2006 05:29:35 -0000	1.16
+++ firestarter.spec	30 Jan 2006 22:33:44 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
@@ -122,7 +122,7 @@
 if [ "$1" = "0" ]; then
     if [ -e /etc/dhclient-exit-hooks ]; then
         NEW_CONF=`mktemp -t firestarter.XXXXXX`
-        grep -v 'sh %{_sysconfdir}/firestarter/firewall.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF}
+        grep -v 'sh %{_sysconfdir}/firestarter/firestarter.sh start' < /etc/dhclient-exit-hooks > ${NEW_CONF}
         cat ${NEW_CONF} > /etc/dhclient-exit-hooks
     fi
 fi
@@ -159,6 +159,9 @@
 
 
 %changelog
+* Mon Jan 30 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-8
+- fixed %post script for dhcp exit script (bug #160431)
+
 * Tue Jan 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-7
 - add CUPS and APCUPSD to services
 - don't open browser window since it runs as root (bug #178040)



From fedora-extras-commits at redhat.com  Mon Jan 30 22:47:20 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 17:47:20 -0500
Subject: rpms/openal/FC-4 openal-pkgconfig.patch, NONE, 1.1 openal.spec, 1.12,
	1.13
Message-ID: <200601302247.k0UMlq7B003737@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3699

Modified Files:
	openal.spec 
Added Files:
	openal-pkgconfig.patch 
Log Message:
- pkgconfig patch


openal-pkgconfig.patch:

--- NEW FILE openal-pkgconfig.patch ---
--- admin/pkgconfig/Makefile.am.orig	2006-01-30 23:41:34.000000000 +0100
+++ admin/pkgconfig/Makefile.am	2006-01-30 23:41:44.000000000 +0100
@@ -1,3 +1,3 @@
-pkgconfigdir   = $(prefix)/lib/pkgconfig
+pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS    = openal-config
--- admin/pkgconfig/Makefile.in.orig	2006-01-30 23:45:01.000000000 +0100
+++ admin/pkgconfig/Makefile.in	2006-01-30 23:45:42.000000000 +0100
@@ -192,7 +192,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS = openal-config
 all: all-am


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-4/openal.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openal.spec	30 Jan 2006 21:48:30 -0000	1.12
+++ openal.spec	30 Jan 2006 22:47:20 -0000	1.13
@@ -9,6 +9,7 @@
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
 Patch0:         openal-arch.patch
+Patch1:         openal-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -45,6 +46,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 23:05:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 18:05:25 -0500
Subject: rpms/openal/FC-3 openal-arch.patch, NONE, 1.1 openal-pkgconfig.patch,
	NONE, 1.1 openal.spec, 1.7, 1.8
Message-ID: <200601302306.k0UN63t4005983@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5911/FC-3

Modified Files:
	openal.spec 
Added Files:
	openal-arch.patch openal-pkgconfig.patch 
Log Message:
- build patches from fc4


openal-arch.patch:

--- NEW FILE openal-arch.patch ---
--- openal-0.0.8/src/Makefile.in.org	2006-01-30 17:52:29.000000000 +0100
+++ openal-0.0.8/src/Makefile.in	2006-01-30 17:53:40.000000000 +0100
@@ -327,7 +327,7 @@
 
 
 # Add compiler flags.
-libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
+libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS) $(ARCH_INCLUDES)
 
 # The -no-undefined flag is neccessary for building DLLs on Windows.
 libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)

openal-pkgconfig.patch:

--- NEW FILE openal-pkgconfig.patch ---
--- admin/pkgconfig/Makefile.am.orig	2006-01-30 23:41:34.000000000 +0100
+++ admin/pkgconfig/Makefile.am	2006-01-30 23:41:44.000000000 +0100
@@ -1,3 +1,3 @@
-pkgconfigdir   = $(prefix)/lib/pkgconfig
+pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS    = openal-config
--- admin/pkgconfig/Makefile.in.orig	2006-01-30 23:45:01.000000000 +0100
+++ admin/pkgconfig/Makefile.in	2006-01-30 23:45:42.000000000 +0100
@@ -192,7 +192,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS = openal-config
 all: all-am


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/FC-3/openal.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openal.spec	19 Jan 2006 08:43:25 -0000	1.7
+++ openal.spec	30 Jan 2006 23:05:24 -0000	1.8
@@ -8,6 +8,8 @@
 URL:            http://www.openal.org/
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
+Patch0:         openal-arch.patch
+Patch1:         openal-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -43,6 +45,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 23:05:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon, 30 Jan 2006 18:05:32 -0500
Subject: rpms/openal/devel openal-arch.patch, NONE,
	1.1 openal-pkgconfig.patch, NONE, 1.1 openal.spec, 1.11, 1.12
Message-ID: <200601302306.k0UN64r6005986@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/openal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5911/devel

Modified Files:
	openal.spec 
Added Files:
	openal-arch.patch openal-pkgconfig.patch 
Log Message:
- build patches from fc4


openal-arch.patch:

--- NEW FILE openal-arch.patch ---
--- openal-0.0.8/src/Makefile.in.org	2006-01-30 17:52:29.000000000 +0100
+++ openal-0.0.8/src/Makefile.in	2006-01-30 17:53:40.000000000 +0100
@@ -327,7 +327,7 @@
 
 
 # Add compiler flags.
-libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS)
+libopenal_la_CFLAGS = $(WARNINGCFLAGS) $(OPTIMIZATIONCFLAGS) $(FEATURECFLAGS) $(ARCH_INCLUDES)
 
 # The -no-undefined flag is neccessary for building DLLs on Windows.
 libopenal_la_LDFLAGS = -no-undefined $(PROFILINGLDFLAGS)

openal-pkgconfig.patch:

--- NEW FILE openal-pkgconfig.patch ---
--- admin/pkgconfig/Makefile.am.orig	2006-01-30 23:41:34.000000000 +0100
+++ admin/pkgconfig/Makefile.am	2006-01-30 23:41:44.000000000 +0100
@@ -1,3 +1,3 @@
-pkgconfigdir   = $(prefix)/lib/pkgconfig
+pkgconfigdir   = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS    = openal-config
--- admin/pkgconfig/Makefile.in.orig	2006-01-30 23:45:01.000000000 +0100
+++ admin/pkgconfig/Makefile.in	2006-01-30 23:45:42.000000000 +0100
@@ -192,7 +192,7 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = openal.pc
 bin_SCRIPTS = openal-config
 all: all-am


Index: openal.spec
===================================================================
RCS file: /cvs/extras/rpms/openal/devel/openal.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openal.spec	19 Jan 2006 08:43:37 -0000	1.11
+++ openal.spec	30 Jan 2006 23:05:31 -0000	1.12
@@ -8,6 +8,8 @@
 URL:            http://www.openal.org/
 Source0:        http://www.openal.org/openal_webstf/downloads/openal-0.0.8.tar.gz
 Source1:        openalrc
+Patch0:         openal-arch.patch
+Patch1:         openal-pkgconfig.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -43,6 +45,8 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1
 
 %build
 %configure --enable-arts                   \



From fedora-extras-commits at redhat.com  Mon Jan 30 23:22:30 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 30 Jan 2006 18:22:30 -0500
Subject: rpms/denyhosts/devel denyhosts.spec,1.22,1.23
Message-ID: <200601302323.k0UNN2EL006893@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6874

Modified Files:
	denyhosts.spec 
Log Message:
* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-5
- Redo installation to match current Python packaging guidelines.



Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- denyhosts.spec	30 Jan 2006 22:15:56 -0000	1.22
+++ denyhosts.spec	30 Jan 2006 23:22:30 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.1.4
-release:	4%{?dist}
+release:	5%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -22,6 +22,9 @@
 BuildRequires:  python-devel
 Requires:       openssh-server
 
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
+
 %description
 DenyHosts is a Python script that analyzes the sshd server log
 messages to determine which hosts are attempting to hack into your
@@ -41,15 +44,14 @@
 
 
 %build
-python ./setup.py build
+%{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python ./setup.py install --root=$RPM_BUILD_ROOT --record=%{name}.files
+%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{_bindir}
-
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
@@ -73,7 +75,6 @@
   touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i
 done
 
-find $RPM_BUILD_ROOT -name \*.pyo -exec rm {} \;
 rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc
 
 
@@ -97,10 +98,17 @@
 exit 0
 
 
-%files -f %{name}.files
+%files
 %defattr(-,root,root,-)
 %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt
 %doc README.fedora README.txt setup.py
+
+%{_bindir}/denyhosts.py
+%{_bindir}/denyhosts-control
+%{python_sitelib}/DenyHosts/*.py
+%{python_sitelib}/DenyHosts/*.pyc
+%ghost %{python_sitelib}/DenyHosts/*.pyo
+
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
 %config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts
@@ -119,9 +127,13 @@
 %dir %{_localstatedir}/lib/denyhosts
 
 %{_initrddir}/denyhosts
-%{_bindir}/denyhosts-control
+
+
 
 %changelog
+* Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-5
+- Redo installation to match current Python packaging guidelines.
+
 * Mon Jan 30 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.1.4-4
 - Simplify "[ -f ... ] && rm" to "rm -f".
 



From fedora-extras-commits at redhat.com  Mon Jan 30 23:46:58 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:46:58 -0500
Subject: rpms/ipython/FC-3 .cvsignore, 1.6, 1.7 ipython.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200601302347.k0UNlUxd007210@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7154/FC-3

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to upstream 0.7.1.fix1 fixing KeyboardInterrupt problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	24 Jan 2006 15:31:42 -0000	1.6
+++ .cvsignore	30 Jan 2006 23:46:58 -0000	1.7
@@ -1 +1 @@
-ipython-0.7.1.tar.gz
+ipython-0.7.1.fix1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/ipython.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ipython.spec	24 Jan 2006 15:31:42 -0000	1.6
+++ ipython.spec	30 Jan 2006 23:46:58 -0000	1.7
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           ipython
-Version:        0.7.1
+Version:        0.7.1.fix1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 0.7.1.fix1-1
+- New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
+
 * Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
 - Update to new upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jan 2006 15:31:42 -0000	1.7
+++ sources	30 Jan 2006 23:46:58 -0000	1.8
@@ -1 +1 @@
-ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz
+ac762aa9480822fff49e08475456fb12  ipython-0.7.1.fix1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:47:04 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:47:04 -0500
Subject: rpms/ipython/FC-4 .cvsignore, 1.7, 1.8 ipython.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200601302347.k0UNlaaH007216@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7154/FC-4

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to upstream 0.7.1.fix1 fixing KeyboardInterrupt problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jan 2006 15:31:48 -0000	1.7
+++ .cvsignore	30 Jan 2006 23:47:03 -0000	1.8
@@ -1 +1 @@
-ipython-0.7.1.tar.gz
+ipython-0.7.1.fix1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/ipython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ipython.spec	24 Jan 2006 15:31:48 -0000	1.8
+++ ipython.spec	30 Jan 2006 23:47:03 -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:           ipython
-Version:        0.7.1
+Version:        0.7.1.fix1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 0.7.1.fix1-1
+- New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
+
 * Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
 - Update to new upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jan 2006 15:31:48 -0000	1.7
+++ sources	30 Jan 2006 23:47:03 -0000	1.8
@@ -1 +1 @@
-ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz
+ac762aa9480822fff49e08475456fb12  ipython-0.7.1.fix1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:47:09 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:47:09 -0500
Subject: rpms/ipython/devel .cvsignore, 1.7, 1.8 ipython.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200601302347.k0UNlfnH007224@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/ipython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7154/devel

Modified Files:
	.cvsignore ipython.spec sources 
Log Message:
Update to upstream 0.7.1.fix1 fixing KeyboardInterrupt problems



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Jan 2006 15:31:54 -0000	1.7
+++ .cvsignore	30 Jan 2006 23:47:09 -0000	1.8
@@ -1 +1 @@
-ipython-0.7.1.tar.gz
+ipython-0.7.1.fix1.tar.gz


Index: ipython.spec
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/ipython.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ipython.spec	24 Jan 2006 15:31:54 -0000	1.8
+++ ipython.spec	30 Jan 2006 23:47:09 -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:           ipython
-Version:        0.7.1
+Version:        0.7.1.fix1
 Release:        1%{?dist}
 Summary:        An enhanced interactive Python shell
 
@@ -83,6 +83,9 @@
 %ghost %{python_sitelib}/IPython/Extensions/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 0.7.1.fix1-1
+- New upstream 0.7.1.fix1 which fixes KeyboardInterrupt handling
+
 * Tue Jan 24 2006 Shahms E. King <shahms at shahms.com> 0.7.1-1
 - Update to new upstream 0.7.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ipython/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	24 Jan 2006 15:31:54 -0000	1.7
+++ sources	30 Jan 2006 23:47:09 -0000	1.8
@@ -1 +1 @@
-ee810623a4027bfadaf8c41d4f2ec927  ipython-0.7.1.tar.gz
+ac762aa9480822fff49e08475456fb12  ipython-0.7.1.fix1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:54:32 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:54:32 -0500
Subject: rpms/python-tpg/FC-3 .cvsignore, 1.2, 1.3 python-tpg.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200601302355.k0UNt5QC007462@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7399/FC-3

Modified Files:
	.cvsignore python-tpg.spec sources 
Log Message:
updated to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
+++ .cvsignore	30 Jan 2006 23:54:32 -0000	1.3
@@ -1 +1 @@
-TPG-3.0.5.tar.gz
+TPG-3.0.6.tar.gz


Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-3/python-tpg.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-tpg.spec	12 May 2005 14:58:34 -0000	1.3
+++ python-tpg.spec	30 Jan 2006 23:54:32 -0000	1.4
@@ -3,14 +3,14 @@
 %define srcname TPG
 
 Name:           python-tpg
-Version:        3.0.5
-Release:        4%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://christophe.delord.free.fr/en/tpg/
-Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.5.tar.gz
+Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 3.0.6-1
+- update to upstream 3.0.6
+
 * Thu May 12 2005 Shahms E. King <shahms at shahms.com> 3.0.5-4
 - rebuilt, add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:44:50 -0000	1.2
+++ sources	30 Jan 2006 23:54:32 -0000	1.3
@@ -1 +1 @@
-4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz
+b5a7cb77a5ad7a5861fcecb74d6e9646  TPG-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:54:38 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:54:38 -0500
Subject: rpms/python-tpg/FC-4 .cvsignore, 1.2, 1.3 python-tpg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601302355.k0UNtAgt007472@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7399/FC-4

Modified Files:
	.cvsignore python-tpg.spec sources 
Log Message:
updated to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
+++ .cvsignore	30 Jan 2006 23:54:38 -0000	1.3
@@ -1 +1 @@
-TPG-3.0.5.tar.gz
+TPG-3.0.6.tar.gz


Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-4/python-tpg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tpg.spec	12 May 2005 14:56:24 -0000	1.4
+++ python-tpg.spec	30 Jan 2006 23:54:38 -0000	1.5
@@ -3,14 +3,14 @@
 %define srcname TPG
 
 Name:           python-tpg
-Version:        3.0.5
-Release:        4%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://christophe.delord.free.fr/en/tpg/
-Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.5.tar.gz
+Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 3.0.6-1
+- update to upstream 3.0.6
+
 * Thu May 12 2005 Shahms E. King <shahms at shahms.com> 3.0.5-4
 - rebuilt, add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:44:50 -0000	1.2
+++ sources	30 Jan 2006 23:54:38 -0000	1.3
@@ -1 +1 @@
-4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz
+b5a7cb77a5ad7a5861fcecb74d6e9646  TPG-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:54:44 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:54:44 -0500
Subject: rpms/python-tpg/devel .cvsignore, 1.2, 1.3 python-tpg.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200601302355.k0UNtG9i007477@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-tpg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7399/devel

Modified Files:
	.cvsignore python-tpg.spec sources 
Log Message:
updated to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:44:50 -0000	1.2
+++ .cvsignore	30 Jan 2006 23:54:44 -0000	1.3
@@ -1 +1 @@
-TPG-3.0.5.tar.gz
+TPG-3.0.6.tar.gz


Index: python-tpg.spec
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/python-tpg.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-tpg.spec	12 May 2005 14:56:24 -0000	1.4
+++ python-tpg.spec	30 Jan 2006 23:54:44 -0000	1.5
@@ -3,14 +3,14 @@
 %define srcname TPG
 
 Name:           python-tpg
-Version:        3.0.5
-Release:        4%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 
 Summary:        A Python "toy parser generator"
 Group:          Development/Libraries
 License:        LGPL
 URL:            http://christophe.delord.free.fr/en/tpg/
-Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.5.tar.gz
+Source0:        http://christophe.delord.free.fr/soft/tpg/TPG-3.0.6.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -61,6 +61,9 @@
 %ghost %{python_sitelib}/tpg.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 3.0.6-1
+- update to upstream 3.0.6
+
 * Thu May 12 2005 Shahms E. King <shahms at shahms.com> 3.0.5-4
 - rebuilt, add dist tag
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-tpg/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2005 20:44:50 -0000	1.2
+++ sources	30 Jan 2006 23:54:44 -0000	1.3
@@ -1 +1 @@
-4608d9a4795b02a9df685d1916090432  TPG-3.0.5.tar.gz
+b5a7cb77a5ad7a5861fcecb74d6e9646  TPG-3.0.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:56:53 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:56:53 -0500
Subject: rpms/smb4k - New directory
Message-ID: <200601302356.k0UNutxU007657@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643/smb4k

Log Message:
Directory /cvs/extras/rpms/smb4k added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 23:56:58 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:56:58 -0500
Subject: rpms/smb4k/devel - New directory
Message-ID: <200601302357.k0UNv15d007672@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643/smb4k/devel

Log Message:
Directory /cvs/extras/rpms/smb4k/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Jan 30 23:57:18 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:57:18 -0500
Subject: rpms/smb4k Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601302357.k0UNvK9q007706@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7694

Added Files:
	Makefile import.log 
Log Message:
Setup of module smb4k


--- NEW FILE Makefile ---
# Top level Makefile for module smb4k
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Jan 30 23:57:24 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:57:24 -0500
Subject: rpms/smb4k/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200601302357.k0UNvQ3w007728@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7694/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module smb4k


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Mon Jan 30 23:58:11 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:58:11 -0500
Subject: rpms/smb4k import.log,1.1,1.2
Message-ID: <200601302358.k0UNwh9e007804@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7767

Modified Files:
	import.log 
Log Message:
auto-import smb4k-0.6.5-4 on branch devel from smb4k-0.6.5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/smb4k/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Jan 2006 23:57:17 -0000	1.1
+++ import.log	30 Jan 2006 23:58:11 -0000	1.2
@@ -0,0 +1 @@
+smb4k-0_6_5-4:HEAD:smb4k-0.6.5-4.src.rpm:1138665507



From fedora-extras-commits at redhat.com  Mon Jan 30 23:58:16 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 18:58:16 -0500
Subject: rpms/smb4k/devel smb4k-0.6.5-desktop.patch, NONE, 1.1 smb4k.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601302358.k0UNwnUw007808@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7767/devel

Modified Files:
	.cvsignore sources 
Added Files:
	smb4k-0.6.5-desktop.patch smb4k.spec 
Log Message:
auto-import smb4k-0.6.5-4 on branch devel from smb4k-0.6.5-4.src.rpm

smb4k-0.6.5-desktop.patch:

--- NEW FILE smb4k-0.6.5-desktop.patch ---
diff -ur smb4k-0.6.5-orig/smb4k/smb4k.desktop smb4k-0.6.5/smb4k/smb4k.desktop
--- smb4k-0.6.5-orig/smb4k/smb4k.desktop	2005-06-16 12:19:55.000000000 +0200
+++ smb4k-0.6.5/smb4k/smb4k.desktop	2006-01-11 21:17:05.000000000 +0100
@@ -77,5 +77,5 @@
 Icon=smb4k
 DocPath=smb4k/index.html
 Type=Application
-Terminal=0
-Categories=Qt;KDE;Utility
\ Brak znaku nowej linii na ko??cu pliku
+Terminal=false
+Categories=Qt;KDE;Utility;


--- NEW FILE smb4k.spec ---
Name:		smb4k
Version:	0.6.5
Release:	4%{?dist}
Summary:	The SMB/CIFS Share Browser for KDE

Group:		Applications/Internet
License:	GPL
URL:		http://smb4k.berlios.de/
Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
Patch0:		smb4k-0.6.5-desktop.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	kdelibs-devel kdebase-devel gettext
Requires:	samba-client

%description
Smb4K is an SMB/CIFS share browser for KDE. It uses the Samba software suite to
access the SMB/CIFS shares of the local network neighborhood. Its purpose is to
provide a program that's easy to use and has as many features as possible.

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

%description devel
This package contains the libraries, include files and other resources
needed to develop applications using %{name}.

%prep
%setup -q
%patch0 -p1

%build
unset QTDIR || : ; . %{_sysconfdir}/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
	--disable-rpath \
	--disable-debug \
	--disable-dependency-tracking \
	--enable-final
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora --delete-original \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	--add-category X-Fedora \
	--add-category Application \
	--add-category Network \
	--add-category FileManager \
	$RPM_BUILD_ROOT%{_datadir}/applications/kde/smb4k.desktop

# Make symlink relative
pushd $RPM_BUILD_ROOT%{_datadir}/doc/HTML/en/smb4k/
ln -s -f ../common
popd

# Ugly workaround for broken libtool archive
sed -i -e "s:-L%{_builddir}/%{name}-%{version}/smb4k/core ::" \
	$RPM_BUILD_ROOT%{_libdir}/kde3/konqsidebar_smb4k.la
sed -i -e "s:-L%{_builddir}/%{name}-%{version}/smb4k/widgets ::" \
	$RPM_BUILD_ROOT%{_libdir}/kde3/konqsidebar_smb4k.la

%find_lang %{name}

rm -f $RPM_BUILD_ROOT%{_libdir}/libsmb4k*.la

%post
/sbin/ldconfig

touch --no-create %{_datadir}/icons/crystalsvg || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
fi

%postun
/sbin/ldconfig

touch --no-create %{_datadir}/icons/crystalsvg || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
fi
	
%clean
rm -rf $RPM_BUILD_ROOT

%files -f %name.lang
%defattr(-, root, root)
%doc AUTHORS BUGS ChangeLog COPYING FAQ README TODO
%{_bindir}/*
%{_libdir}/kde3/konqsidebar_smb4k.la
%{_libdir}/kde3/konqsidebar_smb4k.so
%{_libdir}/libsmb4k*.so.*
%{_datadir}/applications/*smb4k.desktop
%{_datadir}/apps/konqsidebartng/
%{_datadir}/apps/smb4k/
%{_datadir}/doc/HTML/en/smb4k/
%{_datadir}/icons/crystalsvg/*

%files devel
%defattr(-, root, root)
%{_includedir}/smb4k*.h
%{_libdir}/*.so

%changelog
* Wed Jan 18 2006 Marcin Garski <mgarski at post.pl> 0.6.5-4
- Remove libxml2 from BR
- Add workaround for broken libtool archive (made by Dawid Gajownik)

* Sun Jan 15 2006 Marcin Garski <mgarski at post.pl> 0.6.5-3
- Get rid of desktop-file-utils
- Add --disable-dependency-tracking & --enable-final

* Thu Jan 12 2006 Marcin Garski <mgarski at post.pl> 0.6.5-2
- Add kdebase-devel to BuildRequires

* Wed Jan 11 2006 Marcin Garski <mgarski at post.pl> 0.6.5-1
- Updated to version 0.6.5 && spec cleanup for FE

* Sun Sep 05 2004 Marcin Garski <mgarski at post.pl> 0.4.1a-1.fc2
- Updated to version 0.4.1a

* Thu Aug 31 2004 Marcin Garski <mgarski at post.pl> 0.4.1-1.fc2
- Updated to version 0.4.1

* Wed Jun 02 2004 Marcin Garski <mgarski at post.pl> 0.4.0-3.fc2
- Rebuild for Fedora Core 2

* Thu May 06 2004 Marcin Garski <mgarski at post.pl> 0.4.0-2
- Convert pl.po to UTF-8

* Thu May 06 2004 Marcin Garski <mgarski at post.pl> 0.4.0-1
- Update to 0.4.0

* Wed Jan 21 2004 Marcin Garski <mgarski at post.pl> 0.3.2-1
- Rebuild for Fedora Core 1

* Thu Dec 18 2003 Marcin Garski <mgarski at post.pl> 0.3.1-3
- Cleanup specfile

* Fri Nov 27 2003 Marcin Garski <mgarski at post.pl> 0.3.1-2
- Initial specfile based on specfile by Ian Geiser <geiseri at msoe.edu>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2006 23:57:24 -0000	1.1
+++ .cvsignore	30 Jan 2006 23:58:16 -0000	1.2
@@ -0,0 +1 @@
+smb4k-0.6.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2006 23:57:24 -0000	1.1
+++ sources	30 Jan 2006 23:58:16 -0000	1.2
@@ -0,0 +1 @@
+6483086faa286db4ffe4de97643b4cf2  smb4k-0.6.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:59:13 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:59:13 -0500
Subject: rpms/python-simpletal/FC-3 .cvsignore, 1.3,
	1.4 python-simpletal.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200601302359.k0UNxjO7007923@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7853/FC-3

Modified Files:
	.cvsignore python-simpletal.spec sources 
Log Message:
Update to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 19:54:57 -0000	1.3
+++ .cvsignore	30 Jan 2006 23:59:13 -0000	1.4
@@ -1 +1 @@
-SimpleTAL-3.13.tar.gz
+SimpleTAL-4.1.tar.gz


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-3/python-simpletal.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-simpletal.spec	6 Oct 2005 19:54:57 -0000	1.4
+++ python-simpletal.spec	30 Jan 2006 23:59:13 -0000	1.5
@@ -3,7 +3,7 @@
 %define srcname SimpleTAL
 
 Name:           python-simpletal
-Version:        3.13
+Version:        4.1
 Release:        1%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 4.1-1
+- Update to new upstream version 4.1
+
 * Thu Oct 06 2005 Shahms E. King <shahms at shahms.com> 3.13-1
 - use srcname and version in Source URL
 - update to new upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 19:54:57 -0000	1.3
+++ sources	30 Jan 2006 23:59:13 -0000	1.4
@@ -1 +1 @@
-2099be1bb59b5d608aa95cf7c8d077a1  SimpleTAL-3.13.tar.gz
+16c5673382967310b336c68591ae6786  SimpleTAL-4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:59:19 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:59:19 -0500
Subject: rpms/python-simpletal/FC-4 .cvsignore, 1.3,
	1.4 python-simpletal.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601302359.k0UNxpbW007928@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7853/FC-4

Modified Files:
	.cvsignore python-simpletal.spec sources 
Log Message:
Update to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 19:54:58 -0000	1.3
+++ .cvsignore	30 Jan 2006 23:59:18 -0000	1.4
@@ -1 +1 @@
-SimpleTAL-3.13.tar.gz
+SimpleTAL-4.1.tar.gz


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-4/python-simpletal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-simpletal.spec	6 Oct 2005 19:54:58 -0000	1.5
+++ python-simpletal.spec	30 Jan 2006 23:59:18 -0000	1.6
@@ -3,7 +3,7 @@
 %define srcname SimpleTAL
 
 Name:           python-simpletal
-Version:        3.13
+Version:        4.1
 Release:        1%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 4.1-1
+- Update to new upstream version 4.1
+
 * Thu Oct 06 2005 Shahms E. King <shahms at shahms.com> 3.13-1
 - use srcname and version in Source URL
 - update to new upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 19:54:58 -0000	1.3
+++ sources	30 Jan 2006 23:59:18 -0000	1.4
@@ -1 +1 @@
-2099be1bb59b5d608aa95cf7c8d077a1  SimpleTAL-3.13.tar.gz
+16c5673382967310b336c68591ae6786  SimpleTAL-4.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Jan 30 23:59:25 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Mon, 30 Jan 2006 18:59:25 -0500
Subject: rpms/python-simpletal/devel .cvsignore, 1.3,
	1.4 python-simpletal.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200601302359.k0UNxwuO007933@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-simpletal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7853/devel

Modified Files:
	.cvsignore python-simpletal.spec sources 
Log Message:
Update to new upstream version 3.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 19:54:58 -0000	1.3
+++ .cvsignore	30 Jan 2006 23:59:25 -0000	1.4
@@ -1 +1 @@
-SimpleTAL-3.13.tar.gz
+SimpleTAL-4.1.tar.gz


Index: python-simpletal.spec
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/python-simpletal.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-simpletal.spec	6 Oct 2005 19:54:58 -0000	1.5
+++ python-simpletal.spec	30 Jan 2006 23:59:25 -0000	1.6
@@ -3,7 +3,7 @@
 %define srcname SimpleTAL
 
 Name:           python-simpletal
-Version:        3.13
+Version:        4.1
 Release:        1%{?dist}
 
 Summary:        An XML based template processor for TAL, TALES and METAL specifications.
@@ -47,6 +47,9 @@
 %ghost %{python_sitelib}/simpletal/*.pyo
 
 %changelog
+* Mon Jan 30 2006 Shahms E. King <shahms at shahms.com> 4.1-1
+- Update to new upstream version 4.1
+
 * Thu Oct 06 2005 Shahms E. King <shahms at shahms.com> 3.13-1
 - use srcname and version in Source URL
 - update to new upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-simpletal/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 19:54:58 -0000	1.3
+++ sources	30 Jan 2006 23:59:25 -0000	1.4
@@ -1 +1 @@
-2099be1bb59b5d608aa95cf7c8d077a1  SimpleTAL-3.13.tar.gz
+16c5673382967310b336c68591ae6786  SimpleTAL-4.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 00:02:00 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 30 Jan 2006 19:02:00 -0500
Subject: owners owners.list,1.580,1.581
Message-ID: <200601310002.k0V02XQ8009808@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9775

Modified Files:
	owners.list 
Log Message:
- Add smb4k



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- owners.list	30 Jan 2006 00:34:58 -0000	1.580
+++ owners.list	31 Jan 2006 00:02:00 -0000	1.581
@@ -1165,6 +1165,7 @@
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|snort|An intrusion detection system|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 08:16:17 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 31 Jan 2006 03:16:17 -0500
Subject: fedora-security/audit fc4,1.137,1.138 fc5,1.47,1.48
Message-ID: <200601310816.k0V8GHBU026272@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26242

Modified Files:
	fc4 fc5 
Log Message:
Updates from the last week



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- fc4	24 Jan 2006 09:30:55 -0000	1.137
+++ fc4	31 Jan 2006 08:16:08 -0000	1.138
@@ -1,10 +1,13 @@
-Up to date CVE as of CVE email 20060122
+Up to date CVE as of CVE email 20060130
 Up to date FC4 as of 20060122
 
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
+CVE-2006-0301 VULNERABLE (xpdf) bz#179047
+CVE-2006-0301 VULNERABLE (poppler) bz#179054
+CVE-2006-0301 VULNERABLE (kdegraphics) bz#179056
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
@@ -1308,6 +1311,8 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1573 version (kernel, not 2.6)
+CVE-2002-1572 version (kernel, not 2.6)
 CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- fc5	24 Jan 2006 09:30:55 -0000	1.47
+++ fc5	31 Jan 2006 08:16:08 -0000	1.48
@@ -1,4 +1,4 @@
-Up to date CVE as of CVE email 20060122
+Up to date CVE as of CVE email 20060130
 Up to date FC5 as of FC5-Test2-RC
 
 1. Removed packages with security issues that are no longer in FC5 
@@ -17,6 +17,9 @@
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
 CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724
+CVE-2006-0301 VULNERABLE (xpdf)
+CVE-2006-0301 VULNERABLE (poppler)
+CVE-2006-0301 VULNERABLE (kdegraphics)
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 VULNERABLE (openssh)
@@ -1361,6 +1364,8 @@
 CVE-2002-1783 version (php, fixed after 4.2.3)
 CVE-2002-1765 version (evolution, fixed 1.0.5)
 CVE-2002-1593 version (httpd, fixed 2.0.42)
+CVE-2002-1573 version (kernel, not 2.6)
+CVE-2002-1572 version (kernel, not 2.6)
 CVE-2002-1571 version (kernel, not 2.6)
 CVE-2002-1510 version (XFree86, fixed 4.2.0)
 CVE-2002-1472 version (XFree86, fixed 4.2.1)



From fedora-extras-commits at redhat.com  Tue Jan 31 08:26:05 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 03:26:05 -0500
Subject: owners owners.list,1.581,1.582
Message-ID: <200601310826.k0V8QbH9026311@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26294

Modified Files:
	owners.list 
Log Message:
add lacewing


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.581
retrieving revision 1.582
diff -u -r1.581 -r1.582
--- owners.list	31 Jan 2006 00:02:00 -0000	1.581
+++ owners.list	31 Jan 2006 08:26:04 -0000	1.582
@@ -479,6 +479,7 @@
 Fedora Extras|l2tpd|Layer 2 Tunnelling Protocol Daemon (RFC 2661)|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|lablgl|LablGL is an OpenGL interface for Objective Caml|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|lablgtk|An Objective Caml interface to gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|lacewing|Asteroid like game with many different ships|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ladspa|LADSPA SDK, example plug-ins and tools|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|lagan|Local, global, and multiple alignment of DNA sequences|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 08:33:07 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Tue, 31 Jan 2006 03:33:07 -0500
Subject: fedora-security/audit fc4,1.138,1.139 fc5,1.48,1.49
Message-ID: <200601310833.k0V8X7Cr026354@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26334

Modified Files:
	fc4 fc5 
Log Message:
Catch up with FC5 bugzilla issues and mark those that are fixed in
rawhide (and hence will be in FC5test3)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- fc4	31 Jan 2006 08:16:08 -0000	1.138
+++ fc4	31 Jan 2006 08:32:59 -0000	1.139
@@ -11,7 +11,7 @@
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 backport (openssh) [since FEDORA-2006-056]
-CVE-2006-0208 VULNERALBE (php) bz#178036
+CVE-2006-0208 VULNERABLE (php) bz#178036
 CVE-2006-0207 VULNERABLE (php) bz#178044
 CVE-2006-0200 version (php, 5.1.0 5.1.1 only)
 CVE-2006-0197 ** xorg-x11


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- fc5	31 Jan 2006 08:16:08 -0000	1.48
+++ fc5	31 Jan 2006 08:32:59 -0000	1.49
@@ -16,10 +16,10 @@
 ** are items that need attention
 
 CVE-2006-0369 ignore (mysql) this is not a security issue
-CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724
-CVE-2006-0301 VULNERABLE (xpdf)
-CVE-2006-0301 VULNERABLE (poppler)
-CVE-2006-0301 VULNERABLE (kdegraphics)
+CVE-2006-0321 VULNERABLE (fetchmail, fixed 6.3.2) bz#178724:rawhide
+CVE-2006-0301 VULNERABLE (xpdf) bz#179423
+CVE-2006-0301 VULNERABLE (poppler) bz#179424
+CVE-2006-0301 VULNERABLE (kdegraphics) bz#179425
 CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178179
 CVE-2006-0236 ignore (thunderbird) windows only flaw
 CVE-2006-0225 VULNERABLE (openssh)
@@ -79,30 +79,30 @@
 CVE-2005-3651 version (ethereal, fixed 0.10.14)
 CVE-2005-3632 version (netpbm)
 CVE-2005-3631 version (udev)
-CVE-2005-3628 VULNERABLE (xpdf) bz#177911
+CVE-2005-3628 VULNERABLE (xpdf) bz#177911:rawhide
 CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch
-CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3628 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3628 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3628 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3627 VULNERABLE (xpdf) bz#177911
-CVE-2005-3627 VULNERABLE (tetex) bz#177912
-CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3627 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3627 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3627 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3627 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3627 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3626 VULNERABLE (xpdf) bz#177911
-CVE-2005-3626 VULNERABLE (tetex) bz#177912
-CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3626 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3626 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3626 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3626 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3626 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3625 VULNERABLE (xpdf) bz#177911
-CVE-2005-3625 VULNERABLE (tetex) bz#177912
-CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3625 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3625 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3625 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3625 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3625 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3624 VULNERABLE (xpdf) bz#177911
-CVE-2005-3624 VULNERABLE (tetex) bz#177912
-CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3624 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3624 VULNERABLE (xpdf) bz#177911:rawhide
+CVE-2005-3624 VULNERABLE (tetex) bz#177912:rawhide
+CVE-2005-3624 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3624 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch
 CVE-2005-3623 version (kernel, fixed 2.6.14.5)
 CVE-2005-3582 version (ImageMagick) gentoo only
@@ -140,21 +140,21 @@
 CVE-2005-3243 version (ethereal, fixed 0.10.13)
 CVE-2005-3242 version (ethereal, fixed 0.10.13)
 CVE-2005-3241 version (ethereal, fixed 0.10.13)
-CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3193 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide
 CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3193 VULNERABLE (kdegraphics) bz#177908
-CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3193 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3193 VULNERABLE (kdegraphics) bz#177908:rawhide
+CVE-2005-3192 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide
 CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3192 VULNERABLE (kdegraphics) bz#177908
-CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911
+CVE-2005-3192 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3192 VULNERABLE (kdegraphics) bz#177908:rawhide
+CVE-2005-3191 VULNERABLE (xpdf, fixed 3.0.1pl1) bz#177911:rawhide
 CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch
 CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch
-CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4) bz#177910
-CVE-2005-3191 VULNERABLE (kdegraphics) bz#177908
+CVE-2005-3191 VULNERABLE (poppler, fixed 0.4.4) bz#177910:rawhide
+CVE-2005-3191 VULNERABLE (kdegraphics) bz#177908:rawhide
 CVE-2005-3186 version (gtk2, fixed 2.8.7 at least)
 CVE-2005-3186 backport (gdk-pixbuf)
 CVE-2005-3185 version (wget, fixed 1.10.2 at least)
@@ -847,7 +847,7 @@
 CVE-2004-0956 version (mysql, fixed 4.0.20)
 CVE-2004-0946 version (nfs-utils, fixed 1.0.6-r6)
 CVE-2004-0942 version (httpd, fixed 2.0.53)
-CVE-2004-0941 VULNERABLE (gd) bz#177907
+CVE-2004-0941 VULNERABLE (gd) bz#177907:rawhide
 CVE-2004-0940 version (httpd, not 2.0)
 CVE-2004-0938 version (freeradius, fixed 1.0.1)
 CVE-2004-0930 version (samba, fixed 3.0.8)



From fedora-extras-commits at redhat.com  Tue Jan 31 09:28:26 2006
From: fedora-extras-commits at redhat.com (Aaron Kurtz (dragoon))
Date: Tue, 31 Jan 2006 04:28:26 -0500
Subject: rpms/feh/devel feh.spec,1.6,1.7
Message-ID: <200601310928.k0V9Swrn028793@cvs-int.fedora.redhat.com>

Author: dragoon

Update of /cvs/extras/rpms/feh/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28774

Modified Files:
	feh.spec 
Log Message:
* Tue Jan 31 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 1.3.4-2
- change to new modular X devel BuildReqs



Index: feh.spec
===================================================================
RCS file: /cvs/extras/rpms/feh/devel/feh.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- feh.spec	1 Sep 2005 02:33:30 -0000	1.6
+++ feh.spec	31 Jan 2006 09:28:25 -0000	1.7
@@ -3,7 +3,7 @@
 
 Name:         	feh 
 Version:        1.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Fast command line image viewer using Imlib2
 
 Group:          Applications/Multimedia
@@ -13,6 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: giblib-devel imlib2-devel libjpeg-devel libpng-devel
+BuildRequires: libXt-devel
 
 %description
 feh is a versatile and fast image viewer using imlib2, the
@@ -47,6 +48,9 @@
 %{_mandir}/man[^3]/*
 
 %changelog
+* Tue Jan 31 2006 Aaron Kurtz <a.kurtz at hardsun.net> - 1.3.4-2
+- change to new modular X devel BuildReqs
+
 * Wed Aug 31 2005 Aaron Kurtz <a.kurtz at hardsun.net> - 1.3.4-1
 - bump to 1.3.4
 



From fedora-extras-commits at redhat.com  Tue Jan 31 10:05:56 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:05:56 -0500
Subject: rpms/perl-Text-Unidecode - New directory
Message-ID: <200601311005.k0VA5wXb030794@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/perl-Text-Unidecode

Log Message:
Directory /cvs/extras/rpms/perl-Text-Unidecode added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 10:06:18 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:06:18 -0500
Subject: rpms/perl-Text-Unidecode/devel - New directory
Message-ID: <200601311006.k0VA6LeC030809@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30786/perl-Text-Unidecode/devel

Log Message:
Directory /cvs/extras/rpms/perl-Text-Unidecode/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 10:07:09 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:07:09 -0500
Subject: rpms/perl-Text-Unidecode Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311007.k0VA7Brf030843@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30831

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Text-Unidecode


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Text-Unidecode
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 10:07:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:07:27 -0500
Subject: rpms/perl-Text-Unidecode/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601311007.k0VA7To5030861@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30831/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Text-Unidecode


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 10:09:03 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:09:03 -0500
Subject: rpms/perl-Text-Unidecode import.log,1.1,1.2
Message-ID: <200601311009.k0VA9ZDZ030940@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30897

Modified Files:
	import.log 
Log Message:
auto-import perl-Text-Unidecode-0.04-1 on branch devel from perl-Text-Unidecode-0.04-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Unidecode/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 10:07:08 -0000	1.1
+++ import.log	31 Jan 2006 10:09:02 -0000	1.2
@@ -0,0 +1 @@
+perl-Text-Unidecode-0_04-1:HEAD:perl-Text-Unidecode-0.04-1.src.rpm:1138702063



From fedora-extras-commits at redhat.com  Tue Jan 31 10:09:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 31 Jan 2006 05:09:27 -0500
Subject: rpms/perl-Text-Unidecode/devel perl-Text-Unidecode.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601311009.k0VA9xFW030955@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/perl-Text-Unidecode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30897/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Text-Unidecode.spec 
Log Message:
auto-import perl-Text-Unidecode-0.04-1 on branch devel from perl-Text-Unidecode-0.04-1.src.rpm


--- NEW FILE perl-Text-Unidecode.spec ---
Name:           perl-Text-Unidecode
Version:        0.04
Release:        1%{?dist}
Summary:        US-ASCII transliterations of Unicode text

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Text-Unidecode/
Source0:        http://www.cpan.org/modules/by-module/Text/Text-Unidecode-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description

Text::Unidecode provides a function, `unidecode(...)' that
takes Unicode data and tries to represent it in US-ASCII
characters (i.e., the universally displayable characters between
0x00 and 0x7F). The representation is almost always an attempt at
*transliteration* -- i.e., conveying, in Roman letters, the
pronunciation expressed by the text in some other writing
system. 


%prep
%setup -q -n Text-Unidecode-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README TODO.txt ChangeLog
%{perl_vendorlib}/Text/
%{_mandir}/man3/*.3*


%changelog
* Sun Jan 29 2006 Patrice Dumas <pertusus at free.fr> - 0.04-1
- fedora extras submission


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Unidecode/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 10:07:27 -0000	1.1
+++ .cvsignore	31 Jan 2006 10:09:26 -0000	1.2
@@ -0,0 +1 @@
+Text-Unidecode-0.04.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Unidecode/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 10:07:27 -0000	1.1
+++ sources	31 Jan 2006 10:09:26 -0000	1.2
@@ -0,0 +1 @@
+06f6bddb396ab386aa66a2bc8a04df76  Text-Unidecode-0.04.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 10:31:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Jan 2006 05:31:42 -0500
Subject: rpms/gtkwave/devel gtkwave.spec, 1.4, 1.5 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200601311032.k0VAWEDL031183@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31162

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Update to 1.3.83



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkwave.spec	19 Jan 2006 11:27:23 -0000	1.4
+++ gtkwave.spec	31 Jan 2006 10:31:30 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.82
+Version:		1.3.83
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Jan 31 2006 Paul Howarth <paul at city-fan.org> 1.3.83-1
+- update to 1.3.83
+
 * Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
 - update to 1.3.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 11:27:23 -0000	1.5
+++ sources	31 Jan 2006 10:31:31 -0000	1.6
@@ -1 +1 @@
-0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz
+46655d05fc68437883157313979dac5f  gtkwave-1.3.83.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 11:27:23 -0000	1.5
+++ .cvsignore	31 Jan 2006 10:31:31 -0000	1.6
@@ -1 +1 @@
-gtkwave-1.3.82.tgz
+gtkwave-1.3.83.tgz



From fedora-extras-commits at redhat.com  Tue Jan 31 10:34:37 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Jan 2006 05:34:37 -0500
Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.4, 1.5 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200601311035.k0VAZ9XB031260@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31239

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkwave.spec	19 Jan 2006 11:30:03 -0000	1.4
+++ gtkwave.spec	31 Jan 2006 10:34:37 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.82
+Version:		1.3.83
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Jan 31 2006 Paul Howarth <paul at city-fan.org> 1.3.83-1
+- update to 1.3.83
+
 * Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
 - update to 1.3.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 11:30:03 -0000	1.5
+++ sources	31 Jan 2006 10:34:37 -0000	1.6
@@ -1 +1 @@
-0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz
+46655d05fc68437883157313979dac5f  gtkwave-1.3.83.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 11:30:03 -0000	1.5
+++ .cvsignore	31 Jan 2006 10:34:37 -0000	1.6
@@ -1 +1 @@
-gtkwave-1.3.82.tgz
+gtkwave-1.3.83.tgz



From fedora-extras-commits at redhat.com  Tue Jan 31 10:37:12 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 31 Jan 2006 05:37:12 -0500
Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.4, 1.5 sources, 1.5,
	1.6 .cvsignore, 1.5, 1.6
Message-ID: <200601311037.k0VAbjR1031343@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/gtkwave/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31322

Modified Files:
	gtkwave.spec sources .cvsignore 
Log Message:
Resync with devel



Index: gtkwave.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gtkwave.spec	19 Jan 2006 11:32:28 -0000	1.4
+++ gtkwave.spec	31 Jan 2006 10:37:12 -0000	1.5
@@ -1,6 +1,6 @@
 Summary:		Waveform Viewer
 Name:			gtkwave
-Version:		1.3.82
+Version:		1.3.83
 Release:		1%{?dist}
 License:		GPL & MIT
 Group:			Applications/Engineering
@@ -80,6 +80,9 @@
 %{_mandir}/man1/vztminer.1*
 
 %changelog
+* Tue Jan 31 2006 Paul Howarth <paul at city-fan.org> 1.3.83-1
+- update to 1.3.83
+
 * Thu Jan 19 2006 Paul Howarth <paul at city-fan.org> 1.3.82-1
 - update to 1.3.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Jan 2006 11:32:28 -0000	1.5
+++ sources	31 Jan 2006 10:37:12 -0000	1.6
@@ -1 +1 @@
-0d71f6ce4963f1ce4e101e8c79348c84  gtkwave-1.3.82.tgz
+46655d05fc68437883157313979dac5f  gtkwave-1.3.83.tgz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Jan 2006 11:32:28 -0000	1.5
+++ .cvsignore	31 Jan 2006 10:37:12 -0000	1.6
@@ -1 +1 @@
-gtkwave-1.3.82.tgz
+gtkwave-1.3.83.tgz



From fedora-extras-commits at redhat.com  Tue Jan 31 13:22:31 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 08:22:31 -0500
Subject: rpms/lyx/devel .cvsignore, 1.5, 1.6 lyx.spec, 1.17, 1.18 sources,
	1.6, 1.7
Message-ID: <200601311323.k0VDN3FW004727@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4706

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
- 1.4.0pre4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Jan 2006 18:06:33 -0000	1.5
+++ .cvsignore	31 Jan 2006 13:22:30 -0000	1.6
@@ -1 +1 @@
-lyx-1.4.0pre3.tar.bz2
+lyx-1.4.0pre4.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- lyx.spec	26 Jan 2006 18:01:08 -0000	1.17
+++ lyx.spec	31 Jan 2006 13:22:30 -0000	1.18
@@ -1,15 +1,15 @@
 
-%define beta pre3
+%define beta pre4
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.0
-Release: 0.1.%{beta}%{?dist}
+Release: 0.4.%{beta}%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 Url: 	 http://www.lyx.org/
-Source:  ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-1.4.0pre3.tar.bz2
+Source:  ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
@@ -32,10 +32,6 @@
 BuildRequires: qt-devel
 # xforms frontend
 BuildRequires: xforms-devel
-BuildRequires: libjpeg-devel
-%if "%{?fedora}" > "4"
-BuildRequires: libXpm-devel
-%endif
 
 BuildRequires: desktop-file-utils
 BuildRequires: python
@@ -118,8 +114,6 @@
   --with-aspell \
   --without-warnings --disable-debug --disable-dependency-tracking
 
-#--with-included-boost
-
 # Intermediate cleanup
 # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking
 make -C src/frontends clean
@@ -145,10 +139,6 @@
 mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \
    $RPM_BUILD_ROOT${texmf}/tex/latex/lyx
 
-# KDE already has a nice builtin crystalsvg icon, 
-# but this is for gnome's benefit (gtk2 < 2.6)
-#install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png
-
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
@@ -157,8 +147,6 @@
 
 %find_lang %{name} || touch %{name}.lang
 
-#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr
-
 
 %post
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
@@ -191,8 +179,6 @@
 %{_bindir}/lyx
 %{_bindir}/lyxclient
 %{_bindir}/tex2lyx
-#{_datadir}/applications/*-lyx.desktop
-#{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 %{_datadir}/lyx/
 %{_datadir}/texmf/tex/latex/lyx/
@@ -212,6 +198,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.2.pre4
+- 1.4.0pre4
+
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-0.1.pre3
 - 1.4.0pre3
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Jan 2006 18:06:33 -0000	1.6
+++ sources	31 Jan 2006 13:22:30 -0000	1.7
@@ -1 +1 @@
-d1e83cf590c2682b37cea2729608ac77  lyx-1.4.0pre3.tar.bz2
+dbf4af105ce244dbe2b931cb27b4a5c9  lyx-1.4.0pre4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:24 -0500
Subject: rpms/perl-DBD-CSV - New directory
Message-ID: <200601311342.k0VDgQvp004841@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4833/perl-DBD-CSV

Log Message:
Directory /cvs/extras/rpms/perl-DBD-CSV added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:30 -0500
Subject: rpms/perl-DBD-CSV/devel - New directory
Message-ID: <200601311342.k0VDgWxe004856@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4833/perl-DBD-CSV/devel

Log Message:
Directory /cvs/extras/rpms/perl-DBD-CSV/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:49 -0500
Subject: rpms/perl-DBD-CSV Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311342.k0VDgpOs004890@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4878

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DBD-CSV


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBD-CSV
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 13:42:54 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:42:54 -0500
Subject: rpms/perl-DBD-CSV/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601311342.k0VDgu4Y004910@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4878/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBD-CSV


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 13:43:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:43:26 -0500
Subject: rpms/perl-DBD-CSV import.log,1.1,1.2
Message-ID: <200601311343.k0VDhwTC004978@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4944

Modified Files:
	import.log 
Log Message:
auto-import perl-DBD-CSV-0.22-2 on branch devel from perl-DBD-CSV-0.22-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-CSV/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 13:42:48 -0000	1.1
+++ import.log	31 Jan 2006 13:43:26 -0000	1.2
@@ -0,0 +1 @@
+perl-DBD-CSV-0_22-2:HEAD:perl-DBD-CSV-0.22-2.src.rpm:1138714998



From fedora-extras-commits at redhat.com  Tue Jan 31 13:43:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:43:32 -0500
Subject: rpms/perl-DBD-CSV/devel perl-DBD-CSV.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601311344.k0VDi4mr004982@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-CSV/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4944/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBD-CSV.spec 
Log Message:
auto-import perl-DBD-CSV-0.22-2 on branch devel from perl-DBD-CSV-0.22-2.src.rpm


--- NEW FILE perl-DBD-CSV.spec ---
Name:           perl-DBD-CSV
Version:        0.22
Release:        2%{?dist}
Summary:        DBI driver for CSV files

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/DBD-CSV/
Source0:        http://www.cpan.org/authors/id/J/JZ/JZUCKER/DBD-CSV-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(DBI) >= 1.00
BuildRequires:  perl(DBD::File) >= 0.30
BuildRequires:  perl(SQL::Statement) >= 0.1011
BuildRequires:  perl(Text::CSV_XS) >= 0.16
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The DBD::CSV module is yet another driver for the DBI (Database
independent interface for Perl). This one is based on the SQL
"engine" SQL::Statement and the abstract DBI driver DBD::File
and implements access to so-called CSV files (Comma separated
values). Such files are mostly used for exporting MS Access and
MS Excel data.


%prep
%setup -q -n DBD-CSV-%{version}
chmod a-x ChangeLog README lib/DBD/*.pm lib/Bundle/DBD/*.pm


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog README
%{perl_vendorlib}/Bundle/
%{perl_vendorlib}/DBD/
%{_mandir}/man3/*.3*


%changelog
* Sat Dec 17 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-2
- Missing build requirement: DBD::File >= 0.30.

* Sun Sep 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.22-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-CSV/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 13:42:54 -0000	1.1
+++ .cvsignore	31 Jan 2006 13:43:32 -0000	1.2
@@ -0,0 +1 @@
+DBD-CSV-0.22.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-CSV/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 13:42:54 -0000	1.1
+++ sources	31 Jan 2006 13:43:32 -0000	1.2
@@ -0,0 +1 @@
+365517fb2e0f565b16613eac01046d85  DBD-CSV-0.22.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 13:51:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 08:51:16 -0500
Subject: owners owners.list,1.582,1.583
Message-ID: <200601311351.k0VDpm4F005094@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5077

Modified Files:
	owners.list 
Log Message:
New package: perl-DBD-CSV (#175899).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- owners.list	31 Jan 2006 08:26:04 -0000	1.582
+++ owners.list	31 Jan 2006 13:51:16 -0000	1.583
@@ -791,6 +791,7 @@
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 31 14:02:40 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:02:40 -0500
Subject: rpms/dvdisaster/devel .cvsignore, 1.2, 1.3 dvdisaster.spec, 1.4,
	1.5 sources, 1.2, 1.3 dvdisaster-0.64.2-browser.patch, 1.1, NONE
Message-ID: <200601311403.k0VE3CMK006898@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6863

Modified Files:
	.cvsignore dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.64.2-browser.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Nov 2005 12:24:13 -0000	1.2
+++ .cvsignore	31 Jan 2006 14:02:39 -0000	1.3
@@ -1 +1 @@
-dvdisaster-0.64.2.tar.bz2
+dvdisaster-0.65.tar.bz2


Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdisaster.spec	3 Nov 2005 15:25:55 -0000	1.4
+++ dvdisaster.spec	31 Jan 2006 14:02:39 -0000	1.5
@@ -1,13 +1,12 @@
 Name: dvdisaster
 Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.64.2
-Release: 2%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
 Source1: dvdisaster.desktop
-Patch0: dvdisaster-0.64.2-browser.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +32,15 @@
 degli errori che saranno poi utilizzati per recuperare i settori illeggibili
 se il supporto dovesse danneggiarsi col tempo.
 
+%description -l cs
+%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat
+na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m.
+Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch
+sektor??, pokud se disk pozd??ji po??kod??.
+
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -53,14 +57,6 @@
 	DOCSUBDIR=%{_docdir}/%{name}-%{version}
 
 
-pushd documentation
-for man in *.1
-do
-    iconv -f ISO8859-1 -t UTF8 <$man >$man.new && mv -f $man.new $man
-done
-popd
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,7 +68,7 @@
 
 for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
 do
-    sed -i "s:$RPM_BUILD_ROOT::g" $man
+    sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
 done
 
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -102,17 +98,26 @@
 %{_docdir}/%{name}-%{version}/COPYING
 %{_docdir}/%{name}-%{version}/CREDITS.en
 %lang(de) %{_docdir}/%{name}-%{version}/CREDITS.de
+%lang(cs) %{_docdir}/%{name}-%{version}/CREDITS.cs
 %{_docdir}/%{name}-%{version}/TODO
 %{_docdir}/%{name}-%{version}/en
 %lang(de) %{_docdir}/%{name}-%{version}/de
+%lang(cs) %{_docdir}/%{name}-%{version}/cs
 %{_docdir}/%{name}-%{version}/images
 
 %{_mandir}/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(it) %{_mandir}/it/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.65-1
+- upgrade to 0.65
+- drop browser patch (no more needed)
+- drop manual convertations to utf8 -- already in good encodings.
+- handle new locale (czech)
+
 * Thu Nov  3 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64.2-2
 - use user preferred browser to view manuals online (patch0)
 - Accepted for Fedora Extra (review by Ville Skytta <ville.skytta at iki.fi>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 12:24:13 -0000	1.2
+++ sources	31 Jan 2006 14:02:39 -0000	1.3
@@ -1 +1 @@
-166b0efa724da90fd38212eda2ed352e  dvdisaster-0.64.2.tar.bz2
+bcab797d77656ca6c672cb646b9c7971  dvdisaster-0.65.tar.bz2


--- dvdisaster-0.64.2-browser.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:05:16 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:05:16 -0500
Subject: rpms/dvdisaster/FC-4 dvdisaster.spec, 1.4, 1.5 sources, 1.2,
	1.3 dvdisaster-0.64.2-browser.patch, 1.1, NONE
Message-ID: <200601311405.k0VE5m7H006971@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6952

Modified Files:
	dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.64.2-browser.patch 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdisaster.spec	3 Nov 2005 15:25:55 -0000	1.4
+++ dvdisaster.spec	31 Jan 2006 14:05:15 -0000	1.5
@@ -1,13 +1,12 @@
 Name: dvdisaster
 Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.64.2
-Release: 2%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
 Source1: dvdisaster.desktop
-Patch0: dvdisaster-0.64.2-browser.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +32,15 @@
 degli errori che saranno poi utilizzati per recuperare i settori illeggibili
 se il supporto dovesse danneggiarsi col tempo.
 
+%description -l cs
+%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat
+na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m.
+Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch
+sektor??, pokud se disk pozd??ji po??kod??.
+
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -53,14 +57,6 @@
 	DOCSUBDIR=%{_docdir}/%{name}-%{version}
 
 
-pushd documentation
-for man in *.1
-do
-    iconv -f ISO8859-1 -t UTF8 <$man >$man.new && mv -f $man.new $man
-done
-popd
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,7 +68,7 @@
 
 for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
 do
-    sed -i "s:$RPM_BUILD_ROOT::g" $man
+    sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
 done
 
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -102,17 +98,26 @@
 %{_docdir}/%{name}-%{version}/COPYING
 %{_docdir}/%{name}-%{version}/CREDITS.en
 %lang(de) %{_docdir}/%{name}-%{version}/CREDITS.de
+%lang(cs) %{_docdir}/%{name}-%{version}/CREDITS.cs
 %{_docdir}/%{name}-%{version}/TODO
 %{_docdir}/%{name}-%{version}/en
 %lang(de) %{_docdir}/%{name}-%{version}/de
+%lang(cs) %{_docdir}/%{name}-%{version}/cs
 %{_docdir}/%{name}-%{version}/images
 
 %{_mandir}/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(it) %{_mandir}/it/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.65-1
+- upgrade to 0.65
+- drop browser patch (no more needed)
+- drop manual convertations to utf8 -- already in good encodings.
+- handle new locale (czech)
+
 * Thu Nov  3 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64.2-2
 - use user preferred browser to view manuals online (patch0)
 - Accepted for Fedora Extra (review by Ville Skytta <ville.skytta at iki.fi>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 12:24:13 -0000	1.2
+++ sources	31 Jan 2006 14:05:15 -0000	1.3
@@ -1 +1 @@
-166b0efa724da90fd38212eda2ed352e  dvdisaster-0.64.2.tar.bz2
+bcab797d77656ca6c672cb646b9c7971  dvdisaster-0.65.tar.bz2


--- dvdisaster-0.64.2-browser.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:08:12 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:08:12 -0500
Subject: rpms/dvdisaster/FC-3 dvdisaster.spec, 1.4, 1.5 sources, 1.2,
	1.3 dvdisaster-0.64.2-browser.patch, 1.1, NONE
Message-ID: <200601311408.k0VE8xSk007039@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7020

Modified Files:
	dvdisaster.spec sources 
Removed Files:
	dvdisaster-0.64.2-browser.patch 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dvdisaster.spec	3 Nov 2005 15:25:55 -0000	1.4
+++ dvdisaster.spec	31 Jan 2006 14:08:12 -0000	1.5
@@ -1,13 +1,12 @@
 Name: dvdisaster
 Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.64.2
-Release: 2%{?dist}
+Version: 0.65
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
 Source1: dvdisaster.desktop
-Patch0: dvdisaster-0.64.2-browser.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,10 +32,15 @@
 degli errori che saranno poi utilizzati per recuperare i settori illeggibili
 se il supporto dovesse danneggiarsi col tempo.
 
+%description -l cs
+%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat
+na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m.
+Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch
+sektor??, pokud se disk pozd??ji po??kod??.
+
 
 %prep
 %setup -q
-%patch0 -p1
 
 
 %build
@@ -53,14 +57,6 @@
 	DOCSUBDIR=%{_docdir}/%{name}-%{version}
 
 
-pushd documentation
-for man in *.1
-do
-    iconv -f ISO8859-1 -t UTF8 <$man >$man.new && mv -f $man.new $man
-done
-popd
-
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -72,7 +68,7 @@
 
 for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
 do
-    sed -i "s:$RPM_BUILD_ROOT::g" $man
+    sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
 done
 
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -102,17 +98,26 @@
 %{_docdir}/%{name}-%{version}/COPYING
 %{_docdir}/%{name}-%{version}/CREDITS.en
 %lang(de) %{_docdir}/%{name}-%{version}/CREDITS.de
+%lang(cs) %{_docdir}/%{name}-%{version}/CREDITS.cs
 %{_docdir}/%{name}-%{version}/TODO
 %{_docdir}/%{name}-%{version}/en
 %lang(de) %{_docdir}/%{name}-%{version}/de
+%lang(cs) %{_docdir}/%{name}-%{version}/cs
 %{_docdir}/%{name}-%{version}/images
 
 %{_mandir}/man1/*
 %lang(de) %{_mandir}/de/man1/*
 %lang(it) %{_mandir}/it/man1/*
+%lang(cs) %{_mandir}/cs/man1/*
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.65-1
+- upgrade to 0.65
+- drop browser patch (no more needed)
+- drop manual convertations to utf8 -- already in good encodings.
+- handle new locale (czech)
+
 * Thu Nov  3 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64.2-2
 - use user preferred browser to view manuals online (patch0)
 - Accepted for Fedora Extra (review by Ville Skytta <ville.skytta at iki.fi>)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Nov 2005 12:24:13 -0000	1.2
+++ sources	31 Jan 2006 14:08:12 -0000	1.3
@@ -1 +1 @@
-166b0efa724da90fd38212eda2ed352e  dvdisaster-0.64.2.tar.bz2
+bcab797d77656ca6c672cb646b9c7971  dvdisaster-0.65.tar.bz2


--- dvdisaster-0.64.2-browser.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:14:27 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:14:27 -0500
Subject: rpms/dvdisaster/devel dvdisaster.spec,1.5,1.6
Message-ID: <200601311414.k0VEExQb007113@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7096

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdisaster.spec	31 Jan 2006 14:02:39 -0000	1.5
+++ dvdisaster.spec	31 Jan 2006 14:14:27 -0000	1.6
@@ -12,6 +12,7 @@
 
 BuildRequires: gtk2-devel
 BuildRequires: gettext, desktop-file-utils
+BuildRequires: bzip2-devel, libpng-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan 31 14:18:05 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:18:05 -0500
Subject: rpms/dvdisaster/FC-4 dvdisaster.spec,1.5,1.6
Message-ID: <200601311418.k0VEIbC9007204@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7166

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdisaster.spec	31 Jan 2006 14:05:15 -0000	1.5
+++ dvdisaster.spec	31 Jan 2006 14:18:05 -0000	1.6
@@ -12,6 +12,7 @@
 
 BuildRequires: gtk2-devel
 BuildRequires: gettext, desktop-file-utils
+BuildRequires: bzip2-devel, libpng-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan 31 14:19:10 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 09:19:10 -0500
Subject: rpms/dvdisaster/FC-3 dvdisaster.spec,1.5,1.6
Message-ID: <200601311419.k0VEJgMt007262@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/dvdisaster/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7245

Modified Files:
	dvdisaster.spec 
Log Message:



Index: dvdisaster.spec
===================================================================
RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dvdisaster.spec	31 Jan 2006 14:08:12 -0000	1.5
+++ dvdisaster.spec	31 Jan 2006 14:19:10 -0000	1.6
@@ -12,6 +12,7 @@
 
 BuildRequires: gtk2-devel
 BuildRequires: gettext, desktop-file-utils
+BuildRequires: bzip2-devel, libpng-devel
 
 
 %description



From fedora-extras-commits at redhat.com  Tue Jan 31 14:26:44 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:26:44 -0500
Subject: rpms/tkcvs/FC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 tkcvs.spec, 
	1.11, 1.12
Message-ID: <200601311427.k0VERGwN007374@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/FC-3

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Jan 2006 19:28:18 -0000	1.6
+++ .cvsignore	31 Jan 2006 14:26:43 -0000	1.7
@@ -1 +1 @@
-tkcvs_8_0_1.tar.gz
+tkcvs_8_0_2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Jan 2006 19:28:18 -0000	1.6
+++ sources	31 Jan 2006 14:26:43 -0000	1.7
@@ -1 +1 @@
-cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz
+aaeaa34a9e1d309baee9fcf7cbba9799  tkcvs_8_0_2.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- tkcvs.spec	15 Jan 2006 19:28:18 -0000	1.11
+++ tkcvs.spec	31 Jan 2006 14:26:43 -0000	1.12
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	8.0.1
+Version:	8.0.2
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,7 +7,7 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
+Source:		http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -40,6 +40,7 @@
 perl -pi -e 's|set TCDIR \[file join \$TclRoot tkcvs\]|set TCDIR "%{_datadir}/tkcvs"|' tkcvs/tkcvs.tcl
 perl -pi -e 's|\[file join \$TclRoot tkcvs bitmaps\]|\[file join \$TCDIR bitmaps\]|' tkcvs/tkcvs.tcl
 
+
 %install
 install -d ${RPM_BUILD_ROOT}%{_datadir}
 install -d ${RPM_BUILD_ROOT}%{_bindir}
@@ -53,9 +54,11 @@
 cd ..
 cp -fr tkcvs ${RPM_BUILD_ROOT}%{_datadir}
 
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
 %doc CHANGELOG COPYING FAQ vendor5readme.pdf vendorcode.sh
@@ -63,7 +66,11 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
+
 %changelog
+* Tue Jan 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.2-1
+- new version 8.0.2
+
 * Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
 - new version 8.0.1
 



From fedora-extras-commits at redhat.com  Tue Jan 31 14:26:50 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:26:50 -0500
Subject: rpms/tkcvs/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tkcvs.spec, 
	1.14, 1.15
Message-ID: <200601311427.k0VERMPb007379@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/FC-4

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Jan 2006 19:28:24 -0000	1.7
+++ .cvsignore	31 Jan 2006 14:26:49 -0000	1.8
@@ -1 +1 @@
-tkcvs_8_0_1.tar.gz
+tkcvs_8_0_2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Jan 2006 19:28:24 -0000	1.7
+++ sources	31 Jan 2006 14:26:49 -0000	1.8
@@ -1 +1 @@
-cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz
+aaeaa34a9e1d309baee9fcf7cbba9799  tkcvs_8_0_2.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tkcvs.spec	15 Jan 2006 19:28:24 -0000	1.14
+++ tkcvs.spec	31 Jan 2006 14:26:49 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	8.0.1
+Version:	8.0.2
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,7 +7,7 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
+Source:		http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.2-1
+- new version 8.0.2
+
 * Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
 - new version 8.0.1
 



From fedora-extras-commits at redhat.com  Tue Jan 31 14:27:00 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:27:00 -0500
Subject: rpms/tkcvs/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tkcvs.spec, 
	1.14, 1.15
Message-ID: <200601311427.k0VERZH1007382@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/devel

Modified Files:
	.cvsignore sources tkcvs.spec 
Log Message:
new version 8.0.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Jan 2006 19:28:30 -0000	1.7
+++ .cvsignore	31 Jan 2006 14:27:00 -0000	1.8
@@ -1 +1 @@
-tkcvs_8_0_1.tar.gz
+tkcvs_8_0_2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Jan 2006 19:28:30 -0000	1.7
+++ sources	31 Jan 2006 14:27:00 -0000	1.8
@@ -1 +1 @@
-cd9e2807082a40214ac8f002f73847a8  tkcvs_8_0_1.tar.gz
+aaeaa34a9e1d309baee9fcf7cbba9799  tkcvs_8_0_2.tar.gz


Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- tkcvs.spec	15 Jan 2006 19:28:30 -0000	1.14
+++ tkcvs.spec	31 Jan 2006 14:27:00 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		tkcvs
-Version:	8.0.1
+Version:	8.0.2
 Release:	1%{?dist}
 
 Summary:	TkCVS and TkDiff
@@ -7,7 +7,7 @@
 Group:		Development/Tools
 License:	GPL
 URL:		http://www.twobarleycorns.net/tkcvs.html
-Source:		http://www.twobarleycorns.net/tkcvs_8_0_1.tar.gz
+Source:		http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	tk, tcl, cvs
 BuildArch:	noarch
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.2-1
+- new version 8.0.2
+
 * Sun Jan 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 8.0.1-1
 - new version 8.0.1
 



From fedora-extras-commits at redhat.com  Tue Jan 31 14:34:08 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:34:08 -0500
Subject: rpms/tkcvs/FC-3 tkcvs.spec,1.12,1.13
Message-ID: <200601311434.k0VEYexh007440@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-3

Modified Files:
	tkcvs.spec 
Log Message:



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-3/tkcvs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- tkcvs.spec	31 Jan 2006 14:26:43 -0000	1.12
+++ tkcvs.spec	31 Jan 2006 14:34:07 -0000	1.13
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0_1
+%setup -q -n tkcvs_8_0_2
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 31 14:34:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:34:13 -0500
Subject: rpms/tkcvs/FC-4 tkcvs.spec,1.15,1.16
Message-ID: <200601311434.k0VEYkIT007443@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/FC-4

Modified Files:
	tkcvs.spec 
Log Message:



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tkcvs.spec	31 Jan 2006 14:26:49 -0000	1.15
+++ tkcvs.spec	31 Jan 2006 14:34:13 -0000	1.16
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0_1
+%setup -q -n tkcvs_8_0_2
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 31 14:34:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 31 Jan 2006 09:34:19 -0500
Subject: rpms/tkcvs/devel tkcvs.spec,1.15,1.16
Message-ID: <200601311434.k0VEYqlC007446@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/tkcvs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7393/devel

Modified Files:
	tkcvs.spec 
Log Message:



Index: tkcvs.spec
===================================================================
RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tkcvs.spec	31 Jan 2006 14:27:00 -0000	1.15
+++ tkcvs.spec	31 Jan 2006 14:34:19 -0000	1.16
@@ -33,7 +33,7 @@
 
 
 %prep
-%setup -q -n tkcvs_8_0_1
+%setup -q -n tkcvs_8_0_2
 
 
 %build



From fedora-extras-commits at redhat.com  Tue Jan 31 14:51:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:51:46 -0500
Subject: rpms/perl-UNIVERSAL-isa - New directory
Message-ID: <200601311451.k0VEpmsO007703@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7695/perl-UNIVERSAL-isa

Log Message:
Directory /cvs/extras/rpms/perl-UNIVERSAL-isa added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 14:51:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:51:52 -0500
Subject: rpms/perl-UNIVERSAL-isa/devel - New directory
Message-ID: <200601311451.k0VEps82007718@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7695/perl-UNIVERSAL-isa/devel

Log Message:
Directory /cvs/extras/rpms/perl-UNIVERSAL-isa/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:11 -0500
Subject: rpms/perl-UNIVERSAL-isa Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311452.k0VEqDGR007762@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7750

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-UNIVERSAL-isa


--- NEW FILE Makefile ---
# Top level Makefile for module perl-UNIVERSAL-isa
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:16 -0500
Subject: rpms/perl-UNIVERSAL-isa/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200601311452.k0VEqI9h007782@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7750/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-UNIVERSAL-isa


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:47 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:47 -0500
Subject: rpms/perl-UNIVERSAL-isa import.log,1.1,1.2
Message-ID: <200601311453.k0VErKK4007850@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816

Modified Files:
	import.log 
Log Message:
auto-import perl-UNIVERSAL-isa-0.05-2 on branch devel from perl-UNIVERSAL-isa-0.05-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 14:52:10 -0000	1.1
+++ import.log	31 Jan 2006 14:52:47 -0000	1.2
@@ -0,0 +1 @@
+perl-UNIVERSAL-isa-0_05-2:HEAD:perl-UNIVERSAL-isa-0.05-2.src.rpm:1138719160



From fedora-extras-commits at redhat.com  Tue Jan 31 14:52:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:52:53 -0500
Subject: rpms/perl-UNIVERSAL-isa/devel perl-UNIVERSAL-isa.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601311453.k0VErPxa007854@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-UNIVERSAL-isa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7816/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-UNIVERSAL-isa.spec 
Log Message:
auto-import perl-UNIVERSAL-isa-0.05-2 on branch devel from perl-UNIVERSAL-isa-0.05-2.src.rpm


--- NEW FILE perl-UNIVERSAL-isa.spec ---
Name:           perl-UNIVERSAL-isa
Version:        0.05
Release:        2%{?dist}
Summary:        Hack around module authors using UNIVERSAL::isa as a function

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/UNIVERSAL-isa/
Source0:        http://www.cpan.org/authors/id/N/NU/NUFFIN/UNIVERSAL-isa-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Module::Build)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Whenever you use "isa" in UNIVERSAL as a function, a kitten using
Test::MockObject dies. Normally, the kittens would be helpless, but
if they use UNIVERSAL::isa (the module whose docs you are reading),
the kittens can live long and prosper.

This module replaces UNIVERSAL::isa with a version that makes sure
that if it's called as a function on objects which override isa,
isa will be called on those objects as a method.

In all other cases the real UNIVERSAL::isa is just called directly.


%prep
%setup -q -n UNIVERSAL-isa-%{version}
%{__perl} -pi -e 's{^#!%{__perl}\b}{##!%{__perl}}' lib/UNIVERSAL/isa.pm


%build
%{__perl} Build.PL installdirs=vendor
./Build


%install
rm -rf $RPM_BUILD_ROOT
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
chmod -R u+w $RPM_BUILD_ROOT/*


%check
./Build test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{perl_vendorlib}/UNIVERSAL/
%{_mandir}/man3/*.3*


%changelog
* Tue Jan 31 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.05-2
- Source URL correction.

* Tue Dec 27 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.05-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 14:52:16 -0000	1.1
+++ .cvsignore	31 Jan 2006 14:52:53 -0000	1.2
@@ -0,0 +1 @@
+UNIVERSAL-isa-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-isa/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 14:52:16 -0000	1.1
+++ sources	31 Jan 2006 14:52:53 -0000	1.2
@@ -0,0 +1 @@
+15df976064b0b3d21b2fb8808fe9c471  UNIVERSAL-isa-0.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 14:56:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 31 Jan 2006 09:56:46 -0500
Subject: owners owners.list,1.583,1.584
Message-ID: <200601311457.k0VEvIl0007957@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7940

Modified Files:
	owners.list 
Log Message:
New package: perl-UNIVERSAL-isa (#177168).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -r1.583 -r1.584
--- owners.list	31 Jan 2006 13:51:16 -0000	1.583
+++ owners.list	31 Jan 2006 14:56:46 -0000	1.584
@@ -966,6 +966,7 @@
 Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-exports|Lightweight, universal exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-UNIVERSAL-isa|Hack around module authors using UNIVERSAL::isa as a function|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-moniker|Real world naming for classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Statgrab|Perl extension for collecting information about the machine|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unix-Syslog|Perl interface to the UNIX syslog(3) calls|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 31 15:13:47 2006
From: fedora-extras-commits at redhat.com (Miloslav Trmac (mitr))
Date: Tue, 31 Jan 2006 10:13:47 -0500
Subject: rpms/foobillard/devel foobillard.spec,1.8,1.9
Message-ID: <200601311514.k0VFEJhU009758@cvs-int.fedora.redhat.com>

Author: mitr

Update of /cvs/extras/rpms/foobillard/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9741

Modified Files:
	foobillard.spec 
Log Message:
* Tue Jan 31 2006 Miloslav Trmac <mitr at volny.cz> - 3.0a-3
- Update BuildRequires for modular X



Index: foobillard.spec
===================================================================
RCS file: /cvs/extras/rpms/foobillard/devel/foobillard.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- foobillard.spec	6 Apr 2005 22:11:37 -0000	1.8
+++ foobillard.spec	31 Jan 2006 15:13:46 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           foobillard
 Version:        3.0a
-Release:        2
+Release:        3
 
 Summary:        OpenGL billard game
 
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  SDL-devel ImageMagick alsa-lib-devel
 BuildRequires:  freetype-devel libpng-devel perl zlib-devel
-BuildRequires:  xorg-x11-devel libGL.so.1 libGLU.so.1
+BuildRequires:  libGL-devel libGLU-devel libX11-devel libXaw-devel libXi-devel
 
 %description
 FooBillard is an attempt to create a free OpenGL-billard for Linux.
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Tue Jan 31 2006 Miloslav Trmac <mitr at volny.cz> - 3.0a-3
+- Update BuildRequires for modular X
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Jan 31 16:11:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 11:11:36 -0500
Subject: rpms/jasper/devel jasper-1.701.0-GL.patch, 1.1, 1.2 jasper.spec, 1.7,
	1.8
Message-ID: <200601311612.k0VGC8lp011691@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11666

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper-1.701.0-GL.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper-1.701.0-GL.patch	18 Oct 2005 13:10:42 -0000	1.1
+++ jasper-1.701.0-GL.patch	31 Jan 2006 16:11:35 -0000	1.2
@@ -1,14 +1,3 @@
---- jasper-1.701.0/configure.ac.GL	2004-02-08 19:41:29.000000000 -0600
-+++ jasper-1.701.0/configure.ac	2005-10-18 08:09:24.000000000 -0500
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- 	if test $HAVE_OPENGL = no; then
--		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
- 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- 	fi
 --- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
 +++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
 @@ -9465,7 +9465,7 @@
@@ -16,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
++		TMPLIBS="-lglut"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jasper.spec	18 Oct 2005 13:10:42 -0000	1.7
+++ jasper.spec	31 Jan 2006 16:11:35 -0000	1.8
@@ -1,4 +1,3 @@
-# $Id$
 
 # NOTE: packages can use jasper:
 # ImageMagick
@@ -10,13 +9,15 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: jasper-1.701.0-GL.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
 
@@ -37,6 +38,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .GL
+
 
 %build
 %configure \
@@ -46,7 +49,7 @@
 make %{?_smp_mflags}
 
 
-%check
+%check ||:
 make check
 
 
@@ -61,13 +64,17 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
+# not needed anymore, see bz #176773
+# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT LICENSE NEWS README
-%{_bindir}/*
+%{_bindir}/imgcmp
+%{_bindir}/jiv
+%{_bindir}/imginfo
+%{_bindir}/jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -87,6 +94,10 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
+- revert jasper to jaspertool rename (#176773)
+- actually use/apply GL patch
+
 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
 - GL patch to remove libGL dependancy (using only freeglut)
 



From fedora-extras-commits at redhat.com  Tue Jan 31 16:43:47 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 11:43:47 -0500
Subject: rpms/jasper/devel jasper.spec,1.8,1.9
Message-ID: <200601311644.k0VGiQTh011859@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842

Modified Files:
	jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
  (#179464)



Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jasper.spec	31 Jan 2006 16:11:35 -0000	1.8
+++ jasper.spec	31 Jan 2006 16:43:46 -0000	1.9
@@ -9,7 +9,7 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
@@ -20,6 +20,10 @@
 
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
+# workaround: 
+#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+#  http://bugzilla.redhat.com/bugzilla/179464
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -94,6 +98,10 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
+- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+  (#179464)
+
 * Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
 - revert jasper to jaspertool rename (#176773)
 - actually use/apply GL patch



From fedora-extras-commits at redhat.com  Tue Jan 31 17:01:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 12:01:33 -0500
Subject: rpms/jasper/FC-4 jasper-1.701.0-GL.patch, 1.1, 1.2 jasper.spec, 1.6,
	1.7
Message-ID: <200601311702.k0VH28O7013700@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13663

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
  (#179464)

* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper-1.701.0-GL.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper-1.701.0-GL.patch	18 Oct 2005 13:10:33 -0000	1.1
+++ jasper-1.701.0-GL.patch	31 Jan 2006 17:01:33 -0000	1.2
@@ -1,14 +1,3 @@
---- jasper-1.701.0/configure.ac.GL	2004-02-08 19:41:29.000000000 -0600
-+++ jasper-1.701.0/configure.ac	2005-10-18 08:09:24.000000000 -0500
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- 	if test $HAVE_OPENGL = no; then
--		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
- 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- 	fi
 --- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
 +++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
 @@ -9465,7 +9465,7 @@
@@ -16,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
++		TMPLIBS="-lglut"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-4/jasper.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jasper.spec	18 Oct 2005 13:10:33 -0000	1.6
+++ jasper.spec	31 Jan 2006 17:01:33 -0000	1.7
@@ -1,4 +1,3 @@
-# $Id$
 
 # NOTE: packages can use jasper:
 # ImageMagick
@@ -10,15 +9,21 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 7%{?dist}
+Release: 9%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: jasper-1.701.0-GL.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
+# workaround: 
+#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+#  http://bugzilla.redhat.com/bugzilla/179464
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -37,6 +42,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .GL
+
 
 %build
 %configure \
@@ -46,7 +53,7 @@
 make %{?_smp_mflags}
 
 
-%check
+%check ||:
 make check
 
 
@@ -61,13 +68,17 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
+# not needed anymore, see bz #176773
+# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT LICENSE NEWS README
-%{_bindir}/*
+%{_bindir}/imgcmp
+%{_bindir}/jiv
+%{_bindir}/imginfo
+%{_bindir}/jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -87,6 +98,14 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
+- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+  (#179464)
+
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
+- revert jasper to jaspertool rename (#176773)
+- actually use/apply GL patch
+
 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
 - GL patch to remove libGL dependancy (using only freeglut)
 



From fedora-extras-commits at redhat.com  Tue Jan 31 17:19:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 31 Jan 2006 12:19:00 -0500
Subject: owners owners.list,1.584,1.585
Message-ID: <200601311719.k0VHJXWA013844@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13822

Modified Files:
	owners.list 
Log Message:
Catching up on package submissions.  Adding the following:
  amavisd-new
  perl-Convert-ASCII-Armour
  perl-Convert-PEM
  perl-CPAN-DistnameInfo
  perl-Crypt-DES_EDE3
  perl-Parse-CPAN-Packages
  perl-Text-Levenshtein



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -r1.584 -r1.585
--- owners.list	31 Jan 2006 14:56:46 -0000	1.584
+++ owners.list	31 Jan 2006 17:19:00 -0000	1.585
@@ -32,6 +32,7 @@
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|altermime|Alter MIME-encoded mailpacks|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|amavisd-new|Email filter with virus scanner and spamassassin support|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|anjuta|GNOME IDE for C and C++|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
@@ -780,11 +781,15 @@
 Fedora Extras|perl-Config-IniFiles|A module for reading .ini-style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Convert-ASCII-Armour|Convert::ASCII::Armour Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Convert-PEM|Convert::PEM Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|Nicolas.Mailhot at laPoste.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-CPAN-DistnameInfo|CPAN::DistnameInfo Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Blowfish|XS Blowfish implementation for Perl|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-CBC|Encrypt Data with Cipher Block Chaining Mode|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-DES_EDE3|Crypt::DES_EDE3 Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -898,6 +903,7 @@
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Parse-CPAN-Packages|Parse::CPAN::Packages Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -946,6 +952,7 @@
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Iconv|Perl interface to iconv() codeset conversion function|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Kakasi|Kakasi library module for perl|tagoh at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Jan 31 17:28:43 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:28:43 -0500
Subject: rpms/gtk-gnutella/devel gtk-gnutella-0.96-install.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 gtk-gnutella.spec, 1.2, 1.3 sources,
	1.2, 1.3 gtk-gnutella-0.95.4-install.patch, 1.1, NONE
Message-ID: <200601311729.k0VHTFmb013948@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13924

Modified Files:
	.cvsignore gtk-gnutella.spec sources 
Added Files:
	gtk-gnutella-0.96-install.patch 
Removed Files:
	gtk-gnutella-0.95.4-install.patch 
Log Message:


gtk-gnutella-0.96-install.patch:

--- NEW FILE gtk-gnutella-0.96-install.patch ---
diff -Nrbu gtk-gnutella-0.96/src/Makefile.SH gtk-gnutella-0.96-OK/src/Makefile.SH
--- gtk-gnutella-0.96/src/Makefile.SH	2006-01-25 00:18:39.000000000 +0300
+++ gtk-gnutella-0.96-OK/src/Makefile.SH	2006-01-31 19:42:18.000000000 +0300
@@ -231,7 +231,7 @@
 	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
-	$(INSTALL) -c -s -m 555  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
+	$(INSTALL) -c -m 755  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
 
 local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(BINDIR)/gtk-gnutella$(_EXE)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Oct 2005 14:39:17 -0000	1.2
+++ .cvsignore	31 Jan 2006 17:28:43 -0000	1.3
@@ -1 +1 @@
-gtk-gnutella-0.95.4.tar.bz2
+gtk-gnutella-0.96.tar.bz2


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-gnutella.spec	28 Oct 2005 11:10:58 -0000	1.2
+++ gtk-gnutella.spec	31 Jan 2006 17:28:43 -0000	1.3
@@ -1,13 +1,13 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.95.4
-Release: 2%{?dist}
+Version: 0.96
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gtk-gnutella-0.95.4-install.patch
+Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
@@ -44,8 +44,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install INSTALL_PREFIX=$RPM_BUILD_ROOT
+make install.man INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-install -p -m 644 gtk-gnutella*.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
+install -D -m 644 extra_files/gtk-gnutella.16.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.32.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.svg \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -62,14 +71,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
+%{_mandir}/*/*
 %{_datadir}/gtk-gnutella
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96-1
+- upgrade to 0.96
+
 * Fri Oct 28 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.95.4-2
 - patch0: don't pre-strip binary on makeinstall (#171922)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2005 14:39:17 -0000	1.2
+++ sources	31 Jan 2006 17:28:43 -0000	1.3
@@ -1 +1 @@
-4e6ea65149100c882f9b2c4ff7ca8dc1  gtk-gnutella-0.95.4.tar.bz2
+4e1cd518ac2995f29952274e880cd6ec  gtk-gnutella-0.96.tar.bz2


--- gtk-gnutella-0.95.4-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 17:30:59 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:30:59 -0500
Subject: rpms/gtk-gnutella/FC-4 gtk-gnutella-0.96-install.patch, NONE,
	1.1 gtk-gnutella.spec, 1.2, 1.3 sources, 1.2,
	1.3 gtk-gnutella-0.95.4-install.patch, 1.1, NONE
Message-ID: <200601311731.k0VHVViC014051@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14012

Modified Files:
	gtk-gnutella.spec sources 
Added Files:
	gtk-gnutella-0.96-install.patch 
Removed Files:
	gtk-gnutella-0.95.4-install.patch 
Log Message:


gtk-gnutella-0.96-install.patch:

--- NEW FILE gtk-gnutella-0.96-install.patch ---
diff -Nrbu gtk-gnutella-0.96/src/Makefile.SH gtk-gnutella-0.96-OK/src/Makefile.SH
--- gtk-gnutella-0.96/src/Makefile.SH	2006-01-25 00:18:39.000000000 +0300
+++ gtk-gnutella-0.96-OK/src/Makefile.SH	2006-01-31 19:42:18.000000000 +0300
@@ -231,7 +231,7 @@
 	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
-	$(INSTALL) -c -s -m 555  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
+	$(INSTALL) -c -m 755  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
 
 local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(BINDIR)/gtk-gnutella$(_EXE)


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-4/gtk-gnutella.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-gnutella.spec	28 Oct 2005 11:12:46 -0000	1.2
+++ gtk-gnutella.spec	31 Jan 2006 17:30:59 -0000	1.3
@@ -1,13 +1,13 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.95.4
-Release: 2%{?dist}
+Version: 0.96
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gtk-gnutella-0.95.4-install.patch
+Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
@@ -44,8 +44,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install INSTALL_PREFIX=$RPM_BUILD_ROOT
+make install.man INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-install -p -m 644 gtk-gnutella*.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
+install -D -m 644 extra_files/gtk-gnutella.16.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.32.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.svg \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -62,14 +71,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
+%{_mandir}/*/*
 %{_datadir}/gtk-gnutella
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96-1
+- upgrade to 0.96
+
 * Fri Oct 28 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.95.4-2
 - patch0: don't pre-strip binary on makeinstall (#171922)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2005 14:39:17 -0000	1.2
+++ sources	31 Jan 2006 17:30:59 -0000	1.3
@@ -1 +1 @@
-4e6ea65149100c882f9b2c4ff7ca8dc1  gtk-gnutella-0.95.4.tar.bz2
+4e1cd518ac2995f29952274e880cd6ec  gtk-gnutella-0.96.tar.bz2


--- gtk-gnutella-0.95.4-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 17:31:56 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 31 Jan 2006 12:31:56 -0500
Subject: rpms/enchant/FC-4 .cvsignore, 1.5, 1.6 enchant.spec, 1.6,
	1.7 sources, 1.5, 1.6
Message-ID: <200601311732.k0VHWS0A014144@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14089

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
Update to 1.2.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Oct 2005 21:06:15 -0000	1.5
+++ .cvsignore	31 Jan 2006 17:31:56 -0000	1.6
@@ -1 +1 @@
-enchant-1.2.0.tar.gz
+enchant-1.2.1.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/enchant.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- enchant.spec	22 Oct 2005 21:06:15 -0000	1.6
+++ enchant.spec	31 Jan 2006 17:31:56 -0000	1.7
@@ -1,13 +1,12 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.0
+Version: 1.2.1
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
 Source: http://www.abisource.com/downloads/enchant/%{version}/enchant-%{version}.tar.gz
 URL: http://www.abisource.com/
-Requires: glib2 >= 2.0.0
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -62,6 +61,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Jan 31 2006 Marc Maurer <uwog at abisource.com> 1:1.2.1-1.fc4
+- Update to 1.2.1
+- Drop glib Require
+
 * Sat Oct 22 2005 Marc Maurer <uwog at abisource.com> 1:1.2.0-1.fc4
 - Update to 1.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Oct 2005 21:06:15 -0000	1.5
+++ sources	31 Jan 2006 17:31:56 -0000	1.6
@@ -1 +1 @@
-e44a734a85fbbadf898fb935ac346f31  enchant-1.2.0.tar.gz
+841542c0bf89b5c7b8a85f4bc682f70b  enchant-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 17:32:25 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:32:25 -0500
Subject: rpms/gtk-gnutella/FC-3 gtk-gnutella-0.96-install.patch, NONE,
	1.1 gtk-gnutella.spec, 1.2, 1.3 sources, 1.2,
	1.3 gtk-gnutella-0.95.4-install.patch, 1.1, NONE
Message-ID: <200601311732.k0VHWvBo014187@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14127

Modified Files:
	gtk-gnutella.spec sources 
Added Files:
	gtk-gnutella-0.96-install.patch 
Removed Files:
	gtk-gnutella-0.95.4-install.patch 
Log Message:


gtk-gnutella-0.96-install.patch:

--- NEW FILE gtk-gnutella-0.96-install.patch ---
diff -Nrbu gtk-gnutella-0.96/src/Makefile.SH gtk-gnutella-0.96-OK/src/Makefile.SH
--- gtk-gnutella-0.96/src/Makefile.SH	2006-01-25 00:18:39.000000000 +0300
+++ gtk-gnutella-0.96-OK/src/Makefile.SH	2006-01-31 19:42:18.000000000 +0300
@@ -231,7 +231,7 @@
 	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(BINDIR) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(BINDIR)); \
-	$(INSTALL) -c -s -m 555  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
+	$(INSTALL) -c -m 755  gtk-gnutella$(_EXE) $(INSTALL_PREFIX)$(BINDIR)
 
 local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(BINDIR)/gtk-gnutella$(_EXE)


Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-3/gtk-gnutella.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-gnutella.spec	28 Oct 2005 11:13:43 -0000	1.2
+++ gtk-gnutella.spec	31 Jan 2006 17:32:25 -0000	1.3
@@ -1,13 +1,13 @@
 
 Name: gtk-gnutella
 Summary: GUI based Gnutella Client
-Version: 0.95.4
-Release: 2%{?dist}
+Version: 0.96
+Release: 1%{?dist}
 Group: Applications/Internet
 License: GPL
 URL: http://gtk-gnutella.sourceforge.net
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gtk-gnutella-0.95.4-install.patch
+Patch0: gtk-gnutella-0.96-install.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if 0%{!?_with_gtk1:1}
 BuildRequires: gtk2-devel, libglade2-devel
@@ -44,8 +44,17 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install INSTALL_PREFIX=$RPM_BUILD_ROOT
+make install.man INSTALL_PREFIX=$RPM_BUILD_ROOT
 
-install -p -m 644 gtk-gnutella*.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg
+install -D -m 644 extra_files/gtk-gnutella.16.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/16x16/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.32.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.png \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/gtk-gnutella.png
+install -D -m 644 extra_files/gtk-gnutella.svg \
+        $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/scalable/apps/gtk-gnutella.svg
 
 desktop-file-install --vendor fedora --delete-original      \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
@@ -62,14 +71,19 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/*
+%{_mandir}/*/*
 %{_datadir}/gtk-gnutella
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %doc README TODO AUTHORS LICENSE GEO_LICENSE doc/other/remote-shell.txt
 
 
 %changelog
+* Tue Jan 31 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.96-1
+- upgrade to 0.96
+
 * Fri Oct 28 2005 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.95.4-2
 - patch0: don't pre-strip binary on makeinstall (#171922)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Oct 2005 14:39:17 -0000	1.2
+++ sources	31 Jan 2006 17:32:25 -0000	1.3
@@ -1 +1 @@
-4e6ea65149100c882f9b2c4ff7ca8dc1  gtk-gnutella-0.95.4.tar.bz2
+4e1cd518ac2995f29952274e880cd6ec  gtk-gnutella-0.96.tar.bz2


--- gtk-gnutella-0.95.4-install.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 17:54:19 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 12:54:19 -0500
Subject: rpms/gtk-gnutella/devel gtk-gnutella.spec,1.3,1.4
Message-ID: <200601311754.k0VHsp53014279@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14262

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/devel/gtk-gnutella.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-gnutella.spec	31 Jan 2006 17:28:43 -0000	1.3
+++ gtk-gnutella.spec	31 Jan 2006 17:54:19 -0000	1.4
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc
+BuildRequires: libxml2-devel, byacc, groff
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:18:06 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 13:18:06 -0500
Subject: rpms/gtk-gnutella/FC-4 gtk-gnutella.spec,1.3,1.4
Message-ID: <200601311818.k0VIIcpq016223@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16206

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-4/gtk-gnutella.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-gnutella.spec	31 Jan 2006 17:30:59 -0000	1.3
+++ gtk-gnutella.spec	31 Jan 2006 18:18:06 -0000	1.4
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc
+BuildRequires: libxml2-devel, byacc, groff
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:19:53 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 31 Jan 2006 13:19:53 -0500
Subject: rpms/gtk-gnutella/FC-3 gtk-gnutella.spec,1.3,1.4
Message-ID: <200601311820.k0VIKP0u016282@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gtk-gnutella/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16264

Modified Files:
	gtk-gnutella.spec 
Log Message:



Index: gtk-gnutella.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-gnutella/FC-3/gtk-gnutella.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-gnutella.spec	31 Jan 2006 17:32:25 -0000	1.3
+++ gtk-gnutella.spec	31 Jan 2006 18:19:52 -0000	1.4
@@ -14,7 +14,7 @@
 %else
 BuildRequires: gtk+-devel, libglade-devel
 %endif
-BuildRequires: libxml2-devel, byacc
+BuildRequires: libxml2-devel, byacc, groff
 BuildRequires: desktop-file-utils >= 0.2.90
 
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:27:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 31 Jan 2006 13:27:58 -0500
Subject: rpms/jasper/FC-3 jasper-1.701.0-GL.patch, 1.1, 1.2 jasper.spec, 1.5,
	1.6
Message-ID: <200601311828.k0VISVHV016383@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/jasper/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356

Modified Files:
	jasper-1.701.0-GL.patch jasper.spec 
Log Message:
* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
  (#179464)

* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
- revert jasper to jaspertool rename (#176773)
- actually use/apply GL patch


jasper-1.701.0-GL.patch:

Index: jasper-1.701.0-GL.patch
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper-1.701.0-GL.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jasper-1.701.0-GL.patch	18 Oct 2005 13:10:32 -0000	1.1
+++ jasper-1.701.0-GL.patch	31 Jan 2006 18:27:57 -0000	1.2
@@ -1,14 +1,3 @@
---- jasper-1.701.0/configure.ac.GL	2004-02-08 19:41:29.000000000 -0600
-+++ jasper-1.701.0/configure.ac	2005-10-18 08:09:24.000000000 -0500
-@@ -242,7 +242,7 @@
- OPENGL_LIBS=""
- if test $ENABLE_OPENGL = yes; then
- 	if test $HAVE_OPENGL = no; then
--		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
- 		AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes;
- 		  OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS)
- 	fi
 --- jasper-1.701.0/configure.GL	2004-02-08 19:44:12.000000000 -0600
 +++ jasper-1.701.0/configure	2005-10-18 08:09:38.000000000 -0500
 @@ -9465,7 +9465,7 @@
@@ -16,7 +5,7 @@
  if test $ENABLE_OPENGL = yes; then
  	if test $HAVE_OPENGL = no; then
 -		TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS"
-+		TMPLIBS="-lglut $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS"
++		TMPLIBS="-lglut"
  		echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
  echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
  if test "${ac_cv_lib_glut_glutInit+set}" = set; then


Index: jasper.spec
===================================================================
RCS file: /cvs/extras/rpms/jasper/FC-3/jasper.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jasper.spec	18 Oct 2005 13:10:32 -0000	1.5
+++ jasper.spec	31 Jan 2006 18:27:57 -0000	1.6
@@ -1,4 +1,3 @@
-# $Id$
 
 # NOTE: packages can use jasper:
 # ImageMagick
@@ -10,15 +9,21 @@
 Name:    jasper
 Group:   System Environment/Libraries
 Version: 1.701.0
-Release: 7%{?dist}
+Release: 9%{?dist}
 
 License: JasPer License Version 2.0
 URL:     http://www.ece.uvic.ca/~mdadams/jasper/
 Source:  http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: jasper-1.701.0-GL.patch
+
 BuildRequires: libjpeg-devel
 BuildRequires: freeglut-devel
+# workaround: 
+#  "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+#  http://bugzilla.redhat.com/bugzilla/179464
+BuildRequires: libGL-devel libGLU-devel
 
 %description
 This package contains an implementation of the image compression
@@ -37,6 +42,8 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .GL
+
 
 %build
 %configure \
@@ -46,7 +53,7 @@
 make %{?_smp_mflags}
 
 
-%check
+%check ||:
 make check
 
 
@@ -61,13 +68,17 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 # avoid conflict(s) with tomcat
-mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
+# not needed anymore, see bz #176773
+# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool
 
 
 %files
 %defattr(-,root,root)
 %doc COPYRIGHT LICENSE NEWS README
-%{_bindir}/*
+%{_bindir}/imgcmp
+%{_bindir}/jiv
+%{_bindir}/imginfo
+%{_bindir}/jasper*
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -87,6 +98,14 @@
 
 
 %changelog
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-9
+- workaround "freeglut-devel should Requires: libGL-devel, libGLU-devel"
+  (#179464)
+
+* Tue Jan 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-8
+- revert jasper to jaspertool rename (#176773)
+- actually use/apply GL patch
+
 * Tue Oct 18 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.701.0-7
 - GL patch to remove libGL dependancy (using only freeglut)
 



From fedora-extras-commits at redhat.com  Tue Jan 31 18:33:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 31 Jan 2006 13:33:07 -0500
Subject: rpms/cln/FC-4 cln.spec,1.11,1.12
Message-ID: <200601311833.k0VIXeMM016467@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/cln/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16450

Modified Files:
	cln.spec 
Log Message:
Specfile bugfix.


Index: cln.spec
===================================================================
RCS file: /cvs/extras/rpms/cln/FC-4/cln.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cln.spec	16 Jan 2006 22:19:06 -0000	1.11
+++ cln.spec	31 Jan 2006 18:33:06 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           cln
 Version:        1.1.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class Library for Numbers
 
 Group:          System Environment/Libraries
@@ -76,8 +76,12 @@
 %{_bindir}/cln-config
 %{_datadir}/aclocal/cln.m4
 %exclude %{_libdir}/*.la
+%exclude %{_infodir}/dir
 
 %changelog
+* Tue Jan 31 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-2
+- Exclude /usr/share/info/dir from package.
+
 * Mon Jan 16 2006 Quentin Spencer <qspencer at users.sf.net> 1.1.11-1
 - New upstream release.
 - Updated source URL.



From fedora-extras-commits at redhat.com  Tue Jan 31 18:49:53 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:49:53 -0500
Subject: owners owners.list,1.585,1.586
Message-ID: <200601311850.k0VIoPxL016528@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16511

Modified Files:
	owners.list 
Log Message:
Taking fontforge with the permission of previous owner.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.585
retrieving revision 1.586
diff -u -r1.585 -r1.586
--- owners.list	31 Jan 2006 17:19:00 -0000	1.585
+++ owners.list	31 Jan 2006 18:49:53 -0000	1.586
@@ -226,7 +226,7 @@
 Fedora Extras|fluxbox|Fluxbox is a windowmanager that is based on Blackbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fluxconf|Configuration utility for fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fnfx|Hotkey functions for Toshiba laptops|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|fontforge|An outline and bitmap font editor|otaylor at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|fontforge|An outline and bitmap font editor|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|fonts-hebrew-fancy|Fancy Hebrew fonts|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|foobillard|A free OpenGL game of playing billard|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|foremost|Program that recovers files by carving them from a raw disk|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 18:55:09 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:55:09 -0500
Subject: owners owners.list,1.586,1.587
Message-ID: <200601311855.k0VItgVP016564@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16546

Modified Files:
	owners.list 
Log Message:
+spicctrl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -r1.586 -r1.587
--- owners.list	31 Jan 2006 18:49:53 -0000	1.586
+++ owners.list	31 Jan 2006 18:55:09 -0000	1.587
@@ -1187,6 +1187,7 @@
 Fedora Extras|soundtracker|Sound module composer/player|nos at utelsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|source-highlight|Produces a document with syntax highlighting|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|spamass-milter|Sendmail milter for spamassassin|paul at city-fan.org|extras-qa at fedoraproject.org|
+Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|splint|An implementation of the lint program|pnasrat at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 18:59:44 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:59:44 -0500
Subject: rpms/spicctrl - New directory
Message-ID: <200601311859.k0VIxkAk016635@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16627/spicctrl

Log Message:
Directory /cvs/extras/rpms/spicctrl added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 18:59:50 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 13:59:50 -0500
Subject: rpms/spicctrl/devel - New directory
Message-ID: <200601311859.k0VIxquO016653@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16627/spicctrl/devel

Log Message:
Directory /cvs/extras/rpms/spicctrl/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 19:00:43 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:00:43 -0500
Subject: rpms/spicctrl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601311900.k0VJ0jT2016695@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16683

Added Files:
	Makefile import.log 
Log Message:
Setup of module spicctrl


--- NEW FILE Makefile ---
# Top level Makefile for module spicctrl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 19:00:49 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:00:49 -0500
Subject: rpms/spicctrl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601311900.k0VJ0pjA016715@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16683/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module spicctrl


--- NEW FILE .cvsignore ---


--- NEW FILE Makefile ---
# Makefile for source rpm: spicctrl
# $Id$
NAME := spicctrl
SPECFILE = $(firstword $(wildcard *.spec))

define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef

MAKEFILE_COMMON := $(shell $(find-makefile-common))

ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef

MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif

include $(MAKEFILE_COMMON)


--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 19:03:38 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:03:38 -0500
Subject: rpms/spicctrl/devel spicctrl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200601311904.k0VJ4AJr018542@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504/devel

Modified Files:
	.cvsignore sources 
Added Files:
	spicctrl.spec 
Log Message:
auto-import spicctrl-1.9-2 on branch devel from spicctrl-1.9-2.src.rpm


--- NEW FILE spicctrl.spec ---
Name:           spicctrl
Version:        1.9
Release:        2%{?dist}
Summary:        Sony Vaio laptop SPIC control program

Group:          Applications/System
License:        GPL
URL:            http://popies.net/sonypi/
Source0:        http://popies.net/sonypi/spicctrl-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

ExclusiveArch:	%{ix86}

%description
spicctrl queries and sets a variety of parameters on Sony Vaio laptop
computers, including AC Power status, battery status, screen brightness,
and bluetooth device power status


%prep
%setup -q


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
install spicctrl $RPM_BUILD_ROOT%{_sbindir}
install spicctrl.1 $RPM_BUILD_ROOT%{_mandir}/man1


%clean
rm -rf $RPM_BUILD_ROOT


%post
if [ ! -c /dev/sonypi ]; then
	rm -f /dev/sonypi
	mknod /dev/sonypi c 10 250
fi
if [ -e /etc/modprobe.conf ]; then
	grep 'alias char-major-10-250 sonypi' /etc/modprobe.conf > /dev/null
	RETVAL=$?
	if [ $RETVAL -ne 0 ]; then
		echo 'alias char-major-10-250 sonypi' >> /etc/modprobe.conf
		echo 'options sonypi minor=250' >> /etc/modprobe.conf
	fi
fi


%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE
%{_mandir}/man1/spicctrl.1.gz
%attr(0755,root,root) /usr/sbin/spicctrl

%changelog
* Tue Jan 31 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-2
- Bumped release to a proper integer

* Sun Jan 08 2006 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.4
- Add %%{?dist} tag

* Mon Dec 26 2005 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.3
- Change ExclusiveArch to %%{ix86}

* Mon Dec 26 2005 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.2
- Add ExclusiveArch

* Thu Dec 22 2005 Roozbeh Pournader <roozbeh at farsiweb.info> 1.9-1.1
- First revision, based on upstream spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 19:00:49 -0000	1.1
+++ .cvsignore	31 Jan 2006 19:03:38 -0000	1.2
@@ -0,0 +1 @@
+spicctrl-1.9.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 19:00:49 -0000	1.1
+++ sources	31 Jan 2006 19:03:38 -0000	1.2
@@ -0,0 +1 @@
+775a1959c03e59830303b8320ca379d2  spicctrl-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 19:03:32 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Tue, 31 Jan 2006 14:03:32 -0500
Subject: rpms/spicctrl import.log,1.1,1.2
Message-ID: <200601311904.k0VJ44sZ018538@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/spicctrl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504

Modified Files:
	import.log 
Log Message:
auto-import spicctrl-1.9-2 on branch devel from spicctrl-1.9-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/spicctrl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 19:00:43 -0000	1.1
+++ import.log	31 Jan 2006 19:03:32 -0000	1.2
@@ -0,0 +1 @@
+spicctrl-1_9-2:HEAD:spicctrl-1.9-2.src.rpm:1138734153



From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:14 -0500
Subject: rpms/overgod - New directory
Message-ID: <200601312116.k0VLGGe5022806@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798/overgod

Log Message:
Directory /cvs/extras/rpms/overgod added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:20 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:20 -0500
Subject: rpms/overgod/devel - New directory
Message-ID: <200601312116.k0VLGMc8022821@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22798/overgod/devel

Log Message:
Directory /cvs/extras/rpms/overgod/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:37 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:37 -0500
Subject: rpms/overgod Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601312116.k0VLGdm2022855@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22843

Added Files:
	Makefile import.log 
Log Message:
Setup of module overgod


--- NEW FILE Makefile ---
# Top level Makefile for module overgod
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:16:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:16:42 -0500
Subject: rpms/overgod/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200601312116.k0VLGj2x022873@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22843/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module overgod


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:17:28 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:17:28 -0500
Subject: rpms/overgod import.log,1.1,1.2
Message-ID: <200601312118.k0VLI0rf022961@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22922

Modified Files:
	import.log 
Log Message:
auto-import overgod-1.0-2 on branch devel from overgod-1.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/overgod/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 21:16:37 -0000	1.1
+++ import.log	31 Jan 2006 21:17:27 -0000	1.2
@@ -0,0 +1 @@
+overgod-1_0-2:HEAD:overgod-1.0-2.src.rpm:1138742456



From fedora-extras-commits at redhat.com  Tue Jan 31 21:17:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:17:33 -0500
Subject: rpms/overgod/devel overgod-1.0.patch, NONE, 1.1 overgod.desktop,
	NONE, 
	1.1 overgod.png, NONE, 1.1 overgod.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601312118.k0VLI6Wo022965@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/overgod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22922/devel

Modified Files:
	.cvsignore sources 
Added Files:
	overgod-1.0.patch overgod.desktop overgod.png overgod.spec 
Log Message:
auto-import overgod-1.0-2 on branch devel from overgod-1.0-2.src.rpm

overgod-1.0.patch:

--- NEW FILE overgod-1.0.patch ---
diff -urN overgod-1.0.orig/Makefile overgod-1.0/Makefile
--- overgod-1.0.orig/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ overgod-1.0/Makefile	2006-01-21 10:36:02.000000000 +0100
@@ -0,0 +1,28 @@
+PREFIX  = /home/opt
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS  = -g -Wall -O2
+LDFLAGS = `allegro-config --libs`
+DEFINES = -DDATADIR=\"$(DATADIR)/\"
+OBJS    = actor.o bullet.o cloud.o cmds.o displ_in.o display.o eclass.o \
+          enemy.o game.o input.o levels.o light.o main.o menu.o palette.o \
+          pickup.o score.o sound.o stuff.o tile.o
+TARGET  = overgod
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(DATADIR)/gfx
+	mkdir -p $(DATADIR)/wavs/beat
+	install -p -m 755 $(TARGET) $(PREFIX)/bin
+	install -p -m 644 overgod.cfg $(DATADIR)
+	install -p -m 644 gfx/* $(DATADIR)/gfx
+	install -p -m 644 wavs/*.wav $(DATADIR)/wavs
+	install -p -m 644 wavs/beat/* $(DATADIR)/wavs/beat
+	
+clean:
+	rm -f $(OBJS) $(TARGET) *~
diff -urN overgod-1.0.orig/actor.c overgod-1.0/actor.c
--- overgod-1.0.orig/actor.c	2005-09-11 11:32:08.000000000 +0200
+++ overgod-1.0/actor.c	2006-01-21 10:40:31.000000000 +0100
@@ -608,7 +608,7 @@
 //  ysin2 = sin(angle_to_radians(actor[a].angle)) * GRAIN;
 // }
  
- int target_x, target_y;
+ int target_x = 0, target_y = 0;
  float speed_mult;
  int accel = 0;
 
diff -urN overgod-1.0.orig/bullet.c overgod-1.0/bullet.c
--- overgod-1.0.orig/bullet.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/bullet.c	2006-01-21 10:41:54.000000000 +0100
@@ -264,7 +264,7 @@
 //   int y_gain = 0;
 //   char angle_change;
 
-   int cx, cy, xa, ya, xb;
+   int cx = 0, cy = 0, xa, ya, xb;
    int c2x, c2y;
 
    int passing_colour [5];
diff -urN overgod-1.0.orig/cmds.c overgod-1.0/cmds.c
--- overgod-1.0.orig/cmds.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/cmds.c	2006-01-21 10:45:53.000000000 +0100
@@ -2638,9 +2638,6 @@
 {
  int special1;
  int special2;
- int special3;
- int special4;
- int special5;
 
  timer += grand(4);
 
@@ -2694,11 +2691,11 @@
  if (angle == 0)
   angle = 1;
 
+ /* note bombs don't use special3 - 5 */
  create_bullet(btype, x, y,
   xs, ys, sactor,
   damage, timer, mass, angle,
-  status, seed, colours, 1, special1, special2, special3, special4, special5);
-
+  status, seed, colours, 1, special1, special2, 0, 0, 0);
 
 }
 
diff -urN overgod-1.0.orig/config.h overgod-1.0/config.h
--- overgod-1.0.orig/config.h	2005-09-11 15:17:06.000000000 +0200
+++ overgod-1.0/config.h	2006-01-21 10:38:15.000000000 +0100
@@ -68,6 +68,8 @@
 #define ARMOUR_UPGRADE 200
 
 
+#define MAX_FRAMESKIP 4
+
 struct armoury
 {
  char *name;
@@ -1293,3 +1295,12 @@
 PITCH_HEAVY
 };
 
+/* compat defines */
+#include <stdio.h>
+
+#ifndef DATADIR
+#define DATADIR
+#endif
+
+#define itoa(integer, buf, bufsize) \
+ (snprintf(buf, bufsize, "%d", integer), buf)
diff -urN overgod-1.0.orig/displ_in.c overgod-1.0/displ_in.c
--- overgod-1.0.orig/displ_in.c	2005-09-12 17:07:32.000000000 +0200
+++ overgod-1.0/displ_in.c	2006-01-21 10:51:37.000000000 +0100
@@ -139,11 +139,9 @@
  player2 = NULL;
 
  level_bmp = NULL;
- RGB temp_palette2 [1024]; // these seem to serve as a buffer against strange random corruptions of temp_palette. I don't understand this at all.
  RGB temp_palette [256];
- RGB temp_palette3 [1024];
 
- DATAFILE *datf = load_datafile("gfx//data.dat");
+ DATAFILE *datf = load_datafile(DATADIR "gfx/data.dat");
  if (datf == NULL)
  {
   set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
@@ -166,7 +164,7 @@
 
 //rest(1000);
 
- BITMAP *temp_bitmap = load_bitmap("gfx//gb_si.bmp", temp_palette);
+ BITMAP *temp_bitmap = load_bitmap(DATADIR "gfx/gb_si.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (ships)");
@@ -321,8 +319,8 @@
 #ifdef FIX_FONT
 
  RGB font_palette [256];
-// BITMAP *fbmp = load_bitmap("gfx//font_cel.bmp", font_palette);
- BITMAP *fbmp = load_bitmap("gfx//font_oc.bmp", font_palette);
+// BITMAP *fbmp = load_bitmap(DATADIR "gfx/font_cel.bmp", font_palette);
+ BITMAP *fbmp = load_bitmap(DATADIR "gfx/font_oc.bmp", font_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (font_cel)");
@@ -395,7 +393,7 @@
 #ifdef GENERATE_SHIPS
 
 
- temp_bitmap = load_bitmap("gfx//gb_ship.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_ship.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("gb_ship");
@@ -472,7 +470,7 @@
 
 // Load in enemy bitmaps:
 
- temp_bitmap = load_bitmap("gfx//gb_nme1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_nme1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_nme1.bmp not loaded correctly?)");
@@ -496,7 +494,7 @@
  progress_update("Enemies 1");
 
 
- temp_bitmap = load_bitmap("gfx//gb_nme2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_nme2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_nme2.bmp not loaded correctly?)");
@@ -519,7 +517,7 @@
 //extern BITMAP *enemy_bmps [ENEMY_BMPS];
 
 
- temp_bitmap = load_bitmap("gfx//gb_nmebm.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_nmebm.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_nmebm.bmp not loaded correctly?)");
@@ -533,7 +531,7 @@
 
  progress_update("Enemies 3");
 
- temp_bitmap = load_bitmap("gfx//gb_big1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_big1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_big1.bmp not loaded correctly?)");
@@ -548,7 +546,7 @@
 
  progress_update("Enemies 4");
 
- temp_bitmap = load_bitmap("gfx//gb_big2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_big2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_big2.bmp not loaded correctly?)");
@@ -564,7 +562,7 @@
 
  progress_update("Enemies 5");
 
- temp_bitmap = load_bitmap("gfx//gb_big3.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_big3.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_big3.bmp not loaded correctly?)");
@@ -580,7 +578,7 @@
  progress_update("Enemies 6");
 
 
- temp_bitmap = load_bitmap("gfx//gb_med1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_med1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_med1.bmp not loaded correctly?)");
@@ -597,7 +595,7 @@
 
  progress_update("Enemies 7");
 
-/* temp_bitmap = load_bitmap("gfx//enemy3.bmp", temp_palette);
+/* temp_bitmap = load_bitmap(DATADIR "gfx/enemy3.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy3.bmp not loaded correctly?)");
@@ -621,7 +619,7 @@
 
 /* progress_update("Enemy3 Loaded");
 
- temp_bitmap = load_bitmap("gfx//small1.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small1.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small1.bmp not loaded correctly?)");
@@ -635,7 +633,7 @@
  
  progress_update("Small1 Loaded");
 */
- temp_bitmap = load_bitmap("gfx//gb_small.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_small.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gm_small.bmp not loaded correctly?)");
@@ -682,7 +680,7 @@
 
  progress_update("Small Things");
 
- temp_bitmap = load_bitmap("gfx//gb_small2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_small2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gm_small2.bmp not loaded correctly?)");
@@ -733,7 +731,7 @@
 
 
 /*
- temp_bitmap = load_bitmap("gfx//small2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/small2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (small2.bmp not loaded correctly?)");
@@ -748,7 +746,7 @@
 
  progress_update("Small3 Loaded");
 
- temp_bitmap = load_bitmap("gfx//enemy2.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/enemy2.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (enemy2.bmp not loaded correctly?)");
@@ -763,7 +761,7 @@
  
  progress_update("Enemy2 Loaded");
 */
- temp_bitmap = load_bitmap("gfx//gb_lsh.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_lsh.bmp", temp_palette);
  if (temp_bitmap == NULL)
  {
   bitmap_error("temp_bitmap (gb_lsh.bmp not loaded correctly?)");
@@ -1089,7 +1087,7 @@
 //  else
    blit(source_bmp, temp_bmp, which_ship * 51 + 1, 1, 0, 0, 49, 49);
 
- int i, x, y, px, base_col;
+ int i, x, y, px, base_col = 0;
 
  for (i = 0; i < 5; i ++)
  {
@@ -1138,7 +1136,7 @@
  RGB temp_palette [256];
 // RGB temp_palette3 [1024];
  
- BITMAP *temp_bitmap = load_bitmap("gfx//gb_tiles.bmp", temp_palette);
+ BITMAP *temp_bitmap = load_bitmap(DATADIR "gfx/gb_tiles.bmp", temp_palette);
 
  if (temp_bitmap == NULL)
  {
@@ -1164,7 +1162,7 @@
 
  destroy_bitmap(temp_bitmap);
 
- temp_bitmap = load_bitmap("gfx//gb_maze.bmp", temp_palette);
+ temp_bitmap = load_bitmap(DATADIR "gfx/gb_maze.bmp", temp_palette);
 
  if (temp_bitmap == NULL)
  {
diff -urN overgod-1.0.orig/display.c overgod-1.0/display.c
--- overgod-1.0.orig/display.c	2005-09-11 11:42:46.000000000 +0200
+++ overgod-1.0/display.c	2006-01-21 10:23:29.000000000 +0100
@@ -64,13 +64,7 @@
 #include <stdlib.h>
 // for itoa, used in the screenshot code but not needed for ports etc
 extern volatile int frames_per_second;
-extern volatile int ticked;
-extern int slacktime;
-extern int long_slacktime_store;
 extern int debug_sound [5];
-
-int slack_graph [100];
-int slack_graph_pos;
 int fps_graph [100];
 int fps_graph_pos;
 #endif
@@ -7266,14 +7260,11 @@
 // textprintf_ex(bmp, small_font, 20, 110, 5, "Xs %i  Ys %i  TS %f  DS %f  Drag %i",
 //  actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed), hypot(actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed) * game.drag, actor[player[play].actor_controlled].drag_amount);
 // textprintf_ex(bmp, small_font, 20, 60, 5, "Stack %i", stackavail());
-// textprintf(bmp, small_font, 20, 90, 5, "Slack %i", slacktime);
 // textprintf(bmp, small_font, 20, 100, 5, "Lock %i", actor[0].lock);
 //textprintf_ex(bmp, small_font, 20, 100, COLOUR_GREY5, -1, "Fps %i", frames_per_second);
 // textprintf_ex(bmp, small_font, 20, 50, 5, -1, "Fps} %i", frames_per_second);
 #ifdef DEBUG_DISPLAY
  textprintf_ex(bmp, small_font, 20, 90, 5, -1, "Fps %i", frames_per_second);
- textprintf_ex(bmp, small_font, 20, 100, 5, -1, "Slack %i", slacktime);
- textprintf_ex(bmp, small_font, 20, 110, 5, -1, "LSlack %i", long_slacktime_store);
  int i, c = 0;
  for (i = 0; i < NO_ENEMIES; i ++)
  {
@@ -7298,31 +7289,6 @@
  
  textprintf_ex(bmp, small_font, 20, 150, 5, -1, "%i %i %i %i", debug_sound [0], debug_sound [1], debug_sound [2], debug_sound [3]);
 
-
- if (slack_graph_pos < 0 || slack_graph_pos > 99)
-  slack_graph_pos = 0;
-  
- slack_graph [slack_graph_pos] = slacktime;
-
- c = slack_graph_pos;
- for (i = 0; i < 100; i ++)
- {
-  if (slack_graph [c] <= 5)
-   vline(bmp, 110 - i, 300, 160, COLOUR_RED5);
-    else
-     vline(bmp, 110 - i, 300, 300 - (slack_graph [c] / 6000), COLOUR_YELLOW8);
-  c --;
-  if (c < 0)
-   c = 99;   
- }
-
- slack_graph_pos ++;
-
-
-
-
-
-
  if (fps_graph_pos < 0 || fps_graph_pos > 99)
   fps_graph_pos = 0;
   
@@ -7359,7 +7325,6 @@
   enemy[0].angle, enemy[0].attribute [ATTRIB_SWERVER_ANGLE], enemy[0].attacking, enemy[0].recycle);
  textprintf(bmp, font, 20, 200, 5, "Lock} %i ", actor[0].lock);*/
 /* textprintf(bmp, small_font, 20, 50, 5, "FPS %i", frames_per_second);
- textprintf(bmp, small_font, 20, 60, 5, "SLACK %i", slacktime);
  textprintf(bmp, small_font, 20, 70, 5, "XS %i  YS %i  DRAG %i",
   actor[player[play].actor_controlled].x_speed, actor[player[play].actor_controlled].y_speed, actor[player[play].actor_controlled].drag_amount);
  textprintf(bmp, small_font, 20, 80, 5, "X %i  Y %i ",
diff -urN overgod-1.0.orig/enemy.c overgod-1.0/enemy.c
--- overgod-1.0.orig/enemy.c	2005-09-11 10:46:04.000000000 +0200
+++ overgod-1.0/enemy.c	2006-01-21 10:53:31.000000000 +0100
@@ -195,7 +195,7 @@
 // REMEMBER: enemies are also created in create_turret()
 
    int e = 0;
-   int i, j;
+   int i, j = 0;
 
 
    for (e = 0; e < NO_ENEMIES; e++)
diff -urN overgod-1.0.orig/game.c overgod-1.0/game.c
--- overgod-1.0.orig/game.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/game.c	2006-01-21 13:51:09.000000000 +0100
@@ -68,13 +68,10 @@
 
 extern volatile unsigned char ticked;
 extern volatile int framecounter;
-extern int slacktime;
-int long_slacktime;
-int long_slacktime_store;
-
 
 void game_loop(void)
 {
+ int frames_skipped = 0;
  int playing = 1;
  
  counter = 0;
@@ -191,33 +188,24 @@
      
    }
    
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    run_display();
    framecounter++;
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
   
   init_effects();
 
-  slacktime = 0;
-  
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
+  while(ticked == 0)
+   rest(1);
   ticked --;
 
   counter ++;
   
-  if (counter % 32 == 0)
-  {
-   long_slacktime_store = long_slacktime;
-   long_slacktime = 0;
-  } 
-   
-   long_slacktime += slacktime / 100;
-  
-
   if (key [KEY_ESC])
    quit_query();
   
@@ -259,12 +247,8 @@
 
   play_beats();
 
-  do
-  {
-   slacktime ++;
-   slacktime = 0;
-  } while(ticked == 0);
-
+  while(ticked == 0)
+   rest(1);
   ticked = 0;
 
  }
@@ -429,7 +413,6 @@
 
  init_level();
 
- long_slacktime = 0;
  arena.waver_on_level = 0;
 
 }
diff -urN overgod-1.0.orig/main.c overgod-1.0/main.c
--- overgod-1.0.orig/main.c	2005-09-13 22:58:27.000000000 +0200
+++ overgod-1.0/main.c	2006-01-21 10:29:42.000000000 +0100
@@ -155,17 +155,16 @@
 volatile int framecounter;
 volatile int frames_per_second;
 
-volatile int inputcounter = 0;
-volatile int inputs_per_second = 0;
+//volatile int inputcounter = 0;
+//volatile int inputs_per_second = 0;
 
-volatile int turncounter = 0;
-volatile int turns_per_second = 0;
+//volatile int turncounter = 0;
+//volatile int turns_per_second = 0;
 
 void tickover(void);
 
 volatile unsigned char ticked;
 //volatile unsigned char tick_counter;
-int slacktime;
 // --- end timer interupt
 
 extern int grid_offset_x_2p_finetune;
@@ -214,8 +213,6 @@
       exit(1);
    }
 
-   set_config_file("lacew.cfg");
-   
    install_keyboard();
    install_timer();
 
@@ -244,8 +241,8 @@
 //   LOCK_VARIABLE (tick_counter);
    LOCK_VARIABLE (frames_per_second);
    LOCK_VARIABLE (framecounter);
-   LOCK_VARIABLE (turns_per_second);
-   LOCK_VARIABLE (turncounter);
+//   LOCK_VARIABLE (turns_per_second);
+//   LOCK_VARIABLE (turncounter);
 //   LOCK_VARIABLE (inputs_per_second);
 //   LOCK_VARIABLE (inputcounter);
 
@@ -254,7 +251,7 @@
 
    set_color_depth(8);
 
-   set_config_file("overgod.cfg");
+   init_config();
 
    options.resolution = get_config_int("Options", "Resolution", 0);
    
diff -urN overgod-1.0.orig/menu.c overgod-1.0/menu.c
--- overgod-1.0.orig/menu.c	2005-09-12 20:23:14.000000000 +0200
+++ overgod-1.0/menu.c	2006-01-21 13:52:41.000000000 +0100
@@ -229,7 +229,6 @@
 void enter_keystroke(void);
 int option_jump(int direction);
 int special_jump(int direction);
-void init_config(void);
 void save_config(void);
 
 void choose_ships(void);
@@ -373,7 +372,6 @@
 void init_menus_once_only(void)
 {
 // text_mode(-1);
- init_config();
 
  menu_bmp = create_bitmap(640, 480);
 
@@ -394,7 +392,7 @@
 
  RGB temp_palette [256];
 
-/* BITMAP *temp_bmp = load_bitmap("gfx\\title_i.bmp", temp_palette);
+/* BITMAP *temp_bmp = load_bitmap(DATADIR "gfx/title_i.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -414,7 +412,7 @@
 
  destroy_bitmap(temp_bmp);
 */
- BITMAP *temp_bmp = load_bitmap("gfx//gb_title.bmp", temp_palette);
+ BITMAP *temp_bmp = load_bitmap(DATADIR "gfx/gb_title.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -464,7 +462,7 @@
  destroy_bitmap(temp_bmp);*/
  
 /*
- temp_bmp = load_bitmap("gfx//title_s.bmp", temp_palette);
+ temp_bmp = load_bitmap(DATADIR "gfx/title_s.bmp", temp_palette);
 
  if (!temp_bmp)
  {
@@ -484,7 +482,7 @@
 
  destroy_bitmap(temp_bmp);
 */
-/* upgrade_box1 = load_bitmap("gfx//upg_box.bmp", temp_palette);
+/* upgrade_box1 = load_bitmap(DATADIR "gfx/upg_box.bmp", temp_palette);
 
  if (!upgrade_box1)
  {
@@ -493,7 +491,7 @@
       exit(1);
  }
 
- upgrade_box2 = load_bitmap("gfx//upg_box2.bmp", temp_palette);
+ upgrade_box2 = load_bitmap(DATADIR "gfx/upg_box2.bmp", temp_palette);
 
  if (!upgrade_box2)
  {
@@ -502,7 +500,7 @@
       exit(1);
  }
 
- upgrade_box3 = load_bitmap("gfx//upg_box3.bmp", temp_palette);
+ upgrade_box3 = load_bitmap(DATADIR "gfx/upg_box3.bmp", temp_palette);
 
  if (!upgrade_box3)
  {
@@ -523,7 +521,8 @@
 
 void menu_loop(void)
 {
-
+ int frames_skipped = 0;
+ 
  which_menu = MENU_MAIN;
  menu_index_max = 4;
  menu_index_min = 0;
@@ -551,20 +550,21 @@
   if (which_menu == MENU_SCORES || which_menu == MENU_ENTER_SCORES)
    make_ms_move();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    menu_display();
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
   menu_input();
 
-  slacktime = 0;
-  do
-  {
-   slacktime ++;
-  } while(ticked == 0);
+  while(ticked == 0)
+   rest(1);
   ticked --;
 
  } while(TRUE);
@@ -2042,7 +2042,8 @@
 
  game.type = game_type;
 
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
  clear_bitmap(screen);
 
  begin_game();
@@ -2143,14 +2144,13 @@
 
 void choose_ships(void)
 {
+ int frames_skipped = 0;
 
  player[0].ship = 0;
  player[1].ship = 0;
  game.single_player = 0;
  game.users = 1;
 
- int county = 0;
-
  int keypress_wait1 = KP_WAIT_SHORT;
  int keypress_wait2 = KP_WAIT_SHORT;
  int waiting = 5;
@@ -2289,16 +2289,18 @@
 
   make_grid_scroll();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    display_ship_choice(0, p1_active, p2_active, p1_chosen, p2_chosen);
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
+  while (ticked == 0)
+   rest(1);
 
   ticked --;
 
@@ -3853,17 +3855,69 @@
 
 }
 
+/* Function(s) to find the homedir of a user under Unix */
+#ifdef __unix__
+#include <pwd.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(__DECC) && defined(VMS)
+#include <unixlib.h>
+static char *vms_to_unix_buffer = NULL;
+static int convert_vms_to_unix(char *vms_dir_name)
+{
+	vms_to_unix_buffer = vms_dir_name;
+}
+#endif
+
+/* 
+ * Locate user's home directory.
+ */
+char *get_home_dir(void)
+{
+	struct passwd *pw;
+
+	if (!(pw = getpwuid(getuid())))
+	{ 
+		fprintf(stderr, "Who are you? Not found in passwd database!!\n");
+		return NULL;
+	}
+
+#if defined(__DECC) && defined(VMS)
+	/* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix
+	   Format. */
+	decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1);
+	return vms_to_unix_buffer;
+#else
+	return pw->pw_dir;
+#endif
+}
+#endif /* defined __unix__ */
+
 void init_config(void)
 {
-
-// set_config is in main.c
-
  char miscstring [40];
  char wstring [40];
  char itstring [40];
  int i;
 
-
+#ifdef __unix__   
+ char config_file_name[512];
+ char *home_dir = get_home_dir();
+ int using_global_cfg = 1;
+   
+ snprintf(config_file_name, sizeof(config_file_name)/sizeof(char), "%s/.%s",
+  home_dir? home_dir:".", "overgod.cfg");
+      
+ /* does the cfg file exist? */
+ if (access(config_file_name, R_OK) == 0)
+ {
+  override_config_file(config_file_name);
+  using_global_cfg = 0;
+ }
+ else
+#endif   
+  override_config_file(DATADIR "overgod.cfg");
+  
  options.sound_init = get_config_int("Options", "Sound_init", 1);
  options.sound_mode = get_config_int("Options", "Sound_mode", SOUNDMODE_STEREO);
  options.run_vsync = get_config_int("Options", "Run_vsync", 0);
@@ -3945,6 +3999,12 @@
  best_ta_time = get_config_int("Highscores_TA", "best_time", 1000);
  strcpy(best_ta_name, get_config_string("Highscores_TA", "best_name", "Nobody"));
 
+#ifdef __unix__
+ /* make sure any changes get written to the per user file and not to
+    the global file */
+ if (using_global_cfg)
+  override_config_file(config_file_name);
+#endif
 }
 
 void save_config(void)
@@ -4127,8 +4187,7 @@
 
 void display_victory_screen(void)
 {
-
- int county = 0;
+ int frames_skipped = 0;
  int county2 = 0;
 
  init_ms();
@@ -4142,7 +4201,8 @@
   run_sparkles();
   make_ms_move();
   
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    show_grid(COLOUR_PURPLE3, COLOUR_PURPLE8);
@@ -4157,15 +4217,16 @@
 
    if (county2 > 99)
     textprintf_centre_ex(menu_bmp, small_font, 320, 420, COLOUR_YELLOW5, -1, "Press Space to continue.");
-   vsync();
+   if (options.run_vsync > 0)
+    vsync();
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+   frames_skipped++;
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
-
+  while (ticked == 0)
+   rest(1);
   ticked --;
 
   county2 ++;
@@ -4527,8 +4588,7 @@
 
 void unlock_screen(int which)
 {
-
- int county = 0;
+ int frames_skipped = 0;
  int county2 = 0;
 
  do
@@ -4536,7 +4596,8 @@
   menu_counter ++;
   make_grid_scroll();
 
-  if (ticked == 0)
+  /* only draw if we can keepup */
+  if ( (ticked == 0) || (frames_skipped > MAX_FRAMESKIP))
   {
    clear_bitmap(menu_bmp);
    show_grid(COLOUR_PURPLE3, COLOUR_PURPLE8);
@@ -4560,15 +4621,16 @@
 //   textprintf_centre_ex(menu_bmp, small_font, 320, 305, COLOUR_YELLOW8, "your time, like ");
    if (county2 > 99)
     textprintf_centre_ex(menu_bmp, small_font, 320, 380, COLOUR_YELLOW5, -1, "Press Space to continue.");
-   vsync();
+   if (options.run_vsync > 0)
+    vsync();
    menu_to_screen();
+   frames_skipped = 0;
   }
+  else
+    frames_skipped++;
 
-  do
-  {
-   county ++;
-  } while (ticked == 0);
-
+  while(ticked == 0)
+   rest(1);
   ticked --;
 
   county2 ++;
diff -urN overgod-1.0.orig/menu.h overgod-1.0/menu.h
--- overgod-1.0.orig/menu.h	2003-09-04 19:28:36.000000000 +0200
+++ overgod-1.0/menu.h	2006-01-21 09:32:09.000000000 +0100
@@ -1,3 +1,5 @@
 void init_menus_once_only(void);
 
 void menu_loop(void);
+
+void init_config(void);
diff -urN overgod-1.0.orig/overgod.cfg overgod-1.0/overgod.cfg
--- overgod-1.0.orig/overgod.cfg	2005-09-13 22:59:15.000000000 +0200
+++ overgod-1.0/overgod.cfg	2006-01-21 16:37:38.000000000 +0100
@@ -3,7 +3,7 @@
 
 [Options]
 Sound_mode = 2
-Run_vsync = 1
+Run_vsync = 0
 Sound_volume = 100
 Ambience_volume = 100
 Resolution = 2
diff -urN overgod-1.0.orig/palette.c overgod-1.0/palette.c
--- overgod-1.0.orig/palette.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/palette.c	2006-01-21 13:54:07.000000000 +0100
@@ -74,6 +74,8 @@
 #include "palette.h"
 #include "globvars.h"
 
+extern struct optionstruct options;
+
 COLOR_MAP trans_table;
 int blend_function(int x, int y, RGB *rgbl);
 int limit_colour(int colour_input);
@@ -957,13 +959,14 @@
 
 void set_dark_palette(void)
 {
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
  set_palette(dark_palet);
 }
 
 void set_light_palette(void)
 {
- vsync();
+ if (options.run_vsync > 0)
+  vsync();
  set_palette(light_palet);
 }
-
diff -urN overgod-1.0.orig/sound.c overgod-1.0/sound.c
--- overgod-1.0.orig/sound.c	2005-09-11 14:44:18.000000000 +0200
+++ overgod-1.0/sound.c	2006-01-21 10:18:59.000000000 +0100
@@ -311,7 +311,7 @@
    }
    
    sound_active = 1;
-
+   
    if (options.sound_init == 0)
    {
 //    cprintf("\n\r\n\rSound disabled in proj.cfg.");
@@ -326,6 +326,7 @@
    if (install_sound (DIGI_AUTODETECT, MIDI_AUTODETECT, NULL) == -1)
    {
 //    allegro_message("\n\r\n\rSound autodetect failed.");
+    printf("Warning: %s, sound disabled\n", allegro_error);
     sound_active = 0;
 //    rest(300);
 //    do
@@ -448,7 +449,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".//wavs//");
+ strcpy(sfile_name, DATADIR "wavs/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
@@ -467,7 +468,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".//sound//");
+ strcpy(sfile_name, DATADIR "sound/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
@@ -1547,7 +1548,7 @@
 
  char sfile_name [50];
 
- strcpy(sfile_name, ".//wavs//beat//");
+ strcpy(sfile_name, DATADIR "wavs/beat/");
  strcat(sfile_name, sfile);
  strcat(sfile_name, ".wav");
 
diff -urN overgod-1.0.orig/tile.c overgod-1.0/tile.c
--- overgod-1.0.orig/tile.c	2005-09-11 09:35:48.000000000 +0200
+++ overgod-1.0/tile.c	2006-01-21 10:55:45.000000000 +0100
@@ -316,7 +316,7 @@
  
  tile_rle [MAZE_NOTHING] = make_tile(back_tile, -1, bcol1, bcol2, 0);
 
- int tmaze;
+ int tmaze = 0;
 
  if (arena.level <= 4)
  {


--- NEW FILE overgod.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Overgod
GenericName=Another Asteroid like game
Comment=Like asteroids, but the asteroids move independently and shoot back
Exec=overgod
Icon=overgod.png
Terminal=false
Type=Application
Categories=Game;ArcadeGame
Version=1.0


--- NEW FILE overgod.spec ---
Name:           overgod
Version:        1.0
Release:        2%{?dist}
Summary:        Another Asteroid like game
Group:          Amusements/Games
License:        GPL
URL:            http://www.allegro.cc/depot/Overgod
Source0:        http://dl.sourceforge.net/sourceforge/overgod/overgod.tar.gz
Source1:        overgod.desktop
Source2:        overgod.png
Patch0:         overgod-1.0.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel desktop-file-utils

%description
For too long has humanity been ruled by cruel and disputatious gods!
Fly through the various layers of the Celestial Oversphere to unseat
those who control the universe.

In Overgod you control a little vehicle in the middle of the screen and fly
around and shoot things - a bit like asteroids, but the asteroids move
independently and shoot back. You can also upgrade your vehicle in various
ways.


%prep
%setup -q
%patch0 -p1 -z .unix
%{__sed} -i 's/\r//' readme.txt licence.txt

%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix}


%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix}

# below is the desktop file and icon stuff.
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --vendor fedora            \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category X-Fedora                       \
  %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
install -p -m 644 %{SOURCE2} \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc readme.txt licence.txt
%{_bindir}/overgod
%{_datadir}/overgod
%{_datadir}/applications/fedora-overgod.desktop
%{_datadir}/icons/hicolor/48x48/apps/overgod.png

%changelog
* Tue Jan 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-2
- Fixup description (bz 178625)

* Sun Jan 22 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/overgod/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 21:16:42 -0000	1.1
+++ .cvsignore	31 Jan 2006 21:17:33 -0000	1.2
@@ -0,0 +1 @@
+overgod.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/overgod/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 21:16:42 -0000	1.1
+++ sources	31 Jan 2006 21:17:33 -0000	1.2
@@ -0,0 +1 @@
+3bddd8d4e96c5e69ec07236de145799a  overgod.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:07 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:07 -0500
Subject: rpms/sblim-cmpi-base - New directory
Message-ID: <200601312119.k0VLJ9fV023105@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23093/sblim-cmpi-base

Log Message:
Directory /cvs/extras/rpms/sblim-cmpi-base added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:13 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:13 -0500
Subject: rpms/sblim-cmpi-base/devel - New directory
Message-ID: <200601312119.k0VLJFMQ023126@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23093/sblim-cmpi-base/devel

Log Message:
Directory /cvs/extras/rpms/sblim-cmpi-base/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:29 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:29 -0500
Subject: rpms/sblim-cmpi-base Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200601312119.k0VLJVmZ023160@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23148

Added Files:
	Makefile import.log 
Log Message:
Setup of module sblim-cmpi-base


--- NEW FILE Makefile ---
# Top level Makefile for module sblim-cmpi-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 {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:35 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:35 -0500
Subject: rpms/sblim-cmpi-base/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200601312119.k0VLJb0H023180@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sblim-cmpi-base


--- NEW FILE .cvsignore ---


***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'

--- NEW FILE sources ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:19:59 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:19:59 -0500
Subject: rpms/sblim-cmpi-base import.log,1.1,1.2
Message-ID: <200601312120.k0VLKV0w023262@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214

Modified Files:
	import.log 
Log Message:
auto-import sblim-cmpi-base-1.5.4-3 on branch devel from sblim-cmpi-base-1.5.4-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	31 Jan 2006 21:19:29 -0000	1.1
+++ import.log	31 Jan 2006 21:19:58 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-base-1_5_4-3:HEAD:sblim-cmpi-base-1.5.4-3.src.rpm:1138742327



From fedora-extras-commits at redhat.com  Tue Jan 31 21:20:04 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:20:04 -0500
Subject: rpms/sblim-cmpi-base/devel sblim-cmpi-base.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200601312120.k0VLKbx9023272@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sblim-cmpi-base.spec 
Log Message:
auto-import sblim-cmpi-base-1.5.4-3 on branch devel from sblim-cmpi-base-1.5.4-3.src.rpm


--- NEW FILE sblim-cmpi-base.spec ---
#
# $Id: sblim-cmpi-base.rh.spec,v 1.3 2005/11/10 12:01:06 mihajlov Exp $
#
# Package spec for sblim-cmpi-base - RedHat/Fedora Flavor
#
# Use this SPEC if building for a RH/Fedora System for usage with
# OpenPegasus
#

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

Summary: SBLIM Base Providers
Name: sblim-cmpi-base
Version: 1.5.4
Release: 3
Group: Systems Management/Base
URL: http://www.sblim.org
License: CPL

Source0: http://download.sourceforge.net/pub/sourceforge/s/sb/sblim/%{name}-%{version}.tar.bz2

BuildRequires: tog-pegasus-devel >= 2.5
Requires: tog-pegasus >= 2.5.1

%Description
Standards Based Linux Instrumentation Base CMPI Providers for
System-related CIM classes

%Package devel
Summary: SBLIM Base Instrumentation Header Development Files
Group: Systems Management/Base
Requires: %{name} = %{version}-%{release}

%Description devel
SBLIM Base Provider Development Package contains header files and 
link libraries for dependent provider packages

%Package test
Summary: SBLIM Base Instrumentation Testcase Files
Group: Systems Management/Base
Requires: %{name} = %{version}-%{release}
Requires: sblim-testsuite

%Description test
SBLIM Base Provider Testcase Files for the SBLIM Testsuite

%prep

%setup -q

%build

%configure TESTSUITEDIR=%{_datadir}/sblim-testsuite \
	CIMSERVER=pegasus
make %{?_smp_mflags}

%install

rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install

# remove unused libtool files
rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a

%pre

%define SCHEMA %{_datadir}/%{name}/Linux_Base.mof
%define REGISTRATION %{_datadir}/%{name}/Linux_Base.registration

# If upgrading, deregister old version
if [ $1 -gt 1 ]
then
  %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1
fi

%post
# Register Schema and Provider - this is higly provider specific

%{_datadir}/%{name}/provider-register.sh -t pegasus \
	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null  2>&1

/sbin/ldconfig

%preun
# Deregister only if not upgrading 
if [ $1 -eq 0 ]
then
  %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null 2>&1
fi

%postun -p /sbin/ldconfig

%clean

rm -rf $RPM_BUILD_ROOT

%files

%defattr(-,root,root) 
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/%{name}
%{_datadir}/doc/%{name}-%{version}
%{_libdir}/*.so.*
%{_libdir}/cmpi/*.so

%files devel

%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/*.so

%files test

%defattr(-,root,root)
%{_datadir}/sblim-testsuite

%changelog

* Thu Nov 10 2005  <mihajlov at de.ibm.com> - 1.5.4-3
- suppress error output in post scriptlets

* Wed Oct 27 2005  <mihajlov at de.ibm.com> - 1.5.4-2
- went back to original provider dir location as FC5 pegasus 2.5.1 support
  /usr/lib[64]/cmpi

* Wed Oct 12 2005  <mihajlov at de.ibm.com> - 1.5.4-1
- new spec file specifically for Fedora/RedHat

* Wed Jul 20 2005 Mark Hamzy <hamzy at us.ibm.com>	1.5.3-1
- initial support


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	31 Jan 2006 21:19:35 -0000	1.1
+++ .cvsignore	31 Jan 2006 21:20:04 -0000	1.2
@@ -0,0 +1 @@
+sblim-cmpi-base-1.5.4.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	31 Jan 2006 21:19:35 -0000	1.1
+++ sources	31 Jan 2006 21:20:04 -0000	1.2
@@ -0,0 +1 @@
+10d9959925e9a416928dce18532855dc  sblim-cmpi-base-1.5.4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:20:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 31 Jan 2006 16:20:26 -0500
Subject: owners owners.list,1.587,1.588
Message-ID: <200601312120.k0VLKwnn023301@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23251

Modified Files:
	owners.list 
Log Message:
add overgod


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -r1.587 -r1.588
--- owners.list	31 Jan 2006 18:55:09 -0000	1.587
+++ owners.list	31 Jan 2006 21:20:26 -0000	1.588
@@ -709,6 +709,7 @@
 Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|p0f|Versatile passive OS fingerprinting tool|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|p7zip|Very high compression ratio file archiver|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|pam_abl|A Pluggable Authentication Module (PAM) for auto blacklisting|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 21:29:39 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 16:29:39 -0500
Subject: owners owners.list,1.588,1.589
Message-ID: <200601312130.k0VLUCF9023432@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23415

Modified Files:
	owners.list 
Log Message:
Added sblim-cmpi-base



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.588
retrieving revision 1.589
diff -u -r1.588 -r1.589
--- owners.list	31 Jan 2006 21:20:26 -0000	1.588
+++ owners.list	31 Jan 2006 21:29:39 -0000	1.589
@@ -1139,6 +1139,7 @@
 Fedora Extras|s3switch|Manage the output device on S3 Savage chips|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|sabayon|Tool to maintain user profiles in a GNOME desktop|markmc at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sbcl|Steel Bank Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|sblim-cmpi-base|Standards Based Linux Instrumentation Base CMPI Providers for System-related CIM classes|hamzy at us.ibm.com|extras-qa at fedoraproject.org|
 Fedora Extras|scalapack|A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|scim-anthy|SCIM IMEngine for Japanese input with anthy|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Jan 31 21:46:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:46:02 -0500
Subject: rpms/fuse-utils Makefile,1.1,NONE import.log,1.2,NONE
Message-ID: <200601312146.k0VLk4v0024067@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/fuse-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24057

Removed Files:
	Makefile import.log 
Log Message:



--- Makefile DELETED ---


--- import.log DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:46:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:46:08 -0500
Subject: rpms/fuse-utils/devel Makefile, 1.1, NONE fuse-utils-0.7.0.spec, 1.1,
	NONE sources, 1.2, NONE
Message-ID: <200601312146.k0VLkALV024084@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24057/devel

Removed Files:
	Makefile fuse-utils-0.7.0.spec sources 
Log Message:



--- Makefile DELETED ---


--- fuse-utils-0.7.0.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:47:00 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:47:00 -0500
Subject: rpms/fuse-utils/devel .cvsignore,1.2,NONE
Message-ID: <200601312147.k0VLl2ok024122@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/fuse-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24113/devel

Removed Files:
	.cvsignore 
Log Message:

FLUSH!



--- .cvsignore DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:48:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 31 Jan 2006 16:48:54 -0500
Subject: rpms/rxvt-unicode/FC-3 .cvsignore, 1.14, 1.15 rxvt-unicode.spec,
	1.16, 1.17 sources, 1.14, 1.15
Message-ID: <200601312149.k0VLnRuY024249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24173/FC-3

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Jan 2006 22:22:45 -0000	1.14
+++ .cvsignore	31 Jan 2006 21:48:54 -0000	1.15
@@ -1 +1 @@
-rxvt-unicode-7.4.tar.bz2
+rxvt-unicode-7.5.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/rxvt-unicode.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rxvt-unicode.spec	28 Jan 2006 22:22:45 -0000	1.16
+++ rxvt-unicode.spec	31 Jan 2006 21:48:54 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.4
+Version:        7.5
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Tue Jan 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.5-1
+- version upgrade
+
 * Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-3/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jan 2006 22:22:45 -0000	1.14
+++ sources	31 Jan 2006 21:48:54 -0000	1.15
@@ -1 +1 @@
-553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2
+41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:49:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 31 Jan 2006 16:49:00 -0500
Subject: rpms/rxvt-unicode/FC-4 .cvsignore, 1.14, 1.15 rxvt-unicode.spec,
	1.16, 1.17 sources, 1.14, 1.15
Message-ID: <200601312149.k0VLnXUk024254@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24173/FC-4

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Jan 2006 22:22:51 -0000	1.14
+++ .cvsignore	31 Jan 2006 21:49:00 -0000	1.15
@@ -1 +1 @@
-rxvt-unicode-7.4.tar.bz2
+rxvt-unicode-7.5.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/rxvt-unicode.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rxvt-unicode.spec	28 Jan 2006 22:22:51 -0000	1.16
+++ rxvt-unicode.spec	31 Jan 2006 21:49:00 -0000	1.17
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.4
+Version:        7.5
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -66,6 +66,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Tue Jan 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.5-1
+- version upgrade
+
 * Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jan 2006 22:22:51 -0000	1.14
+++ sources	31 Jan 2006 21:49:00 -0000	1.15
@@ -1 +1 @@
-553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2
+41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:49:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Tue, 31 Jan 2006 16:49:06 -0500
Subject: rpms/rxvt-unicode/devel .cvsignore, 1.14, 1.15 rxvt-unicode.spec,
	1.20, 1.21 sources, 1.14, 1.15
Message-ID: <200601312149.k0VLncPF024259@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/rxvt-unicode/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24173/devel

Modified Files:
	.cvsignore rxvt-unicode.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	28 Jan 2006 22:22:59 -0000	1.14
+++ .cvsignore	31 Jan 2006 21:49:06 -0000	1.15
@@ -1 +1 @@
-rxvt-unicode-7.4.tar.bz2
+rxvt-unicode-7.5.tar.bz2


Index: rxvt-unicode.spec
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/rxvt-unicode.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- rxvt-unicode.spec	28 Jan 2006 22:22:59 -0000	1.20
+++ rxvt-unicode.spec	31 Jan 2006 21:49:06 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           rxvt-unicode
-Version:        7.4
+Version:        7.5
 Release:        1%{?dist}
 Summary:        Rxvt-unicode is an unicode version of rxvt
 
@@ -71,6 +71,10 @@
 %{_libdir}/urxvt
 
 %changelog
+* Tue Jan 31 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+7.5-1
+- version upgrade
+
 * Sat Jan 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 7.4-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rxvt-unicode/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	28 Jan 2006 22:22:59 -0000	1.14
+++ sources	31 Jan 2006 21:49:06 -0000	1.15
@@ -1 +1 @@
-553604233d5a5abc5a28e56d5b00740b  rxvt-unicode-7.4.tar.bz2
+41b8b19da031846c6a60bf8f36a16fd7  rxvt-unicode-7.5.tar.bz2



From fedora-extras-commits at redhat.com  Tue Jan 31 21:51:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:51:35 -0500
Subject: rpms/sqlite2/devel Makefile, 1.1, NONE sources, 1.2,
	NONE sqlite-2.8.15-arch-double-differences.patch, 1.1,
	NONE sqlite-2.8.15-makefile.patch, 1.1,
	NONE sqlite-2.8.15.rpath.patch, 1.1,
	NONE sqlite-2.8.3.test.rh9.patch, 1.1,
	NONE sqlite-64bit-fixes.patch, 1.1, NONE sqlite2.spec, 1.3, NONE
Message-ID: <200601312151.k0VLpbNj024352@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24341

Removed Files:
	Makefile sources sqlite-2.8.15-arch-double-differences.patch 
	sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch 
	sqlite-2.8.3.test.rh9.patch sqlite-64bit-fixes.patch 
	sqlite2.spec 
Log Message:

FLUSH!



--- Makefile DELETED ---


--- sources DELETED ---


--- sqlite-2.8.15-arch-double-differences.patch DELETED ---


--- sqlite-2.8.15-makefile.patch DELETED ---


--- sqlite-2.8.15.rpath.patch DELETED ---


--- sqlite-2.8.3.test.rh9.patch DELETED ---


--- sqlite-64bit-fixes.patch DELETED ---


--- sqlite2.spec DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 21:51:54 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 31 Jan 2006 16:51:54 -0500
Subject: rpms/perl-Net-Patricia/devel .cvsignore, 1.2,
	1.3 perl-Net-Patricia.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200601312152.k0VLqQOg024397@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/perl-Net-Patricia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24372

Modified Files:
	.cvsignore perl-Net-Patricia.spec sources 
Log Message:
Update to 1.014



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Patricia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Oct 2005 15:11:40 -0000	1.2
+++ .cvsignore	31 Jan 2006 21:51:53 -0000	1.3
@@ -1 +1 @@
-Net-Patricia-1.010.tar.gz
+Net-Patricia-1.014.tar.gz


Index: perl-Net-Patricia.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Patricia/devel/perl-Net-Patricia.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Net-Patricia.spec	24 Oct 2005 15:11:40 -0000	1.1
+++ perl-Net-Patricia.spec	31 Jan 2006 21:51:53 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Net-Patricia
-Version:        1.010
+Version:        1.014
 Release:        1%{?dist}
 Summary:        Patricia Trie perl module for fast IP address lookups
 License:        GPL
@@ -53,5 +53,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Jan 31 2006 Orion Poplawski 1.014-1
+- Update to 1.014
+
 * Tue Oct 11 2005 Orion Poplawski 1.010-1
 - Initial Fedora Extras release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Patricia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Oct 2005 15:11:40 -0000	1.2
+++ sources	31 Jan 2006 21:51:53 -0000	1.3
@@ -1 +1 @@
-19f0c6944769daba64694ee3c72cf286  Net-Patricia-1.010.tar.gz
+16ec73b5b514dbe4275e349fca236c49  Net-Patricia-1.014.tar.gz



From fedora-extras-commits at redhat.com  Tue Jan 31 21:53:55 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Tue, 31 Jan 2006 16:53:55 -0500
Subject: rpms/sqlite2/devel .cvsignore,1.2,NONE
Message-ID: <200601312153.k0VLrvEY024505@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24496

Removed Files:
	.cvsignore 
Log Message:

FLUSH



--- .cvsignore DELETED ---



From fedora-extras-commits at redhat.com  Tue Jan 31 23:46:16 2006
From: fedora-extras-commits at redhat.com (Mark Hamzy (hamzy))
Date: Tue, 31 Jan 2006 18:46:16 -0500
Subject: rpms/sblim-cmpi-base/devel sblim-cmpi-base.spec,1.1,1.2
Message-ID: <200601312346.k0VNkmxc028844@cvs-int.fedora.redhat.com>

Author: hamzy

Update of /cvs/extras/rpms/sblim-cmpi-base/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28827

Modified Files:
	sblim-cmpi-base.spec 
Log Message:
Changing release to 3.fc5



Index: sblim-cmpi-base.spec
===================================================================
RCS file: /cvs/extras/rpms/sblim-cmpi-base/devel/sblim-cmpi-base.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sblim-cmpi-base.spec	31 Jan 2006 21:20:04 -0000	1.1
+++ sblim-cmpi-base.spec	31 Jan 2006 23:46:15 -0000	1.2
@@ -12,7 +12,7 @@
 Summary: SBLIM Base Providers
 Name: sblim-cmpi-base
 Version: 1.5.4
-Release: 3
+Release: 3.fc5
 Group: Systems Management/Base
 URL: http://www.sblim.org
 License: CPL